@rotorsoft/act 1.32.5 → 1.32.6

package/dist/@types/act.d.ts

@@ -394,9 +394,9 @@ export declare class Act<TSchemaReg extends SchemaRegister<TActions>, TEvents ex
      */
     private readonly _close_locks;
     /**
-     * Run `work` under the per-stream close lock (#1222). Serializes
-     * windowed-close critical sections for the same stream while letting
-     * different streams proceed in parallel.
+     * Run `work` under the per-stream close lock (#1222). Serializes close
+     * critical sections for the same stream (windowed prunes, and full closes
+     * since #1738) while letting different streams proceed in parallel.
      */
     private _with_close_lock;
     /** Drain lanes declared via `.withLane(...)`. Implicit default not included. */

package/dist/@types/internal/close-cycle.d.ts

@@ -70,9 +70,13 @@ export type CloseCycleDeps = {
      * same prefix — a double S3 upload / double JSONL append. This runs the
      * given work under a process-local per-stream lock so the two closers
      * serialize; the second sees the already-pruned prefix and skips its
-     * archive. Provided by the Act orchestrator (shared across `app.close`
-     * and the drain's `on_close`); defaults to identity (no serialization)
-     * when the cycle is exercised in isolation.
+     * archive. The full (tombstone/restart) path takes the same lock for
+     * every stream it closes: without it, a second full closer that arrives
+     * while the first is archiving mistakes the first closer's tombstone for
+     * an interrupted close, resumes it, and both archive and truncate (#1738).
+     * Provided by the Act orchestrator (shared across `app.close` and the
+     * drain's `on_close`); defaults to identity (no serialization) when the
+     * cycle is exercised in isolation.
      */
     readonly with_stream_lock?: <T>(stream: string, work: () => Promise<T>) => Promise<T>;
 };

package/dist/@types/internal/close-cycle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"close-cycle.d.ts","sourceRoot":"","sources":["../../../src/internal/close-cycle.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EACX,MAAM,EAEN,KAAK,EACN,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAEjD;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,cAAc,EAAE,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IACnE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;IACvC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B;;;;OAIG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC;;;;;;;;;;;;;;;;;OAiBG;IACH,QAAQ,CAAC,oBAAoB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAClE;;;;;;;;;;;;;;OAcG;IACH,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,EAC5B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KACnB,OAAO,CAAC,CAAC,CAAC,CAAC;CACjB,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,OAAO,CAAC;AAuB3C;;;;;;;;;;GAUG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,WAAW,EAAE,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,WAAW,CAAC,CA+FtB"}
+{"version":3,"file":"close-cycle.d.ts","sourceRoot":"","sources":["../../../src/internal/close-cycle.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EACX,MAAM,EAEN,KAAK,EACN,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAEjD;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,cAAc,EAAE,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IACnE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;IACvC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B;;;;OAIG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC;;;;;;;;;;;;;;;;;OAiBG;IACH,QAAQ,CAAC,oBAAoB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAClE;;;;;;;;;;;;;;;;;;OAkBG;IACH,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,EAC5B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KACnB,OAAO,CAAC,CAAC,CAAC,CAAC;CACjB,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,OAAO,CAAC;AAuB3C;;;;;;;;;;GAUG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,WAAW,EAAE,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,WAAW,CAAC,CA0BtB"}

package/dist/index.cjs

@@ -2720,6 +2720,23 @@ async function run_close_cycle(targets, deps) {
   const skipped = [];
   const windowed_result = windowed.length ? await run_windowed_closes(windowed, deps, skipped) : /* @__PURE__ */ new Map();
   if (!full.length) return { truncated: windowed_result, skipped };
+  const truncated = await with_stream_locks(
+    full.map((t) => t.stream),
+    deps,
+    () => run_full_closes(full, target_map, deps, skipped)
+  );
+  for (const [stream, entry] of windowed_result) truncated.set(stream, entry);
+  return { truncated, skipped };
+}
+function with_stream_locks(streams, deps, work) {
+  const with_lock = deps.with_stream_lock ?? ((_stream, w) => w());
+  return [...streams].sort().reduceRight(
+    (inner, stream) => () => with_lock(stream, inner),
+    work
+  )();
+}
+async function run_full_closes(full, target_map, deps, skipped) {
+  const none = /* @__PURE__ */ new Map();
   const streams = full.map((t) => t.stream);
   const stream_info = await scan_stream_heads(streams);
   for (const target of full) {
@@ -2742,7 +2759,7 @@ async function run_close_cycle(targets, deps) {
     deps.probe_page_size ?? SAFETY_PROBE_PAGE_SIZE,
     deps.catch_up_correlation
   );
-  if (!safe.length) return { truncated: windowed_result, skipped };
+  if (!safe.length) return none;
   const { guarded, guard_events } = await guard_with_tombstones(
     safe,
     stream_info,
@@ -2750,7 +2767,7 @@ async function run_close_cycle(targets, deps) {
     deps.tombstone,
     skipped
   );
-  if (!guarded.length) return { truncated: windowed_result, skipped };
+  if (!guarded.length) return none;
   const seed_states = await load_restart_seeds(
     guarded,
     target_map,
@@ -2760,14 +2777,18 @@ async function run_close_cycle(targets, deps) {
     deps.logger
   );
   await run_archive_callbacks(guarded, target_map);
-  const truncated = await truncate_and_warm_cache(
+  const still_guarded = await heads_still_guarded(
     guarded,
+    guard_events,
+    skipped
+  );
+  if (!still_guarded.length) return none;
+  return truncate_and_warm_cache(
+    still_guarded,
     seed_states,
     guard_events,
     deps.correlation
   );
-  for (const [stream, entry] of windowed_result) truncated.set(stream, entry);
-  return { truncated, skipped };
 }
 async function run_windowed_closes(windowed, deps, skipped) {
   const checkpoint = deps.reactive_events_size > 0 ? await deps.catch_up_correlation(Number.MAX_SAFE_INTEGER) : -1;
@@ -2957,6 +2978,15 @@ async function run_archive_callbacks(guarded, target_map) {
     if (archive_fn) await archive_fn();
   }
 }
+async function heads_still_guarded(guarded, guard_events, skipped) {
+  const heads = await store2().query_stats(guarded, {});
+  return guarded.filter((stream) => {
+    if (heads.get(stream)?.head.id === guard_events.get(stream).id)
+      return true;
+    skipped.push(stream);
+    return false;
+  });
+}
 async function truncate_and_warm_cache(guarded, seed_states, guard_events, correlation) {
   const trunc_targets = guarded.map((stream) => {
     const snapshot = seed_states.get(stream);
@@ -5231,9 +5261,9 @@ var Act = class {
    */
   _close_locks = /* @__PURE__ */ new Map();
   /**
-   * Run `work` under the per-stream close lock (#1222). Serializes
-   * windowed-close critical sections for the same stream while letting
-   * different streams proceed in parallel.
+   * Run `work` under the per-stream close lock (#1222). Serializes close
+   * critical sections for the same stream (windowed prunes, and full closes
+   * since #1738) while letting different streams proceed in parallel.
    */
   _with_close_lock(stream, work) {
     const prev = this._close_locks.get(stream) ?? Promise.resolve();