agent-recall-core 3.4.51 → 3.5.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +670 -330
- package/dist/digest/match.d.ts +2 -0
- package/dist/digest/match.d.ts.map +1 -1
- package/dist/digest/match.js +5 -0
- package/dist/digest/match.js.map +1 -1
- package/dist/digest/store.d.ts.map +1 -1
- package/dist/digest/store.js +2 -3
- package/dist/digest/store.js.map +1 -1
- package/dist/embeddings/config.d.ts.map +1 -1
- package/dist/embeddings/config.js +17 -4
- package/dist/embeddings/config.js.map +1 -1
- package/dist/helpers/alignment-patterns.d.ts +46 -0
- package/dist/helpers/alignment-patterns.d.ts.map +1 -1
- package/dist/helpers/alignment-patterns.js +103 -2
- package/dist/helpers/alignment-patterns.js.map +1 -1
- package/dist/helpers/journal-files.d.ts +12 -6
- package/dist/helpers/journal-files.d.ts.map +1 -1
- package/dist/helpers/journal-files.js +13 -7
- package/dist/helpers/journal-files.js.map +1 -1
- package/dist/index.d.ts +23 -6
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +23 -5
- package/dist/index.js.map +1 -1
- package/dist/palace/rooms.d.ts +7 -0
- package/dist/palace/rooms.d.ts.map +1 -1
- package/dist/palace/rooms.js +13 -0
- package/dist/palace/rooms.js.map +1 -1
- package/dist/prompts/consolidation-prompt.js +14 -14
- package/dist/retrieval/candidates.d.ts +17 -0
- package/dist/retrieval/candidates.d.ts.map +1 -1
- package/dist/retrieval/candidates.js +4 -2
- package/dist/retrieval/candidates.js.map +1 -1
- package/dist/retrieval/contradiction.d.ts +42 -0
- package/dist/retrieval/contradiction.d.ts.map +1 -1
- package/dist/retrieval/contradiction.js +126 -7
- package/dist/retrieval/contradiction.js.map +1 -1
- package/dist/retrieval/lexical-index.d.ts +150 -0
- package/dist/retrieval/lexical-index.d.ts.map +1 -0
- package/dist/retrieval/lexical-index.js +516 -0
- package/dist/retrieval/lexical-index.js.map +1 -0
- package/dist/retrieval/query-memory.d.ts +17 -7
- package/dist/retrieval/query-memory.d.ts.map +1 -1
- package/dist/retrieval/query-memory.js +279 -71
- package/dist/retrieval/query-memory.js.map +1 -1
- package/dist/storage/classification.d.ts.map +1 -1
- package/dist/storage/classification.js +6 -1
- package/dist/storage/classification.js.map +1 -1
- package/dist/storage/content-guard.d.ts +32 -0
- package/dist/storage/content-guard.d.ts.map +1 -1
- package/dist/storage/content-guard.js +467 -48
- package/dist/storage/content-guard.js.map +1 -1
- package/dist/storage/corrections.d.ts +3 -1
- package/dist/storage/corrections.d.ts.map +1 -1
- package/dist/storage/corrections.js +52 -67
- package/dist/storage/corrections.js.map +1 -1
- package/dist/storage/cwd-allowlist.d.ts +30 -2
- package/dist/storage/cwd-allowlist.d.ts.map +1 -1
- package/dist/storage/cwd-allowlist.js +105 -22
- package/dist/storage/cwd-allowlist.js.map +1 -1
- package/dist/storage/deferred-bookkeeping.d.ts +34 -0
- package/dist/storage/deferred-bookkeeping.d.ts.map +1 -0
- package/dist/storage/deferred-bookkeeping.js +201 -0
- package/dist/storage/deferred-bookkeeping.js.map +1 -0
- package/dist/storage/filelock.d.ts +26 -8
- package/dist/storage/filelock.d.ts.map +1 -1
- package/dist/storage/filelock.js +202 -26
- package/dist/storage/filelock.js.map +1 -1
- package/dist/storage/frontmatter.d.ts +14 -0
- package/dist/storage/frontmatter.d.ts.map +1 -0
- package/dist/storage/frontmatter.js +22 -0
- package/dist/storage/frontmatter.js.map +1 -0
- package/dist/storage/fs-utils.d.ts +53 -0
- package/dist/storage/fs-utils.d.ts.map +1 -1
- package/dist/storage/fs-utils.js +140 -2
- package/dist/storage/fs-utils.js.map +1 -1
- package/dist/storage/hook-session.d.ts +9 -0
- package/dist/storage/hook-session.d.ts.map +1 -0
- package/dist/storage/hook-session.js +49 -0
- package/dist/storage/hook-session.js.map +1 -0
- package/dist/storage/identity-card.d.ts +27 -0
- package/dist/storage/identity-card.d.ts.map +1 -0
- package/dist/storage/identity-card.js +86 -0
- package/dist/storage/identity-card.js.map +1 -0
- package/dist/storage/lifecycle-telemetry.d.ts +1 -1
- package/dist/storage/lifecycle-telemetry.d.ts.map +1 -1
- package/dist/storage/lifecycle-telemetry.js +2 -2
- package/dist/storage/lifecycle-telemetry.js.map +1 -1
- package/dist/storage/memory-protocol.js +55 -55
- package/dist/storage/paths.d.ts.map +1 -1
- package/dist/storage/paths.js +7 -2
- package/dist/storage/paths.js.map +1 -1
- package/dist/storage/pending.d.ts +39 -3
- package/dist/storage/pending.d.ts.map +1 -1
- package/dist/storage/pending.js +126 -20
- package/dist/storage/pending.js.map +1 -1
- package/dist/storage/project.d.ts.map +1 -1
- package/dist/storage/project.js +34 -9
- package/dist/storage/project.js.map +1 -1
- package/dist/storage/session.d.ts.map +1 -1
- package/dist/storage/session.js +43 -16
- package/dist/storage/session.js.map +1 -1
- package/dist/storage/state-card.d.ts +59 -0
- package/dist/storage/state-card.d.ts.map +1 -0
- package/dist/storage/state-card.js +162 -0
- package/dist/storage/state-card.js.map +1 -0
- package/dist/storage/store-manifest.js +57 -57
- package/dist/storage/unclaimed.js +2 -2
- package/dist/storage/unclaimed.js.map +1 -1
- package/dist/supabase/config.d.ts.map +1 -1
- package/dist/supabase/config.js +7 -1
- package/dist/supabase/config.js.map +1 -1
- package/dist/supabase/embedding.d.ts.map +1 -1
- package/dist/supabase/embedding.js +7 -0
- package/dist/supabase/embedding.js.map +1 -1
- package/dist/supabase/sync.d.ts.map +1 -1
- package/dist/supabase/sync.js +42 -18
- package/dist/supabase/sync.js.map +1 -1
- package/dist/tools-logic/bootstrap.d.ts.map +1 -1
- package/dist/tools-logic/bootstrap.js +4 -2
- package/dist/tools-logic/bootstrap.js.map +1 -1
- package/dist/tools-logic/check.d.ts +69 -2
- package/dist/tools-logic/check.d.ts.map +1 -1
- package/dist/tools-logic/check.js +280 -57
- package/dist/tools-logic/check.js.map +1 -1
- package/dist/tools-logic/dream-admission.js +29 -29
- package/dist/tools-logic/recall-backend.d.ts.map +1 -1
- package/dist/tools-logic/recall-backend.js +11 -1
- package/dist/tools-logic/recall-backend.js.map +1 -1
- package/dist/tools-logic/session-end.d.ts +18 -1
- package/dist/tools-logic/session-end.d.ts.map +1 -1
- package/dist/tools-logic/session-end.js +36 -5
- package/dist/tools-logic/session-end.js.map +1 -1
- package/dist/tools-logic/session-start-render.d.ts +35 -0
- package/dist/tools-logic/session-start-render.d.ts.map +1 -0
- package/dist/tools-logic/session-start-render.js +240 -0
- package/dist/tools-logic/session-start-render.js.map +1 -0
- package/dist/tools-logic/session-start.d.ts +21 -0
- package/dist/tools-logic/session-start.d.ts.map +1 -1
- package/dist/tools-logic/session-start.js +279 -225
- package/dist/tools-logic/session-start.js.map +1 -1
- package/dist/tools-logic/smart-recall.d.ts +60 -0
- package/dist/tools-logic/smart-recall.d.ts.map +1 -1
- package/dist/tools-logic/smart-recall.js +221 -31
- package/dist/tools-logic/smart-recall.js.map +1 -1
- package/dist/tools-logic/smart-remember-vector.d.ts +3 -1
- package/dist/tools-logic/smart-remember-vector.d.ts.map +1 -1
- package/dist/tools-logic/smart-remember-vector.js +3 -1
- package/dist/tools-logic/smart-remember-vector.js.map +1 -1
- package/dist/tools-logic/smart-remember.d.ts.map +1 -1
- package/dist/tools-logic/smart-remember.js +8 -5
- package/dist/tools-logic/smart-remember.js.map +1 -1
- package/dist/types.d.ts +98 -2
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +164 -3
- package/dist/types.js.map +1 -1
- package/dist/vector/embedding.d.ts +20 -1
- package/dist/vector/embedding.d.ts.map +1 -1
- package/dist/vector/embedding.js +30 -1
- package/dist/vector/embedding.js.map +1 -1
- package/dist/vector/local-vector-backend.d.ts +4 -1
- package/dist/vector/local-vector-backend.d.ts.map +1 -1
- package/dist/vector/local-vector-backend.js +7 -3
- package/dist/vector/local-vector-backend.js.map +1 -1
- package/package.json +59 -59
package/dist/storage/filelock.js
CHANGED
|
@@ -72,7 +72,7 @@ import * as fs from "node:fs";
|
|
|
72
72
|
import * as os from "node:os";
|
|
73
73
|
import * as path from "node:path";
|
|
74
74
|
import { getRoot } from "../types.js";
|
|
75
|
-
import { ensureDir } from "./fs-utils.js";
|
|
75
|
+
import { ensureDir, lockDebug } from "./fs-utils.js";
|
|
76
76
|
const LOCK_TIMEOUT_MS = 5000;
|
|
77
77
|
/**
|
|
78
78
|
* A lock dir with NO readable owner.json (legacy pre-pid code, or a crash in
|
|
@@ -141,18 +141,25 @@ function readOwner(dir) {
|
|
|
141
141
|
return null;
|
|
142
142
|
}
|
|
143
143
|
}
|
|
144
|
-
/** Signal-0 liveness probe. EPERM means "alive but not ours" — still alive
|
|
145
|
-
|
|
144
|
+
/** Signal-0 liveness probe. EPERM means "alive but not ours" — still alive
|
|
145
|
+
* (fail closed: only a definitive ESRCH-class "no such process" reads as
|
|
146
|
+
* dead). Returns the errno so the A14 debug channel can report WHY a reclaim
|
|
147
|
+
* decision was made. */
|
|
148
|
+
function probePid(pid) {
|
|
146
149
|
if (!Number.isInteger(pid) || pid <= 0)
|
|
147
|
-
return false;
|
|
150
|
+
return { alive: false, errno: "bad-pid" };
|
|
148
151
|
try {
|
|
149
152
|
process.kill(pid, 0);
|
|
150
|
-
return true;
|
|
153
|
+
return { alive: true };
|
|
151
154
|
}
|
|
152
155
|
catch (err) {
|
|
153
|
-
|
|
156
|
+
const code = err.code;
|
|
157
|
+
return { alive: code === "EPERM", errno: code };
|
|
154
158
|
}
|
|
155
159
|
}
|
|
160
|
+
function isPidAlive(pid) {
|
|
161
|
+
return probePid(pid).alive;
|
|
162
|
+
}
|
|
156
163
|
/**
|
|
157
164
|
* Review MEDIUM-1 (2026-09-11): pid liveness alone cannot distinguish the
|
|
158
165
|
* original holder from an UNRELATED process that recycled the pid after a
|
|
@@ -182,8 +189,21 @@ function tryReclaim(dir) {
|
|
|
182
189
|
// Live holder from THIS boot — NEVER steal. A pre-boot acquired_at means
|
|
183
190
|
// the "live" pid is a post-reboot recycle, not the holder (see
|
|
184
191
|
// predatesBoot's doc comment).
|
|
185
|
-
|
|
192
|
+
const probe = probePid(owner.pid);
|
|
193
|
+
const preBoot = predatesBoot(owner.acquired_at);
|
|
194
|
+
// released:true = the holder COMPLETED its critical section but could not
|
|
195
|
+
// remove the dir (see LockOwner.released) — reclaimable regardless of
|
|
196
|
+
// pid liveness; there is no mid-write to protect.
|
|
197
|
+
if (!owner.released && probe.alive && !preBoot)
|
|
186
198
|
return false;
|
|
199
|
+
lockDebug("reclaim", {
|
|
200
|
+
lock: path.basename(dir),
|
|
201
|
+
reason: owner.released ? "released-tombstone" : probe.alive ? "pre-boot-pid" : "dead-pid",
|
|
202
|
+
owner_pid: owner.pid,
|
|
203
|
+
probe_alive: probe.alive,
|
|
204
|
+
probe_errno: probe.errno,
|
|
205
|
+
acquired_at: owner.acquired_at,
|
|
206
|
+
});
|
|
187
207
|
}
|
|
188
208
|
else {
|
|
189
209
|
// No owner record: legacy lock or crash inside the mkdir→owner-write
|
|
@@ -197,6 +217,11 @@ function tryReclaim(dir) {
|
|
|
197
217
|
}
|
|
198
218
|
if (Date.now() - stat.mtimeMs <= STALE_LOCK_MS)
|
|
199
219
|
return false;
|
|
220
|
+
lockDebug("reclaim", {
|
|
221
|
+
lock: path.basename(dir),
|
|
222
|
+
reason: "legacy-stale",
|
|
223
|
+
age_ms: Math.round(Date.now() - stat.mtimeMs),
|
|
224
|
+
});
|
|
200
225
|
}
|
|
201
226
|
const trash = `${dir}.reclaim-${process.pid}-${Date.now()}`;
|
|
202
227
|
try {
|
|
@@ -247,8 +272,21 @@ function tryReclaim(dir) {
|
|
|
247
272
|
* Only EEXIST means "contended"; ENOENT (store root vanished) is repaired and
|
|
248
273
|
* retried; any OTHER error (EACCES/EROFS/EMFILE, …) is rethrown immediately —
|
|
249
274
|
* spinning 5 s on a read-only store and then reporting "held by a live
|
|
250
|
-
* process" would misdiagnose an environment problem as contention.
|
|
251
|
-
|
|
275
|
+
* process" would misdiagnose an environment problem as contention.
|
|
276
|
+
*
|
|
277
|
+
* win32 EXCEPTION (A10, 2026-10-11): on Windows, mkdir of a name whose
|
|
278
|
+
* previous incarnation is DELETE-PENDING (another process's release/reclaim
|
|
279
|
+
* rmSync has started but the handle isn't fully closed) fails with EPERM,
|
|
280
|
+
* not EEXIST — a transient contention artefact of NTFS delete semantics,
|
|
281
|
+
* observed crashing audit-outcome-concurrency workers once the
|
|
282
|
+
* progress-aware deadline increased acquire/release churn. On win32 ONLY,
|
|
283
|
+
* EPERM is therefore treated as "contended" (retry), recorded in the
|
|
284
|
+
* optional `diag` out-param; acquireLock rethrows the ORIGINAL EPERM at
|
|
285
|
+
* timeout when no owner record was ever observed during the whole wait
|
|
286
|
+
* (a genuinely permission-denied store, not contention — A10 review FIX 1),
|
|
287
|
+
* so the error type stays truthful on both platforms. POSIX behavior is
|
|
288
|
+
* unchanged (strict immediate rethrow). */
|
|
289
|
+
function tryAcquire(dir, diag) {
|
|
252
290
|
try {
|
|
253
291
|
fs.mkdirSync(dir, { recursive: false });
|
|
254
292
|
}
|
|
@@ -272,14 +310,31 @@ function tryAcquire(dir) {
|
|
|
272
310
|
else if (code === "EEXIST") {
|
|
273
311
|
return null;
|
|
274
312
|
}
|
|
313
|
+
else if (code === "EPERM" && process.platform === "win32") {
|
|
314
|
+
// Delete-pending collision — see doc comment above. Record the error
|
|
315
|
+
// so acquireLock can tell a genuine permission failure (EPERM retried
|
|
316
|
+
// for the whole wait with NO owner ever observed) from real contention
|
|
317
|
+
// and rethrow the original at timeout (A10 review FIX 1).
|
|
318
|
+
if (diag)
|
|
319
|
+
diag.eperm = err;
|
|
320
|
+
return null;
|
|
321
|
+
}
|
|
275
322
|
else {
|
|
276
323
|
throw err;
|
|
277
324
|
}
|
|
278
325
|
}
|
|
326
|
+
// Kept for the release closure's tombstone TOCTOU check (A14 review FIX 3):
|
|
327
|
+
// the tombstone may only be written over EXACTLY this record.
|
|
328
|
+
let myOwner = { pid: process.pid, acquired_at: new Date().toISOString() };
|
|
279
329
|
try {
|
|
280
|
-
fs.writeFileSync(ownerPath(dir), JSON.stringify(
|
|
330
|
+
fs.writeFileSync(ownerPath(dir), JSON.stringify(myOwner), "utf-8");
|
|
281
331
|
}
|
|
282
|
-
catch {
|
|
332
|
+
catch (err) {
|
|
333
|
+
myOwner = null; // identity unverifiable — the release closure never tombstones
|
|
334
|
+
lockDebug("owner-write-failed", {
|
|
335
|
+
lock: path.basename(dir),
|
|
336
|
+
errno: err.code,
|
|
337
|
+
});
|
|
283
338
|
// Owner record is advisory: without it the lock degrades to the legacy
|
|
284
339
|
// mtime staleness rule instead of pid-liveness. NOTE (review LOW-2): in
|
|
285
340
|
// this degraded mode a LIVE holder that keeps the lock past STALE_LOCK_MS
|
|
@@ -298,10 +353,55 @@ function tryAcquire(dir) {
|
|
|
298
353
|
if (owner && owner.pid !== process.pid)
|
|
299
354
|
return;
|
|
300
355
|
try {
|
|
301
|
-
|
|
356
|
+
// maxRetries is best-effort belt-and-braces (bounded, ~10*20ms linear
|
|
357
|
+
// backoff); in the observed failure shapes (dir pinned by a CWD or an
|
|
358
|
+
// AV scan) the retries do NOT ride out the pin — the tombstone below is
|
|
359
|
+
// the mechanism that actually heals the lock (A14 review).
|
|
360
|
+
fs.rmSync(dir, { recursive: true, force: true, maxRetries: 10, retryDelay: 20 });
|
|
302
361
|
}
|
|
303
|
-
catch {
|
|
304
|
-
|
|
362
|
+
catch (err) {
|
|
363
|
+
const errno = err.code;
|
|
364
|
+
// A14 root cause (CI run 38255969731): swallowing this left a stale
|
|
365
|
+
// lock dir that waiters misdiagnosed for 5-60s each, and check()'s
|
|
366
|
+
// contention-skip dropped 28/40 alignment records. Tombstone the owner
|
|
367
|
+
// record (released: true) so the very next reclaim attempt may take the
|
|
368
|
+
// lock the moment the external pin lifts — and say it loudly; a silent
|
|
369
|
+
// release failure costs every other process real time.
|
|
370
|
+
let tombstoned = false;
|
|
371
|
+
if (fs.existsSync(dir)) {
|
|
372
|
+
// TOCTOU re-read (A14 review FIX 3, mirrors tryReclaim's rename-aside
|
|
373
|
+
// verify): between this closure's entry read and here, the wreckage
|
|
374
|
+
// may have been reclaimed and RE-ACQUIRED — by this very pid, too
|
|
375
|
+
// (another async task in this process), which the entry pid-guard
|
|
376
|
+
// cannot distinguish. Tombstone only when owner.json still holds
|
|
377
|
+
// EXACTLY the record this acquire wrote (pid + acquired_at); marking
|
|
378
|
+
// anyone else's live hold released would steal their lock. The
|
|
379
|
+
// ownerless shape (our rmSync removed owner.json before failing on
|
|
380
|
+
// the dir) is also left alone — indistinguishable from a fresh
|
|
381
|
+
// holder's mkdir→owner-write window; it falls back to the
|
|
382
|
+
// STALE_LOCK_MS mtime rule, and the DATA is safe either way (the
|
|
383
|
+
// append fallback in check()/processFeedback).
|
|
384
|
+
const current = readOwner(dir);
|
|
385
|
+
const stillOurs = myOwner !== null && current !== null &&
|
|
386
|
+
current.pid === myOwner.pid && current.acquired_at === myOwner.acquired_at;
|
|
387
|
+
if (stillOurs) {
|
|
388
|
+
try {
|
|
389
|
+
fs.writeFileSync(ownerPath(dir), JSON.stringify({ ...myOwner, released: true }), "utf-8");
|
|
390
|
+
tombstoned = true;
|
|
391
|
+
}
|
|
392
|
+
catch {
|
|
393
|
+
/* tombstone write blocked too — mtime staleness remains the backstop */
|
|
394
|
+
}
|
|
395
|
+
}
|
|
396
|
+
console.error(`[agent-recall] filelock: release of "${path.basename(dir)}" could not remove the lock dir ` +
|
|
397
|
+
`(${errno}) — ${tombstoned ? "tombstoned for immediate reclaim" : `not tombstoned (record no longer ours, or write blocked); reclaim falls back to the ${STALE_LOCK_MS}ms staleness rule`}.`);
|
|
398
|
+
}
|
|
399
|
+
lockDebug("release-failed", {
|
|
400
|
+
lock: path.basename(dir),
|
|
401
|
+
errno,
|
|
402
|
+
dir_still_exists: fs.existsSync(dir),
|
|
403
|
+
tombstoned,
|
|
404
|
+
});
|
|
305
405
|
}
|
|
306
406
|
};
|
|
307
407
|
}
|
|
@@ -314,30 +414,106 @@ function sleep(ms) {
|
|
|
314
414
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
315
415
|
}
|
|
316
416
|
/**
|
|
317
|
-
* Acquire a named lock. Retries with async (event-loop-friendly) backoff
|
|
318
|
-
*
|
|
319
|
-
*
|
|
417
|
+
* Acquire a named lock. Retries with async (event-loop-friendly) backoff;
|
|
418
|
+
* reclaims dead-holder / legacy-stale locks; throws LockContentionError only
|
|
419
|
+
* when the lock makes NO PROGRESS for LOCK_TIMEOUT_MS (same holder the whole
|
|
420
|
+
* time — a wedged process), or after MAX_TOTAL_WAIT_MS outright.
|
|
421
|
+
*
|
|
422
|
+
* PROGRESS-AWARE DEADLINE (A10 Linux-CI fix, 2026-10-11): the old fixed
|
|
423
|
+
* `now + 5s` deadline measured TOTAL wait, so under heavy-but-healthy
|
|
424
|
+
* contention (N processes serializing short critical sections through one
|
|
425
|
+
* lock — the audit-outcome-concurrency stress shape) a waiter near the back
|
|
426
|
+
* of the herd timed out even though the lock was changing hands every few
|
|
427
|
+
* milliseconds. Callers like recordOutcome treat LockContentionError as
|
|
428
|
+
* "skip the materialized-counter update" (by design: ledger stays lossless),
|
|
429
|
+
* so every such spurious timeout became a silently lost counter increment
|
|
430
|
+
* (reproduced: 480-event stress runs materialized 461-476). The timeout's
|
|
431
|
+
* actual job is detecting a WEDGED holder, so the deadline now resets every
|
|
432
|
+
* time the observed owner (pid + acquired_at) changes: a live, churning lock
|
|
433
|
+
* is waited on; a holder that sits on the lock for LOCK_TIMEOUT_MS without
|
|
434
|
+
* releasing still times out exactly as before (the "never steal from a live
|
|
435
|
+
* holder" filelock test is unchanged). MAX_TOTAL_WAIT_MS bounds the absolute
|
|
436
|
+
* worst case so a hot path can never hang indefinitely behind a pathological
|
|
437
|
+
* ping-pong.
|
|
320
438
|
* Returns a release function (idempotent).
|
|
321
439
|
*/
|
|
322
|
-
|
|
440
|
+
const MAX_TOTAL_WAIT_MS = 60_000;
|
|
441
|
+
export async function acquireLock(name, opts = {}) {
|
|
323
442
|
const dir = lockDir(name);
|
|
324
|
-
const
|
|
443
|
+
const startedAt = Date.now();
|
|
444
|
+
let deadline = startedAt + LOCK_TIMEOUT_MS;
|
|
445
|
+
const hardDeadline = startedAt + (opts.maxTotalWaitMs ?? MAX_TOTAL_WAIT_MS);
|
|
446
|
+
let lastOwnerKey = null;
|
|
447
|
+
let polls = 0;
|
|
448
|
+
let reclaimed = false;
|
|
325
449
|
// Ensure root dir exists before attempting lock
|
|
326
450
|
ensureDir(path.dirname(dir));
|
|
327
451
|
let delay = 5;
|
|
452
|
+
const diag = {};
|
|
328
453
|
for (;;) {
|
|
329
|
-
const release = tryAcquire(dir);
|
|
330
|
-
if (release)
|
|
454
|
+
const release = tryAcquire(dir, diag);
|
|
455
|
+
if (release) {
|
|
456
|
+
lockDebug("acquired", {
|
|
457
|
+
lock: name,
|
|
458
|
+
path: polls === 0 ? "immediate" : reclaimed ? "reclaimed" : "waited",
|
|
459
|
+
wait_ms: Date.now() - startedAt,
|
|
460
|
+
polls,
|
|
461
|
+
last_holder: lastOwnerKey,
|
|
462
|
+
});
|
|
331
463
|
return release;
|
|
332
|
-
|
|
464
|
+
}
|
|
465
|
+
polls += 1;
|
|
466
|
+
// Progress detection: a change of owner (pid or acquired_at) since the
|
|
467
|
+
// last look means the lock is live — reset the no-progress deadline.
|
|
468
|
+
// An unreadable owner.json (legacy/crash lock) never counts as progress,
|
|
469
|
+
// so that branch keeps the original fixed-timeout behavior.
|
|
470
|
+
const owner = readOwner(dir);
|
|
471
|
+
const ownerKey = owner ? `${owner.pid}:${owner.acquired_at}` : null;
|
|
472
|
+
if (ownerKey !== null && ownerKey !== lastOwnerKey) {
|
|
473
|
+
if (lastOwnerKey !== null)
|
|
474
|
+
deadline = Date.now() + LOCK_TIMEOUT_MS;
|
|
475
|
+
lastOwnerKey = ownerKey;
|
|
476
|
+
}
|
|
477
|
+
// waitForLiveHolder mode: a holder that probes alive (and is from this
|
|
478
|
+
// boot — predatesBoot pids are recycles, handled by tryReclaim below) is
|
|
479
|
+
// WAITED ON, not misdiagnosed as wedged; keep pushing the no-progress
|
|
480
|
+
// deadline while it lives. The hardDeadline check below still bounds the
|
|
481
|
+
// absolute worst case, and an unreadable owner record (legacy/crash lock)
|
|
482
|
+
// deliberately gets NO reset — same as the progress detector above.
|
|
483
|
+
if (opts.waitForLiveHolder && owner && !owner.released &&
|
|
484
|
+
isPidAlive(owner.pid) && !predatesBoot(owner.acquired_at)) {
|
|
485
|
+
deadline = Date.now() + LOCK_TIMEOUT_MS;
|
|
486
|
+
}
|
|
487
|
+
// Deadlines are checked BEFORE the reclaim-retry shortcut so the loop is
|
|
333
488
|
// always bounded — a pathological reclaim-always-true state (e.g. the
|
|
334
489
|
// store root being deleted out from under us) can never spin forever.
|
|
335
|
-
if (Date.now() >= deadline) {
|
|
490
|
+
if (Date.now() >= deadline || Date.now() >= hardDeadline) {
|
|
491
|
+
// A wait that expires having NEVER seen an owner record, with EPERM
|
|
492
|
+
// being retried as "delete-pending contention", was not contended at
|
|
493
|
+
// all — it is a genuine win32 permission problem (read-only store,
|
|
494
|
+
// ACL deny). Surface the original error instead of a fabricated
|
|
495
|
+
// contention claim. (A truly churning lock writes owner.json on every
|
|
496
|
+
// handoff, so some poll in the 5 s window reads one; delete-pending
|
|
497
|
+
// transients last milliseconds, never 5 s.) A10 review FIX 1.
|
|
498
|
+
lockDebug("contention", {
|
|
499
|
+
lock: name,
|
|
500
|
+
waited_ms: Date.now() - startedAt,
|
|
501
|
+
polls,
|
|
502
|
+
hard_cap_hit: Date.now() >= hardDeadline,
|
|
503
|
+
last_holder: lastOwnerKey,
|
|
504
|
+
owner_now: owner ? `${owner.pid}:${owner.acquired_at}` : null,
|
|
505
|
+
eperm_seen: Boolean(diag.eperm),
|
|
506
|
+
wait_for_live_holder: Boolean(opts.waitForLiveHolder),
|
|
507
|
+
});
|
|
508
|
+
if (lastOwnerKey === null && diag.eperm)
|
|
509
|
+
throw diag.eperm;
|
|
336
510
|
throw contentionError(name, dir);
|
|
337
511
|
}
|
|
338
512
|
// Held. Dead holder (or legacy-stale dir) → reclaim and retry at once.
|
|
339
|
-
if (tryReclaim(dir))
|
|
513
|
+
if (tryReclaim(dir)) {
|
|
514
|
+
reclaimed = true;
|
|
340
515
|
continue;
|
|
516
|
+
}
|
|
341
517
|
await sleep(Math.min(delay, Math.max(1, deadline - Date.now())));
|
|
342
518
|
delay = Math.min(delay * 2, MAX_BACKOFF_MS);
|
|
343
519
|
}
|
|
@@ -348,8 +524,8 @@ export async function acquireLock(name) {
|
|
|
348
524
|
* hold); an async fn is allowed only for the documented awareness nesting —
|
|
349
525
|
* see the header's lock-ordering section.
|
|
350
526
|
*/
|
|
351
|
-
export async function withLock(name, fn) {
|
|
352
|
-
const release = await acquireLock(name);
|
|
527
|
+
export async function withLock(name, fn, opts = {}) {
|
|
528
|
+
const release = await acquireLock(name, opts);
|
|
353
529
|
try {
|
|
354
530
|
return await fn();
|
|
355
531
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filelock.js","sourceRoot":"","sources":["../../src/storage/filelock.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"filelock.js","sourceRoot":"","sources":["../../src/storage/filelock.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
/** Shared frontmatter reader for the identity and state cards: BOM- and CRLF-tolerant, never throws. */
|
|
2
|
+
/** Strips one leading UTF-8 BOM (Notepad, PowerShell) and normalizes CRLF to LF; nothing else. */
|
|
3
|
+
export declare const normalizeCardText: (text: string) => string;
|
|
4
|
+
export interface Frontmatter {
|
|
5
|
+
fields: Map<string, string>;
|
|
6
|
+
body: string;
|
|
7
|
+
}
|
|
8
|
+
/**
|
|
9
|
+
* A `---` block at the very start of the (normalized) text → its `key: value` fields and the body after the closing `---`.
|
|
10
|
+
* Values keep inner colons and lose a trailing ` # comment` plus surrounding whitespace; lines without a colon are skipped.
|
|
11
|
+
* null when the text does not open with a complete block — the caller decides whether that means "malformed" or "no card".
|
|
12
|
+
*/
|
|
13
|
+
export declare function parseFrontmatter(text: string): Frontmatter | null;
|
|
14
|
+
//# sourceMappingURL=frontmatter.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"frontmatter.d.ts","sourceRoot":"","sources":["../../src/storage/frontmatter.ts"],"names":[],"mappings":"AAAA,wGAAwG;AAExG,kGAAkG;AAClG,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,KAAG,MAA4D,CAAC;AAE9G,MAAM,WAAW,WAAW;IAAG,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE;AAE1E;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAUjE"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/** Shared frontmatter reader for the identity and state cards: BOM- and CRLF-tolerant, never throws. */
|
|
2
|
+
/** Strips one leading UTF-8 BOM (Notepad, PowerShell) and normalizes CRLF to LF; nothing else. */
|
|
3
|
+
export const normalizeCardText = (text) => text.replace(/^\uFEFF/, "").replace(/\r\n/g, "\n");
|
|
4
|
+
/**
|
|
5
|
+
* A `---` block at the very start of the (normalized) text → its `key: value` fields and the body after the closing `---`.
|
|
6
|
+
* Values keep inner colons and lose a trailing ` # comment` plus surrounding whitespace; lines without a colon are skipped.
|
|
7
|
+
* null when the text does not open with a complete block — the caller decides whether that means "malformed" or "no card".
|
|
8
|
+
*/
|
|
9
|
+
export function parseFrontmatter(text) {
|
|
10
|
+
const m = /^---\n([\s\S]*?)\n---(?:\n|$)([\s\S]*)$/.exec(normalizeCardText(text));
|
|
11
|
+
if (!m)
|
|
12
|
+
return null;
|
|
13
|
+
const fields = new Map();
|
|
14
|
+
for (const line of m[1].split("\n")) {
|
|
15
|
+
const i = line.indexOf(":");
|
|
16
|
+
// `\s#` (one whitespace char, then #) is linear; `\s+#` backtracks quadratically on a long run of spaces — a poisoned card could stall session_start.
|
|
17
|
+
if (i > 0)
|
|
18
|
+
fields.set(line.slice(0, i).trim(), line.slice(i + 1).replace(/\s#.*$/, "").trim());
|
|
19
|
+
}
|
|
20
|
+
return { fields, body: m[2] };
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=frontmatter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"frontmatter.js","sourceRoot":"","sources":["../../src/storage/frontmatter.ts"],"names":[],"mappings":"AAAA,wGAAwG;AAExG,kGAAkG;AAClG,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AAI9G;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,MAAM,CAAC,GAAG,yCAAyC,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;IAClF,IAAI,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IACpB,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IACzC,KAAK,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACpC,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC5B,sJAAsJ;QACtJ,IAAI,CAAC,GAAG,CAAC;YAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACjG,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAChC,CAAC"}
|
|
@@ -14,7 +14,58 @@ export declare function todayISO(): string;
|
|
|
14
14
|
* date-in-filename writer) apply the SAME rule (class-not-instance).
|
|
15
15
|
*/
|
|
16
16
|
export declare function safeIsoDateOrToday(date: string | undefined | null): string;
|
|
17
|
+
/** True when the file's content starts with a JSON array bracket — the
|
|
18
|
+
* legacy whole-array format of the append-only NDJSON stores (A14:
|
|
19
|
+
* alignment-log.json, feedback-log.json). Reads 16 bytes, not the file. */
|
|
20
|
+
export declare function isLegacyJsonArrayFile(p: string): boolean;
|
|
17
21
|
export declare function readJsonSafe<T>(filePath: string): T | null;
|
|
22
|
+
/**
|
|
23
|
+
* A14 diagnostics channel (2026-10-12, CI run 38255969731): one NDJSON line
|
|
24
|
+
* per event on stderr, prefix "ARLOCKDBG", gated on AGENT_RECALL_LOCK_DEBUG=1.
|
|
25
|
+
* Shared by filelock.ts (acquire path / reclaim decision / contention /
|
|
26
|
+
* release failure) and renameAtomic (retry storms) so a failing concurrency
|
|
27
|
+
* run on an unreachable CI runner tells us WHICH mechanism lost the records
|
|
28
|
+
* instead of only how many. Read lazily (not at module load) so tests that
|
|
29
|
+
* set the env after import still get the stream. Never throws.
|
|
30
|
+
*/
|
|
31
|
+
export declare function lockDebug(ev: string, fields: Record<string, unknown>): void;
|
|
32
|
+
/**
|
|
33
|
+
* Total win32 transient-rename retry budget. 5s, not the original ~1s (A13,
|
|
34
|
+
* CI run 38251553161): on a loaded 2-vCPU GitHub runner, a holder that
|
|
35
|
+
* intended a ~400ms window kept the destination open past the entire ~1s
|
|
36
|
+
* backoff (the rename-retry test's own PowerShell reader — its close drifted
|
|
37
|
+
* >600ms under scheduler pressure; even idle on a fast desktop the drift
|
|
38
|
+
* measures ~80ms). Real-world holders are no gentler: antivirus/indexer
|
|
39
|
+
* scans commonly pin a just-written file for 100ms–2s. The 5s worst case is
|
|
40
|
+
* only ever PAID when the rename is genuinely blocked the whole time —
|
|
41
|
+
* uncontended renames (the overwhelmingly common case) succeed on the first
|
|
42
|
+
* attempt and never sleep — and after the budget the original error still
|
|
43
|
+
* surfaces (exported so the regression test derives its assertions from the
|
|
44
|
+
* real value instead of a copy that can drift).
|
|
45
|
+
*/
|
|
46
|
+
export declare const RENAME_RETRY_BUDGET_MS = 5000;
|
|
47
|
+
/**
|
|
48
|
+
* renameSync with a BOUNDED win32-only retry for transient sharing-violation
|
|
49
|
+
* errors (CI/parallel-suite flake, 2026-10-12): every atomic write here is
|
|
50
|
+
* tmp-write + rename, and readers of these files are deliberately LOCK-FREE
|
|
51
|
+
* (readAlignmentLog in session_start, readCorrections on hot paths, check()'s
|
|
52
|
+
* similar-past-deltas scan). On NTFS, renaming OVER a destination that any
|
|
53
|
+
* process holds open without FILE_SHARE_DELETE — a concurrent lock-free
|
|
54
|
+
* reader, an antivirus/indexer scan — fails with EPERM/EACCES/EBUSY for the
|
|
55
|
+
* few ms the handle lives. That is a TRANSIENT, not a permission problem
|
|
56
|
+
* (same NTFS semantics as filelock.ts's A10 delete-pending EPERM note), and
|
|
57
|
+
* it intermittently failed alignment-log-concurrency under full-suite load:
|
|
58
|
+
* EPERM: operation not permitted, rename '…alignment-log.json.tmp.N' →
|
|
59
|
+
* '…alignment-log.json'
|
|
60
|
+
* Exponential backoff 10→250ms (capped), 5s total (see
|
|
61
|
+
* RENAME_RETRY_BUDGET_MS for why ~1s lost to a slow CI runner), then rethrow
|
|
62
|
+
* — anything outlasting the budget is a real environment problem the caller
|
|
63
|
+
* must see. The budget counts REQUESTED sleep, not wall clock, so a
|
|
64
|
+
* descheduled process still waits at least the full budget. POSIX renames
|
|
65
|
+
* over open files simply succeed, so the retry path is unreachable there
|
|
66
|
+
* (hence "atomic on POSIX" never needed this).
|
|
67
|
+
*/
|
|
68
|
+
export declare function renameAtomic(oldPath: string, newPath: string): void;
|
|
18
69
|
export declare function writeJsonAtomic(filePath: string, data: unknown): void;
|
|
19
70
|
/**
|
|
20
71
|
* Atomic PRE-SERIALIZED text write (tmp + rename) — for callers that must
|
|
@@ -25,6 +76,8 @@ export declare function writeJsonAtomic(filePath: string, data: unknown): void;
|
|
|
25
76
|
* closes that without requiring readers to lock.
|
|
26
77
|
*/
|
|
27
78
|
export declare function writeTextAtomic(filePath: string, text: string): void;
|
|
79
|
+
/** Cards v1 — unique tmp (pid+random) so concurrent writers never share one; tmp removed if the rename fails. */
|
|
80
|
+
export declare function writeTextAtomicPrivate(filePath: string, text: string): void;
|
|
28
81
|
/**
|
|
29
82
|
* Largest N in [0, buf.length] such that `buf.subarray(0, N)` never ends
|
|
30
83
|
* mid-way through a multi-byte UTF-8 sequence. Used both for a plain
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs-utils.d.ts","sourceRoot":"","sources":["../../src/storage/fs-utils.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"fs-utils.d.ts","sourceRoot":"","sources":["../../src/storage/fs-utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAMH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAI3C;AAED,wBAAgB,QAAQ,IAAI,MAAM,CAEjC;AAED;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,MAAM,CAE1E;AAED;;2EAE2E;AAC3E,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAUxD;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,GAAG,IAAI,CAO1D;AAUD;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAS3E;AAED;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,sBAAsB,OAAQ,CAAC;AAM5C;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAkCnE;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,IAAI,CAKrE;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAKpE;AAED,iHAAiH;AACjH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAK3E;AAgBD;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAuCzE;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAIzE;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKzE"}
|