mirror of
https://github.com/garrytan/gbrain.git
synced 2026-08-17 10:22:34 +00:00
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5350bbc796 | ||
|
|
8c27339c5c |
@@ -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 `<calibration>` 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 <ver>`, `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-<owner>`) — tracked separately.
|
||||
- `src/commands/takes.ts` extension — `gbrain takes revisit <slug>` opens $EDITOR on the source page with a `<!-- gbrain:revisit -->` 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. `<TrustedSVG>` wrapper handles `dangerouslySetInnerHTML` for the server-rendered SVG.
|
||||
|
||||
@@ -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/<owner>` (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.
|
||||
|
||||
@@ -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<void> {
|
||||
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<CalibrationProfileRow | null> {
|
||||
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="<slug>" or omit to default to "garry"',
|
||||
'pass holder="<slug>" or omit to default to the owner holder (config emotional_weight.user_holder, else "self")',
|
||||
);
|
||||
}
|
||||
const scope = sourceScopeOpts(ctx);
|
||||
|
||||
@@ -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';
|
||||
@@ -1287,14 +1288,19 @@ export async function checkAbandonedThreads(engine: BrainEngine): Promise<Check>
|
||||
|
||||
/**
|
||||
* 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<Check> {
|
||||
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) {
|
||||
|
||||
@@ -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
|
||||
@@ -1190,7 +1191,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' });
|
||||
@@ -1240,7 +1241,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) {
|
||||
@@ -1257,7 +1258,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 });
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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<string[]>;
|
||||
|
||||
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<string, unknown>; 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;
|
||||
|
||||
@@ -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<string> = 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;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
*/
|
||||
|
||||
import type { BrainEngine } from './engine.ts';
|
||||
import { PGVECTOR_HNSW_VECTOR_MAX_DIMS, hnswMaxDimsForType } from './vector-index.ts';
|
||||
import { PGVECTOR_HNSW_VECTOR_MAX_DIMS } from './vector-index.ts';
|
||||
import { gbrainPath } from './config.ts';
|
||||
import { resolveRecipe } from './ai/model-resolver.ts';
|
||||
import type { Recipe } from './ai/types.ts';
|
||||
@@ -609,17 +609,6 @@ export function buildFactsAlterRecipe(
|
||||
const opclass = columnType === 'halfvec' ? 'halfvec_cosine_ops' : 'vector_cosine_ops';
|
||||
const targetType = columnType === 'halfvec' ? `halfvec(${configuredDims})` : `vector(${configuredDims})`;
|
||||
const dimsChanged = columnDims !== configuredDims;
|
||||
const hnswMaxDims = hnswMaxDimsForType(columnType);
|
||||
const indexLines = configuredDims <= hnswMaxDims
|
||||
? [
|
||||
`CREATE INDEX idx_facts_embedding_hnsw`,
|
||||
` ON facts USING hnsw (embedding ${opclass})`,
|
||||
` WHERE embedding IS NOT NULL AND expired_at IS NULL;`,
|
||||
]
|
||||
: [
|
||||
`-- Skip reindex. ${columnType}(${configuredDims}) exceeds pgvector's HNSW cap of ${hnswMaxDims};`,
|
||||
`-- fact similarity falls back to exact scans.`,
|
||||
];
|
||||
return [
|
||||
`-- ALTER ${columnType}(${columnDims}) → ${columnType}(${configuredDims}) on indexed column.`,
|
||||
`-- HOLD a maintenance window: this rewrites every row's embedding.`,
|
||||
@@ -640,7 +629,9 @@ export function buildFactsAlterRecipe(
|
||||
: []),
|
||||
`ALTER TABLE facts ALTER COLUMN embedding TYPE ${targetType}`,
|
||||
` USING embedding::${targetType};`,
|
||||
...indexLines,
|
||||
`CREATE INDEX idx_facts_embedding_hnsw`,
|
||||
` ON facts USING hnsw (embedding ${opclass})`,
|
||||
` WHERE embedding IS NOT NULL AND expired_at IS NULL;`,
|
||||
].join('\n');
|
||||
}
|
||||
|
||||
|
||||
+8
-21
@@ -1,7 +1,6 @@
|
||||
import type { BrainEngine } from './engine.ts';
|
||||
import { slugifyPath } from './sync.ts';
|
||||
import { getFtsLanguage } from './fts-language.ts';
|
||||
import { hnswMaxDimsForType } from './vector-index.ts';
|
||||
|
||||
/**
|
||||
* Schema migrations — run automatically on initSchema().
|
||||
@@ -2277,19 +2276,11 @@ export const MIGRATIONS: Migration[] = [
|
||||
useHalfvec = true;
|
||||
}
|
||||
|
||||
const columnType = useHalfvec ? 'halfvec' : 'vector';
|
||||
const vecType = columnType.toUpperCase();
|
||||
const vecType = useHalfvec ? 'HALFVEC' : 'VECTOR';
|
||||
// HNSW operator class must match the column type:
|
||||
// VECTOR(n) → vector_cosine_ops
|
||||
// HALFVEC(n) → halfvec_cosine_ops
|
||||
const opclass = useHalfvec ? 'halfvec_cosine_ops' : 'vector_cosine_ops';
|
||||
const hnswMaxDims = hnswMaxDimsForType(columnType);
|
||||
const factsEmbeddingIndexSql = embeddingDim <= hnswMaxDims
|
||||
? `CREATE INDEX IF NOT EXISTS idx_facts_embedding_hnsw
|
||||
ON facts USING hnsw (embedding ${opclass})
|
||||
WHERE embedding IS NOT NULL AND expired_at IS NULL;`
|
||||
: `-- idx_facts_embedding_hnsw skipped: pgvector HNSW ${columnType} indexes support
|
||||
-- at most ${hnswMaxDims} dimensions; exact vector scans remain available.`;
|
||||
// FK to sources is added in a separate ALTER TABLE rather than inline
|
||||
// on the column. Inline `REFERENCES` worked on PGLite but silently
|
||||
// got dropped by postgres.js's `unsafe()` multi-statement path on
|
||||
@@ -2363,7 +2354,9 @@ export const MIGRATIONS: Migration[] = [
|
||||
ON facts(source_id, entity_slug)
|
||||
WHERE consolidated_at IS NULL AND expired_at IS NULL;
|
||||
|
||||
${factsEmbeddingIndexSql}
|
||||
CREATE INDEX IF NOT EXISTS idx_facts_embedding_hnsw
|
||||
ON facts USING hnsw (embedding ${opclass})
|
||||
WHERE embedding IS NOT NULL AND expired_at IS NULL;
|
||||
`;
|
||||
|
||||
await engine.runMigration(40, factsDDL);
|
||||
@@ -2877,16 +2870,8 @@ export const MIGRATIONS: Migration[] = [
|
||||
useHalfvec = true;
|
||||
}
|
||||
|
||||
const columnType = useHalfvec ? 'halfvec' : 'vector';
|
||||
const vecType = columnType.toUpperCase();
|
||||
const vecType = useHalfvec ? 'HALFVEC' : 'VECTOR';
|
||||
const opclass = useHalfvec ? 'halfvec_cosine_ops' : 'vector_cosine_ops';
|
||||
const hnswMaxDims = hnswMaxDimsForType(columnType);
|
||||
const queryCacheEmbeddingIndexSql = embeddingDim <= hnswMaxDims
|
||||
? `CREATE INDEX IF NOT EXISTS idx_query_cache_embedding_hnsw
|
||||
ON query_cache USING hnsw (embedding ${opclass})
|
||||
WHERE embedding IS NOT NULL;`
|
||||
: `-- idx_query_cache_embedding_hnsw skipped: pgvector HNSW ${columnType} indexes support
|
||||
-- at most ${hnswMaxDims} dimensions; exact vector scans remain available.`;
|
||||
|
||||
const ddl = `
|
||||
CREATE TABLE IF NOT EXISTS query_cache (
|
||||
@@ -2905,7 +2890,9 @@ export const MIGRATIONS: Migration[] = [
|
||||
CREATE INDEX IF NOT EXISTS idx_query_cache_source_created
|
||||
ON query_cache(source_id, created_at DESC);
|
||||
|
||||
${queryCacheEmbeddingIndexSql}
|
||||
CREATE INDEX IF NOT EXISTS idx_query_cache_embedding_hnsw
|
||||
ON query_cache USING hnsw (embedding ${opclass})
|
||||
WHERE embedding IS NOT NULL;
|
||||
`;
|
||||
|
||||
await engine.runMigration(55, ddl);
|
||||
|
||||
@@ -3289,7 +3289,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) => {
|
||||
|
||||
@@ -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/<owner> (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-<owner> 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;
|
||||
}
|
||||
@@ -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 = {
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
import type { BrainEngine } from './engine.ts';
|
||||
|
||||
export const PGVECTOR_HNSW_VECTOR_MAX_DIMS = 2000;
|
||||
export const PGVECTOR_HNSW_HALFVEC_MAX_DIMS = 4000;
|
||||
|
||||
const CHUNK_EMBEDDING_HNSW_INDEX =
|
||||
'CREATE INDEX IF NOT EXISTS idx_chunks_embedding ON content_chunks USING hnsw (embedding vector_cosine_ops);';
|
||||
@@ -30,10 +29,6 @@ export function chunkEmbeddingIndexSql(dims: number): string {
|
||||
].join('\n');
|
||||
}
|
||||
|
||||
export function hnswMaxDimsForType(columnType: 'vector' | 'halfvec'): number {
|
||||
return columnType === 'halfvec' ? PGVECTOR_HNSW_HALFVEC_MAX_DIMS : PGVECTOR_HNSW_VECTOR_MAX_DIMS;
|
||||
}
|
||||
|
||||
export function applyChunkEmbeddingIndexPolicy(sql: string, dims: number): string {
|
||||
return sql.replaceAll(CHUNK_EMBEDDING_HNSW_INDEX, chunkEmbeddingIndexSql(dims));
|
||||
}
|
||||
|
||||
@@ -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<string | null> {
|
||||
return null;
|
||||
},
|
||||
async executeRaw<T>(sql: string, params?: unknown[]): Promise<T[]> {
|
||||
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'] });
|
||||
|
||||
@@ -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<string | null> {
|
||||
if (key === 'emotional_weight.user_holder') return opts.userHolder ?? null;
|
||||
return null;
|
||||
},
|
||||
async executeRaw<T>(sql: string, params?: unknown[]): Promise<T[]> {
|
||||
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');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -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<string | null> {
|
||||
return null;
|
||||
},
|
||||
async executeRaw<T>(sql: string): Promise<T[]> {
|
||||
if (opts.throwOn && opts.throwOn.test(sql)) {
|
||||
throw new Error('mock engine error: ' + sql.slice(0, 50));
|
||||
|
||||
@@ -122,9 +122,9 @@ describe('buildFactsAlterRecipe', () => {
|
||||
});
|
||||
|
||||
test('vector recipe uses vector_cosine_ops + vector(N) USING cast', () => {
|
||||
const recipe = buildFactsAlterRecipe(1024, 1536, 'vector');
|
||||
expect(recipe).toContain('vector(1536)');
|
||||
expect(recipe).toContain('USING embedding::vector(1536)');
|
||||
const recipe = buildFactsAlterRecipe(1024, 2048, 'vector');
|
||||
expect(recipe).toContain('vector(2048)');
|
||||
expect(recipe).toContain('USING embedding::vector(2048)');
|
||||
expect(recipe).toContain('vector_cosine_ops');
|
||||
expect(recipe).not.toContain('halfvec_cosine_ops');
|
||||
});
|
||||
@@ -163,14 +163,6 @@ describe('buildFactsAlterRecipe', () => {
|
||||
expect(recipe).not.toContain('UPDATE facts SET embedding = NULL');
|
||||
expect(recipe).toContain('USING embedding::vector(1536)');
|
||||
});
|
||||
|
||||
test('halfvec recipe skips HNSW rebuild above pgvector cap', () => {
|
||||
const recipe = buildFactsAlterRecipe(1536, 4096, 'halfvec');
|
||||
expect(recipe).toContain('halfvec(4096)');
|
||||
expect(recipe).toContain('Skip reindex');
|
||||
expect(recipe).toContain("exceeds pgvector's HNSW cap of 4000");
|
||||
expect(recipe).not.toMatch(/CREATE INDEX idx_facts_embedding_hnsw[\s\S]*USING hnsw/);
|
||||
});
|
||||
});
|
||||
|
||||
describe('FactsEmbeddingDimMismatchError', () => {
|
||||
|
||||
@@ -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');
|
||||
});
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
|
||||
import { describe, test, expect, beforeAll, afterAll } from 'bun:test';
|
||||
import { PGLiteEngine } from '../src/core/pglite-engine.ts';
|
||||
import { configureGateway, resetGateway } from '../src/core/ai/gateway.ts';
|
||||
|
||||
let engine: PGLiteEngine;
|
||||
|
||||
@@ -94,60 +93,4 @@ describe('migration v45 facts column shape', () => {
|
||||
);
|
||||
expect(after[0].udt_name).toBe(before[0].udt_name);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('migration v45/v55 large-dim HNSW policy', () => {
|
||||
let largeDimEngine: PGLiteEngine;
|
||||
|
||||
beforeAll(async () => {
|
||||
configureGateway({
|
||||
embedding_model: 'litellm:custom-4096d',
|
||||
embedding_dimensions: 4096,
|
||||
env: { ...process.env },
|
||||
});
|
||||
|
||||
largeDimEngine = new PGLiteEngine();
|
||||
await largeDimEngine.connect({});
|
||||
await largeDimEngine.initSchema();
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
await largeDimEngine.disconnect();
|
||||
resetGateway();
|
||||
});
|
||||
|
||||
test('4096d init skips unsupported HNSW indexes but keeps vector columns', async () => {
|
||||
const formatRows = await largeDimEngine.executeRaw<{ format_type: string }>(
|
||||
`SELECT format_type(atttypid, atttypmod) AS format_type
|
||||
FROM pg_attribute
|
||||
WHERE attrelid = 'facts'::regclass AND attname = 'embedding'`,
|
||||
);
|
||||
expect(formatRows[0]?.format_type).toMatch(/(halfvec|vector)\(4096\)/);
|
||||
|
||||
const indexRows = await largeDimEngine.executeRaw<{ exists: boolean }>(
|
||||
`SELECT EXISTS (
|
||||
SELECT 1 FROM pg_indexes
|
||||
WHERE tablename = 'facts'
|
||||
AND indexname = 'idx_facts_embedding_hnsw'
|
||||
) AS exists`,
|
||||
);
|
||||
expect(indexRows[0]?.exists).toBe(false);
|
||||
|
||||
const queryCacheFormatRows = await largeDimEngine.executeRaw<{ format_type: string }>(
|
||||
`SELECT format_type(atttypid, atttypmod) AS format_type
|
||||
FROM pg_attribute
|
||||
WHERE attrelid = 'query_cache'::regclass AND attname = 'embedding'`,
|
||||
);
|
||||
expect(queryCacheFormatRows[0]?.format_type).toMatch(/(halfvec|vector)\(4096\)/);
|
||||
|
||||
const queryCacheIndexRows = await largeDimEngine.executeRaw<{ exists: boolean }>(
|
||||
`SELECT EXISTS (
|
||||
SELECT 1 FROM pg_indexes
|
||||
WHERE tablename = 'query_cache'
|
||||
AND indexname = 'idx_query_cache_embedding_hnsw'
|
||||
) AS exists`,
|
||||
);
|
||||
expect(queryCacheIndexRows[0]?.exists).toBe(false);
|
||||
}, 60000);
|
||||
});
|
||||
|
||||
@@ -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');
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user