fix(search): honor sources.config.federated in unqualified local CLI search/query (#2561 )

A source registered with `gbrain sources add --federated` was invisible to an unqualified `gbrain search`/`gbrain query`: the local CLI always emitted a scalar {sourceId} scope, and nothing on the read path ever consulted sources.config.federated — contradicting docs/guides/multi-source-brains.md ('Source participates in unqualified gbrain search results'). Fix, at the trusted-local boundary only: - src/cli.ts makeContext resolves the source WITH its tier and, when the tier is non-explicit (local_path / brain_default / sole_non_default / seed_default), computes ctx.localFederatedSourceIds = [resolved source, ...other config.federated=true sources] (archived excluded). - New federatedSearchScope (operations.ts) delegates to resolveRequestedScope, then widens an unqualified trusted-local scalar scope to that set. Used by the search + query handlers only. - Expansion NEVER applies when ctx.remote !== false (fail-closed source isolation), when a per-call source_id/__all__ is passed, when an OAuth grant (allowedSources) is present, or when --source/GBRAIN_SOURCE/dotfile named the source explicitly. Deliberately NOT inside sourceScopeOpts: code-intel ops reject multi-source scopes (resolveCodeIntelScope) and non-search reads keep their scalar behavior. Cache contamination is already handled — cacheScopeKey folds sourceIds sets into the query-cache key. Fixes #2561 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-08-16 01:42:23 +00:00 · 2026-07-21 14:43:36 -07:00
15 changed files with 327 additions and 330 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-CzLjRij_.js"></script>
+  <script type="module" crossorigin src="/admin/assets/index-CoGEje3-.js"></script>
  <link rel="stylesheet" crossorigin href="/admin/assets/index-GxkWX7v3.css">
 </head>
 <body>
@@ -39,7 +39,6 @@ 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,16 +23,9 @@ 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;
@@ -95,7 +88,6 @@ 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>
@@ -116,9 +108,6 @@ 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>
@@ -268,29 +257,9 @@ 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' },
@@ -308,24 +277,11 @@ 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),
-          source_id: sourceId,
-          federated_read: federatedRead,
-          ...(uris.length > 0 ? { redirectUris: uris, grantTypes: ['authorization_code', 'refresh_token'] } : {}),
-        }),
+        body: JSON.stringify({ name: name.trim(), scopes: selectedScopes, tokenTtl: ttl === '0' ? 315360000 : Number(ttl) }),
      });
      if (!res.ok) throw new Error('Registration failed');
      const data = await res.json();
@@ -356,42 +312,6 @@ 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)}
@@ -608,8 +528,6 @@ 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),
  };

@@ -629,10 +547,6 @@ 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-07-21.
+// Source: admin/dist/ at 2026-05-27.
 //
 // 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_CzLjRij__js from '../admin/dist/assets/index-CzLjRij_.js' with { type: 'file' };
+import A_0_assets_index_CoGEje3__js from '../admin/dist/assets/index-CoGEje3-.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-CzLjRij_.js": { path: A_0_assets_index_CzLjRij__js as unknown as string, mime: "application/javascript; charset=utf-8" },
+  "/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-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" },
 };
@@ -808,12 +808,20 @@ async function makeContext(engine: BrainEngine, params: Record<string, unknown>)
  // 'default'. Wrapped in try/catch so a doctor / single-source brain that
  // never set up sources still returns 'default' silently.
  let sourceId: string | undefined;
