From b0f74017d713828d7191e048374652a03e4e0116 Mon Sep 17 00:00:00 2001 From: Time Attakc <89218912+time-attack@users.noreply.github.com> Date: Thu, 23 Jul 2026 12:03:26 -0700 Subject: [PATCH] fix(calibration): resolve owner holder via config (default 'self') (#3077) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(calibration): resolve owner holder via config (default 'self'), fixes #2464 Takeover of #2467 (rebased onto master). consolidate writes owner takes with holder='self' while calibration-profile, calibration CLI/op, think's calibration block, emotional-weight, and doctor's calibration_freshness all defaulted to a hardcoded 'garry' — so getScorecard returned 0 resolved and the calibration profile never built on non-upstream brains. New src/core/owner-holder.ts is the single source of truth: resolveOwnerHolder({override, configValue}) = override > emotional_weight.user_holder config > 'self'. All six call sites route through it; doctor's freshness SQL is parameterized (). Upgrade note: upstream-owner brains with historical holder='garry' profiles should `gbrain config set emotional_weight.user_holder garry` to keep reading them. Co-authored-by: devty Co-Authored-By: Claude Fable 5 * test(calibration): replace real-name holder fixture with charlie-example placeholder Privacy iron rule: no real people's names in checked-in code. The sanctioned placeholder mapping uses people/charlie-example. Co-Authored-By: Claude Fable 5 --------- Co-authored-by: Sinabina Co-authored-by: devty Co-authored-by: Claude Fable 5 Co-authored-by: Garry Tan --- docs/architecture/KEY_FILES.md | 1 + docs/takes-vs-facts.md | 15 ++++++++++++++ src/commands/calibration.ts | 13 +++++++++--- src/commands/doctor.ts | 10 +++++++-- src/commands/serve-http.ts | 7 ++++--- src/commands/takes.ts | 3 ++- src/core/brainstorm/orchestrator.ts | 5 +++-- src/core/calibration/think-ab.ts | 2 +- src/core/cycle/calibration-profile.ts | 8 ++++++-- src/core/cycle/emotional-weight.ts | 11 ++++++---- src/core/operations.ts | 2 +- src/core/owner-holder.ts | 24 ++++++++++++++++++++++ src/core/think/index.ts | 10 ++++++--- test/calibration-cli.test.ts | 20 +++++++++++------- test/calibration-profile.test.ts | 28 ++++++++++++++++++++++++-- test/doctor-calibration-checks.test.ts | 6 ++++++ test/emotional-weight.test.ts | 4 ++++ test/owner-holder.test.ts | 27 +++++++++++++++++++++++++ 18 files changed, 165 insertions(+), 31 deletions(-) create mode 100644 src/core/owner-holder.ts create mode 100644 test/owner-holder.test.ts diff --git a/docs/architecture/KEY_FILES.md b/docs/architecture/KEY_FILES.md index bd4c80623..d26ea811d 100644 --- a/docs/architecture/KEY_FILES.md +++ b/docs/architecture/KEY_FILES.md @@ -457,6 +457,7 @@ unresolvable+true|false, pre-v80 NULL/NULL rows survive). - `src/core/think/prompt.ts` extension — anti-bias rewrite. `withCalibration` option on `buildThinkSystemPrompt` adds anti-bias rules. `buildCalibrationBlock()` emits the `` XML. `buildThinkUserMessage` has TWO shapes: default (question first), and with-calibration (retrieval → calibration → question) when opt-in. Wired into `runThink` via `opts.withCalibration` + `opts.calibrationHolder`. - `src/commands/calibration.ts` — CLI: `gbrain calibration` (read + print), `--regenerate`, `--undo-wave `, `ab-report`. MCP op `get_calibration_profile` (scope: read) backs the same data path. Source-scoped via `sourceScopeOpts(ctx)`. - `src/commands/serve-http.ts` extension — three admin routes: `/admin/api/calibration/profile`, `/admin/api/calibration/charts/:type` (image/svg+xml; type in {brier-trend, domain-bars, pattern-statements, abandoned-threads}), `/admin/api/calibration/pattern/:id` (drill-down). +- `src/core/owner-holder.ts` — single source of truth for "the brain owner" holder string. `DEFAULT_OWNER_HOLDER = 'self'` (matches the consolidate facts→takes writer + `docs/takes-vs-facts.md`); `resolveOwnerHolder({override, configValue})` returns override > `emotional_weight.user_holder` config > `'self'`. Consumed by the calibration_profile cycle phase, `gbrain calibration` CLI, the `get_calibration_profile` op, `think`'s calibration block, `emotional-weight`'s `DEFAULT_USER_HOLDER`, and doctor's `calibration_freshness`. Pure; unit-tested in `test/owner-holder.test.ts`. Does NOT unify owner-identity fragmentation (`self`/`brain`/`people-`) — tracked separately. - `src/commands/takes.ts` extension — `gbrain takes revisit ` opens $EDITOR on the source page with a `` cursor marker. - `src/commands/doctor.ts` extension — 4 checks: `abandoned_threads`, `calibration_freshness`, `grade_confidence_drift` (mitigation surface; math ships later), `voice_gate_health`. - `admin/src/pages/Calibration.tsx` — Calibration tab. Single-column layout. `` wrapper handles `dangerouslySetInnerHTML` for the server-rendered SVG. diff --git a/docs/takes-vs-facts.md b/docs/takes-vs-facts.md index 37754922b..f11568c69 100644 --- a/docs/takes-vs-facts.md +++ b/docs/takes-vs-facts.md @@ -91,3 +91,18 @@ First full takes extraction run on a ~100K-page brain: 4. **Self-reported ≠ verified.** "Reports 7 figures" → holder=person, weight=0.75, NOT world/1.0 5. **No false precision.** Use 0.05 increments (0.35, 0.55, 0.75), not 0.74 or 0.82 6. **"So what" test.** Skip Twitter handles, follower counts, obvious metadata + +## Owner-holder canonicalization + +"The brain owner" is, by convention, the holder string **`self`** — the value the +dream `consolidate` phase stamps when it promotes the owner's hot facts into cold +takes. Calibration, `think`, and the `doctor` calibration check resolve the owner +holder through `resolveOwnerHolder` (`src/core/owner-holder.ts`): explicit override +> `emotional_weight.user_holder` config > `self`. + +Known limitation (tracked in garrytan/gbrain#2465): the owner can also +appear under `brain` (a take the owner asserts, via `propose_takes`) and +`people/` (extraction that names the owner). The resolver selects the +*default* canonical owner string for reads; it does not merge those other +strings. Per-take attribution for other people (e.g. `people/george`) is +unaffected and correct. diff --git a/src/commands/calibration.ts b/src/commands/calibration.ts index c67db9048..b542a046c 100644 --- a/src/commands/calibration.ts +++ b/src/commands/calibration.ts @@ -23,6 +23,7 @@ import { runPhaseCalibrationProfile } from '../core/cycle/calibration-profile.ts import { sourceScopeOpts, type OperationContext } from '../core/operations.ts'; import type { GBrainConfig } from '../core/config.ts'; import { GBrainError } from '../core/types.ts'; +import { resolveOwnerHolder } from '../core/owner-holder.ts'; export interface CalibrationProfileRow { /** BIGSERIAL → string (postgres.js int8 wire shape; never Number() — int8 @@ -167,7 +168,10 @@ export async function runCalibration( config: GBrainConfig, ): Promise { const { opts } = parseArgs(args); - const holder = opts.holder ?? 'garry'; + const holder = resolveOwnerHolder({ + override: opts.holder, + configValue: await engine.getConfig('emotional_weight.user_holder'), + }); // Resolve --source / GBRAIN_SOURCE / .gbrain-source so the (now reachable, #2035) // calibration command targets the right source in a multi-source brain instead // of always reading `default`. No signal → 'default' (prior behavior). @@ -253,12 +257,15 @@ export async function getCalibrationProfileOp( ctx: OperationContext, params: { holder?: string }, ): Promise { - const holder = params.holder ?? 'garry'; + const holder = resolveOwnerHolder({ + override: params.holder, + configValue: await ctx.engine.getConfig('emotional_weight.user_holder'), + }); if (typeof holder !== 'string' || holder.length === 0) { throw new GBrainError( 'INVALID_HOLDER', 'get_calibration_profile.holder must be a non-empty string', - 'pass holder="" or omit to default to "garry"', + 'pass holder="" or omit to default to the owner holder (config emotional_weight.user_holder, else "self")', ); } const scope = sourceScopeOpts(ctx); diff --git a/src/commands/doctor.ts b/src/commands/doctor.ts index a4c822a1a..63d8b2eb3 100644 --- a/src/commands/doctor.ts +++ b/src/commands/doctor.ts @@ -28,6 +28,7 @@ import type { DbUrlSource } from '../core/config.ts'; import { gbrainPath, loadConfig } from '../core/config.ts'; import { reflexEnabled } from '../core/context/reflex.ts'; import { resolveSocketPath } from '../core/context/resolve-ipc.ts'; +import { resolveOwnerHolder } from '../core/owner-holder.ts'; import { homedir } from 'os'; import { dirname, isAbsolute, join, resolve as resolvePath } from 'path'; import { fileURLToPath } from 'url'; @@ -1263,14 +1264,19 @@ export async function checkAbandonedThreads(engine: BrainEngine): Promise /** * calibration_freshness: warns when the active calibration profile is - * older than 7 days (configurable). Default holder 'garry'. Multi-source + * older than 7 days (configurable). Default holder resolves via resolveOwnerHolder + * (config emotional_weight.user_holder, else 'self'). Multi-source * brains see one row per source; this check uses the most recent across * all sources. */ export async function checkCalibrationFreshness(engine: BrainEngine): Promise { try { + const ownerHolder = resolveOwnerHolder({ + configValue: await engine.getConfig('emotional_weight.user_holder'), + }); const rows = await engine.executeRaw<{ generated_at: Date | null }>( - `SELECT MAX(generated_at) AS generated_at FROM calibration_profiles WHERE holder = 'garry'`, + `SELECT MAX(generated_at) AS generated_at FROM calibration_profiles WHERE holder = $1`, + [ownerHolder], ); const generated = rows[0]?.generated_at; if (!generated) { diff --git a/src/commands/serve-http.ts b/src/commands/serve-http.ts index 9b01a183f..737f984b6 100644 --- a/src/commands/serve-http.ts +++ b/src/commands/serve-http.ts @@ -45,6 +45,7 @@ import { type IngestionContentType, type IngestionEvent, } from '../core/ingestion/types.ts'; +import { resolveOwnerHolder } from '../core/owner-holder.ts'; /** * /health endpoint timeout. 3s rather than 5s: Fly.io's default @@ -1205,7 +1206,7 @@ export async function runServeHttp(engine: BrainEngine, options: ServeHttpOption app.get('/admin/api/calibration/pattern/:id', requireAdmin, async (req: Request, res: Response) => { try { const { getLatestProfile } = await import('./calibration.ts'); - const holder = (req.query.holder as string) || 'garry'; + const holder = resolveOwnerHolder({ override: (req.query.holder as string) || undefined, configValue: await engine.getConfig('emotional_weight.user_holder') }); const profile = await getLatestProfile(engine, { holder }); if (!profile) { res.status(404).json({ error: 'no_profile' }); @@ -1255,7 +1256,7 @@ export async function runServeHttp(engine: BrainEngine, options: ServeHttpOption app.get('/admin/api/calibration/profile', requireAdmin, async (req: Request, res: Response) => { try { const { getLatestProfile } = await import('./calibration.ts'); - const holder = (req.query.holder as string) || 'garry'; + const holder = resolveOwnerHolder({ override: (req.query.holder as string) || undefined, configValue: await engine.getConfig('emotional_weight.user_holder') }); const profile = await getLatestProfile(engine, { holder }); res.json(profile); } catch (err) { @@ -1272,7 +1273,7 @@ export async function runServeHttp(engine: BrainEngine, options: ServeHttpOption renderAbandonedThreadsCard, renderPatternStatementsCard, } = await import('../core/calibration/svg-renderer.ts'); - const holder = (req.query.holder as string) || 'garry'; + const holder = resolveOwnerHolder({ override: (req.query.holder as string) || undefined, configValue: await engine.getConfig('emotional_weight.user_holder') }); const type = req.params.type; const profile = await getLatestProfile(engine, { holder }); diff --git a/src/commands/takes.ts b/src/commands/takes.ts index 4cad6b7a7..4ef7e82f0 100644 --- a/src/commands/takes.ts +++ b/src/commands/takes.ts @@ -29,6 +29,7 @@ import { } from '../core/takes-fence.ts'; import { withPageLock } from '../core/page-lock.ts'; import { resolveSourceId } from '../core/source-resolver.ts'; +import { resolveOwnerHolder } from '../core/owner-holder.ts'; // --- Helpers --- @@ -364,7 +365,7 @@ async function cmdResolve(engine: BrainEngine, args: string[], sourceId?: string // --evidence is the v0.30.0 alias for --source on the resolve subcommand // (semantic clarity: "what evidence resolved this bet?"). const source = flagValue(args, '--evidence') ?? flagValue(args, '--source'); - const resolvedBy = flagValue(args, '--by') ?? 'garry'; + const resolvedBy = flagValue(args, '--by') ?? resolveOwnerHolder({ configValue: await engine.getConfig('emotional_weight.user_holder') }); const dirArg = flagValue(args, '--dir'); const pageId = await getPageId(engine, slug, sourceId); diff --git a/src/core/brainstorm/orchestrator.ts b/src/core/brainstorm/orchestrator.ts index 3ac7caef2..494775c18 100644 --- a/src/core/brainstorm/orchestrator.ts +++ b/src/core/brainstorm/orchestrator.ts @@ -68,6 +68,7 @@ import { type BrainstormCheckpoint, type CheckpointCross, } from './checkpoint.ts'; +import { resolveOwnerHolder } from '../owner-holder.ts'; export { BudgetExhausted }; @@ -139,7 +140,7 @@ export interface BrainstormOptions { modelOverride?: string; /** Skip the cost-preview TTY grace window. Required for non-interactive callers. */ skipCostPreview?: boolean; - /** When set, force the user holder for calibration profile lookup. Falls back to config (`emotional_weight.user_holder`) then `'garry'`. */ + /** When set, force the user holder for calibration profile lookup. Falls back to config (`emotional_weight.user_holder`) then `'self'`. */ holderOverride?: string; /** Source scope. */ sourceId?: string; @@ -623,7 +624,7 @@ async function _runBrainstormInner( } // ---- Phase 3: calibration context (cold-start fallback) ---- - const holder = opts.holderOverride ?? config.emotional_weight?.user_holder ?? 'garry'; + const holder = resolveOwnerHolder({ override: opts.holderOverride, configValue: config.emotional_weight?.user_holder }); const calibContext = await loadCalibrationContext(engine, { holder, sourceId: opts.sourceId, diff --git a/src/core/calibration/think-ab.ts b/src/core/calibration/think-ab.ts index 70e987a73..d5efdb07c 100644 --- a/src/core/calibration/think-ab.ts +++ b/src/core/calibration/think-ab.ts @@ -25,7 +25,7 @@ import type { BrainEngine } from '../engine.ts'; export interface ABRunInput { question: string; - /** Holder context for calibration. Default 'garry'. */ + /** Holder context for calibration. Resolves via resolveOwnerHolder (config emotional_weight.user_holder, else 'self'). */ holder?: string; /** Engine for DB write. */ engine: BrainEngine; diff --git a/src/core/cycle/calibration-profile.ts b/src/core/cycle/calibration-profile.ts index 2555cb03e..56e995d54 100644 --- a/src/core/cycle/calibration-profile.ts +++ b/src/core/cycle/calibration-profile.ts @@ -26,6 +26,7 @@ */ import { BaseCyclePhase, type ScopedReadOpts, type BasePhaseOpts } from './base-phase.ts'; +import { resolveOwnerHolder } from '../owner-holder.ts'; import { chat as gatewayChat } from '../ai/gateway.ts'; import { TIER_DEFAULTS } from '../model-config.ts'; import { gateVoice, type VoiceGateGenerator, type VoiceGateJudge } from '../calibration/voice-gate.ts'; @@ -96,7 +97,7 @@ export type PatternStatementsGenerator = (input: { export type BiasTagsGenerator = (patterns: string[]) => Promise; export interface CalibrationProfileOpts extends BasePhaseOpts { - /** Holder to generate the profile for. Default 'garry'. */ + /** Holder to generate the profile for. Default resolves via resolveOwnerHolder (config emotional_weight.user_holder, else 'self'). */ holder?: string; /** Inject the patterns generator (tests). */ patternsGenerator?: PatternStatementsGenerator; @@ -227,7 +228,10 @@ class CalibrationProfilePhase extends BaseCyclePhase { _ctx: OperationContext, opts: CalibrationProfileOpts, ): Promise<{ summary: string; details: Record; status?: PhaseStatus }> { - const holder = opts.holder ?? 'garry'; + const holder = resolveOwnerHolder({ + override: opts.holder, + configValue: await engine.getConfig('emotional_weight.user_holder'), + }); const promptVersion = opts.promptVersion ?? CALIBRATION_PROFILE_PROMPT_VERSION; const modelId = opts.model ?? TIER_DEFAULTS.reasoning; const gradeCompletion = opts.gradeCompletion ?? 1.0; diff --git a/src/core/cycle/emotional-weight.ts b/src/core/cycle/emotional-weight.ts index 4c7b64dd0..7d4e90702 100644 --- a/src/core/cycle/emotional-weight.ts +++ b/src/core/cycle/emotional-weight.ts @@ -14,6 +14,8 @@ * See `loadHighEmotionTags` for the resolution path. */ +import { DEFAULT_OWNER_HOLDER } from '../owner-holder.ts'; + /** * Default high-emotion tag seed list. Pages with any tag in this set get the * tag-emotion boost in the formula below. Override via config key @@ -43,11 +45,12 @@ export const HIGH_EMOTION_TAGS: ReadonlySet = new Set([ ]); /** - * Holder name treated as "the user" for the Garry-as-holder ratio. Configurable - * via the `emotional_weight.user_holder` config key (defaults to 'garry' to - * match the v0.28 schema's takes table convention). + * Holder name treated as "the user" for the user-as-holder ratio. Configurable + * via the `emotional_weight.user_holder` config key; defaults to the canonical + * owner holder ('self', DEFAULT_OWNER_HOLDER) so it matches the consolidate + * facts→takes writer instead of a hardcoded name. */ -export const DEFAULT_USER_HOLDER = 'garry'; +export const DEFAULT_USER_HOLDER = DEFAULT_OWNER_HOLDER; export interface EmotionalWeightTake { holder: string; diff --git a/src/core/operations.ts b/src/core/operations.ts index 55e388cd8..0d1e5dcef 100644 --- a/src/core/operations.ts +++ b/src/core/operations.ts @@ -3333,7 +3333,7 @@ const get_calibration_profile: Operation = { holder: { type: 'string', description: - "Holder slug, e.g. 'garry' or 'people/charlie-example'. Defaults to 'garry' when omitted.", + "Holder slug, e.g. 'self' or 'people/charlie-example'. Defaults to config emotional_weight.user_holder, else 'self', when omitted.", }, }, handler: async (ctx, p) => { diff --git a/src/core/owner-holder.ts b/src/core/owner-holder.ts new file mode 100644 index 000000000..c81782d51 --- /dev/null +++ b/src/core/owner-holder.ts @@ -0,0 +1,24 @@ +/** + * Canonical holder string for "the brain owner," resolved in ONE place so the + * calibration / think / doctor / emotional-weight defaults stop disagreeing. + * + * The default matches the consolidate facts→takes writer + * (src/core/cycle/phases/consolidate.ts: holder:'self') and docs/takes-vs-facts.md. + * Do NOT introduce a fourth literal — three already exist historically + * ('garry', 'system', 'self'); this is the source of truth. + * + * NORMALIZATION NOTE: the brain owner may also appear under other holder + * strings — 'brain' (propose_takes when the author asserts a claim) and + * people/ (extraction that names the owner). This resolver only selects + * the *default* canonical owner string for reads; it does NOT merge those other + * strings. Unifying them is owner-identity entity-resolution, tracked separately + * (see garrytan/gbrain#2465). Until then, historical owner takes + * under 'brain'/people- are not folded into the default profile. + */ +export const DEFAULT_OWNER_HOLDER = 'self'; + +export function resolveOwnerHolder( + opts: { override?: string | null; configValue?: string | null }, +): string { + return opts.override ?? opts.configValue ?? DEFAULT_OWNER_HOLDER; +} diff --git a/src/core/think/index.ts b/src/core/think/index.ts index f06ab59dc..aaa370e96 100644 --- a/src/core/think/index.ts +++ b/src/core/think/index.ts @@ -23,6 +23,7 @@ import { runGather, renderPagesBlock, takesHitToTakeForPrompt } from './gather.t import { renderTakesBlock } from './sanitize.ts'; import { buildThinkSystemPrompt, buildThinkUserMessage } from './prompt.ts'; import { resolveCitations, type ParsedCitation } from './cite-render.ts'; +import { resolveOwnerHolder } from '../owner-holder.ts'; import { resolveModel } from '../model-config.ts'; import { chat as gatewayChat, probeChatModel, type ChatResult } from '../ai/gateway.ts'; import { AIConfigError } from '../ai/errors.ts'; @@ -76,8 +77,8 @@ export interface RunThinkOpts { */ withCalibration?: boolean; /** - * Holder to retrieve the calibration profile for. Default 'garry'. Only - * consulted when withCalibration=true. + * Holder to retrieve the calibration profile for. Resolves via resolveOwnerHolder + * (config emotional_weight.user_holder, else 'self'). Only consulted when withCalibration=true. */ calibrationHolder?: string; /** @@ -308,7 +309,10 @@ export async function runThink( try { const { getLatestProfile } = await import('../../commands/calibration.ts'); const profile = await getLatestProfile(engine, { - holder: opts.calibrationHolder ?? 'garry', + holder: resolveOwnerHolder({ + override: opts.calibrationHolder, + configValue: await engine.getConfig('emotional_weight.user_holder'), + }), }); if (profile) { calibrationBlockOpts = { diff --git a/test/calibration-cli.test.ts b/test/calibration-cli.test.ts index c70ebe483..e35258f2d 100644 --- a/test/calibration-cli.test.ts +++ b/test/calibration-cli.test.ts @@ -27,6 +27,12 @@ function buildMockEngine(opts: { rows: CalibrationProfileRow[] }): { const capturedParams: unknown[][] = []; const engine = { kind: 'pglite', + // #2464: getCalibrationProfileOp resolves the owner holder via + // resolveOwnerHolder(config emotional_weight.user_holder, else 'self'), so the + // mock must implement getConfig. null = key unset → resolver falls back to 'self'. + async getConfig(): Promise { + return null; + }, async executeRaw(sql: string, params?: unknown[]): Promise { capturedSql.push(sql); capturedParams.push(params ?? []); @@ -211,17 +217,17 @@ describe('formatProfileText', () => { // ─── getCalibrationProfileOp ──────────────────────────────────────── describe('getCalibrationProfileOp (MCP)', () => { - test('defaults holder to "garry" when omitted', async () => { - const { engine } = buildMockEngine({ rows: [buildProfile({ holder: 'garry' })] }); + test('defaults holder to "self" when omitted (config emotional_weight.user_holder unset)', async () => { + const { engine } = buildMockEngine({ rows: [buildProfile({ holder: 'self' })] }); const ctx = buildCtx(engine); const result = await getCalibrationProfileOp(ctx, {}); - expect(result?.holder).toBe('garry'); + expect(result?.holder).toBe('self'); }); test('routes through sourceScopeOpts: scalar source-bound client gets source-scoped result', async () => { const rows = [ - buildProfile({ holder: 'garry', source_id: 'default' }), - buildProfile({ holder: 'garry', source_id: 'tenant-b' }), + buildProfile({ holder: 'self', source_id: 'default' }), + buildProfile({ holder: 'self', source_id: 'tenant-b' }), ]; const { engine } = buildMockEngine({ rows }); const ctx = buildCtx(engine, { sourceId: 'tenant-b' }); @@ -231,8 +237,8 @@ describe('getCalibrationProfileOp (MCP)', () => { test('federated read scope sees the union of allowed sources', async () => { const rows = [ - buildProfile({ holder: 'garry', source_id: 'tenant-a' }), - buildProfile({ holder: 'garry', source_id: 'tenant-z' }), + buildProfile({ holder: 'self', source_id: 'tenant-a' }), + buildProfile({ holder: 'self', source_id: 'tenant-z' }), ]; const { engine } = buildMockEngine({ rows }); const ctx = buildCtx(engine, { allowedSources: ['tenant-a', 'tenant-b'] }); diff --git a/test/calibration-profile.test.ts b/test/calibration-profile.test.ts index f92e516ed..ff40c1afd 100644 --- a/test/calibration-profile.test.ts +++ b/test/calibration-profile.test.ts @@ -32,7 +32,7 @@ interface CapturedSql { params: unknown[]; } -function buildMockEngine(opts: { scorecard: TakesScorecard }): { +function buildMockEngine(opts: { scorecard: TakesScorecard; userHolder?: string | null }): { engine: BrainEngine; captured: CapturedSql[]; } { @@ -42,6 +42,10 @@ function buildMockEngine(opts: { scorecard: TakesScorecard }): { async getScorecard() { return opts.scorecard; }, + async getConfig(key: string): Promise { + if (key === 'emotional_weight.user_holder') return opts.userHolder ?? null; + return null; + }, async executeRaw(sql: string, params?: unknown[]): Promise { captured.push({ sql, params: params ?? [] }); return []; @@ -234,7 +238,7 @@ describe('runPhaseCalibrationProfile — phase integration', () => { // grade_completion, domain_scorecards_json, patterns[], voice_passed, voice_attempts, // bias_tags[], model_id expect(insert!.params[0]).toBe('default'); // source_id - expect(insert!.params[1]).toBe('garry'); // holder + expect(insert!.params[1]).toBe('self'); // holder (resolved via resolveOwnerHolder, no override) expect(insert!.params[2]).toBe(12); // total_resolved expect(insert!.params[9]).toBe(true); // voice_gate_passed expect(insert!.params[10]).toBe(1); // voice_gate_attempts @@ -330,4 +334,24 @@ describe('runPhaseCalibrationProfile — phase integration', () => { const insert = captured.find(c => c.sql.includes('INSERT INTO calibration_profiles')); expect(insert!.params[0]).toBe('tenant-b'); }); + + test('cold-brain summary uses resolved owner holder self when user_holder unset', async () => { + const { engine } = buildMockEngine({ + scorecard: { total_bets: 0, resolved: 0, correct: 0, incorrect: 0, partial: 0, + accuracy: null, brier: null, partial_rate: null, unresolvable_count: 0, unresolvable_rate: null }, + }); + const result = await runPhaseCalibrationProfile(buildCtx(engine), {}); + expect(result.summary).toContain('holder=self'); + expect(result.summary).not.toContain('holder=garry'); + }); + + test('configured user_holder overrides the default in the cold-brain summary', async () => { + const { engine } = buildMockEngine({ + scorecard: { total_bets: 0, resolved: 0, correct: 0, incorrect: 0, partial: 0, + accuracy: null, brier: null, partial_rate: null, unresolvable_count: 0, unresolvable_rate: null }, + userHolder: 'people/charlie-example', + }); + const result = await runPhaseCalibrationProfile(buildCtx(engine), {}); + expect(result.summary).toContain('holder=people/charlie-example'); + }); }); diff --git a/test/doctor-calibration-checks.test.ts b/test/doctor-calibration-checks.test.ts index ed267c11e..2eeefedac 100644 --- a/test/doctor-calibration-checks.test.ts +++ b/test/doctor-calibration-checks.test.ts @@ -32,6 +32,12 @@ function buildMockEngine(opts: { }): BrainEngine { return { kind: 'pglite', + // #2464: checkCalibrationFreshness resolves the owner holder via + // resolveOwnerHolder(config emotional_weight.user_holder, else 'self'), so the + // mock must implement getConfig. null = key unset → resolver falls back to 'self'. + async getConfig(): Promise { + return null; + }, async executeRaw(sql: string): Promise { if (opts.throwOn && opts.throwOn.test(sql)) { throw new Error('mock engine error: ' + sql.slice(0, 50)); diff --git a/test/emotional-weight.test.ts b/test/emotional-weight.test.ts index 2c9501e1f..bd4e6e64c 100644 --- a/test/emotional-weight.test.ts +++ b/test/emotional-weight.test.ts @@ -112,3 +112,7 @@ describe('computeEmotionalWeight', () => { expect(HIGH_EMOTION_TAGS.has('mental-health')).toBe(true); }); }); + +test('DEFAULT_USER_HOLDER is the canonical owner holder self', () => { + expect(DEFAULT_USER_HOLDER).toBe('self'); +}); diff --git a/test/owner-holder.test.ts b/test/owner-holder.test.ts new file mode 100644 index 000000000..72f61afc1 --- /dev/null +++ b/test/owner-holder.test.ts @@ -0,0 +1,27 @@ +import { describe, test, expect } from 'bun:test'; +import { resolveOwnerHolder, DEFAULT_OWNER_HOLDER } from '../src/core/owner-holder.ts'; + +describe('owner-holder', () => { + test('DEFAULT_OWNER_HOLDER is self', () => { + expect(DEFAULT_OWNER_HOLDER).toBe('self'); + }); + + test('defaults to self when nothing provided', () => { + expect(resolveOwnerHolder({})).toBe('self'); + }); + + test('null/undefined config falls back to self', () => { + expect(resolveOwnerHolder({ configValue: null })).toBe('self'); + expect(resolveOwnerHolder({ configValue: undefined })).toBe('self'); + }); + + test('uses config value when set and no override', () => { + expect(resolveOwnerHolder({ configValue: 'people/charlie-example' })) + .toBe('people/charlie-example'); + }); + + test('override beats config and default', () => { + expect(resolveOwnerHolder({ override: 'world', configValue: 'people/charlie-example' })) + .toBe('world'); + }); +});