agent-recall-core 3.4.42 → 3.4.44
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/dist/digest/store.d.ts.map +1 -1
- package/dist/digest/store.js +14 -8
- package/dist/digest/store.js.map +1 -1
- package/dist/helpers/handoff.d.ts.map +1 -1
- package/dist/helpers/handoff.js +11 -1
- package/dist/helpers/handoff.js.map +1 -1
- package/dist/helpers/tokenize.d.ts +76 -0
- package/dist/helpers/tokenize.d.ts.map +1 -0
- package/dist/helpers/tokenize.js +139 -0
- package/dist/helpers/tokenize.js.map +1 -0
- package/dist/host-profile.d.ts +35 -0
- package/dist/host-profile.d.ts.map +1 -1
- package/dist/host-profile.js +37 -0
- package/dist/host-profile.js.map +1 -1
- package/dist/index.d.ts +3 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/palace/awareness.d.ts.map +1 -1
- package/dist/palace/awareness.js +27 -11
- package/dist/palace/awareness.js.map +1 -1
- package/dist/palace/insights-index.d.ts.map +1 -1
- package/dist/palace/insights-index.js +18 -4
- package/dist/palace/insights-index.js.map +1 -1
- package/dist/palace/pipeline.d.ts.map +1 -1
- package/dist/palace/pipeline.js +7 -1
- package/dist/palace/pipeline.js.map +1 -1
- package/dist/palace/skills.d.ts.map +1 -1
- package/dist/palace/skills.js +37 -10
- package/dist/palace/skills.js.map +1 -1
- package/dist/storage/archive-write.d.ts.map +1 -1
- package/dist/storage/archive-write.js +13 -2
- package/dist/storage/archive-write.js.map +1 -1
- package/dist/storage/behavior-policies.d.ts.map +1 -1
- package/dist/storage/behavior-policies.js +8 -3
- package/dist/storage/behavior-policies.js.map +1 -1
- package/dist/storage/consolidation-queue.d.ts.map +1 -1
- package/dist/storage/consolidation-queue.js +48 -6
- package/dist/storage/consolidation-queue.js.map +1 -1
- package/dist/storage/content-guard.d.ts +33 -7
- package/dist/storage/content-guard.d.ts.map +1 -1
- package/dist/storage/content-guard.js +33 -8
- package/dist/storage/content-guard.js.map +1 -1
- package/dist/storage/corrections.d.ts.map +1 -1
- package/dist/storage/corrections.js +28 -3
- package/dist/storage/corrections.js.map +1 -1
- package/dist/storage/recency-index.d.ts +20 -0
- package/dist/storage/recency-index.d.ts.map +1 -1
- package/dist/storage/recency-index.js +66 -2
- package/dist/storage/recency-index.js.map +1 -1
- package/dist/storage/session-card.d.ts +20 -4
- package/dist/storage/session-card.d.ts.map +1 -1
- package/dist/storage/session-card.js +40 -9
- package/dist/storage/session-card.js.map +1 -1
- package/dist/storage/working-memory.d.ts +64 -0
- package/dist/storage/working-memory.d.ts.map +1 -1
- package/dist/storage/working-memory.js +288 -1
- package/dist/storage/working-memory.js.map +1 -1
- package/dist/tools-logic/alignment-check.d.ts.map +1 -1
- package/dist/tools-logic/alignment-check.js +6 -1
- package/dist/tools-logic/alignment-check.js.map +1 -1
- package/dist/tools-logic/bootstrap.d.ts.map +1 -1
- package/dist/tools-logic/bootstrap.js +1 -15
- package/dist/tools-logic/bootstrap.js.map +1 -1
- package/dist/tools-logic/check-action.d.ts.map +1 -1
- package/dist/tools-logic/check-action.js +13 -78
- package/dist/tools-logic/check-action.js.map +1 -1
- package/dist/tools-logic/check.d.ts.map +1 -1
- package/dist/tools-logic/check.js +8 -1
- package/dist/tools-logic/check.js.map +1 -1
- package/dist/tools-logic/context-synthesize.d.ts.map +1 -1
- package/dist/tools-logic/context-synthesize.js +7 -3
- package/dist/tools-logic/context-synthesize.js.map +1 -1
- package/dist/tools-logic/drill-down.d.ts.map +1 -1
- package/dist/tools-logic/drill-down.js +9 -1
- package/dist/tools-logic/drill-down.js.map +1 -1
- package/dist/tools-logic/journal-capture.d.ts.map +1 -1
- package/dist/tools-logic/journal-capture.js +5 -1
- package/dist/tools-logic/journal-capture.js.map +1 -1
- package/dist/tools-logic/journal-search.d.ts.map +1 -1
- package/dist/tools-logic/journal-search.js +10 -2
- package/dist/tools-logic/journal-search.js.map +1 -1
- package/dist/tools-logic/journal-write.d.ts.map +1 -1
- package/dist/tools-logic/journal-write.js +12 -5
- package/dist/tools-logic/journal-write.js.map +1 -1
- package/dist/tools-logic/knowledge-write.d.ts.map +1 -1
- package/dist/tools-logic/knowledge-write.js +6 -0
- package/dist/tools-logic/knowledge-write.js.map +1 -1
- package/dist/tools-logic/nudge.d.ts.map +1 -1
- package/dist/tools-logic/nudge.js +4 -0
- package/dist/tools-logic/nudge.js.map +1 -1
- package/dist/tools-logic/palace-search.d.ts.map +1 -1
- package/dist/tools-logic/palace-search.js +11 -3
- package/dist/tools-logic/palace-search.js.map +1 -1
- package/dist/tools-logic/palace-write.d.ts.map +1 -1
- package/dist/tools-logic/palace-write.js +11 -5
- package/dist/tools-logic/palace-write.js.map +1 -1
- package/dist/tools-logic/resurrect.d.ts.map +1 -1
- package/dist/tools-logic/resurrect.js +21 -6
- package/dist/tools-logic/resurrect.js.map +1 -1
- package/dist/tools-logic/session-end-reflect.d.ts.map +1 -1
- package/dist/tools-logic/session-end-reflect.js +10 -1
- package/dist/tools-logic/session-end-reflect.js.map +1 -1
- package/dist/tools-logic/session-end.d.ts.map +1 -1
- package/dist/tools-logic/session-end.js +118 -15
- package/dist/tools-logic/session-end.js.map +1 -1
- package/dist/tools-logic/session-start.d.ts.map +1 -1
- package/dist/tools-logic/session-start.js +35 -1
- package/dist/tools-logic/session-start.js.map +1 -1
- package/dist/tools-logic/smart-recall.d.ts.map +1 -1
- package/dist/tools-logic/smart-recall.js +28 -8
- package/dist/tools-logic/smart-recall.js.map +1 -1
- package/dist/types.d.ts +1 -1
- package/dist/types.js +1 -1
- package/package.json +1 -1
|
@@ -20,6 +20,7 @@ import { ensureDir, todayISO, writeJsonAtomic } from "./fs-utils.js";
|
|
|
20
20
|
import { writeMemoryProtocol } from "./memory-protocol.js";
|
|
21
21
|
import { ensureStoreManifest } from "./store-manifest.js";
|
|
22
22
|
import { getRoot } from "../types.js";
|
|
23
|
+
import { recordHookFailure } from "./hook-health.js";
|
|
23
24
|
function buildFrontmatter(meta) {
|
|
24
25
|
const lines = [
|
|
25
26
|
"---",
|
|
@@ -45,8 +46,12 @@ function appendIndexLine(slug, line) {
|
|
|
45
46
|
ensureDir(path.dirname(indexPath));
|
|
46
47
|
fs.appendFileSync(indexPath, line + "\n", "utf-8");
|
|
47
48
|
}
|
|
48
|
-
catch {
|
|
49
|
+
catch (err) {
|
|
49
50
|
// index is a convenience; failure must not abort the archive write.
|
|
51
|
+
// F5 depth (2026-08-12, followups wave): this catch used to swallow with
|
|
52
|
+
// zero trace — recordHookFailure is never-throws, so reporting it changes
|
|
53
|
+
// nothing about the swallow itself, only its visibility.
|
|
54
|
+
recordHookFailure("archive-session-index", err);
|
|
50
55
|
}
|
|
51
56
|
}
|
|
52
57
|
/**
|
|
@@ -96,8 +101,14 @@ export function archiveSession(input) {
|
|
|
96
101
|
ensureStoreManifest(getRoot());
|
|
97
102
|
return { path: dest, bytes: input.rawTranscript.length };
|
|
98
103
|
}
|
|
99
|
-
catch {
|
|
104
|
+
catch (err) {
|
|
100
105
|
// NEVER throw into the Stop turn.
|
|
106
|
+
// F5 depth (2026-08-12, followups wave): this was a complete silent
|
|
107
|
+
// swallow — the lossless archive tier could fail on every session with
|
|
108
|
+
// zero trace anywhere. recordHookFailure never throws, so this changes
|
|
109
|
+
// nothing about the return-value contract (still {path:"",bytes:0}),
|
|
110
|
+
// only whether the failure is now visible in hook-health.
|
|
111
|
+
recordHookFailure("archive-session", err);
|
|
101
112
|
return { path: "", bytes: 0 };
|
|
102
113
|
}
|
|
103
114
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archive-write.js","sourceRoot":"","sources":["../../src/storage/archive-write.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"archive-write.js","sourceRoot":"","sources":["../../src/storage/archive-write.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"behavior-policies.d.ts","sourceRoot":"","sources":["../../src/storage/behavior-policies.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;
|
|
1
|
+
{"version":3,"file":"behavior-policies.d.ts","sourceRoot":"","sources":["../../src/storage/behavior-policies.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAQH,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,kDAAkD;IAClD,IAAI,EAAE,MAAM,CAAC;IACb,mDAAmD;IACnD,EAAE,EAAE,MAAM,CAAC;IACX,iCAAiC;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,yEAAyE;IACzE,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,YAAY,EAAE,CAAC;CACvB;AAUD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,oBAAoB,CAWvE;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,iBAAiB,GAAG,kBAAkB,CAoCjF;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAcnD"}
|
|
@@ -17,6 +17,7 @@ import * as fs from "node:fs";
|
|
|
17
17
|
import * as path from "node:path";
|
|
18
18
|
import { palaceDir } from "./paths.js";
|
|
19
19
|
import { ensureDir } from "./fs-utils.js";
|
|
20
|
+
import { scrubForCloud } from "./content-guard.js";
|
|
20
21
|
function policyPath(slug) {
|
|
21
22
|
return path.join(palaceDir(slug), "behavior-policies.json");
|
|
22
23
|
}
|
|
@@ -57,11 +58,15 @@ export function registerBehaviorRule(input) {
|
|
|
57
58
|
if (existing) {
|
|
58
59
|
return { success: true, rule_id: existing.id, total_rules: current.rules.length };
|
|
59
60
|
}
|
|
61
|
+
// Scrub the free-text fields before they ever enter the rule object — this
|
|
62
|
+
// store is read directly at session_start (readBehaviorPolicies, above
|
|
63
|
+
// regular-insight salience) AND surfaces in handoff.ts's "Behavior policies"
|
|
64
|
+
// section, and had no scrub of any kind previously.
|
|
60
65
|
const rule = {
|
|
61
66
|
id: newRuleId(),
|
|
62
|
-
name,
|
|
63
|
-
when,
|
|
64
|
-
do: doField,
|
|
67
|
+
name: scrubForCloud(name),
|
|
68
|
+
when: scrubForCloud(when),
|
|
69
|
+
do: scrubForCloud(doField),
|
|
65
70
|
created: new Date().toISOString(),
|
|
66
71
|
hits: 0,
|
|
67
72
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"behavior-policies.js","sourceRoot":"","sources":["../../src/storage/behavior-policies.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"behavior-policies.js","sourceRoot":"","sources":["../../src/storage/behavior-policies.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consolidation-queue.d.ts","sourceRoot":"","sources":["../../src/storage/consolidation-queue.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;
|
|
1
|
+
{"version":3,"file":"consolidation-queue.d.ts","sourceRoot":"","sources":["../../src/storage/consolidation-queue.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAQH,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;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,gBAAgB,GAAG,IAAI,CAoBhE;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,IAAI,GACvC,WAAW,CA0Gb"}
|
|
@@ -13,6 +13,7 @@ import * as fs from "node:fs";
|
|
|
13
13
|
import * as path from "node:path";
|
|
14
14
|
import { getRoot } from "../types.js";
|
|
15
15
|
import { ensureDir, todayISO } from "./fs-utils.js";
|
|
16
|
+
import { recordHookFailure } from "./hook-health.js";
|
|
16
17
|
function queueDir() {
|
|
17
18
|
return path.join(getRoot(), ".consolidation-queue");
|
|
18
19
|
}
|
|
@@ -35,8 +36,13 @@ export function enqueueConsolidation(job) {
|
|
|
35
36
|
};
|
|
36
37
|
fs.appendFileSync(queueFileForToday(), JSON.stringify(record) + "\n", "utf-8");
|
|
37
38
|
}
|
|
38
|
-
catch {
|
|
39
|
+
catch (err) {
|
|
39
40
|
// Enqueue is fire-and-forget — never break the caller (the Stop hook).
|
|
41
|
+
// F5 depth (2026-08-12, followups wave): this is the SOP-named
|
|
42
|
+
// "consolidation enqueue" swallow — a failure here means the whole async
|
|
43
|
+
// dreaming/compression pipeline silently never runs for that session,
|
|
44
|
+
// with zero trace anywhere until this fix.
|
|
45
|
+
recordHookFailure("consolidation-enqueue", err);
|
|
40
46
|
}
|
|
41
47
|
}
|
|
42
48
|
/**
|
|
@@ -55,13 +61,22 @@ export function drainConsolidationQueue(handler) {
|
|
|
55
61
|
return report;
|
|
56
62
|
}
|
|
57
63
|
catch {
|
|
64
|
+
// F5 depth (2026-08-12, followups wave): intentionally left UNWIRED —
|
|
65
|
+
// this only guards queueDir()'s path.join (getRoot() always returns a
|
|
66
|
+
// string; fs.existsSync never throws by contract) — unreachable in
|
|
67
|
+
// practice, and "no queue found" is the correct degrade even if it did.
|
|
58
68
|
return report;
|
|
59
69
|
}
|
|
60
70
|
let files;
|
|
61
71
|
try {
|
|
62
72
|
files = fs.readdirSync(dir).filter((f) => f.endsWith(".jsonl"));
|
|
63
73
|
}
|
|
64
|
-
catch {
|
|
74
|
+
catch (err) {
|
|
75
|
+
// F5 depth (2026-08-12, followups wave): a real failure here (permission,
|
|
76
|
+
// disk error) silently degrades to {processed:0,failed:0} — indistinguishable
|
|
77
|
+
// from "genuinely empty queue" to any caller. That's exactly the
|
|
78
|
+
// invisible-swallow-looks-like-empty-state class F5 targets.
|
|
79
|
+
recordHookFailure("consolidation-drain-listdir", err);
|
|
65
80
|
return report;
|
|
66
81
|
}
|
|
67
82
|
for (const file of files) {
|
|
@@ -70,7 +85,12 @@ export function drainConsolidationQueue(handler) {
|
|
|
70
85
|
try {
|
|
71
86
|
lines = fs.readFileSync(full, "utf-8").split("\n");
|
|
72
87
|
}
|
|
73
|
-
catch {
|
|
88
|
+
catch (err) {
|
|
89
|
+
// F5 depth (2026-08-12, followups wave): an unreadable file means every
|
|
90
|
+
// job inside it is silently skipped THIS drain AND every future drain
|
|
91
|
+
// (nothing here retries at the file level) — worth a trace, unlike the
|
|
92
|
+
// routine per-line/per-job skips below.
|
|
93
|
+
recordHookFailure("consolidation-drain-fileread", err);
|
|
74
94
|
continue; // unreadable file → skip, don't block the rest
|
|
75
95
|
}
|
|
76
96
|
const rewritten = [];
|
|
@@ -83,7 +103,15 @@ export function drainConsolidationQueue(handler) {
|
|
|
83
103
|
try {
|
|
84
104
|
job = JSON.parse(trimmed);
|
|
85
105
|
}
|
|
86
|
-
catch {
|
|
106
|
+
catch (err) {
|
|
107
|
+
// F5 depth (2026-08-12, followups wave): unlike the outcome-verdict
|
|
108
|
+
// loops in session-end.ts (high-cardinality, routine skips), this
|
|
109
|
+
// queue is OUR OWN system's data (small volume, written only by
|
|
110
|
+
// enqueueConsolidation) — a malformed line here can never be
|
|
111
|
+
// reparsed or marked done, so it is stuck retrying (being preserved
|
|
112
|
+
// verbatim) forever. Consistent with the sibling "consolidation-drain-job"
|
|
113
|
+
// wire below at the same per-line granularity.
|
|
114
|
+
recordHookFailure("consolidation-drain-parse", err);
|
|
87
115
|
rewritten.push(line); // malformed line — preserve verbatim, don't drop
|
|
88
116
|
continue;
|
|
89
117
|
}
|
|
@@ -97,10 +125,20 @@ export function drainConsolidationQueue(handler) {
|
|
|
97
125
|
rewritten.push(JSON.stringify({ ...job, done: true }));
|
|
98
126
|
mutated = true;
|
|
99
127
|
}
|
|
100
|
-
catch {
|
|
128
|
+
catch (err) {
|
|
101
129
|
// One bad job never blocks the rest — leave it pending for a retry.
|
|
130
|
+
// F5 depth (2026-08-12, followups wave): the CLI's own outer catch
|
|
131
|
+
// around drainConsolidationQueue() (packages/cli/src/index.ts,
|
|
132
|
+
// "consolidate-async" case) only fires if THIS FUNCTION throws as a
|
|
133
|
+
// whole — a single job's rethrown error is caught right here and
|
|
134
|
+
// never propagates that far, so per-job failures were invisible to
|
|
135
|
+
// hook-health even though the handler explicitly rethrows so the
|
|
136
|
+
// job survives for retry. report.failed (returned to the CLI, which
|
|
137
|
+
// prints it to stdout) is not the same as a persisted, queryable
|
|
138
|
+
// trace `ar health` can surface.
|
|
102
139
|
report.failed++;
|
|
103
140
|
rewritten.push(trimmed);
|
|
141
|
+
recordHookFailure("consolidation-drain-job", err);
|
|
104
142
|
}
|
|
105
143
|
}
|
|
106
144
|
if (mutated) {
|
|
@@ -109,9 +147,13 @@ export function drainConsolidationQueue(handler) {
|
|
|
109
147
|
fs.writeFileSync(tmp, rewritten.join("\n") + "\n", "utf-8");
|
|
110
148
|
fs.renameSync(tmp, full); // atomic on POSIX
|
|
111
149
|
}
|
|
112
|
-
catch {
|
|
150
|
+
catch (err) {
|
|
113
151
|
// If we can't persist the done-marks, the worst case is a re-run of
|
|
114
152
|
// already-processed jobs next drain — acceptable, never fatal.
|
|
153
|
+
// F5 depth (2026-08-12, followups wave): same disk-write-failure
|
|
154
|
+
// class as archiveSession/session-card writes — genuinely worth a
|
|
155
|
+
// trace even though the degrade (re-run next time) is safe.
|
|
156
|
+
recordHookFailure("consolidation-drain-persist", err);
|
|
115
157
|
}
|
|
116
158
|
}
|
|
117
159
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consolidation-queue.js","sourceRoot":"","sources":["../../src/storage/consolidation-queue.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"consolidation-queue.js","sourceRoot":"","sources":["../../src/storage/consolidation-queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,16 +5,32 @@
|
|
|
5
5
|
* prompt-injection attempts do not reach Supabase or the embedding API.
|
|
6
6
|
*
|
|
7
7
|
* Two-layer scrub:
|
|
8
|
-
* 1. scrubPromptInjection — strip
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
* single source of
|
|
8
|
+
* 1. scrubPromptInjection — strip STRUCTURAL control tokens only: XML
|
|
9
|
+
* system-marker tags, `<|im_start|>`/`<|im_end|>`-style delimiters, bidi
|
|
10
|
+
* override chars, null bytes. Extracted from bootstrap.ts and re-exported
|
|
11
|
+
* here so journal-write/palace-write can import from a single source of
|
|
12
|
+
* truth.
|
|
12
13
|
* 2. scrubSecretContent — redact known secret token prefixes (AKIA…, ghp_…,
|
|
13
14
|
* gho_…, ghs_…, sk-…, xoxb-…, PEM markers). Operates on content, not
|
|
14
15
|
* filenames (bootstrap.ts isSecretFile() handles filename-level rejection).
|
|
15
16
|
*
|
|
16
17
|
* scrubForCloud(content) = scrubSecretContent(scrubPromptInjection(content))
|
|
17
18
|
*
|
|
19
|
+
* NARROWING (P0-a rework, 2026-08-18, owner-decided architecture): a prior
|
|
20
|
+
* revision of scrubPromptInjection also stripped free-standing natural-
|
|
21
|
+
* language phrases ("ignore/disregard/forget previous/prior instructions").
|
|
22
|
+
* That phrase matcher was DROPPED. Rationale: (a) it produced false positives
|
|
23
|
+
* on legitimate prose — this product's users journal ABOUT prompt-injection
|
|
24
|
+
* incidents (in English and CJK), and every such entry got mangled into
|
|
25
|
+
* "[stripped injection attempt]"; (b) it silently destroyed the matchable
|
|
26
|
+
* vocabulary of any correction/rule whose text happened to describe an
|
|
27
|
+
* injection pattern, breaking check()/checkAction()'s token-overlap matching
|
|
28
|
+
* for that rule forever. Only STRUCTURAL control tokens — sequences that are
|
|
29
|
+
* never legitimate even as quoted text, because they are how a model's own
|
|
30
|
+
* prompt format demarcates role/instruction boundaries — are stripped now.
|
|
31
|
+
* A bare phrase with no structural wrapper is inert prose to any reader and
|
|
32
|
+
* is left untouched.
|
|
33
|
+
*
|
|
18
34
|
* Design guarantees:
|
|
19
35
|
* - Never throws — any failure returns the original content unchanged.
|
|
20
36
|
* - Pure function, no I/O, no Supabase imports.
|
|
@@ -24,9 +40,19 @@
|
|
|
24
40
|
* before passing content to syncToSupabase.
|
|
25
41
|
*/
|
|
26
42
|
/**
|
|
27
|
-
* Strip prompt-injection
|
|
28
|
-
* Same logic as bootstrap.ts:scrubPromptInjection but
|
|
29
|
-
* journal-write and palace-write to use at sync time.
|
|
43
|
+
* Strip STRUCTURAL prompt-injection control tokens from content before it
|
|
44
|
+
* leaves the machine. Same logic as bootstrap.ts:scrubPromptInjection but
|
|
45
|
+
* exported here for journal-write and palace-write to use at sync time.
|
|
46
|
+
*
|
|
47
|
+
* Narrowed 2026-08-18 (P0-a rework, owner-decided architecture): only
|
|
48
|
+
* structural control tokens are stripped — XML system-marker tags,
|
|
49
|
+
* `<|im_start|>`/`<|im_end|>`-style delimiters, bidi override chars, null
|
|
50
|
+
* bytes. The free-standing natural-language phrase matcher ("ignore all
|
|
51
|
+
* previous instructions" etc. as bare prose) was REMOVED — see this file's
|
|
52
|
+
* header comment for the false-positive + correction-matching-pollution
|
|
53
|
+
* rationale. A phrase inside a still-stripped structural tag is neutralized
|
|
54
|
+
* along with the tag; a bare phrase with no structural wrapper is left as
|
|
55
|
+
* ordinary text.
|
|
30
56
|
*/
|
|
31
57
|
export declare function scrubPromptInjection(s: string): string;
|
|
32
58
|
export interface SecretScanResult {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"content-guard.d.ts","sourceRoot":"","sources":["../../src/storage/content-guard.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"content-guard.d.ts","sourceRoot":"","sources":["../../src/storage/content-guard.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AAMH;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAatD;AA2CD,MAAM,WAAW,gBAAgB;IAC/B,oEAAoE;IACpE,OAAO,EAAE,MAAM,CAAC;IAChB,oDAAoD;IACpD,aAAa,EAAE,MAAM,CAAC;IACtB,6CAA6C;IAC7C,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,CAuBpE;AAMD;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAQrD;AAMD;;;GAGG;AACH,qBAAa,eAAgB,SAAQ,KAAK;aACZ,KAAK,EAAE,MAAM;gBAAb,KAAK,EAAE,MAAM;CAI1C;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAmBtD"}
|
|
@@ -5,16 +5,32 @@
|
|
|
5
5
|
* prompt-injection attempts do not reach Supabase or the embedding API.
|
|
6
6
|
*
|
|
7
7
|
* Two-layer scrub:
|
|
8
|
-
* 1. scrubPromptInjection — strip
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
* single source of
|
|
8
|
+
* 1. scrubPromptInjection — strip STRUCTURAL control tokens only: XML
|
|
9
|
+
* system-marker tags, `<|im_start|>`/`<|im_end|>`-style delimiters, bidi
|
|
10
|
+
* override chars, null bytes. Extracted from bootstrap.ts and re-exported
|
|
11
|
+
* here so journal-write/palace-write can import from a single source of
|
|
12
|
+
* truth.
|
|
12
13
|
* 2. scrubSecretContent — redact known secret token prefixes (AKIA…, ghp_…,
|
|
13
14
|
* gho_…, ghs_…, sk-…, xoxb-…, PEM markers). Operates on content, not
|
|
14
15
|
* filenames (bootstrap.ts isSecretFile() handles filename-level rejection).
|
|
15
16
|
*
|
|
16
17
|
* scrubForCloud(content) = scrubSecretContent(scrubPromptInjection(content))
|
|
17
18
|
*
|
|
19
|
+
* NARROWING (P0-a rework, 2026-08-18, owner-decided architecture): a prior
|
|
20
|
+
* revision of scrubPromptInjection also stripped free-standing natural-
|
|
21
|
+
* language phrases ("ignore/disregard/forget previous/prior instructions").
|
|
22
|
+
* That phrase matcher was DROPPED. Rationale: (a) it produced false positives
|
|
23
|
+
* on legitimate prose — this product's users journal ABOUT prompt-injection
|
|
24
|
+
* incidents (in English and CJK), and every such entry got mangled into
|
|
25
|
+
* "[stripped injection attempt]"; (b) it silently destroyed the matchable
|
|
26
|
+
* vocabulary of any correction/rule whose text happened to describe an
|
|
27
|
+
* injection pattern, breaking check()/checkAction()'s token-overlap matching
|
|
28
|
+
* for that rule forever. Only STRUCTURAL control tokens — sequences that are
|
|
29
|
+
* never legitimate even as quoted text, because they are how a model's own
|
|
30
|
+
* prompt format demarcates role/instruction boundaries — are stripped now.
|
|
31
|
+
* A bare phrase with no structural wrapper is inert prose to any reader and
|
|
32
|
+
* is left untouched.
|
|
33
|
+
*
|
|
18
34
|
* Design guarantees:
|
|
19
35
|
* - Never throws — any failure returns the original content unchanged.
|
|
20
36
|
* - Pure function, no I/O, no Supabase imports.
|
|
@@ -27,16 +43,25 @@
|
|
|
27
43
|
// Layer 1 — prompt-injection scrub (re-export from bootstrap logic)
|
|
28
44
|
// ---------------------------------------------------------------------------
|
|
29
45
|
/**
|
|
30
|
-
* Strip prompt-injection
|
|
31
|
-
* Same logic as bootstrap.ts:scrubPromptInjection but
|
|
32
|
-
* journal-write and palace-write to use at sync time.
|
|
46
|
+
* Strip STRUCTURAL prompt-injection control tokens from content before it
|
|
47
|
+
* leaves the machine. Same logic as bootstrap.ts:scrubPromptInjection but
|
|
48
|
+
* exported here for journal-write and palace-write to use at sync time.
|
|
49
|
+
*
|
|
50
|
+
* Narrowed 2026-08-18 (P0-a rework, owner-decided architecture): only
|
|
51
|
+
* structural control tokens are stripped — XML system-marker tags,
|
|
52
|
+
* `<|im_start|>`/`<|im_end|>`-style delimiters, bidi override chars, null
|
|
53
|
+
* bytes. The free-standing natural-language phrase matcher ("ignore all
|
|
54
|
+
* previous instructions" etc. as bare prose) was REMOVED — see this file's
|
|
55
|
+
* header comment for the false-positive + correction-matching-pollution
|
|
56
|
+
* rationale. A phrase inside a still-stripped structural tag is neutralized
|
|
57
|
+
* along with the tag; a bare phrase with no structural wrapper is left as
|
|
58
|
+
* ordinary text.
|
|
33
59
|
*/
|
|
34
60
|
export function scrubPromptInjection(s) {
|
|
35
61
|
try {
|
|
36
62
|
return s
|
|
37
63
|
.replace(/<\/?\s*(system[-_]?(reminder|prompt|message|instruction)|important|critical)\b[^>]*>/gi, "[stripped tag]")
|
|
38
64
|
.replace(/<\|im_(start|end)\|>/gi, "[stripped]")
|
|
39
|
-
.replace(/\b(ignore|disregard|forget)\s+(all\s+)?(previous|prior|above)\s+(instructions?|prompts?|messages?)/gi, "[stripped injection attempt]")
|
|
40
65
|
.replace(/[--]/g, "") // bidi override chars
|
|
41
66
|
.replace(/\0/g, ""); // null bytes
|
|
42
67
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"content-guard.js","sourceRoot":"","sources":["../../src/storage/content-guard.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"content-guard.js","sourceRoot":"","sources":["../../src/storage/content-guard.ts"],"names":[],"mappings":"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"}
|
|
@@ -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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"}
|
|
@@ -11,6 +11,7 @@ import { ensureDir } from "./fs-utils.js";
|
|
|
11
11
|
import { byteCap, sanitizeName } from "./sanitize.js";
|
|
12
12
|
import { journalDir, projectSubPath } from "./paths.js";
|
|
13
13
|
import { withLock } from "./filelock.js";
|
|
14
|
+
import { scrubForCloud } from "./content-guard.js";
|
|
14
15
|
// ---------------------------------------------------------------------------
|
|
15
16
|
// Internal helpers
|
|
16
17
|
// ---------------------------------------------------------------------------
|
|
@@ -164,8 +165,16 @@ function todayDate() {
|
|
|
164
165
|
* durable path. Pure side-effect helper; no behavior change vs the originals.
|
|
165
166
|
*/
|
|
166
167
|
function writeRecordAtomic(filepath, record) {
|
|
168
|
+
// Scrub BEFORE the local write — corrections are AgentRecall's most-injected
|
|
169
|
+
// artifact (readP0Corrections is loaded into every session_start briefing,
|
|
170
|
+
// handoff.md's "Binding rules" section, and check()'s/checkAction's
|
|
171
|
+
// matching_corrections return value on every FUTURE call), yet this was the
|
|
172
|
+
// ONLY correction write path with no scrub at all: `rule`/`context` are the
|
|
173
|
+
// human_correction text verbatim from check()/alignment_check. Reused by
|
|
174
|
+
// writeCorrection, retractCorrection, and recordOutcome — the single choke
|
|
175
|
+
// point for every persisted correction record.
|
|
167
176
|
const tmp = `${filepath}.tmp.${process.pid}.${Date.now()}`;
|
|
168
|
-
fs.writeFileSync(tmp, JSON.stringify(record, null, 2), { encoding: "utf-8", mode: 0o600 });
|
|
177
|
+
fs.writeFileSync(tmp, scrubForCloud(JSON.stringify(record, null, 2)), { encoding: "utf-8", mode: 0o600 });
|
|
169
178
|
fs.renameSync(tmp, filepath);
|
|
170
179
|
}
|
|
171
180
|
/** Sort rank for the corrections index — p0 first, unknown severities last. */
|
|
@@ -556,9 +565,21 @@ export function writeCorrection(project, correction) {
|
|
|
556
565
|
}
|
|
557
566
|
const dir = correctionsDir(project);
|
|
558
567
|
ensureDir(dir);
|
|
559
|
-
// Auto-detect severity if not already set
|
|
568
|
+
// Auto-detect severity if not already set (BEFORE scrubbing — detectSeverity's
|
|
569
|
+
// language heuristics are tuned against real human_correction phrasing, not
|
|
570
|
+
// against post-scrub placeholder text).
|
|
560
571
|
const severity = correction.severity ?? detectSeverity(`${correction.rule} ${correction.context}`);
|
|
561
572
|
const record = applyCorrectionDefaults({ ...correction, severity }, todayDate());
|
|
573
|
+
// Scrub rule/context on the RECORD OBJECT itself (not just at writeRecordAtomic's
|
|
574
|
+
// JSON-serialize step) — `record.rule` also drives every on-disk FILENAME below
|
|
575
|
+
// (`slugify(record.rule || record.id)`), a leak vector content-only scrubbing
|
|
576
|
+
// can never close: a secret/injection payload embedded in the human_correction
|
|
577
|
+
// text would otherwise survive verbatim in the *.json FILENAME even though the
|
|
578
|
+
// file's *contents* were clean. Scrubbing the object here means the filename,
|
|
579
|
+
// the merge-matching (`normalizeRule`), and the eventual writeRecordAtomic
|
|
580
|
+
// content write are all derived from the SAME already-clean value.
|
|
581
|
+
record.rule = scrubForCloud(record.rule);
|
|
582
|
+
record.context = scrubForCloud(record.context);
|
|
562
583
|
// ── LOCKED critical section (P0 data-loss fix, 2026-07-25) ────────────────
|
|
563
584
|
// From here on this is an unlocked read-all→find→mutate→atomic-rewrite→
|
|
564
585
|
// index-regen sequence: the consolidation scan below reads every *.json
|
|
@@ -1267,7 +1288,11 @@ export function logRejectedCorrection(project, rule, reason) {
|
|
|
1267
1288
|
const row = {
|
|
1268
1289
|
ts: new Date().toISOString(),
|
|
1269
1290
|
project,
|
|
1270
|
-
|
|
1291
|
+
// Scrubbed even though this is a human-facing CLI diagnostic dump today
|
|
1292
|
+
// (readRejectedCorrections has no agent-facing reader currently) — a
|
|
1293
|
+
// rejected candidate is, by definition, raw un-vetted text, and the same
|
|
1294
|
+
// defense-in-depth applies as every other correction write.
|
|
1295
|
+
rule: scrubForCloud(rule),
|
|
1271
1296
|
reason,
|
|
1272
1297
|
gate_version: GATE_VERSION,
|
|
1273
1298
|
};
|