reasonix 0.36.1 → 0.36.2

package/dist/cli/{chunk-QRUQ2BFT.js → chunk-RNSZYYGB.js}

@@ -2,7 +2,7 @@
 import {
   MemoryStore,
   sanitizeMemoryName
-} from "./chunk-ZU45XW3P.js";
+} from "./chunk-4D6TT2IB.js";
 import {
   countTokens,
   estimateConversationTokens,
@@ -13,12 +13,12 @@ import {
 } from "./chunk-KMWKGPFZ.js";
 import {
   pauseGate
-} from "./chunk-QPNZWUZF.js";
+} from "./chunk-S4GF3HPO.js";
 import {
   ESCALATION_CONTRACT,
   NEGATIVE_CLAIM_RULE,
   TUI_FORMATTING_RULES
-} from "./chunk-KJQIA4US.js";
+} from "./chunk-K6W64QVE.js";
 import {
   formatHookOutcomeMessage,
   runHooks
@@ -681,6 +681,48 @@ var ContextManager = class {
   }
 };
 
+// src/core/inflight.ts
+var InflightSet = class {
+  _set = /* @__PURE__ */ new Set();
+  _listeners = /* @__PURE__ */ new Set();
+  add(id) {
+    if (this._set.has(id)) return;
+    this._set.add(id);
+    this._notify();
+  }
+  delete(id) {
+    if (this._set.delete(id)) this._notify();
+  }
+  has(id) {
+    return this._set.has(id);
+  }
+  /** Snapshot for diagnostics / tests; live view, do not mutate. */
+  get size() {
+    return this._set.size;
+  }
+  /** Subscribe to add/delete; returns the unsubscribe function. */
+  subscribe(fn) {
+    this._listeners.add(fn);
+    return () => {
+      this._listeners.delete(fn);
+    };
+  }
+  /** Drop everything — only use at session reset. Notifies once. */
+  clear() {
+    if (this._set.size === 0) return;
+    this._set.clear();
+    this._notify();
+  }
+  _notify() {
+    for (const fn of this._listeners) {
+      try {
+        fn();
+      } catch {
+      }
+    }
+  }
+};
+
 // src/loop/errors.ts
 function formatLoopError(err, probe) {
   const msg = err.message ?? "";
@@ -1362,12 +1404,18 @@ var CacheFirstLoop = class {
   _streamPreference;
   /** Threaded through HTTP + every tool dispatch so Esc cancels in-flight work, not after. */
   _turnAbort = new AbortController();
+  /** Authoritative running-id set — UI cards consult this instead of trusting end-event delivery. Insert at dispatch entry, delete in finally. */
+  _inflight = new InflightSet();
   _proArmedForNextTurn = false;
   _escalateThisTurn = false;
   _turnFailures = new TurnFailureTracker();
   _turnSelfCorrected = false;
   _foldedThisTurn = false;
   context;
+  /** Subscribe API so UI hooks can derive `running` from finally-guaranteed insertions. */
+  get inflight() {
+    return this._inflight;
+  }
   get currentTurn() {
     return this._turn;
   }
@@ -1498,6 +1546,7 @@ var CacheFirstLoop = class {
       }
     }
     this.scratch.reset();
+    this._inflight.clear();
     return { dropped };
   }
   configure(opts) {
@@ -1548,44 +1597,59 @@ var CacheFirstLoop = class {
     const name = call.function?.name ?? "";
     const args = call.function?.arguments ?? "{}";
     const parsedArgs = safeParseToolArgs(args);
-    const preReport = await runHooks({
-      hooks: this.hooks,
-      payload: {
-        event: "PreToolUse",
-        cwd: this.hookCwd,
-        toolName: name,
-        toolArgs: parsedArgs
-      }
-    });
-    const preWarnings = [...hookWarnings(preReport.outcomes, this._turn)];
-    if (preReport.blocked) {
-      const blocking = preReport.outcomes[preReport.outcomes.length - 1];
-      const reason = (blocking?.stderr || blocking?.stdout || "blocked by PreToolUse hook").trim();
-      return {
-        preWarnings,
-        postWarnings: [],
-        result: `[hook block] ${blocking?.hook.command ?? "<unknown>"}
+    this._inflight.add(this.inflightIdFor(call));
+    try {
+      const preReport = await runHooks({
+        hooks: this.hooks,
+        payload: {
+          event: "PreToolUse",
+          cwd: this.hookCwd,
+          toolName: name,
+          toolArgs: parsedArgs
+        }
+      });
+      const preWarnings = [...hookWarnings(preReport.outcomes, this._turn)];
+      if (preReport.blocked) {
+        const blocking = preReport.outcomes[preReport.outcomes.length - 1];
+        const reason = (blocking?.stderr || blocking?.stdout || "blocked by PreToolUse hook").trim();
+        return {
+          preWarnings,
+          postWarnings: [],
+          result: `[hook block] ${blocking?.hook.command ?? "<unknown>"}
 ${reason}`
-      };
-    }
-    const result = await this.tools.dispatch(name, args, {
-      signal,
-      maxResultTokens: DEFAULT_MAX_RESULT_TOKENS,
-      confirmationGate: this.confirmationGate
-    });
-    const postReport = await runHooks({
-      hooks: this.hooks,
-      payload: {
-        event: "PostToolUse",
-        cwd: this.hookCwd,
-        toolName: name,
-        toolArgs: parsedArgs,
-        toolResult: result
+        };
       }
-    });
-    const postWarnings = [...hookWarnings(postReport.outcomes, this._turn)];
-    return { preWarnings, postWarnings, result };
+      const result = await this.tools.dispatch(name, args, {
+        signal,
+        maxResultTokens: DEFAULT_MAX_RESULT_TOKENS,
+        confirmationGate: this.confirmationGate
+      });
+      const postReport = await runHooks({
+        hooks: this.hooks,
+        payload: {
+          event: "PostToolUse",
+          cwd: this.hookCwd,
+          toolName: name,
+          toolArgs: parsedArgs,
+          toolResult: result
+        }
+      });
+      const postWarnings = [...hookWarnings(postReport.outcomes, this._turn)];
+      return { preWarnings, postWarnings, result };
+    } finally {
+      this._inflight.delete(this.inflightIdFor(call));
+    }
+  }
+  /** Stable per-call id used as the inflight key AND threaded into tool_start / tool events so the UI matches them up. */
+  inflightIdFor(call) {
+    if (call.id) return call.id;
+    const fallback = call._inflightFallback;
+    if (fallback) return fallback;
+    const generated = `inflight-${++this._inflightCounter}`;
+    call._inflightFallback = generated;
+    return generated;
   }
+  _inflightCounter = 0;
   buildMessages(pendingUser) {
     const healed = healLoadedMessages(this.log.toMessages(), DEFAULT_MAX_RESULT_CHARS);
     const msgs = [...this.prefix.toMessages(), ...healed.messages];
@@ -2027,12 +2091,15 @@ ${reason}`
           chunk.push(repairedCalls[callIdx++]);
         }
         for (const call of chunk) {
+          const callId = this.inflightIdFor(call);
+          this._inflight.add(callId);
           yield {
             turn: this._turn,
             role: "tool_start",
             content: "",
             toolName: call.function?.name ?? "",
-            toolArgs: call.function?.arguments ?? "{}"
+            toolArgs: call.function?.arguments ?? "{}",
+            callId
           };
         }
         const settled = await Promise.allSettled(chunk.map((c) => this.runOneToolCall(c, signal)));
@@ -2076,7 +2143,8 @@ ${reason}`
             role: "tool",
             content: result,
             toolName: name,
-            toolArgs: args
+            toolArgs: args,
+            callId: this.inflightIdFor(call)
           };
         }
       }
@@ -5009,4 +5077,4 @@ export {
   snapshotBeforeEdits,
   restoreSnapshots
 };
-//# sourceMappingURL=chunk-QRUQ2BFT.js.map
+//# sourceMappingURL=chunk-RNSZYYGB.js.map