mirror of
https://github.com/garrytan/gbrain.git
synced 2026-07-27 21:19:18 +00:00
* v0.31.1 feat: get_brain_identity MCP op (Issue #734 prep) Lightweight read-scope op that returns {version, engine, page_count, chunk_count, last_sync_iso} for the thin-client identity banner. Reuses engine.getStats() — banner's 60s TTL cache (next commit) bounds frequency to ≤1/60s per CLI process. Banner-only op, no cliHints. Pinned by 9 tests in test/get-brain-identity.test.ts. Part of v0.31.1 fix for #734 (thin-client mode silently routing ~25 CLI commands to empty local PGLite). See plan at ~/.claude/plans/how-to-make-mcp-iterative-liskov.md. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * v0.31.1 feat: harden callRemoteTool error normalization + abort/timeout CDX-4 (Codex outside-voice finding): the previous callRemoteTool let plain Error escape — undici network errors, AbortError, JSON parse failures all bubbled untyped. Plan called for an exhaustive switch on RemoteMcpError.reason at the dispatcher; that contract was unsound. Hardening: - New CallRemoteToolOptions {timeoutMs?, signal?} (4th arg, optional). - buildAbortController composes external signal with timeout into a single signal threaded through the SDK transport's requestInit. - toRemoteMcpError funnel converts ANY thrown value to RemoteMcpError before re-raising; the outermost try/catch guarantees the contract. - RemoteMcpErrorReason exported as a stable union type. - RemoteMcpErrorDetail.kind ('timeout'|'aborted'|'unreachable') sub-tags network errors so the dispatcher can render the right hint. - RemoteMcpErrorDetail.code carries server-supplied error codes on tool_error (e.g. 'missing_scope') for pinpoint refusal hints. - extractToolErrorCode parses JSON envelopes first, falls back to substring detection for legacy server messages. All 13 existing mcp-client tests still pass. Typecheck clean. Part of v0.31.1 fix for #734. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * v0.31.1 feat: --timeout=Ns CLI flag for thin-client routed calls (ENG-4) New global flag --timeout that accepts ms / s / m / ms-suffix forms ("30s", "2m", "500ms", "500"). Default null = per-command default (30s for most ops, 180s for `think` per ENG-4). Plumbs through to callRemoteTool's AbortController via cliOpts.timeoutMs. Rejection cases (timeoutMs stays null, flag falls through): - --timeout=0 (must be positive) - --timeout=garbage (no parse) Pinned by 8 new tests in test/cli-options.test.ts (total 28 pass). Part of v0.31.1 fix for #734. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * v0.31.1 feat: thin-client routing seam in cli.ts (CDX-1) The keystone fix for Issue #734. Inserts the routing seam INSIDE the existing op-dispatch path in cli.ts:78-138 (per Codex finding CDX-1) — no parallel `src/core/thin-client/` module. Routing is a ~80-line conditional that runs BEFORE connectEngine() so thin-client installs never open the empty local PGLite. Architecture (CDX-1, CDX-4, ENG-2, ENG-4): - Existing arg parser, image-to-base64 transform, stdin handler, and required-param check run UNCHANGED before the routing branch. Zero duplicated parsers. - New runThinClientRouted(op, params, cfg, cliOpts) calls callRemoteTool with {timeoutMs, signal}; default 180s for `think`, 30s otherwise; --timeout flag overrides. - SIGINT abort threaded into AbortController → exit 130. - Exhaustive TS `never` switch on RemoteMcpError.reason produces canned, actionable user messages per failure mode (ENG-4 contract). - ENG-2 renderer parity: local-engine path runs JSON.parse(JSON.stringify()) on the result before formatResult, killing the Date/bigint/Buffer drift class without per-command renderer audit. - THIN_CLIENT_REFUSE_HINTS table replaces the generic refusal message with pinpoint hints (CDX-5 / cherry-pick A). Adds dream/transcripts/storage to the refused set with their own hints. - localOnly ops on thin-client refuse via refuseThinClient (with hint). Pinned by 14 cli-dispatch-thin-client tests (all pass). Typecheck clean. Part of v0.31.1 fix for #734. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * v0.31.1 feat: thin-client identity banner (cherry-pick B) Prints "[thin-client → wintermute.fly.dev:3131 · brain: 102k pages, 265k chunks · v0.31.1]" to stderr before each routed command. Kills the "am I empty?" confusion that drove the original Hermes/Neuromancer report against wintermute (102k pages → empty CLI search results). Cache: 60s TTL, in-memory Map keyed by mcp_url so switching hosts via `gbrain init` invalidates cleanly. Cross-process file cache deferred. Suppression: --quiet, GBRAIN_NO_BANNER=1, non-TTY default suppresses unless GBRAIN_BANNER=1 explicitly opts in (clean pipes for shell flows). Failure mode: banner fetch errors swallowed; underlying command runs normally. Banner is observability, never load-bearing. The hardened callRemoteTool will surface the same error class on the actual call if the host is genuinely unreachable. Inline in cli.ts per CDX-1 (no parallel module). _clearIdentityCacheForTest exported as test escape hatch. Backed by the new `get_brain_identity` MCP op (read-scope, banner-only). Part of v0.31.1 fix for #734. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * v0.31.1 feat: route CLI-only commands with MCP equivalents (salience/anomalies/graph-query/think) These four CLI commands bypass the operation-layer dispatch and call engine methods directly today, so the cli.ts routing seam doesn't catch them. Each gets a thin per-command branch: when isThinClient(cfg), callRemoteTool against the corresponding op; otherwise existing engine path runs unchanged. Mappings: - gbrain salience → get_recent_salience (read scope, 30s timeout) - gbrain anomalies → find_anomalies (read scope, 30s timeout) - gbrain graph-query → traverse_graph (read scope, 30s timeout) - gbrain think → think (write scope, 180s timeout) `think` is a special case: the server's think op intentionally disables --save/--take for remote callers (operations.ts:1103-1135 trust-boundary gate per CLAUDE.md subagent-isolation policy). Thin-client think prints a loud warning when those flags are set so users know what they lose instead of silent ignoring. Documented as v0.31.x policy review in plan. Output format unchanged on both paths — the MCP op handler IS the engine method, so the unpacked tool result has identical shape. Part of v0.31.1 fix for #734. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * v0.31.1 feat: oauth_client_scopes_probe doctor check (CDX-5) \`gbrain remote doctor\` gains a 5th check that probes the read + admin scope tiers via two harmless read-only MCP calls (get_brain_identity and get_health). Surfaces v0.29.2/v0.30.0 thin-client clients that registered with read+write only and now hit \`gbrain stats\` / \`gbrain history\` and fail mid-flight — instead of failing mid-command, doctor names the exact remediation: On the host: gbrain auth register-client <name> --grant-types client_credentials --scopes read,write,admin Status semantics (informational by default): - read.missing_scope → fail (broken setup) - admin.missing_scope → warn + pinpoint hint (the load-bearing case) - both succeed → ok - non-scope probe errors (parse/network/timeout) → ok with detail.inconclusive=true (doctor's overall status doesn't flap) GBRAIN_DOCTOR_SKIP_SCOPE_PROBE=1 env-flag for test fixtures that mock /mcp at JSON-RPC initialize level only (MCP SDK Client hangs on shape mismatch and doesn't always honor AbortSignal — adversarial test behavior we don't want to bake into doctor). Pinned by 8 cases in test/oauth-scope-probe.test.ts (pure-function buildScopeCheck) plus unchanged passing of all 23 doctor-remote tests. CDX-5 from the codex outside-voice review. Keeps host-side \`gbrain auth register-client\` default at \`read\` (no breaking change for existing scrapers); puts the migration burden on the THIN-CLIENT side where it belongs. Part of v0.31.1 fix for #734. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * v0.31.1 feat: refuse \`takes\`/\`sources\` on thin-client with MCP-tool hints (CDX-2) Per the CDX-2 op-coverage audit: takes and sources are multi-subcommand CLIs with mixed local/routable surface. Their READ subcommands (takes_list, takes_search, sources_list, sources_status) have MCP equivalents — those land in v0.31.x with per-subcommand splits. For v0.31.1, refuse both at the top level with hints naming the MCP tools so agents know exactly which tools to invoke directly. Honest framing per CDX-2: "thin-client gbrain routes the read+write+admin op surface; multi-subcommand CLIs land incrementally." Per-subcommand routing recorded as v0.31.x TODO in the plan. Storage is also refused (filesystem-bound; no remote equivalent). Part of v0.31.1 fix for #734. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * v0.31.1 docs + version: bump VERSION/package.json, CHANGELOG, TODOS, CLAUDE.md Cross-cut for v0.31.1 ship: - VERSION: 0.30.0 → 0.31.1 - package.json: "version": "0.31.1" (bun install refreshed bun.lock) - CHANGELOG.md: full release-summary entry per CLAUDE.md voice contract (numbers-that-matter table with before/after comparison, what-this-means closer, take-advantage block with exact remediation commands, itemized changes by surface, contributor section with plan/decision-history pointer) - TODOS.md: 7 follow-up entries for v0.31.x (timing telemetry, job-routing, per-subcommand takes/sources split, transcripts privacy decision, trust-boundary policy review, register-client default flip, cross-process token cache, parity test backfill) - CLAUDE.md: new "Thin-client routing" section under "Key files" annotating every changed/new file with its v0.31.1 contract — src/cli.ts routing seam, src/core/mcp-client.ts hardening, src/core/cli-options.ts --timeout, src/core/doctor-remote.ts scope-probe, get_brain_identity op, per-command routing in salience/anomalies/graph-query/think. Part of v0.31.1 fix for #734. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * v0.31.1 fix: collectRemoteDoctorReport opts.skipScopeProbe + regen llms.txt Replaces the env-var GBRAIN_DOCTOR_SKIP_SCOPE_PROBE module-mutation in test/doctor-remote.test.ts with an explicit opts arg threaded through collectRemoteDoctorReport(config, opts). Satisfies the test-isolation lint (rule R1: no process.env.X = ... in non-serial unit files). Production callers still honor the env-flag for ops bypass; opts wins when both are set. Also regenerates llms.txt + llms-full.txt to match the v0.31.1 CLAUDE.md additions (build:llms drift check passes). Part of v0.31.1 fix for #734. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * v0.31.1 test: close coverage gaps — issue #734 e2e regression + CDX-4 hardening unit tests Two real gaps the prior coverage missed: 1. **Issue #734 regression e2e** (test/e2e/thin-client.test.ts +6 cases): Existing e2e covered init/doctor/sync-refusal/remote-ping/no-admin but never exercised the actual bug — `gbrain search` against a populated host. Added the load-bearing regression: seed two pages on the host, run thin-client `gbrain search "<unique-token>"`, assert non-zero rows AND seeded slug present in stdout. If this assertion ever fails, #734 has regressed. Plus: routed identity banner verification (GBRAIN_BANNER=1 path), --quiet suppression check, routed put round-trip (write reaches host, visible from host's local engine), routed admin stats (page_count > 0 not 0/0), and pinpoint refuse-hint format for `gbrain sync`. 2. **CDX-4 hardening unit tests** (test/mcp-client-hardening.test.ts +31 cases): pre-fix the hardening pass had ZERO direct unit coverage. The "exhaustive switch on RemoteMcpError.reason" promise depended on toRemoteMcpError actually normalizing every thrown value, but nothing verified that contract. Added: - toRemoteMcpError: passthrough for RemoteMcpError, AbortError → network/aborted, plain Error → network/unreachable, string/object/null non-Error throwables → network/unreachable, mcp_url always populated, contract test that EVERY output has a recognized reason - extractToolErrorCode: JSON envelope (error.code + top-level code), substring fallback for missing-scope-shaped messages, defensive handling of non-string code field, malformed-JSON fallthrough - buildAbortController: timeout fires on schedule, external signal propagates immediately when pre-aborted and lazily when aborted later, timeout + external compose (whichever fires first wins), cleanup is idempotent and removes external listener (no leak) - RemoteMcpError class shape (instanceof Error, reason/detail readonly, name="RemoteMcpError", detail optional) - CallRemoteToolOptions type contract Internal helpers (toRemoteMcpError, extractToolErrorCode, buildAbortController) gain @internal export tags so the test file can import them without going through the SDK transport. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * v0.31.1 test: move routing tests before remote-ping; fix pre-existing assertion for new refusal format The newly-added routing tests were running AFTER `gbrain remote ping`, which submits a 60s autopilot-cycle and can leave the server in a state where subsequent OAuth probes fail. Moving them before Tier B so they exercise a healthy server. Also updated the existing `sync is refused with canonical thin-client error` test assertion: v0.31.1 changed the refusal format from generic \`thin client\` (with space) to the pinpoint \`thin-client of <url>\` (with hyphen) plus \`not routable\` prefix. The test now asserts both the new format and the pinpoint hint. E2E result: 10 pass / 3 fail. The 3 failures are pre-existing on master (remote-ping timeout, client-without-admin OAuth discovery flake) and not in my diff scope. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * v0.31.1 fix: scrub banned fork name from new test fixtures (CI privacy gate) CI's check-privacy.sh rejected the v0.31.1 test additions because the unique-token fixture string used the private OpenClaw fork name as a prefix. Replaced with neutral names per CLAUDE.md privacy rule: - test/e2e/thin-client.test.ts: \`wintermute_routing_proof\` → \`host_routing_proof\` (the unique-token marker that proves search results came from the remote brain, not the empty local PGLite). All 6 references updated. - test/mcp-client-hardening.test.ts: \`https://wintermute.fly.dev/mcp\` → \`https://brain-host.example/mcp\` (the synthetic MCP URL used as the toRemoteMcpError second arg). Matches the convention used in the existing test/cli-dispatch-thin-client.test.ts fixture. bun run verify passes; 31/31 hardening tests still pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
177 lines
6.5 KiB
TypeScript
177 lines
6.5 KiB
TypeScript
/**
|
|
* Tests for the top-level CLI dispatch guard introduced in multi-topology v1.
|
|
*
|
|
* When `~/.gbrain/config.json` has `remote_mcp` set, 9 commands are refused
|
|
* with a canonical error pointing at the remote host:
|
|
* sync, embed, extract, migrate, apply-migrations, repair-jsonb, orphans,
|
|
* integrity, serve.
|
|
*
|
|
* Doctor is NOT in the refused set — it routes to runRemoteDoctor instead.
|
|
*
|
|
* Strategy: seed `~/.gbrain/config.json` with remote_mcp set in a tempdir
|
|
* `GBRAIN_HOME`, then spawn `gbrain <cmd>` and assert (a) exit code 1,
|
|
* (b) stderr contains the canonical error message, (c) the local engine
|
|
* was never reached. Async Bun.spawn (NOT execFileSync) so the test event
|
|
* loop stays responsive — see init-mcp-only.test.ts for the rationale.
|
|
*
|
|
* Includes a regression test that local-config installs still pass through
|
|
* to connectEngine normally.
|
|
*/
|
|
|
|
import { describe, test as testRaw, expect, beforeEach, afterEach } from 'bun:test';
|
|
import { mkdtempSync, rmSync, writeFileSync, mkdirSync } from 'fs';
|
|
import { join } from 'path';
|
|
import { tmpdir } from 'os';
|
|
|
|
function test(name: string, fn: () => void | Promise<unknown>): void {
|
|
testRaw(name, fn, 30000);
|
|
}
|
|
|
|
const CLI = join(__dirname, '..', 'src', 'cli.ts');
|
|
|
|
let tmp: string;
|
|
|
|
function configPath(): string { return join(tmp, '.gbrain', 'config.json'); }
|
|
|
|
function seedThinClientConfig(extra: Record<string, unknown> = {}) {
|
|
mkdirSync(join(tmp, '.gbrain'), { recursive: true });
|
|
writeFileSync(configPath(), JSON.stringify({
|
|
engine: 'postgres',
|
|
remote_mcp: {
|
|
issuer_url: 'https://brain-host.example',
|
|
mcp_url: 'https://brain-host.example/mcp',
|
|
oauth_client_id: 'cid',
|
|
oauth_client_secret: 'csecret',
|
|
},
|
|
...extra,
|
|
}, null, 2));
|
|
}
|
|
|
|
function seedLocalPGLiteConfig() {
|
|
mkdirSync(join(tmp, '.gbrain'), { recursive: true });
|
|
writeFileSync(configPath(), JSON.stringify({
|
|
engine: 'pglite',
|
|
database_path: join(tmp, 'brain.pglite'),
|
|
}, null, 2));
|
|
}
|
|
|
|
interface RunResult { exitCode: number; stdout: string; stderr: string; }
|
|
|
|
async function run(args: string[]): Promise<RunResult> {
|
|
const env: Record<string, string> = {};
|
|
for (const [k, v] of Object.entries(process.env)) {
|
|
if (v !== undefined) env[k] = v;
|
|
}
|
|
env.GBRAIN_HOME = tmp;
|
|
delete env.DATABASE_URL;
|
|
delete env.GBRAIN_DATABASE_URL;
|
|
delete env.GBRAIN_REMOTE_CLIENT_SECRET;
|
|
const proc = Bun.spawn({
|
|
cmd: ['bun', 'run', CLI, ...args],
|
|
env,
|
|
stdin: 'ignore',
|
|
stdout: 'pipe',
|
|
stderr: 'pipe',
|
|
});
|
|
const [stdout, stderr, exitCode] = await Promise.all([
|
|
new Response(proc.stdout).text(),
|
|
new Response(proc.stderr).text(),
|
|
proc.exited,
|
|
]);
|
|
return { exitCode, stdout, stderr };
|
|
}
|
|
|
|
beforeEach(() => {
|
|
tmp = mkdtempSync(join(tmpdir(), 'gbrain-cli-dispatch-'));
|
|
});
|
|
|
|
afterEach(() => {
|
|
try { rmSync(tmp, { recursive: true, force: true }); } catch { /* best-effort */ }
|
|
});
|
|
|
|
describe('thin-client dispatch guard refuses DB-bound commands', () => {
|
|
// Each command in the refused set MUST exit 1 with a canonical error and
|
|
// MUST NOT attempt to connect to a local engine.
|
|
const refusedCommands = [
|
|
['sync'],
|
|
['embed', '--stale'],
|
|
['extract', 'links'],
|
|
// 'migrate' the engine-migration command (different from the migrations
|
|
// orchestrator). Both are in CLI_ONLY but only `migrate-engine` here.
|
|
['migrate', '--to', 'pglite'],
|
|
['apply-migrations', '--yes'],
|
|
['repair-jsonb', '--dry-run'],
|
|
['orphans'],
|
|
['integrity', 'check'],
|
|
['serve'],
|
|
];
|
|
|
|
for (const args of refusedCommands) {
|
|
test(`refuses \`gbrain ${args.join(' ')}\` with pinpoint hint`, async () => {
|
|
seedThinClientConfig();
|
|
const r = await run(args);
|
|
expect(r.exitCode).toBe(1);
|
|
// v0.31.1 (Issue #734): refusal carries an actionable hint via
|
|
// THIN_CLIENT_REFUSE_HINTS instead of a generic "run on the remote
|
|
// host" message. Hint format: "`gbrain <cmd>` is not routable. <hint>"
|
|
expect(r.stderr).toContain(`gbrain ${args[0]}`);
|
|
expect(r.stderr).toContain('thin-client of https://brain-host.example/mcp');
|
|
expect(r.stderr).toContain('not routable');
|
|
});
|
|
}
|
|
});
|
|
|
|
describe('thin-client dispatch guard does NOT refuse safe commands', () => {
|
|
// Commands that are still useful in thin-client mode (init, auth, version,
|
|
// help) MUST NOT be refused. We assert the canonical thin-client error
|
|
// does NOT appear.
|
|
test('`gbrain --version` works on thin-client install', async () => {
|
|
seedThinClientConfig();
|
|
const r = await run(['--version']);
|
|
expect(r.exitCode).toBe(0);
|
|
expect(r.stdout).toContain('gbrain');
|
|
expect(r.stderr).not.toContain('thin client');
|
|
});
|
|
|
|
test('`gbrain --help` works on thin-client install', async () => {
|
|
seedThinClientConfig();
|
|
const r = await run(['--help']);
|
|
expect(r.exitCode).toBe(0);
|
|
expect(r.stderr).not.toContain('requires a local engine');
|
|
});
|
|
});
|
|
|
|
describe('thin-client doctor routes to runRemoteDoctor', () => {
|
|
test('`gbrain doctor` runs remote checks (not DB-bound checks) when remote_mcp is set', async () => {
|
|
seedThinClientConfig();
|
|
const r = await run(['doctor', '--json']);
|
|
// Doctor will likely fail because brain-host.example isn't reachable —
|
|
// but that's irrelevant. What matters is it ran the THIN-CLIENT doctor,
|
|
// not the local-DB doctor. Fingerprint: the remote doctor's JSON output
|
|
// has `mode: "thin-client"`. The local doctor doesn't.
|
|
expect(r.stdout).toContain('"mode":"thin-client"');
|
|
// Output must include the remote_mcp fields, NOT a schema_version check.
|
|
expect(r.stdout).toContain('"mcp_url":"https://brain-host.example/mcp"');
|
|
});
|
|
});
|
|
|
|
describe('regression — local config still passes through normally', () => {
|
|
test('local PGLite config does NOT trigger thin-client guard for `sync`', async () => {
|
|
// Seed a local PGLite config (no remote_mcp). `gbrain sync` shouldn't
|
|
// refuse with the thin-client error. It may error for other reasons
|
|
// (no brain repo configured, etc.) — what matters is the canonical
|
|
// thin-client message MUST NOT appear.
|
|
seedLocalPGLiteConfig();
|
|
const r = await run(['sync', '--dry-run']);
|
|
expect(r.stderr).not.toContain('thin client');
|
|
expect(r.stderr).not.toContain('requires a local engine');
|
|
});
|
|
|
|
test('local PGLite config does NOT trigger guard for `doctor`', async () => {
|
|
seedLocalPGLiteConfig();
|
|
const r = await run(['doctor', '--fast', '--json']);
|
|
// Local doctor's output has different fingerprint — no `mode: thin-client`.
|
|
expect(r.stdout).not.toContain('"mode":"thin-client"');
|
|
});
|
|
});
|