agent-recall-core 3.4.47 → 3.4.48
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/index.d.ts +7 -6
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +13 -3
- package/dist/index.js.map +1 -1
- package/dist/retrieval/candidates.d.ts +27 -2
- package/dist/retrieval/candidates.d.ts.map +1 -1
- package/dist/retrieval/candidates.js +153 -1
- package/dist/retrieval/candidates.js.map +1 -1
- package/dist/retrieval/contradiction.d.ts +65 -13
- package/dist/retrieval/contradiction.d.ts.map +1 -1
- package/dist/retrieval/contradiction.js +40 -17
- package/dist/retrieval/contradiction.js.map +1 -1
- package/dist/retrieval/query-memory.d.ts +47 -2
- package/dist/retrieval/query-memory.d.ts.map +1 -1
- package/dist/retrieval/query-memory.js +121 -0
- package/dist/retrieval/query-memory.js.map +1 -1
- package/dist/storage/corrections.d.ts +132 -1
- package/dist/storage/corrections.d.ts.map +1 -1
- package/dist/storage/corrections.js +113 -2
- package/dist/storage/corrections.js.map +1 -1
- package/dist/supabase/recall-backend.d.ts +1 -0
- package/dist/supabase/recall-backend.d.ts.map +1 -1
- package/dist/supabase/recall-backend.js +151 -6
- package/dist/supabase/recall-backend.js.map +1 -1
- package/dist/tools-logic/smart-recall.d.ts.map +1 -1
- package/dist/tools-logic/smart-recall.js +28 -2
- package/dist/tools-logic/smart-recall.js.map +1 -1
- package/dist/tools-logic/supersession.d.ts +63 -2
- package/dist/tools-logic/supersession.d.ts.map +1 -1
- package/dist/tools-logic/supersession.js +153 -48
- package/dist/tools-logic/supersession.js.map +1 -1
- package/dist/types.d.ts +12 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +1 -1
- package/package.json +1 -1
|
@@ -3,6 +3,7 @@ import { getSupabaseClient } from "./client.js";
|
|
|
3
3
|
import { createEmbeddingProvider } from "./embedding.js";
|
|
4
4
|
import { calibratedConfidence } from "../tools-logic/confidence.js";
|
|
5
5
|
import { isRescueSourceTag } from "../helpers/journal-filter.js";
|
|
6
|
+
import { tokenizeWords } from "../helpers/tokenize.js";
|
|
6
7
|
// Import the interface type — we can't import directly from recall-backend.ts
|
|
7
8
|
// because it would create a circular dependency (it dynamically imports us).
|
|
8
9
|
// Instead, we define the same shape and the getRecallBackend() factory casts.
|
|
@@ -81,6 +82,107 @@ export function mapFtsRows(rows) {
|
|
|
81
82
|
room: r.room ?? undefined,
|
|
82
83
|
}));
|
|
83
84
|
}
|
|
85
|
+
/**
|
|
86
|
+
* Build the PostgreSQL FTS query string for the `ar_entries.body` `.textSearch(...,
|
|
87
|
+
* { type: "plain" })` leg — pure, testable in isolation (Wave 4 W4b FIX 1,
|
|
88
|
+
* 2026-09-08).
|
|
89
|
+
*
|
|
90
|
+
* BUG this replaces: the query was built as `query.split(/\s+/).join(" & ")`
|
|
91
|
+
* — a bare whitespace split. Chinese/Japanese text is normally written with
|
|
92
|
+
* NO spaces between words, so an unspaced CJK query (e.g. `"分析报告"`) finds
|
|
93
|
+
* zero whitespace, stays ONE segment, and gets handed to
|
|
94
|
+
* `plainto_tsquery('english', …)` as one opaque blob — the exact same
|
|
95
|
+
* "one giant token never matches" class that caused the v3.4.44 local-search
|
|
96
|
+
* CJK fix (`../helpers/tokenize.ts`'s header; L1 eval CJK hit@5 was 0/6
|
|
97
|
+
* before that fix). This Supabase-remote leg was never swept when that fix
|
|
98
|
+
* landed, even though `SupabaseRecallBackend` is the backend the owner's
|
|
99
|
+
* REAL `smart_recall` traffic resolves to (remote replaces local output when
|
|
100
|
+
* non-empty within 2500ms) — so CJK FTS has been silently broken on the
|
|
101
|
+
* actual production path.
|
|
102
|
+
*
|
|
103
|
+
* FIX: tokenize with the SAME shared CJK-aware tokenizer every local
|
|
104
|
+
* recall/search site already uses (`tokenizeWords` — imported, not forked;
|
|
105
|
+
* see that module's own header on why forking it recreated this exact bug
|
|
106
|
+
* class 7 times before v3.4.44). `tokenizeWords` extracts Han-script runs
|
|
107
|
+
* and segments them with `Intl.Segmenter` independently of ASCII
|
|
108
|
+
* whitespace-splitting, so `"分析报告"` (no internal whitespace at all)
|
|
109
|
+
* becomes `["分析", "报告"]` instead of one token.
|
|
110
|
+
*
|
|
111
|
+
* WHY joining segmented tokens with real whitespace still works under
|
|
112
|
+
* `{ type: "plain" }` (verified, not assumed): `.textSearch(..., { type:
|
|
113
|
+
* "plain" })` sends the string through Postgres's `plainto_tsquery`, which
|
|
114
|
+
* re-tokenizes the WHOLE string itself and ANDs together whatever "words" it
|
|
115
|
+
* finds (any `&` we insert is treated as punctuation-noise and dropped, not
|
|
116
|
+
* parsed as a boolean operator — that only applies to the default/`to_tsquery`
|
|
117
|
+
* mode). `plainto_tsquery` uses Postgres's OWN whitespace/punctuation-based
|
|
118
|
+
* parser, which — like the pre-fix JS `\s+` split — cannot itself segment an
|
|
119
|
+
* unspaced Han run into separate words. What it CAN do is treat any run
|
|
120
|
+
* already delimited by whitespace as one atomic token. So the fix's actual
|
|
121
|
+
* job is upstream of Postgres: pre-insert real whitespace at the CJK word
|
|
122
|
+
* boundaries `tokenizeWords` finds, so `plainto_tsquery` receives
|
|
123
|
+
* `"分析 & 报告"` and naturally isolates `分析` and `报告` as two lexemes
|
|
124
|
+
* instead of receiving `"分析报告"` and being unable to split it.
|
|
125
|
+
*
|
|
126
|
+
* RESIDUAL LIMITATION (out of scope for this fix, documented honestly): this
|
|
127
|
+
* only fixes the QUERY side. The INDEXED side — `idx_ar_entries_fts`'s
|
|
128
|
+
* `to_tsvector('english', …)` in migration.sql — has the identical inability
|
|
129
|
+
* to auto-segment CJK at write time (no CJK-aware text-search
|
|
130
|
+
* config/dictionary such as `zhparser`/`pg_jieba` is installed). For body
|
|
131
|
+
* content that is itself one long unpunctuated CJK run with no natural
|
|
132
|
+
* breaks, matching still fails, because the indexed side never produced the
|
|
133
|
+
* separate `分析`/`报告` lexemes to match against in the first place. In
|
|
134
|
+
* practice this owner's real memory content is heavily CJK+ASCII+punctuation
|
|
135
|
+
* mixed (see e.g. this very file's own commit-message/report conventions),
|
|
136
|
+
* which DOES naturally break into separate indexed tokens at punctuation/
|
|
137
|
+
* script boundaries — so this fix closes the common case (unspaced CJK
|
|
138
|
+
* QUERIES against naturally-punctuated stored content) without needing an
|
|
139
|
+
* index/schema change. A full write-side fix would require a CJK-aware
|
|
140
|
+
* `to_tsvector` config — a migration.sql/schema change, explicitly out of
|
|
141
|
+
* this task's scope.
|
|
142
|
+
*
|
|
143
|
+
* Returns `null` when tokenization yields zero tokens (pure
|
|
144
|
+
* stopword/punctuation query) — callers MUST skip the FTS leg entirely in
|
|
145
|
+
* that case rather than pass an empty string to `.textSearch(...)`, so an
|
|
146
|
+
* edge-case query can never reach Postgres as a malformed/empty tsquery
|
|
147
|
+
* input.
|
|
148
|
+
*
|
|
149
|
+
* v4 PRE-SHIP GATE FIX (2026-09-08, reports/2026-09-08-v4-gatefix-report.md
|
|
150
|
+
* FIX 2) — "zero tokens" above was not actually true for CJK PUNCTUATION:
|
|
151
|
+
* `HAN_RUN_RE` (`tokenize.ts`) only matches `\p{Script=Han}` — CJK
|
|
152
|
+
* punctuation (fullwidth/ideographic marks like "。!?,、" or the Chinese
|
|
153
|
+
* double-ellipsis "……") carries Unicode script `Common`, not `Han`, so it is
|
|
154
|
+
* NEVER captured by the Han-run path and falls through to the plain
|
|
155
|
+
* ASCII/whitespace path unmodified (this call passes no `asciiStripRegex`).
|
|
156
|
+
* With no internal whitespace, a punctuation run becomes ONE token whose
|
|
157
|
+
* length can exceed `minLength` (e.g. "。!?,、" is 5 characters) and
|
|
158
|
+
* survives as a garbage FTS clause; mixed with real Han content (e.g.
|
|
159
|
+
* "什么???" → Han run "什么" plus a leftover "???" ASCII-path token,
|
|
160
|
+
* itself long enough to survive `minLength`), it produces a spurious
|
|
161
|
+
* `& ???`-shaped AND-clause alongside the real query terms.
|
|
162
|
+
*
|
|
163
|
+
* FIX: after tokenizing, drop any token containing NO letter or digit
|
|
164
|
+
* (Unicode-aware — `\p{L}` covers Han ideographs the same as Latin letters,
|
|
165
|
+
* so no separate CJK case is needed). A pure-punctuation query now
|
|
166
|
+
* tokenizes to nothing (this leg's existing `tokens.length === 0` guard
|
|
167
|
+
* above returns `null`, so search() skips the FTS leg entirely, matching
|
|
168
|
+
* the ASCII punctuation-only case `recall-backend.test.mjs` already
|
|
169
|
+
* covered). A mixed query loses ONLY the punctuation-only token(s) — a real
|
|
170
|
+
* Han run like "什么" is unaffected (Han characters ARE `\p{L}`), so
|
|
171
|
+
* `"什么???"` now segments to just `"什么"`, no spurious `& ???` clause.
|
|
172
|
+
* Filtering post-tokenize (rather than passing an `asciiStripRegex` into
|
|
173
|
+
* `tokenizeWords`, the approach `palace/skills.ts` uses) keeps this
|
|
174
|
+
* call the only one that changes — `tokenizeWords` itself, and every OTHER
|
|
175
|
+
* call site's behavior, is untouched.
|
|
176
|
+
*/
|
|
177
|
+
function hasWordChar(token) {
|
|
178
|
+
return /[\p{L}\p{N}]/u.test(token);
|
|
179
|
+
}
|
|
180
|
+
export function buildFtsQuery(query) {
|
|
181
|
+
const tokens = tokenizeWords(query).filter(hasWordChar);
|
|
182
|
+
if (tokens.length === 0)
|
|
183
|
+
return null;
|
|
184
|
+
return tokens.join(" & ");
|
|
185
|
+
}
|
|
84
186
|
export class SupabaseRecallBackend {
|
|
85
187
|
config;
|
|
86
188
|
embedding;
|
|
@@ -109,6 +211,13 @@ export class SupabaseRecallBackend {
|
|
|
109
211
|
const { localRecallSearch } = await import("../tools-logic/smart-recall.js");
|
|
110
212
|
return localRecallSearch(query, project, limit);
|
|
111
213
|
}
|
|
214
|
+
// FIX 1 (Wave 4 W4b, 2026-09-08): CJK-aware query segmentation — see
|
|
215
|
+
// `buildFtsQuery`'s own doc comment for the bug, the fix mechanism, and
|
|
216
|
+
// the documented residual (index-side) limitation. `null` means
|
|
217
|
+
// tokenization found nothing to search on (pure stopword/punctuation
|
|
218
|
+
// query) — skip the FTS leg entirely rather than hand Postgres an empty
|
|
219
|
+
// or malformed tsquery input.
|
|
220
|
+
const ftsQuery = buildFtsQuery(query);
|
|
112
221
|
// Three parallel queries
|
|
113
222
|
const [semanticResults, insightResults, ftsResults] = await Promise.all([
|
|
114
223
|
// 1. pgvector cosine similarity on ar_entries
|
|
@@ -123,12 +232,14 @@ export class SupabaseRecallBackend {
|
|
|
123
232
|
match_limit: limit,
|
|
124
233
|
}),
|
|
125
234
|
// 3. PostgreSQL FTS (keyword backup)
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
235
|
+
ftsQuery
|
|
236
|
+
? client
|
|
237
|
+
.from("ar_entries")
|
|
238
|
+
.select("id, project, store, room, slug, title, body, tags, metadata")
|
|
239
|
+
.eq("project", project)
|
|
240
|
+
.textSearch("body", ftsQuery, { type: "plain" })
|
|
241
|
+
.limit(limit)
|
|
242
|
+
: Promise.resolve({ data: [], error: null }),
|
|
132
243
|
]);
|
|
133
244
|
// Identity-trust (P0 trust-class closure, 2026-08-30, wave/pipe-p0-trustclass,
|
|
134
245
|
// gap #6 defense-in-depth): the ROOT CAUSE (rescue-tagged content entering
|
|
@@ -142,6 +253,40 @@ export class SupabaseRecallBackend {
|
|
|
142
253
|
// hand-constructed row, without a live Supabase client + embedding
|
|
143
254
|
// provider (this class has no DI seam for either).
|
|
144
255
|
const semanticItems = mapSemanticRows(semanticResults.data ?? []);
|
|
256
|
+
// FIX 2 (Wave 4 W4b, 2026-09-08) — VERIFIED, not applied: this leg has NO
|
|
257
|
+
// rescue-provenance filter analogous to `isRescueRow` above, and after
|
|
258
|
+
// checking the actual schema it CANNOT get one the same way.
|
|
259
|
+
// - `ar_insights` (migration.sql) has no `metadata` column at all
|
|
260
|
+
// (unlike `ar_entries`, which does) — there is no jsonb field to
|
|
261
|
+
// carry a `source:` provenance tag on this table, full stop.
|
|
262
|
+
// - Even the one column that could theoretically double for this
|
|
263
|
+
// (`ar_insights.tags text[]`) is not selected by the `ar_insight_search`
|
|
264
|
+
// RPC's `RETURNS TABLE` (migration.sql): it returns only
|
|
265
|
+
// `id, title, severity, confirmed, projects, similarity` — no body,
|
|
266
|
+
// no metadata, no tags reach this code at all.
|
|
267
|
+
// - A best-effort content-level check
|
|
268
|
+
// (`isRescueSourcedContent`/`journal-filter.ts`) would be VACUOUS
|
|
269
|
+
// here, not just weak: it parses a `---\nsource: …\n---` frontmatter
|
|
270
|
+
// block out of raw file content, and `title`/`severity` are plain
|
|
271
|
+
// short text fields, never frontmatter-delimited content — the
|
|
272
|
+
// `content.startsWith("---")` guard would be false for every
|
|
273
|
+
// realistic row, so the filter could never fire. Shipping it would
|
|
274
|
+
// be exactly the "vacuous filter that looks fixed but never runs"
|
|
275
|
+
// trap w5fix already caught once (body-vs-metadata, same file).
|
|
276
|
+
// - Also verified structurally unreachable today regardless: `grep -rn
|
|
277
|
+
// "ar_insights"` across `packages/*/src` finds zero writers to this
|
|
278
|
+
// Supabase table (only a same-named but unrelated LOCAL
|
|
279
|
+
// `palace/insights-index.ts` file index) — nothing in this codebase
|
|
280
|
+
// inserts rows into `ar_insights` at all, so a rescue-tagged row
|
|
281
|
+
// cannot reach this leg through any currently-shipped path.
|
|
282
|
+
// Net: this residual gap is real (a future writer to `ar_insights` that
|
|
283
|
+
// doesn't sanitize provenance would surface unfiltered here) but it is
|
|
284
|
+
// UNFILTERABLE BY THE CURRENT SCHEMA from this file alone — closing it
|
|
285
|
+
// requires a migration.sql change (add a metadata/source column, thread
|
|
286
|
+
// it through the RPC's RETURNS TABLE) and/or a real writer that respects
|
|
287
|
+
// it, both out of this task's scope (target file is
|
|
288
|
+
// `supabase/recall-backend.ts`, not `migration.sql`). Left as a
|
|
289
|
+
// documented gap rather than a filter that can never fire.
|
|
145
290
|
const insightItemsList = (insightResults.data ?? []).map((r) => ({
|
|
146
291
|
id: r.id,
|
|
147
292
|
source: "insight",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recall-backend.js","sourceRoot":"","sources":["../../src/supabase/recall-backend.ts"],"names":[],"mappings":"AAAA,+CAA+C;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,uBAAuB,EAA0B,MAAM,gBAAgB,CAAC;AAEjF,OAAO,EAAE,oBAAoB,EAAwB,MAAM,8BAA8B,CAAC;AAC1F,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"recall-backend.js","sourceRoot":"","sources":["../../src/supabase/recall-backend.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smart-recall.d.ts","sourceRoot":"","sources":["../../src/tools-logic/smart-recall.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwGG;AAWH,OAAO,EAAiB,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAQlE,MAAM,WAAW,cAAc;IAC7B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,cAAc,EAAE,CAAC;IAC5B;;qDAEiD;IACjD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;wBACoB;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX;;;;;;;kBAOc;IACd,MAAM,EAAE,QAAQ,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;IACrD;;;yEAGqE;IACrE,WAAW,CAAC,EAAE,KAAK,CAAC,QAAQ,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC,CAAC;IAClE,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,iEAAiE;IACjE,UAAU,EAAE,MAAM,CAAC;IACnB;yEACqE;IACrE,UAAU,EAAE,MAAM,CAAC;IACnB,mFAAmF;IACnF,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;;;;;;;;;;;;;OAiBG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED,iFAAiF;AACjF,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAQD,MAAM,WAAW,mBAAmB;IAGlC,MAAM,EAAE,SAAS,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;+EAC+E;AAC/E,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,qBAAqB,EAAE,CAAC;IACjC,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,sFAAsF;IACtF,QAAQ,CAAC,EAAE,mBAAmB,CAAC;IAC/B,6EAA6E;IAC7E,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAC1B;;;gEAG4D;IAC5D,oBAAoB,CAAC,EAAE,kBAAkB,CAAC;CAC3C;
|
|
1
|
+
{"version":3,"file":"smart-recall.d.ts","sourceRoot":"","sources":["../../src/tools-logic/smart-recall.ts"],"names":[],"mappings":"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"}
|
|
@@ -205,6 +205,30 @@ function verbatimKeyFor(item) {
|
|
|
205
205
|
return { kind: "archive", date: item.date, file: item.file };
|
|
206
206
|
return undefined;
|
|
207
207
|
}
|
|
208
|
+
/**
|
|
209
|
+
* v4 W3 (2026-09-08) type-compat shim, NOT a behavior change: `queryMemory`'s
|
|
210
|
+
* `QueryMemorySource` union grew a `"corrections"` member this wave (a new
|
|
211
|
+
* competing RRF tier — see retrieval/candidates.ts/query-memory.ts), but
|
|
212
|
+
* `SmartRecallResultItem.source`'s own external contract (this file's own
|
|
213
|
+
* header comment, "kept singular for backward compatibility with existing
|
|
214
|
+
* consumers") deliberately stays `"palace" | "journal" | "insight" |
|
|
215
|
+
* "archive"` — smart_recall does NOT opt into the corrections tier this wave
|
|
216
|
+
* (its own `tiers: ["palace", "journal", "insight"]` call below is
|
|
217
|
+
* unchanged), so widening this exported type would be a false, unrequested
|
|
218
|
+
* contract change for every existing consumer. This narrows the (now wider)
|
|
219
|
+
* `QueryMemorySource` back down at the one call site that needs it, and
|
|
220
|
+
* FAILS LOUDLY (never silently mislabels) if a future edit ever adds
|
|
221
|
+
* `"corrections"` to the `tiers` array below without also updating
|
|
222
|
+
* `SmartRecallResultItem.source`'s contract first.
|
|
223
|
+
*/
|
|
224
|
+
function excludeCorrectionsSource(source) {
|
|
225
|
+
if (source === "corrections") {
|
|
226
|
+
throw new Error("localRecallSearch: unexpected 'corrections' source — this file's own " +
|
|
227
|
+
"tiers list must not request it without first updating " +
|
|
228
|
+
"SmartRecallResultItem.source's external contract");
|
|
229
|
+
}
|
|
230
|
+
return source;
|
|
231
|
+
}
|
|
208
232
|
/**
|
|
209
233
|
* localRecallSearch — the core local search logic (palace + journal + insight).
|
|
210
234
|
*
|
|
@@ -256,8 +280,10 @@ export async function localRecallSearch(query, project, limit, since) {
|
|
|
256
280
|
// correctly dropped, not a behavior change).
|
|
257
281
|
const deduped = result.items.map((item) => ({
|
|
258
282
|
id: item.id,
|
|
259
|
-
source: item.source,
|
|
260
|
-
...(item.alsoFoundIn && item.alsoFoundIn.length > 0
|
|
283
|
+
source: excludeCorrectionsSource(item.source),
|
|
284
|
+
...(item.alsoFoundIn && item.alsoFoundIn.length > 0
|
|
285
|
+
? { alsoFoundIn: item.alsoFoundIn.map(excludeCorrectionsSource) }
|
|
286
|
+
: {}),
|
|
261
287
|
title: item.title,
|
|
262
288
|
excerpt: item.excerpt,
|
|
263
289
|
score: item.score,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smart-recall.js","sourceRoot":"","sources":["../../src/tools-logic/smart-recall.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"smart-recall.js","sourceRoot":"","sources":["../../src/tools-logic/smart-recall.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import type { CorrectionRecord } from "../storage/corrections.js";
|
|
2
|
+
import type { Confidence, DecayClass } from "../types.js";
|
|
1
3
|
export interface SupersessionMatch {
|
|
2
4
|
existingId: string;
|
|
3
5
|
existingRule: string;
|
|
@@ -13,12 +15,71 @@ export interface SupersessionReview {
|
|
|
13
15
|
superseded: string[];
|
|
14
16
|
auto: boolean;
|
|
15
17
|
}
|
|
16
|
-
/**
|
|
18
|
+
/**
|
|
19
|
+
* Find active corrections that contradict the candidate on a version/status/kv
|
|
20
|
+
* fact.
|
|
21
|
+
*
|
|
22
|
+
* `preloaded` (v4 W5, additive/optional): an already-read `readActiveCorrections()`
|
|
23
|
+
* result, same contract as `readActiveCorrections`/`readP0Corrections`'s own
|
|
24
|
+
* `preloaded` param (corrections.ts, PERF 2026-07-27 doc) — a pure in-memory
|
|
25
|
+
* filter substitution, order/semantics byte-identical to omitting it. Exists so
|
|
26
|
+
* `listCorrectionConflicts` below can read the store ONCE and pass the same
|
|
27
|
+
* array into every pairwise call instead of re-scanning disk per candidate.
|
|
28
|
+
* Every existing caller (reviewSupersessions, the P2 supersession tests) omits
|
|
29
|
+
* it and is unaffected.
|
|
30
|
+
*/
|
|
17
31
|
export declare function detectCorrectionConflicts(project: string, candidate: {
|
|
18
32
|
id?: string;
|
|
19
33
|
rule: string;
|
|
20
34
|
context?: string;
|
|
21
|
-
}): SupersessionMatch[];
|
|
35
|
+
}, preloaded?: CorrectionRecord[]): SupersessionMatch[];
|
|
36
|
+
/**
|
|
37
|
+
* A suspected supersession pair for the human-confirmed CLI listing
|
|
38
|
+
* (`ar corrections conflicts`) — `existing*` is the chronologically OLDER
|
|
39
|
+
* active correction, `newer*` the one that contradicts it. Confidence/decay
|
|
40
|
+
* annotations reuse the SAME W1/W2 read-time computations `rankCorrections`/
|
|
41
|
+
* `getCorrectionKPIs` already use (`effectiveConfidenceOf`/`decayClassOf`) —
|
|
42
|
+
* no new derivation logic, no re-blending into any score.
|
|
43
|
+
*/
|
|
44
|
+
export interface CorrectionConflict extends SupersessionMatch {
|
|
45
|
+
existingConfidence: Confidence;
|
|
46
|
+
existingDecayClass: DecayClass;
|
|
47
|
+
newerId: string;
|
|
48
|
+
newerRule: string;
|
|
49
|
+
newerConfidence: Confidence;
|
|
50
|
+
newerDecayClass: DecayClass;
|
|
51
|
+
}
|
|
52
|
+
/**
|
|
53
|
+
* List suspected supersession pairs across ALL active corrections in a
|
|
54
|
+
* project — the store-wide counterpart to `detectCorrectionConflicts`'s
|
|
55
|
+
* one-candidate-vs-store shape, built for `ar corrections conflicts`
|
|
56
|
+
* (v4 W5, design memo Wave 5). READ-ONLY: never calls `retractCorrection`,
|
|
57
|
+
* never mutates anything — same guarantee as `detectCorrectionConflicts`.
|
|
58
|
+
*
|
|
59
|
+
* Shape decision (design memo CHALLENGE): `detectCorrectionConflicts` takes
|
|
60
|
+
* ONE candidate vs. the store, not "all conflicts in the store" — there is no
|
|
61
|
+
* existing all-pairs primitive to call. The minimal correct shape is pairwise:
|
|
62
|
+
* for each active correction as candidate, call `detectCorrectionConflicts`
|
|
63
|
+
* against the SAME preloaded snapshot (one disk read total, via the
|
|
64
|
+
* `preloaded` param above) — O(n) calls, each doing O(n) in-memory
|
|
65
|
+
* comparisons, so O(n²) comparisons overall. Corrections stores are small
|
|
66
|
+
* (P0-cap ~5-9 active typical per corrections.ts's own cap discussion), so
|
|
67
|
+
* O(n²) comparisons here is on the order of tens of comparisons in the
|
|
68
|
+
* realistic case, not a performance concern. This does NOT scale to a
|
|
69
|
+
* cross-project or unbounded-n use case — it is scoped, by design, to one
|
|
70
|
+
* project's active-corrections population, matching `detectCorrectionConflicts`'s
|
|
71
|
+
* own existing scope.
|
|
72
|
+
*
|
|
73
|
+
* Dedup: a contradiction between two records can be found from EITHER side
|
|
74
|
+
* (candidate=A finds existingId=B, and candidate=B finds existingId=A) since
|
|
75
|
+
* `compareForConflicts` doesn't track direction. Corrections are sorted
|
|
76
|
+
* chronologically once (date, then id as a tiebreak) and only pairs where the
|
|
77
|
+
* matched `existingId` is STRICTLY OLDER than the current candidate are kept
|
|
78
|
+
* — this reports each unordered pair exactly once, with `existing` always the
|
|
79
|
+
* older rule and `newer` the one that contradicts it (matching the CLI's
|
|
80
|
+
* "existing rule vs. newer conflicting rule" framing).
|
|
81
|
+
*/
|
|
82
|
+
export declare function listCorrectionConflicts(project: string, preloaded?: CorrectionRecord[]): CorrectionConflict[];
|
|
22
83
|
/**
|
|
23
84
|
* Review (and, under auto, apply) supersessions for a newly-written correction.
|
|
24
85
|
* SUGGEST-ONLY by default. With auto (or AR_CONSOLIDATE_AUTO=1) the contradicted
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supersession.d.ts","sourceRoot":"","sources":["../../src/tools-logic/supersession.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"supersession.d.ts","sourceRoot":"","sources":["../../src/tools-logic/supersession.ts"],"names":[],"mappings":"AA2EA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE1D,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAClE;AAED,MAAM,WAAW,kBAAkB;IACjC,oFAAoF;IACpF,WAAW,EAAE,iBAAiB,EAAE,CAAC;IACjC,gFAAgF;IAChF,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,IAAI,EAAE,OAAO,CAAC;CACf;AA4BD;;;;;;;;;;;;GAYG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE;IAAE,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EAC1D,SAAS,CAAC,EAAE,gBAAgB,EAAE,GAC7B,iBAAiB,EAAE,CAgBrB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC3D,kBAAkB,EAAE,UAAU,CAAC;IAC/B,kBAAkB,EAAE,UAAU,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,UAAU,CAAC;IAC5B,eAAe,EAAE,UAAU,CAAC;CAC7B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,MAAM,EACf,SAAS,CAAC,EAAE,gBAAgB,EAAE,GAC7B,kBAAkB,EAAE,CAiCtB;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,MAAM,EACf,aAAa,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EAC7D,IAAI,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,GACxB,kBAAkB,CAgBpB"}
|