fix(thin-client): keep ambient scope out of get_skill's non-scope source_id param

get_skill's source_id is a mode switch (host catalog vs brain-resident-pack
lookup), not a read-scope filter. Ambient GBRAIN_SOURCE / .gbrain-source
injection would silently reroute 'gbrain skill <name>' on thin clients to
getResidentSkillDetail. Exclude it via NON_SCOPE_SOURCE_ID_OPS; explicit
--source-id still passes through, explicit --source errors with a hint.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

src/cli.ts

@@ -24,6 +24,7 @@ import type { GBrainConfig } from './core/config.ts';
 import type { AIGatewayConfig } from './core/ai/types.ts';
 import type { BrainEngine } from './core/engine.ts';
 import { operations, OperationError } from './core/operations.ts';
+import { resolveSourceIdEngineFree } from './core/source-resolver.ts';
 import { formatVolunteeredPage } from './core/context/volunteer.ts';
 import type { Operation, OperationContext } from './core/operations.ts';
 import { shouldForceExitAfterMain, finishCliTeardown, flushThenExit, currentExitCode, setCliExitVerdict } from './core/cli-force-exit.ts';
@@ -382,6 +383,15 @@ async function main() {
     if (op.localOnly) {
       refuseThinClient(command, cfgPre!.remote_mcp!.mcp_url);
     }
+    // #2098: the local path resolves --source / GBRAIN_SOURCE / .gbrain-source
+    // inside makeContext (ctx.sourceId), which this route never reaches — so
+    // scope must be mapped onto the op's source_id wire param before the call.
+    try {
+      applyThinClientSourceScope(op, params);
+    } catch (e: unknown) {
+      console.error(e instanceof Error ? e.message : String(e));
+      process.exit(1);
+    }
     await runThinClientRouted(op, params, cfgPre!, cliOpts);
     return;
   }
@@ -802,6 +812,60 @@ export function parseOpArgs(op: Operation, args: string[]): Record<string, unkno
   return params;
 }
 
