agent-recall-core 3.4.48 → 3.4.50
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/README.md +25 -0
- package/dist/digest/store.d.ts +15 -6
- package/dist/digest/store.d.ts.map +1 -1
- package/dist/digest/store.js +33 -20
- package/dist/digest/store.js.map +1 -1
- package/dist/embeddings/chunker.d.ts +102 -0
- package/dist/embeddings/chunker.d.ts.map +1 -0
- package/dist/embeddings/chunker.js +260 -0
- package/dist/embeddings/chunker.js.map +1 -0
- package/dist/embeddings/config.d.ts +93 -0
- package/dist/embeddings/config.d.ts.map +1 -0
- package/dist/embeddings/config.js +174 -0
- package/dist/embeddings/config.js.map +1 -0
- package/dist/embeddings/index-store.d.ts +61 -0
- package/dist/embeddings/index-store.d.ts.map +1 -0
- package/dist/embeddings/index-store.js +158 -0
- package/dist/embeddings/index-store.js.map +1 -0
- package/dist/embeddings/indexer.d.ts +75 -0
- package/dist/embeddings/indexer.d.ts.map +1 -0
- package/dist/embeddings/indexer.js +196 -0
- package/dist/embeddings/indexer.js.map +1 -0
- package/dist/embeddings/runtime.d.ts +66 -0
- package/dist/embeddings/runtime.d.ts.map +1 -0
- package/dist/embeddings/runtime.js +197 -0
- package/dist/embeddings/runtime.js.map +1 -0
- package/dist/helpers/associative-link.d.ts.map +1 -1
- package/dist/helpers/associative-link.js +26 -1
- package/dist/helpers/associative-link.js.map +1 -1
- package/dist/helpers/tokenize.d.ts +1 -0
- package/dist/helpers/tokenize.d.ts.map +1 -1
- package/dist/helpers/tokenize.js +18 -0
- package/dist/helpers/tokenize.js.map +1 -1
- package/dist/index.d.ts +27 -7
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +42 -5
- package/dist/index.js.map +1 -1
- package/dist/palace/awareness.d.ts +56 -10
- package/dist/palace/awareness.d.ts.map +1 -1
- package/dist/palace/awareness.js +279 -182
- package/dist/palace/awareness.js.map +1 -1
- package/dist/palace/consolidate.d.ts +1 -1
- package/dist/palace/consolidate.d.ts.map +1 -1
- package/dist/palace/consolidate.js +9 -9
- package/dist/palace/consolidate.js.map +1 -1
- package/dist/palace/decay-pass.d.ts +1 -1
- package/dist/palace/decay-pass.d.ts.map +1 -1
- package/dist/palace/decay-pass.js +2 -2
- package/dist/palace/decay-pass.js.map +1 -1
- package/dist/palace/fan-out.d.ts +1 -1
- package/dist/palace/fan-out.d.ts.map +1 -1
- package/dist/palace/fan-out.js +5 -5
- package/dist/palace/fan-out.js.map +1 -1
- package/dist/palace/index-manager.d.ts +1 -1
- package/dist/palace/index-manager.d.ts.map +1 -1
- package/dist/palace/index-manager.js +1 -1
- package/dist/palace/index-manager.js.map +1 -1
- package/dist/palace/insights-index.d.ts +19 -6
- package/dist/palace/insights-index.d.ts.map +1 -1
- package/dist/palace/insights-index.js +36 -13
- package/dist/palace/insights-index.js.map +1 -1
- package/dist/palace/keystone.d.ts +1 -1
- package/dist/palace/keystone.d.ts.map +1 -1
- package/dist/palace/keystone.js +2 -2
- package/dist/palace/keystone.js.map +1 -1
- package/dist/palace/rooms.d.ts +3 -3
- package/dist/palace/rooms.d.ts.map +1 -1
- package/dist/palace/rooms.js +34 -6
- package/dist/palace/rooms.js.map +1 -1
- package/dist/prompts/consolidation-prompt.d.ts.map +1 -1
- package/dist/prompts/consolidation-prompt.js +5 -0
- package/dist/prompts/consolidation-prompt.js.map +1 -1
- package/dist/retrieval/candidates.d.ts.map +1 -1
- package/dist/retrieval/candidates.js +17 -2
- package/dist/retrieval/candidates.js.map +1 -1
- package/dist/retrieval/query-memory.d.ts +65 -7
- package/dist/retrieval/query-memory.d.ts.map +1 -1
- package/dist/retrieval/query-memory.js +518 -78
- package/dist/retrieval/query-memory.js.map +1 -1
- package/dist/retrieval/semantic-leg.d.ts +74 -0
- package/dist/retrieval/semantic-leg.d.ts.map +1 -0
- package/dist/retrieval/semantic-leg.js +180 -0
- package/dist/retrieval/semantic-leg.js.map +1 -0
- package/dist/storage/archive-write.d.ts.map +1 -1
- package/dist/storage/archive-write.js +29 -8
- package/dist/storage/archive-write.js.map +1 -1
- package/dist/storage/capture-router.d.ts +1 -1
- package/dist/storage/capture-router.d.ts.map +1 -1
- package/dist/storage/capture-router.js +26 -9
- package/dist/storage/capture-router.js.map +1 -1
- package/dist/storage/consolidation-queue.d.ts +11 -2
- package/dist/storage/consolidation-queue.d.ts.map +1 -1
- package/dist/storage/consolidation-queue.js +45 -16
- package/dist/storage/consolidation-queue.js.map +1 -1
- package/dist/storage/corrections.d.ts +53 -5
- package/dist/storage/corrections.d.ts.map +1 -1
- package/dist/storage/corrections.js +412 -124
- package/dist/storage/corrections.js.map +1 -1
- package/dist/storage/dream-health.d.ts +56 -8
- package/dist/storage/dream-health.d.ts.map +1 -1
- package/dist/storage/dream-health.js +130 -35
- package/dist/storage/dream-health.js.map +1 -1
- package/dist/storage/dream-yield.d.ts +81 -0
- package/dist/storage/dream-yield.d.ts.map +1 -0
- package/dist/storage/dream-yield.js +77 -0
- package/dist/storage/dream-yield.js.map +1 -0
- package/dist/storage/durable-intent.d.ts.map +1 -1
- package/dist/storage/durable-intent.js +24 -1
- package/dist/storage/durable-intent.js.map +1 -1
- package/dist/storage/filelock.d.ts +92 -12
- package/dist/storage/filelock.d.ts.map +1 -1
- package/dist/storage/filelock.js +317 -47
- package/dist/storage/filelock.js.map +1 -1
- package/dist/storage/fs-utils.d.ts +20 -0
- package/dist/storage/fs-utils.d.ts.map +1 -1
- package/dist/storage/fs-utils.js +27 -0
- package/dist/storage/fs-utils.js.map +1 -1
- package/dist/storage/paths.d.ts +34 -0
- package/dist/storage/paths.d.ts.map +1 -1
- package/dist/storage/paths.js +71 -0
- package/dist/storage/paths.js.map +1 -1
- package/dist/storage/pending.d.ts +154 -0
- package/dist/storage/pending.d.ts.map +1 -0
- package/dist/storage/pending.js +454 -0
- package/dist/storage/pending.js.map +1 -0
- package/dist/storage/project.d.ts.map +1 -1
- package/dist/storage/project.js +68 -16
- package/dist/storage/project.js.map +1 -1
- package/dist/storage/session-card.d.ts +13 -0
- package/dist/storage/session-card.d.ts.map +1 -1
- package/dist/storage/session-card.js +34 -3
- package/dist/storage/session-card.js.map +1 -1
- package/dist/storage/unclaimed.d.ts +165 -0
- package/dist/storage/unclaimed.d.ts.map +1 -0
- package/dist/storage/unclaimed.js +442 -0
- package/dist/storage/unclaimed.js.map +1 -0
- package/dist/storage/working-memory.d.ts.map +1 -1
- package/dist/storage/working-memory.js +19 -1
- package/dist/storage/working-memory.js.map +1 -1
- package/dist/supabase/recall-backend.d.ts +28 -2
- package/dist/supabase/recall-backend.d.ts.map +1 -1
- package/dist/supabase/recall-backend.js +80 -23
- package/dist/supabase/recall-backend.js.map +1 -1
- package/dist/supabase/sync.d.ts.map +1 -1
- package/dist/supabase/sync.js +13 -0
- package/dist/supabase/sync.js.map +1 -1
- package/dist/tools-logic/alignment-check.js +1 -1
- package/dist/tools-logic/alignment-check.js.map +1 -1
- package/dist/tools-logic/awareness-update.d.ts.map +1 -1
- package/dist/tools-logic/awareness-update.js +25 -16
- package/dist/tools-logic/awareness-update.js.map +1 -1
- package/dist/tools-logic/check-action.js +1 -1
- package/dist/tools-logic/check-action.js.map +1 -1
- package/dist/tools-logic/check.d.ts +55 -1
- package/dist/tools-logic/check.d.ts.map +1 -1
- package/dist/tools-logic/check.js +230 -57
- package/dist/tools-logic/check.js.map +1 -1
- package/dist/tools-logic/confidence.d.ts +11 -6
- package/dist/tools-logic/confidence.d.ts.map +1 -1
- package/dist/tools-logic/confidence.js +11 -6
- package/dist/tools-logic/confidence.js.map +1 -1
- package/dist/tools-logic/context-synthesize.js +2 -2
- package/dist/tools-logic/context-synthesize.js.map +1 -1
- package/dist/tools-logic/digest-read.js +2 -2
- package/dist/tools-logic/digest-read.js.map +1 -1
- package/dist/tools-logic/digest-recall.js +1 -1
- package/dist/tools-logic/digest-recall.js.map +1 -1
- package/dist/tools-logic/dream-admission.d.ts +144 -0
- package/dist/tools-logic/dream-admission.d.ts.map +1 -0
- package/dist/tools-logic/dream-admission.js +537 -0
- package/dist/tools-logic/dream-admission.js.map +1 -0
- package/dist/tools-logic/insight-promotion.d.ts +19 -1
- package/dist/tools-logic/insight-promotion.d.ts.map +1 -1
- package/dist/tools-logic/insight-promotion.js +48 -14
- package/dist/tools-logic/insight-promotion.js.map +1 -1
- package/dist/tools-logic/journal-capture.js +3 -3
- package/dist/tools-logic/journal-capture.js.map +1 -1
- package/dist/tools-logic/journal-write.js +3 -3
- package/dist/tools-logic/journal-write.js.map +1 -1
- package/dist/tools-logic/knowledge-write.js +2 -2
- package/dist/tools-logic/knowledge-write.js.map +1 -1
- package/dist/tools-logic/palace-lint.js +1 -1
- package/dist/tools-logic/palace-lint.js.map +1 -1
- package/dist/tools-logic/palace-read.js +1 -1
- package/dist/tools-logic/palace-read.js.map +1 -1
- package/dist/tools-logic/palace-search.js +1 -1
- package/dist/tools-logic/palace-search.js.map +1 -1
- package/dist/tools-logic/palace-walk.js +3 -3
- package/dist/tools-logic/palace-walk.js.map +1 -1
- package/dist/tools-logic/palace-write.js +4 -4
- package/dist/tools-logic/palace-write.js.map +1 -1
- package/dist/tools-logic/predict-correction.js +1 -1
- package/dist/tools-logic/predict-correction.js.map +1 -1
- package/dist/tools-logic/recall-backend.d.ts +11 -2
- package/dist/tools-logic/recall-backend.d.ts.map +1 -1
- package/dist/tools-logic/recall-backend.js +2 -2
- package/dist/tools-logic/recall-backend.js.map +1 -1
- package/dist/tools-logic/resurrect.d.ts.map +1 -1
- package/dist/tools-logic/resurrect.js +9 -1
- package/dist/tools-logic/resurrect.js.map +1 -1
- package/dist/tools-logic/safety-consolidation.d.ts +15 -0
- package/dist/tools-logic/safety-consolidation.d.ts.map +1 -1
- package/dist/tools-logic/safety-consolidation.js +44 -31
- package/dist/tools-logic/safety-consolidation.js.map +1 -1
- package/dist/tools-logic/session-end-reflect.d.ts.map +1 -1
- package/dist/tools-logic/session-end-reflect.js +4 -1
- package/dist/tools-logic/session-end-reflect.js.map +1 -1
- package/dist/tools-logic/session-end.d.ts +8 -0
- package/dist/tools-logic/session-end.d.ts.map +1 -1
- package/dist/tools-logic/session-end.js +51 -13
- package/dist/tools-logic/session-end.js.map +1 -1
- package/dist/tools-logic/session-start.d.ts +23 -0
- package/dist/tools-logic/session-start.d.ts.map +1 -1
- package/dist/tools-logic/session-start.js +44 -1
- package/dist/tools-logic/session-start.js.map +1 -1
- package/dist/tools-logic/smart-recall.d.ts +185 -10
- package/dist/tools-logic/smart-recall.d.ts.map +1 -1
- package/dist/tools-logic/smart-recall.js +363 -85
- package/dist/tools-logic/smart-recall.js.map +1 -1
- package/dist/tools-logic/store-doctor.d.ts.map +1 -1
- package/dist/tools-logic/store-doctor.js +14 -5
- package/dist/tools-logic/store-doctor.js.map +1 -1
- package/dist/tools-logic/store-repair.js +1 -1
- package/dist/tools-logic/store-repair.js.map +1 -1
- package/dist/tools-logic/supersession.d.ts +1 -1
- package/dist/tools-logic/supersession.d.ts.map +1 -1
- package/dist/tools-logic/supersession.js +2 -2
- package/dist/tools-logic/supersession.js.map +1 -1
- package/dist/types.d.ts +1 -1
- package/dist/types.js +1 -1
- package/dist/vector/embedding.d.ts +8 -0
- package/dist/vector/embedding.d.ts.map +1 -1
- package/dist/vector/embedding.js +8 -0
- package/dist/vector/embedding.js.map +1 -1
- package/package.json +1 -1
|
@@ -28,6 +28,7 @@ import { archiveSession } from "./archive-write.js";
|
|
|
28
28
|
import { dropHardNoise } from "./corrections.js";
|
|
29
29
|
import { saveTriggerKind } from "./durable-intent.js";
|
|
30
30
|
import { withLock } from "./filelock.js";
|
|
31
|
+
import { writeTextAtomic } from "./fs-utils.js";
|
|
31
32
|
import { getRoot } from "../types.js";
|
|
32
33
|
// ---------------------------------------------------------------------------
|
|
33
34
|
// Cross-process dedup arbiter
|
|
@@ -57,22 +58,38 @@ function readDedupEntries() {
|
|
|
57
58
|
function isDuplicate(hash, entries) {
|
|
58
59
|
return entries.some((e) => e.hash === hash);
|
|
59
60
|
}
|
|
60
|
-
|
|
61
|
+
/**
|
|
62
|
+
* Atomically CHECK-and-RECORD a dedup entry — the check and the append run
|
|
63
|
+
* inside the SAME "capture-dedup" critical section (fix6-locks review: an
|
|
64
|
+
* unlocked check followed by a locked append is check-then-act — two hooks
|
|
65
|
+
* firing on the same message could both pass the check and double-fire,
|
|
66
|
+
* which is the exact race this arbiter exists to stop).
|
|
67
|
+
*
|
|
68
|
+
* Returns true when the entry is a duplicate (caller must drop).
|
|
69
|
+
* Best-effort on ANY failure (incl. lock contention): returns false so a
|
|
70
|
+
* dedup outage degrades to "maybe double-captured", never "capture blocked".
|
|
71
|
+
*/
|
|
72
|
+
async function checkAndRecordDedup(entry) {
|
|
61
73
|
try {
|
|
62
74
|
const file = dedupFilePath();
|
|
63
75
|
const dir = path.dirname(file);
|
|
64
76
|
if (!fs.existsSync(dir))
|
|
65
77
|
fs.mkdirSync(dir, { recursive: true });
|
|
66
|
-
withLock("capture-dedup", () => {
|
|
78
|
+
return await withLock("capture-dedup", () => {
|
|
67
79
|
let entries = readDedupEntries();
|
|
80
|
+
if (isDuplicate(entry.hash, entries))
|
|
81
|
+
return true;
|
|
68
82
|
entries.push(entry);
|
|
69
83
|
if (entries.length > DEDUP_MAX_ENTRIES)
|
|
70
84
|
entries = entries.slice(-DEDUP_MAX_ENTRIES);
|
|
71
|
-
|
|
85
|
+
// Atomic: concurrent lock-free readers must never see a truncated file.
|
|
86
|
+
writeTextAtomic(file, JSON.stringify(entries));
|
|
87
|
+
return false;
|
|
72
88
|
});
|
|
73
89
|
}
|
|
74
90
|
catch {
|
|
75
91
|
// Best-effort — dedup failure must never block the capture path.
|
|
92
|
+
return false;
|
|
76
93
|
}
|
|
77
94
|
}
|
|
78
95
|
// ---------------------------------------------------------------------------
|
|
@@ -89,7 +106,7 @@ function writeDedupEntry(entry) {
|
|
|
89
106
|
* 5. LANE 2 (correction-signal) → return correctionText for caller to capture
|
|
90
107
|
* 6. none → 'dropped-no-intent'
|
|
91
108
|
*/
|
|
92
|
-
export function routeCapture(input) {
|
|
109
|
+
export async function routeCapture(input) {
|
|
93
110
|
const text = (typeof input.text === "string" ? input.text : "").trim();
|
|
94
111
|
// Step 1: hard noise gate (both lanes share this pre-filter)
|
|
95
112
|
if (!dropHardNoise(text)) {
|
|
@@ -100,14 +117,14 @@ export function routeCapture(input) {
|
|
|
100
117
|
if (intent === "none") {
|
|
101
118
|
return { kind: "dropped-no-intent" };
|
|
102
119
|
}
|
|
103
|
-
// Step 3: cross-process dedup
|
|
120
|
+
// Step 3: cross-process dedup — check AND record in one locked critical
|
|
121
|
+
// section, BEFORE doing any I/O, so a concurrent hook sees it and the
|
|
122
|
+
// check-then-act double-fire window is closed.
|
|
104
123
|
const hash = quickHash(text);
|
|
105
|
-
const
|
|
106
|
-
if (
|
|
124
|
+
const duplicate = await checkAndRecordDedup({ hash, kind: intent, ts: new Date().toISOString() });
|
|
125
|
+
if (duplicate) {
|
|
107
126
|
return { kind: "dropped-duplicate" };
|
|
108
127
|
}
|
|
109
|
-
// Record this entry BEFORE doing any I/O so a concurrent hook sees it.
|
|
110
|
-
writeDedupEntry({ hash, kind: intent, ts: new Date().toISOString() });
|
|
111
128
|
// Step 4 — LANE 1: explicit-save → local archive ONLY
|
|
112
129
|
if (intent === "explicit-save") {
|
|
113
130
|
const archiveInput = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capture-router.js","sourceRoot":"","sources":["../../src/storage/capture-router.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,cAAc,EAA4B,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,8EAA8E;AAC9E,8BAA8B;AAC9B,8EAA8E;AAE9E,gEAAgE;AAChE,SAAS,aAAa;IACpB,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,sBAAsB,CAAC,CAAC;AACtD,CAAC;AAED,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAQ7B,SAAS,SAAS,CAAC,IAAY;IAC7B,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AACtF,CAAC;AAED,SAAS,gBAAgB;IACvB,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;QAC7B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,OAAO,EAAE,CAAC;QACpC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;QAC1D,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;YAAE,OAAO,MAAsB,CAAC;QACzD,OAAO,EAAE,CAAC;IACZ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAAC,IAAY,EAAE,OAAqB;IACtD,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;AAC9C,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"capture-router.js","sourceRoot":"","sources":["../../src/storage/capture-router.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,13 @@
|
|
|
8
8
|
*
|
|
9
9
|
* Storage: JSONL, one job per line, under ~/.agent-recall/.consolidation-queue/.
|
|
10
10
|
* Append-only; drain marks lines done by rewriting the file with done:true.
|
|
11
|
+
*
|
|
12
|
+
* fix6-locks (review finding): enqueue's append and drain's rewrite share the
|
|
13
|
+
* "consolidation-queue" lock, and the drain re-reads the file INSIDE the lock
|
|
14
|
+
* before rewriting — a Stop hook enqueueing while a drain is mid-flight can no
|
|
15
|
+
* longer have its job silently deleted by the drain's stale-snapshot rewrite
|
|
16
|
+
* (async handlers made that read→rewrite window seconds wide). Jobs are
|
|
17
|
+
* processed OUTSIDE the lock; only the append and the final rewrite hold it.
|
|
11
18
|
*/
|
|
12
19
|
export interface ConsolidationJob {
|
|
13
20
|
project: string;
|
|
@@ -26,8 +33,10 @@ export interface DrainReport {
|
|
|
26
33
|
}
|
|
27
34
|
/**
|
|
28
35
|
* Append a consolidation job to today's queue file. Best-effort: never throws.
|
|
36
|
+
* Locked (shared with the drain's rewrite) so an append can never straddle the
|
|
37
|
+
* drain's read→rename window and get deleted.
|
|
29
38
|
*/
|
|
30
|
-
export declare function enqueueConsolidation(job: ConsolidationJob): void
|
|
39
|
+
export declare function enqueueConsolidation(job: ConsolidationJob): Promise<void>;
|
|
31
40
|
/**
|
|
32
41
|
* Drain all pending (not-done) jobs across every queue file. For each pending
|
|
33
42
|
* job, invoke `handler(job)`; a throwing handler counts as failed but does NOT
|
|
@@ -35,5 +44,5 @@ export declare function enqueueConsolidation(job: ConsolidationJob): void;
|
|
|
35
44
|
*
|
|
36
45
|
* Best-effort: never throws to the caller.
|
|
37
46
|
*/
|
|
38
|
-
export declare function drainConsolidationQueue(handler: (job: ConsolidationJob) => void): DrainReport
|
|
47
|
+
export declare function drainConsolidationQueue(handler: (job: ConsolidationJob) => void | Promise<void>): Promise<DrainReport>;
|
|
39
48
|
//# sourceMappingURL=consolidation-queue.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consolidation-queue.d.ts","sourceRoot":"","sources":["../../src/storage/consolidation-queue.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"consolidation-queue.d.ts","sourceRoot":"","sources":["../../src/storage/consolidation-queue.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AASH,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0CAA0C;IAC1C,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,gCAAgC;IAChC,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,WAAW;IAC1B,+CAA+C;IAC/C,SAAS,EAAE,MAAM,CAAC;IAClB,uDAAuD;IACvD,MAAM,EAAE,MAAM,CAAC;CAChB;AAUD;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAsB/E;AAED;;;;;;GAMG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GACvD,OAAO,CAAC,WAAW,CAAC,CAyHtB"}
|
|
@@ -8,11 +8,19 @@
|
|
|
8
8
|
*
|
|
9
9
|
* Storage: JSONL, one job per line, under ~/.agent-recall/.consolidation-queue/.
|
|
10
10
|
* Append-only; drain marks lines done by rewriting the file with done:true.
|
|
11
|
+
*
|
|
12
|
+
* fix6-locks (review finding): enqueue's append and drain's rewrite share the
|
|
13
|
+
* "consolidation-queue" lock, and the drain re-reads the file INSIDE the lock
|
|
14
|
+
* before rewriting — a Stop hook enqueueing while a drain is mid-flight can no
|
|
15
|
+
* longer have its job silently deleted by the drain's stale-snapshot rewrite
|
|
16
|
+
* (async handlers made that read→rewrite window seconds wide). Jobs are
|
|
17
|
+
* processed OUTSIDE the lock; only the append and the final rewrite hold it.
|
|
11
18
|
*/
|
|
12
19
|
import * as fs from "node:fs";
|
|
13
20
|
import * as path from "node:path";
|
|
14
21
|
import { getRoot } from "../types.js";
|
|
15
22
|
import { ensureDir, todayISO } from "./fs-utils.js";
|
|
23
|
+
import { withLock } from "./filelock.js";
|
|
16
24
|
import { recordHookFailure } from "./hook-health.js";
|
|
17
25
|
function queueDir() {
|
|
18
26
|
return path.join(getRoot(), ".consolidation-queue");
|
|
@@ -22,8 +30,10 @@ function queueFileForToday() {
|
|
|
22
30
|
}
|
|
23
31
|
/**
|
|
24
32
|
* Append a consolidation job to today's queue file. Best-effort: never throws.
|
|
33
|
+
* Locked (shared with the drain's rewrite) so an append can never straddle the
|
|
34
|
+
* drain's read→rename window and get deleted.
|
|
25
35
|
*/
|
|
26
|
-
export function enqueueConsolidation(job) {
|
|
36
|
+
export async function enqueueConsolidation(job) {
|
|
27
37
|
try {
|
|
28
38
|
const dir = queueDir();
|
|
29
39
|
ensureDir(dir);
|
|
@@ -34,7 +44,9 @@ export function enqueueConsolidation(job) {
|
|
|
34
44
|
at: job.at ?? new Date().toISOString(),
|
|
35
45
|
done: false,
|
|
36
46
|
};
|
|
37
|
-
|
|
47
|
+
await withLock("consolidation-queue", () => {
|
|
48
|
+
fs.appendFileSync(queueFileForToday(), JSON.stringify(record) + "\n", "utf-8");
|
|
49
|
+
});
|
|
38
50
|
}
|
|
39
51
|
catch (err) {
|
|
40
52
|
// Enqueue is fire-and-forget — never break the caller (the Stop hook).
|
|
@@ -52,7 +64,7 @@ export function enqueueConsolidation(job) {
|
|
|
52
64
|
*
|
|
53
65
|
* Best-effort: never throws to the caller.
|
|
54
66
|
*/
|
|
55
|
-
export function drainConsolidationQueue(handler) {
|
|
67
|
+
export async function drainConsolidationQueue(handler) {
|
|
56
68
|
const report = { processed: 0, failed: 0 };
|
|
57
69
|
let dir;
|
|
58
70
|
try {
|
|
@@ -93,8 +105,11 @@ export function drainConsolidationQueue(handler) {
|
|
|
93
105
|
recordHookFailure("consolidation-drain-fileread", err);
|
|
94
106
|
continue; // unreadable file → skip, don't block the rest
|
|
95
107
|
}
|
|
96
|
-
|
|
97
|
-
|
|
108
|
+
// Successfully-processed lines only: original trimmed line → done-marked
|
|
109
|
+
// replacement. Everything NOT in this map (done lines, malformed lines,
|
|
110
|
+
// failed jobs, and — crucially — jobs appended by a concurrent enqueue
|
|
111
|
+
// AFTER our read above) is preserved verbatim by the locked re-read below.
|
|
112
|
+
const transformed = new Map();
|
|
98
113
|
for (const line of lines) {
|
|
99
114
|
const trimmed = line.trim();
|
|
100
115
|
if (!trimmed)
|
|
@@ -112,18 +127,15 @@ export function drainConsolidationQueue(handler) {
|
|
|
112
127
|
// verbatim) forever. Consistent with the sibling "consolidation-drain-job"
|
|
113
128
|
// wire below at the same per-line granularity.
|
|
114
129
|
recordHookFailure("consolidation-drain-parse", err);
|
|
115
|
-
|
|
116
|
-
continue;
|
|
130
|
+
continue; // malformed line — preserved verbatim by the re-read below
|
|
117
131
|
}
|
|
118
132
|
if (job.done) {
|
|
119
|
-
rewritten.push(trimmed);
|
|
120
133
|
continue;
|
|
121
134
|
}
|
|
122
135
|
try {
|
|
123
|
-
handler(job);
|
|
136
|
+
await handler(job);
|
|
124
137
|
report.processed++;
|
|
125
|
-
|
|
126
|
-
mutated = true;
|
|
138
|
+
transformed.set(trimmed, JSON.stringify({ ...job, done: true }));
|
|
127
139
|
}
|
|
128
140
|
catch (err) {
|
|
129
141
|
// One bad job never blocks the rest — leave it pending for a retry.
|
|
@@ -137,15 +149,32 @@ export function drainConsolidationQueue(handler) {
|
|
|
137
149
|
// prints it to stdout) is not the same as a persisted, queryable
|
|
138
150
|
// trace `ar health` can surface.
|
|
139
151
|
report.failed++;
|
|
140
|
-
rewritten.push(trimmed);
|
|
141
152
|
recordHookFailure("consolidation-drain-job", err);
|
|
142
153
|
}
|
|
143
154
|
}
|
|
144
|
-
if (
|
|
155
|
+
if (transformed.size > 0) {
|
|
145
156
|
try {
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
157
|
+
// Re-read INSIDE the lock and substitute only the lines we processed —
|
|
158
|
+
// lines appended since our unlocked read survive verbatim.
|
|
159
|
+
await withLock("consolidation-queue", () => {
|
|
160
|
+
let current;
|
|
161
|
+
try {
|
|
162
|
+
current = fs.readFileSync(full, "utf-8").split("\n");
|
|
163
|
+
}
|
|
164
|
+
catch {
|
|
165
|
+
current = lines; // vanished/unreadable — fall back to our snapshot
|
|
166
|
+
}
|
|
167
|
+
const out = [];
|
|
168
|
+
for (const line of current) {
|
|
169
|
+
const t = line.trim();
|
|
170
|
+
if (!t)
|
|
171
|
+
continue;
|
|
172
|
+
out.push(transformed.get(t) ?? line);
|
|
173
|
+
}
|
|
174
|
+
const tmp = full + ".tmp." + process.pid;
|
|
175
|
+
fs.writeFileSync(tmp, out.join("\n") + "\n", "utf-8");
|
|
176
|
+
fs.renameSync(tmp, full); // atomic on POSIX
|
|
177
|
+
});
|
|
149
178
|
}
|
|
150
179
|
catch (err) {
|
|
151
180
|
// If we can't persist the done-marks, the worst case is a re-run of
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consolidation-queue.js","sourceRoot":"","sources":["../../src/storage/consolidation-queue.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"consolidation-queue.js","sourceRoot":"","sources":["../../src/storage/consolidation-queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -128,6 +128,16 @@ export interface CorrectionRecord {
|
|
|
128
128
|
* "told" is the safe default per the proposal).
|
|
129
129
|
*/
|
|
130
130
|
provenance?: CorrectionProvenance;
|
|
131
|
+
/**
|
|
132
|
+
* Fix #2 (dual-channel capture gate, 2026-09-11) — the structured
|
|
133
|
+
* human_correction form's `applies_when` context keywords, persisted for
|
|
134
|
+
* fidelity. ADDITIVE + OPTIONAL: absent on every pre-fix record and on
|
|
135
|
+
* records captured through non-structured paths; never defaulted at read
|
|
136
|
+
* time. The same tokens are ALSO folded into `tags` at capture (tags are
|
|
137
|
+
* the existing p1 context-match mechanism) — this field preserves the
|
|
138
|
+
* caller's original, unmixed list.
|
|
139
|
+
*/
|
|
140
|
+
applies_when?: string[];
|
|
131
141
|
}
|
|
132
142
|
/**
|
|
133
143
|
* v4 W1 (2026-07-02 field-design-options.md §A.1) — provenance of a
|
|
@@ -293,7 +303,43 @@ export interface CorrectionKPI {
|
|
|
293
303
|
* a bare weak verb. Recall-safe — no fixture correction relies on a hedged weak verb.
|
|
294
304
|
*/
|
|
295
305
|
export declare const GATE_VERSION = "v4-2026-06-22";
|
|
306
|
+
/**
|
|
307
|
+
* Auto-detect severity: p0 if uses strong negation/mandate language, else p1.
|
|
308
|
+
*
|
|
309
|
+
* INDEPENDENT-REVIEW FIX (2026-09-09, TOW2-326 class): this pattern was
|
|
310
|
+
* English-only, so a CJK-only P0-caliber prohibition (禁止/不得/不能/不要 with
|
|
311
|
+
* no English marker) would now clear the newly CJK-aware capture gate above
|
|
312
|
+
* but still classify as p1 — silently losing the P0 blocking power (see
|
|
313
|
+
* check.ts's own doctrine comment: P0 severity is what lets a correction
|
|
314
|
+
* OVERRIDE a plan via `verdict: "blocked"`) an equivalent English phrasing
|
|
315
|
+
* would get. CJK rows added, mirroring STRONG_IMPERATIVE above; kept
|
|
316
|
+
* byte-identical to the duplicate `p0Patterns` copy in tools-logic/check.ts
|
|
317
|
+
* (search that file for `p0Patterns`, not a line number — line references
|
|
318
|
+
* drift; that copy is the primary caller, which computes severity itself
|
|
319
|
+
* before calling writeCorrection — this function is the FALLBACK path for
|
|
320
|
+
* callers that don't pre-supply severity).
|
|
321
|
+
*
|
|
322
|
+
* INDEPENDENT-REVIEW FIX (2026-09-09, round 3): 不能 scoped to 你不能 —
|
|
323
|
+
* see the identical fix/reasoning on STRONG_IMPERATIVE above.
|
|
324
|
+
*
|
|
325
|
+
* PRE-SHIP GATE FIX (2026-09-09, C-1): 不要's benign-reassurance exclusion
|
|
326
|
+
* widened from the narrow round-1 set (担心/客气/急/着急/紧张/见外) to the
|
|
327
|
+
* FULL round-2 set also used by GATED_PROHIBITION_PATTERNS and
|
|
328
|
+
* STRONG_IMPERATIVE (adds 慌/害怕/在意) — see CJK_REASSURANCE_COMPLETIONS'
|
|
329
|
+
* own doc comment. This copy had drifted out of sync with the other three
|
|
330
|
+
* sites; all four are now built from the SAME exported constant where they
|
|
331
|
+
* share a package (this file + check.ts), or kept byte-identical by
|
|
332
|
+
* cross-reference where they don't (correction-detector.ts, cli package).
|
|
333
|
+
*/
|
|
334
|
+
export declare function detectSeverity(text: string): "p0" | "p1";
|
|
296
335
|
export declare function stripInterjections(text: string): string;
|
|
336
|
+
/**
|
|
337
|
+
* Atomic JSON write — tmp + rename, mode 0600. Prevents truncation on SIGTERM.
|
|
338
|
+
* Extracted from the three identical inlined copies (writeCorrection /
|
|
339
|
+
* retractCorrection / recordOutcome) so every correction writer shares one
|
|
340
|
+
* durable path. Pure side-effect helper; no behavior change vs the originals.
|
|
341
|
+
*/
|
|
342
|
+
export declare function writeRecordAtomic(filepath: string, record: unknown): void;
|
|
297
343
|
/**
|
|
298
344
|
* W2-1 (naming-v2 spec §4) — regenerate corrections/_index.md, the
|
|
299
345
|
* materialized machine fast-path over the corrections store: a severity-first
|
|
@@ -393,6 +439,7 @@ export interface RankedCorrection extends CorrectionRecord {
|
|
|
393
439
|
* tokenizer — it deliberately errs toward NOT splitting.
|
|
394
440
|
*/
|
|
395
441
|
export declare function splitSentences(text: string): string[];
|
|
442
|
+
export declare const CJK_REASSURANCE_COMPLETIONS = "\u62C5\u5FC3|\u5BA2\u6C14|\u6025|\u7740\u6025|\u7D27\u5F20|\u89C1\u5916|\u614C|\u5BB3\u6015|\u5728\u610F";
|
|
396
443
|
/**
|
|
397
444
|
* Capture-quality gate — rejects context-free fragments, pure acknowledgments,
|
|
398
445
|
* and text that carries no actionable signal.
|
|
@@ -459,6 +506,7 @@ export interface WriteCorrectionResult {
|
|
|
459
506
|
/** id of the written record, or the existing record's id on a merge. */
|
|
460
507
|
id?: string;
|
|
461
508
|
}
|
|
509
|
+
export declare function distillRuleIdentity(rule: string): string;
|
|
462
510
|
/**
|
|
463
511
|
* Write a correction to persistent storage.
|
|
464
512
|
* Auto-detects severity from the rule/context text.
|
|
@@ -468,7 +516,7 @@ export interface WriteCorrectionResult {
|
|
|
468
516
|
* are unaffected (the return value was void, now it is an object; ignoring it
|
|
469
517
|
* still compiles and runs correctly).
|
|
470
518
|
*/
|
|
471
|
-
export declare function writeCorrection(project: string, correction: CorrectionRecord): WriteCorrectionResult
|
|
519
|
+
export declare function writeCorrection(project: string, correction: CorrectionRecord): Promise<WriteCorrectionResult>;
|
|
472
520
|
/**
|
|
473
521
|
* TEST-ONLY instrumentation log — one entry (the project slug) appended per
|
|
474
522
|
* actual corrections-directory enumeration inside readCorrections() below
|
|
@@ -531,7 +579,7 @@ export interface RetractCorrectionResult {
|
|
|
531
579
|
* The file is rewritten atomically — never deleted. The record remains in
|
|
532
580
|
* _outcomes.jsonl history and can be manually reactivated by editing the JSON.
|
|
533
581
|
*/
|
|
534
|
-
export declare function retractCorrection(project: string, id: string, reason?: string, supersededBy?: string): RetractCorrectionResult
|
|
582
|
+
export declare function retractCorrection(project: string, id: string, reason?: string, supersededBy?: string): Promise<RetractCorrectionResult>;
|
|
535
583
|
/**
|
|
536
584
|
* Record an outcome event for a correction (retrieved / heeded / recurred).
|
|
537
585
|
* Appends to _outcomes.jsonl and also updates the correction JSON's counters
|
|
@@ -546,7 +594,7 @@ export declare function retractCorrection(project: string, id: string, reason?:
|
|
|
546
594
|
* the core-level enforcement of the single-producer contract (the CLI's
|
|
547
595
|
* `ar outcomes record` is the one caller that adds the prefix).
|
|
548
596
|
*/
|
|
549
|
-
export declare function recordOutcome(outcome: CorrectionOutcome): void
|
|
597
|
+
export declare function recordOutcome(outcome: CorrectionOutcome): Promise<void>;
|
|
550
598
|
/** One `_outcomes.jsonl` line that failed to parse (or lacked required fields). */
|
|
551
599
|
export interface MalformedOutcomeRow {
|
|
552
600
|
/** 1-based line number within _outcomes.jsonl. */
|
|
@@ -669,7 +717,7 @@ export interface OutcomesRebuildResult {
|
|
|
669
717
|
* 4. Only per-correction JSON files that actually differ are rewritten; the
|
|
670
718
|
* shared _index.md is regenerated ONCE at the end, only if anything wrote.
|
|
671
719
|
*/
|
|
672
|
-
export declare function runOutcomesRebuild(project: string, opts?: OutcomesRebuildOptions): OutcomesRebuildResult
|
|
720
|
+
export declare function runOutcomesRebuild(project: string, opts?: OutcomesRebuildOptions): Promise<OutcomesRebuildResult>;
|
|
673
721
|
/**
|
|
674
722
|
* Best-effort: append one row to corrections/_rejected.jsonl recording a
|
|
675
723
|
* gate-rejected correction candidate. INVARIANT: never throws — every fs op is
|
|
@@ -799,7 +847,7 @@ export interface NoiseReview {
|
|
|
799
847
|
*/
|
|
800
848
|
export declare function reviewNoiseCorrections(project: string, opts?: {
|
|
801
849
|
auto?: boolean;
|
|
802
|
-
}): NoiseReview
|
|
850
|
+
}): Promise<NoiseReview>;
|
|
803
851
|
/**
|
|
804
852
|
* P5: order corrections for surfacing when a cap applies. Today P0s are surfaced
|
|
805
853
|
* `slice(0, 10)` in newest-first FILENAME order — so when a project has >10 P0s
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"corrections.d.ts","sourceRoot":"","sources":["../../src/storage/corrections.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"corrections.d.ts","sourceRoot":"","sources":["../../src/storage/corrections.ts"],"names":[],"mappings":"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"}
|