mirror of
https://github.com/garrytan/gbrain.git
synced 2026-07-27 22:15:33 +00:00
* Merge branch 'master' into garrytan/type-taxonomy-unification Resolve VERSION, package.json, CHANGELOG conflicts with v0.41.22.0 on top, preserving master's v0.41.19.0 entry below. * feat: v0.41.22.0 type-unification cathedral — collapse 94 types to 15 (closes #1479) Ships gbrain-base-v2 as the new install default (15 canonical types: 14 + note catch-all) and the unify-types PROTECTED Minion handler that runs the gbrain-base→v2 migration end-to-end on existing brains. What this delivers: - gbrain-base-v2.yaml standalone schema pack (no extends:) with 14 canonical page_types + 9 cluster mapping_rules + catch-all sentinel - 3 new schema-pack primitives: runRetypeCore (chunked UPDATE with legacy_type stamping), runPageToLinkCore (edge-shaped pages → link rows), runPageToAliasCore (concept-redirect → slug_aliases) - rewriteLinksBatch for N-pair atomic FK rewrite - Migration v104 slug_aliases table (forward-bootstrap probed on both engines for safe upgrade chain) - New engine method resolveSlugWithAlias(slug, sourceOrSources) on both Postgres + PGLite with multi-source ambiguity warning - inferTypeAndSubtypeFromPack overload + subtypes: + mapping_rules: + migration_from: schema-pack manifest extensions - findPackSuccessors version-range walker (1.x / 1.0.x / exact match) - expandTypeFilter for --type back-compat (D14): legacy aliases route through mapping_rules → canonical+subtype before the SQL filter fires - 3 new onboard checks: pack_upgrade_available, type_proliferation, dangling_aliases (source-scoped per F12) - unify-types Minion handler (PROTECTED, manual_only via render.ts allowlist per D17): retype-explicit → retype-catch-all → page-to-link → page-to-alias → final sync → active-pack flip - alias_resolved 1.05x post-fusion search boost stage; KNOBS_HASH_VERSION bumped 5→6 (one-time cache miss on upgrade, self-healing in TTL) - ELIGIBLE_TYPES for facts extraction extended with v2 canonicals (codex F-ELIGIBLE: blocker not v0.43 follow-up) Tests: 79 new unit/integration cases + 3 E2E cases covering all 9 production clusters end-to-end. 124-case verification on the cache-key + build-llms fixes. KNOBS_HASH_VERSION assertions updated in 3 tests. Plan: ~/.claude/plans/system-instruction-you-are-working-transient-elephant.md (16 locked decisions D1-D17, 12 baseline fixes F7-F21 absorbed from codex outside voice). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: CI verify failures — system-of-record allow-comment + schema-unify manifest registration Two CI failures on PR #1542: 1. check:system-of-record flagged page-to-link.ts:207 addLinksBatch as a direct write to a derived table. The call IS the reconcile surface for page_to_link mapping_rules — it converts edge-shaped pages into canonical link rows under the PROTECTED unify-types Minion handler, source-scoped, atomic per-rule. Added the canonical `// gbrain-allow-direct-insert: <reason>` comment on the same line. 2. check:resolver emitted 11 orphan_trigger warnings for `schema-unify` because the skill was added to skills/RESOLVER.md without a corresponding entry in skills/manifest.json. Added the registration under the existing skills[] array. bun run verify: 28/28 checks pass locally. * fix: CI test failures — schema-unify conformance + eligibility regression Six test failures across shards 2 + 10 on PR #1542: 1. resolver.test.ts: round-trip parser requires frontmatter triggers to be quoted (`- "..."` or `- '...'`). schema-unify shipped with bare YAML strings; quoted the 10 triggers to round-trip correctly. 2. skills-conformance.test.ts (×3): schema-unify SKILL.md was missing the required Contract, Anti-Patterns, and Output Format sections that every conformant skill must declare. Added all three: - Contract: inputs / outputs / side effects / failure modes - Anti-Patterns: 5 DON'Ts including the autopilot trust boundary - Output Format: per-phase stderr lines + celebration summary + JSON envelope shape 3. facts-eligibility.test.ts (×2): the v0.41.22 ELIGIBLE_TYPES expansion added `concept` to the eligible list, but the existing test suite pins concept as rejected (it's `extractable: true` in the schema pack but the v0.41.11 contract documented this as "cosmetic on the backstop path because backstop uses hardcoded ELIGIBLE_TYPES"). Removed `concept` from the expansion; other v2 canonicals (media, tweet, atom, analysis) stay. Comment updated to document the deliberate omission. All 6 failing tests now pass locally (370/370 across the 3 affected files). bun run verify: 28/28 checks green. * fix: harden findPackSuccessors test against shard pollution CI shard 8 reported 1 fail (1.00ms — too fast for any real loadActivePack file I/O) on `finds gbrain-base-v2 as successor of gbrain-base@1.0.0`. Local triple-run passes 9/9 in isolation. Root cause: the existing afterEach reset clears the module-level pack cache AFTER each test, but the FIRST test in the file inherits whatever state sibling files in the same bun shard process left behind. With 24+ schema-pack tests in shard 8 (mutate, mutate-audit, best-effort, registry-reload, manifest-v041_2, etc.) running before this file, the first test can read a poisoned cache. Fix: add `beforeEach(_resetPackCacheForTests)`. Two-sided reset guarantees clean state regardless of file ordering within the shard. bun run verify: 28/28 checks pass. * fix: quarantine two flaky tests to serial runner CI shard 1 + shard 8 each surfaced one intermittent failure: shard 1: buildBrainTools > execute() on put_page with valid namespace shard 8: findPackSuccessors > finds gbrain-base-v2 as successor Both pass cleanly in isolation. Both are concurrency races against shared in-shard state: - brain-allowlist.test.ts shares a singleton PGLiteEngine across 18 tests with a beforeEach DELETE FROM pages. With max-concurrency=4, two put_page tests can interleave their TRUNCATE + write phases, so the auto-link/extract sub-steps inside put_page race against the sibling test's DELETE. - schema-pack-find-pack-successors.test.ts reads bundled YAML packs via loadActivePack. The module-level pack cache is shared across parallel tests in the same shard; the previous beforeEach reset helped but didn't fully isolate against concurrent file reads under CI load. Fix per CLAUDE.md test-isolation lint rule R2 (concurrency-fragile files belong in the .serial.test.ts quarantine): rename both files to *.serial.test.ts. Serial runner picks them up at max-concurrency=1. 49/49 serial files pass locally. 28/28 verify checks pass. * fix: quarantine embed-stale test to serial runner CI shard 9 reported 6 failures, all from the embedStaleForSource describe block, all ~120-150ms each — classic shared-engine concurrency race shape. Passes 7/7 locally in isolation. Root cause: embed-stale.test.ts shares a singleton PGLiteEngine across 7 tests with beforeEach resetPgliteState. Under bun's max-concurrency=4 in the parallel shard, two tests can interleave their TRUNCATE + seedPage + upsertChunks + embedStaleForSource flow, so one test's stale-chunk count sees another test's mid-flight writes. Same fix as brain-allowlist.serial.test.ts and schema-pack-find-pack-successors.serial.test.ts: rename to *.serial.test.ts so the serial runner picks it up at max-concurrency=1. bun run verify: 28/28 checks pass. 7/7 embed-stale tests pass via serial. --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
184 lines
7.6 KiB
TypeScript
184 lines
7.6 KiB
TypeScript
/**
|
|
* Subagent brain-tool registry tests. Covers:
|
|
* - every allow-list name exists in OPERATIONS (catches renames upstream)
|
|
* - Anthropic tool-name constraint enforced
|
|
* - put_page schema is namespace-wrapped per subagent
|
|
* - execute() invokes the op handler with viaSubagent=true + subagentId
|
|
* - filterAllowedTools narrows registry + rejects unknown names
|
|
* - denied ops (file_upload etc.) do NOT appear in the registry
|
|
*/
|
|
|
|
import { describe, test, expect, beforeAll, afterAll, beforeEach } from 'bun:test';
|
|
import { PGLiteEngine } from '../src/core/pglite-engine.ts';
|
|
import { operations, OperationError } from '../src/core/operations.ts';
|
|
import {
|
|
BRAIN_TOOL_ALLOWLIST,
|
|
buildBrainTools,
|
|
filterAllowedTools,
|
|
__testing,
|
|
} from '../src/core/minions/tools/brain-allowlist.ts';
|
|
import type { GBrainConfig } from '../src/core/config.ts';
|
|
import type { ToolCtx } from '../src/core/minions/types.ts';
|
|
|
|
let engine: PGLiteEngine;
|
|
const config: GBrainConfig = { engine: 'pglite' } as GBrainConfig;
|
|
|
|
beforeAll(async () => {
|
|
engine = new PGLiteEngine();
|
|
await engine.connect({ database_url: '' });
|
|
await engine.initSchema();
|
|
}, 60_000); // OAuth v25 + full migration chain needs breathing room
|
|
|
|
afterAll(async () => {
|
|
if (engine) await engine.disconnect();
|
|
}, 60_000);
|
|
|
|
beforeEach(async () => {
|
|
await engine.executeRaw('DELETE FROM pages');
|
|
});
|
|
|
|
describe('BRAIN_TOOL_ALLOWLIST', () => {
|
|
test('every name exists in src/core/operations.ts OPERATIONS', () => {
|
|
const opNames = new Set(operations.map(o => o.name));
|
|
const missing = [...BRAIN_TOOL_ALLOWLIST].filter(n => !opNames.has(n));
|
|
expect(missing).toEqual([]);
|
|
});
|
|
|
|
test('contains the v0.15 read-only 10 + put_page + v0.29 salience pair', () => {
|
|
// v0.29 added get_recent_salience + find_anomalies (read-only).
|
|
// get_recent_transcripts is deliberately excluded — subagent calls always
|
|
// have ctx.remote=true, and the v0.29 trust gate rejects remote callers.
|
|
expect(BRAIN_TOOL_ALLOWLIST.size).toBe(13);
|
|
expect(BRAIN_TOOL_ALLOWLIST.has('query')).toBe(true);
|
|
expect(BRAIN_TOOL_ALLOWLIST.has('search')).toBe(true);
|
|
expect(BRAIN_TOOL_ALLOWLIST.has('get_page')).toBe(true);
|
|
expect(BRAIN_TOOL_ALLOWLIST.has('list_pages')).toBe(true);
|
|
expect(BRAIN_TOOL_ALLOWLIST.has('put_page')).toBe(true);
|
|
expect(BRAIN_TOOL_ALLOWLIST.has('get_recent_salience')).toBe(true);
|
|
expect(BRAIN_TOOL_ALLOWLIST.has('find_anomalies')).toBe(true);
|
|
expect(BRAIN_TOOL_ALLOWLIST.has('get_recent_transcripts')).toBe(false);
|
|
});
|
|
|
|
test('does NOT contain destructive ops', () => {
|
|
expect(BRAIN_TOOL_ALLOWLIST.has('file_upload')).toBe(false);
|
|
expect(BRAIN_TOOL_ALLOWLIST.has('delete_page')).toBe(false);
|
|
expect(BRAIN_TOOL_ALLOWLIST.has('delete_file')).toBe(false);
|
|
expect(BRAIN_TOOL_ALLOWLIST.has('sync')).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe('buildBrainTools', () => {
|
|
test('produces one ToolDef per allow-listed op that exists in operations.ts', () => {
|
|
const tools = buildBrainTools({ subagentId: 42, engine, config });
|
|
const opNames = new Set(operations.map(o => o.name));
|
|
const expected = [...BRAIN_TOOL_ALLOWLIST].filter(n => opNames.has(n)).length;
|
|
expect(tools.length).toBe(expected);
|
|
});
|
|
|
|
test('tool names are brain_<op> and match Anthropic constraint', () => {
|
|
const tools = buildBrainTools({ subagentId: 7, engine, config });
|
|
for (const t of tools) {
|
|
expect(t.name).toMatch(__testing.ANTHROPIC_NAME_RE);
|
|
expect(t.name.startsWith('brain_')).toBe(true);
|
|
}
|
|
});
|
|
|
|
test('tools are flagged idempotent in v0.15', () => {
|
|
const tools = buildBrainTools({ subagentId: 1, engine, config });
|
|
expect(tools.every(t => t.idempotent === true)).toBe(true);
|
|
});
|
|
|
|
test('tools carry the op description verbatim', () => {
|
|
const tools = buildBrainTools({ subagentId: 1, engine, config });
|
|
const getPage = tools.find(t => t.name === 'brain_get_page');
|
|
const op = operations.find(o => o.name === 'get_page');
|
|
expect(getPage?.description).toBe(op!.description);
|
|
});
|
|
|
|
test('put_page schema is namespace-wrapped per subagent', () => {
|
|
const tools42 = buildBrainTools({ subagentId: 42, engine, config });
|
|
const putPage42 = tools42.find(t => t.name === 'brain_put_page');
|
|
const slug42 = ((putPage42!.input_schema as any).properties as any).slug;
|
|
expect(slug42.pattern).toBe('^wiki/agents/42/.+');
|
|
expect(slug42.description).toContain('wiki/agents/42/');
|
|
|
|
const tools7 = buildBrainTools({ subagentId: 7, engine, config });
|
|
const putPage7 = tools7.find(t => t.name === 'brain_put_page');
|
|
const slug7 = ((putPage7!.input_schema as any).properties as any).slug;
|
|
expect(slug7.pattern).toBe('^wiki/agents/7/.+');
|
|
});
|
|
|
|
test('non-put_page tools do NOT get a pattern on slug', () => {
|
|
const tools = buildBrainTools({ subagentId: 42, engine, config });
|
|
const getPage = tools.find(t => t.name === 'brain_get_page');
|
|
const slug = ((getPage!.input_schema as any).properties as any).slug;
|
|
expect(slug).toBeDefined();
|
|
expect(slug.pattern).toBeUndefined();
|
|
});
|
|
|
|
test('execute() on put_page with valid namespace slug succeeds', async () => {
|
|
const tools = buildBrainTools({ subagentId: 42, engine, config });
|
|
const putPage = tools.find(t => t.name === 'brain_put_page');
|
|
const ctx: ToolCtx = { engine, jobId: 1, remote: true };
|
|
const res = await putPage!.execute(
|
|
{ slug: 'wiki/agents/42/notes', content: '---\ntitle: Notes\n---\nbody' },
|
|
ctx,
|
|
);
|
|
expect(res).toBeTruthy();
|
|
});
|
|
|
|
test('execute() on put_page with out-of-namespace slug throws permission_denied', async () => {
|
|
const tools = buildBrainTools({ subagentId: 42, engine, config });
|
|
const putPage = tools.find(t => t.name === 'brain_put_page');
|
|
const ctx: ToolCtx = { engine, jobId: 1, remote: true };
|
|
await expect(
|
|
putPage!.execute(
|
|
{ slug: 'wiki/analysis/stomp', content: '---\ntitle: x\n---\nb' },
|
|
ctx,
|
|
),
|
|
).rejects.toBeInstanceOf(OperationError);
|
|
});
|
|
});
|
|
|
|
describe('filterAllowedTools', () => {
|
|
test('passes prefixed names through', () => {
|
|
const tools = buildBrainTools({ subagentId: 1, engine, config });
|
|
const filtered = filterAllowedTools(tools, ['brain_get_page', 'brain_search']);
|
|
expect(filtered.map(t => t.name)).toEqual(['brain_get_page', 'brain_search']);
|
|
});
|
|
|
|
test('accepts un-prefixed names as a convenience', () => {
|
|
const tools = buildBrainTools({ subagentId: 1, engine, config });
|
|
const filtered = filterAllowedTools(tools, ['get_page', 'search']);
|
|
expect(filtered.map(t => t.name)).toEqual(['brain_get_page', 'brain_search']);
|
|
});
|
|
|
|
test('rejects unknown tool names (no silent ignore)', () => {
|
|
const tools = buildBrainTools({ subagentId: 1, engine, config });
|
|
expect(() => filterAllowedTools(tools, ['brain_typo_nope'])).toThrow(/unknown tool/);
|
|
});
|
|
|
|
test('deduplicates when both prefixed + unprefixed given', () => {
|
|
const tools = buildBrainTools({ subagentId: 1, engine, config });
|
|
const filtered = filterAllowedTools(tools, ['brain_get_page', 'get_page']);
|
|
expect(filtered.length).toBe(1);
|
|
});
|
|
|
|
test('empty array yields empty registry', () => {
|
|
const tools = buildBrainTools({ subagentId: 1, engine, config });
|
|
expect(filterAllowedTools(tools, [])).toEqual([]);
|
|
});
|
|
});
|
|
|
|
describe('sanitizeToolName', () => {
|
|
test('returns within 64 chars', () => {
|
|
// Synthetic: simulate an op name long enough to need slicing.
|
|
const long = 'a'.repeat(100);
|
|
expect(__testing.sanitizeToolName(long).length).toBeLessThanOrEqual(64);
|
|
});
|
|
|
|
test('replaces non-conforming chars with _', () => {
|
|
expect(__testing.sanitizeToolName('foo.bar')).toBe('brain_foo_bar');
|
|
});
|
|
});
|