fix(admin): source scoping + redirect URIs in admin OAuth registration

Takeover of #1558 (rebased onto master, admin/dist + admin-embedded regenerated so asset hashes match; source changes salvaged intact): - /admin/api/register-client now accepts source_id + federated_read (snake and camel case), validated fail-closed against the registered source list via the new normalizeAdminClientSourceScope (src/core/admin-source-scope.ts) before reaching registerClientManual — unknown or malformed ids are a 400, never a silently-hardcoded 'default'. Fixes #1490. - New requireAdmin-gated GET /admin/api/sources feeds the Register Agent form; the form now has a Write Source select + Read Sources checkboxes, and the agents table/drawer show each client's scope. - #1036: the Register Agent form now has a Redirect URIs textarea (one per line). When present, the POST carries redirectUris plus the authorization_code + refresh_token grants, mirroring the CLI's --redirect-uri grant-inference convention (src/commands/auth.ts). Backend plumbing already existed; this was UI-only. Tests: test/admin-source-scope.test.ts (normalization matrix), test/oauth.test.ts (registerClientManual persists source scope into AuthInfo), test/fix-wave-structural.test.ts (endpoint + form pins for #1490 and #1036). Co-authored-by: flamerged <flamerged@users.noreply.github.com> Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-08-14 17:02:19 +00:00 · 2026-07-21 15:09:32 -07:00
22 changed files with 340 additions and 226 deletions
@@ -7,7 +7,7 @@
  <link rel="preconnect" href="https://fonts.googleapis.com" />
  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
  <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&family=JetBrains+Mono:wght@400;500&display=swap" rel="stylesheet" />
-  <script type="module" crossorigin src="/admin/assets/index-CoGEje3-.js"></script>
+  <script type="module" crossorigin src="/admin/assets/index-CzLjRij_.js"></script>
  <link rel="stylesheet" crossorigin href="/admin/assets/index-GxkWX7v3.css">
 </head>
 <body>
