omnius 1.0.458 → 1.0.459

package/dist/index.js

@@ -572346,6 +572346,20 @@ var init_streaming_executor = __esm({
       setExecutor(fn) {
         this.executeFn = fn;
       }
+      /** Rename a queued streaming tool entry when the provider reveals its real id late. */
+      rename(oldId, newId) {
+        if (!oldId || !newId || oldId === newId)
+          return;
+        const entry = this.tools.get(oldId);
+        if (!entry || this.tools.has(newId))
+          return;
+        this.tools.delete(oldId);
+        entry.id = newId;
+        this.tools.set(newId, entry);
+        const idx = this.insertionOrder.indexOf(oldId);
+        if (idx >= 0)
+          this.insertionOrder[idx] = newId;
+      }
       /** Update the parsed-input concurrency classifier. */
       setConcurrencyResolver(fn) {
         this.config.concurrencyResolver = fn;
@@ -572583,7 +572597,7 @@ var init_streaming_executor = __esm({
         entry.state = "executing";
         entry.startedAt = Date.now();
         const exec7 = this.executeFn;
-        entry.promise = exec7(entry.name, entry.args).then((result) => {
+        entry.promise = exec7(entry.id, entry.name, entry.args).then((result) => {
           entry.state = "completed";
           entry.result = result;
           entry.completedAt = Date.now();
@@ -574740,8 +574754,87 @@ function diagnoseContextDump(record) {
   if (record.metrics.estimatedTokens > 1e5) {
     diagnoses.add("large-context-window");
   }
+  if (hasToolResultBindingMismatch(record)) {
+    diagnoses.add("tool-result-binding-mismatch");
+  }
   return [...diagnoses].sort();
 }
+function hasToolResultBindingMismatch(record) {
+  const messages2 = Array.isArray(record.request?.["messages"]) ? record.request["messages"] : [];
+  if (messages2.length === 0)
+    return false;
+  const callsById = /* @__PURE__ */ new Map();
+  for (const message2 of messages2) {
+    if (message2["role"] !== "assistant")
+      continue;
+    const calls = Array.isArray(message2["tool_calls"]) ? message2["tool_calls"] : [];
+    for (const call of calls) {
+      const id2 = typeof call["id"] === "string" ? call["id"] : "";
+      const fn = call["function"] && typeof call["function"] === "object" ? call["function"] : {};
+      const name10 = typeof fn["name"] === "string" ? fn["name"] : "";
+      const argsRaw = typeof fn["arguments"] === "string" ? fn["arguments"] : "{}";
+      let args = {};
+      try {
+        args = JSON.parse(argsRaw);
+      } catch {
+        args = {};
+      }
+      if (id2)
+        callsById.set(id2, { name: name10, args });
+    }
+  }
+  for (const message2 of messages2) {
+    if (message2["role"] !== "tool")
+      continue;
+    const id2 = typeof message2["tool_call_id"] === "string" ? message2["tool_call_id"] : "";
+    const call = id2 ? callsById.get(id2) : void 0;
+    if (!call)
+      continue;
+    const requested = extractToolTarget(call.args);
+    if (!requested)
+      continue;
+    const content = typeof message2["content"] === "string" ? message2["content"] : "";
+    const reported = extractReportedToolTarget(content);
+    if (!reported)
+      continue;
+    if (!targetsCompatible(requested, reported))
+      return true;
+  }
+  return false;
+}
+function extractToolTarget(args) {
+  const value2 = args["path"] ?? args["file"] ?? args["file_path"] ?? args["filepath"] ?? args["directory"] ?? args["cwd"];
+  return typeof value2 === "string" ? value2.trim() : "";
+}
+function extractReportedToolTarget(content) {
+  const patterns = [
+    /^target=([^\n\r]+)/m,
+    /^path=([^\n\r]+)/m,
+    /\bfile\s+([^\s]+)\s+already contains/i,
+    /\bEdited\s+([^\s]+)\s+at line/i,
+    /\bat\s+([^\s]+)\s+\(sha256\b/i,
+    /\bRefusing to (?:edit|overwrite existing file)\s+([^\s]+)/i
+  ];
+  for (const pattern of patterns) {
+    const match = content.match(pattern);
+    const raw = match?.[1]?.trim();
+    if (raw)
+      return raw.replace(/[),.;:]+$/, "");
+  }
+  return "";
+}
+function targetsCompatible(requested, reported) {
+  const left = normalizeTargetForCompare(requested);
+  const right = normalizeTargetForCompare(reported);
+  if (!left || !right)
+    return true;
+  if (left === right)
+    return true;
+  return left.endsWith(`/${right}`) || right.endsWith(`/${left}`);
+}
+function normalizeTargetForCompare(value2) {
+  return value2.trim().replace(/^["']|["']$/g, "").replace(/\\/g, "/").replace(/\/+/g, "/").replace(/\/$/, "");
+}
 function summarizeToolEvent(toolName, success, diagnoses, command) {
   const status = success ? "success" : "failure";
   const parts = [`${toolName} ${status}`];
@@ -574853,6 +574946,7 @@ function writeContract(contractPath) {
     "- `focus-supervisor-cached-evidence`: the focus supervisor short-circuited a call successfully by reusing current cached evidence.",
     "- `background-task-id-missing`: task status lookup could not find the spawned task id.",
     "- `raw-discovery-dominates-context`: context-window metrics show low signal/noise around raw discovery output.",
+    "- `tool-result-binding-mismatch`: the outbound model transcript contains a tool result whose reported target does not match the assistant tool call it is attached to.",
     ""
   ].join("\n");
   writeFileSync49(contractPath, body, "utf-8");
@@ -578130,27 +578224,39 @@ function sanitizeHistoryThink(messages2) {
   const sanitized = [];
   for (let i2 = 0; i2 < stripped.length; i2++) {
     const current = stripped[i2];
-    const next = stripped[i2 + 1];
-    if (isOrphanDuplicateAssistantToolAnchor(current, next, referencedToolCallIds)) {
+    if (isOrphanDuplicateAssistantToolAnchor(stripped, i2, referencedToolCallIds)) {
       continue;
     }
     sanitized.push(current);
   }
   return sanitized;
 }
-function isOrphanDuplicateAssistantToolAnchor(current, next, referencedToolCallIds) {
-  if (!next)
+function isOrphanDuplicateAssistantToolAnchor(messages2, index, referencedToolCallIds) {
+  const current = messages2[index];
+  if (!current)
     return false;
-  if (current.role !== "assistant" || next.role !== "assistant")
+  if (current.role !== "assistant")
     return false;
-  if (!Array.isArray(current.tool_calls) || !Array.isArray(next.tool_calls)) {
+  if (!Array.isArray(current.tool_calls) || current.tool_calls.length === 0) {
     return false;
   }
-  if (current.tool_calls.length === 0 || next.tool_calls.length === 0) {
+  if (assistantVisibleText(current).length > 0)
     return false;
+  let next;
+  for (let i2 = index + 1; i2 < Math.min(messages2.length, index + 8); i2++) {
+    const candidate = messages2[i2];
+    if (candidate.role === "system")
+      continue;
+    if (candidate.role !== "assistant")
+      return false;
+    next = candidate;
+    break;
   }
-  if (assistantVisibleText(current).length > 0)
+  if (!next)
+    return false;
+  if (!Array.isArray(next.tool_calls) || next.tool_calls.length === 0) {
     return false;
+  }
   if (toolCallsFingerprint(current.tool_calls) !== toolCallsFingerprint(next.tool_calls)) {
     return false;
   }
@@ -590807,10 +590913,12 @@ Then use file_read on individual FILES inside it.`);
             const rawToolCalls = msg.toolCalls;
             if (this.options.streamEnabled && this._streamingExecutor.hasTools) {
               const streamFpInFlight = /* @__PURE__ */ new Map();
-              this._streamingExecutor.setExecutor(async (name10, args) => {
-                let matchTc = rawToolCalls.find((tc) => tc.name === name10 && JSON.stringify(tc.arguments) === JSON.stringify(args)) ?? rawToolCalls.find((tc) => tc.name === name10);
+              this._streamingExecutor.setExecutor(async (id2, name10, args) => {
+                const argsFingerprint = this._buildToolFingerprint(name10, args);
+                const exactArgMatches = rawToolCalls.filter((tc) => tc.name === name10 && this._buildToolFingerprint(tc.name, tc.arguments ?? {}) === argsFingerprint);
+                let matchTc = rawToolCalls.find((tc) => tc.id === id2) ?? (exactArgMatches.length === 1 ? exactArgMatches[0] : void 0);
                 if (!matchTc) {
-                  const synthId = globalThis.crypto?.randomUUID?.() || `call_${Date.now()}`;
+                  const synthId = id2 || globalThis.crypto?.randomUUID?.() || `call_${Date.now()}`;
                   matchTc = { id: synthId, name: name10, arguments: args };
                   messages2.push({
                     role: "assistant",
@@ -597200,14 +597308,17 @@ ${description}`
               }
             }
             const acc = toolCallAccumulators.get(idx);
+            if (chunk.toolCallId && chunk.toolCallId !== acc.id) {
+              const previousId = acc.id;
+              acc.id = chunk.toolCallId;
+              this._streamingExecutor.rename(previousId, acc.id);
+            }
             if (chunk.toolCallName) {
               acc.name = chunk.toolCallName;
               if (!this._streamingExecutor.getStates().has(acc.id) && acc.name) {
                 this._streamingExecutor.queue(acc.id, acc.name);
               }
             }
-            if (chunk.toolCallId)
-              acc.id = chunk.toolCallId;
             if (chunk.toolCallArgs) {
               acc.args += chunk.toolCallArgs;
             }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "omnius",
-  "version": "1.0.458",
+  "version": "1.0.459",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "omnius",
-      "version": "1.0.458",
+      "version": "1.0.459",
       "bundleDependencies": [
         "image-to-ascii"
       ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omnius",
-  "version": "1.0.458",
+  "version": "1.0.459",
   "description": "AI coding agent powered by open-source models (Ollama/vLLM) — interactive TUI with agentic tool-calling loop",
   "type": "module",
   "main": "./dist/index.js",