mirror of
https://github.com/garrytan/gbrain.git
synced 2026-07-27 21:19:18 +00:00
* fix(code-callers/callees): honor .gbrain-source pin via full source-resolution chain code-callers and code-callees called resolveDefaultSource directly, which only knew "1 source -> use it, else multiple_sources_ambiguous" and ignored the .gbrain-source pin (and env / local_path / brain_default / sole_non_default tiers). On a multi-source brain they errored even when a pin clearly selected one source, while code-def/code-refs "worked" only because they never scope by source at all. New shared helper resolveScopedSourceOrThrow(engine, cwd) in sources-ops.ts runs the full resolveSourceWithTier chain and applies the ambiguity guard ONLY when nothing matched (tier seed_default). Both commands route through it; an explicit --source/--all-sources still overrides. Adds source_id + scope to the JSON envelope, a stderr nudge on the sole_non_default tier (matches sync/import), a zero-result "try --all-sources" hint, and clean exit-2 handling for a bad pin. Tests: test/code-scoped-source-resolve.test.ts (8 helper cases incl. dotfile pin, env/brain_default/sole_non_default tiers, ambiguity, bad pin) and test/code-callers-pin.serial.test.ts (9 CLI-wiring cases via process.chdir). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(dream): run against postgres engines (skip filesystem-only phases when no checkout) gbrain dream hard-failed with "No brain directory found" on a postgres/Supabase brain with no local checkout, so the DB-only maintenance phases (notably resolve_symbol_edges, the call-graph builder) could never run. doctor even recommended `gbrain dream --source <id>`, a command that couldn't run. - dream.ts: resolveBrainDir returns string|null (order: --dir -> resolved source's local_path -> sync.repo_path -> null); runDream owns the both-null (no checkout AND no engine) exit 1. - cycle.ts: CycleOpts.brainDir is string|null; resolveSourceForDir null-tolerant; the 6 filesystem phases (lint/backlinks/sync/synthesize/extract/patterns) skip with reason 'no_brain_dir' when there's no checkout; DB phases run. cycleSourceId = opts.sourceId ?? resolveSourceForDir(...) scopes the per-source DB phases (extract_facts/extract_atoms/calibration) correctly even on a checkout-less brain (previously they scoped to 'default' while the cycle stamped the requested source fresh — a freshness stamp that lied). deriveStatus counts resolved/ambiguous edges as work so an edges-only cycle reports 'ok'. - jobs.ts: the autopilot-cycle handler passes null (not cwd '.') when no repo is configured, so the queued cycle follows the same no_brain_dir contract. Tests: test/dream-postgres.test.ts (8: null-brainDir path, --source scope regression, edges->ok, both-null exit) + test/jobs-autopilot-cycle-braindir.test.ts (1: handler passes null -> FS phases skip). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * chore: bump version and changelog (v0.41.38.0) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(review): scope dream brainDir to --source; null fallback for phase handlers; quarantine heavy PGLite tests Addresses pre-landing review findings (codex P1/P2): - dream.ts resolveBrainDir: when --source resolves but that source has no on-disk checkout, return null (DB-only) instead of falling through to the global sync.repo_path. That global path belongs to the default/unscoped brain; running FS phases against it while DB phases + the last_full_cycle_at stamp target the requested source mixed scopes (codex P1). Adds a regression test (--source repo-a + a configured global sync.repo_path → brain_dir null). - jobs.ts makePhaseHandler: fall back to null (not cwd '.') when no repo is configured, matching the autopilot-cycle handler + gbrain dream. A direct phase job (synthesize/patterns) on a checkout-less brain now skips FS phases as no_brain_dir instead of running against the worker cwd (codex P2). - Move dream-postgres + jobs-autopilot-cycle-braindir tests to *.serial.test.ts (they run full runCycle passes; the serial pass avoids parallel-shard PGLite cold-start contention). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * docs(todos): record v0.41.38.0 dream-postgres / source-pin follow-ups Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * docs: update CLAUDE.md Key Files for v0.41.38.0 (dream-postgres + source pin) - dream.ts entry: resolveBrainDir returns string|null; checkout-less postgres runs DB phases + skips FS phases (no_brain_dir); --source-with-no-checkout doesn't borrow a different source's global repo. - cycle.ts entry: CycleOpts.brainDir nullable; cycleSourceId per-source scope; deriveStatus counts edges; jobs.ts handlers pass null not '.'. - Regenerated llms-full.txt (bun run build:llms). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
246 lines
9.3 KiB
TypeScript
246 lines
9.3 KiB
TypeScript
/**
|
|
* v0.41.30.0 — code-callers / code-callees end-to-end source resolution (BUG 1).
|
|
*
|
|
* Serial (`*.serial.test.ts`) because it process.chdir()s into a temp dir
|
|
* holding a .gbrain-source pin — process.cwd() is process-global and races
|
|
* with parallel files. Drives the real runCodeCallers / runCodeCallees through
|
|
* their process.cwd()-based resolution, asserting:
|
|
* - a .gbrain-source pin resolves on a multi-source brain (no exit 2)
|
|
* - no pin + no flag + multi-source still errors (exit 2)
|
|
* - explicit --source overrides
|
|
* - A4: JSON envelope carries source_id + scope; --all-sources → null/'all'
|
|
* - A4: sole_non_default tier emits the stderr nudge
|
|
* - A5: zero-result implicit scope appends the "try --all-sources" hint
|
|
*
|
|
* PGLite in-memory, no DATABASE_URL.
|
|
*/
|
|
|
|
import { describe, test, expect, beforeAll, afterAll, beforeEach, afterEach, spyOn } from 'bun:test';
|
|
import { mkdtempSync, writeFileSync, rmSync } from 'fs';
|
|
import { join } from 'path';
|
|
import { tmpdir } from 'os';
|
|
import { PGLiteEngine } from '../src/core/pglite-engine.ts';
|
|
import { resetPgliteState } from './helpers/reset-pglite.ts';
|
|
import { withEnv } from './helpers/with-env.ts';
|
|
import { runCodeCallers } from '../src/commands/code-callers.ts';
|
|
import { runCodeCallees } from '../src/commands/code-callees.ts';
|
|
|
|
let engine: PGLiteEngine;
|
|
let origCwd: string;
|
|
|
|
beforeAll(async () => {
|
|
engine = new PGLiteEngine();
|
|
await engine.connect({});
|
|
await engine.initSchema();
|
|
origCwd = process.cwd();
|
|
});
|
|
|
|
afterAll(async () => {
|
|
await engine.disconnect();
|
|
});
|
|
|
|
beforeEach(async () => {
|
|
await resetPgliteState(engine);
|
|
});
|
|
|
|
afterEach(() => {
|
|
process.chdir(origCwd);
|
|
});
|
|
|
|
async function addSource(id: string, localPath: string | null): Promise<void> {
|
|
await engine.executeRaw(
|
|
`INSERT INTO sources (id, name, local_path, config, created_at)
|
|
VALUES ($1, $1, $2, '{}'::jsonb, NOW()) ON CONFLICT (id) DO NOTHING`,
|
|
[id, localPath],
|
|
);
|
|
}
|
|
|
|
function pinnedDir(sourceId: string): string {
|
|
const dir = mkdtempSync(join(tmpdir(), 'gbrain-pin-cli-'));
|
|
writeFileSync(join(dir, '.gbrain-source'), `${sourceId}\n`);
|
|
return dir;
|
|
}
|
|
|
|
/** Run fn with process.exit + console.log/error spied. Returns captured output
|
|
* + the exit code if process.exit was called (spied to throw an EXIT sentinel). */
|
|
async function capture(fn: () => Promise<void>): Promise<{ logs: string[]; errs: string[]; exitCode: number | null }> {
|
|
const logs: string[] = [];
|
|
const errs: string[] = [];
|
|
let exitCode: number | null = null;
|
|
const logSpy = spyOn(console, 'log').mockImplementation((m?: unknown) => { logs.push(String(m)); });
|
|
const errSpy = spyOn(console, 'error').mockImplementation((m?: unknown) => { errs.push(String(m)); });
|
|
const exitSpy = spyOn(process, 'exit').mockImplementation(((code?: number) => {
|
|
exitCode = code ?? 0;
|
|
throw new Error('EXIT');
|
|
}) as never);
|
|
try {
|
|
await fn();
|
|
} catch (e) {
|
|
if (!(e instanceof Error) || e.message !== 'EXIT') throw e;
|
|
} finally {
|
|
logSpy.mockRestore();
|
|
errSpy.mockRestore();
|
|
exitSpy.mockRestore();
|
|
}
|
|
return { logs, errs, exitCode };
|
|
}
|
|
|
|
describe('code-callers / code-callees — .gbrain-source pin (CLI wiring)', () => {
|
|
test('pin resolves on a multi-source brain: no exit 2, output names the pinned source', async () => {
|
|
await addSource('repo-a', '/fake/a');
|
|
await addSource('repo-b', '/fake/b');
|
|
const dir = pinnedDir('repo-a');
|
|
process.chdir(dir);
|
|
try {
|
|
const callers = await withEnv({ GBRAIN_SOURCE: undefined }, () =>
|
|
capture(() => runCodeCallers(engine, ['someSym', '--no-json'])));
|
|
expect(callers.exitCode).toBeNull(); // resolved, did NOT error
|
|
expect(callers.logs.join('\n')).toContain("repo-a");
|
|
|
|
const callees = await withEnv({ GBRAIN_SOURCE: undefined }, () =>
|
|
capture(() => runCodeCallees(engine, ['someSym', '--no-json'])));
|
|
expect(callees.exitCode).toBeNull();
|
|
expect(callees.logs.join('\n')).toContain("repo-a");
|
|
} finally {
|
|
rmSync(dir, { recursive: true, force: true });
|
|
}
|
|
});
|
|
|
|
test('no pin + no flag + multi-source → exit 2 (ambiguous preserved)', async () => {
|
|
await addSource('repo-a', '/fake/a');
|
|
await addSource('repo-b', '/fake/b');
|
|
const dir = mkdtempSync(join(tmpdir(), 'gbrain-nopin-cli-'));
|
|
process.chdir(dir);
|
|
try {
|
|
const callers = await withEnv({ GBRAIN_SOURCE: undefined }, () =>
|
|
capture(() => runCodeCallers(engine, ['someSym', '--no-json'])));
|
|
expect(callers.exitCode).toBe(2);
|
|
expect(callers.errs.join('\n')).toContain('--source');
|
|
|
|
const callees = await withEnv({ GBRAIN_SOURCE: undefined }, () =>
|
|
capture(() => runCodeCallees(engine, ['someSym', '--no-json'])));
|
|
expect(callees.exitCode).toBe(2);
|
|
} finally {
|
|
rmSync(dir, { recursive: true, force: true });
|
|
}
|
|
});
|
|
|
|
test('explicit --source overrides (even with a conflicting pin)', async () => {
|
|
await addSource('repo-a', '/fake/a');
|
|
await addSource('repo-b', '/fake/b');
|
|
const dir = pinnedDir('repo-a');
|
|
process.chdir(dir);
|
|
try {
|
|
const { logs, exitCode } = await withEnv({ GBRAIN_SOURCE: undefined }, () =>
|
|
capture(() => runCodeCallers(engine, ['someSym', '--source', 'repo-b', '--json'])));
|
|
expect(exitCode).toBeNull();
|
|
const env = JSON.parse(logs.join('\n'));
|
|
expect(env.source_id).toBe('repo-b');
|
|
expect(env.scope).toBe('single');
|
|
} finally {
|
|
rmSync(dir, { recursive: true, force: true });
|
|
}
|
|
});
|
|
|
|
test('A4: JSON envelope carries source_id + scope (resolved pin)', async () => {
|
|
await addSource('repo-a', '/fake/a');
|
|
await addSource('repo-b', '/fake/b');
|
|
const dir = pinnedDir('repo-a');
|
|
process.chdir(dir);
|
|
try {
|
|
const { logs } = await withEnv({ GBRAIN_SOURCE: undefined }, () =>
|
|
capture(() => runCodeCallers(engine, ['someSym', '--json'])));
|
|
const env = JSON.parse(logs.join('\n'));
|
|
expect(env.source_id).toBe('repo-a');
|
|
expect(env.scope).toBe('single');
|
|
expect(env.symbol).toBe('someSym');
|
|
} finally {
|
|
rmSync(dir, { recursive: true, force: true });
|
|
}
|
|
});
|
|
|
|
test('A4: --all-sources → source_id null, scope "all"', async () => {
|
|
await addSource('repo-a', '/fake/a');
|
|
await addSource('repo-b', '/fake/b');
|
|
const dir = mkdtempSync(join(tmpdir(), 'gbrain-all-cli-'));
|
|
process.chdir(dir);
|
|
try {
|
|
const { logs, exitCode } = await capture(() =>
|
|
runCodeCallers(engine, ['someSym', '--all-sources', '--json']));
|
|
expect(exitCode).toBeNull();
|
|
const env = JSON.parse(logs.join('\n'));
|
|
expect(env.source_id).toBeNull();
|
|
expect(env.scope).toBe('all');
|
|
} finally {
|
|
rmSync(dir, { recursive: true, force: true });
|
|
}
|
|
});
|
|
|
|
test('A4: sole_non_default tier emits the stderr nudge', async () => {
|
|
await addSource('repo-a', '/fake/a'); // default + one non-default w/ local_path
|
|
const dir = mkdtempSync(join(tmpdir(), 'gbrain-sole-cli-'));
|
|
process.chdir(dir);
|
|
try {
|
|
const { errs, exitCode } = await withEnv(
|
|
{ GBRAIN_SOURCE: undefined, GBRAIN_NO_SOLE_NON_DEFAULT_NUDGE: undefined },
|
|
() => capture(() => runCodeCallers(engine, ['someSym', '--json'])));
|
|
expect(exitCode).toBeNull();
|
|
expect(errs.join('\n')).toContain("routing to source 'repo-a'");
|
|
} finally {
|
|
rmSync(dir, { recursive: true, force: true });
|
|
}
|
|
});
|
|
|
|
test('A4: dotfile-pin tier does NOT emit the sole_non_default nudge', async () => {
|
|
await addSource('repo-a', '/fake/a');
|
|
await addSource('repo-b', '/fake/b');
|
|
const dir = pinnedDir('repo-a');
|
|
process.chdir(dir);
|
|
try {
|
|
const { errs } = await withEnv({ GBRAIN_SOURCE: undefined }, () =>
|
|
capture(() => runCodeCallers(engine, ['someSym', '--json'])));
|
|
expect(errs.join('\n')).not.toContain('routing to source');
|
|
} finally {
|
|
rmSync(dir, { recursive: true, force: true });
|
|
}
|
|
});
|
|
|
|
test('A5: zero-result implicit scope appends the "try --all-sources" hint', async () => {
|
|
await addSource('repo-a', '/fake/a');
|
|
await addSource('repo-b', '/fake/b');
|
|
const dir = pinnedDir('repo-a');
|
|
process.chdir(dir);
|
|
try {
|
|
// human output
|
|
const human = await withEnv({ GBRAIN_SOURCE: undefined }, () =>
|
|
capture(() => runCodeCallers(engine, ['someSym', '--no-json'])));
|
|
expect(human.logs.join('\n')).toContain('Try --all-sources');
|
|
|
|
// JSON hint field
|
|
const jsonRun = await withEnv({ GBRAIN_SOURCE: undefined }, () =>
|
|
capture(() => runCodeCallees(engine, ['someSym', '--json'])));
|
|
const env = JSON.parse(jsonRun.logs.join('\n'));
|
|
expect(env.count).toBe(0);
|
|
expect(env.hint).toContain('--all-sources');
|
|
} finally {
|
|
rmSync(dir, { recursive: true, force: true });
|
|
}
|
|
});
|
|
|
|
test('bad .gbrain-source pin → exit 2 with JSON error envelope', async () => {
|
|
await addSource('repo-a', '/fake/a');
|
|
await addSource('repo-b', '/fake/b');
|
|
const dir = pinnedDir('nonexistent-src');
|
|
process.chdir(dir);
|
|
try {
|
|
const { logs, exitCode } = await withEnv({ GBRAIN_SOURCE: undefined }, () =>
|
|
capture(() => runCodeCallers(engine, ['someSym', '--json'])));
|
|
expect(exitCode).toBe(2);
|
|
const env = JSON.parse(logs.join('\n'));
|
|
expect(env.error.code).toBe('invalid_source_pin');
|
|
} finally {
|
|
rmSync(dir, { recursive: true, force: true });
|
|
}
|
|
});
|
|
});
|