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-17 10:22:34 +00:00 · 2026-07-21 14:43:36 -07:00
8 changed files with 269 additions and 97 deletions
@@ -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 } : {}),
  };
 }

@@ -509,12 +509,8 @@ export function extractTimelineFromContent(content: string, slug: string): Extra
  // DB-level uniqueness cannot collapse.
  const citationPattern = /\[Source:\s*([^\]]+?),\s*(\d{4}-\d{2}-\d{2})\s*\]/g;
  const bulletLinePattern = /^-\s+\*\*\d{4}-\d{2}-\d{2}\*\*\s*\|/;
-  // Lines captured by Format 4 (plain bullet) are skipped for the same
-  // reason: quality.md mandates a trailing [Source: ...] on those bullets,
-  // and re-extracting the citation would double-count the event.
-  const plainBulletLinePattern = /^-\s+\d{4}-\d{2}-\d{2}\s*[—–-]/;
  for (const line of content.split(/\r?\n/)) {
-    if (bulletLinePattern.test(line) || plainBulletLinePattern.test(line)) continue;
+    if (bulletLinePattern.test(line)) continue;
    const lineMatches = [...line.matchAll(citationPattern)];
    if (lineMatches.length === 0) continue;
    // Strip every citation marker from the line to leave the annotated text.
@@ -530,19 +526,6 @@ export function extractTimelineFromContent(content: string, slug: string): Extra
    }
  }

-  // Format 4: Plain bullet — - YYYY-MM-DD — Summary
-  // This is the format gbrain's own enrich skill writes (no bold, no source
-  // pipe). Without it, every brain-authored timeline entry is invisible to
-  // extraction and timeline_coverage stays at 0%. Anchored at line start so a
-  // date inside a summary/link cannot start a spurious entry; a bold Format-1
-  // line (`- **…**`) cannot match here (a `*` follows the bullet, not a
-  // digit), and the citation loop above skips these lines, so a plain bullet
-  // carrying its own [Source: ...] files exactly one entry.
-  const plainBulletPattern = /^-\s+(\d{4}-\d{2}-\d{2})\s*[—–-]\s*(.+)$/gm;
-  while ((match = plainBulletPattern.exec(content)) !== null) {
-    entries.push({ slug, date: match[1], source: 'markdown', summary: match[2].trim() });
-  }
-
  return entries;
 }

