Compare commits

..
Author SHA1 Message Date
Garry TanandClaude Fable 5 2247540b4f fix(init,mcp): seed init AI options from env on cold install; whoami reports stdio transport
Two backlog fixes:

- init (#1058): loadConfig() returns null on a cold install (no config.json
  AND no DATABASE_URL), short-circuiting before its env merge — so
  GBRAIN_EMBEDDING_MODEL / GBRAIN_EMBEDDING_DIMENSIONS /
  GBRAIN_EXPANSION_MODEL / GBRAIN_CHAT_MODEL were silently ignored and
  Tier-3 detection auto-picked by API key instead. resolveAIOptions' config
  seed now falls back to those env vars directly when loadConfig() is null
  (new exported helper seedAIOptionsFromConfig, env-injectable for tests).

- whoami (#1061): the stdio MCP dispatch is remote/untrusted by design but
  has no per-token auth (local pipe), so whoami threw unknown_transport on
  the primary stdio surface. The stdio dispatch now marks
  ctx.transport = 'stdio' and whoami returns {transport: 'stdio', scopes: []}
  for it. Trust posture unchanged: remote stays true, the marker is never
  used for trust decisions, and an unmarked auth-less remote context still
  throws (fail-closed preserved).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-21 14:24:02 -07:00
18 changed files with 195 additions and 364 deletions
+1 -12
View File
@@ -54,7 +54,7 @@ export function bigintToStringReplacer(_key: string, value: unknown): unknown {
}
// CLI-only commands that bypass the operation layer
export const CLI_ONLY = new Set(['init', 'reinit-pglite', 'upgrade', 'post-upgrade', 'check-update', 'integrations', 'publish', 'check-backlinks', 'lint', 'report', 'import', 'export', 'files', 'embed', 'serve', 'call', 'config', 'doctor', 'migrate', 'eval', 'sync', 'extract', 'extract-conversation-facts', 'enrich', 'features', 'autopilot', 'graph-query', 'jobs', 'agent', 'apply-migrations', 'skillpack-check', 'skillpack', 'resolvers', 'integrity', 'repair-jsonb', 'orphans', 'sources', 'mounts', 'dream', 'check-resolvable', 'routing-eval', 'skillify', 'smoke-test', 'providers', 'storage', 'repos', 'code-def', 'code-refs', 'reindex', 'reindex-code', 'reindex-frontmatter', 'code-callers', 'code-callees', 'reconcile-links', 'frontmatter', 'auth', 'friction', 'claw-test', 'book-mirror', 'takes', 'think', 'salience', 'anomalies', 'calibration', 'transcripts', 'models', 'remote', 'recall', 'forget', 'edges-backfill', 'facts', 'cache', 'ze-switch', 'founder', 'brainstorm', 'lsd', 'schema', 'capture', 'onboard', 'conversation-parser', 'status', 'connect', 'skillopt', 'quarantine', 'self-upgrade', 'advisor', 'watch', 'reindex-search-vector']);
export const CLI_ONLY = new Set(['init', 'reinit-pglite', 'upgrade', 'post-upgrade', 'check-update', 'integrations', 'publish', 'check-backlinks', 'lint', 'report', 'import', 'export', 'files', 'embed', 'serve', 'call', 'config', 'doctor', 'migrate', 'eval', 'sync', 'extract', 'extract-conversation-facts', 'enrich', 'features', 'autopilot', 'graph-query', 'jobs', 'agent', 'apply-migrations', 'skillpack-check', 'skillpack', 'resolvers', 'integrity', 'repair-jsonb', 'orphans', 'sources', 'mounts', 'dream', 'check-resolvable', 'routing-eval', 'skillify', 'smoke-test', 'providers', 'storage', 'repos', 'code-def', 'code-refs', 'reindex', 'reindex-code', 'reindex-frontmatter', 'code-callers', 'code-callees', 'reconcile-links', 'frontmatter', 'auth', 'friction', 'claw-test', 'book-mirror', 'takes', 'think', 'salience', 'anomalies', 'calibration', 'transcripts', 'models', 'remote', 'recall', 'forget', 'edges-backfill', 'cache', 'ze-switch', 'founder', 'brainstorm', 'lsd', 'schema', 'capture', 'onboard', 'conversation-parser', 'status', 'connect', 'skillopt', 'quarantine', 'self-upgrade', 'advisor', 'watch', 'reindex-search-vector']);
// CLI-only commands whose handlers print their own --help text. These are
// excluded from the generic short-circuit so detailed per-command and
// per-subcommand usage stays reachable.
@@ -991,8 +991,6 @@ const THIN_CLIENT_REFUSED_COMMANDS = new Set([
// hint pointing at the routable MCP tools; per-subcommand splits are
// a v0.31.x follow-up TODO.
'takes', 'sources',
// #1867: fence-backfill edits local .md fences + stamps the local DB.
'facts',
// v0.32 thin-client routing audit (Codex round 2 findings #2, #4):
// - `pages` purge-deleted is admin+localOnly (operations.ts:856-864)
// - `files` list / file_url MCP ops are localOnly (operations.ts:1769-1879)
@@ -1028,7 +1026,6 @@ const THIN_CLIENT_REFUSE_HINTS: Record<string, string> = {
migrate: "migrate runs on the host's local engine. Run on the host machine.",
'apply-migrations': 'schema migrations run on the host. SSH and run there.',
'repair-jsonb': 'repair-jsonb operates on the local DB only.',
facts: 'facts fence-backfill edits local entity-page fences. Run on the host machine.',
integrity: 'integrity scans local files. Run on the host machine.',
serve: 'serve starts a server. Run on the host, not the thin client.',
dream: 'dream runs the autopilot cycle on the host. `gbrain remote ping` queues one. (Native `gbrain dream` thin-client routing planned for v0.31.2.)',
@@ -1858,13 +1855,6 @@ async function handleCliOnly(command: string, args: string[]) {
await runEdgesBackfill(engine, args);
break;
}
case 'facts': {
// #1867 — re-runnable fence-backfill for row_num-NULL legacy fact
// rows (idempotent v0_32_2 phase B, exposed as an operator command).
const { runFactsCommand } = await import('./commands/facts.ts');
await runFactsCommand(engine, args);
break;
}
case 'whoknows': {
// v0.33 (Issue #?): expertise + relationship-proximity routing.
// MCP op `find_experts` (read-scoped) backs the same code path; CLI
@@ -2345,7 +2335,6 @@ TOOLS
check-backlinks <check|fix> [dir] Find/fix missing back-links across brain
lint <dir|file> [--fix] Catch LLM artifacts, placeholder dates, bad frontmatter
orphans [--json] [--count] Find pages with no inbound wikilinks
facts fence-backfill [--dry-run] Fence legacy fact rows (row_num NULL) onto entity pages
salience [--days N] [--kind P] v0.29: pages ranked by emotional + activity salience
anomalies [--since D] [--sigma N] v0.29: cohort-based statistical anomalies (tag, type)
transcripts recent [--days N] v0.29: recent raw .txt transcripts (local-only)
-48
View File
@@ -1,48 +0,0 @@
/**
* gbrain facts — fact-store maintenance surface (#1867).
*
* `fence-backfill` re-runs the v0_32_2 fence-backfill phase on demand.
* Remote `extract_facts` deposits that predate the fence-write backstop
* (and any legacy DB-only insert) leave `row_num IS NULL` rows that the
* cycle extract_facts guard refuses to reconcile past — previously the
* only remedy was the one-shot v0_32_2 migration, which the ledger marks
* complete and never re-runs. The phase is idempotent (only touches
* `row_num IS NULL` rows), so exposing it as a command is safe to re-run
* any time the backlog reappears.
*/
import type { BrainEngine } from '../core/engine.ts';
import { setCliExitVerdict } from '../core/cli-force-exit.ts';
import { phaseBFenceFacts } from './migrations/v0_32_2.ts';
function printHelp(): void {
process.stderr.write(
`Usage: gbrain facts fence-backfill [--dry-run]\n\n` +
`Fence-backfill: appends every legacy fact row (row_num IS NULL) to its\n` +
`entity page's \`## Facts\` fence and stamps row_num + source_markdown_slug\n` +
`back onto the DB row. Idempotent — re-runs only pick up rows still\n` +
`missing a fence assignment. Clears the backlog that makes the cycle's\n` +
`extract_facts phase skip fence→DB reconciliation.\n\n` +
` --dry-run report what would be fenced; no FS or DB writes\n`,
);
}
export async function runFactsCommand(engine: BrainEngine, args: string[]): Promise<void> {
const sub = args[0];
if (!sub || sub === '--help' || sub === '-h') {
printHelp();
return;
}
if (sub !== 'fence-backfill') {
process.stderr.write(`Unknown facts subcommand: ${sub}\n`);
printHelp();
setCliExitVerdict(1);
return;
}
const dryRun = args.includes('--dry-run');
const result = await phaseBFenceFacts(engine, { dryRun });
process.stderr.write(
`fence-backfill: ${result.status}${result.detail ? `${result.detail}` : ''}\n`,
);
if (result.status === 'failed') setCliExitVerdict(1);
}
+42 -12
View File
@@ -161,7 +161,7 @@ interface ResolveAIOptionsArgs {
nonInteractive: boolean; // --non-interactive (forces D3 fail-loud, no picker)
}
interface ResolvedAIOptions {
export interface ResolvedAIOptions {
embedding_model?: string;
embedding_dimensions?: number;
expansion_model?: string;
@@ -170,6 +170,41 @@ interface ResolvedAIOptions {
noEmbedding?: boolean;
}
/**
* Seed init's AI options from persisted config, falling back to the raw env
* vars when loadConfig() returned null (#1058). On a cold install (no
* config.json AND no DATABASE_URL) loadConfig short-circuits BEFORE its env
* merge, so GBRAIN_EMBEDDING_MODEL / GBRAIN_EMBEDDING_DIMENSIONS /
* GBRAIN_EXPANSION_MODEL / GBRAIN_CHAT_MODEL were silently ignored by init
* and Tier-3 detection auto-picked by API key instead. Exported for unit
* tests (env injectable).
*/
export function seedAIOptionsFromConfig(
cfg: GBrainConfig | null,
env: NodeJS.ProcessEnv = process.env,
): ResolvedAIOptions {
const envDims = env.GBRAIN_EMBEDDING_DIMENSIONS
? parseInt(env.GBRAIN_EMBEDDING_DIMENSIONS, 10)
: NaN;
const seed = cfg ?? {
embedding_disabled: undefined,
embedding_model: env.GBRAIN_EMBEDDING_MODEL,
embedding_dimensions: Number.isFinite(envDims) ? envDims : undefined,
expansion_model: env.GBRAIN_EXPANSION_MODEL,
chat_model: env.GBRAIN_CHAT_MODEL,
};
const out: ResolvedAIOptions = {};
if (seed.embedding_disabled) {
out.noEmbedding = true;
} else if (seed.embedding_model) {
out.embedding_model = seed.embedding_model;
if (seed.embedding_dimensions) out.embedding_dimensions = seed.embedding_dimensions;
}
if (seed.expansion_model) out.expansion_model = seed.expansion_model;
if (seed.chat_model) out.chat_model = seed.chat_model;
return out;
}
/**
* Resolve AI provider options for `gbrain init`.
*
@@ -203,18 +238,13 @@ async function resolveAIOptions(opts: ResolveAIOptionsArgs): Promise<ResolvedAIO
// user already opted into deferred mode.
try {
const { loadConfig } = await import('../core/config.ts');
const cfg = loadConfig();
if (cfg?.embedding_disabled) {
out.noEmbedding = true;
} else if (cfg?.embedding_model) {
out.embedding_model = cfg.embedding_model;
if (cfg.embedding_dimensions) out.embedding_dimensions = cfg.embedding_dimensions;
}
if (cfg?.expansion_model) out.expansion_model = cfg.expansion_model;
if (cfg?.chat_model) out.chat_model = cfg.chat_model;
// #1058: loadConfig() returns null on a cold install (no config.json AND
// no DATABASE_URL) — before it ever reaches its env merge. The seed helper
// falls back to the same GBRAIN_* env vars directly in that case.
Object.assign(out, seedAIOptionsFromConfig(loadConfig()));
} catch {
// loadConfig throws when no brain configured — first-time install, fall
// through to env detection.
// loadConfig threw — treat as first-time install, fall through to env
// detection.
}
// --- Tier 1+2: explicit flags ---------------------------------------------
+4 -32
View File
@@ -39,7 +39,6 @@ import type { BrainEngine } from '../../core/engine.ts';
import { loadConfig, toEngineConfig } from '../../core/config.ts';
import { createEngine } from '../../core/engine-factory.ts';
import { upsertFactRow, parseFactsFence } from '../../core/facts-fence.ts';
import { resolvePageFilePath } from '../../core/markdown.ts';
let testEngineOverride: BrainEngine | null = null;
export function __setTestEngineOverride(engine: BrainEngine | null): void {
@@ -149,16 +148,9 @@ function isLocalPathDirty(localPath: string): boolean {
}
}
/**
* Exported (not just via `__testing`) because `gbrain facts fence-backfill`
* (#1867) re-runs this phase on demand: remote `extract_facts` deposits that
* predate the fence-write backstop leave row_num-NULL rows the cycle guard
* refuses to reconcile past. The phase is idempotent (only touches
* `row_num IS NULL` rows), so re-running is always safe.
*/
export async function phaseBFenceFacts(
async function phaseBFenceFacts(
engine: BrainEngine | null,
opts: Pick<OrchestratorOpts, 'dryRun'>,
opts: OrchestratorOpts,
): Promise<OrchestratorPhaseResult> {
if (opts.dryRun) {
// Dry-run: report what WOULD happen without touching FS or DB.
@@ -246,11 +238,7 @@ export async function phaseBFenceFacts(
for (const [key, group] of groups) {
const [sourceId, entitySlug] = key.split('\0');
const localPath = localPathById.get(sourceId)!;
// resolvePageFilePath, NOT a bare join — non-default sources fence
// into `<local_path>/.sources/<id>/<slug>.md`, the same path the
// fence-write backstop and put_page write-through compute. A bare
// join here diverges fence and DB for non-default sources (#2044).
const filePath = resolvePageFilePath(localPath, entitySlug, sourceId);
const filePath = join(localPath, `${entitySlug}.md`);
const tmpPath = `${filePath}.tmp`;
try {
@@ -281,21 +269,6 @@ export async function phaseBFenceFacts(
const existingFence = parseFactsFence(body);
const existingKeySet = new Set(existingFence.facts.map(f => `${f.claim}\0${f.source ?? ''}`));
// Seed appended row_nums from MAX(fence max, DB max) — same #2044
// divergence guard as writeFactsToFence. When the fence at the
// resolved path is missing/behind but the DB already holds stamped
// rows for this slug (legacy wrong-path fence writes), fence-max+1
// collides with idx_facts_fence_key on the post-rename UPDATE,
// failing the page and leaving fence and DB disagreeing.
const dbMaxRows = await engine.executeRaw<{ max: number | string | null }>(
`SELECT MAX(row_num) AS max FROM facts
WHERE source_id = $1 AND source_markdown_slug = $2`,
[sourceId, entitySlug],
);
const dbMaxRowNum = Number(dbMaxRows[0]?.max ?? 0) || 0;
const fenceMaxRowNum = existingFence.facts.reduce((m, f) => Math.max(m, f.rowNum), 0);
let nextRowNum = Math.max(fenceMaxRowNum, dbMaxRowNum) + 1;
const assignments: Array<{ id: string; row_num: number }> = [];
for (const row of group) {
const key = `${row.fact}\0${row.source ?? ''}`;
@@ -318,7 +291,6 @@ export async function phaseBFenceFacts(
.toISOString().slice(0, 10)
: undefined;
const { body: updated, rowNum } = upsertFactRow(body, {
rowNum: nextRowNum++,
claim: row.fact,
kind: row.kind,
confidence: row.confidence,
@@ -409,7 +381,7 @@ async function phaseCVerify(
for (const g of groups) {
const localPath = localPathById.get(g.source_id);
if (!localPath) continue;
const filePath = resolvePageFilePath(localPath, g.source_markdown_slug, g.source_id);
const filePath = join(localPath, `${g.source_markdown_slug}.md`);
if (!existsSync(filePath)) {
mismatches.push(`${g.source_markdown_slug} (file missing)`);
continue;
+3 -5
View File
@@ -176,11 +176,9 @@ export async function runExtractFacts(
if (legacyCount > 0) {
result.guardTriggered = true;
result.warnings.push(
`extract_facts: ${legacyCount} legacy fact rows pending fence backfill ` +
`(row_num IS NULL — v0.31 rows or remote extract_facts deposits that ` +
`predate the fence backstop). Run \`gbrain facts fence-backfill\` ` +
`(idempotent, re-runnable) before this phase can safely reconcile ` +
`fence → DB.`,
`extract_facts: ${legacyCount} legacy v0.31 fact rows pending fence backfill. ` +
`Run \`gbrain apply-migrations --yes\` to complete v0_32_2 before this phase ` +
`can safely reconcile fence → DB.`,
);
return result;
}
+6 -7
View File
@@ -1739,14 +1739,13 @@ export interface BrainEngine {
* single-row supersede flow because fence reconciliation is the canonical
* source-of-truth direction, not the consolidator path.
*
* Insertion runs in a single transaction. A collision on the v51
* partial UNIQUE index `(source_id, source_markdown_slug, row_num)`
* skips ONLY that row (ON CONFLICT DO NOTHING, #2044) — the rest of
* the batch still commits, so a redundant deposit against an
* already-indexed fence row is idempotent instead of a hard failure.
* Insertion is atomic per call: all rows commit in a single transaction
* or none commit (the transaction rolls back on any constraint
* violation, e.g. the v51 partial UNIQUE index on
* `(source_id, source_markdown_slug, row_num)`).
*
* Returns the inserted ids in input-order (colliding rows omitted) so
* callers can correlate fence-row → DB-id without a separate lookup.
* Returns the inserted ids in input-order so callers can correlate
* fence-row → DB-id without a separate lookup.
*/
insertFacts(
rows: Array<NewFact & { row_num: number; source_markdown_slug: string }>,
+1 -17
View File
@@ -218,27 +218,11 @@ export async function writeFactsToFence(
}
// 2. Upsert each fact onto the fence in input order. row_num
// monotonically increases, append-only, seeded from the MAX of
// the fence and the DB index (#2044): when fence and DB have
// diverged (e.g. legacy writes that stamped DB rows against a
// fence at a path this code no longer reads), fence-max+1 can
// collide with an existing DB row_num, tripping
// idx_facts_fence_key and rolling back the whole batch.
const dbMaxRows = await engine.executeRaw<{ max: number | string | null }>(
`SELECT MAX(row_num) AS max FROM facts
WHERE source_id = $1 AND source_markdown_slug = $2`,
[target.sourceId, target.slug],
);
const dbMaxRowNum = Number(dbMaxRows[0]?.max ?? 0) || 0;
const fenceMaxRowNum = parseFactsFence(body).facts
.reduce((m, f) => Math.max(m, f.rowNum), 0);
let nextRowNum = Math.max(fenceMaxRowNum, dbMaxRowNum) + 1;
// monotonically increases (max-existing + 1 per call, append-only).
const assignedRowNums: number[] = [];
for (const f of facts) {
const validFromStr = (f.validFrom ?? new Date()).toISOString().slice(0, 10);
const { body: updated, rowNum } = upsertFactRow(body, {
rowNum: nextRowNum++,
claim: f.fact,
kind: (f.kind ?? 'fact') as 'fact' | 'event' | 'preference' | 'commitment' | 'belief',
confidence: f.confidence ?? 1.0,
+19 -3
View File
@@ -332,6 +332,15 @@ export interface OperationContext {
* remote/untrusted (defense in depth in case the type is bypassed via cast).
*/
remote: boolean;
/**
* Transport marker for auth-less remote surfaces (#1061). The stdio MCP
* dispatch sets 'stdio' — it is deliberately `remote: true` (agent-facing,
* untrusted) but has no per-token auth (local pipe), so identity ops like
* whoami need a way to distinguish "known auth-less transport" from "a
* transport bug forgot to thread ctx.auth". Trust decisions MUST NOT key
* off this field — only `ctx.remote === false` grants trust.
*/
transport?: 'stdio';
/**
* Subagent runtime context (v0.16+). Set by the subagent tool dispatcher when
* dispatching an op as a tool call from an LLM loop. Used to enforce per-op
@@ -3713,9 +3722,10 @@ const whoami: Operation = {
'Introspect the calling identity. Returns one of three transport shapes: ' +
'{transport: "oauth", client_id, client_name, scopes, expires_at}, ' +
'{transport: "legacy", token_name, scopes, expires_at: null}, or ' +
'{transport: "local", scopes: []}. Throws unknown_transport when the ' +
'context is ambiguous (remote=true without auth) — fail-closed posture ' +
'mirroring the v0.26.9 trust-boundary contract.',
'{transport: "local", scopes: []}, or {transport: "stdio", scopes: []} ' +
'for the auth-less stdio MCP pipe. Throws unknown_transport when the ' +
'context is ambiguous (remote=true without auth and no transport marker) ' +
'— fail-closed posture mirroring the v0.26.9 trust-boundary contract.',
params: {},
scope: 'read',
handler: async (ctx) => {
@@ -3727,6 +3737,12 @@ const whoami: Operation = {
if (ctx.remote === false) {
return { transport: 'local', scopes: [] };
}
// #1061: stdio MCP is remote/untrusted by design but has no per-token
// auth (local pipe) — a known transport, not a bug. Report it instead of
// throwing. Empty scopes: nothing here may be used to gate anything.
if (!ctx.auth && ctx.transport === 'stdio') {
return { transport: 'stdio', scopes: [] };
}
if (!ctx.auth) {
throw new OperationError(
'unknown_transport',
+8 -18
View File
@@ -4102,13 +4102,11 @@ export class PGLiteEngine implements BrainEngine {
): Promise<{ inserted: number; ids: number[] }> {
if (rows.length === 0) return { inserted: 0, ids: [] };
// Single transaction; per-row INSERTs (not multi-row VALUES) keep the
// embedding-vs-no-embedding branching readable; batch sizes are small
// (5-30 rows per page in practice) so the loop overhead is negligible
// vs the embedding compute cost. #2044: ON CONFLICT DO NOTHING on the
// v51 partial UNIQUE index makes a residual fence/DB row_num collision
// skip that row instead of rolling back the whole batch (parity with
// postgres-engine.ts).
// Single transaction so the v51 partial UNIQUE index can roll back the
// whole batch on constraint violation. Per-row INSERTs (not multi-row
// VALUES) keep the embedding-vs-no-embedding branching readable; batch
// sizes are small (5-30 rows per page in practice) so the loop overhead
// is negligible vs the embedding compute cost.
const ids = await this.db.transaction(async (tx) => {
const out: number[] = [];
for (const input of rows) {
@@ -4151,11 +4149,7 @@ export class PGLiteEngine implements BrainEngine {
$14, $15,
$16, $17, $18, $19,
$20
)
ON CONFLICT (source_id, source_markdown_slug, row_num)
WHERE row_num IS NOT NULL
DO NOTHING
RETURNING id`
) RETURNING id`
: `INSERT INTO facts (
source_id, entity_slug, fact, kind, visibility, notability, context,
valid_from, valid_until, source, source_session, confidence,
@@ -4169,16 +4163,12 @@ export class PGLiteEngine implements BrainEngine {
$15, $16,
$17, $18, $19, $20,
$21
)
ON CONFLICT (source_id, source_markdown_slug, row_num)
WHERE row_num IS NOT NULL
DO NOTHING
RETURNING id`,
) RETURNING id`,
embedStr === null
? [ctx.source_id, entitySlug, input.fact, kind, visibility, notability, context, validFrom, validUntil, input.source, sourceSession, confidence, embeddedAt, input.row_num, input.source_markdown_slug, claimMetric, claimValue, claimUnit, claimPeriod, eventType]
: [ctx.source_id, entitySlug, input.fact, kind, visibility, notability, context, validFrom, validUntil, input.source, sourceSession, confidence, embedStr, embeddedAt, input.row_num, input.source_markdown_slug, claimMetric, claimValue, claimUnit, claimPeriod, eventType],
);
if (ins.rows[0]) out.push(ins.rows[0].id);
out.push(ins.rows[0].id);
}
return out;
});
+6 -12
View File
@@ -4302,12 +4302,10 @@ export class PostgresEngine implements BrainEngine {
// ONCE per process so the cast matches the actual column type
// (halfvec vs vector). The probe is cached after first call.
const castSuffix = await this.resolveFactsEmbeddingCast();
// Single transaction; per-row INSERTs (not multi-row VALUES) keep the
// embedding-vs-no-embedding branching readable; batch sizes are small
// (5-30 rows per page in practice). #2044: ON CONFLICT DO NOTHING on
// the v51 partial UNIQUE index makes a residual fence/DB row_num
// collision skip that row instead of rolling back the whole batch —
// the fence stays system-of-record and reconciliation catches up.
// Single transaction so the v51 partial UNIQUE index can roll back
// the whole batch on constraint violation. Per-row INSERTs (not
// multi-row VALUES) keep the embedding-vs-no-embedding branching
// readable; batch sizes are small (5-30 rows per page in practice).
// No supersede flow in this path — fence reconciliation is the
// canonical source-of-truth direction, not the consolidator path.
const ids = await sql.begin(async (tx) => {
@@ -4348,13 +4346,9 @@ export class PostgresEngine implements BrainEngine {
${input.row_num}, ${input.source_markdown_slug},
${claimMetric}, ${claimValue}, ${claimUnit}, ${claimPeriod},
${eventType}
)
ON CONFLICT (source_id, source_markdown_slug, row_num)
WHERE row_num IS NOT NULL
DO NOTHING
RETURNING id
) RETURNING id
`;
if (ins[0]) out.push(Number(ins[0].id));
out.push(Number(ins[0].id));
}
return out;
});
+7
View File
@@ -32,6 +32,12 @@ export interface DispatchOpts {
remote?: boolean;
/** Override the default stderr logger (e.g. CLI uses console.* directly). */
logger?: OperationContext['logger'];
/**
* #1061: transport marker for auth-less remote surfaces. The stdio MCP
* server passes 'stdio' so identity ops (whoami) can report the transport
* instead of throwing unknown_transport. Never used for trust decisions.
*/
transport?: OperationContext['transport'];
/**
* v0.28: per-token allow-list for the takes.holder field. Threaded by
* the HTTP/stdio transport from `access_tokens.permissions.takes_holders`.
@@ -203,6 +209,7 @@ export function buildOperationContext(
logger: opts.logger || stderrLogger,
dryRun: !!params.dry_run,
remote: opts.remote ?? true,
transport: opts.transport,
takesHoldersAllowList: opts.takesHoldersAllowList,
// v0.34 D4: sourceId is REQUIRED at the type level. Auto-fill 'default'
// for single-source brains and any caller who didn't resolve a sourceId.
+4
View File
@@ -42,6 +42,10 @@ export async function startMcpServer(engine: BrainEngine) {
// `gbrain call <op>` (sets remote=false in src/cli.ts).
return dispatchToolCall(engine, name, params, {
remote: true,
// #1061: mark the transport so whoami can report {transport: 'stdio'}
// instead of throwing unknown_transport. Trust posture unchanged —
// stdio stays remote/untrusted.
transport: 'stdio',
takesHoldersAllowList: ['world'],
// v0.31: source defaults to 'default' for stdio (no per-token scope).
// Operators who want a different source on stdio MCP should set
+1 -3
View File
@@ -304,9 +304,7 @@ describe('runExtractFacts — empty-fence guard (Codex R2-#7)', () => {
expect(r.legacyRowsPending).toBe(1);
expect(r.factsInserted).toBe(0);
expect(r.factsDeleted).toBe(0);
// #1867: the remedy hint points at the re-runnable backfill command,
// not the one-shot v0_32_2 migration (which the ledger never re-runs).
expect(r.warnings.some(w => w.includes('gbrain facts fence-backfill'))).toBe(true);
expect(r.warnings.some(w => w.includes('apply-migrations'))).toBe(true);
// Legacy row was NOT touched.
// eslint-disable-next-line @typescript-eslint/no-explicit-any
-133
View File
@@ -1,133 +0,0 @@
/**
* #1867 — `gbrain facts fence-backfill` command tests.
*
* The command re-runs the (idempotent) v0_32_2 phase B on demand so
* row_num-NULL backlogs — remote extract_facts deposits that predate
* the fence-write backstop — can be cleared without re-running the
* one-shot migration. Real PGLite + real tempdir filesystem.
*/
import { describe, test, expect, beforeAll, afterAll, beforeEach } from 'bun:test';
import { mkdtempSync, rmSync, existsSync, readFileSync } from 'node:fs';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { PGLiteEngine } from '../src/core/pglite-engine.ts';
import { runFactsCommand } from '../src/commands/facts.ts';
import { phaseBFenceFacts } from '../src/commands/migrations/v0_32_2.ts';
let engine: PGLiteEngine;
let brainDir: string;
beforeAll(async () => {
engine = new PGLiteEngine();
await engine.connect({});
await engine.initSchema();
});
afterAll(async () => {
await engine.disconnect();
try {
if (brainDir) rmSync(brainDir, { recursive: true, force: true });
} catch { /* best-effort */ }
});
beforeEach(async () => {
brainDir = mkdtempSync(join(tmpdir(), 'facts-backfill-cmd-test-'));
// eslint-disable-next-line @typescript-eslint/no-explicit-any
await (engine as any).db.query('DELETE FROM facts');
// eslint-disable-next-line @typescript-eslint/no-explicit-any
await (engine as any).db.query(
`UPDATE sources SET local_path = $1 WHERE id = 'default'`,
[brainDir],
);
});
async function seedLegacyFact(fact: string): Promise<void> {
// The row_num-NULL shape a remote extract_facts deposit leaves behind
// when it lands via the legacy DB-only path.
// eslint-disable-next-line @typescript-eslint/no-explicit-any
await (engine as any).db.query(
`INSERT INTO facts (source_id, entity_slug, fact, kind, visibility, notability,
valid_from, source, confidence)
VALUES ('default', 'people/alice', $1, 'fact', 'private', 'medium',
now(), 'mcp:extract_facts', 1.0)`,
[fact],
);
}
describe('gbrain facts fence-backfill', () => {
test('fences row_num-NULL rows and stamps the DB', async () => {
await seedLegacyFact('Deposited remotely');
await runFactsCommand(engine, ['fence-backfill']);
// The fence exists on disk with the claim.
const filePath = join(brainDir, 'people/alice.md');
expect(existsSync(filePath)).toBe(true);
expect(readFileSync(filePath, 'utf-8')).toContain('Deposited remotely');
// The backlog is cleared: no row_num-NULL rows remain.
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const rows = await (engine as any).db.query(
'SELECT row_num, source_markdown_slug FROM facts',
);
expect(rows.rows).toHaveLength(1);
expect(rows.rows[0].row_num).toBe(1);
expect(rows.rows[0].source_markdown_slug).toBe('people/alice');
});
test('re-run is a no-op (idempotent)', async () => {
await seedLegacyFact('Deposited remotely');
await runFactsCommand(engine, ['fence-backfill']);
await runFactsCommand(engine, ['fence-backfill']);
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const rows = await (engine as any).db.query('SELECT id FROM facts');
expect(rows.rows).toHaveLength(1);
const body = readFileSync(join(brainDir, 'people/alice.md'), 'utf-8');
expect(body.match(/Deposited remotely/g)).toHaveLength(1);
});
test('--dry-run reports without writing', async () => {
await seedLegacyFact('Deposited remotely');
await runFactsCommand(engine, ['fence-backfill', '--dry-run']);
expect(existsSync(join(brainDir, 'people/alice.md'))).toBe(false);
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const rows = await (engine as any).db.query(
'SELECT row_num FROM facts',
);
expect(rows.rows[0].row_num).toBeNull();
});
test('diverged page: appends past the DB row_num max instead of colliding (#2044 class)', async () => {
// The #2044 divergence shape the backfill must survive: the DB already
// holds stamped rows 1..3 for the slug (legacy wrong-path fence write),
// but the fence at the resolved path is missing. Fence-max+1 (= 1) would
// collide with the stamped rows on the post-rename UPDATE, failing the
// page and leaving the renamed fence disagreeing with the DB.
for (let n = 1; n <= 3; n++) {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
await (engine as any).db.query(
`INSERT INTO facts (source_id, entity_slug, fact, kind, visibility, notability,
valid_from, source, confidence, row_num, source_markdown_slug)
VALUES ('default', 'people/alice', $1, 'fact', 'private', 'medium',
now(), 'mcp:extract_facts', 1.0, $2, 'people/alice')`,
[`stamped ${n}`, n],
);
}
await seedLegacyFact('Deposited remotely');
const result = await phaseBFenceFacts(engine, { dryRun: false });
expect(result.status).toBe('complete');
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const rows = await (engine as any).db.query(
`SELECT row_num FROM facts WHERE fact = 'Deposited remotely'`,
);
expect(rows.rows[0].row_num).toBe(4);
const body = readFileSync(join(brainDir, 'people/alice.md'), 'utf-8');
expect(body).toContain('| 4 | Deposited remotely |');
});
});
-43
View File
@@ -292,49 +292,6 @@ describe('lookupSourceLocalPath', () => {
});
});
describe('writeFactsToFence — fence/DB divergence (#2044)', () => {
test('seeds row_num past the DB max when the fence lags the DB', async () => {
// Simulate the divergence class from #2044: DB rows were stamped with
// row_nums against a fence written at a path this code no longer reads
// (e.g. the pre-"Local patch 2026-06-11" wrong-path writes). The page
// on disk has NO fence, but the DB already holds row_num 1..3 for the
// slug. Pre-fix, the next deposit re-assigned row_num=1 from fence
// text alone and the whole insertFacts batch failed on
// idx_facts_fence_key.
for (let n = 1; n <= 3; n++) {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
await (engine as any).db.query(
`INSERT INTO facts (source_id, entity_slug, fact, kind, visibility, notability,
valid_from, source, confidence, row_num, source_markdown_slug)
VALUES ('default', 'people/dana', $1, 'fact', 'private', 'medium',
now(), 'mcp:extract_facts', 1.0, $2, 'people/dana')`,
[`old claim ${n}`, n],
);
}
const result = await writeFactsToFence(
engine,
{ sourceId: 'default', localPath: brainDir, slug: 'people/dana' },
[baseInput({ fact: 'second deposit' })],
);
expect(result.fenceWriteFailed).toBeUndefined();
expect(result.inserted).toBe(1);
// The new row landed PAST the DB max, not at fence-max+1 (= 1).
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const rows = await (engine as any).db.query(
'SELECT row_num FROM facts WHERE id = $1',
[result.ids[0]],
);
expect(rows.rows[0].row_num).toBe(4);
// And the on-disk fence carries the same row_num — fence and DB agree.
const body = readFileSync(join(brainDir, 'people/dana.md'), 'utf-8');
expect(body).toContain('| 4 | second deposit |');
});
});
// Cleanup any leftover tempdirs after the whole suite.
afterAll(() => {
// No-op: each test cleaned up via the beforeEach; this is a safety net.
+45 -1
View File
@@ -12,7 +12,7 @@
*/
import { describe, test, expect } from 'bun:test';
import { groupReadyByProvider, findEnvKeyTypos } from '../src/commands/init.ts';
import { groupReadyByProvider, findEnvKeyTypos, seedAIOptionsFromConfig } from '../src/commands/init.ts';
describe('groupReadyByProvider — embedding touchpoint', () => {
test('OPENAI_API_KEY alone → openai is ready', async () => {
@@ -149,3 +149,47 @@ describe('findEnvKeyTypos', () => {
expect(got.find(t => t.userSet === 'COMPLETELY_UNRELATED_KEY')).toBeUndefined();
});
});
describe('seedAIOptionsFromConfig — #1058 cold-install env fallback', () => {
test('null config (no config.json, no DATABASE_URL) falls back to GBRAIN_* env vars', () => {
const got = seedAIOptionsFromConfig(null, {
GBRAIN_EMBEDDING_MODEL: 'voyage:voyage-3-large',
GBRAIN_EMBEDDING_DIMENSIONS: '1024',
GBRAIN_EXPANSION_MODEL: 'openai:gpt-5-mini',
GBRAIN_CHAT_MODEL: 'anthropic:claude-sonnet-4-6',
});
expect(got.embedding_model).toBe('voyage:voyage-3-large');
expect(got.embedding_dimensions).toBe(1024);
expect(got.expansion_model).toBe('openai:gpt-5-mini');
expect(got.chat_model).toBe('anthropic:claude-sonnet-4-6');
});
test('null config + no env vars → empty seed (Tier-3 detection takes over)', () => {
const got = seedAIOptionsFromConfig(null, {});
expect(got).toEqual({});
});
test('persisted config wins (loadConfig already merged env when non-null)', () => {
const got = seedAIOptionsFromConfig(
{ engine: 'pglite', embedding_model: 'openai:text-embedding-3-small', embedding_dimensions: 1536 } as any,
{ GBRAIN_EMBEDDING_MODEL: 'voyage:voyage-3-large' },
);
expect(got.embedding_model).toBe('openai:text-embedding-3-small');
expect(got.embedding_dimensions).toBe(1536);
});
test('embedding_disabled sentinel honored on re-init', () => {
const got = seedAIOptionsFromConfig({ engine: 'pglite', embedding_disabled: true } as any, {});
expect(got.noEmbedding).toBe(true);
expect(got.embedding_model).toBeUndefined();
});
test('non-numeric GBRAIN_EMBEDDING_DIMENSIONS ignored, model still seeds', () => {
const got = seedAIOptionsFromConfig(null, {
GBRAIN_EMBEDDING_MODEL: 'voyage:voyage-3-large',
GBRAIN_EMBEDDING_DIMENSIONS: 'not-a-number',
});
expect(got.embedding_model).toBe('voyage:voyage-3-large');
expect(got.embedding_dimensions).toBeUndefined();
});
});
+19 -18
View File
@@ -5,7 +5,7 @@
* - Batch insert N rows persists row_num + source_markdown_slug
* - Empty batch is a no-op
* - Returns ids in input-order
* - v51 partial UNIQUE collision skips only the colliding row (#2044)
* - v51 partial UNIQUE index rolls back the whole batch on a collision
* - deleteFactsForPage scopes by (source_id, source_markdown_slug);
* never touches other pages or pre-v51 NULL-source_markdown_slug rows
* - deleteFactsForPage on an empty page returns deleted:0 (idempotent)
@@ -135,29 +135,30 @@ describe('engine.insertFacts — batch insert', () => {
});
});
test('v51 partial UNIQUE collision skips ONLY the colliding row (#2044)', async () => {
test('v51 partial UNIQUE index rolls back the whole batch on collision', async () => {
// Seed row #1 first.
await engine.insertFacts([fixtureFact(1, { fact: 'seeded' })], { source_id: 'default' });
// Batch-insert rows that include a colliding row_num=1. Pre-#2044 this
// threw and rolled back the whole batch, making a second remote
// extract_facts deposit to an already-fenced page a hard failure. Now
// ON CONFLICT DO NOTHING skips the colliding row and keeps the rest.
const result = await engine.insertFacts(
[
fixtureFact(2, { fact: 'second' }),
fixtureFact(1, { fact: 'collides' }), // row_num=1 on same (source_id, source_markdown_slug)
fixtureFact(3, { fact: 'third' }),
],
{ source_id: 'default' },
);
expect(result.inserted).toBe(2);
expect(result.ids).toHaveLength(2);
// Now try to batch-insert rows that include a colliding row_num=1.
let threw = false;
try {
await engine.insertFacts(
[
fixtureFact(2, { fact: 'second' }),
fixtureFact(1, { fact: 'collides' }), // row_num=1 on same (source_id, source_markdown_slug)
fixtureFact(3, { fact: 'third' }),
],
{ source_id: 'default' },
);
} catch {
threw = true;
}
expect(threw).toBe(true);
// The seeded row survives untouched; the colliding claim is skipped.
// Verify the transaction rolled back — only the seeded row should remain.
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const rows = await (engine as any).db.query('SELECT fact FROM facts ORDER BY id');
expect(rows.rows.map((r: { fact: string }) => r.fact)).toEqual(['seeded', 'second', 'third']);
expect(rows.rows.map((r: { fact: string }) => r.fact)).toEqual(['seeded']);
});
test('different source_markdown_slug values DO NOT collide on the same row_num', async () => {
+29
View File
@@ -94,6 +94,35 @@ describe('whoami op contract', () => {
expect(result.expires_at).toBeNull();
});
// #1061: stdio MCP is remote/untrusted by design but has no per-token auth
// (local pipe). The stdio dispatch marks ctx.transport='stdio'; whoami
// reports it instead of throwing unknown_transport.
test('stdio transport (remote=true, no auth, transport marker) reports stdio', async () => {
const result = (await whoami.handler(
ctxWith({ remote: true, auth: undefined, transport: 'stdio' }),
{},
)) as any;
expect(result.transport).toBe('stdio');
expect(result.scopes).toEqual([]);
});
test('stdio marker does not mask real auth (auth still wins)', async () => {
const result = (await whoami.handler(
ctxWith({
remote: true,
transport: 'stdio',
auth: {
token: 'gbrain_at_xxx',
clientId: 'gbrain_cl_abc',
scopes: ['read'],
expiresAt: 1,
} as AuthInfo,
}),
{},
)) as any;
expect(result.transport).toBe('oauth');
});
// Q3: ambiguous transport — fail-closed. The footgun this guards against
// is a future transport that lands without threading auth, where a buggy
// caller might trust whoami's output to gate sensitive ops.