+/**
+ * #2098: thin-client source scoping. Locally, --source / GBRAIN_SOURCE /
+ * .gbrain-source resolve to ctx.sourceId in makeContext; the thin-client
+ * route short-circuits before that, so `gbrain query --source X` against a
+ * remote brain silently searched unscoped. This runs the engine-free tiers
+ * (flag → env → dotfile; the DB-backed tiers can't run without an engine —
+ * the server's grant scoping covers the rest) and maps the result onto the
+ * op's `source_id` wire param.
+ *
+ * Ops that declare their OWN `source` param (facts add, etc.) are left
+ * untouched — their --source is an op param, not scope. An explicit --source
+ * on an op with no source_id wire param throws (loud beats silent drop);
+ * ambient env/dotfile scope with nowhere to send it is ignored, matching the
+ * pre-fix behavior for non-scopeable ops. Exported for tests.
+ */
+// Ops whose `source_id` wire param is NOT read-scope semantics: get_skill's
+// source_id flips the lookup from host catalog to brain-resident-pack
+// (getResidentSkillDetail). Ambient env/dotfile scope must never leak into
+// these; an explicit --source-id still passes through untouched above.
+const NON_SCOPE_SOURCE_ID_OPS = new Set(['get_skill']);
+
+export function applyThinClientSourceScope(
+  op: Operation,
+  params: Record<string, unknown>,
+  cwd?: string,
+): void {
+  if ('source' in op.params) return; // the op owns --source; not a scope flag
+  const explicit = typeof params.source === 'string' && params.source.length > 0
+    ? (params.source as string)
+    : null;
+  delete params.source; // never a wire param on these ops — don't leak it
+  // Explicit per-call scope already on the wire wins over ambient tiers.
+  if (params.source_id !== undefined || params.all_sources === true) {
+    if (explicit) {
+      throw new Error('Pass either --source or --source-id/--all-sources, not both.');
+    }
+    return;
+  }
+  const resolved = resolveSourceIdEngineFree(explicit, cwd);
+  if (!resolved) return;
+  if (!('source_id' in op.params) || NON_SCOPE_SOURCE_ID_OPS.has(op.name)) {
+    if (explicit) {
+      const hint = NON_SCOPE_SOURCE_ID_OPS.has(op.name)
+        ? `(its source_id parameter is not a scope filter; pass --source-id explicitly if you mean it)`
+        : `(the remote op has no source_id parameter; the server scopes it to your grant)`;
+      throw new Error(
+        `gbrain ${op.cliHints?.name || op.name} does not accept --source on a thin-client install ${hint}.`,
+      );
+    }
+    return; // ambient env/dotfile scope with nowhere to send it
+  }
+  params.source_id = resolved;
+}
+
 async function makeContext(engine: BrainEngine, params: Record<string, unknown>): Promise<OperationContext> {
   // v0.31.8 (D11): resolve sourceId via the canonical 6-tier chain. Honors
   // --source / GBRAIN_SOURCE / .gbrain-source / path-match / brain default /

src/commands/calibration.ts

@@ -19,7 +19,7 @@
  */
 
 import type { BrainEngine } from '../core/engine.ts';
-import { resolveCalibrationHolder, runPhaseCalibrationProfile } from '../core/cycle/calibration-profile.ts';
+import { runPhaseCalibrationProfile } from '../core/cycle/calibration-profile.ts';
 import { sourceScopeOpts, type OperationContext } from '../core/operations.ts';
 import type { GBrainConfig } from '../core/config.ts';
 import { GBrainError } from '../core/types.ts';
@@ -167,7 +167,7 @@ export async function runCalibration(
   config: GBrainConfig,
 ): Promise<void> {
   const { opts } = parseArgs(args);
-  const holder = await resolveCalibrationHolder(engine, opts.holder);
+  const holder = opts.holder ?? 'garry';
   // Resolve --source / GBRAIN_SOURCE / .gbrain-source so the (now reachable, #2035)
   // calibration command targets the right source in a multi-source brain instead
   // of always reading `default`. No signal → 'default' (prior behavior).
@@ -253,14 +253,14 @@ export async function getCalibrationProfileOp(
   ctx: OperationContext,
   params: { holder?: string },
 ): Promise<CalibrationProfileRow | null> {
-  if (params.holder !== undefined && (typeof params.holder !== 'string' || params.holder.length === 0)) {
+  const holder = params.holder ?? 'garry';
+  if (typeof holder !== 'string' || holder.length === 0) {
     throw new GBrainError(
       'INVALID_HOLDER',
       'get_calibration_profile.holder must be a non-empty string',
-      'pass holder="<slug>" or omit to default to the calibration.user_holder config (then "garry")',
+      'pass holder="<slug>" or omit to default to "garry"',
     );
   }
-  const holder = await resolveCalibrationHolder(ctx.engine, params.holder);
   const scope = sourceScopeOpts(ctx);
   return getLatestProfile(ctx.engine, { holder, ...scope });
 }

src/core/config.ts

@@ -928,10 +928,6 @@ export const KNOWN_CONFIG_KEYS: readonly string[] = [
   // Emotional weight (v0.29)
   'emotional_weight.high_tags',
   'emotional_weight.user_holder',
-  // Calibration holder (#1726): persistent default for the nightly
-  // calibration_profile phase + `gbrain calibration`, symmetric with
-  // emotional_weight.user_holder. Falls back to 'garry' when unset.
-  'calibration.user_holder',
   // Cycle phase config
   'cycle.grade_takes.write_gstack_learnings',
   // Content sanity (v0.41)

src/core/cycle/calibration-profile.ts

@@ -96,7 +96,7 @@ export type PatternStatementsGenerator = (input: {
 export type BiasTagsGenerator = (patterns: string[]) => Promise<string[]>;
 
 export interface CalibrationProfileOpts extends BasePhaseOpts {
-  /** Holder to generate the profile for. Default: `calibration.user_holder` config, then 'garry'. */
+  /** Holder to generate the profile for. Default 'garry'. */
   holder?: string;
   /** Inject the patterns generator (tests). */
   patternsGenerator?: PatternStatementsGenerator;
@@ -194,26 +194,6 @@ export function parseBiasTagsOutput(raw: string): string[] {
     .slice(0, 4);
 }
 
-/**
- * #1726: resolve the calibration holder. Explicit param wins, then the
- * persistent `calibration.user_holder` config key (symmetric with
- * emotional_weight.user_holder), then the legacy 'garry' default. Fail-open:
- * a missing config table / mock engine without getConfig falls through.
- */
-export async function resolveCalibrationHolder(
-  engine: BrainEngine,
-  explicit?: string,
-): Promise<string> {
-  if (explicit) return explicit;
-  try {
-    const configured = await engine.getConfig('calibration.user_holder');
-    if (configured && configured.trim().length > 0) return configured.trim();
-  } catch {
-    // Config unavailable — use the legacy default.
-  }
-  return 'garry';
-}
-
 /** Pick the "loudest" pattern slot for the template fallback. */
 function pickFallbackSlots(scorecard: TakesScorecard): PatternStatementSlots {
   if (!scorecard || scorecard.resolved === 0) {
@@ -247,7 +227,7 @@ class CalibrationProfilePhase extends BaseCyclePhase {
     _ctx: OperationContext,
     opts: CalibrationProfileOpts,
   ): Promise<{ summary: string; details: Record<string, unknown>; status?: PhaseStatus }> {
-    const holder = await resolveCalibrationHolder(engine, opts.holder);
+    const holder = opts.holder ?? 'garry';
     const promptVersion = opts.promptVersion ?? CALIBRATION_PROFILE_PROMPT_VERSION;
     const modelId = opts.model ?? TIER_DEFAULTS.reasoning;
     const gradeCompletion = opts.gradeCompletion ?? 1.0;

src/core/extract-timeline-from-meetings.ts

@@ -68,14 +68,11 @@ export async function extractTimelineFromMeetings(
   // 1. Fetch all meeting pages (one round-trip).
   const sourceFilter = opts.sourceIdFilter ? `AND source_id = $1` : '';
   const meetingParams = opts.sourceIdFilter ? [opts.sourceIdFilter] : [];
-  // #2109: gbrain-base-v2's unify-types catch-all retypes meeting pages to
-  // `note` with frontmatter.legacy_type = 'meeting'. Match both spellings so
-  // the extractor keeps working on migrated (v2) brains, not just v1 ones.
   const meetings = await engine.executeRaw<MeetingRow>(
     `SELECT slug, source_id, title, effective_date, updated_at,
             compiled_truth, COALESCE(timeline, '') AS timeline
        FROM pages
-      WHERE (type = 'meeting' OR frontmatter ->> 'legacy_type' = 'meeting')
+      WHERE type = 'meeting'
         AND deleted_at IS NULL
         ${sourceFilter}
       ORDER BY effective_date DESC NULLS LAST, slug`,
@@ -97,7 +94,7 @@ export async function extractTimelineFromMeetings(
        JOIN pages pf ON pf.id = l.from_page_id
        JOIN pages pt ON pt.id = l.to_page_id
       WHERE l.link_type = 'attended'
-        AND (pf.type = 'meeting' OR pf.frontmatter ->> 'legacy_type' = 'meeting')
+        AND pf.type = 'meeting'
         AND pf.deleted_at IS NULL
         AND pt.deleted_at IS NULL`,
   );

src/core/operations.ts

@@ -4562,10 +4562,7 @@ const list_schema_packs: Operation = {
     const { existsSync, readdirSync } = await import('node:fs');
     const { join } = await import('node:path');
     const { gbrainPath } = await import('./config.ts');
-    // #1726: derive from the locator's registry instead of a hand-copied
-    // subset (which had frozen at 2 of 7 bundled packs).
-    const { BUNDLED_PACKS } = await import('./schema-pack/load-active.ts');
-    const bundled = [...BUNDLED_PACKS];
+    const bundled = ['gbrain-base', 'gbrain-recommended'];
     const installedDir = gbrainPath('schema-packs');
     const installed: string[] = [];
     if (existsSync(installedDir)) {

src/core/schema-pack/base/gbrain-base-v2.yaml

@@ -41,12 +41,6 @@ migration_from:
   pack: gbrain-base
   version: "1.x"
 
-# #2117 — cycle-phase participation. `phases:` is additive and pack-gated;
-# without this key extract_atoms is silently off on v2 brains even though
-# onboard + doctor recommend it (v2 declares the `atom` type it writes).
-phases:
-  - extract_atoms
-
 page_types:
   - name: person
     primitive: entity
@@ -325,10 +319,6 @@ page_types:
     extractable: false
     expert_routing: false
 
-# #2117 — inference rules ported from gbrain-base v1 so extract-ner keeps
-# working on v2 brains (it hard-skips with pack_unavailable when no
-# link_type declares an inference.regex). Same ReDoS-guarded sketch
-# regexes v1 ships; production matchers in link-extraction.ts still apply.
 link_types:
   - name: partner_of
     inverse: partner_of
@@ -338,24 +328,14 @@ link_types:
   - name: discusses
   - name: founded
     inverse: founded_by
-    inference:
-      regex: \b(founded|founder of|co-?founded|started)\b
   - name: works_at
     inverse: employs
-    inference:
-      regex: \b(works? at|employed by|works? for|joined|hired by|ceo of|cto of|cmo of)\b
   - name: invested_in
     inverse: investor_of
-    inference:
-      regex: \b(invested in|backed|seeded|funded|wrote a check)\b
   - name: sourced_from
   - name: derived_from
   - name: supersedes
   - name: redirects_to
-  # NOTE: v1's `attended` inference is page_type-bound to `meeting`, which
-  # v2 does not declare (lint: link_types_undeclared_page_type). Meeting
-  # pages retyped by unify-types are matched via frontmatter.legacy_type
-  # in extract-timeline-from-meetings (#2109) instead.
   - name: attended
     inverse: attended_by
   - name: authored

src/core/schema-pack/load-active.ts

@@ -91,33 +91,29 @@ export function _resetPackLocatorForTests(): void {
  * Returns null when the pack is not found. Callers handle null by
  * throwing UnknownPackError with a paste-ready install hint.
  */
-// v0.39 T8 — bundled packs registry. gbrain-base + gbrain-recommended
-// ship in src/core/schema-pack/base/. Add a new entry here to bundle
-// additional canonical packs.
-//
-// v0.41 T4 — lens packs join the bundle: creator (atoms + concepts +
-// extract_atoms/synthesize_concepts phases), investor (theses + bet
-// resolution + 3 calibration domains), engineer (gstack-learnings bridge
-// + 3 calibration domains), everything (meta-pack stacking all three
-// via extends + borrow_from). Each ships as a real YAML at base/<name>.yaml.
-//
-// #1726: exported so reporting surfaces (list_schema_packs) derive from the
-// same list the locator resolves — no more hand-copied 2-of-7 subsets.
-export const BUNDLED_PACKS: ReadonlyArray<string> = [
-  'gbrain-base',
-  'gbrain-recommended',
-  'gbrain-creator',
-  'gbrain-investor',
-  'gbrain-engineer',
-  'gbrain-everything',
-  // v0.42 type-unification: 15-type canonical successor to gbrain-base.
-  // Ships as install default (Lane E T17) + via gbrain onboard pack
-  // upgrade flow (the unify-types Minion handler).
-  'gbrain-base-v2',
-];
-
 function defaultPackLocator(name: string): string | null {
-  if (BUNDLED_PACKS.includes(name)) {
+  // v0.39 T8 — bundled packs registry. gbrain-base + gbrain-recommended
+  // ship in src/core/schema-pack/base/. Add a new entry here to bundle
+  // additional canonical packs.
+  //
+  // v0.41 T4 — lens packs join the bundle: creator (atoms + concepts +
+  // extract_atoms/synthesize_concepts phases), investor (theses + bet
+  // resolution + 3 calibration domains), engineer (gstack-learnings bridge
+  // + 3 calibration domains), everything (meta-pack stacking all three
+  // via extends + borrow_from). Each ships as a real YAML at base/<name>.yaml.
+  const BUNDLED: ReadonlyArray<string> = [
+    'gbrain-base',
+    'gbrain-recommended',
+    'gbrain-creator',
+    'gbrain-investor',
+    'gbrain-engineer',
+    'gbrain-everything',
+    // v0.42 type-unification: 15-type canonical successor to gbrain-base.
+    // Ships as install default (Lane E T17) + via gbrain onboard pack
+    // upgrade flow (the unify-types Minion handler).
+    'gbrain-base-v2',
+  ];
+  if (BUNDLED.includes(name)) {
     // Resolve bundled YAML relative to this source file. Works in both
     // direct-bun execution and bun --compile binaries.
     const here = dirname(fileURLToPath(import.meta.url));

src/core/source-resolver.ts

@@ -160,6 +160,33 @@ export async function resolveSourceId(
   return 'default';
 }
 
+/**
+ * Engine-free tiers (1-3) of the resolution chain: explicit flag →
+ * GBRAIN_SOURCE env → .gbrain-source dotfile walk. Used by the thin-client
+ * CLI path (#2098), which has no local engine to run tiers 4-6 or
+ * assertSourceExists against — the remote server enforces existence + grant.
+ * Returns null when no engine-free tier fires.
+ */
+export function resolveSourceIdEngineFree(
+  explicit: string | null | undefined,
+  cwd: string = process.cwd(),
+): string | null {
+  if (explicit) {
+    if (!SOURCE_ID_RE.test(explicit)) {
+      throw new Error(`Invalid --source value "${explicit}". Must match [a-z0-9-]{1,32}.`);
+    }
+    return explicit;
+  }
+  const env = process.env.GBRAIN_SOURCE;
+  if (env && env.length > 0) {
+    if (!SOURCE_ID_RE.test(env)) {
+      throw new Error(`Invalid GBRAIN_SOURCE value "${env}". Must match [a-z0-9-]{1,32}.`);
+    }
+    return env;
+  }
+  return readDotfileWalk(cwd);
+}
+
 /**
  * Returns the id of the SINGLE registered non-default source with a
  * local_path, when exactly one such row exists. Returns null when:

test/calibration-profile.test.ts

@@ -32,7 +32,7 @@ interface CapturedSql {
   params: unknown[];
 }
 
-function buildMockEngine(opts: { scorecard: TakesScorecard; config?: Record<string, string> }): {
+function buildMockEngine(opts: { scorecard: TakesScorecard }): {
   engine: BrainEngine;
   captured: CapturedSql[];
 } {
@@ -42,9 +42,6 @@ function buildMockEngine(opts: { scorecard: TakesScorecard; config?: Record<stri
     async getScorecard() {
       return opts.scorecard;
     },
-    async getConfig(key: string) {
-      return opts.config?.[key] ?? null;
-    },
     async executeRaw<T>(sql: string, params?: unknown[]): Promise<T[]> {
       captured.push({ sql, params: params ?? [] });
       return [];
@@ -244,36 +241,6 @@ describe('runPhaseCalibrationProfile — phase integration', () => {
     expect(insert!.params[11]).toEqual(['over-confident-geography']); // active_bias_tags
   });
 
-  test('#1726: calibration.user_holder config drives the holder when no explicit opt', async () => {
-    const { engine, captured } = buildMockEngine({
-      scorecard: ENOUGH_RESOLVED_SCORECARD,
-      config: { 'calibration.user_holder': 'alice-example' },
-    });
-    await runPhaseCalibrationProfile(buildCtx(engine), {
-      patternsGenerator: async () => ['You call early-stage tactics well — 8 of 10 held up.'],
-      biasTagsGenerator: async () => [],
-      voiceGateJudge: passJudge,
-    });
-    const insert = captured.find(c => c.sql.includes('INSERT INTO calibration_profiles'));
-    expect(insert).toBeDefined();
-    expect(insert!.params[1]).toBe('alice-example'); // holder from config
-  });
-
-  test('#1726: explicit holder opt wins over calibration.user_holder config', async () => {
-    const { engine, captured } = buildMockEngine({
-      scorecard: ENOUGH_RESOLVED_SCORECARD,
-      config: { 'calibration.user_holder': 'alice-example' },
-    });
-    await runPhaseCalibrationProfile(buildCtx(engine), {
-      holder: 'charlie-example',
-      patternsGenerator: async () => ['You call early-stage tactics well — 8 of 10 held up.'],
-      biasTagsGenerator: async () => [],
-      voiceGateJudge: passJudge,
-    });
-    const insert = captured.find(c => c.sql.includes('INSERT INTO calibration_profiles'));
-    expect(insert!.params[1]).toBe('charlie-example');
-  });
-
   test('default model is a provider-prefixed id, persisted to model_id (#2451)', async () => {
     const { engine, captured } = buildMockEngine({ scorecard: ENOUGH_RESOLVED_SCORECARD });
     const patternsGenerator: PatternStatementsGenerator = async () => [

test/extract-timeline-legacy-type.test.ts

@@ -1,106 +0,0 @@
-// #2109 — gbrain-base-v2's unify-types retypes meeting pages to `note`
-// with frontmatter.legacy_type='meeting'. extract-timeline-from-meetings
-// used to hardcode type='meeting' and silently scan 0 meetings on migrated
-// brains. These tests fail without the legacy_type fallback in both SQL
-// sites (meeting walk + attended-edge join).
-
-import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'bun:test';
-import { PGLiteEngine } from '../src/core/pglite-engine.ts';
-import { resetPgliteState } from './helpers/reset-pglite.ts';
-import { extractTimelineFromMeetings } from '../src/core/extract-timeline-from-meetings.ts';
-
-let engine: PGLiteEngine;
-
-beforeAll(async () => {
-  engine = new PGLiteEngine();
-  await engine.connect({});
-  await engine.initSchema();
-});
-
-afterAll(async () => {
-  await engine.disconnect();
-});
-
-beforeEach(async () => {
-  await resetPgliteState(engine);
-});
-
-async function insertPage(opts: {
-  slug: string;
-  type: string;
-  title: string;
-  effectiveDate?: string;
-  legacyType?: string;
-}): Promise<number> {
-  const frontmatterLiteral = opts.legacyType
-    ? `'{"legacy_type": "${opts.legacyType}"}'::jsonb`
-    : `'{}'::jsonb`;
-  const rows = await engine.executeRaw<{ id: number }>(
-    `INSERT INTO pages (slug, source_id, type, title, compiled_truth, timeline, effective_date, frontmatter)
-     VALUES ($1, 'default', $2, $3, '', '', $4, ${frontmatterLiteral})
-     RETURNING id`,
-    [opts.slug, opts.type, opts.title, opts.effectiveDate ?? null],
-  );
-  return rows[0]!.id;
-}
-
-describe('extractTimelineFromMeetings — legacy_type fallback (#2109)', () => {
-  it('scans pages retyped to note with legacy_type=meeting and walks their attended edges', async () => {
-    const meetingId = await insertPage({
-      slug: 'meetings/2026-01-05',
-      type: 'note', // post-unify-types shape on a gbrain-base-v2 brain
-      legacyType: 'meeting',
-      title: 'Weekly sync',
-      effectiveDate: '2026-01-05',
-    });
-    const personId = await insertPage({
-      slug: 'people/alice-example',
-      type: 'person',
-      title: 'Alice Example',
-    });
-    await engine.executeRaw(
-      `INSERT INTO links (from_page_id, to_page_id, link_type) VALUES ($1, $2, 'attended')`,
-      [meetingId, personId],
-    );
-
-    const result = await extractTimelineFromMeetings(engine);
-    expect(result.meetings_scanned).toBe(1);
-    expect(result.entries_created).toBe(1);
-    expect(result.entities_touched).toBe(1);
-    expect(result.batch_errors).toBe(0);
-  });
-
-  it('still scans pre-unify pages with type=meeting (v1 behavior preserved)', async () => {
-    const meetingId = await insertPage({
-      slug: 'meetings/2026-02-01',
-      type: 'meeting',
-      title: 'Board prep',
-      effectiveDate: '2026-02-01',
-    });
-    const personId = await insertPage({
-      slug: 'people/charlie-example',
-      type: 'person',
-      title: 'Charlie Example',
-    });
-    await engine.executeRaw(
-      `INSERT INTO links (from_page_id, to_page_id, link_type) VALUES ($1, $2, 'attended')`,
-      [meetingId, personId],
-    );
-
-    const result = await extractTimelineFromMeetings(engine);
-    expect(result.meetings_scanned).toBe(1);
-    expect(result.entries_created).toBe(1);
-  });
-
-  it('does not scan unrelated note pages without legacy_type=meeting', async () => {
-    await insertPage({
-      slug: 'notes/random',
-      type: 'note',
-      title: 'Random note',
-      effectiveDate: '2026-03-01',
-    });
-    const result = await extractTimelineFromMeetings(engine);
-    expect(result.meetings_scanned).toBe(0);
-    expect(result.entries_created).toBe(0);
-  });
-});

test/operations-schema-pack.test.ts

@@ -152,19 +152,6 @@ describe('list_schema_packs', () => {
       expect(result.installed).toContain('mine');
     });
   });
-
-  it('reports the full bundled registry, not a hand-copied subset (#1726)', async () => {
-    await withEnv({ GBRAIN_HOME: tmpDir }, async () => {
-      const { BUNDLED_PACKS } = await import('../src/core/schema-pack/load-active.ts');
-      const result = await operationsByName.list_schema_packs!.handler(ctxOf(), {}) as { bundled: string[] };
-      expect(result.bundled.slice().sort()).toEqual([...BUNDLED_PACKS].sort());
-      // The lens packs that declare extract_atoms/synthesize_concepts phases
-      // were the ones dropped by the frozen 2-pack literal.
-      for (const name of ['gbrain-creator', 'gbrain-everything', 'gbrain-base-v2']) {
-        expect(result.bundled).toContain(name);
-      }
-    });
-  });
 });
 
 // ── schema_stats ───────────────────────────────────────────────────────

test/schema-pack-base-v2-capabilities.test.ts

@@ -1,40 +0,0 @@
-// #2117 — gbrain-base-v2 shipped with no `phases:` declaration and zero
-// link_types[].inference regexes, so extract_atoms was silently pack-gated
-// off and extract-ner returned pack_unavailable on the bundled default pack.
-// These assertions fail against the pre-fix yaml.
-
-import { describe, expect, it } from 'bun:test';
-import { join } from 'node:path';
-import { loadPackFromFile } from '../src/core/schema-pack/loader.ts';
-import { linkTypesUndeclared } from '../src/core/schema-pack/lint-rules.ts';
-
-const V2_PATH = join(import.meta.dir, '..', 'src', 'core', 'schema-pack', 'base', 'gbrain-base-v2.yaml');
-
-describe('gbrain-base-v2 capability parity (#2117)', () => {
-  const manifest = loadPackFromFile(V2_PATH);
-
-  it('declares the extract_atoms cycle phase', () => {
-    expect(manifest.phases ?? []).toContain('extract_atoms');
-  });
-
-  it('ships at least one link_type inference regex so extract-ner is not pack_unavailable', () => {
-    // Mirrors the extract-ner hasRegex predicate exactly.
-    const hasRegex = manifest.link_types.some(
-      (lt) => lt.inference && typeof lt.inference === 'object' && 'regex' in lt.inference,
-    );
-    expect(hasRegex).toBe(true);
-  });
-
-  it('ports the v1 inference verbs it declares link types for', () => {
-    const withRegex = manifest.link_types
-      .filter((lt) => lt.inference?.regex)
-      .map((lt) => lt.name)
-      .sort();
-    expect(withRegex).toEqual(['founded', 'invested_in', 'works_at']);
-  });
-
-  it('inference rules pass the undeclared-page-type lint (no meeting-bound inference)', async () => {
-    const issues = await linkTypesUndeclared(manifest);
-    expect(issues).toEqual([]);
-  });
-});

test/thin-client-source-scope.test.ts

@@ -0,0 +1,142 @@
+/**
+ * #2098: thin-client routing dropped --source / GBRAIN_SOURCE / .gbrain-source.
+ *
+ * The local CLI path resolves source scope in makeContext (ctx.sourceId); the
+ * thin-client route short-circuits before that and sent params verbatim, so
+ * `gbrain query --source X` against a remote brain silently searched unscoped
+ * (the server op ignores the unknown `source` key).
+ *
+ * applyThinClientSourceScope runs the engine-free tiers (flag → env → dotfile)
+ * and maps the result onto the op's `source_id` wire param. These tests fail
+ * without the fix (params.source_id stays undefined / params.source leaks).
+ */
+
+import { describe, test, expect } from 'bun:test';
+import { mkdtempSync, rmSync, writeFileSync } from 'fs';
+import { join } from 'path';
+import { tmpdir } from 'os';
+import { applyThinClientSourceScope, parseOpArgs } from '../src/cli.ts';
+import { operationsByName } from '../src/core/operations.ts';
+import { withEnv } from './helpers/with-env.ts';
+
+const queryOp = operationsByName.query;
+
+describe('applyThinClientSourceScope (#2098)', () => {
+  test('--source maps onto the query op wire param source_id', async () => {
+    await withEnv({ GBRAIN_SOURCE: undefined }, () => {
+      const params = parseOpArgs(queryOp, ['find things', '--source', 'wiki']);
+      expect(params.source).toBe('wiki'); // pre-fix state: wrong key
+      applyThinClientSourceScope(queryOp, params, '/');
+      expect(params.source_id).toBe('wiki');
+      expect('source' in params).toBe(false); // never leaks the unknown key
+    });
+  });
+
+  test('GBRAIN_SOURCE env tier fires when no flag is passed', async () => {
+    await withEnv({ GBRAIN_SOURCE: 'gstack' }, () => {
+      const params = parseOpArgs(queryOp, ['find things']);
+      applyThinClientSourceScope(queryOp, params, '/');
+      expect(params.source_id).toBe('gstack');
+    });
+  });
+
+  test('.gbrain-source dotfile tier fires when flag and env are absent', async () => {
+    await withEnv({ GBRAIN_SOURCE: undefined }, () => {
+      const tmp = mkdtempSync(join(tmpdir(), 'gbrain-thin-scope-'));
+      try {
+        writeFileSync(join(tmp, '.gbrain-source'), 'essays\n');
+        const params = parseOpArgs(queryOp, ['find things']);
+        applyThinClientSourceScope(queryOp, params, tmp);
+        expect(params.source_id).toBe('essays');
+      } finally {
+        rmSync(tmp, { recursive: true, force: true });
+      }
+    });
+  });
+
+  test('explicit --source-id on the wire wins over ambient env scope', async () => {
+    await withEnv({ GBRAIN_SOURCE: 'gstack' }, () => {
+      const params = parseOpArgs(queryOp, ['find things', '--source-id', 'wiki']);
+      applyThinClientSourceScope(queryOp, params, '/');
+      expect(params.source_id).toBe('wiki');
+    });
+  });
+
+  test('--source together with --source-id is rejected loudly', async () => {
+    await withEnv({ GBRAIN_SOURCE: undefined }, () => {
+      const params = parseOpArgs(queryOp, ['q', '--source', 'a', '--source-id', 'b']);
+      expect(() => applyThinClientSourceScope(queryOp, params, '/')).toThrow(/not both/);
+    });
+  });
+
+  test('invalid --source value is rejected loudly', async () => {
+    await withEnv({ GBRAIN_SOURCE: undefined }, () => {
+      const params = parseOpArgs(queryOp, ['q', '--source', 'Bad_Value!']);
+      expect(() => applyThinClientSourceScope(queryOp, params, '/')).toThrow(/Invalid --source/);
+    });
+  });
+
+  test('--source on an op with no source_id wire param errors instead of silently dropping', async () => {
+    await withEnv({ GBRAIN_SOURCE: undefined }, () => {
+      const op = operationsByName.add_tag;
+      expect('source_id' in op.params).toBe(false);
+      const params = { slug: 'x', tag: 'y', source: 'wiki' };
+      expect(() => applyThinClientSourceScope(op, params, '/')).toThrow(/--source/);
+    });
+  });
+
+  test('ambient env scope on an op with no source_id wire param is ignored (no throw)', async () => {
+    await withEnv({ GBRAIN_SOURCE: 'wiki' }, () => {
+      const op = operationsByName.add_tag;
+      const params: Record<string, unknown> = { slug: 'x', tag: 'y' };
+      applyThinClientSourceScope(op, params, '/');
+      expect(params.source_id).toBeUndefined();
+    });
+  });
+
+  test('ops that declare their OWN source param are left untouched', async () => {
+    await withEnv({ GBRAIN_SOURCE: undefined }, () => {
+      const op = operationsByName.put_raw_data;
+      expect('source' in op.params).toBe(true);
+      const params: Record<string, unknown> = { slug: 'x', source: 'crustdata', data: {} };
+      applyThinClientSourceScope(op, params, '/');
+      expect(params.source).toBe('crustdata');
+      expect(params.source_id).toBeUndefined();
+    });
+  });
+
+  test('get_skill: ambient scope never leaks into its non-scope source_id param', async () => {
+    await withEnv({ GBRAIN_SOURCE: 'wiki' }, () => {
+      const op = operationsByName.get_skill;
+      expect('source_id' in op.params).toBe(true); // has the param, but it is a mode switch
+      const params: Record<string, unknown> = { name: 'ingest' };
+      applyThinClientSourceScope(op, params, '/');
+      expect(params.source_id).toBeUndefined(); // would flip host catalog → brain-pack lookup
+    });
+  });
+
+  test('get_skill: explicit --source errors instead of masquerading as --source-id', async () => {
+    await withEnv({ GBRAIN_SOURCE: undefined }, () => {
+      const op = operationsByName.get_skill;
+      const params: Record<string, unknown> = { name: 'ingest', source: 'wiki' };
+      expect(() => applyThinClientSourceScope(op, params, '/')).toThrow(/--source-id/);
+    });
+  });
+
+  test('get_skill: explicit --source-id passes through untouched', async () => {
+    await withEnv({ GBRAIN_SOURCE: 'gstack' }, () => {
+      const op = operationsByName.get_skill;
+      const params: Record<string, unknown> = { name: 'ingest', source_id: 'wiki' };
+      applyThinClientSourceScope(op, params, '/');
+      expect(params.source_id).toBe('wiki');
+    });
+  });
+
+  test('no scope from any tier leaves params unchanged', async () => {
+    await withEnv({ GBRAIN_SOURCE: undefined }, () => {
+      const params = parseOpArgs(queryOp, ['find things']);
+      applyThinClientSourceScope(queryOp, params, '/');
+      expect(params.source_id).toBeUndefined();
+    });
+  });
+});