@graphrefly/graphrefly 0.14.0 → 0.16.0

package/dist/index.cjs

@@ -2997,15 +2997,14 @@ var GraphReflyEventExplorer = class {
     if (!cqrsGraph) return;
     cqrsGraph.event(meta.eventName);
     const eventNode = cqrsGraph.resolve(meta.eventName);
-    const currentSnap = eventNode.get();
-    const existingEntries = currentSnap?.value?.entries;
+    const existingEntries = eventNode.get();
     let lastSeq = existingEntries && existingEntries.length > 0 ? existingEntries[existingEntries.length - 1].seq : 0;
     const handle = this.observeNodeOn(cqrsGraph, meta.eventName);
     const unsub = handle.subscribe((msgs) => {
       for (const m of msgs) {
         if (m[0] === DATA) {
-          const snap = m[1];
-          for (const entry of snap.value.entries) {
+          const entries = m[1];
+          for (const entry of entries) {
             if (entry.seq > lastSeq) {
               bound(entry);
               lastSeq = entry.seq;
@@ -3919,6 +3918,7 @@ var Graph = class _Graph {
   /** @internal — exposed for {@link teardownMountedGraph}. */
   _mounts = /* @__PURE__ */ new Map();
   _autoCheckpointDisposers = /* @__PURE__ */ new Set();
+  _disposers = /* @__PURE__ */ new Set();
   _defaultVersioningLevel;
   static registerFactory(pattern, factory) {
     if (!pattern) {
@@ -4645,7 +4645,7 @@ var Graph = class _Graph {
   _createObserveResult(path, target, options) {
     const timeline = options.timeline === true;
     const causal = options.causal === true;
-    const derived3 = options.derived === true;
+    const derived2 = options.derived === true;
     const minimal = options.detail === "minimal";
     const result = {
       values: {},
@@ -4658,14 +4658,14 @@ var Graph = class _Graph {
     let lastTriggerDepIndex;
     let lastRunDepValues;
     let detachInspectorHook;
-    if ((causal || derived3) && target instanceof NodeImpl) {
+    if ((causal || derived2) && target instanceof NodeImpl) {
       detachInspectorHook = target._setInspectorHook((event) => {
         if (event.kind === "dep_message") {
           lastTriggerDepIndex = event.depIndex;
           return;
         }
         lastRunDepValues = [...event.depValues];
-        if (derived3) {
+        if (derived2) {
           result.events.push({
             type: "derived",
             path,
@@ -5054,10 +5054,33 @@ var Graph = class _Graph {
   //  Lifecycle & persistence (§3.7–§3.8)
   // ——————————————————————————————————————————————————————————————
   /**
-   * Sends `[[TEARDOWN]]` to all nodes, then clears registries on this graph and every
-   * mounted subgraph (§3.7). The instance is left empty and may be reused with {@link Graph.add}.
+   * Register a cleanup function to be called on {@link Graph.destroy}.
+   *
+   * Factories use this to attach teardown logic for internal nodes, keepalive
+   * subscriptions, or other resources that are not registered on the graph and
+   * would otherwise leak on repeated create/destroy cycles.
+   *
+   * Returns a removal function — call it to unregister the disposer early.
+   */
+  addDisposer(fn) {
+    this._disposers.add(fn);
+    return () => {
+      this._disposers.delete(fn);
+    };
+  }
+  /**
+   * Drains disposers (registered via {@link addDisposer}), then sends `[[TEARDOWN]]` to all
+   * nodes and clears registries on this graph and every mounted subgraph (§3.7).
+   * The instance is left empty and may be reused with {@link Graph.add}.
    */
   destroy() {
+    for (const dispose of [...this._disposers]) {
+      try {
+        dispose();
+      } catch {
+      }
+    }
+    this._disposers.clear();
     this.signal([[TEARDOWN]], { internal: true });
     for (const dispose of [...this._autoCheckpointDisposers]) {
       try {
@@ -5666,25 +5689,7 @@ var ResettableTimer = class {
   }
 };
 
-// src/extra/reactive-base.ts
-function snapshotEqualsVersion(a, b) {
-  if (typeof a !== "object" || a == null || typeof b !== "object" || b == null) {
-    return Object.is(a, b);
-  }
-  if (!("version" in a) || !("version" in b)) return Object.is(a, b);
-  return a.version === b.version;
-}
-function bumpVersion(current, nextValue, v0) {
-  if (v0 != null) {
-    return { version: current.version + 1, value: nextValue, v0 };
-  }
-  return { version: current.version + 1, value: nextValue };
-}
-
 // src/extra/reactive-log.ts
-function emptySnapshot() {
-  return { version: 0, value: { entries: [] } };
-}
 function keepaliveDerived(n) {
   return n.subscribe(() => {
   });
@@ -5698,22 +5703,16 @@ function reactiveLog(initial, options = {}) {
   if (maxSize !== void 0 && buf.length > maxSize) {
     buf.splice(0, buf.length - maxSize);
   }
-  let current = buf.length > 0 ? { version: 1, value: { entries: [...buf] } } : emptySnapshot();
-  const entries = state(current, {
+  const entries = state(buf.length > 0 ? [...buf] : [], {
     name,
     describeKind: "state",
-    equals: snapshotEqualsVersion
+    equals: (a, b) => a === b
   });
   function pushSnapshot() {
-    const ev = entries.v;
-    current = bumpVersion(
-      current,
-      { entries: [...buf] },
-      ev ? { id: ev.id, version: ev.version } : void 0
-    );
+    const snapshot = [...buf];
     batch(() => {
       entries.down([[DIRTY]]);
-      entries.down([[DATA, current]]);
+      entries.down([[DATA, snapshot]]);
     });
   }
   function trimBuf() {
@@ -5756,13 +5755,12 @@ function reactiveLog(initial, options = {}) {
       if (n < 0) {
         throw new RangeError("n must be >= 0");
       }
-      const snap = entries.get();
-      const e = snap.value.entries;
+      const e = entries.get();
       const init = n === 0 ? [] : e.slice(Math.max(0, e.length - n));
       const out = derived(
         [entries],
         ([s]) => {
-          const list = s.value.entries;
+          const list = s;
           return n === 0 ? [] : list.slice(Math.max(0, list.length - n));
         },
         { initial: init, describeKind: "derived" }
@@ -5777,13 +5775,12 @@ function logSlice(log, start, stop) {
   if (start < 0) {
     throw new RangeError("start must be >= 0");
   }
-  const snap = log.entries.get();
-  const e = snap.value.entries;
+  const e = log.entries.get();
   const init = stop === void 0 ? e.slice(start) : e.slice(start, stop);
   const out = derived(
     [log.entries],
     ([s]) => {
-      const list = s.value.entries;
+      const list = s;
       return stop === void 0 ? list.slice(start) : list.slice(start, stop);
     },
     { initial: init, describeKind: "derived" }
@@ -6063,8 +6060,8 @@ var CqrsGraph = class extends Graph {
       (snapshots) => {
         const allEvents = [];
         for (const snapshot of snapshots) {
-          const snap = snapshot;
-          allEvents.push(...snap.value.entries);
+          const entries = snapshot;
+          allEvents.push(...entries);
         }
         allEvents.sort((a, b) => a.timestampNs - b.timestampNs || a.seq - b.seq);
         return reducer(initial, allEvents);
@@ -6105,9 +6102,8 @@ var CqrsGraph = class extends Graph {
       (snapshots) => {
         const errNode = sagaRef.n.meta.error;
         for (let i = 0; i < snapshots.length; i++) {
-          const snap = snapshots[i];
+          const entries = snapshots[i];
           const eName = eventNames[i];
-          const entries = snap.value.entries;
           const lastCount = lastCounts.get(eName) ?? 0;
           if (entries.length > lastCount) {
             const newEntries = entries.slice(lastCount);
@@ -12046,9 +12042,6 @@ var throttleTime = throttle;
 var catchError = rescue;
 
 // src/extra/reactive-map.ts
-function emptySnapshot2() {
-  return { version: 0, value: { map: /* @__PURE__ */ new Map() } };
-}
 function isExpired(e, now) {
   return e.expiresAt !== void 0 && now >= e.expiresAt;
 }
@@ -12062,12 +12055,12 @@ function buildMap(store, now) {
 function reactiveMap(options = {}) {
   const { name, maxSize, defaultTtl, ...nodeOpts } = options;
   const store = /* @__PURE__ */ new Map();
-  let current = emptySnapshot2();
-  const n = state(current, {
+  const n = state(/* @__PURE__ */ new Map(), {
     ...nodeOpts,
     name,
     describeKind: "state",
-    equals: snapshotEqualsVersion
+    equals: (a, b) => a === b
+    // identity; pushSnapshot always creates a new Map
   });
   function pruneExpiredInternal() {
     const now = monotonicNs();
@@ -12092,11 +12085,9 @@ function reactiveMap(options = {}) {
     pruneExpiredInternal();
     const now = monotonicNs();
     const map3 = buildMap(store, now);
-    const nv = n.v;
-    current = bumpVersion(current, { map: map3 }, nv ? { id: nv.id, version: nv.version } : void 0);
     batch(() => {
       n.down([[DIRTY]]);
-      n.down([[DATA, current]]);
+      n.down([[DATA, map3]]);
     });
   }
   function touchLru(key) {
@@ -12106,7 +12097,7 @@ function reactiveMap(options = {}) {
     store.set(key, e);
   }
   const bundle = {
-    node: n,
+    entries: n,
     get(key) {
       const now = monotonicNs();
       const e = store.get(key);
@@ -12203,13 +12194,11 @@ function keepalive2(node2) {
   node2.subscribe(() => void 0);
 }
 function mapFromSnapshot(snapshot) {
-  if (typeof snapshot === "object" && snapshot !== null && "value" in snapshot && typeof snapshot.value === "object" && snapshot.value !== null && "map" in snapshot.value) {
-    return snapshot.value.map ?? /* @__PURE__ */ new Map();
-  }
+  if (snapshot instanceof Map) return snapshot;
   return /* @__PURE__ */ new Map();
 }
 function asReadonlyMap(store) {
-  return mapFromSnapshot(store.node.get());
+  return mapFromSnapshot(store.entries.get());
 }
 function applyExtraction(store, extraction) {
   if (!Array.isArray(extraction.upsert)) {
@@ -12237,7 +12226,7 @@ function distill(source, extractFn, opts) {
   if (opts.evict) {
     const evictionKeys = dynamicNode((get) => {
       const out = [];
-      const snapshot = mapFromSnapshot(get(store.node));
+      const snapshot = mapFromSnapshot(get(store.entries));
       for (const [key, mem] of snapshot) {
         const verdict = opts.evict(key, mem);
         if (isNodeLike(verdict)) {
@@ -12267,7 +12256,7 @@ function distill(source, extractFn, opts) {
       applyExtraction(store, extraction);
     });
   }
-  const compact = derived([store.node, contextNode], ([snapshot, context]) => {
+  const compact = derived([store.entries, contextNode], ([snapshot, context]) => {
     const entries = [...mapFromSnapshot(snapshot).entries()].map(([key, value]) => ({
       key,
       value,
@@ -12285,7 +12274,7 @@ function distill(source, extractFn, opts) {
     }
     return packed;
   });
-  const size = derived([store.node], ([snapshot]) => mapFromSnapshot(snapshot).size);
+  const size = derived([store.entries], ([snapshot]) => mapFromSnapshot(snapshot).size);
   keepalive2(compact);
   keepalive2(size);
   return { store, compact, size };
@@ -12322,9 +12311,6 @@ function pubsub() {
 }
 
 // src/extra/reactive-index.ts
-function emptySnapshot3() {
-  return { version: 0, value: { rows: [] } };
-}
 function rowKey(row) {
   return [row.secondary, row.primary];
 }
@@ -12370,31 +12356,25 @@ function keepaliveDerived2(n) {
 function reactiveIndex(options = {}) {
   const { name } = options;
   const buf = [];
-  let current = emptySnapshot3();
-  const ordered = state(current, {
+  const ordered = state([], {
     name,
     describeKind: "state",
-    equals: snapshotEqualsVersion
+    equals: (a, b) => a === b
   });
   const byPrimary = derived(
     [ordered],
     ([s]) => {
-      const rows = s.value.rows;
+      const rows = s;
       return byPrimaryMap(rows);
     },
     { initial: /* @__PURE__ */ new Map(), describeKind: "derived" }
   );
   keepaliveDerived2(byPrimary);
   function pushSnapshot() {
-    const ov = ordered.v;
-    current = bumpVersion(
-      current,
-      { rows: [...buf] },
-      ov ? { id: ov.id, version: ov.version } : void 0
-    );
+    const snapshot = [...buf];
     batch(() => {
       ordered.down([[DIRTY]]);
-      ordered.down([[DATA, current]]);
+      ordered.down([[DATA, snapshot]]);
     });
   }
   return {
@@ -12425,28 +12405,19 @@ function reactiveIndex(options = {}) {
 }
 
 // src/extra/reactive-list.ts
-function emptySnapshot4() {
-  return { version: 0, value: { items: [] } };
-}
 function reactiveList(initial, options = {}) {
   const { name } = options;
   const buf = initial ? [...initial] : [];
-  let current = buf.length > 0 ? { version: 1, value: { items: [...buf] } } : emptySnapshot4();
-  const items = state(current, {
+  const items = state(buf.length > 0 ? [...buf] : [], {
     name,
     describeKind: "state",
-    equals: snapshotEqualsVersion
+    equals: (a, b) => a === b
   });
   function pushSnapshot() {
-    const iv = items.v;
-    current = bumpVersion(
-      current,
-      { items: [...buf] },
-      iv ? { id: iv.id, version: iv.version } : void 0
-    );
+    const snapshot = [...buf];
     batch(() => {
       items.down([[DIRTY]]);
-      items.down([[DATA, current]]);
+      items.down([[DATA, snapshot]]);
     });
   }
   return {
@@ -13523,7 +13494,9 @@ function promptNode(adapter, deps, prompt, opts) {
   const messagesNode = derived(
     deps,
     (values) => {
+      if (values.some((v) => v == null)) return [];
       const text = typeof prompt === "string" ? prompt : prompt(...values);
+      if (!text) return [];
       const msgs = [];
       if (opts?.systemPrompt) msgs.push({ role: "system", content: opts.systemPrompt });
       msgs.push({ role: "user", content: text });
@@ -13579,7 +13552,6 @@ function promptNode(adapter, deps, prompt, opts) {
 }
 var ChatStreamGraph = class extends Graph {
   _log;
-  _keepaliveSubs = [];
   messages;
   latest;
   messageCount;
@@ -13594,7 +13566,7 @@ var ChatStreamGraph = class extends Graph {
     this.latest = derived(
       [this.messages],
       ([snapshot]) => {
-        const entries = snapshot.value.entries;
+        const entries = snapshot;
         return entries.length === 0 ? void 0 : entries[entries.length - 1];
       },
       {
@@ -13606,10 +13578,10 @@ var ChatStreamGraph = class extends Graph {
     );
     this.add("latest", this.latest);
     this.connect("messages", "latest");
-    this._keepaliveSubs.push(keepalive3(this.latest));
+    this.addDisposer(keepalive3(this.latest));
     this.messageCount = derived(
       [this.messages],
-      ([snapshot]) => snapshot.value.entries.length,
+      ([snapshot]) => snapshot.length,
       {
         name: "messageCount",
         describeKind: "derived",
@@ -13619,7 +13591,7 @@ var ChatStreamGraph = class extends Graph {
     );
     this.add("messageCount", this.messageCount);
     this.connect("messages", "messageCount");
-    this._keepaliveSubs.push(keepalive3(this.messageCount));
+    this.addDisposer(keepalive3(this.messageCount));
   }
   append(role, content, extra) {
     this._log.append({ role, content, ...extra });
@@ -13631,12 +13603,7 @@ var ChatStreamGraph = class extends Graph {
     this._log.clear();
   }
   allMessages() {
-    return this.messages.get().value.entries;
-  }
-  destroy() {
-    for (const unsub of this._keepaliveSubs) unsub();
-    this._keepaliveSubs.length = 0;
-    super.destroy();
+    return this.messages.get();
   }
 };
 function chatStream(name, opts) {
@@ -13645,7 +13612,6 @@ function chatStream(name, opts) {
 var ToolRegistryGraph = class extends Graph {
   definitions;
   schemas;
-  _keepaliveSubs = [];
   constructor(name, opts = {}) {
     super(name, opts.graph);
     this.definitions = state(/* @__PURE__ */ new Map(), {
@@ -13666,7 +13632,7 @@ var ToolRegistryGraph = class extends Graph {
     );
     this.add("schemas", this.schemas);
     this.connect("definitions", "schemas");
-    this._keepaliveSubs.push(keepalive3(this.schemas));
+    this.addDisposer(keepalive3(this.schemas));
   }
   register(tool) {
     const current = this.definitions.get();
@@ -13691,11 +13657,6 @@ var ToolRegistryGraph = class extends Graph {
   getDefinition(name) {
     return this.definitions.get().get(name);
   }
-  destroy() {
-    for (const unsub of this._keepaliveSubs) unsub();
-    this._keepaliveSubs.length = 0;
-    super.destroy();
-  }
 };
 function toolRegistry(name, opts) {
   return new ToolRegistryGraph(name, opts);
@@ -13840,9 +13801,7 @@ function admissionFilter3D(opts = {}) {
 }
 var DEFAULT_DECAY_RATE = Math.LN2 / (7 * 86400);
 function extractStoreMap(snapshot) {
-  if (snapshot && typeof snapshot === "object" && "value" in snapshot && typeof snapshot.value === "object" && snapshot.value !== null && "map" in snapshot.value) {
-    return snapshot.value.map ?? /* @__PURE__ */ new Map();
-  }
+  if (snapshot instanceof Map) return snapshot;
   return /* @__PURE__ */ new Map();
 }
 function agentMemory(name, source, opts) {
@@ -13893,7 +13852,7 @@ function agentMemory(name, source, opts) {
     consolidateTrigger
   };
   const distillBundle = distill(filteredSource, extractFn, distillOpts);
-  graph.add("store", distillBundle.store.node);
+  graph.add("store", distillBundle.store.entries);
   graph.add("compact", distillBundle.compact);
   graph.add("size", distillBundle.size);
   graph.connect("store", "compact");
@@ -13920,7 +13879,7 @@ function agentMemory(name, source, opts) {
     const permanentKeys = /* @__PURE__ */ new Set();
     const tierOf = (key) => {
       if (permanentKeys.has(key)) return "permanent";
-      const storeMap = extractStoreMap(distillBundle.store.node.get());
+      const storeMap = extractStoreMap(distillBundle.store.entries.get());
       if (storeMap.has(key)) return "active";
       return "archived";
     };
@@ -13929,7 +13888,7 @@ function agentMemory(name, source, opts) {
       permanent.upsert(key, value);
     };
     const entryCreatedAtNs = /* @__PURE__ */ new Map();
-    const storeNode = distillBundle.store.node;
+    const storeNode = distillBundle.store.entries;
     const contextNode = opts.context ? fromAny(opts.context) : state(null);
     const tierClassifier = effect([storeNode, contextNode], ([snapshot, ctx]) => {
       const storeMap = extractStoreMap(snapshot);
@@ -13996,7 +13955,7 @@ function agentMemory(name, source, opts) {
   if (vectors || kg) {
     const embedFn = opts.embedFn;
     const entityFn = opts.entityFn;
-    const storeNode = distillBundle.store.node;
+    const storeNode = distillBundle.store.entries;
     const indexer = effect([storeNode], ([snapshot]) => {
       const storeMap = extractStoreMap(snapshot);
       for (const [key, mem] of storeMap) {
@@ -14041,7 +14000,7 @@ function agentMemory(name, source, opts) {
     });
     graph.add("retrievalTrace", traceState);
     retrievalTraceNode = traceState;
-    const storeNode = distillBundle.store.node;
+    const storeNode = distillBundle.store.entries;
     let lastTrace = null;
     const retrievalDerived = derived(
       [queryInput, storeNode, contextNode],
@@ -14134,12 +14093,10 @@ function agentMemory(name, source, opts) {
       return result;
     };
   }
-  const origDestroy = graph.destroy.bind(graph);
-  graph.destroy = () => {
+  graph.addDisposer(() => {
     for (const unsub of keepaliveSubs) unsub();
     keepaliveSubs.length = 0;
-    origDestroy();
-  };
+  });
   return Object.assign(graph, {
     distillBundle,
     compact: distillBundle.compact,
@@ -15758,7 +15715,7 @@ function funnel(name, sources, stages, opts) {
     });
     g.add(bridgeName, br);
     g.connect(prevOutputPath, bridgeName);
-    keepalive4(br);
+    g.addDisposer(keepalive4(br));
     prevOutputPath = `${stage.name}::output`;
   }
   return g;
@@ -15810,7 +15767,7 @@ function feedback(graph, condition, reentry, opts) {
   });
   graph.add(feedbackEffectName, feedbackEffect);
   graph.connect(condition, feedbackEffectName);
-  keepalive4(feedbackEffect);
+  graph.addDisposer(keepalive4(feedbackEffect));
   return graph;
 }
 function budgetGate(source, constraints, opts) {
@@ -16190,7 +16147,7 @@ function contentModerationGraph(name, opts) {
     }
   });
   g.add("__review_accumulator", reviewAccumulator);
-  keepalive5(reviewAccumulator);
+  g.addDisposer(keepalive5(reviewAccumulator));
   try {
     g.connect("stratify::branch/review", "__review_accumulator");
   } catch {
@@ -16238,8 +16195,7 @@ function contentModerationGraph(name, opts) {
   const fbCondition = derived(
     [reviewLog.entries, policy2],
     (vals) => {
-      const snap = vals[0];
-      const entries = snap?.value?.entries;
+      const entries = vals[0];
       if (entries && entries.length > 0) {
         const latest = entries[entries.length - 1];
         if (latest && latest.falsePositive) {
@@ -17471,7 +17427,6 @@ function messagingMeta(kind, extra) {
 }
 var TopicGraph = class extends Graph {
   _log;
-  _keepaliveDisposers = [];
   events;
   latest;
   constructor(name, opts = {}) {
@@ -17482,7 +17437,7 @@ var TopicGraph = class extends Graph {
     this.latest = derived(
       [this.events],
       ([snapshot]) => {
-        const entries = snapshot.value.entries;
+        const entries = snapshot;
         return entries.length === 0 ? void 0 : entries[entries.length - 1];
       },
       {
@@ -17494,23 +17449,16 @@ var TopicGraph = class extends Graph {
     );
     this.add("latest", this.latest);
     this.connect("events", "latest");
-    this._keepaliveDisposers.push(keepalive6(this.latest));
-  }
-  destroy() {
-    for (const dispose of this._keepaliveDisposers) dispose();
-    this._keepaliveDisposers.length = 0;
-    super.destroy();
+    this.addDisposer(keepalive6(this.latest));
   }
   publish(value) {
     this._log.append(value);
   }
   retained() {
-    const snapshot = this.events.get();
-    return snapshot.value.entries;
+    return this.events.get();
   }
 };
 var SubscriptionGraph = class extends Graph {
-  _keepaliveDisposers = [];
   source;
   cursor;
   available;
@@ -17535,7 +17483,7 @@ var SubscriptionGraph = class extends Graph {
     this.available = derived(
       [this.source, this.cursor],
       ([sourceSnapshot, cursor]) => {
-        const entries = sourceSnapshot.value.entries;
+        const entries = sourceSnapshot;
         const start = Math.max(0, Math.trunc(cursor ?? 0));
         return entries.slice(start);
       },
@@ -17550,13 +17498,8 @@ var SubscriptionGraph = class extends Graph {
     this.connect("topic::events", "source");
     this.connect("source", "available");
     this.connect("cursor", "available");
-    this._keepaliveDisposers.push(keepalive6(this.source));
-    this._keepaliveDisposers.push(keepalive6(this.available));
-  }
-  destroy() {
-    for (const dispose of this._keepaliveDisposers) dispose();
-    this._keepaliveDisposers.length = 0;
-    super.destroy();
+    this.addDisposer(keepalive6(this.source));
+    this.addDisposer(keepalive6(this.available));
   }
   ack(count) {
     const available = this.available.get();
@@ -17578,7 +17521,6 @@ var SubscriptionGraph = class extends Graph {
 var JobQueueGraph = class extends Graph {
   _pending;
   _jobs;
-  _keepaliveDisposers = [];
   _seq = 0;
   pending;
   jobs;
@@ -17588,27 +17530,18 @@ var JobQueueGraph = class extends Graph {
     this._pending = reactiveList([], { name: "pending" });
     this._jobs = reactiveMap({ name: "jobs" });
     this.pending = this._pending.items;
-    this.jobs = this._jobs.node;
+    this.jobs = this._jobs.entries;
     this.add("pending", this.pending);
     this.add("jobs", this.jobs);
-    this.depth = derived(
-      [this.pending],
-      ([snapshot]) => snapshot.value.items.length,
-      {
-        name: "depth",
-        describeKind: "derived",
-        meta: messagingMeta("queue_depth"),
-        initial: 0
-      }
-    );
+    this.depth = derived([this.pending], ([snapshot]) => snapshot.length, {
+      name: "depth",
+      describeKind: "derived",
+      meta: messagingMeta("queue_depth"),
+      initial: 0
+    });
     this.add("depth", this.depth);
     this.connect("pending", "depth");
-    this._keepaliveDisposers.push(keepalive6(this.depth));
-  }
-  destroy() {
-    for (const dispose of this._keepaliveDisposers) dispose();
-    this._keepaliveDisposers.length = 0;
-    super.destroy();
+    this.addDisposer(keepalive6(this.depth));
   }
   enqueue(payload, opts = {}) {
     const id = opts.id ?? `${this.name}-${++this._seq}`;
@@ -17631,8 +17564,7 @@ var JobQueueGraph = class extends Graph {
     if (max === 0) return [];
     const out = [];
     while (out.length < max) {
-      const snapshot = this.pending.get();
-      const ids = snapshot.value.items;
+      const ids = this.pending.get();
       if (ids.length === 0) break;
       const id = this._pending.pop(0);
       const job = this._jobs.get(id);
@@ -17668,7 +17600,6 @@ var JobQueueGraph = class extends Graph {
 var JobFlowGraph = class extends Graph {
   _stageNames;
   _queues = /* @__PURE__ */ new Map();
-  _keepaliveDisposers = [];
   _completed;
   completed;
   completedCount;
@@ -17693,7 +17624,7 @@ var JobFlowGraph = class extends Graph {
     this.add("completed", this.completed);
     this.completedCount = derived(
       [this.completed],
-      ([snapshot]) => snapshot.value.entries.length,
+      ([snapshot]) => snapshot.length,
       {
         name: "completedCount",
         describeKind: "derived",
@@ -17703,7 +17634,7 @@ var JobFlowGraph = class extends Graph {
     );
     this.add("completedCount", this.completedCount);
     this.connect("completed", "completedCount");
-    this._keepaliveDisposers.push(keepalive6(this.completedCount));
+    this.addDisposer(keepalive6(this.completedCount));
     const maxPerPump = Math.max(
       1,
       requireNonNegativeInt(opts.maxPerPump ?? DEFAULT_MAX_PER_PUMP, "job flow maxPerPump")
@@ -17743,14 +17674,9 @@ var JobFlowGraph = class extends Graph {
       );
       this.add(`pump_${stage}`, pump);
       this.connect(`${stage}::pending`, `pump_${stage}`);
-      this._keepaliveDisposers.push(keepalive6(pump));
+      this.addDisposer(keepalive6(pump));
     }
   }
-  destroy() {
-    for (const dispose of this._keepaliveDisposers) dispose();
-    this._keepaliveDisposers.length = 0;
-    super.destroy();
-  }
   stages() {
     return this._stageNames;
   }
@@ -17763,14 +17689,12 @@ var JobFlowGraph = class extends Graph {
     return this.queue(this._stageNames[0]).enqueue(payload, opts);
   }
   retainedCompleted() {
-    const snapshot = this.completed.get();
-    return snapshot.value.entries;
+    return this.completed.get();
   }
 };
 var TopicBridgeGraph = class extends Graph {
   _sourceSub;
   _target;
-  _keepaliveDisposers = [];
   bridgedCount;
   constructor(name, sourceTopic, targetTopic, opts = {}) {
     super(name, opts.graph);
@@ -17815,12 +17739,7 @@ var TopicBridgeGraph = class extends Graph {
     );
     this.add("pump", pump);
     this.connect("subscription::available", "pump");
-    this._keepaliveDisposers.push(keepalive6(pump));
-  }
-  destroy() {
-    for (const dispose of this._keepaliveDisposers) dispose();
-    this._keepaliveDisposers.length = 0;
-    super.destroy();
+    this.addDisposer(keepalive6(pump));
   }
 };
 function topic(name, opts) {
@@ -18112,7 +18031,7 @@ function gate(graph, name, source, opts) {
       isOpenNode.down([[DATA, false]]);
     }
   };
-  countNode.subscribe(() => void 0);
+  graph.addDisposer(countNode.subscribe(() => void 0));
   registerStep(graph, name, output, src.path ? [src.path] : []);
   const internal = new Graph(`${name}_state`);
   internal.add("pending", pendingNode);
@@ -18359,9 +18278,9 @@ var DEFAULT_QUEUE_CONFIGS = {
 function strategyModel() {
   const _map = reactiveMap({ name: "strategy-entries" });
   const snapshot = derived(
-    [_map.node],
+    [_map.entries],
     ([mapSnap]) => {
-      const raw = mapSnap.value.map;
+      const raw = mapSnap;
       return new Map(raw);
     },
     {
@@ -18396,7 +18315,10 @@ function strategyModel() {
   }
   const _unsub = snapshot.subscribe(() => {
   });
-  return { node: snapshot, record, lookup };
+  function dispose() {
+    _unsub();
+  }
+  return { node: snapshot, record, lookup, dispose };
 }
 function priorityScore(item, strategy, lastInteractionNs, urgency, signals) {
   const severityWeights = { ...DEFAULT_SEVERITY_WEIGHTS, ...signals?.severityWeights };
@@ -18428,6 +18350,9 @@ function priorityScore(item, strategy, lastInteractionNs, urgency, signals) {
 }
 
 // src/patterns/harness/loop.ts
+function baseSummary(summary) {
+  return summary.replace(/^\[RETRY \d+\/\d+\]\s*/, "");
+}
 var DEFAULT_TRIAGE_PROMPT = `You are a triage classifier for a reactive collaboration harness.
 
 Given an intake item, classify it and output JSON:
@@ -18489,13 +18414,19 @@ var HarnessGraph = class extends Graph {
   strategy;
   /** Verify results topic — subscribe to see verification outcomes. */
   verifyResults;
-  constructor(name, intake, queues, gates, strategy, verifyResults) {
+  /** Per-item fast-retry counts (keyed by base summary). */
+  retryTracker;
+  /** Per-item reingestion counts (keyed by base summary). */
+  reingestionTracker;
+  constructor(name, intake, queues, gates, strategy, verifyResults, retryTracker, reingestionTracker) {
     super(name);
     this.intake = intake;
     this.queues = queues;
     this.gates = gates;
     this.strategy = strategy;
     this.verifyResults = verifyResults;
+    this.retryTracker = retryTracker;
+    this.reingestionTracker = reingestionTracker;
   }
 };
 function harnessLoop(name, opts) {
@@ -18512,14 +18443,20 @@ function harnessLoop(name, opts) {
   }
   const intake = new TopicGraph("intake", { retainedLimit });
   const strategy = strategyModel();
+  const triageInput = withLatestFrom(
+    intake.latest,
+    strategy.node
+  );
   const triageNode = promptNode(
     adapter,
-    [intake.latest, strategy.node],
-    opts.triagePrompt ?? ((item, strat) => {
-      return DEFAULT_TRIAGE_PROMPT.replace("{{strategy}}", JSON.stringify(strat)).replace(
-        "{{item}}",
-        JSON.stringify(item)
-      );
+    [triageInput],
+    opts.triagePrompt ?? ((pair) => {
+      const [item, strat] = pair;
+      if (!item) return "";
+      return DEFAULT_TRIAGE_PROMPT.replace(
+        "{{strategy}}",
+        JSON.stringify(Array.from(strat.entries()))
+      ).replace("{{item}}", JSON.stringify(item));
     }),
     {
       name: "triage",
@@ -18531,12 +18468,14 @@ function harnessLoop(name, opts) {
   for (const route of QUEUE_NAMES) {
     queueTopics.set(route, new TopicGraph(`queue/${route}`, { retainedLimit }));
   }
-  const _router = effect([triageNode], ([triaged]) => {
+  const router = effect([triageNode], ([triaged]) => {
     const item = triaged;
     if (!item || !item.route) return;
     const topic2 = queueTopics.get(item.route);
     if (topic2) topic2.publish(item);
   });
+  const routerUnsub = router.subscribe(() => {
+  });
   const gateGraph = new Graph("gates");
   const gateControllers = /* @__PURE__ */ new Map();
   for (const route of QUEUE_NAMES) {
@@ -18566,9 +18505,7 @@ function harnessLoop(name, opts) {
   const executeNode = promptNode(
     adapter,
     [executeInput],
-    opts.executePrompt ?? ((item) => {
-      return DEFAULT_EXECUTE_PROMPT.replace("{{item}}", JSON.stringify(item));
-    }),
+    opts.executePrompt ?? ((item) => DEFAULT_EXECUTE_PROMPT.replace("{{item}}", JSON.stringify(item))),
     {
       name: "execute",
       format: "json",
@@ -18579,67 +18516,91 @@ function harnessLoop(name, opts) {
   const verifyNode = promptNode(
     adapter,
     [executeNode, executeInput],
-    opts.verifyPrompt ?? ((execution, item) => {
-      return DEFAULT_VERIFY_PROMPT.replace("{{execution}}", JSON.stringify(execution)).replace(
-        "{{item}}",
-        JSON.stringify(item)
-      );
-    }),
+    opts.verifyPrompt ?? ((execution, item) => DEFAULT_VERIFY_PROMPT.replace("{{execution}}", JSON.stringify(execution)).replace(
+      "{{item}}",
+      JSON.stringify(item)
+    )),
     {
       name: "verify",
       format: "json",
       retries: 1
     }
   );
+  const verifyWithExec = withLatestFrom(verifyNode, executeNode);
+  const verifyContext = withLatestFrom(
+    verifyWithExec,
+    executeInput
+  );
   const maxReingestions = opts.maxReingestions ?? 1;
-  let reingestionCount = 0;
-  const _fastRetry = effect([verifyNode], ([result]) => {
-    const vr = result;
-    if (!vr) return;
+  const retryTracker = /* @__PURE__ */ new Map();
+  const reingestionTracker = /* @__PURE__ */ new Map();
+  const fastRetry = effect([verifyContext], ([ctx]) => {
+    const [[vo, execRaw], item] = ctx;
+    if (!vo || !item) return;
+    const exec = {
+      item,
+      outcome: execRaw?.outcome ?? "failure",
+      detail: execRaw?.detail ?? "unknown"
+    };
+    const vr = {
+      item,
+      execution: exec,
+      verified: vo.verified,
+      findings: vo.findings ?? [],
+      errorClass: vo.errorClass
+    };
     if (vr.verified) {
-      strategy.record(vr.item.rootCause, vr.item.intervention, true);
+      strategy.record(item.rootCause, item.intervention, true);
       verifyResults.publish(vr);
       return;
     }
     const errClass = vr.errorClass ?? errorClassifier({
-      item: vr.item,
+      item,
       outcome: "failure",
-      detail: vr.findings.join("; "),
-      retryCount: 0
+      detail: vr.findings.join("; ")
     });
-    const exec = vr.execution;
-    const retryCount = exec?.retryCount ?? 0;
+    const key = baseSummary(item.summary);
+    const retryCount = retryTracker.get(key) ?? 0;
     if (errClass === "self-correctable" && retryCount < maxRetries) {
+      retryTracker.set(key, retryCount + 1);
       const retryItem = {
-        ...vr.item,
-        summary: `[RETRY ${retryCount + 1}/${maxRetries}] ${vr.item.summary} \u2014 Previous attempt failed: ${vr.findings.join("; ")}`
+        ...item,
+        summary: `[RETRY ${retryCount + 1}/${maxRetries}] ${baseSummary(item.summary)} \u2014 Previous attempt failed: ${vr.findings.join("; ")}`
       };
       retryTopic.publish(retryItem);
     } else {
-      strategy.record(vr.item.rootCause, vr.item.intervention, false);
+      strategy.record(item.rootCause, item.intervention, false);
       verifyResults.publish(vr);
-      if (reingestionCount < maxReingestions) {
-        reingestionCount++;
+      const itemReingestions = reingestionTracker.get(key) ?? 0;
+      if (itemReingestions < maxReingestions) {
+        reingestionTracker.set(key, itemReingestions + 1);
         intake.publish({
           source: "eval",
-          summary: `Verification failed for: ${vr.item.summary}`,
+          summary: `Verification failed for: ${baseSummary(item.summary)}`,
           evidence: vr.findings.join("\n"),
-          affectsAreas: vr.item.affectsAreas,
-          affectsEvalTasks: vr.item.affectsEvalTasks,
+          affectsAreas: item.affectsAreas,
+          affectsEvalTasks: item.affectsEvalTasks,
           severity: "high",
-          relatedTo: [vr.item.summary]
+          relatedTo: [baseSummary(item.summary)]
         });
       }
     }
   });
+  const fastRetryUnsub = fastRetry.subscribe(() => {
+  });
   const harness = new HarnessGraph(
     name,
     intake,
     queueTopics,
     gateControllers,
     strategy,
-    verifyResults
+    verifyResults,
+    retryTracker,
+    reingestionTracker
   );
+  harness.addDisposer(routerUnsub);
+  harness.addDisposer(fastRetryUnsub);
+  harness.addDisposer(strategy.dispose);
   harness.mount("intake", intake);
   for (const [route, topic2] of queueTopics) {
     harness.mount(`queue/${route}`, topic2);