@@ -39,6 +39,7 @@ export const api = {
  stats: () => apiFetch('/admin/api/stats'),
  health: () => apiFetch('/admin/api/health-indicators'),
  agents: () => apiFetch('/admin/api/agents'),
+  sources: () => apiFetch('/admin/api/sources'),
  requests: (page = 1, qs = '') => apiFetch(`/admin/api/requests?page=${page}${qs}`),
  apiKeys: () => apiFetch('/admin/api/api-keys'),
  createApiKey: (name: string) => apiFetch('/admin/api/api-keys', { method: 'POST', body: JSON.stringify({ name }) }),
@@ -23,9 +23,16 @@ interface Agent {
  total_requests: number;
  requests_today: number;
  token_ttl: number | null;
+  source_id: string | null;
+  federated_read: string[] | null;
  status: 'active' | 'revoked';
 }

+interface SourceOption {
+  id: string;
+  name: string | null;
+}
+
 interface ApiKey {
  id: string;
  name: string;
@@ -88,6 +95,7 @@ export function AgentsPage() {
                <th>Name</th>
                <th>Type</th>
                <th>Scopes</th>
+                <th>Source</th>
                <th>Status</th>
                <th>Requests</th>
                <th>Last Used</th>
@@ -108,6 +116,9 @@ export function AgentsPage() {
                      <span key={s} className={`badge badge-${s}`} style={{ marginRight: 4 }}>{s}</span>
                    ))}
                  </td>
+                  <td className="mono" style={{ fontSize: 12, color: 'var(--text-secondary)' }}>
+                    {a.auth_type === 'oauth' ? (a.source_id || 'default') : 'all'}
+                  </td>
                  <td>
                    <span className={`badge ${a.status === 'active' ? 'badge-success' : 'badge-danger'}`}>{a.status}</span>
                  </td>
@@ -257,9 +268,29 @@ function RegisterModal({ onClose, onRegistered }: {
    Object.fromEntries(ALLOWED_SCOPES_LIST.map(s => [s, s === 'read'])) as Record<Scope, boolean>,
  );
  const [ttl, setTtl] = useState('86400'); // 24h default
+  const [redirectUris, setRedirectUris] = useState('');
+  const [sources, setSources] = useState<SourceOption[]>([{ id: 'default', name: 'default' }]);
+  const [sourceId, setSourceId] = useState('default');
+  const [readSources, setReadSources] = useState<Record<string, boolean>>({ default: true });
  const [loading, setLoading] = useState(false);
  const [error, setError] = useState('');

+  useEffect(() => {
+    api.sources()
+      .then((rows: SourceOption[]) => {
+        const nextSources = rows.length > 0 ? rows : [{ id: 'default', name: 'default' }];
+        const nextSourceId = nextSources.some(s => s.id === sourceId) ? sourceId : nextSources[0].id;
+        setSources(nextSources);
+        setSourceId(nextSourceId);
+        setReadSources(prev => {
+          const next = Object.fromEntries(nextSources.map(s => [s.id, Boolean(prev[s.id])])) as Record<string, boolean>;
+          next[nextSourceId] = true;
+          return next;
+        });
+      })
+      .catch(() => {});
+  }, []);
+
  const ttlOptions = [
    { label: '1 hour', value: '3600' },
    { label: '24 hours', value: '86400' },
@@ -277,11 +308,24 @@ function RegisterModal({ onClose, onRegistered }: {
    try {
      // Use the CLI registration endpoint (POST to admin API)
      const selectedScopes = Object.entries(scopes).filter(([, v]) => v).map(([k]) => k).join(' ');
+      const federatedRead = sources.map(s => s.id).filter(id => readSources[id]);
+      if (federatedRead.length === 0) { setError('Select at least one read source'); setLoading(false); return; }
+      // #1036: redirect URIs, one per line. Mirrors the CLI convention
+      // (src/commands/auth.ts): presence of redirect URIs implies
+      // authorization_code + refresh_token grants unless the user had none.
+      const uris = redirectUris.split('\n').map(u => u.trim()).filter(Boolean);
      const res = await fetch('/admin/api/register-client', {
        method: 'POST',
        credentials: 'same-origin',
        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ name: name.trim(), scopes: selectedScopes, tokenTtl: ttl === '0' ? 315360000 : Number(ttl) }),
+        body: JSON.stringify({
+          name: name.trim(),
+          scopes: selectedScopes,
+          tokenTtl: ttl === '0' ? 315360000 : Number(ttl),
+          source_id: sourceId,
+          federated_read: federatedRead,
+          ...(uris.length > 0 ? { redirectUris: uris, grantTypes: ['authorization_code', 'refresh_token'] } : {}),
+        }),
      });
      if (!res.ok) throw new Error('Registration failed');
      const data = await res.json();
@@ -312,6 +356,42 @@ function RegisterModal({ onClose, onRegistered }: {
            ))}
          </div>
        </div>
+        <div style={{ marginBottom: 16 }}>
+          <label>Write Source</label>
+          <select value={sourceId} onChange={e => {
+            const id = e.target.value;
+            setSourceId(id);
+            setReadSources(p => ({ ...p, [id]: true }));
+          }}
+            style={{ width: '100%', background: 'var(--bg-secondary)', color: 'var(--text-primary)', border: '1px solid var(--border)', borderRadius: 6, padding: '6px 10px', fontSize: 14 }}>
+            {sources.map(s => <option key={s.id} value={s.id}>{s.name && s.name !== s.id ? `${s.id} (${s.name})` : s.id}</option>)}
+          </select>
+        </div>
+        <div style={{ marginBottom: 16 }}>
+          <label>Read Sources</label>
+          <div className="checkbox-group">
+            {sources.map(s => (
+              <label key={s.id} className="checkbox-label">
+                <input
+                  type="checkbox"
+                  checked={Boolean(readSources[s.id])}
+                  onChange={e => setReadSources(p => ({ ...p, [s.id]: e.target.checked }))}
+                />
+                {s.name && s.name !== s.id ? `${s.id} (${s.name})` : s.id}
+              </label>
+            ))}
+          </div>
+        </div>
+        <div style={{ marginBottom: 16 }}>
+          <label>Redirect URIs <span style={{ color: 'var(--text-secondary)', fontWeight: 400 }}>(optional, one per line — enables authorization_code flow)</span></label>
+          <textarea
+            placeholder={'https://example.com/callback'}
+            value={redirectUris}
+            onChange={e => setRedirectUris(e.target.value)}
+            rows={2}
+            style={{ width: '100%', background: 'var(--bg-secondary)', color: 'var(--text-primary)', border: '1px solid var(--border)', borderRadius: 6, padding: '6px 10px', fontSize: 13, fontFamily: 'inherit', resize: 'vertical' }}
+          />
+        </div>
        <div style={{ marginBottom: 20 }}>
          <label>Token Lifetime</label>
          <select value={ttl} onChange={e => setTtl(e.target.value)}
@@ -528,6 +608,8 @@ function AgentDrawer({ agent, onClose, onRevoked }: { agent: Agent; onClose: ()
      client_name: agentName,
      auth_type: agent.auth_type,
      scope: agent.scope,
+      source_id: agent.source_id,
+      federated_read: agent.federated_read,
    }, null, 2),
  };

@@ -547,6 +629,10 @@ function AgentDrawer({ agent, onClose, onRevoked }: { agent: Agent; onClose: ()
          <span>{(agent.scope || '').split(' ').filter(Boolean).map(s => (
            <span key={s} className={`badge badge-${s}`} style={{ marginRight: 4 }}>{s}</span>
          ))}</span>
+          <span style={{ color: 'var(--text-secondary)' }}>Write Source</span>
+          <span className="mono">{agent.source_id || (isOAuth ? 'default' : 'all')}</span>
+          <span style={{ color: 'var(--text-secondary)' }}>Read Sources</span>
+          <span className="mono">{isOAuth ? (agent.federated_read && agent.federated_read.length > 0 ? agent.federated_read.join(', ') : (agent.source_id || 'default')) : 'all'}</span>
          <span style={{ color: 'var(--text-secondary)' }}>Registered</span>
          <span>{new Date(agent.created_at).toLocaleDateString()}</span>
          <span style={{ color: 'var(--text-secondary)' }}>Token TTL</span>
@@ -1,13 +1,13 @@
 // AUTO-GENERATED — do not edit by hand.
 // Run `bun run scripts/build-admin-embedded.ts` to regenerate.
-// Source: admin/dist/ at 2026-05-27.
+// Source: admin/dist/ at 2026-07-21.
 //
 // Bun resolves the file: imports to a path that works at runtime even
 // inside a compiled binary (`bun build --compile`). The manifest maps
 // the request path the express handler sees to (resolved-path, mime).

 // @ts-ignore — type: 'file' is Bun ESM, not in lib.d.ts
-import A_0_assets_index_CoGEje3__js from '../admin/dist/assets/index-CoGEje3-.js' with { type: 'file' };
+import A_0_assets_index_CzLjRij__js from '../admin/dist/assets/index-CzLjRij_.js' with { type: 'file' };
 // @ts-ignore — type: 'file' is Bun ESM, not in lib.d.ts
 import A_1_assets_index_GxkWX7v3_css from '../admin/dist/assets/index-GxkWX7v3.css' with { type: 'file' };
 // @ts-ignore — type: 'file' is Bun ESM, not in lib.d.ts
@@ -19,7 +19,7 @@ export interface AdminAsset {
 }

 export const ADMIN_ASSETS: Record<string, AdminAsset> = {
-  "/admin/assets/index-CoGEje3-.js": { path: A_0_assets_index_CoGEje3__js as unknown as string, mime: "application/javascript; charset=utf-8" },
+  "/admin/assets/index-CzLjRij_.js": { path: A_0_assets_index_CzLjRij__js as unknown as string, mime: "application/javascript; charset=utf-8" },
  "/admin/assets/index-GxkWX7v3.css": { path: A_1_assets_index_GxkWX7v3_css as unknown as string, mime: "text/css; charset=utf-8" },
  "/admin/index.html": { path: A_2_index_html as unknown as string, mime: "text/html; charset=utf-8" },
 };
@@ -39,6 +39,7 @@ import * as db from '../core/db.ts';
 import { sqlQueryForEngine, executeRawJsonb } from '../core/sql-query.ts';
 import { MinionQueue } from '../core/minions/queue.ts';
 import { isRetryableError } from '../core/retry-matcher.ts';
+import { normalizeAdminClientSourceScope } from '../core/admin-source-scope.ts';
 import {
  computeContentHash,
  validateIngestionEvent,
@@ -1086,6 +1087,7 @@ export async function runServeHttp(engine: BrainEngine, options: ServeHttpOption
      const oauthClients = await sql`
        SELECT c.client_id as id, c.client_name as name, 'oauth' as auth_type,
          c.grant_types, c.scope, c.created_at, c.token_ttl,
+          c.source_id, c.federated_read,
          CASE WHEN c.deleted_at IS NOT NULL THEN 'revoked' ELSE 'active' END as status,
          (SELECT max(created_at) FROM mcp_request_log WHERE token_name = c.client_id) as last_used_at,
          (SELECT count(*)::int FROM mcp_request_log WHERE token_name = c.client_id) as total_requests,
@@ -1095,6 +1097,7 @@ export async function runServeHttp(engine: BrainEngine, options: ServeHttpOption
      const legacyKeys = await sql`
        SELECT a.id, a.name, 'api_key' as auth_type,
          '{"bearer"}' as grant_types, 'read write admin' as scope, a.created_at, null as token_ttl,
+          null as source_id, null as federated_read,
          CASE WHEN a.revoked_at IS NOT NULL THEN 'revoked' ELSE 'active' END as status,
          a.last_used_at,
          (SELECT count(*)::int FROM mcp_request_log WHERE token_name = a.name) as total_requests,
@@ -1107,6 +1110,17 @@ export async function runServeHttp(engine: BrainEngine, options: ServeHttpOption
    }
  });

+  app.get('/admin/api/sources', requireAdmin, async (_req: Request, res: Response) => {
+    try {
+      const sources = await engine.listAllSources({ includeArchived: false });
+      const options = sources.map(s => ({ id: s.id, name: s.name }));
+      if (!options.some(s => s.id === 'default')) options.unshift({ id: 'default', name: 'default' });
+      res.json(options);
+    } catch (e) {
+      res.status(503).json({ error: 'service_unavailable' });
+    }
+  });
+
  // v0.38 Slice 4 — per-OAuth-client agent spend viewer. Pre-computes today's
  // spend (committed + pending reservations) per client so the Agents tab
  // can render a "$X / $Y today" cell. Read-side endpoint only — no mutation.
@@ -1440,6 +1454,8 @@ export async function runServeHttp(engine: BrainEngine, options: ServeHttpOption
      // missing, empty) and rejects the rest with a structured 400.
      const { name, tokenTtl, grantTypes, redirectUris, tokenEndpointAuthMethod } = req.body;
      const rawScopes = (req.body as Record<string, unknown>).scopes ?? (req.body as Record<string, unknown>).scope;
+      const rawSourceId = (req.body as Record<string, unknown>).source_id ?? (req.body as Record<string, unknown>).sourceId;
+      const rawFederatedRead = (req.body as Record<string, unknown>).federated_read ?? (req.body as Record<string, unknown>).federatedRead;
      if (!name) { res.status(400).json({ error: 'Name required' }); return; }
      let scopeString: string;
      try {
@@ -1470,8 +1486,23 @@ export async function runServeHttp(engine: BrainEngine, options: ServeHttpOption
        });
        return;
      }
+      let sourceScope: ReturnType<typeof normalizeAdminClientSourceScope>;
+      try {
+        const sources = await engine.listAllSources({ includeArchived: false });
+        sourceScope = normalizeAdminClientSourceScope(
+          rawSourceId,
+          rawFederatedRead,
+          sources.map(s => s.id),
+        );
+      } catch (e) {
+        res.status(400).json({
+          error: 'invalid_source_scope',
+          message: e instanceof Error ? e.message : String(e),
+        });
+        return;
+      }
      const result = await oauthProvider.registerClientManual(
-        name, grants, scopeString, uris, 'default', undefined, validatedAuthMethod,
+        name, grants, scopeString, uris, sourceScope.sourceId, sourceScope.federatedRead, validatedAuthMethod,
      );
      // Set per-client TTL if specified
      if (tokenTtl && Number(tokenTtl) > 0) {
@@ -0,0 +1,51 @@
+import { isValidSourceId } from './source-id.ts';
+
+export interface AdminClientSourceScope {
+  sourceId: string;
+  federatedRead: string[];
+}
+
+function parseFederatedReadInput(raw: unknown, sourceId: string): string[] {
+  if (raw === undefined || raw === null) return [sourceId];
+  if (typeof raw === 'string') {
+    const values = raw.split(',').map(s => s.trim()).filter(Boolean);
+    return values.length > 0 ? values : [sourceId];
+  }
+  if (Array.isArray(raw)) {
+    if (!raw.every(v => typeof v === 'string')) {
+      throw new Error('federated_read must be an array of source ids');
+    }
+    const values = raw.map(v => v.trim()).filter(Boolean);
+    return values.length > 0 ? values : [sourceId];
+  }
+  throw new Error('federated_read must be a string or array');
+}
+
+export function normalizeAdminClientSourceScope(
+  rawSourceId: unknown,
+  rawFederatedRead: unknown,
+  availableSourceIds: string[],
+): AdminClientSourceScope {
+  const knownSources = new Set(availableSourceIds);
+  const fallbackSourceId = knownSources.has('default') ? 'default' : (availableSourceIds[0] ?? 'default');
+  const sourceId = rawSourceId === undefined || rawSourceId === null || rawSourceId === ''
+    ? fallbackSourceId
+    : rawSourceId;
+  if (!isValidSourceId(sourceId)) {
+    throw new Error(`Invalid source_id: ${JSON.stringify(sourceId)}`);
+  }
+  if (knownSources.size > 0 && !knownSources.has(sourceId)) {
+    throw new Error(`Unknown source_id: ${sourceId}`);
+  }
+
+  const federatedRead = Array.from(new Set(parseFederatedReadInput(rawFederatedRead, sourceId)));
+  for (const id of federatedRead) {
+    if (!isValidSourceId(id)) {
+      throw new Error(`Invalid federated_read source_id: ${JSON.stringify(id)}`);
+    }
+    if (knownSources.size > 0 && !knownSources.has(id)) {
+      throw new Error(`Unknown federated_read source_id: ${id}`);
+    }
+  }
+  return { sourceId, federatedRead };
+}
@@ -908,10 +908,6 @@ export const KNOWN_CONFIG_KEYS: readonly string[] = [
  'facts.extraction_model',
  // #2113: output-token cap for the per-turn facts extractor (default 4000).
  'facts.extraction_max_tokens',
-  // Owner opt-in: let the local stdio MCP pipe read this owner's private facts
-  // (find_trajectory / recall). Default off; HTTP transport ignores it. See
-  // src/core/facts/reader-trust.ts.
-  'facts.trust_local_reads',
  // Dream cycle config
  'dream.synthesize.session_corpus_dir',
  'dream.synthesize.meeting_transcripts_dir',
@@ -591,8 +591,6 @@ export interface TrajectoryOpts {
  sourceIds?: string[];
  /** When true, filters to visibility='world' only. Set by MCP layer from ctx.remote. */
  remote?: boolean;
-  /** Owner opt-in: read private facts despite `remote`. See facts/reader-trust.ts. */
-  trustedFactReads?: boolean;
  /** Metric filter. When set, only facts with this canonical metric label participate. */
  metric?: string;
  /**
@@ -17,7 +17,6 @@
 import type { OperationContext } from './../operations.ts';
 import type { FactRow } from './../engine.ts';
 import { effectiveConfidence } from './decay.ts';
-import { readableFactVisibilities } from './reader-trust.ts';

 const DEFAULT_TTL_MS = 30_000;
 const DEFAULT_TOP_K = 10;
@@ -51,13 +50,7 @@ export async function getBrainHotMemoryMeta(
  const sessionId = (ctx as { source_session?: string }).source_session
    ?? null;
  const allowListHash = hashAllowList(ctx.takesHoldersAllowList);
-  // Visibility tier: untrusted remote → world-only; trusted local +
-  // owner-trusted reads → all rows. Folded into the cache key (the header's
-  // "cache entries don't bleed across tiers" invariant): trustedFactReads is
-  // re-read from config per call, so a mid-session opt-out must not keep
-  // serving a private-inclusive cached payload for the TTL window.
-  const visibility = readableFactVisibilities(ctx);
-  const cacheKey = `${sourceId}::${sessionId ?? '_'}::${allowListHash}::${visibility ? 'world' : 'all'}`;
+  const cacheKey = `${sourceId}::${sessionId ?? '_'}::${allowListHash}`;

  const ttl = Math.max(1000, opts.ttlMs ?? DEFAULT_TTL_MS);
  const topK = Math.max(1, Math.min(opts.topK ?? DEFAULT_TOP_K, 25));
@@ -68,6 +61,10 @@ export async function getBrainHotMemoryMeta(
    return cached.payload;
  }

+  // Build a fresh payload. Visibility tier: remote → world-only;
+  // local → all rows.
+  const visibility = ctx.remote === false ? undefined : ['world'] as ('world' | 'private')[];
+
  let rows: FactRow[] = [];
  if (sessionId) {
    rows = await ctx.engine.listFactsBySession(sourceId, sessionId, {
@@ -1,48 +0,0 @@
-/**
- * Fact-read visibility trust.
- *
- * Fact rows are tagged `private` | `world`. Remote/untrusted callers
- * (`remote === true`) see only `world` rows — the posture that keeps a
- * published or HTTP-served brain from leaking private claims to strangers.
- *
- * But the stdio MCP server is an unauthenticated LOCAL pipe: on a single-owner
- * machine the caller IS the owner, yet it still defaults `remote: true` for
- * safety, so the owner's own agent is denied the owner's own private facts
- * (e.g. `find_trajectory` returns empty over MCP even though the facts exist).
- *
- * `trustedFactReads` is a narrow, READ-ONLY trust elevation, deliberately
- * DECOUPLED from `remote` so every other remote protection — file_upload
- * confinement, source isolation, fence stripping, takes-holder scoping — stays
- * fully in force. The stdio MCP server sets it ONLY when the brain owner opts
- * in via the `facts.trust_local_reads` config (default off). The HTTP/published
- * transport never sets it, so a served brain stays world-only regardless.
- */
-export interface FactReaderTrust {
-  /**
-   * Mirrors OperationContext.remote. FAIL-CLOSED: anything not strictly
-   * `false` is treated as remote/untrusted (CLAUDE.md trust invariant).
-   */
-  remote?: boolean;
-  /** Owner opt-in: this remote caller may read private facts. */
-  trustedFactReads?: boolean;
-}
-
-/**
- * True when the reader is restricted to `visibility = 'world'` rows.
- * Fail-closed: an unset/undefined `remote` is untrusted — only an explicit
- * `remote: false` (trusted local CLI) or an explicit owner opt-in
- * (`trustedFactReads: true`) reads private rows.
- */
-export function factsWorldOnly(t: FactReaderTrust): boolean {
-  return t.remote !== false && t.trustedFactReads !== true;
-}
-
-/**
- * Visibility filter for list-style fact reads: `['world']` when the reader is
- * world-only, `undefined` (no filter — all rows) when it is trusted.
- */
-export function readableFactVisibilities(
-  t: FactReaderTrust,
-): ('private' | 'world')[] | undefined {
-  return factsWorldOnly(t) ? ['world'] : undefined;
-}
@@ -18,7 +18,6 @@ import { captureEvalCandidate, isEvalCaptureEnabled, isEvalScrubEnabled } from '
 import type { HybridSearchMeta } from './types.ts';
 import { extractPageLinks, isAutoLinkEnabled, isAutoTimelineEnabled, isGlobalBasenameEnabled, parseTimelineEntries, makeResolver, type UnresolvedFrontmatterRef } from './link-extraction.ts';
 import { isFactsBackstopEligible } from './facts/eligibility.ts';
-import { readableFactVisibilities } from './facts/reader-trust.ts';
 import { stripTakesFence } from './takes-fence.ts';
 import { stripFactsFence } from './facts-fence.ts';
 import { getContentFlag } from './quarantine.ts';
@@ -333,15 +332,6 @@ export interface OperationContext {
   * remote/untrusted (defense in depth in case the type is bypassed via cast).
   */
  remote: boolean;
-  /**
-   * Owner opt-in (`facts.trust_local_reads`): allow this remote caller to read
-   * `private` facts. A NARROW, read-only trust elevation decoupled from
-   * `remote` — every other remote protection (file confinement, source
-   * isolation, fence stripping, takes scoping) stays in force. Set ONLY by the
-   * stdio MCP server when the config is on; the HTTP transport never sets it.
-   * Consulted via `src/core/facts/reader-trust.ts`.
-   */
-  trustedFactReads?: boolean;
  /**
   * Subagent runtime context (v0.16+). Set by the subagent tool dispatcher when
   * dispatching an op as a tool call from an LLM loop. Used to enforce per-op
@@ -3639,7 +3629,6 @@ const find_trajectory: Operation = {
      entitySlug: p.entity_slug,
      ...scope,
      remote: ctx.remote === true,
-      trustedFactReads: ctx.trustedFactReads === true,
      metric,
      kind,
      since,
@@ -4000,9 +3989,13 @@ const recall: Operation = {
    const includeExpired = p.include_expired === true;
    const grep = typeof p.grep === 'string' ? p.grep.toLowerCase() : null;

-    // Visibility filter: world-only for untrusted remote callers; all rows for
-    // trusted local CLI and owner-trusted reads (facts.trust_local_reads).
-    const visibility = readableFactVisibilities(ctx);
+    // Visibility filter: remote callers see world-only unless their token
+    // grants elevated visibility (future-proofing; v0.31 ships world-only
+    // for remote, all for local CLI).
+    const visibility =
+      ctx.remote === false
+        ? undefined
+        : ['world'] as ('private' | 'world')[];

    let rows: Awaited<ReturnType<typeof ctx.engine.listFactsByEntity>> = [];

@@ -18,7 +18,6 @@ import type {
 } from './engine.ts';
 import { MAX_SEARCH_LIMIT, clampSearchLimit } from './engine.ts';
 import { withRetry, BULK_RETRY_OPTS, resolveBulkRetryOpts, computeNextDelay, type BatchAuditSite } from './retry.ts';
-import { factsWorldOnly } from './facts/reader-trust.ts';
 import { logBatchRetry as auditLogBatchRetry, logBatchExhausted as auditLogBatchExhausted } from './audit/batch-retry-audit.ts';
 import { runMigrations } from './migrate.ts';
 import { PGLITE_SCHEMA_SQL, getPGLiteSchema } from './pglite-schema.ts';
@@ -4319,10 +4318,7 @@ export class PGLiteEngine implements BrainEngine {
    const useArray = Array.isArray(opts.sourceIds) && opts.sourceIds.length > 0;
    const sourceIds = useArray ? opts.sourceIds! : null;
    const sourceId = opts.sourceId ?? 'default';
-    // Direct-engine contract: unset `remote` here means a trusted in-process
-    // caller (CLI/tests) — the fail-closed default lives in the op layer, which
-    // always passes explicit booleans. Normalize before the fail-closed helper.
-    const remoteFilter = factsWorldOnly({ remote: opts.remote === true, trustedFactReads: opts.trustedFactReads === true });
+    const remoteFilter = opts.remote === true;

    // Build SQL dynamically. PGLite uses $N positional params; we
    // assemble the WHERE clauses + params array in tandem to keep them
@@ -14,7 +14,6 @@ import type {
  SourceRow,
 } from './engine.ts';
 import { withRetry, BULK_RETRY_OPTS, resolveBulkRetryOpts, computeNextDelay, type BatchAuditSite } from './retry.ts';
-import { factsWorldOnly } from './facts/reader-trust.ts';
 import { logBatchRetry as auditLogBatchRetry, logBatchExhausted as auditLogBatchExhausted } from './audit/batch-retry-audit.ts';
 import type {
  DomainBankSampleOpts, CorpusSampleOpts, DomainBankRow,
@@ -4533,10 +4532,7 @@ export class PostgresEngine implements BrainEngine {
    const useArray = Array.isArray(opts.sourceIds) && opts.sourceIds.length > 0;
    const sourceIds = useArray ? opts.sourceIds! : null;
    const sourceId = opts.sourceId ?? 'default';
-    // Direct-engine contract: unset `remote` here means a trusted in-process
-    // caller (CLI/tests) — the fail-closed default lives in the op layer, which
-    // always passes explicit booleans. Normalize before the fail-closed helper.
-    const remoteFilter = factsWorldOnly({ remote: opts.remote === true, trustedFactReads: opts.trustedFactReads === true });
+    const remoteFilter = opts.remote === true;

    // Source-scope predicate: array path (federated) wins over scalar.
    // Engine.ts contract: returns chronological points; regressions +
@@ -30,13 +30,6 @@ export interface ToolResult {
 export interface DispatchOpts {
  /** Defaults to true (remote/untrusted). Local CLI callers (`gbrain call`) pass false. */
  remote?: boolean;
-  /**
-   * Owner opt-in (`facts.trust_local_reads`): let this remote caller read
-   * `private` facts. Set ONLY by the stdio MCP server; the HTTP transport
-   * leaves it unset so a served brain stays world-only. See
-   * `src/core/facts/reader-trust.ts`.
-   */
-  trustedFactReads?: boolean;
  /** Override the default stderr logger (e.g. CLI uses console.* directly). */
  logger?: OperationContext['logger'];
  /**
@@ -210,7 +203,6 @@ export function buildOperationContext(
    logger: opts.logger || stderrLogger,
    dryRun: !!params.dry_run,
    remote: opts.remote ?? true,
-    trustedFactReads: opts.trustedFactReads === true,
    takesHoldersAllowList: opts.takesHoldersAllowList,
    // v0.34 D4: sourceId is REQUIRED at the type level. Auto-fill 'default'
    // for single-source brains and any caller who didn't resolve a sourceId.
@@ -35,16 +35,6 @@ export async function startMcpServer(engine: BrainEngine) {
  // shape and cast through `any` (the SDK accepts it via the ServerResult union).
  server.setRequestHandler(CallToolRequestSchema, async (request: any): Promise<any> => {
    const { name, arguments: params } = request.params;
-    // Owner opt-in: the stdio pipe is local + unauthenticated, so on a
-    // single-owner machine its caller is the owner. When facts.trust_local_reads
-    // is on, let fact reads (find_trajectory / recall) see this owner's own
-    // private facts. Narrow + read-only — every other remote protection stays
-    // on (remote stays true). HTTP transport never sets this. Best-effort: a
-    // config read blip falls back to the safe world-only default.
-    let trustedFactReads = false;
-    try {
-      trustedFactReads = (await engine.getConfig('facts.trust_local_reads')) === 'true';
-    } catch { /* keep world-only default */ }
    // v0.28: stdio MCP has no per-token auth (local pipe). Default the
    // takes-holder allow-list to ['world'] so agent-facing callers don't
    // see private hunches via takes_list / takes_search / query. Operators
@@ -52,7 +42,6 @@ export async function startMcpServer(engine: BrainEngine) {
    // `gbrain call <op>` (sets remote=false in src/cli.ts).
    return dispatchToolCall(engine, name, params, {
      remote: true,
-      trustedFactReads,
      takesHoldersAllowList: ['world'],
      // v0.31: source defaults to 'default' for stdio (no per-token scope).
      // Operators who want a different source on stdio MCP should set
@@ -0,0 +1,44 @@
+import { describe, expect, test } from 'bun:test';
+import { normalizeAdminClientSourceScope } from '../src/core/admin-source-scope.ts';
+
+describe('admin register-client source scope normalization', () => {
+  const sources = ['default', 'team-a', 'team-b'];
+
+  test('defaults write and read scope to default source', () => {
+    expect(normalizeAdminClientSourceScope(undefined, undefined, sources)).toEqual({
+      sourceId: 'default',
+      federatedRead: ['default'],
+    });
+  });
+
+  test('accepts snake-case body fields with multiple read sources', () => {
+    expect(normalizeAdminClientSourceScope('team-a', ['team-a', 'team-b'], sources)).toEqual({
+      sourceId: 'team-a',
+      federatedRead: ['team-a', 'team-b'],
+    });
+  });
+
+  test('accepts comma-separated federated_read for API callers', () => {
+    expect(normalizeAdminClientSourceScope('team-a', 'team-b, default,team-b', sources)).toEqual({
+      sourceId: 'team-a',
+      federatedRead: ['team-b', 'default'],
+    });
+  });
+
+  test('falls back to selected write source when federated_read is empty', () => {
+    expect(normalizeAdminClientSourceScope('team-b', [], sources)).toEqual({
+      sourceId: 'team-b',
+      federatedRead: ['team-b'],
+    });
+  });
+
+  test('rejects malformed source ids before registration', () => {
+    expect(() => normalizeAdminClientSourceScope('../secret', undefined, sources)).toThrow(/Invalid source_id/);
+    expect(() => normalizeAdminClientSourceScope('team-a', ['snake_case'], sources)).toThrow(/Invalid federated_read/);
+  });
+
+  test('rejects valid-looking but unregistered source ids', () => {
+    expect(() => normalizeAdminClientSourceScope('ghost', undefined, sources)).toThrow(/Unknown source_id/);
+    expect(() => normalizeAdminClientSourceScope('team-a', ['ghost'], sources)).toThrow(/Unknown federated_read/);
+  });
+});
@@ -165,22 +165,6 @@ describe('findTrajectory — visibility filter (D-CDX-1 / R6)', () => {
    const all = await engine.findTrajectory({ entitySlug: 'traj-vis-default' });
    expect(all.length).toBe(2);
  });
-
-  test('remote=true + trustedFactReads bypasses world-only (owner-trusted reads)', async () => {
-    await insertTyped({ entity_slug: 'traj-vis-trusted', metric: 'mrr', value: 50000, visibility: 'private', valid_from: new Date('2026-01-15') });
-    await insertTyped({ entity_slug: 'traj-vis-trusted', metric: 'mrr', value: 99999, visibility: 'world',   valid_from: new Date('2026-04-12') });
-
-    // Untrusted remote: world only.
-    const untrusted = await engine.findTrajectory({ entitySlug: 'traj-vis-trusted', remote: true });
-    expect(untrusted.length).toBe(1);
-    expect(untrusted[0].value).toBe(99999);
-
-    // Owner-trusted remote: sees the private point too. remote stays true — only
-    // fact-read visibility is elevated.
-    const trusted = await engine.findTrajectory({ entitySlug: 'traj-vis-trusted', remote: true, trustedFactReads: true });
-    expect(trusted.length).toBe(2);
-    expect(trusted.map(p => p.value).sort((a, b) => (a! - b!))).toEqual([50000, 99999]);
-  });
 });

 describe('findTrajectory — metric + since + until filters', () => {
@@ -1,43 +0,0 @@
-import { describe, test, expect } from 'bun:test';
-import {
-  factsWorldOnly,
-  readableFactVisibilities,
-} from '../src/core/facts/reader-trust.ts';
-
-describe('factsWorldOnly', () => {
-  test('FAIL-CLOSED: unset remote is untrusted (world-only)', () => {
-    expect(factsWorldOnly({})).toBe(true);
-    expect(factsWorldOnly({ remote: undefined })).toBe(true);
-    expect(factsWorldOnly({ trustedFactReads: false })).toBe(true);
-  });
-
-  test('explicit remote=false (trusted local CLI) sees all', () => {
-    expect(factsWorldOnly({ remote: false })).toBe(false);
-    expect(factsWorldOnly({ remote: false, trustedFactReads: false })).toBe(false);
-  });
-
-  test('untrusted remote callers are world-only', () => {
-    expect(factsWorldOnly({ remote: true })).toBe(true);
-    expect(factsWorldOnly({ remote: true, trustedFactReads: false })).toBe(true);
-  });
-
-  test('owner-trusted remote reads bypass the world-only filter', () => {
-    expect(factsWorldOnly({ remote: true, trustedFactReads: true })).toBe(false);
-  });
-
-  test('trustedFactReads is a no-op for an already-trusted local caller', () => {
-    expect(factsWorldOnly({ remote: false, trustedFactReads: true })).toBe(false);
-  });
-});
-
-describe('readableFactVisibilities', () => {
-  test("world-only readers get the ['world'] filter (incl. unset remote)", () => {
-    expect(readableFactVisibilities({ remote: true })).toEqual(['world']);
-    expect(readableFactVisibilities({})).toEqual(['world']);
-  });
-
-  test('trusted readers get undefined (no filter — all rows)', () => {
-    expect(readableFactVisibilities({ remote: false })).toBeUndefined();
-    expect(readableFactVisibilities({ remote: true, trustedFactReads: true })).toBeUndefined();
-  });
-});
@@ -78,6 +78,8 @@ describe('v0.36.1.x #1077 — admin register-client supports PKCE public clients
    // (under either name) from req.body. Pin the fallback pattern so the
    // PKCE-fix regression contract stays load-bearing.
    expect(src).toMatch(/req\.body[^;]*scopes\s*\?\?\s*[^;]*scope\b/);
+    expect(src).toMatch(/req\.body[^;]*source_id\s*\?\?\s*[^;]*sourceId\b/);
+    expect(src).toMatch(/req\.body[^;]*federated_read\s*\?\?\s*[^;]*federatedRead\b/);
    // v0.41.3 (T4 atomicity fix, codex F4): admin endpoint now validates
    // tokenEndpointAuthMethod via the shared validator and passes it to
    // registerClientManual as a positional arg. Pre-v0.41.3 the route did
@@ -87,6 +89,7 @@ describe('v0.36.1.x #1077 — admin register-client supports PKCE public clients
    // UPDATE block (the regex deliberately asserts the post-insert UPDATE
    // is GONE).
    expect(src).toMatch(/validateTokenEndpointAuthMethod\(tokenEndpointAuthMethod\)/);
+    expect(src).toMatch(/normalizeAdminClientSourceScope\(/);
    expect(src).toMatch(/registerClientManual\([^)]*validatedAuthMethod[^)]*\)/);
    // Regression guard: post-insert UPDATE flipping client_secret_hash to
    // NULL based on a runtime check is exactly the non-atomic pattern T4
@@ -267,3 +270,26 @@ describe('v0.42.43.0 #2095 — volunteer-events sink + cycle purge wiring (struc
    expect(src).toMatch(/purged_volunteer_events_count/);
  });
 });
+
+describe('#1490 + #1036 — admin Register Agent form exposes source scope + redirect URIs', () => {
+  test('Agents.tsx RegisterModal sends source_id + federated_read in the POST body (#1490)', () => {
+    const src = readFileSync('admin/src/pages/Agents.tsx', 'utf8');
+    expect(src).toMatch(/source_id:\s*sourceId/);
+    expect(src).toMatch(/federated_read:\s*federatedRead/);
+    // The source list comes from the requireAdmin-gated endpoint, not a hardcoded 'default'.
+    expect(src).toMatch(/api\.sources\(\)/);
+  });
+
+  test('serve-http.ts serves /admin/api/sources behind requireAdmin (#1490)', () => {
+    const src = readFileSync('src/commands/serve-http.ts', 'utf8');
+    expect(src).toMatch(/app\.get\('\/admin\/api\/sources',\s*requireAdmin/);
+  });
+
+  test('Agents.tsx RegisterModal sends redirectUris + authorization_code grants when URIs are entered (#1036)', () => {
+    const src = readFileSync('admin/src/pages/Agents.tsx', 'utf8');
+    // One-per-line textarea split into an array...
+    expect(src).toMatch(/redirectUris\.split\('\\n'\)/);
+    // ...included in the body with the CLI's grant-type inference convention.
+    expect(src).toMatch(/redirectUris:\s*uris,\s*grantTypes:\s*\['authorization_code',\s*'refresh_token'\]/);
+  });
+});
@@ -125,6 +125,30 @@ describe('client registration', () => {
    expect(client!.client_name).toBe('test-agent');
  });

+  test('registerClientManual persists source_id and federated_read into AuthInfo', async () => {
+    await sql`
+      INSERT INTO sources (id, name) VALUES (${'team-a'}, ${'Team A'}), (${'team-b'}, ${'Team B'})
+      ON CONFLICT DO NOTHING
+    `;
+    const { clientId, clientSecret } = await provider.registerClientManual(
+      'source-scoped-test',
+      ['client_credentials'],
+      'read write',
+      [],
+      'team-a',
+      ['team-a', 'team-b'],
+    );
+
+    const tokens = await provider.exchangeClientCredentials(clientId, clientSecret!, 'read');
+    const authInfo = await provider.verifyAccessToken(tokens.access_token) as {
+      sourceId?: string;
+      allowedSources?: string[];
+    };
+
+    expect(authInfo.sourceId).toBe('team-a');
+    expect(authInfo.allowedSources).toEqual(['team-a', 'team-b']);
+  });
+
  test('getClient returns undefined for unknown client', async () => {
    const client = await provider.clientsStore.getClient('nonexistent');
    expect(client).toBeUndefined();