@@ -1103,11 +1103,6 @@ export interface TimelineCandidate {
 // Match: `- **YYYY-MM-DD** | summary` or `- **YYYY-MM-DD** -- summary`
 // or `- **YYYY-MM-DD** - summary` or just `**YYYY-MM-DD** | summary`.
 const TIMELINE_LINE_RE = /^\s*-?\s*\*\*(\d{4}-\d{2}-\d{2})\*\*\s*[|\-–—]+\s*(.+?)\s*$/;
-// Plain bullet: `- YYYY-MM-DD — summary` (no bold, no source pipe). Kept in
-// sync with extractTimelineFromContent's Format 4 (the fs-source path).
-// Anchored flush-left so a date inside an indented continuation line cannot
-// start a spurious entry.
-const PLAIN_TIMELINE_LINE_RE = /^-\s+(\d{4}-\d{2}-\d{2})\s*[—–-]\s*(.+?)\s*$/;

 /**
 * Parse timeline entries from content. Looks at:
@@ -1124,7 +1119,7 @@ export function parseTimelineEntries(content: string): TimelineCandidate[] {

  let i = 0;
  while (i < lines.length) {
-    const m = TIMELINE_LINE_RE.exec(lines[i]) ?? PLAIN_TIMELINE_LINE_RE.exec(lines[i]);
+    const m = TIMELINE_LINE_RE.exec(lines[i]);
    if (!m) {
      i++;
      continue;
@@ -1141,7 +1136,7 @@ export function parseTimelineEntries(content: string): TimelineCandidate[] {
    let j = i + 1;
    while (j < lines.length) {
      const next = lines[j];
-      if (TIMELINE_LINE_RE.test(next) || PLAIN_TIMELINE_LINE_RE.test(next)) break;
+      if (TIMELINE_LINE_RE.test(next)) break;
      if (/^#{1,6}\s/.test(next)) break;
      if (next.trim().length === 0 && detailLines.length === 0) {
        // skip leading blank line; if we hit a blank after detail content
@@ -1171,7 +1166,7 @@ export function parseTimelineEntries(content: string): TimelineCandidate[] {
  // bullet pass are skipped (a bullet often carries its own citation).
  const citationRe = /\[Source:\s*([^\]]+?),\s*(\d{4}-\d{2}-\d{2})\s*\]/g;
  for (const line of lines) {
-    if (TIMELINE_LINE_RE.test(line) || PLAIN_TIMELINE_LINE_RE.test(line)) continue;
+    if (TIMELINE_LINE_RE.test(line)) continue;
    const matches = [...line.matchAll(citationRe)];
    if (matches.length === 0) continue;
    const summary = line
@@ -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,
@@ -185,49 +185,6 @@ describe('extractTimelineFromContent', () => {
    expect(entries).toHaveLength(1);
    expect(entries[0].summary).toBe('Landed the enterprise pilot with acme-example.');
  });
-
-  // Format 4: the plain bullet `- YYYY-MM-DD — Summary` that gbrain's own
-  // enrich skill writes. Before this was supported, every brain-authored
-  // timeline entry was invisible and timeline_coverage was stuck at 0%.
-  it('extracts plain bullet format (- YYYY-MM-DD — Summary)', () => {
-    const content = `## Timeline\n- 2026-06-01 — Catch-up call with alice-example; intros offered.`;
-    const entries = extractTimelineFromContent(content, 'people/alice-example');
-    expect(entries).toHaveLength(1);
-    expect(entries[0].date).toBe('2026-06-01');
-    expect(entries[0].source).toBe('markdown');
-    expect(entries[0].summary).toBe('Catch-up call with alice-example; intros offered.');
-  });
-
-  it('files exactly one entry for a plain bullet that carries its own citation', () => {
-    // quality.md mandates this shape; it must not double-count via the
-    // citation arm (Format 3) AND the plain-bullet arm (Format 4).
-    const content = `- 2026-05-31 — Confirmed full name. [Source: User, 2026-05-31]`;
-    const entries = extractTimelineFromContent(content, 'people/charlie-example');
-    expect(entries).toHaveLength(1);
-    expect(entries[0].date).toBe('2026-05-31');
-    expect(entries[0].source).toBe('markdown');
-    expect(entries[0].summary).toContain('Confirmed full name.');
-  });
-
-  it('does not double-count bold (Format 1) lines as plain bullets', () => {
-    const content = `- **2025-03-18** | Meeting — Discussed partnership`;
-    const entries = extractTimelineFromContent(content, 'test');
-    expect(entries).toHaveLength(1);
-    expect(entries[0].source).toBe('Meeting');
-  });
-
-  it('does not start a spurious entry from a date inside a summary', () => {
-    const content = `- 2026-06-01 — See [meeting](meetings/2026-06-01).`;
-    const entries = extractTimelineFromContent(content, 'people/alice-example');
-    expect(entries).toHaveLength(1);
-    expect(entries[0].date).toBe('2026-06-01');
-  });
-
-  it('handles en dash and hyphen separators in plain bullets', () => {
-    const content = `- 2026-06-01 – First\n- 2026-06-02 - Second`;
-    const entries = extractTimelineFromContent(content, 'test');
-    expect(entries).toHaveLength(2);
-  });
 });

 describe('walkMarkdownFiles', () => {
@@ -720,30 +720,6 @@ More prose here.
    const entries = parseTimelineEntries(content);
    expect(entries.length).toBe(2);
  });
-
-  // Plain bullet (extract.ts Format 4 parity — the db-source path must see
-  // the same entries as the fs-source path).
-  test('parses plain bullet: - YYYY-MM-DD — summary', () => {
-    const entries = parseTimelineEntries('## Timeline\n- 2026-06-01 — Catch-up call with alice-example');
-    expect(entries.length).toBe(1);
-    expect(entries[0].date).toBe('2026-06-01');
-    expect(entries[0].summary).toBe('Catch-up call with alice-example');
-  });
-
-  test('files exactly one entry for a plain bullet carrying its own citation', () => {
-    const entries = parseTimelineEntries('- 2026-05-31 — Confirmed full name. [Source: User, 2026-05-31]');
-    expect(entries.length).toBe(1);
-    expect(entries[0].date).toBe('2026-05-31');
-  });
-
-  test('skips invalid dates in plain bullets', () => {
-    expect(parseTimelineEntries('- 2026-13-45 — Bad date').length).toBe(0);
-  });
-
-  test('does not double-count a bold bullet as a plain bullet', () => {
-    const entries = parseTimelineEntries('- **2026-01-15** | Met with Alice');
-    expect(entries.length).toBe(1);
-  });
 });

 // ─── isAutoLinkEnabled ─────────────────────────────────────────
@@ -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']);
+  });
+});