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>
125 lines
4.7 KiB
TypeScript
125 lines
4.7 KiB
TypeScript
// src/core/onboard/render.ts
|
|
// v0.41.18.0 (T12). Stable JSON envelope + human renderer for
|
|
// `gbrain onboard`. Library-shaped — no console.* / process.exit; CLI
|
|
// shell calls these and pipes results to its own output.
|
|
|
|
import type { RemediationStep } from '../remediation-step.ts';
|
|
import type { RemediationPlan } from '../remediation/types.ts';
|
|
import type {
|
|
OnboardRecommendation,
|
|
OnboardReport,
|
|
} from './types.ts';
|
|
|
|
/**
|
|
* Translate a RemediationStep into an OnboardRecommendation. Layers the
|
|
* apply_policy + prompt_text + migration_id metadata.
|
|
*
|
|
* Rules of thumb for apply_policy:
|
|
* - protected job (LLM-bearing) → 'prompt_required' or 'manual_only'
|
|
* based on job name (takes-bootstrap stays manual_only per A12).
|
|
* - non-protected (regex, SQL, etc.) → 'auto_apply'.
|
|
*/
|
|
/**
|
|
* v0.42 (D17): jobs that stay manual_only — autopilot will NOT surface
|
|
* these as auto-apply candidates; user must explicitly run
|
|
* `gbrain onboard --auto-with-prompt` or submit the handler directly.
|
|
*
|
|
* Membership criteria: one-time consenting decisions OR LLM-bearing
|
|
* handlers without a mature eval. Adding a new entry here is a load-
|
|
* bearing choice — confirm the apply_policy posture before commit.
|
|
*/
|
|
const MANUAL_ONLY_PROTECTED_JOBS: ReadonlySet<string> = new Set([
|
|
// v0.41.18.0 (A12, A24): takes-bootstrap classifier stays manual_only
|
|
// until v0.42.1 lands the 100+-case eval.
|
|
'extract-takes-from-pages',
|
|
// v0.42 (D17): pack-upgrade migration. Taxonomy change is a one-time
|
|
// consenting user decision; autopilot must not auto-flip the schema pack.
|
|
'unify-types',
|
|
]);
|
|
|
|
export function toOnboardRecommendation(step: RemediationStep): OnboardRecommendation {
|
|
let apply_policy: OnboardRecommendation['apply_policy'] = 'auto_apply';
|
|
if (step.protected) {
|
|
// Manual-only allowlist takes precedence; everything else protected
|
|
// is prompt_required (needs --yes but can run via --auto --yes).
|
|
apply_policy = MANUAL_ONLY_PROTECTED_JOBS.has(step.job) ? 'manual_only' : 'prompt_required';
|
|
}
|
|
return {
|
|
...step,
|
|
apply_policy,
|
|
prompt_text: step.rationale,
|
|
migration_id: step.id,
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Build the stable JSON envelope from a remediation plan. brainId, when
|
|
* available, identifies the brain across runs (consumed by --history
|
|
* cross-runtime joins).
|
|
*/
|
|
export function buildOnboardReport(
|
|
plan: RemediationPlan,
|
|
opts?: { brainId?: string; history?: OnboardReport['history'] },
|
|
): OnboardReport {
|
|
const recs = plan.plan.map(toOnboardRecommendation);
|
|
const summary = {
|
|
total: recs.length,
|
|
auto_eligible: recs.filter((r) => r.apply_policy === 'auto_apply').length,
|
|
prompt_required: recs.filter((r) => r.apply_policy === 'prompt_required').length,
|
|
manual_only: recs.filter((r) => r.apply_policy === 'manual_only').length,
|
|
est_total_usd: plan.est_total_usd_cost,
|
|
};
|
|
return {
|
|
schema_version: 1,
|
|
brain_id: opts?.brainId,
|
|
recommendations: recs,
|
|
summary,
|
|
history: opts?.history,
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Human-readable render (returns string; CLI prints to stdout). Designed
|
|
* for stderr/stdout segregation: the CLI shell prints this on stdout,
|
|
* progress + errors on stderr. Echoes the AskUserQuestion-style
|
|
* "Recommendation + WHY" framing the CEO/Eng review settled on.
|
|
*/
|
|
export function renderHuman(report: OnboardReport): string {
|
|
const lines: string[] = [];
|
|
lines.push(`Brain onboarding: ${report.summary.total} recommendation(s) found`);
|
|
if (report.summary.total === 0) {
|
|
lines.push(' Brain is at target — nothing to do.');
|
|
return lines.join('\n');
|
|
}
|
|
lines.push(
|
|
` ${report.summary.auto_eligible} auto-eligible | ` +
|
|
`${report.summary.prompt_required} prompt-required | ` +
|
|
`${report.summary.manual_only} manual-only`,
|
|
);
|
|
if (report.summary.est_total_usd > 0) {
|
|
lines.push(` Total estimated cost: $${report.summary.est_total_usd.toFixed(2)}`);
|
|
}
|
|
lines.push('');
|
|
for (const r of report.recommendations) {
|
|
const sev = `[${r.severity}]`;
|
|
const policy = r.apply_policy === 'auto_apply' ? '(auto)'
|
|
: r.apply_policy === 'prompt_required' ? '(prompt)'
|
|
: '(manual)';
|
|
const cost = (r.est_usd_cost ?? 0) > 0 ? ` ~$${(r.est_usd_cost ?? 0).toFixed(2)}` : '';
|
|
lines.push(` ${sev} ${policy} ${r.job}${cost}`);
|
|
lines.push(` why: ${r.prompt_text ?? r.rationale}`);
|
|
}
|
|
if (report.history && report.history.length > 0) {
|
|
lines.push('');
|
|
lines.push('Recent impact (last 10):');
|
|
for (const h of report.history.slice(0, 10)) {
|
|
const delta = h.delta !== null ? (h.delta > 0 ? `+${h.delta}` : String(h.delta)) : '?';
|
|
lines.push(
|
|
` ${h.applied_at} ${h.remediation_id} ${h.metric_name}: ` +
|
|
`${h.metric_before ?? '?'} → ${h.metric_after ?? '?'} (${delta})`,
|
|
);
|
|
}
|
|
}
|
|
return lines.join('\n');
|
|
}
|