+  // #2561: when the source resolved via a NON-explicit tier (path-match /
+  // brain default / sole-non-default / seed default), unqualified search-shaped
+  // reads span every `config.federated = true` source. Computed here (the
+  // trusted local boundary) and consumed by federatedSearchScope in
+  // operations.ts, which additionally gates on ctx.remote === false.
+  let localFederated: string[] | undefined;
  try {
-    const { resolveSourceId } = await import('./core/source-resolver.ts');
+    const { resolveSourceWithTier, localFederatedSourceIds } = await import('./core/source-resolver.ts');
    // params.source is set when a CLI flag was parsed for the op (rare; most
    // CLI ops don't take --source). Falls through to env/dotfile/path-match.
    const explicit = (params.source as string | undefined) ?? null;
-    sourceId = await resolveSourceId(engine, explicit);
+    const resolved = await resolveSourceWithTier(engine, explicit);
+    sourceId = resolved.source_id;
+    localFederated = await localFederatedSourceIds(engine, resolved.source_id, resolved.tier);
  } catch {
    // Source resolution failed (e.g. sources table doesn't exist on a fresh
    // pre-init brain). Leave sourceId unset; engine read methods fall through
@@ -834,6 +842,7 @@ async function makeContext(engine: BrainEngine, params: Record<string, unknown>)
    // table). Matches dispatch.ts's auto-fill so the contract holds across
    // every transport.
    sourceId: sourceId ?? 'default',
+    ...(localFederated ? { localFederatedSourceIds: localFederated } : {}),
  };
 }

