mixdog 0.9.2 → 0.9.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -1
- package/scripts/anthropic-maxtokens-test.mjs +119 -0
- package/scripts/build-tui.mjs +13 -1
- package/scripts/explore-bench.mjs +124 -0
- package/scripts/hook-bus-test.mjs +191 -0
- package/scripts/path-suffix-test.mjs +57 -0
- package/scripts/recall-bench.mjs +207 -0
- package/scripts/tool-smoke.mjs +7 -4
- package/src/agents/debugger/AGENT.md +2 -2
- package/src/agents/heavy-worker/AGENT.md +20 -11
- package/src/agents/reviewer/AGENT.md +2 -2
- package/src/agents/worker/AGENT.md +17 -11
- package/src/mixdog-session-runtime.mjs +424 -1812
- package/src/repl.mjs +5 -5
- package/src/rules/agent/30-explorer.md +8 -11
- package/src/rules/lead/lead-tool.md +9 -5
- package/src/rules/shared/01-tool.md +11 -5
- package/src/runtime/agent/orchestrator/context/collect.mjs +51 -0
- package/src/runtime/agent/orchestrator/mcp/client.mjs +6 -2
- package/src/runtime/agent/orchestrator/providers/anthropic-effort.mjs +1 -1
- package/src/runtime/agent/orchestrator/providers/anthropic-max-tokens.mjs +93 -0
- package/src/runtime/agent/orchestrator/providers/anthropic-oauth.mjs +22 -68
- package/src/runtime/agent/orchestrator/providers/anthropic.mjs +46 -7
- package/src/runtime/agent/orchestrator/providers/api-usage.mjs +1 -13
- package/src/runtime/agent/orchestrator/providers/gemini.mjs +1 -1
- package/src/runtime/agent/orchestrator/providers/grok-oauth.mjs +1 -1
- package/src/runtime/agent/orchestrator/providers/lib/usage-primitives.mjs +32 -0
- package/src/runtime/agent/orchestrator/providers/oauth-usage.mjs +54 -20
- package/src/runtime/agent/orchestrator/providers/openai-compat-stream.mjs +19 -12
- package/src/runtime/agent/orchestrator/providers/openai-compat.mjs +7 -5
- package/src/runtime/agent/orchestrator/providers/openai-oauth-ws.mjs +33 -23
- package/src/runtime/agent/orchestrator/providers/openai-oauth.mjs +31 -14
- package/src/runtime/agent/orchestrator/providers/opencode-go-usage.mjs +38 -12
- package/src/runtime/agent/orchestrator/providers/retry-classifier.mjs +7 -8
- package/src/runtime/agent/orchestrator/session/loop/compact-debug.mjs +28 -0
- package/src/runtime/agent/orchestrator/session/loop/compact-policy.mjs +262 -0
- package/src/runtime/agent/orchestrator/session/loop/context-overflow.mjs +38 -0
- package/src/runtime/agent/orchestrator/session/loop/env.mjs +14 -0
- package/src/runtime/agent/orchestrator/session/loop/hidden-agents.mjs +21 -0
- package/src/runtime/agent/orchestrator/session/loop/pre-dispatch-deny.mjs +49 -0
- package/src/runtime/agent/orchestrator/session/loop/steering.mjs +63 -0
- package/src/runtime/agent/orchestrator/session/loop/stored-tool-args.mjs +100 -0
- package/src/runtime/agent/orchestrator/session/loop/tool-classify.mjs +52 -0
- package/src/runtime/agent/orchestrator/session/loop/tool-helpers.mjs +218 -0
- package/src/runtime/agent/orchestrator/session/loop/transcript-repair.mjs +101 -0
- package/src/runtime/agent/orchestrator/session/loop/usage.mjs +35 -0
- package/src/runtime/agent/orchestrator/session/loop.mjs +169 -918
- package/src/runtime/agent/orchestrator/session/manager/context-meta.mjs +227 -0
- package/src/runtime/agent/orchestrator/session/manager/pending-messages.mjs +235 -0
- package/src/runtime/agent/orchestrator/session/manager/prompt-utils.mjs +137 -0
- package/src/runtime/agent/orchestrator/session/manager/rules-cache.mjs +155 -0
- package/src/runtime/agent/orchestrator/session/manager/tool-resolution.mjs +303 -0
- package/src/runtime/agent/orchestrator/session/manager.mjs +65 -1032
- package/src/runtime/agent/orchestrator/stall-policy.mjs +3 -3
- package/src/runtime/agent/orchestrator/tools/builtin/builtin-tools.mjs +2 -2
- package/src/runtime/agent/orchestrator/tools/builtin/external-tool-adapters.mjs +241 -0
- package/src/runtime/agent/orchestrator/tools/builtin/external-tool-adapters.test.mjs +162 -0
- package/src/runtime/agent/orchestrator/tools/builtin/fuzzy-match.mjs +1 -1
- package/src/runtime/agent/orchestrator/tools/builtin/path-diagnostics.mjs +42 -2
- package/src/runtime/agent/orchestrator/tools/builtin/read-formatting.mjs +1 -1
- package/src/runtime/agent/orchestrator/tools/builtin/read-single-tool.mjs +11 -4
- package/src/runtime/agent/orchestrator/tools/builtin/search-tool.mjs +5 -0
- package/src/runtime/agent/orchestrator/tools/builtin/shell-jobs.mjs +50 -39
- package/src/runtime/agent/orchestrator/tools/builtin.mjs +11 -0
- package/src/runtime/agent/orchestrator/tools/code-graph/build.mjs +303 -0
- package/src/runtime/agent/orchestrator/tools/code-graph/constants.mjs +43 -0
- package/src/runtime/agent/orchestrator/tools/code-graph/disk-cache.mjs +382 -0
- package/src/runtime/agent/orchestrator/tools/code-graph/dispatch.mjs +497 -0
- package/src/runtime/agent/orchestrator/tools/code-graph/graph-binary.mjs +295 -0
- package/src/runtime/agent/orchestrator/tools/code-graph/graph-model.mjs +158 -0
- package/src/runtime/agent/orchestrator/tools/code-graph/lang-predicates.mjs +128 -0
- package/src/runtime/agent/orchestrator/tools/code-graph/memory-cache.mjs +66 -0
- package/src/runtime/agent/orchestrator/tools/code-graph/project-root.mjs +44 -0
- package/src/runtime/agent/orchestrator/tools/code-graph/search.mjs +1192 -0
- package/src/runtime/agent/orchestrator/tools/code-graph/source-access.mjs +81 -0
- package/src/runtime/agent/orchestrator/tools/code-graph/span.mjs +19 -0
- package/src/runtime/agent/orchestrator/tools/code-graph/symbol-index.mjs +280 -0
- package/src/runtime/agent/orchestrator/tools/code-graph/text-mask.mjs +347 -0
- package/src/runtime/agent/orchestrator/tools/code-graph.mjs +36 -4277
- package/src/runtime/agent/orchestrator/tools/patch.mjs +3 -3
- package/src/runtime/agent/orchestrator/tools/progress-message.mjs +1 -2
- package/src/runtime/agent/orchestrator/tools/shell-command.mjs +1 -2
- package/src/runtime/agent/orchestrator/tools/shell-snapshot.mjs +2 -4
- package/src/runtime/channels/index.mjs +14 -233
- package/src/runtime/channels/lib/boot-profile.mjs +23 -0
- package/src/runtime/channels/lib/crash-log.mjs +106 -0
- package/src/runtime/channels/lib/index-drop-trace.mjs +72 -0
- package/src/runtime/channels/lib/output-forwarder.mjs +8 -0
- package/src/runtime/channels/lib/telegram-format.mjs +19 -22
- package/src/runtime/channels/lib/whisper-language.mjs +42 -0
- package/src/runtime/memory/index.mjs +314 -359
- package/src/runtime/memory/lib/core-memory-store.mjs +351 -1
- package/src/runtime/memory/lib/cycle-signatures.mjs +34 -0
- package/src/runtime/memory/lib/http-wire.mjs +57 -0
- package/src/runtime/memory/lib/memory-cycle2.mjs +56 -3
- package/src/runtime/memory/lib/memory-recall-scope-filter.mjs +24 -0
- package/src/runtime/memory/lib/memory-retrievers.mjs +8 -0
- package/src/runtime/memory/lib/memory.mjs +20 -0
- package/src/runtime/memory/lib/promotion-fingerprint.mjs +50 -0
- package/src/runtime/memory/lib/recall-format.mjs +183 -0
- package/src/runtime/memory/tool-defs.mjs +4 -4
- package/src/runtime/shared/abort-controller.mjs +1 -1
- package/src/runtime/shared/background-tasks.mjs +2 -3
- package/src/runtime/shared/buffered-appender.mjs +149 -0
- package/src/runtime/shared/task-notification-envelope.mjs +98 -0
- package/src/runtime/shared/task-notification-envelope.test.mjs +107 -0
- package/src/runtime/shared/tool-execution-contract.mjs +2 -2
- package/src/runtime/shared/transcript-writer.mjs +29 -2
- package/src/session-runtime/config-helpers.mjs +209 -0
- package/src/session-runtime/effort.mjs +128 -0
- package/src/session-runtime/fs-utils.mjs +10 -0
- package/src/session-runtime/model-capabilities.mjs +130 -0
- package/src/session-runtime/output-styles.mjs +124 -0
- package/src/session-runtime/plugin-mcp.mjs +114 -0
- package/src/session-runtime/session-text.mjs +100 -0
- package/src/session-runtime/statusline-route.mjs +35 -0
- package/src/session-runtime/tool-catalog.mjs +720 -0
- package/src/session-runtime/workflow.mjs +358 -0
- package/src/standalone/agent-tool.mjs +49 -10
- package/src/standalone/channel-worker.mjs +3 -2
- package/src/standalone/explore-tool.mjs +10 -3
- package/src/standalone/hook-bus.mjs +165 -8
- package/src/standalone/opencode-go-login.mjs +121 -0
- package/src/standalone/provider-admin.mjs +14 -3
- package/src/tui/App.jsx +884 -143
- package/src/tui/components/PromptInput.jsx +272 -15
- package/src/tui/components/ToolExecution.jsx +20 -10
- package/src/tui/components/tool-output-format.mjs +2 -2
- package/src/tui/dist/index.mjs +1771 -1947
- package/src/tui/engine/agent-envelope.mjs +296 -0
- package/src/tui/engine/boot-profile.mjs +21 -0
- package/src/tui/engine/labels.mjs +67 -0
- package/src/tui/engine/notice-text.mjs +112 -0
- package/src/tui/engine/queue-helpers.mjs +161 -0
- package/src/tui/engine/session-stats.mjs +46 -0
- package/src/tui/engine/tool-call-fields.mjs +23 -0
- package/src/tui/engine/tool-result-text.mjs +126 -0
- package/src/tui/engine.mjs +311 -851
- package/src/tui/input-editing.mjs +58 -8
- package/src/tui/input-editing.selection.test.mjs +75 -0
- package/src/tui/keyboard-protocol.mjs +2 -2
- package/src/tui/lib/voice-recorder.mjs +35 -19
- package/src/tui/markdown/format-token.mjs +7 -8
- package/src/tui/markdown/format-token.test.mjs +3 -3
- package/src/tui/paste-attachments.mjs +38 -0
- package/src/tui/paste-fix.test.mjs +119 -0
- package/src/tui/themes/base.mjs +2 -2
- package/src/tui/themes/kanagawa.mjs +4 -4
- package/src/tui/themes/teal.mjs +4 -5
- package/src/tui/themes/utils.mjs +1 -1
- package/src/ui/statusline.mjs +49 -0
- package/src/workflows/default/WORKFLOW.md +16 -9
- package/src/workflows/sequential/WORKFLOW.md +16 -11
- package/src/workflows/solo/WORKFLOW.md +5 -1
|
@@ -333,4 +333,354 @@ export async function deleteCore(dataDir, id) {
|
|
|
333
333
|
const r = await db.query(`DELETE FROM core_entries WHERE id = $1 RETURNING *`, [numId])
|
|
334
334
|
if (r.rows.length === 0) throw new Error(`no entry with id=${numId}`)
|
|
335
335
|
return r.rows[0]
|
|
336
|
-
}
|
|
336
|
+
}
|
|
337
|
+
|
|
338
|
+
// ─── Core-candidate promotion pipeline (proposal mode) ───────────────────────
|
|
339
|
+
//
|
|
340
|
+
// nominateCoreCandidates flags strong active entries as core-memory
|
|
341
|
+
// candidates. NEVER auto-inserts into core_entries — a user approves each via
|
|
342
|
+
// listCoreCandidates → promoteCoreCandidate. Durable-signal driven:
|
|
343
|
+
// - category grade: only durable knowledge types (rule/constraint/decision/
|
|
344
|
+
// preference/goal/fact) — transient task/issue never nominated.
|
|
345
|
+
// - score >= CANDIDATE_MIN_SCORE: survived age-decay / repeated gate reviews.
|
|
346
|
+
// - reviewed_at survival: entry has been through >= 1 gate review (reviewed_at
|
|
347
|
+
// set) so freshly-promoted noise is excluded.
|
|
348
|
+
// - core_overlap skip: entries whose embedding sits near an existing
|
|
349
|
+
// core_entries row (sim >= CANDIDATE_OVERLAP_SIM) are already covered by a
|
|
350
|
+
// user rule — skip to avoid duplicate promotion. Reuses the same cosine
|
|
351
|
+
// recall shape as cycle2 phase_merge core_overlap.
|
|
352
|
+
// Terminal states ('promoted'/'dismissed') are never re-nominated. Caps at
|
|
353
|
+
// CANDIDATE_CAP total live candidates.
|
|
354
|
+
|
|
355
|
+
const CANDIDATE_CAP = 10
|
|
356
|
+
// Durable categories worth surfacing for user-curated core memory. Mirrors the
|
|
357
|
+
// high end of CATEGORY_GRADE (memory-score.mjs) — task/issue excluded.
|
|
358
|
+
const CANDIDATE_CATEGORIES = new Set(['rule', 'constraint', 'decision', 'preference', 'goal', 'fact'])
|
|
359
|
+
// Score floor: preference grade is 1.4, fact 1.6 — require the entry to still
|
|
360
|
+
// be near its grade ceiling (i.e. survived decay), not a stale low-score root.
|
|
361
|
+
const CANDIDATE_MIN_SCORE = 1.3
|
|
362
|
+
// Embedding sim at/above which the active entry is considered already covered
|
|
363
|
+
// by an existing core row → skip nomination. Matches cycle2 TIER1_THRESHOLD.
|
|
364
|
+
const CANDIDATE_OVERLAP_SIM = 0.78
|
|
365
|
+
// A promote left mid-flight ('promoting') longer than this is treated as a
|
|
366
|
+
// crashed promotion and reverted to a live candidate by recoverStalePromotions.
|
|
367
|
+
// Worst-case addCore duration bounds this: it runs up to CORE_DEDUP_TOP_K (5)
|
|
368
|
+
// sequential LLM merge-judge calls at 30s timeout each (~150s) plus embedding
|
|
369
|
+
// generation — call it ~3min worst case. 15min gives >5x margin so a slow-but-
|
|
370
|
+
// live promote is never mistaken for a crash, while still recovering a genuine
|
|
371
|
+
// crash within one hourly cycle2 pass. The finalize path ALSO tolerates a
|
|
372
|
+
// racing recovery (rowCount=0 → re-claim, see promoteCoreCandidate) so an
|
|
373
|
+
// over-tight cutoff can't corrupt state — this margin is defense-in-depth.
|
|
374
|
+
const PROMOTING_STALE_MS = 15 * 60_000
|
|
375
|
+
|
|
376
|
+
function _candidateReason(row) {
|
|
377
|
+
return `${row.category} grade, score ${Number(row.score).toFixed(2)}, survived gate review`
|
|
378
|
+
}
|
|
379
|
+
|
|
380
|
+
// Post-gate nomination pass. Cheap: one scan over durable high-score active
|
|
381
|
+
// roots not already candidate/promoted/dismissed, one core-overlap cosine
|
|
382
|
+
// probe per row, capped at CANDIDATE_CAP net-new. Returns count nominated.
|
|
383
|
+
export async function nominateCoreCandidates(dataDir, options = {}) {
|
|
384
|
+
const signal = options?.signal
|
|
385
|
+
const db = _getDb(dataDir)
|
|
386
|
+
throwIfAborted(signal)
|
|
387
|
+
// Recover crashed promotions first: a root stuck in 'promoting' past
|
|
388
|
+
// PROMOTING_STALE_MS (claim tx committed but the process died before finalize)
|
|
389
|
+
// is reverted to a live candidate here, so it re-enters the pool below.
|
|
390
|
+
try {
|
|
391
|
+
await recoverStalePromotions(dataDir, { signal })
|
|
392
|
+
throwIfAborted(signal)
|
|
393
|
+
} catch (err) {
|
|
394
|
+
if (signal?.aborted) throw signal.reason ?? err
|
|
395
|
+
__mixdogMemoryLog(`[core-memory] stale-promotion recovery failed: ${err.message}\n`)
|
|
396
|
+
}
|
|
397
|
+
// Live candidate headroom: never exceed CANDIDATE_CAP total pending. Count
|
|
398
|
+
// only ACTIVE candidate roots — a candidate archived by cycle2 core_overlap
|
|
399
|
+
// between nomination and now must not eat headroom (it is also excluded from
|
|
400
|
+
// listCoreCandidates by the same status='active' guard).
|
|
401
|
+
const liveRes = await db.query(
|
|
402
|
+
`SELECT COUNT(*)::int AS n FROM entries WHERE is_root = 1 AND status = 'active' AND core_candidate_status = 'candidate'`,
|
|
403
|
+
)
|
|
404
|
+
const live = Number(liveRes.rows[0]?.n ?? 0)
|
|
405
|
+
const headroom = CANDIDATE_CAP - live
|
|
406
|
+
if (headroom <= 0) return 0
|
|
407
|
+
|
|
408
|
+
// Pull the strongest eligible roots that have never been nominated (status
|
|
409
|
+
// NULL) and have been through a gate review (reviewed_at set). Terminal
|
|
410
|
+
// 'promoted'/'dismissed' rows are excluded by the NULL predicate.
|
|
411
|
+
const cats = [...CANDIDATE_CATEGORIES]
|
|
412
|
+
const eligibleRes = await db.query(
|
|
413
|
+
`SELECT id, element, summary, category, score, project_id,
|
|
414
|
+
(embedding IS NOT NULL) AS has_embedding
|
|
415
|
+
FROM entries
|
|
416
|
+
WHERE is_root = 1 AND status = 'active'
|
|
417
|
+
AND core_candidate_status IS NULL
|
|
418
|
+
AND reviewed_at IS NOT NULL
|
|
419
|
+
AND category = ANY($1::text[])
|
|
420
|
+
AND score >= $2
|
|
421
|
+
ORDER BY score DESC, last_seen_at DESC, id ASC
|
|
422
|
+
LIMIT $3`,
|
|
423
|
+
[cats, CANDIDATE_MIN_SCORE, headroom * 3],
|
|
424
|
+
)
|
|
425
|
+
throwIfAborted(signal)
|
|
426
|
+
|
|
427
|
+
const now = Date.now()
|
|
428
|
+
let nominated = 0
|
|
429
|
+
for (const row of eligibleRes.rows) {
|
|
430
|
+
throwIfAborted(signal)
|
|
431
|
+
if (nominated >= headroom) break
|
|
432
|
+
// core_overlap skip: is this entry already covered by an existing core row?
|
|
433
|
+
// Compute similarity fully in SQL against the entry's own embedding
|
|
434
|
+
// (referenced by id) so no halfvec value round-trips through JS — mirrors
|
|
435
|
+
// the cycle2 phase_merge core_overlap probe shape. Same-pool + COMMON core
|
|
436
|
+
// are eligible matches.
|
|
437
|
+
if (row.has_embedding) {
|
|
438
|
+
const ov = await db.query(
|
|
439
|
+
`SELECT 1 - (e.embedding <=> c.embedding) AS sim
|
|
440
|
+
FROM entries e
|
|
441
|
+
CROSS JOIN LATERAL (
|
|
442
|
+
SELECT inner_c.embedding
|
|
443
|
+
FROM core_entries inner_c
|
|
444
|
+
WHERE inner_c.embedding IS NOT NULL
|
|
445
|
+
AND (inner_c.project_id IS NULL OR inner_c.project_id IS NOT DISTINCT FROM e.project_id)
|
|
446
|
+
ORDER BY inner_c.embedding <=> e.embedding
|
|
447
|
+
LIMIT 1
|
|
448
|
+
) c
|
|
449
|
+
WHERE e.id = $1 AND e.embedding IS NOT NULL`,
|
|
450
|
+
[Number(row.id)],
|
|
451
|
+
)
|
|
452
|
+
throwIfAborted(signal)
|
|
453
|
+
if (ov.rows.length > 0 && Number(ov.rows[0].sim) >= CANDIDATE_OVERLAP_SIM) continue
|
|
454
|
+
}
|
|
455
|
+
const r = await db.query(
|
|
456
|
+
`UPDATE entries SET core_candidate_status = 'candidate', core_candidate_at = $1
|
|
457
|
+
WHERE id = $2 AND is_root = 1 AND core_candidate_status IS NULL`,
|
|
458
|
+
[now, Number(row.id)],
|
|
459
|
+
)
|
|
460
|
+
if (Number(r.rowCount ?? r.affectedRows ?? 0) > 0) nominated++
|
|
461
|
+
}
|
|
462
|
+
if (nominated > 0) {
|
|
463
|
+
__mixdogMemoryLog(`[core-memory] nominated ${nominated} core candidate(s)\n`)
|
|
464
|
+
}
|
|
465
|
+
return nominated
|
|
466
|
+
}
|
|
467
|
+
|
|
468
|
+
// List live candidates for the UI. Shape matches the deliver spec:
|
|
469
|
+
// {id, element, summary, category, score, reason}.
|
|
470
|
+
// `scope`: null → COMMON pool only (project_id NULL); '*' → all pools;
|
|
471
|
+
// slug → that project's pool + COMMON. Mirrors the add/edit/delete + list
|
|
472
|
+
// project isolation so an unscoped call can't leak another project's
|
|
473
|
+
// candidates. status='active' guard: a candidate root archived by cycle2
|
|
474
|
+
// core_overlap between nomination and listing must NOT stay listed (it also
|
|
475
|
+
// no longer counts against CANDIDATE_CAP — see nominateCoreCandidates).
|
|
476
|
+
export async function listCoreCandidates(dataDir, scope = null) {
|
|
477
|
+
const db = _getDb(dataDir)
|
|
478
|
+
let scopeClause = ''
|
|
479
|
+
const params = []
|
|
480
|
+
if (scope === '*') {
|
|
481
|
+
scopeClause = ''
|
|
482
|
+
} else if (scope == null) {
|
|
483
|
+
scopeClause = 'AND project_id IS NULL'
|
|
484
|
+
} else {
|
|
485
|
+
scopeClause = 'AND (project_id IS NULL OR project_id = $1)'
|
|
486
|
+
params.push(scope)
|
|
487
|
+
}
|
|
488
|
+
const r = await db.query(
|
|
489
|
+
`SELECT id, element, summary, category, score, project_id
|
|
490
|
+
FROM entries
|
|
491
|
+
WHERE is_root = 1 AND status = 'active' AND core_candidate_status = 'candidate'
|
|
492
|
+
${scopeClause}
|
|
493
|
+
ORDER BY score DESC, core_candidate_at DESC, id ASC`,
|
|
494
|
+
params,
|
|
495
|
+
)
|
|
496
|
+
return r.rows.map(row => ({
|
|
497
|
+
id: Number(row.id),
|
|
498
|
+
element: row.element,
|
|
499
|
+
summary: row.summary,
|
|
500
|
+
category: row.category,
|
|
501
|
+
score: row.score == null ? null : Number(row.score),
|
|
502
|
+
project_id: row.project_id ?? null,
|
|
503
|
+
reason: _candidateReason(row),
|
|
504
|
+
}))
|
|
505
|
+
}
|
|
506
|
+
|
|
507
|
+
// Promote a candidate via a two-phase claim → insert → finalize with a
|
|
508
|
+
// recoverable intermediate state ('promoting'), so a process crash at ANY point
|
|
509
|
+
// is recoverable by the cycle2 recovery sweep (recoverStalePromotions).
|
|
510
|
+
//
|
|
511
|
+
// Phase 1 (claim tx): status='archived', core_candidate_status='promoting'.
|
|
512
|
+
// The embedding is NOT nulled here — deferred to finalize — so recovery can
|
|
513
|
+
// restore the row to active WITHOUT needing to re-embed. Archived-with-
|
|
514
|
+
// embedding for the brief promoting window is harmless: the recall scope
|
|
515
|
+
// filter excludes BOTH 'promoted' AND 'promoting' rows (and their members).
|
|
516
|
+
// Phase 2: addCore (its own tx — advisory locks can't join an outer tx).
|
|
517
|
+
// Phase 3 (finalize tx): core_candidate_status='promoted', embedding=NULL.
|
|
518
|
+
//
|
|
519
|
+
// Crash matrix:
|
|
520
|
+
// - crash after phase 1, before addCore commits → row is archived+'promoting'
|
|
521
|
+
// with NO core row → recovery sweep (stale > PROMOTING_STALE_MS) reverts it
|
|
522
|
+
// to active+'candidate' (embedding intact) → clean retry.
|
|
523
|
+
// - addCore threw → synchronous compensation reverts immediately (same shape).
|
|
524
|
+
// - crash after addCore commits, before finalize → core row exists + row is
|
|
525
|
+
// 'promoting' → recovery reverts the ROOT to candidate, but the core row now
|
|
526
|
+
// exists, so the retry's addCore merge-judge/unique-index folds back into the
|
|
527
|
+
// same core row (element unchanged) → converges (no duplicate). This is the
|
|
528
|
+
// one window where a retry relies on addCore dedup, but it is bounded and
|
|
529
|
+
// self-healing rather than a permanent orphan+stuck-root.
|
|
530
|
+
// - finalize committed → terminal 'promoted', embedding NULL → done.
|
|
531
|
+
//
|
|
532
|
+
// `scope` (from the index handler) enforces project isolation: the candidate
|
|
533
|
+
// must belong to the resolved scope or COMMON — never another project's pool.
|
|
534
|
+
export async function promoteCoreCandidate(dataDir, id, options = {}) {
|
|
535
|
+
const numId = Number(id)
|
|
536
|
+
if (!Number.isInteger(numId) || numId <= 0) throw new Error('integer id > 0 required')
|
|
537
|
+
const db = _getDb(dataDir)
|
|
538
|
+
// Require BOTH active status and a live candidate flag (finding #2): a stale
|
|
539
|
+
// archived/merged root must not be promotable by direct id.
|
|
540
|
+
const cur = (await db.query(
|
|
541
|
+
`SELECT id, element, summary, category, project_id, core_candidate_status
|
|
542
|
+
FROM entries WHERE id = $1 AND is_root = 1 AND status = 'active'`,
|
|
543
|
+
[numId],
|
|
544
|
+
)).rows[0]
|
|
545
|
+
if (!cur) throw new Error(`no active root entry with id=${numId} (already archived, merged, or deleted)`)
|
|
546
|
+
if (cur.core_candidate_status !== 'candidate') {
|
|
547
|
+
throw new Error(`entry id=${numId} is not a live core candidate (status=${cur.core_candidate_status ?? 'none'})`)
|
|
548
|
+
}
|
|
549
|
+
// Project-scope guard: reject cross-project promotion. scope null == COMMON;
|
|
550
|
+
// a scoped candidate is only promotable within its own pool (or if it is a
|
|
551
|
+
// COMMON candidate). Mirrors add/edit/delete project isolation.
|
|
552
|
+
const scope = options?.scope ?? null
|
|
553
|
+
const rowPid = cur.project_id ?? null
|
|
554
|
+
if (rowPid != null && rowPid !== scope) {
|
|
555
|
+
throw new Error(`candidate id=${numId} belongs to project "${rowPid}", not the resolved scope "${scope ?? 'common'}"`)
|
|
556
|
+
}
|
|
557
|
+
// Core summary cap: candidate summaries may exceed CORE_SUMMARY_MAX. Prefer
|
|
558
|
+
// the explicit override, else compress by truncation so addCore accepts it.
|
|
559
|
+
const summary = options?.summary ?? cur.summary
|
|
560
|
+
const cappedSummary = summary && String(summary).length > CORE_SUMMARY_MAX
|
|
561
|
+
? String(summary).slice(0, CORE_SUMMARY_MAX)
|
|
562
|
+
: summary
|
|
563
|
+
const now = Date.now()
|
|
564
|
+
// Phase 1 — claim (active+candidate guarded so a concurrent archive/promote
|
|
565
|
+
// loses the race → 0 rows → nothing to promote). Embedding NOT nulled here
|
|
566
|
+
// (deferred to finalize) so recovery needs no re-embed.
|
|
567
|
+
const claim = await db.transaction(async (tx) => {
|
|
568
|
+
const r = await tx.query(
|
|
569
|
+
`UPDATE entries SET core_candidate_status = 'promoting', core_candidate_at = $1, status = 'archived'
|
|
570
|
+
WHERE id = $2 AND is_root = 1 AND status = 'active' AND core_candidate_status = 'candidate'`,
|
|
571
|
+
[now, numId],
|
|
572
|
+
)
|
|
573
|
+
return Number(r.rowCount ?? r.affectedRows ?? 0)
|
|
574
|
+
})
|
|
575
|
+
if (claim === 0) {
|
|
576
|
+
throw new Error(`candidate id=${numId} was concurrently promoted/archived — nothing to do`)
|
|
577
|
+
}
|
|
578
|
+
// Phase 2 — insert into core_entries. addCore's own tx commits independently.
|
|
579
|
+
let entry
|
|
580
|
+
try {
|
|
581
|
+
entry = await addCore(
|
|
582
|
+
dataDir,
|
|
583
|
+
{ element: cur.element, summary: cappedSummary, category: cur.category },
|
|
584
|
+
rowPid,
|
|
585
|
+
)
|
|
586
|
+
} catch (err) {
|
|
587
|
+
// Synchronous compensation: revert the 'promoting' claim to the live-
|
|
588
|
+
// candidate state so a retry is clean and no core row was created. Embedding
|
|
589
|
+
// is intact (never nulled), so no re-embed needed.
|
|
590
|
+
try {
|
|
591
|
+
await db.transaction(async (tx) => {
|
|
592
|
+
await tx.query(
|
|
593
|
+
`UPDATE entries SET core_candidate_status = 'candidate', core_candidate_at = $1, status = 'active'
|
|
594
|
+
WHERE id = $2 AND is_root = 1 AND core_candidate_status = 'promoting' AND status = 'archived'`,
|
|
595
|
+
[Date.now(), numId],
|
|
596
|
+
)
|
|
597
|
+
})
|
|
598
|
+
} catch (compErr) {
|
|
599
|
+
__mixdogMemoryLog(`[core-memory] promote compensation failed id=${numId}: ${compErr.message} (root left 'promoting' — recovery sweep will revert)\n`)
|
|
600
|
+
}
|
|
601
|
+
throw err
|
|
602
|
+
}
|
|
603
|
+
// Phase 3 — finalize: terminal 'promoted' + null the embedding (now safe: the
|
|
604
|
+
// core row is committed, so nulling can't strand a recoverable row without its
|
|
605
|
+
// fact). Guarded on 'promoting'. If a racing recoverStalePromotions (slow
|
|
606
|
+
// addCore that overran PROMOTING_STALE_MS) already reverted the row to
|
|
607
|
+
// 'candidate'+active, this affects 0 rows — but the core row IS committed, so
|
|
608
|
+
// we must NOT return success while the root is still a live candidate (user
|
|
609
|
+
// would see success + the candidate re-listed). Re-claim from the recovered
|
|
610
|
+
// 'candidate' state (finding #2). If THAT also affects 0 rows, another actor
|
|
611
|
+
// changed the row (genuine re-promote, dismiss, archive) — don't clobber;
|
|
612
|
+
// log and still return the entry (the core row exists either way).
|
|
613
|
+
const finalize = await db.transaction(async (tx) => {
|
|
614
|
+
const r1 = await tx.query(
|
|
615
|
+
`UPDATE entries SET core_candidate_status = 'promoted', core_candidate_at = $1, embedding = NULL
|
|
616
|
+
WHERE id = $2 AND is_root = 1 AND core_candidate_status = 'promoting'`,
|
|
617
|
+
[Date.now(), numId],
|
|
618
|
+
)
|
|
619
|
+
if (Number(r1.rowCount ?? r1.affectedRows ?? 0) > 0) return 'finalized'
|
|
620
|
+
// Row was recovered back to candidate mid-flight — re-claim it (core row
|
|
621
|
+
// already committed). Guard on the exact recovery state (active+candidate).
|
|
622
|
+
const r2 = await tx.query(
|
|
623
|
+
`UPDATE entries SET core_candidate_status = 'promoted', core_candidate_at = $1, status = 'archived', embedding = NULL
|
|
624
|
+
WHERE id = $2 AND is_root = 1 AND status = 'active' AND core_candidate_status = 'candidate'`,
|
|
625
|
+
[Date.now(), numId],
|
|
626
|
+
)
|
|
627
|
+
return Number(r2.rowCount ?? r2.affectedRows ?? 0) > 0 ? 'reclaimed' : 'unchanged'
|
|
628
|
+
})
|
|
629
|
+
if (finalize === 'reclaimed') {
|
|
630
|
+
__mixdogMemoryLog(`[core-memory] promote id=${numId} finalized after a racing recovery revert (re-claimed)\n`)
|
|
631
|
+
} else if (finalize === 'unchanged') {
|
|
632
|
+
__mixdogMemoryLog(`[core-memory] promote id=${numId}: root changed by another actor before finalize; core row committed, root state left as-is\n`)
|
|
633
|
+
}
|
|
634
|
+
return entry
|
|
635
|
+
}
|
|
636
|
+
|
|
637
|
+
// Recovery sweep for crashed promotions: a root left in 'promoting' (claim tx
|
|
638
|
+
// committed but the process died before finalize) is reverted to the live
|
|
639
|
+
// candidate state (status='active', core_candidate_status='candidate') once it
|
|
640
|
+
// is older than PROMOTING_STALE_MS. Embedding was never nulled in the claim, so
|
|
641
|
+
// no re-embed is required. Runs from nominateCoreCandidates (hourly cycle2).
|
|
642
|
+
// Idempotent: 0 stale rows → fast no-op. Returns count recovered.
|
|
643
|
+
export async function recoverStalePromotions(dataDir, options = {}) {
|
|
644
|
+
const signal = options?.signal
|
|
645
|
+
const db = _getDb(dataDir)
|
|
646
|
+
throwIfAborted(signal)
|
|
647
|
+
const cutoff = Date.now() - PROMOTING_STALE_MS
|
|
648
|
+
const r = await db.query(
|
|
649
|
+
`UPDATE entries SET core_candidate_status = 'candidate', core_candidate_at = $1, status = 'active'
|
|
650
|
+
WHERE is_root = 1 AND core_candidate_status = 'promoting'
|
|
651
|
+
AND core_candidate_at IS NOT NULL AND core_candidate_at < $2`,
|
|
652
|
+
[Date.now(), cutoff],
|
|
653
|
+
)
|
|
654
|
+
const n = Number(r.rowCount ?? r.affectedRows ?? 0)
|
|
655
|
+
if (n > 0) __mixdogMemoryLog(`[core-memory] recovered ${n} stale 'promoting' root(s) → candidate\n`)
|
|
656
|
+
return n
|
|
657
|
+
}
|
|
658
|
+
|
|
659
|
+
// Dismiss a candidate: mark terminal so the nomination pass never re-nominates
|
|
660
|
+
// the same root. Leaves status/score untouched — the entry stays active in
|
|
661
|
+
// generated memory, it just won't be re-surfaced as a core candidate.
|
|
662
|
+
// `scope` enforces project isolation (mirrors promote): a scoped caller can
|
|
663
|
+
// only dismiss candidates in its own pool or COMMON.
|
|
664
|
+
export async function dismissCoreCandidate(dataDir, id, options = {}) {
|
|
665
|
+
const numId = Number(id)
|
|
666
|
+
if (!Number.isInteger(numId) || numId <= 0) throw new Error('integer id > 0 required')
|
|
667
|
+
const db = _getDb(dataDir)
|
|
668
|
+
const scope = options?.scope ?? null
|
|
669
|
+
const cur = (await db.query(
|
|
670
|
+
`SELECT project_id, core_candidate_status FROM entries WHERE id = $1 AND is_root = 1`,
|
|
671
|
+
[numId],
|
|
672
|
+
)).rows[0]
|
|
673
|
+
if (!cur) throw new Error(`no root entry with id=${numId}`)
|
|
674
|
+
const rowPid = cur.project_id ?? null
|
|
675
|
+
if (rowPid != null && rowPid !== scope) {
|
|
676
|
+
throw new Error(`candidate id=${numId} belongs to project "${rowPid}", not the resolved scope "${scope ?? 'common'}"`)
|
|
677
|
+
}
|
|
678
|
+
const r = await db.query(
|
|
679
|
+
`UPDATE entries SET core_candidate_status = 'dismissed', core_candidate_at = $1
|
|
680
|
+
WHERE id = $2 AND is_root = 1 AND core_candidate_status = 'candidate'
|
|
681
|
+
RETURNING id, element, category`,
|
|
682
|
+
[Date.now(), numId],
|
|
683
|
+
)
|
|
684
|
+
if (r.rows.length === 0) throw new Error(`no live core candidate with id=${numId}`)
|
|
685
|
+
return r.rows[0]
|
|
686
|
+
}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
// Scheduled-cycle request-signature helpers extracted from index.mjs.
|
|
2
|
+
// Pure functions of the passed `config` object; they call the imported
|
|
3
|
+
// makeCycleRequestSignature and touch no module state (no db/timers).
|
|
4
|
+
// index.mjs imports these; signatures and behavior are unchanged.
|
|
5
|
+
|
|
6
|
+
import { makeCycleRequestSignature } from './memory-cycle-requests.mjs'
|
|
7
|
+
|
|
8
|
+
export function scheduledCycle1Signature(config) {
|
|
9
|
+
return makeCycleRequestSignature('cycle1', config, {
|
|
10
|
+
preset: undefined,
|
|
11
|
+
concurrency: undefined,
|
|
12
|
+
maxConcurrent: undefined,
|
|
13
|
+
})
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
export function scheduledCycle2Signature(config) {
|
|
17
|
+
return makeCycleRequestSignature('cycle2', config, {
|
|
18
|
+
cascadePreset: undefined,
|
|
19
|
+
concurrency: undefined,
|
|
20
|
+
})
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
export function scheduledCycle3ApplyMode(config) {
|
|
24
|
+
const raw = String(config?.cycle3?.applyMode || 'conservative').trim().toLowerCase()
|
|
25
|
+
return (raw === 'proposal' || raw === 'dry-run' || raw === 'dryrun') ? 'proposal' : 'conservative'
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
export function scheduledCycle3Signature(config) {
|
|
29
|
+
const retryConfig = config?.cycle3 || config
|
|
30
|
+
return makeCycleRequestSignature('cycle3', retryConfig, {
|
|
31
|
+
applyMode: scheduledCycle3ApplyMode(config),
|
|
32
|
+
apply: undefined,
|
|
33
|
+
})
|
|
34
|
+
}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
// HTTP wire helpers extracted from index.mjs. All pure request/response
|
|
2
|
+
// utilities with no module state — no db, _traceDb, or timer dependencies.
|
|
3
|
+
// index.mjs imports these; behavior and signatures are unchanged.
|
|
4
|
+
|
|
5
|
+
export function readBody(req) {
|
|
6
|
+
return new Promise((resolve, reject) => {
|
|
7
|
+
const chunks = []
|
|
8
|
+
req.on('data', c => chunks.push(c))
|
|
9
|
+
req.on('end', () => {
|
|
10
|
+
const raw = Buffer.concat(chunks).toString('utf8').trim()
|
|
11
|
+
if (!raw) { resolve({}); return }
|
|
12
|
+
try { resolve(JSON.parse(raw)) }
|
|
13
|
+
catch (error) {
|
|
14
|
+
const e = new Error(`invalid JSON body: ${error.message}`)
|
|
15
|
+
e.statusCode = 400
|
|
16
|
+
reject(e)
|
|
17
|
+
}
|
|
18
|
+
})
|
|
19
|
+
req.on('error', reject)
|
|
20
|
+
})
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
export function sendJson(res, data, status = 200) {
|
|
24
|
+
const body = JSON.stringify(data)
|
|
25
|
+
res.writeHead(status, {
|
|
26
|
+
'Content-Type': 'application/json; charset=utf-8',
|
|
27
|
+
'Content-Length': Buffer.byteLength(body),
|
|
28
|
+
})
|
|
29
|
+
res.end(body)
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
export function sendError(res, msg, status = 500) {
|
|
33
|
+
sendJson(res, { error: msg }, status)
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
// Origin/Referer guard for /admin/* mutation routes. Memory-service binds
|
|
37
|
+
// 127.0.0.1, but browser DNS-rebinding or a stray cross-origin fetch could
|
|
38
|
+
// still reach destructive endpoints (purge, backfill, entry mutations).
|
|
39
|
+
// Server-to-server callers (setup-server, hooks) issue raw http.request
|
|
40
|
+
// without a browser Origin/Referer, so absent headers pass; any non-loopback
|
|
41
|
+
// Origin/Referer is rejected. Mirrors setup-server.mjs isAllowedOrigin.
|
|
42
|
+
export function isLocalOrigin(req) {
|
|
43
|
+
const LOOP = /^https?:\/\/(localhost|127\.0\.0\.1|\[::1\])(:\d+)?(\/|$)/i
|
|
44
|
+
const origin = req.headers.origin || ''
|
|
45
|
+
const referer = req.headers.referer || ''
|
|
46
|
+
if (origin && !LOOP.test(origin)) return false
|
|
47
|
+
if (referer && !LOOP.test(referer)) return false
|
|
48
|
+
return true
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
export function normalizeCoreProjectId(value, { allowStar = false } = {}) {
|
|
52
|
+
if (value == null) return null
|
|
53
|
+
const s = String(value).trim()
|
|
54
|
+
if (!s || s.toLowerCase() === 'common') return null
|
|
55
|
+
if (allowStar && s === '*') return '*'
|
|
56
|
+
return s
|
|
57
|
+
}
|
|
@@ -12,7 +12,7 @@ import { callAgentDispatch } from './agent-ipc.mjs'
|
|
|
12
12
|
import {
|
|
13
13
|
syncRootEmbedding, deleteRootEmbedding, flushEmbeddingDirty,
|
|
14
14
|
} from './memory-embed.mjs'
|
|
15
|
-
import { listCore, backfillCoreEmbeddings, CORE_SUMMARY_MAX } from './core-memory-store.mjs'
|
|
15
|
+
import { listCore, backfillCoreEmbeddings, nominateCoreCandidates, CORE_SUMMARY_MAX } from './core-memory-store.mjs'
|
|
16
16
|
import { markCycleRequest, consumeCycleRequests, resolveCoalesceMaxDrains, scheduleCoalescedCycleRetry, makeCycleRequestSignature, resolveCoalesceMaxRetries } from './memory-cycle-requests.mjs'
|
|
17
17
|
|
|
18
18
|
export const CYCLE2_ACTIVE_TARGET_CAP = 100
|
|
@@ -490,7 +490,13 @@ export async function runPhaseMerge(db, options = {}) {
|
|
|
490
490
|
// Archiving one overlap and deleting its embedding is one mutation unit;
|
|
491
491
|
// cancellation resumes at the next row boundary.
|
|
492
492
|
const r = await db.query(
|
|
493
|
-
|
|
493
|
+
// Clear a live core-candidate flag on the same UPDATE: an archived root
|
|
494
|
+
// must not stay listed as a candidate or keep eating CANDIDATE_CAP. Set
|
|
495
|
+
// it to 'dismissed' (terminal) since the fact already restates a core row.
|
|
496
|
+
`UPDATE entries
|
|
497
|
+
SET status = 'archived',
|
|
498
|
+
core_candidate_status = CASE WHEN core_candidate_status = 'candidate' THEN 'dismissed' ELSE core_candidate_status END
|
|
499
|
+
WHERE id = $1 AND is_root = 1 AND status = 'active'`,
|
|
494
500
|
[Number(row.entry_id)],
|
|
495
501
|
)
|
|
496
502
|
if (Number(r.rowCount ?? r.affectedRows ?? 0) > 0) {
|
|
@@ -865,6 +871,7 @@ function mergeCycle2Results(a, b) {
|
|
|
865
871
|
merge_rejected: Number(a.merge_rejected || 0) + Number(b.merge_rejected || 0),
|
|
866
872
|
missing_core_summary: Number(a.missing_core_summary || 0) + Number(b.missing_core_summary || 0),
|
|
867
873
|
core_embedding_backfill: Number(a.core_embedding_backfill || 0) + Number(b.core_embedding_backfill || 0),
|
|
874
|
+
core_candidates_nominated: Number(a.core_candidates_nominated || 0) + Number(b.core_candidates_nominated || 0),
|
|
868
875
|
rescore: mergeNestedNumeric(a.rescore, b.rescore),
|
|
869
876
|
phase_merge: mergeNestedNumeric(a.phase_merge, b.phase_merge),
|
|
870
877
|
cascade: mergeNestedNumeric(a.cascade, b.cascade),
|
|
@@ -1007,6 +1014,7 @@ async function _runCycle2Impl(db, config = {}, options = {}, dataDir = null) {
|
|
|
1007
1014
|
merge_rejected: 0,
|
|
1008
1015
|
missing_core_summary: 0,
|
|
1009
1016
|
core_embedding_backfill: 0,
|
|
1017
|
+
core_candidates_nominated: 0,
|
|
1010
1018
|
rescore: { updated: 0 },
|
|
1011
1019
|
phase_merge: { merged: 0, llm_calls: 0, tier1_pairs: 0, tier2_pairs: 0, core_overlap: 0 },
|
|
1012
1020
|
cascade: { evaluated: 0, dropped: 0 },
|
|
@@ -1360,11 +1368,55 @@ async function _runCycle2Impl(db, config = {}, options = {}, dataDir = null) {
|
|
|
1360
1368
|
throwIfAborted(signal)
|
|
1361
1369
|
stats.phase_merge = phaseMergeStats
|
|
1362
1370
|
|
|
1371
|
+
// Core-candidate nomination (proposal mode): flag strong durable active
|
|
1372
|
+
// roots as core-memory candidates for user approval. Runs AFTER phase_merge
|
|
1373
|
+
// so its core_overlap sweep has already archived active entries that restate
|
|
1374
|
+
// an existing core row — nomination never re-surfaces those. NEVER
|
|
1375
|
+
// auto-inserts into core_entries; the user promotes via action:'core'
|
|
1376
|
+
// op:'promote'. Best-effort: a failure here must not fail the cycle.
|
|
1377
|
+
if (dataDir) {
|
|
1378
|
+
try {
|
|
1379
|
+
throwIfAborted(signal)
|
|
1380
|
+
stats.core_candidates_nominated = await nominateCoreCandidates(dataDir, { signal })
|
|
1381
|
+
throwIfAborted(signal)
|
|
1382
|
+
} catch (err) {
|
|
1383
|
+
if (signal?.aborted) throw signal.reason ?? err
|
|
1384
|
+
__mixdogMemoryLog(`[cycle2] core-candidate nomination failed: ${err.message}\n`)
|
|
1385
|
+
}
|
|
1386
|
+
}
|
|
1387
|
+
|
|
1363
1388
|
// Active-cap enforcement is delegated to the gate (phases 1-3): the prompt
|
|
1364
1389
|
// exposes Active/cap counts and instructs aggressive `archived` verdicts on
|
|
1365
1390
|
// overflow. No deterministic safety net here — if the gate ever fails to
|
|
1366
1391
|
// contain growth, fix the prompt, not bolt a fallback back on.
|
|
1367
1392
|
|
|
1393
|
+
// Chronic gate-failure sweep: pending roots that have failed the gate 5+
|
|
1394
|
+
// times AND are 30+ days old will realistically never pass (their content
|
|
1395
|
+
// keeps breaking the parse — 2026-07 drain left 154 such rows cycling as
|
|
1396
|
+
// permanent noop batches). Terminal-archive them (status only, no data
|
|
1397
|
+
// deletion) so they stop occupying gate batches. Same cooldown semantics
|
|
1398
|
+
// as the parse-failure reviewed_at advance above.
|
|
1399
|
+
try {
|
|
1400
|
+
throwIfAborted(signal)
|
|
1401
|
+
const sweepRes = await db.query(
|
|
1402
|
+
`UPDATE entries
|
|
1403
|
+
SET status = 'archived', reviewed_at = $1
|
|
1404
|
+
WHERE is_root = 1 AND status = 'pending'
|
|
1405
|
+
AND COALESCE(error_count, 0) >= 5
|
|
1406
|
+
AND ts < $2
|
|
1407
|
+
RETURNING id`,
|
|
1408
|
+
[Date.now(), Date.now() - 30 * 86_400_000],
|
|
1409
|
+
)
|
|
1410
|
+
const swept = sweepRes?.rows?.length ?? 0
|
|
1411
|
+
if (swept > 0) {
|
|
1412
|
+
stats.chronic_swept = swept
|
|
1413
|
+
__mixdogMemoryLog(`[cycle2] chronic gate-failure sweep archived=${swept}\n`)
|
|
1414
|
+
}
|
|
1415
|
+
} catch (err) {
|
|
1416
|
+
if (signal?.aborted) throw signal.reason ?? err
|
|
1417
|
+
__mixdogMemoryLog(`[cycle2] chronic sweep failed: ${err.message}\n`)
|
|
1418
|
+
}
|
|
1419
|
+
|
|
1368
1420
|
__mixdogMemoryLog(
|
|
1369
1421
|
`[cycle2] rescore=${stats.rescore.updated}` +
|
|
1370
1422
|
` core_backfill=${stats.core_embedding_backfill}` +
|
|
@@ -1375,7 +1427,8 @@ async function _runCycle2Impl(db, config = {}, options = {}, dataDir = null) {
|
|
|
1375
1427
|
` missing_core=${stats.missing_core_summary}` +
|
|
1376
1428
|
` | cascade eval=${stats.cascade.evaluated} drop=${stats.cascade.dropped}` +
|
|
1377
1429
|
` | phase_merge merged=${stats.phase_merge.merged} core_overlap=${stats.phase_merge.core_overlap || 0}` +
|
|
1378
|
-
` llm=${stats.phase_merge.llm_calls}
|
|
1430
|
+
` llm=${stats.phase_merge.llm_calls}` +
|
|
1431
|
+
` | core_candidates=${stats.core_candidates_nominated || 0}\n`,
|
|
1379
1432
|
)
|
|
1380
1433
|
|
|
1381
1434
|
return stats
|
|
@@ -18,11 +18,35 @@ export function buildCategoryFilterClause(offset, categories, { tableAlias = ''
|
|
|
18
18
|
return { clause: `AND (${inner})`, params: [...cats] }
|
|
19
19
|
}
|
|
20
20
|
|
|
21
|
+
// Shared, param-less predicate excluding promoted/promoting core-candidate
|
|
22
|
+
// roots AND member rows under such a root. Single source of truth so the hybrid
|
|
23
|
+
// recall path (buildRecallScopeFilter) and the query-less browse path
|
|
24
|
+
// (retrieveEntries) can't diverge. tableAlias='' → bare `entries` column refs.
|
|
25
|
+
export function buildPromotedExclusionClauses(tableAlias = '') {
|
|
26
|
+
const p = `${tableAlias || 'entries'}.`
|
|
27
|
+
return [
|
|
28
|
+
// Promoted core-candidate roots have been absorbed into user-curated
|
|
29
|
+
// core_entries and archived by promoteCoreCandidate. Their content now
|
|
30
|
+
// lives in the {{USER_CORE}} slot, so surfacing the stale generated root
|
|
31
|
+
// would double-serve the same fact. 'promoting' (mid-flight or crashed
|
|
32
|
+
// promote awaiting recovery) is excluded too — its root is already archived
|
|
33
|
+
// and finalizes to 'promoted'. Member rows whose chunk_root points at a
|
|
34
|
+
// promoted/promoting root are excluded via EXISTS-on-root (the flag lives
|
|
35
|
+
// only on the root; members keep NULL). Constant predicates — no bind param.
|
|
36
|
+
`(${p}core_candidate_status IS NULL OR ${p}core_candidate_status NOT IN ('promoted', 'promoting'))`,
|
|
37
|
+
`NOT (${p}is_root = 0 AND ${p}chunk_root IS NOT NULL AND ${p}chunk_root <> ${p}id AND EXISTS (
|
|
38
|
+
SELECT 1 FROM entries r WHERE r.id = ${p}chunk_root AND r.is_root = 1 AND r.core_candidate_status IN ('promoted', 'promoting')
|
|
39
|
+
))`,
|
|
40
|
+
]
|
|
41
|
+
}
|
|
42
|
+
|
|
21
43
|
export function buildRecallScopeFilter(offset, options = {}, tableAlias = '') {
|
|
22
44
|
const outerRef = tableAlias || 'entries'
|
|
23
45
|
const p = `${outerRef}.`
|
|
24
46
|
const clauses = [
|
|
25
47
|
`NOT (${p}is_root = 0 AND ${p}chunk_root IS NOT DISTINCT FROM ${p}id AND ${p}status IS NOT DISTINCT FROM 'archived')`,
|
|
48
|
+
// Exclude promoted/promoting roots + their members (shared predicate).
|
|
49
|
+
...buildPromotedExclusionClauses(tableAlias),
|
|
26
50
|
]
|
|
27
51
|
const params = []
|
|
28
52
|
let next = offset
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { recallReadQuery } from './memory-recall-read-query.mjs'
|
|
2
2
|
|
|
3
|
+
import { buildPromotedExclusionClauses } from './memory-recall-scope-filter.mjs'
|
|
4
|
+
|
|
3
5
|
const VALID_CATEGORIES_SET = new Set([
|
|
4
6
|
'rule', 'constraint', 'decision', 'fact', 'goal', 'preference', 'task', 'issue',
|
|
5
7
|
])
|
|
@@ -72,6 +74,12 @@ export async function retrieveEntries(db, filters = {}) {
|
|
|
72
74
|
where.push(`chunk_root IS NULL`)
|
|
73
75
|
}
|
|
74
76
|
|
|
77
|
+
// Exclude promoted/promoting core-candidate roots AND members under such a
|
|
78
|
+
// root — the query-less browse path (includeArchived) would otherwise surface
|
|
79
|
+
// rows the hybrid recall path already filters. Shared predicate (param-less)
|
|
80
|
+
// keeps this in lock-step with buildRecallScopeFilter.
|
|
81
|
+
where.push(...buildPromotedExclusionClauses())
|
|
82
|
+
|
|
75
83
|
const limit = Math.max(1, Math.min(500, Number(filters.limit ?? 50)))
|
|
76
84
|
const offset = Math.max(0, Number(filters.offset ?? 0))
|
|
77
85
|
const sort = String(filters.sort ?? 'importance').trim().toLowerCase()
|
|
@@ -443,6 +443,26 @@ export async function ensureCurrentSchemaExtensions(db, dims) {
|
|
|
443
443
|
|
|
444
444
|
|
|
445
445
|
|
|
446
|
+
// Core-candidate promotion pipeline (proposal mode): active entries the
|
|
447
|
+
// cycle2 nomination pass flags as strong core-memory candidates. Never
|
|
448
|
+
// auto-inserted into core_entries — a user approves each via the
|
|
449
|
+
// action:'core' op:'promote' handler. Columns are nullable and the ALTERs
|
|
450
|
+
// are idempotent (ADD COLUMN IF NOT EXISTS), safe to re-run every boot.
|
|
451
|
+
// core_candidate_status: NULL (not a candidate) | 'candidate' | 'promoting'
|
|
452
|
+
// (mid-flight promote, recoverable) | 'promoted' | 'dismissed'
|
|
453
|
+
// core_candidate_at: ms timestamp of last nomination/state change
|
|
454
|
+
// 'dismissed'/'promoted' are terminal for a given root so the pass never
|
|
455
|
+
// re-nominates the same entry.
|
|
456
|
+
await db.exec(`ALTER TABLE entries ADD COLUMN IF NOT EXISTS core_candidate_status text`)
|
|
457
|
+
await db.exec(`ALTER TABLE entries ADD COLUMN IF NOT EXISTS core_candidate_at bigint`)
|
|
458
|
+
// No index on core_candidate_status by design (round-2 finding #4): the only
|
|
459
|
+
// readers are listCoreCandidates (user picker, on-demand) and
|
|
460
|
+
// nominateCoreCandidates (once per cycle2, hourly). Both are rare and the
|
|
461
|
+
// entries table is small enough that a seq scan is fine — an index isn't
|
|
462
|
+
// worth the boot-time AccessExclusive build lock on the hot entries table.
|
|
463
|
+
// Drop it if a previous deploy created it (idempotent no-op otherwise).
|
|
464
|
+
await db.exec(`DROP INDEX IF EXISTS idx_entries_core_candidate`)
|
|
465
|
+
|
|
446
466
|
// Dedupe core_entries before creating the unique index — keeps the row with
|
|
447
467
|
// the most recent updated_at (id breaks ties), drops the rest.
|
|
448
468
|
const dedupe = await db.query(`
|