reasonix 0.47.1 → 0.48.0

package/dist/cli/{chunk-JBH5RM7X.js → chunk-OPYALNTT.js}

@@ -3,7 +3,7 @@ import { createRequire as __cr } from 'node:module'; if (typeof globalThis.requi
 import {
   MemoryStore,
   sanitizeMemoryName
-} from "./chunk-BQ6HC66J.js";
+} from "./chunk-2QSTA2QV.js";
 import {
   countTokens,
   countTokensBounded,
@@ -12,12 +12,12 @@ import {
 } from "./chunk-6OWJV3YW.js";
 import {
   Usage
-} from "./chunk-DWPAKZTY.js";
+} from "./chunk-TE5UIIFL.js";
 import {
   applyEdit,
   applyMultiEdit,
   pauseGate
-} from "./chunk-TRSAHHCL.js";
+} from "./chunk-WZGNXR6E.js";
 import {
   NEGATIVE_CLAIM_RULE,
   PROJECT_MEMORY_FILES,
@@ -28,7 +28,7 @@ import {
 import {
   formatHookOutcomeMessage,
   runHooks
-} from "./chunk-GH7DC2Y5.js";
+} from "./chunk-NMQSUNLB.js";
 import {
   ignoredByLayers,
   loadGitignoreAt,
@@ -46,21 +46,23 @@ import {
   DEEPSEEK_CONTEXT_TOKENS,
   DEFAULT_CONTEXT_TOKENS,
   SessionStats
-} from "./chunk-QCFLPSPH.js";
+} from "./chunk-OG5JANQ4.js";
 import {
   t
-} from "./chunk-NRQ5UP5T.js";
+} from "./chunk-YW63N3ZR.js";
 import {
   DEFAULT_INDEX_EXCLUDES,
   addProjectPathAllowed,
+  loadExaApiKey,
   loadMemoryTypeRegistry,
   loadMetasoApiKey,
+  loadPerplexityApiKey,
   loadProjectPathAllowed,
   loadTavilyApiKey,
   require_picomatch,
   webSearchEndpoint,
   webSearchEngine
-} from "./chunk-6CRPCJAU.js";
+} from "./chunk-CDVSFSAK.js";
 import {
   __commonJS,
   __esm,
@@ -6314,8 +6316,8 @@ var ToolRegistry = class {
   _resultAugmenter = null;
   /** Per-tool fingerprint of the last call that failed schema validation. Cleared by any successful validation for that tool. */
   _lastMalformed = /* @__PURE__ */ new Map();
-  /** Per-tool fingerprint of the last host-side interceptor rejection. */
-  _lastInterceptorRejection = /* @__PURE__ */ new Map();
+  /** Per-tool fingerprint of the last host-side gate rejection. */
+  _lastGateRejection = /* @__PURE__ */ new Map();
   constructor(opts = {}) {
     this._autoFlatten = opts.autoFlatten !== false;
   }
@@ -6402,20 +6404,21 @@ var ToolRegistry = class {
     if (!tool) {
       return JSON.stringify({ error: `unknown tool: ${name}` });
     }
-    const fingerprint = fingerprintArgs(argumentsRaw);
+    const rawFingerprint = rawFingerprintArgs(argumentsRaw);
     let args;
     try {
       args = typeof argumentsRaw === "string" ? argumentsRaw.trim() ? JSON.parse(argumentsRaw) ?? {} : {} : argumentsRaw ?? {};
     } catch (err) {
       return this._noteMalformed(
         name,
-        fingerprint,
+        rawFingerprint,
         `invalid tool arguments JSON: ${err.message}`
       );
     }
     if (tool.flatSchema && args && typeof args === "object" && hasDotKey(args)) {
       args = nestArguments(args);
     }
+    const fingerprint = fingerprintArgs(args);
     const missing = tool.parameters ? missingRequiredParam(tool.parameters, args) : null;
     if (missing) {
       return this._noteMalformed(
@@ -6436,7 +6439,7 @@ var ToolRegistry = class {
       try {
         const short = await interceptor(name, args);
         if (typeof short === "string") {
-          const guarded = this._noteInterceptorRejection(name, fingerprint, short);
+          const guarded = this._noteGateRejection(name, fingerprint, short);
           return this._augmentResult(name, args, guarded);
         }
       } catch (err) {
@@ -6445,7 +6448,6 @@ var ToolRegistry = class {
         });
       }
     }
-    this._lastInterceptorRejection.delete(name);
     if (opts.signal?.aborted) {
       return JSON.stringify({
         error: `${name}: aborted before dispatch (user interrupt)`,
@@ -6483,6 +6485,7 @@ var ToolRegistry = class {
         finalResult = JSON.stringify({ error: `${e.name}: ${e.message}` });
       }
     }
+    finalResult = this._noteGateRejection(name, fingerprint, finalResult);
     return this._augmentResult(name, args, finalResult);
   }
   _augmentResult(name, args, result) {
@@ -6506,18 +6509,18 @@ var ToolRegistry = class {
     }
     return JSON.stringify({ error: `${name}: ${detail}` });
   }
-  _noteInterceptorRejection(name, fingerprint, result) {
-    const reason = rejectedReason(result);
+  _noteGateRejection(name, fingerprint, result) {
+    const reason = rejectedReason(name, result);
     if (!reason) {
-      this._lastInterceptorRejection.delete(name);
+      this._lastGateRejection.delete(name);
       return result;
     }
     const key = `${reason}:${fingerprint}`;
-    const prev = this._lastInterceptorRejection.get(name);
-    this._lastInterceptorRejection.set(name, key);
+    const prev = this._lastGateRejection.get(name);
+    this._lastGateRejection.set(name, key);
     if (prev === key) {
       return JSON.stringify({
-        error: `${name}: same call was just rejected by ${reason} \u2014 do not retry identical args. Switch to read-only exploration, submit or revise the plan, or choose a different tool call.`,
+        error: `${name}: same call was just rejected by ${reason} \u2014 do not retry identical args. ${rejectionRecoveryHint(reason)}`,
         rejectedReason: reason,
         consecutiveInterceptorRejection: true
       });
@@ -6525,16 +6528,44 @@ var ToolRegistry = class {
     return result;
   }
 };
-function rejectedReason(result) {
+function rejectedReason(name, result) {
+  const textReason = plainTextRejectedReason(name, result);
+  if (textReason) return textReason;
   try {
     const parsed = JSON.parse(result);
     if (!parsed || typeof parsed !== "object") return null;
     const reason = parsed.rejectedReason;
-    return typeof reason === "string" && reason ? reason : null;
+    if (typeof reason === "string" && reason) return reason;
+    const error = parsed.error;
+    if (typeof error === "string") return plainTextRejectedReason(name, error);
+    return null;
   } catch {
     return null;
   }
 }
+function plainTextRejectedReason(name, result) {
+  if ((name === "edit_file" || name === "write_file") && /rejected this edit/i.test(result)) {
+    return "edit-gate";
+  }
+  if ((name === "run_command" || name === "run_background") && /\buser denied:/i.test(result)) {
+    return "shell-gate";
+  }
+  return null;
+}
+function rejectionRecoveryHint(reason) {
+  switch (reason) {
+    case "edit-gate":
+      return "Do not re-emit the same edit. Try a genuinely different edit or ask the user how to proceed.";
+    case "shell-gate":
+      return "Do not retry the same command. Use an allowlisted/read-only command, wait for approval, or ask the user how to proceed.";
+    case "engineering-lifecycle":
+      return "Switch to read-only exploration, submit or revise the plan, or choose a different tool call.";
+    case "engineering-lifecycle-evidence":
+      return "Submit completion evidence or revise/checkpoint the plan before marking the step complete.";
+    default:
+      return "Choose a different tool call or ask the user how to proceed.";
+  }
+}
 function isReadOnlyCall(tool, args) {
   if (tool.readOnlyCheck) {
     try {
@@ -6553,14 +6584,27 @@ function hasDotKey(obj) {
   }
   return false;
 }
-function fingerprintArgs(argumentsRaw) {
+function rawFingerprintArgs(argumentsRaw) {
   if (typeof argumentsRaw === "string") return argumentsRaw;
+  return fingerprintArgs(argumentsRaw);
+}
+function fingerprintArgs(args) {
   try {
-    return JSON.stringify(argumentsRaw);
+    return JSON.stringify(sortJson(args));
   } catch {
     return "";
   }
 }
+function sortJson(value) {
+  if (Array.isArray(value)) return value.map(sortJson);
+  if (!value || typeof value !== "object") return value;
+  const out = {};
+  for (const key of Object.keys(value).sort()) {
+    const item = value[key];
+    if (item !== void 0) out[key] = sortJson(item);
+  }
+  return out;
+}
 function missingRequiredParam(schema, args) {
   const required = schema.required;
   if (!required || required.length === 0) return null;
@@ -6745,6 +6789,20 @@ var ContextManager = class {
     this.deps = deps;
   }
   deps;
+  /** Real-time token count of the current log — used by Desktop to refresh the
+   *  context meter after /compact when no API usage event is available. */
+  getLogTokens() {
+    const entries = this.deps.log.toMessages();
+    let total = 0;
+    for (const e of entries) {
+      const content = typeof e.content === "string" ? e.content : "";
+      total += countTokensBounded(content);
+      if (e.role === "assistant" && Array.isArray(e.tool_calls) && e.tool_calls.length > 0) {
+        total += countTokensBounded(JSON.stringify(e.tool_calls));
+      }
+    }
+    return total;
+  }
   /** Decision after a turn's response — fold, exit with summary, or carry on. */
   decideAfterUsage(usage, model, alreadyFoldedThisTurn) {
     const ctxMax = DEEPSEEK_CONTEXT_TOKENS[model] ?? DEFAULT_CONTEXT_TOKENS;
@@ -7096,13 +7154,11 @@ async function* forceSummaryAfterIterLimit(ctx, opts) {
       content: "The turn is being force-summarized (context guard or stuck-state). Summarize in plain prose what you learned from the tool results above. Do NOT emit any tool calls, function-call markup, DSML invocations, or SEARCH/REPLACE edit blocks \u2014 they will be silently discarded. Just plain text."
     });
     const summaryModel = "deepseek-v4-flash";
-    const summaryEffort = "high";
     const resp = await ctx.client.chat({
       model: summaryModel,
       messages,
       signal: ctx.signal,
-      thinking: thinkingModeForModel(summaryModel),
-      reasoningEffort: summaryEffort
+      thinking: "disabled"
     });
     const rawContent = resp.content?.trim() ?? "";
     const cleaned = stripHallucinatedToolMarkup(rawContent);
@@ -7733,6 +7789,10 @@ var CacheFirstLoop = class {
   async compactHistory(opts) {
     return this.context.fold(this.model, opts);
   }
+  /** Real-time token count of the current log — forwarded to Desktop for meter refresh. */
+  getCurrentLogTokens() {
+    return this.context.getLogTokens();
+  }
   appendAndPersist(message) {
     this.log.append(message);
     if (this.sessionName) {
@@ -8048,21 +8108,24 @@ ${reason}`
     const toolSpecs = this.prefix.tools();
     for (let iter = 0; ; iter++) {
       if (signal.aborted) {
-        yield {
-          turn: this._turn,
-          role: "warning",
-          content: t("loop.abortedAtIter", { iter })
-        };
-        const stoppedMsg = "[aborted by user (Esc) \u2014 no summary produced. Ask again or /retry when ready; prior tool output is still in the log.]";
-        this.appendAndPersist(buildSyntheticAssistantMessage(stoppedMsg, this.model));
-        yield {
-          turn: this._turn,
-          role: "assistant_final",
-          content: stoppedMsg,
-          forcedSummary: true
-        };
-        yield { turn: this._turn, role: "done", content: stoppedMsg };
-        this._turnAbort = new AbortController();
+        try {
+          yield {
+            turn: this._turn,
+            role: "warning",
+            content: t("loop.abortedAtIter", { iter })
+          };
+          const stoppedMsg = "[aborted by user (Esc) \u2014 no summary produced. Ask again or /retry when ready; prior tool output is still in the log.]";
+          this.appendAndPersist(buildSyntheticAssistantMessage(stoppedMsg, this.model));
+          yield {
+            turn: this._turn,
+            role: "assistant_final",
+            content: stoppedMsg,
+            forcedSummary: true
+          };
+          yield { turn: this._turn, role: "done", content: stoppedMsg };
+        } finally {
+          this._turnAbort = new AbortController();
+        }
         return;
       }
       if (iter > 0) {
@@ -8238,8 +8301,11 @@ ${reason}`
         }
       } catch (err) {
         if (signal.aborted) {
-          yield { turn: this._turn, role: "done", content: "" };
-          this._turnAbort = new AbortController();
+          try {
+            yield { turn: this._turn, role: "done", content: "" };
+          } finally {
+            this._turnAbort = new AbortController();
+          }
           return;
         }
         const probe = is5xxError(err) ? await probeDeepSeekReachable(this.client) : void 0;
@@ -9273,6 +9339,8 @@ var USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (
 var MOJEEK_ENDPOINT = "https://www.mojeek.com/search";
 var METASO_ENDPOINT = "https://metaso.cn/api/v1";
 var TAVILY_ENDPOINT = "https://api.tavily.com/search";
+var PERPLEXITY_ENDPOINT = "https://api.perplexity.ai/chat/completions";
+var EXA_ENDPOINT = "https://api.exa.ai/answer";
 function searchStatusError(status) {
   if (status === 429) return t("webErrors.rateLimit429");
   if (status === 403) return t("webErrors.forbidden403");
@@ -9295,6 +9363,12 @@ async function webSearch(query, opts = {}) {
   if (opts.engine === "tavily") {
     return searchTavily(query, opts);
   }
+  if (opts.engine === "perplexity") {
+    return searchPerplexity(query, opts);
+  }
+  if (opts.engine === "exa") {
+    return searchExa(query, opts);
+  }
   return searchMojeek(query, opts);
 }
 async function searchMojeek(query, opts = {}) {
@@ -9478,6 +9552,121 @@ async function searchTavily(query, opts = {}) {
     snippet: r.content ?? ""
   }));
 }
+async function searchPerplexity(query, opts = {}) {
+  const topK = Math.max(1, Math.min(20, opts.topK ?? DEFAULT_TOPK));
+  const apiKey = loadPerplexityApiKey();
+  if (!apiKey) throw new Error(t("webErrors.perplexityMissingKey"));
+  let resp;
+  try {
+    resp = await fetch(PERPLEXITY_ENDPOINT, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${apiKey}`,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({
+        model: "sonar",
+        messages: [{ role: "user", content: query }],
+        max_tokens: 1024,
+        return_related_questions: false
+      }),
+      signal: opts.signal
+    });
+  } catch (err) {
+    if (err instanceof TypeError && err.message.includes("fetch")) {
+      throw new Error(t("webErrors.cannotReach", { endpoint: PERPLEXITY_ENDPOINT }));
+    }
+    throw err;
+  }
+  if (!resp.ok) {
+    if (resp.status === 401 || resp.status === 403) {
+      throw new Error(t("webErrors.perplexityUnauthorized"));
+    }
+    if (resp.status === 429) throw new Error(t("webErrors.perplexityRateLimit"));
+    throw new Error(t("webErrors.perplexityServerError", { status: resp.status }));
+  }
+  const raw = await resp.text();
+  let data;
+  try {
+    data = JSON.parse(raw);
+  } catch {
+    throw new Error(t("webErrors.perplexityParseError", { status: resp.status }));
+  }
+  const answer = data.choices?.[0]?.message?.content ?? "";
+  const citations = Array.isArray(data.citations) ? data.citations : [];
+  const results = [];
+  if (answer) {
+    results.push({ title: answer, url: "", snippet: "", answer });
+  }
+  const count = Math.min(citations.length, topK);
+  for (let i = 0; i < count; i++) {
+    const c = citations[i];
+    if (typeof c === "string") {
+      results.push({ title: `Source ${i + 1}`, url: c, snippet: "" });
+    } else if (c && typeof c === "object" && typeof c.url === "string") {
+      const item = c;
+      results.push({
+        title: typeof item.title === "string" ? item.title : `Source ${i + 1}`,
+        url: item.url,
+        snippet: ""
+      });
+    }
+  }
+  return results;
+}
+async function searchExa(query, opts = {}) {
+  const topK = Math.max(1, Math.min(20, opts.topK ?? DEFAULT_TOPK));
+  const apiKey = loadExaApiKey();
+  if (!apiKey) throw new Error(t("webErrors.exaMissingKey"));
+  let resp;
+  try {
+    resp = await fetch(EXA_ENDPOINT, {
+      method: "POST",
+      headers: {
+        "x-api-key": apiKey,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({ query, text: true }),
+      signal: opts.signal
+    });
+  } catch (err) {
+    if (err instanceof TypeError && err.message.includes("fetch")) {
+      throw new Error(t("webErrors.cannotReach", { endpoint: EXA_ENDPOINT }));
+    }
+    throw err;
+  }
+  if (!resp.ok) {
+    if (resp.status === 401 || resp.status === 403) {
+      throw new Error(t("webErrors.exaUnauthorized"));
+    }
+    if (resp.status === 429) throw new Error(t("webErrors.exaRateLimit"));
+    throw new Error(t("webErrors.exaServerError", { status: resp.status }));
+  }
+  const raw = await resp.text();
+  let data;
+  try {
+    data = JSON.parse(raw);
+  } catch {
+    throw new Error(t("webErrors.exaParseError", { status: resp.status }));
+  }
+  const answer = data.answer ?? "";
+  const citations = data.citations ?? [];
+  const results = [];
+  if (answer) {
+    results.push({ title: answer, url: "", snippet: "", answer });
+  }
+  const count = Math.min(citations.length, topK);
+  for (let i = 0; i < count; i++) {
+    const c = citations[i];
+    if (!c.url) continue;
+    results.push({
+      title: c.title || `Source ${i + 1}`,
+      url: c.url,
+      snippet: c.text ?? ""
+    });
+  }
+  return results;
+}
 function parseSearxngHtmlResults(html) {
   const root = (0, import_node_html_parser.parse)(html);
   const results = [];
@@ -9696,7 +9885,7 @@ function registerWebTools(registry, opts = {}) {
   const maxFetchChars = opts.maxFetchChars ?? DEFAULT_FETCH_MAX_CHARS;
   registry.register({
     name: "web_search",
-    description: "Search the public web. Returns ranked results with title, url, and snippet. Call this when the answer's correctness depends on current state \u2014 anything that changes over time (events, prices, releases, status of a thing in the real world). Composing such answers from training memory invents stale numbers; search first, then ground the answer in the results. For evergreen / definitional questions you don't need this. To change the backend, use /search-engine mojeek|searxng|metaso|tavily.",
+    description: "Search the public web. Returns ranked results with title, url, and snippet. Call this when the answer's correctness depends on current state \u2014 anything that changes over time (events, prices, releases, status of a thing in the real world). Composing such answers from training memory invents stale numbers; search first, then ground the answer in the results. For evergreen / definitional questions you don't need this.",
     readOnly: true,
     parallelSafe: true,
     parameters: {
@@ -9705,7 +9894,7 @@ function registerWebTools(registry, opts = {}) {
         query: { type: "string", description: "Natural-language search query." },
         topK: {
           type: "integer",
-          description: `Number of results to return (1..10). Default ${defaultTopK}.`
+          description: `Number of results to return. Default ${defaultTopK}.`
         }
       },
       required: ["query"]
@@ -9749,14 +9938,30 @@ ${page.text}`;
   return registry;
 }
 function formatSearchResults(query, results) {
-  const lines = [`query: ${query}`, `
-results (${results.length}):`];
-  results.forEach((r, i) => {
+  const lines = [`query: ${query}`];
+  const hasAnswer = results.length > 0 && results[0]?.url === "" && results[0]?.answer;
+  if (hasAnswer) {
+    lines.push("\nanswer:");
+    lines.push(`  ${results[0].answer}`);
+    const sources = results.slice(1);
     lines.push(`
+sources (${sources.length}):`);
+    sources.forEach((r, i) => {
+      lines.push(`
 ${i + 1}. ${r.title}`);
-    lines.push(`   ${r.url}`);
-    if (r.snippet) lines.push(`   ${r.snippet}`);
-  });
+      lines.push(`   ${r.url}`);
+      if (r.snippet) lines.push(`   ${r.snippet}`);
+    });
+  } else {
+    lines.push(`
+results (${results.length}):`);
+    results.forEach((r, i) => {
+      lines.push(`
+${i + 1}. ${r.title}`);
+      lines.push(`   ${r.url}`);
+      if (r.snippet) lines.push(`   ${r.snippet}`);
+    });
+  }
   return lines.join("\n");
 }
 
@@ -10423,7 +10628,9 @@ var DEFAULT_OUTLINE_THRESHOLD_BYTES = 64 * 1024;
 var DEFAULT_MAX_LIST_BYTES = 256 * 1024;
 var HARD_MAX_FILE_BYTES = 32 * 1024 * 1024;
 var OUTLINE_HEAD_LINES = 80;
-var SKIP_DIR_NAMES = new Set(DEFAULT_INDEX_EXCLUDES.dirs);
+var SKIP_DIR_NAMES = new Set(
+  DEFAULT_INDEX_EXCLUDES.dirs.filter((d) => d !== ".reasonix")
+);
 var BINARY_EXTENSIONS = new Set(DEFAULT_INDEX_EXCLUDES.exts);
 function displayRel3(rootDir, full) {
   return pathMod4.relative(rootDir, full).replaceAll("\\", "/");
@@ -11150,6 +11357,21 @@ function sanitizeEvidence(raw) {
   }
   return out.length > 0 ? out : void 0;
 }
+function summarizeEvidence(evidence) {
+  if (!evidence || evidence.length === 0) return void 0;
+  const parts = evidence.map((item) => `${item.kind}: ${item.summary}`);
+  return parts.join("; ");
+}
+function compactStepCompletion(update) {
+  const compact = {
+    kind: "step_completed",
+    stepId: update.stepId,
+    result: update.result
+  };
+  const evidenceSummary = summarizeEvidence(update.evidence);
+  if (evidenceSummary) compact.evidenceSummary = evidenceSummary;
+  return compact;
+}
 function registerSubmitPlan(registry, opts) {
   registry.register({
     name: "submit_plan",
@@ -11263,9 +11485,9 @@ function registerMarkStepComplete(registry, opts) {
       opts.onStepCompleted?.(update);
       const verdict = await (ctx?.confirmationGate ?? pauseGate).ask({
         kind: "plan_checkpoint",
-        payload: { stepId, title, result, notes }
+        payload: { stepId, title, result, notes, completion: update }
       });
-      if (verdict.type === "continue") return JSON.stringify(update);
+      if (verdict.type === "continue") return JSON.stringify(compactStepCompletion(update));
       if (verdict.type === "revise") {
         if (verdict.feedback) return `revision requested: ${verdict.feedback}`;
         throw new Error("user requested revision at checkpoint");
@@ -11478,6 +11700,7 @@ function nextRunId() {
   runIdCounter++;
   return `sub-${runIdCounter.toString(36)}`;
 }
+var SHARED_SUBAGENT_SINK = { current: null };
 var SUBAGENT_BASE_SYSTEM = `You are a Reasonix subagent. The parent agent spawned you to handle one focused subtask, then return.
 
 Rules:
@@ -11576,12 +11799,40 @@ async function spawnSubagent(opts) {
   let toolIter = 0;
   let summarisingEmitted = false;
   let forcedSummaryFired = false;
+  let outputChars = 0;
+  let reasoningChars = 0;
+  let toolReadChars = 0;
+  let lastStreamEmitAt = 0;
+  let charsSinceLastEmit = 0;
+  const STREAM_EMIT_INTERVAL_MS = 200;
+  const STREAM_EMIT_CHARS = 400;
+  const maybeEmitStreamProgress = (now, force) => {
+    if (!sink?.current) return;
+    if (!force && now - lastStreamEmitAt < STREAM_EMIT_INTERVAL_MS && charsSinceLastEmit < STREAM_EMIT_CHARS) {
+      return;
+    }
+    lastStreamEmitAt = now;
+    charsSinceLastEmit = 0;
+    sink.current({
+      kind: "stream-progress",
+      runId,
+      task: taskPreview,
+      skillName,
+      model,
+      iter: toolIter,
+      elapsedMs: now - startedAt,
+      outputChars,
+      reasoningChars,
+      toolReadChars
+    });
+  };
   try {
     for await (const ev of childLoop.step(opts.task)) {
       sink?.current?.({ kind: "inner", runId, task: taskPreview, skillName, model, inner: ev });
       if (ev.role === "tool") {
         toolIter++;
         summarisingEmitted = false;
+        toolReadChars += ev.content?.length ?? 0;
         sink?.current?.({
           kind: "progress",
           runId,
@@ -11591,6 +11842,17 @@ async function spawnSubagent(opts) {
           iter: toolIter,
           elapsedMs: Date.now() - startedAt
         });
+        maybeEmitStreamProgress(Date.now(), true);
+      }
+      if (ev.role === "assistant_delta") {
+        const dContent = ev.content?.length ?? 0;
+        const dReason = ev.reasoningDelta?.length ?? 0;
+        if (dContent > 0 || dReason > 0) {
+          outputChars += dContent;
+          reasoningChars += dReason;
+          charsSinceLastEmit += dContent + dReason;
+          maybeEmitStreamProgress(Date.now(), false);
+        }
       }
       if (ev.role === "assistant_delta" && !summarisingEmitted && (ev.content ?? "").length > 0) {
         summarisingEmitted = true;
@@ -11831,6 +12093,14 @@ function applyEditBlock(block, rootDir) {
           message: "SEARCH text does not match the current file content exactly"
         };
       }
+      const nextIdx = content.indexOf(adaptedSearch, idx + 1);
+      if (nextIdx !== -1) {
+        return {
+          path: block.path,
+          status: "not-found",
+          message: "SEARCH text appears multiple times; include more context to disambiguate"
+        };
+      }
       const replaced = `${content.slice(0, idx)}${adaptedReplace}${content.slice(idx + adaptedSearch.length)}`;
       const outBuf = Buffer.from(replaced, "utf8");
       ftruncateSync(fd, outBuf.length);
@@ -11942,6 +12212,7 @@ export {
   registerChoiceTool,
   registerPlanTool,
   registerTodoTool,
+  SHARED_SUBAGENT_SINK,
   spawnSubagent,
   formatSubagentResult,
   webFetch,
@@ -11957,4 +12228,4 @@ export {
 he/he.js:
   (*! https://mths.be/he v1.2.0 by @mathias | MIT license *)
 */
-//# sourceMappingURL=chunk-JBH5RM7X.js.map
+//# sourceMappingURL=chunk-OPYALNTT.js.map