@@ -39,7 +39,6 @@ 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,
@@ -1087,7 +1086,6 @@ 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,
@@ -1097,7 +1095,6 @@ 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,
@@ -1110,17 +1107,6 @@ 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.
@@ -1454,8 +1440,6 @@ 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 {
@@ -1486,23 +1470,8 @@ 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, sourceScope.sourceId, sourceScope.federatedRead, validatedAuthMethod,
+        name, grants, scopeString, uris, 'default', undefined, validatedAuthMethod,
      );
      // Set per-client TTL if specified
      if (tokenTtl && Number(tokenTtl) > 0) {
@@ -1,51 +0,0 @@
-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 };
-}
@@ -424,6 +424,23 @@ export interface OperationContext {
   * satisfied even on single-source brains.
   */
  sourceId: string;
+  /**
+   * #2561 — federated read scope for UNQUALIFIED local CLI reads.
+   *
+   * Set ONLY by the local CLI's context builder (src/cli.ts makeContext), and
+   * only when the source resolved via a non-explicit tier (local_path /
+   * brain_default / sole_non_default / seed_default — NOT --source, NOT
+   * GBRAIN_SOURCE, NOT a .gbrain-source dotfile). Contains the resolved
+   * source first, then every other `config.federated = true` source, so an
+   * unqualified `gbrain search "X"` spans federated sources as
+   * docs/guides/multi-source-brains.md promises.
+   *
+   * Consumed exclusively by `federatedSearchScope` and ONLY when
+   * `ctx.remote === false` — a remote caller's scope stays governed by
+   * `ctx.auth.allowedSources` / scalar `ctx.sourceId` (source-isolation
+   * invariant, fail-closed).
+   */
+  localFederatedSourceIds?: string[];
 }

 /**
@@ -539,6 +556,45 @@ export function resolveRequestedScope(
  return sourceScopeOpts(ctx);
 }

+/**
+ * #2561 — source scope for the search-shaped read ops (`search`, `query`).
+ *
+ * Delegates to `resolveRequestedScope` (the single trust+grant resolver), then
+ * widens an UNQUALIFIED trusted-local scalar scope to the CLI-computed
+ * federated set (`ctx.localFederatedSourceIds`, resolved source first). This is
+ * what makes `sources add --federated` mean something for local search: a
+ * federated source participates in unqualified `gbrain search "X"` results.
+ *
+ * The expansion NEVER applies when:
+ *   - the caller is not strictly trusted-local (`ctx.remote !== false`) —
+ *     remote scope stays grant-governed (fail-closed source isolation);
+ *   - a per-call `source_id` was passed (explicit wins, including `__all__`);
+ *   - the resolver already produced a federated array (OAuth grant);
+ *   - the CLI resolved the source from an explicit signal (--source / env /
+ *     dotfile) — makeContext leaves `localFederatedSourceIds` unset then.
+ *
+ * Deliberately NOT inside `sourceScopeOpts`: code-intel ops collapse a
+ * multi-element scope to an error (`resolveCodeIntelScope`), and non-search
+ * reads (get_page, get_links, …) keep their long-standing scalar behavior.
+ */
+export function federatedSearchScope(
+  ctx: OperationContext,
+  sourceIdParam?: string,
+): { sourceId?: string; sourceIds?: string[] } {
+  const scope = resolveRequestedScope(ctx, sourceIdParam);
+  if (
+    ctx.remote === false &&
+    sourceIdParam === undefined &&
+    scope.sourceId !== undefined &&
+    scope.sourceIds === undefined &&
+    ctx.localFederatedSourceIds !== undefined &&
+    ctx.localFederatedSourceIds.length > 1
+  ) {
+    return { sourceIds: ctx.localFederatedSourceIds };
+  }
+  return scope;
+}
+
 /**
 * Code-intel adapter for `resolveRequestedScope`. Graph traversal
 * (code_callers/code_callees/code_blast/code_flow) is single-source by design —
@@ -1448,7 +1504,8 @@ const search: Operation = {
    const queryText = p.query as string;
    const limit = (p.limit as number) || 20;
    const offset = (p.offset as number) || 0;
-    const scope = sourceScopeOpts(ctx);
+    // #2561: unqualified trusted-local search spans federated sources.
+    const scope = federatedSearchScope(ctx);

    // T4/D5 — per-call mode honored ONLY for trusted/local callers so a remote
    // OAuth client can't escalate to the costly tokenmax bundle. Local + unknown
@@ -1610,7 +1667,9 @@ const query: Operation = {
    // is spread into BOTH the image-similarity searchVector path and the text
    // hybridSearch path below, so both honor the same grant.
    const sourceIdParam = typeof p.source_id === 'string' ? p.source_id : undefined;
-    const querySourceScope = resolveRequestedScope(ctx, sourceIdParam);
+    // #2561: unqualified trusted-local query spans federated sources (per-call
+    // source_id / remote grants still resolve through resolveRequestedScope).
+    const querySourceScope = federatedSearchScope(ctx, sourceIdParam);

    // v0.27.1: image-similarity branch. Bypasses hybridSearch (which is
    // text-only); embeds the image via embedMultimodal and runs a direct
@@ -353,6 +353,45 @@ export async function resolveSourceWithTier(
  return { source_id: 'default', tier: 'seed_default' };
 }

+/**
+ * #2561 — compute the federated read scope for an UNQUALIFIED local CLI call.
+ *
+ * `sources add --federated` promises that a `config.federated = true` source
+ * "participates in unqualified `gbrain search` results"
+ * (docs/guides/multi-source-brains.md). This helper turns that promise into a
+ * scope: given the resolved source and WHICH tier resolved it, return
+ * `[resolvedSource, ...other federated source ids]` — or `undefined` when the
+ * expansion must not apply:
+ *
+ *   - explicit tiers (`flag` / `env` / `dotfile`): the user named a source;
+ *     scalar scope stands (that IS the qualified case);
+ *   - no other federated source exists: keep the scalar fast path unchanged.
+ *
+ * Archived sources are excluded (same rationale as pickSoleNonDefaultSource);
+ * the archived column is v34+, so fall back to the un-archived query on older
+ * brains. Callers put the result on `OperationContext.localFederatedSourceIds`
+ * — consumed only by `federatedSearchScope` and only when `remote === false`.
+ */
+export async function localFederatedSourceIds(
+  engine: BrainEngine,
+  sourceId: string,
+  tier: SourceTier,
+): Promise<string[] | undefined> {
+  if (tier === 'flag' || tier === 'env' || tier === 'dotfile') return undefined;
+  let rows: Array<{ id: string }>;
+  try {
+    rows = await engine.executeRaw<{ id: string }>(
+      `SELECT id FROM sources WHERE config->>'federated' = 'true' AND archived = false ORDER BY id`,
+    );
+  } catch {
+    rows = await engine.executeRaw<{ id: string }>(
+      `SELECT id FROM sources WHERE config->>'federated' = 'true' ORDER BY id`,
+    );
+  }
+  const ids = [sourceId, ...rows.map((r) => r.id).filter((id) => id !== sourceId)];
+  return ids.length > 1 ? ids : undefined;
+}
+
 /** Exposed for tests. */
 export const __testing = {
  readDotfileWalk,
@@ -1,44 +0,0 @@
-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/);
-  });
-});
@@ -78,8 +78,6 @@ 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
@@ -89,7 +87,6 @@ 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
@@ -270,26 +267,3 @@ 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'\]/);
-  });
-});
@@ -0,0 +1,154 @@
+/**
+ * #2561 — sources.config.federated participates in UNQUALIFIED local CLI
+ * search/query.
+ *
+ * Pre-fix: the local CLI always emitted a scalar `{sourceId}` scope (required
+ * field, auto-filled 'default'), so a source registered with
+ * `gbrain sources add --federated` was invisible to an unqualified
+ * `gbrain search "X"` — contradicting docs/guides/multi-source-brains.md
+ * ("Source participates in unqualified `gbrain search` results").
+ *
+ * Fix: the CLI context builder computes `ctx.localFederatedSourceIds`
+ * (resolved source + every other federated source) whenever the source
+ * resolved via a NON-explicit tier; `federatedSearchScope` widens the scalar
+ * scope to that set for the `search` / `query` ops — trusted-local only
+ * (`ctx.remote === false`), never for remote callers, never when a per-call
+ * `source_id` or an explicit --source/env/dotfile was given.
+ */
+import { describe, test, expect, beforeAll, afterAll } from 'bun:test';
+import { PGLiteEngine } from '../src/core/pglite-engine.ts';
+import { localFederatedSourceIds } from '../src/core/source-resolver.ts';
+import {
+  federatedSearchScope,
+  operations,
+  type OperationContext,
+} from '../src/core/operations.ts';
+
+let engine: PGLiteEngine;
+const search = operations.find((o) => o.name === 'search')!;
+
+function ctxOf(overrides: Partial<OperationContext> = {}): OperationContext {
+  return {
+    engine: engine as any,
+    config: {} as any,
+    logger: console as any,
+    dryRun: false,
+    remote: false,
+    sourceId: 'default',
+    ...overrides,
+  };
+}
+
+beforeAll(async () => {
+  engine = new PGLiteEngine();
+  await engine.connect({});
+  await engine.initSchema();
+  // Seeded 'default' source is federated=true. Add:
+  //   wiki    — federated (must join unqualified search)
+  //   private — NOT federated (must stay invisible unless explicitly named)
+  //   oldnews — federated but archived (must stay excluded)
+  await engine.executeRaw(
+    `INSERT INTO sources (id, name, local_path, config) VALUES ('wiki', 'wiki', '/tmp/wiki', '{"federated": true}'::jsonb)`,
+  );
+  await engine.executeRaw(
+    `INSERT INTO sources (id, name, local_path, config) VALUES ('private', 'private', '/tmp/private', '{}'::jsonb)`,
+  );
+  await engine.executeRaw(
+    `INSERT INTO sources (id, name, local_path, config, archived) VALUES ('oldnews', 'oldnews', '/tmp/oldnews', '{"federated": true}'::jsonb, true)`,
+  );
+  const pages: Array<[slug: string, sourceId: string, where: string]> = [
+    ['notes/home', 'default', 'default'],
+    ['wiki/topic', 'wiki', 'wiki'],
+    ['private/topic', 'private', 'private'],
+    ['old/topic', 'oldnews', 'oldnews'],
+  ];
+  for (const [slug, sourceId, where] of pages) {
+    await engine.putPage(slug, {
+      type: 'note', title: `Topic in ${where}`, compiled_truth: `the zebra telescope in ${where}`, frontmatter: {},
+    }, { sourceId });
+    await engine.upsertChunks(slug, [
+      { chunk_index: 0, chunk_text: `the zebra telescope in ${where}`, chunk_source: 'compiled_truth' },
+    ], { sourceId });
+  }
+  // Keyword-only search path: no embedding provider needed in tests.
+  await engine.setConfig('search.mcp_keyword_only', 'true');
+}, 60_000);
+
+afterAll(async () => {
+  if (engine) await engine.disconnect();
+}, 60_000);
+
+describe('localFederatedSourceIds — CLI-side scope computation', () => {
+  test('non-explicit tier: resolved source first, then other federated, archived excluded', async () => {
+    expect(await localFederatedSourceIds(engine, 'default', 'seed_default')).toEqual(['default', 'wiki']);
+  });
+
+  test('non-federated resolved source still joins its own scope', async () => {
+    expect(await localFederatedSourceIds(engine, 'private', 'brain_default')).toEqual(['private', 'default', 'wiki']);
+  });
+
+  test('explicit tiers (--source / env / dotfile) never expand', async () => {
+    expect(await localFederatedSourceIds(engine, 'default', 'flag')).toBeUndefined();
+    expect(await localFederatedSourceIds(engine, 'default', 'env')).toBeUndefined();
+    expect(await localFederatedSourceIds(engine, 'default', 'dotfile')).toBeUndefined();
+  });
+
+  test('single federated source (the resolved one) keeps the scalar fast path', async () => {
+    const solo = { executeRaw: async () => [{ id: 'default' }] } as any;
+    expect(await localFederatedSourceIds(solo, 'default', 'seed_default')).toBeUndefined();
+  });
+});
+
+describe('federatedSearchScope — trust + explicitness matrix', () => {
+  test('trusted local + unqualified widens to the federated set', () => {
+    const ctx = ctxOf({ localFederatedSourceIds: ['default', 'wiki'] });
+    expect(federatedSearchScope(ctx)).toEqual({ sourceIds: ['default', 'wiki'] });
+  });
+
+  test('remote caller NEVER widens (fail-closed), even if the field is set', () => {
+    const ctx = ctxOf({ remote: true, localFederatedSourceIds: ['default', 'wiki'] });
+    expect(federatedSearchScope(ctx)).toEqual({ sourceId: 'default' });
+  });
+
+  test('per-call source_id wins over the federated set', () => {
+    const ctx = ctxOf({ localFederatedSourceIds: ['default', 'wiki'] });
+    expect(federatedSearchScope(ctx, 'wiki')).toEqual({ sourceId: 'wiki' });
+  });
+
+  test('per-call __all__ keeps the whole-brain semantics for trusted local', () => {
+    const ctx = ctxOf({ localFederatedSourceIds: ['default', 'wiki'] });
+    expect(federatedSearchScope(ctx, '__all__')).toEqual({});
+  });
+
+  test('a federated OAuth grant wins over the local set', () => {
+    const ctx = ctxOf({
+      localFederatedSourceIds: ['default', 'wiki'],
+      auth: { allowedSources: ['a', 'b'] } as OperationContext['auth'],
+    });
+    expect(federatedSearchScope(ctx)).toEqual({ sourceIds: ['a', 'b'] });
+  });
+
+  test('no local federated set → unchanged scalar scope', () => {
+    expect(federatedSearchScope(ctxOf())).toEqual({ sourceId: 'default' });
+  });
+});
+
+describe('search op — unqualified local search spans federated sources', () => {
+  test('federated source results appear; non-federated + archived stay invisible', async () => {
+    const ctx = ctxOf({
+      localFederatedSourceIds: await localFederatedSourceIds(engine, 'default', 'seed_default'),
+    });
+    const results = (await search.handler(ctx, { query: 'zebra telescope' })) as Array<{ slug: string }>;
+    const slugs = results.map((r) => r.slug);
+    expect(slugs).toContain('notes/home');
+    expect(slugs).toContain('wiki/topic'); // pre-#2561 this was missing
+    expect(slugs).not.toContain('private/topic');
+    expect(slugs).not.toContain('old/topic');
+  });
+
+  test('explicit source resolution (no federated set on ctx) stays single-source', async () => {
+    const results = (await search.handler(ctxOf(), { query: 'zebra telescope' })) as Array<{ slug: string }>;
+    const slugs = results.map((r) => r.slug);
+    expect(slugs).toEqual(['notes/home']);
+  });
+});
@@ -125,30 +125,6 @@ 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();