mirror of
https://github.com/garrytan/gbrain.git
synced 2026-07-27 22:15:33 +00:00
* fix-wave: dream.* DB merge + batch retry + extract_atoms idempotency + ze-switch env-gate + doctor check Closes PRs #1414, #1416, #1421 (rebuilt from designs by @garrytan-agents with structural improvements from /plan-eng-review + codex outside-voice). Three production reliability fixes in one wave: 1. dream.* DB-config merge (closes PR #1416 silent-config gap) - loadConfigWithEngine() sparse-merge extends with 7 dream.* keys - File > DB > defaults precedence (no GBRAIN_DREAM_* env vars) - extract-atoms switches to loadConfigWithEngine() so DB-plane keys reach it 2. Batch retry on transient connection drops (closes PR #1416 ~30%-loss bug) - withRetry() pure primitive exported from src/commands/extract.ts - 6 flush() sites snapshot-before-clear with onRetry callback - Reuses isRetryableConnError from src/core/retry-matcher.ts - retry-matcher extended with GBrainError{problem:'No database connection'} 3. extract_atoms source-hash idempotency + page-based discovery (closes #1414) - One raw SQL with NOT EXISTS subquery replaces 6 listPages + N atom checks - sourceId threaded through every putPage call (codex caught real bug) - NULL content_hash filter + dream_generated exclusion + transcript-side idempotency - cycle.ts passes union of syncPagesAffected + synthesizeWrittenSlugs 4. ze-switch pre-apply + pre-resume env-override gate (closes PR #1421) - Gate fires FIRST in apply AND resume; zero setConfig calls on refusal - ASCII warning box (no Unicode per repo D10) - --ignore-env-override escape hatch for power users - ApplyResult extended with refused variant 5. doctor embedding_env_override check (defense-in-depth for #1421) - Cross-surface parity: buildChecks() + doctorReportRemote() - Uses Check.details (not Check.issues per codex schema review) Co-Authored-By: garrytan-agents <garrytan-agents@users.noreply.github.com> Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore: bump version and changelog (v0.41.10.0) Adds 61 new tests across 5 new files pinning the fix-wave contracts: - test/extract-batch-retry.test.ts (16 cases) — withRetry primitive + snapshot contract - test/extract-atoms-page-discovery.test.ts (17 cases) — discovery SQL + dual-source idempotency - test/ze-switch-env-override.test.ts (17 cases) — env-gate apply + resume + ZERO-setConfig assertion - test/doctor-embedding-env-override.test.ts (7 cases) — cross-surface parity - test/e2e/extract-atoms-discovery-sql.test.ts (4 cases) — real-Postgres parity for raw SQL Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(test): pin gateway to 1536-dim in 2 PGLite tests that hardcode 1536-vector inserts CI shards 1 + 4 failed persistently (not flake — confirmed via retry) after the v0.41.6.0 merge with this error: error: expected 1280 dimensions, not 1536 file: "vector.c", routine: "CheckExpectedDim" Two test files insert 1536-dim Float32Array vectors into `content_chunks.embedding` / `facts.embedding`, but v0.41.5.0 flipped `DEFAULT_EMBEDDING_DIMENSIONS` from 1536 to 1280 (ZE Matryoshka default). On a fresh CI bun process where no prior test pre-configured the gateway, `initSchema()` sizes the vector column at vector(1280) and the inserts throw. Locally this is hidden when an earlier test file in the shard happens to have called `configureGateway({embedding_dimensions: 1536})` — that state leaks forward through bun's shared process. The v0.41.6.0 LPT shard re-balancing reordered files so these two ran cold, surfacing the latent bug. Fix follows the canonical hermetic pattern from test/consolidate-valid-until.test.ts:23-34: pin the gateway to 1536d in beforeAll, reset in afterAll. Test is now isolated from shard ordering. test/search-types-filter.test.ts — shard 1 fail test/operations-find-trajectory.test.ts — shard 4 (6 fails) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore: empty commit to trigger CI * chore: trigger CI again * chore: renumber v0.41.10.0 -> v0.41.10.1 Per request — version slot moved to .1 micro tier to leave .0 available for unrelated wave landing on master. --------- Co-authored-by: garrytan-agents <garrytan-agents@users.noreply.github.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
328 lines
12 KiB
TypeScript
328 lines
12 KiB
TypeScript
// v0.41.2.1 — ze-switch env-override safety gate (D3 + D9 #6, #7, #8).
|
|
//
|
|
// Pinned contracts:
|
|
// - detectEnvOverride pure function (no env mutation; tests pass env arg)
|
|
// - formatEnvOverrideWarning produces ASCII-only box ≤78 cols
|
|
// - applyRetrievalUpgrade gate fires FIRST (NO setConfig calls when refused)
|
|
// - resumeRetrievalUpgrade gate fires FIRST (refused too, no schema mutation)
|
|
// - --ignore-env-override escape hatch bypasses both gates
|
|
// - ApplyResult tagged union extends with {status:'refused', reason, warning}
|
|
//
|
|
// Hermetic: PGLite + withEnv() per CLAUDE.md R1/R3/R4. No DATABASE_URL needed.
|
|
|
|
import { describe, test, expect, beforeAll, afterAll, beforeEach } from 'bun:test';
|
|
import { PGLiteEngine } from '../src/core/pglite-engine.ts';
|
|
import {
|
|
detectEnvOverride,
|
|
formatEnvOverrideWarning,
|
|
applyRetrievalUpgrade,
|
|
resumeRetrievalUpgrade,
|
|
planRetrievalUpgrade,
|
|
KEY_REQUESTED,
|
|
KEY_APPLIED,
|
|
KEY_PREVIOUS_SNAPSHOT,
|
|
ZE_TARGET_EMBEDDING_MODEL,
|
|
ZE_TARGET_EMBEDDING_DIM,
|
|
} from '../src/core/retrieval-upgrade-planner.ts';
|
|
import { resetPgliteState } from './helpers/reset-pglite.ts';
|
|
import { withEnv } from './helpers/with-env.ts';
|
|
|
|
let engine: PGLiteEngine;
|
|
|
|
beforeAll(async () => {
|
|
engine = new PGLiteEngine();
|
|
await engine.connect({});
|
|
await engine.initSchema();
|
|
}, 60000);
|
|
|
|
afterAll(async () => {
|
|
await engine.disconnect();
|
|
});
|
|
|
|
beforeEach(async () => {
|
|
await resetPgliteState(engine);
|
|
});
|
|
|
|
// ─── detectEnvOverride: pure function tests (no env mutation needed) ────
|
|
|
|
describe('detectEnvOverride (pure)', () => {
|
|
test('triggered:false when env unset', () => {
|
|
const w = detectEnvOverride('zeroentropyai:zembed-1', 1280, {});
|
|
expect(w.triggered).toBe(false);
|
|
expect(w.vars).toEqual([]);
|
|
});
|
|
|
|
test('triggered:false when env matches target exactly', () => {
|
|
const w = detectEnvOverride('zeroentropyai:zembed-1', 1280, {
|
|
GBRAIN_EMBEDDING_MODEL: 'zeroentropyai:zembed-1',
|
|
GBRAIN_EMBEDDING_DIMENSIONS: '1280',
|
|
});
|
|
expect(w.triggered).toBe(false);
|
|
});
|
|
|
|
test('triggered:true on GBRAIN_EMBEDDING_MODEL mismatch (1 var)', () => {
|
|
const w = detectEnvOverride('zeroentropyai:zembed-1', 1280, {
|
|
GBRAIN_EMBEDDING_MODEL: 'openai:text-embedding-3-large',
|
|
});
|
|
expect(w.triggered).toBe(true);
|
|
expect(w.vars).toHaveLength(1);
|
|
expect(w.vars[0].name).toBe('GBRAIN_EMBEDDING_MODEL');
|
|
expect(w.vars[0].current).toBe('openai:text-embedding-3-large');
|
|
expect(w.vars[0].target).toBe('zeroentropyai:zembed-1');
|
|
});
|
|
|
|
test('GBRAIN_EMBEDDING_DIMENSIONS string-vs-number comparison works', () => {
|
|
const w = detectEnvOverride('zeroentropyai:zembed-1', 1280, {
|
|
GBRAIN_EMBEDDING_DIMENSIONS: '1536',
|
|
});
|
|
expect(w.triggered).toBe(true);
|
|
expect(w.vars[0].name).toBe('GBRAIN_EMBEDDING_DIMENSIONS');
|
|
expect(w.vars[0].current).toBe('1536');
|
|
expect(w.vars[0].target).toBe('1280');
|
|
});
|
|
|
|
test('NaN dim treated as mismatch (defensive)', () => {
|
|
const w = detectEnvOverride('zeroentropyai:zembed-1', 1280, {
|
|
GBRAIN_EMBEDDING_DIMENSIONS: 'not-a-number',
|
|
});
|
|
expect(w.triggered).toBe(true);
|
|
expect(w.vars[0].current).toBe('not-a-number');
|
|
});
|
|
|
|
test('both vars set + both mismatched → 2 entries', () => {
|
|
const w = detectEnvOverride('zeroentropyai:zembed-1', 1280, {
|
|
GBRAIN_EMBEDDING_MODEL: 'openai:text-embedding-3-large',
|
|
GBRAIN_EMBEDDING_DIMENSIONS: '1536',
|
|
});
|
|
expect(w.triggered).toBe(true);
|
|
expect(w.vars).toHaveLength(2);
|
|
});
|
|
|
|
test('empty-string env values treated as unset (no false-trigger)', () => {
|
|
const w = detectEnvOverride('zeroentropyai:zembed-1', 1280, {
|
|
GBRAIN_EMBEDDING_MODEL: '',
|
|
GBRAIN_EMBEDDING_DIMENSIONS: ' ',
|
|
});
|
|
expect(w.triggered).toBe(false);
|
|
});
|
|
});
|
|
|
|
// ─── formatEnvOverrideWarning: pure rendering ──────────────────────────
|
|
|
|
describe('formatEnvOverrideWarning', () => {
|
|
test('produces ASCII-only box (no Unicode box-drawing per repo D10)', () => {
|
|
const out = formatEnvOverrideWarning({
|
|
triggered: true,
|
|
vars: [{ name: 'GBRAIN_EMBEDDING_MODEL', current: 'openai:x', target: 'zeroentropyai:zembed-1' }],
|
|
});
|
|
// Should NOT contain any Unicode box-drawing characters
|
|
expect(out).not.toMatch(/[╔╗╚╝═║╠╣╦╩╬]/);
|
|
// Should contain ASCII box characters
|
|
expect(out).toMatch(/[+|-]/);
|
|
});
|
|
|
|
test('every line is ≤ 78 cols (terminal-safe)', () => {
|
|
const out = formatEnvOverrideWarning({
|
|
triggered: true,
|
|
vars: [
|
|
{ name: 'GBRAIN_EMBEDDING_MODEL', current: 'openai:text-embedding-3-large', target: 'zeroentropyai:zembed-1' },
|
|
{ name: 'GBRAIN_EMBEDDING_DIMENSIONS', current: '1536', target: '1280' },
|
|
],
|
|
});
|
|
for (const line of out.split('\n')) {
|
|
expect(line.length).toBeLessThanOrEqual(78);
|
|
}
|
|
});
|
|
|
|
test('names every var by exact key', () => {
|
|
const out = formatEnvOverrideWarning({
|
|
triggered: true,
|
|
vars: [
|
|
{ name: 'GBRAIN_EMBEDDING_MODEL', current: 'a', target: 'b' },
|
|
{ name: 'GBRAIN_EMBEDDING_DIMENSIONS', current: 'c', target: 'd' },
|
|
],
|
|
});
|
|
expect(out).toContain('GBRAIN_EMBEDDING_MODEL');
|
|
expect(out).toContain('GBRAIN_EMBEDDING_DIMENSIONS');
|
|
});
|
|
|
|
test('includes paste-ready `unset` command listing every var', () => {
|
|
const out = formatEnvOverrideWarning({
|
|
triggered: true,
|
|
vars: [
|
|
{ name: 'GBRAIN_EMBEDDING_MODEL', current: 'a', target: 'b' },
|
|
{ name: 'GBRAIN_EMBEDDING_DIMENSIONS', current: 'c', target: 'd' },
|
|
],
|
|
});
|
|
expect(out).toContain('unset GBRAIN_EMBEDDING_MODEL GBRAIN_EMBEDDING_DIMENSIONS');
|
|
});
|
|
});
|
|
|
|
// ─── applyRetrievalUpgrade integration (D9 #7 — gate fires FIRST) ──────
|
|
|
|
describe('applyRetrievalUpgrade env-gate (D9 #7)', () => {
|
|
test('refused on env-triggered apply; ZERO setConfig calls fired', async () => {
|
|
await withEnv({ GBRAIN_EMBEDDING_MODEL: 'openai:text-embedding-3-large' }, async () => {
|
|
// Spy on engine.setConfig
|
|
const setConfigSpy: string[] = [];
|
|
const realSetConfig = engine.setConfig.bind(engine);
|
|
(engine as unknown as { setConfig: typeof engine.setConfig }).setConfig =
|
|
async (key: string, val: string) => {
|
|
setConfigSpy.push(key);
|
|
return realSetConfig(key, val);
|
|
};
|
|
|
|
try {
|
|
// Force an eligible plan by seeding the legacy default + enough pages.
|
|
await engine.setConfig('embedding_model', 'openai:text-embedding-3-large');
|
|
// Seed 101 pages to clear the ZE_MIN_PAGES_FOR_OFFER threshold.
|
|
for (let i = 0; i < 101; i++) {
|
|
await engine.putPage(`note/seed-${i}`, {
|
|
type: 'note' as never,
|
|
title: `seed-${i}`,
|
|
compiled_truth: 'x',
|
|
timeline: '',
|
|
});
|
|
}
|
|
// Reset the spy AFTER the setup writes
|
|
setConfigSpy.length = 0;
|
|
|
|
const plan = await planRetrievalUpgrade(engine);
|
|
expect(plan.ze_switch_offered).toBe(true);
|
|
|
|
const result = await applyRetrievalUpgrade(engine, plan);
|
|
expect(result.status).toBe('refused');
|
|
if (result.status === 'refused') {
|
|
expect(result.reason).toBe('env_override');
|
|
expect(result.warning.triggered).toBe(true);
|
|
expect(result.warning.vars[0].name).toBe('GBRAIN_EMBEDDING_MODEL');
|
|
}
|
|
// THE LOAD-BEARING ASSERTION: no setConfig calls fired during the
|
|
// refused apply. Pre-fix, KEY_PREVIOUS_SNAPSHOT and KEY_REQUESTED
|
|
// were written BEFORE the warning gate, leaving the brain in a
|
|
// half-applied state. Now: zero mutations on refusal.
|
|
expect(setConfigSpy).toEqual([]);
|
|
|
|
// Direct evidence: KEY_REQUESTED + KEY_PREVIOUS_SNAPSHOT unset
|
|
const requested = await engine.getConfig(KEY_REQUESTED);
|
|
const snapshot = await engine.getConfig(KEY_PREVIOUS_SNAPSHOT);
|
|
expect(requested).toBeNull();
|
|
expect(snapshot).toBeNull();
|
|
} finally {
|
|
(engine as unknown as { setConfig: typeof engine.setConfig }).setConfig = realSetConfig;
|
|
}
|
|
});
|
|
});
|
|
|
|
test('--ignore-env-override proceeds with apply when env triggered', async () => {
|
|
await withEnv({ GBRAIN_EMBEDDING_MODEL: 'openai:text-embedding-3-large' }, async () => {
|
|
await engine.setConfig('embedding_model', 'openai:text-embedding-3-large');
|
|
for (let i = 0; i < 101; i++) {
|
|
await engine.putPage(`note/x-${i}`, {
|
|
type: 'note' as never,
|
|
title: `x-${i}`,
|
|
compiled_truth: 'c',
|
|
timeline: '',
|
|
});
|
|
}
|
|
const plan = await planRetrievalUpgrade(engine);
|
|
const result = await applyRetrievalUpgrade(engine, plan, { ignoreEnvOverride: true });
|
|
expect(result.status).toBe('applied');
|
|
const appliedFlag = await engine.getConfig(KEY_APPLIED);
|
|
expect(appliedFlag).toBe('true');
|
|
});
|
|
});
|
|
|
|
test('env not triggered → proceeds silently (no env vars set)', async () => {
|
|
// No env vars at all
|
|
await withEnv(
|
|
{ GBRAIN_EMBEDDING_MODEL: undefined, GBRAIN_EMBEDDING_DIMENSIONS: undefined },
|
|
async () => {
|
|
await engine.setConfig('embedding_model', 'openai:text-embedding-3-large');
|
|
for (let i = 0; i < 101; i++) {
|
|
await engine.putPage(`note/y-${i}`, {
|
|
type: 'note' as never,
|
|
title: `y-${i}`,
|
|
compiled_truth: 'c',
|
|
timeline: '',
|
|
});
|
|
}
|
|
const plan = await planRetrievalUpgrade(engine);
|
|
const result = await applyRetrievalUpgrade(engine, plan);
|
|
expect(result.status).toBe('applied');
|
|
},
|
|
);
|
|
});
|
|
|
|
test('result tagged union shape pinned (TypeScript discriminator + runtime)', async () => {
|
|
await withEnv({ GBRAIN_EMBEDDING_MODEL: 'openai:other-model' }, async () => {
|
|
await engine.setConfig('embedding_model', 'openai:text-embedding-3-large');
|
|
for (let i = 0; i < 101; i++) {
|
|
await engine.putPage(`note/z-${i}`, {
|
|
type: 'note' as never,
|
|
title: `z-${i}`,
|
|
compiled_truth: 'c',
|
|
timeline: '',
|
|
});
|
|
}
|
|
const plan = await planRetrievalUpgrade(engine);
|
|
const result = await applyRetrievalUpgrade(engine, plan);
|
|
expect(result.status).toBe('refused');
|
|
// Type narrowing: runtime + TS check
|
|
if (result.status === 'refused') {
|
|
expect(result.reason).toBe('env_override');
|
|
expect(Array.isArray(result.warning.vars)).toBe(true);
|
|
expect(result.plan).toBeDefined();
|
|
}
|
|
});
|
|
});
|
|
});
|
|
|
|
// ─── resumeRetrievalUpgrade env-gate (D9 #6 — same gate, no bypass) ────
|
|
|
|
describe('resumeRetrievalUpgrade env-gate (D9 #6)', () => {
|
|
test('refused on env-triggered resume; ZERO schema-mutation setConfig calls fired', async () => {
|
|
// Set up a half-applied state: requested=true, applied=false.
|
|
// Then run resume with env override set.
|
|
await engine.setConfig(KEY_REQUESTED, 'true');
|
|
await engine.setConfig('embedding_model', 'openai:text-embedding-3-large');
|
|
|
|
await withEnv({ GBRAIN_EMBEDDING_MODEL: 'openai:still-old-model' }, async () => {
|
|
const setConfigSpy: string[] = [];
|
|
const realSetConfig = engine.setConfig.bind(engine);
|
|
(engine as unknown as { setConfig: typeof engine.setConfig }).setConfig =
|
|
async (key: string, val: string) => {
|
|
setConfigSpy.push(key);
|
|
return realSetConfig(key, val);
|
|
};
|
|
|
|
try {
|
|
const result = await resumeRetrievalUpgrade(engine);
|
|
expect(result.status).toBe('refused');
|
|
if (result.status === 'refused') {
|
|
expect(result.reason).toBe('env_override');
|
|
}
|
|
// No setConfig calls fired (no schema-completion writes happened)
|
|
expect(setConfigSpy).toEqual([]);
|
|
// APPLIED stays NOT-set
|
|
const applied = await engine.getConfig(KEY_APPLIED);
|
|
expect(applied).toBeNull();
|
|
} finally {
|
|
(engine as unknown as { setConfig: typeof engine.setConfig }).setConfig = realSetConfig;
|
|
}
|
|
});
|
|
});
|
|
|
|
test('--ignore-env-override proceeds with resume', async () => {
|
|
await engine.setConfig(KEY_REQUESTED, 'true');
|
|
await engine.setConfig('embedding_model', 'openai:text-embedding-3-large');
|
|
|
|
await withEnv({ GBRAIN_EMBEDDING_MODEL: 'openai:still-old' }, async () => {
|
|
const result = await resumeRetrievalUpgrade(engine, { ignoreEnvOverride: true });
|
|
expect(result.status).toBe('applied');
|
|
const appliedFlag = await engine.getConfig(KEY_APPLIED);
|
|
expect(appliedFlag).toBe('true');
|
|
});
|
|
});
|
|
});
|