omnius 1.0.468 → 1.0.470

package/dist/index.js

@@ -14298,27 +14298,62 @@ function replaceAllOccurrences(haystack, needle, replacement) {
   return haystack.split(needle).join(replacement);
 }
 function buildMissingOldStringLlmContent(input) {
+  const attemptedLineCount = input.attemptedOldString.split("\n").length;
+  const attemptedCharCount = input.attemptedOldString.length;
   const lines = [
     "[FILE_EDIT_OLD_STRING_NOT_FOUND]",
     `path=${input.path}`,
     "The attempted old_string was absent from the current file.",
+    `attempted_old_string_lines=${attemptedLineCount}`,
+    `attempted_old_string_chars=${attemptedCharCount}`,
+    "repair_state=needs_current_range",
+    "patch_ready=false",
+    "read_required=true unless current path+start_line+end_line+expected_hash are already present in active evidence",
     "Do not copy diagnostic gutters into old_string. Ignore line numbers, leading '>' markers, and the '|' separator.",
+    "Transport rule: file_edit is for exact unique current text. If the intended edit is a contiguous line-range delete/replace/insert, use file_patch with start_line/end_line from file_read and expected_hash or expected_old_content.",
+    "Range patch contract: if patch_ready=true or current target line range plus expected_hash are known, call file_patch. If the range/hash is missing after stale exact edit failure, file_read the target once.",
     "",
-    "attempted_old_string:",
-    fencedText(input.attemptedOldString)
+    ...diagnosticTextBlock("attempted_old_string", input.attemptedOldString)
   ];
   if (input.snippetContent) {
     const range = input.snippetStartLine && input.snippetEndLine && input.totalLines ? `lines ${input.snippetStartLine}-${input.snippetEndLine} of ${input.totalLines}` : "closest current text";
-    lines.push("", `copyable_current_text_without_gutters (${range}):`, fencedText(stripDiagnosticGutters(input.snippetContent)), "", "Next action: build a new file_edit old_string only from the copyable_current_text_without_gutters block, or file_read the target if more context is needed.");
+    lines.push("", `current_anchor_range=${range}`, "target_range_status=anchor_only_not_patch_ready", `copyable_current_text_without_gutters (${range}):`, fencedText(stripDiagnosticGutters(input.snippetContent)), "", "Next action: build a new file_edit old_string only from the copyable_current_text_without_gutters block, or use file_patch from fresh file_read line numbers when the target is a block/range.");
   } else {
-    lines.push("", "Next action: file_read the target, then build old_string from exact current file content.");
+    lines.push("", "Next action: file_read the target, then either build old_string from exact current file content or use file_patch for a line-range edit.");
   }
   lines.push("", "Do not use shell text-rewrite commands as a workaround for this edit failure; keep the change tracked through file_edit, batch_edit, file_patch, or file_write.");
   if (input.newString.length > 0) {
-    lines.push("", "desired_new_string:", fencedText(input.newString));
+    lines.push("", ...diagnosticTextBlock("desired_new_string", input.newString));
   }
   return lines.join("\n");
 }
+function diagnosticTextBlock(label, text2) {
+  const maxChars = 700;
+  const maxLines = 12;
+  const lineCount = text2.split("\n").length;
+  if (text2.length <= maxChars && lineCount <= maxLines) {
+    return [`${label}:`, fencedText(text2)];
+  }
+  return [
+    `${label}_preview:`,
+    fencedText(previewText(text2, maxChars)),
+    `${label}_omitted=true`,
+    `${label}_omitted_reason=stale failed edit payload is not authoritative current file evidence`
+  ];
+}
+function previewText(text2, maxChars) {
+  if (text2.length <= maxChars)
+    return text2;
+  const headSize = Math.floor(maxChars * 0.65);
+  const tailSize = Math.max(80, maxChars - headSize - 64);
+  const head = text2.slice(0, headSize).trimEnd();
+  const tail = text2.slice(-tailSize).trimStart();
+  return `${head}
+...
+[omitted ${text2.length - head.length - tail.length} chars]
+...
+${tail}`;
+}
 function buildAmbiguousOldStringLlmContent(input) {
   const replaceAllArgs = {
     path: input.path,
@@ -14367,7 +14402,7 @@ var init_file_edit = __esm({
     init_text_encoding();
     FileEditTool = class {
       name = "file_edit";
-      description = "Make a precise edit to a file by replacing an exact string match. The old_string must be unique in the file unless replace_all is true. Use replace_all to rename variables or change repeated patterns throughout the file.";
+      description = "Make a precise edit to a file by replacing an exact string match. The old_string must be unique in the file unless replace_all is true. Use replace_all to rename variables or change repeated patterns throughout the file. Use file_patch instead when file_read line numbers identify a contiguous block to delete, replace, or insert around.";
       parameters = {
         type: "object",
         properties: {
@@ -14490,6 +14525,8 @@ var init_file_edit = __esm({
             }
           }
           if (occurrences === 0) {
+            const attemptedOldStringLines = oldString.split("\n").length;
+            const attemptedOldStringChars = oldString.length;
             const alreadyAppliedLines = newString.length > 0 ? findMatchLines(content, newString) : [];
             if (alreadyAppliedLines.length > 0) {
               const lineInfo = alreadyAppliedLines.length === 1 ? `line ${alreadyAppliedLines[0]}` : `${alreadyAppliedLines.length} locations (lines ${alreadyAppliedLines.join(", ")})`;
@@ -14512,10 +14549,12 @@ var init_file_edit = __esm({
               const pct = Math.round(snippet.similarity * 100);
               errorMsg += `
 
-Current file content (closest match, ${pct}% similarity, lines ${snippet.startLine}–${snippet.endLine} of ${snippet.totalLines}):
+Attempted old_string spans ${attemptedOldStringLines} line(s), ${attemptedOldStringChars} chars. The diagnostic below is the closest anchor-line match, not proof that the whole old_string exists.
+
+Current file content (closest anchor-line match, ${pct}% line similarity, lines ${snippet.startLine}–${snippet.endLine} of ${snippet.totalLines}):
 ${snippet.content}
 
-Use the EXACT current content above to construct a working old_string. Do not retry with a different guess — the file on disk has changed since you last read it.`;
+Use the EXACT current content above to construct a working old_string. If the intended change is a contiguous line range, use file_patch with start_line/end_line from a fresh file_read. Do not retry with a different guess — the file on disk has changed since you last read it.`;
             } else {
               errorMsg += ` The file is empty or binary. Use file_read to inspect.`;
             }
@@ -28917,7 +28956,7 @@ var init_file_patch = __esm({
     init_text_encoding();
     FilePatchTool = class {
       name = "file_patch";
-      description = "Edit specific line ranges in a file. More precise than string matching for large files. Modes: 'replace' replaces lines start_line..end_line with new_content, 'insert_before' inserts before start_line, 'insert_after' inserts after start_line, 'delete' removes lines start_line..end_line. Use dry_run to preview changes.";
+      description = "Edit specific line ranges in a file. More precise than string matching for large files. Modes: 'replace' replaces lines start_line..end_line with new_content, 'insert_before' inserts before start_line, 'insert_after' inserts after start_line, 'delete' removes lines start_line..end_line. Use this instead of file_edit when file_read line numbers identify the contiguous block to change. Use dry_run to preview changes.";
       parameters = {
         type: "object",
         properties: {
@@ -575475,7 +575514,7 @@ function compactCachedEvidence(text2) {
   const lineCount = value2 ? value2.split("\n").length : 0;
   const sha = value2.match(/sha256=([a-f0-9]{8,64})/i)?.[1];
   const header = value2.match(/\[FILE CONTEXT \|[^\]]+\]/)?.[0];
-  const preview = value2.split("\n").map((line) => line.trim()).find((line) => line.length > 0 && !line.startsWith("[trust_tier:") && line !== "---") ?? "";
+  const preview = meaningfulCachedEvidencePreview(value2);
   return [
     "Cached evidence is already available in the active context/tool cache; full payload omitted from this block to avoid context bloat.",
     `cached_size=${lineCount} lines, ${value2.length} chars`,
@@ -575485,6 +575524,35 @@ function compactCachedEvidence(text2) {
     "Use the cached evidence now, or request a distinct offset/limit/query if genuinely needed."
   ].filter(Boolean).join("\n");
 }
+function meaningfulCachedEvidencePreview(text2) {
+  const lines = text2.split("\n").map((line) => line.trim()).filter(Boolean);
+  const preview = [];
+  const push = (value2) => {
+    if (!value2)
+      return;
+    if (preview.includes(value2))
+      return;
+    preview.push(value2);
+  };
+  for (let i2 = 0; i2 < lines.length; i2++) {
+    const line = lines[i2];
+    if (line.startsWith("[trust_tier:") || line.startsWith("[quoted_tool_output:") || line === "---" || line === "[SHELL RESULT CACHE]" || line === "[SHELL TRANSCRIPT]" || /^cwd_(?:before|after|note):/i.test(line) || line === "output:" || line === "stderr:" || line === "[no stderr captured]") {
+      continue;
+    }
+    if (line === "stdout:" || line === "error:") {
+      const next = lines.slice(i2 + 1).find((candidate) => candidate && candidate !== "[no stdout captured]" && candidate !== "[no stderr captured]" && candidate !== "[SHELL TRANSCRIPT]" && candidate !== "stderr:" && !/^cwd_(?:before|after|note):/i.test(candidate));
+      if (next)
+        push(`${line} ${next}`);
+      continue;
+    }
+    if (line === "[no stdout captured]")
+      continue;
+    push(line);
+    if (preview.join(" | ").length >= 520 || preview.length >= 5)
+      break;
+  }
+  return preview.join(" | ").slice(0, 700);
+}
 function actionReasonSummary(actionReason) {
   if (!actionReason)
     return "";
@@ -578077,6 +578145,43 @@ import { z as z17 } from "zod";
 function cleanToolActionReasonField(value2) {
   return String(value2 ?? "").replace(/\s+/g, " ").trim();
 }
+function stripShellQuotedSegments(command) {
+  let out = "";
+  let quote2 = null;
+  let escaped = false;
+  for (let i2 = 0; i2 < command.length; i2++) {
+    const ch = command[i2];
+    if (quote2 === "'") {
+      if (ch === "'")
+        quote2 = null;
+      out += " ";
+      continue;
+    }
+    if (quote2 === '"') {
+      if (escaped) {
+        escaped = false;
+        out += " ";
+        continue;
+      }
+      if (ch === "\\") {
+        escaped = true;
+        out += " ";
+        continue;
+      }
+      if (ch === '"')
+        quote2 = null;
+      out += " ";
+      continue;
+    }
+    if (ch === "'" || ch === '"') {
+      quote2 = ch;
+      out += " ";
+      continue;
+    }
+    out += ch;
+  }
+  return out;
+}
 function parsePersistentMemoryMode(value2) {
   if (value2 === "full" || value2 === "deferred" || value2 === "off")
     return value2;
@@ -578768,6 +578873,7 @@ var init_agenticRunner = __esm({
     init_completionLedger();
     init_completionAutoFinalize();
     init_verificationCommand();
+    init_completionContract();
     init_dist6();
     init_ollama_pool();
     init_personality();
@@ -579826,6 +579932,8 @@ ${parts.join("\n")}
           lines.push(`recent_failed_approaches=${ts.failedApproaches.slice(-3).join(" | ").replace(/\s+/g, " ").slice(0, 420)}`);
         }
         lines.push("tool_call_contract=Mutating/side-effectful tool calls require action_reason {task_anchor,intent,evidence,expected_result,scope}; read-only evidence tools may include it but must never be blocked only for missing metadata. Compact public facts only, no hidden chain-of-thought.");
+        lines.push("edit_transport_contract=file_edit is for exact unique current text copied from file_read; file_patch is for line-range delete/replace/insert using file_read line numbers and expected_hash/current target evidence. A failed file_edit invalidates the edit premise; rebuild from current evidence instead of broadening into file_write unless the task is truly whole-file replacement.");
+        lines.push("range_patch_contract=If patch_ready=true or current path+start_line+end_line+expected_hash are known, call file_patch. If read_required=true or a stale exact edit lacks current range/hash, call file_read once. Do not call file_read when patch_ready=true.");
         lines.push(`scope_contract=${Array.from(TOOL_ACTION_REASON_SCOPES).join("|")}; use targeted_patch for constrained code edits and full_file_rewrite only for deliberate whole-file replacement.`);
         const focus = this._focusSupervisor?.snapshot().directive ?? null;
         if (focus) {
@@ -580035,7 +580143,7 @@ ${parts.join("\n")}
           temperature: options2?.temperature ?? 0,
           requestTimeoutMs: options2?.requestTimeoutMs ?? 3e5,
           taskTimeoutMs: options2?.taskTimeoutMs ?? 0,
-          // 0 = no hard timeout (turn budget is the loop breaker)
+          // legacy health-check interval only; never a hard timeout
           compactionThreshold: options2?.compactionThreshold ?? 4e4,
           deepContext: options2?.deepContext ?? false,
           dynamicContext: options2?.dynamicContext ?? "",
@@ -581769,8 +581877,11 @@ ${modelVisible}` : modelVisible || result.error || displayOutput || "";
         const realFileMutation = input.realFileMutation ?? this._isRealProjectMutation(input.toolName, input.result);
         const attemptedTargetPaths = this._extractToolTargetPaths(input.toolName, input.args, input.result);
         const realMutationPaths = input.realMutationPaths ?? (realFileMutation ? attemptedTargetPaths : []);
-        const shellVerification = input.toolName === "shell" && input.result.runtimeAuthored !== true && this._shellResultLooksLikeVerification(input.args, input.result);
-        const shellVerificationFamily = shellVerification ? this._shellVerificationFamily(input.args) : "";
+        const shellActionReasonScope = input.toolName === "shell" ? input.actionReason?.scope : void 0;
+        const shellActionReasonDeclaresVerification = shellActionReasonScope === "verification";
+        const shellActionReasonDeclaresNonVerification = typeof shellActionReasonScope === "string" && shellActionReasonScope.length > 0 && shellActionReasonScope !== "verification";
+        const shellVerification = input.toolName === "shell" && (shellActionReasonDeclaresVerification || !shellActionReasonDeclaresNonVerification && input.result.runtimeAuthored !== true && this._shellResultLooksLikeVerification(input.args, input.result));
+        const shellVerificationFamily = shellVerification ? this._shellVerificationFamily(input.args, input.actionReason) : "";
         if (input.result.success === true && this._isProjectEditTool(input.toolName) && !realFileMutation && input.result.alreadyApplied !== true) {
           return;
         }
@@ -581783,8 +581894,8 @@ ${modelVisible}` : modelVisible || result.error || displayOutput || "";
           outputPreview: (input.outputPreview ?? this._toolEvidencePreview(input.result, void 0, 1200, input.toolName)).toString().slice(0, input.toolName === "audio_analyze" || input.toolName === "video_understand" ? 1200 : 500),
           argsKey: input.argsKey.slice(0, 300),
           targetPaths: attemptedTargetPaths,
-          role: input.result.completionEvidenceRole ?? (input.result.alreadyApplied === true ? "mutation" : realFileMutation ? "mutation" : input.result.runtimeAuthored === true ? "blocker" : shellVerification ? "verification" : void 0),
-          family: input.result.completionEvidenceFamily ?? (input.result.runtimeAuthored === true ? "runtime_control" : shellVerification ? shellVerificationFamily : void 0),
+          role: input.result.completionEvidenceRole ?? (input.result.alreadyApplied === true ? "mutation" : realFileMutation ? "mutation" : input.result.runtimeAuthored === true && !shellVerification ? "blocker" : shellVerification ? "verification" : void 0),
+          family: input.result.completionEvidenceFamily ?? (input.result.runtimeAuthored === true && !shellVerification ? "runtime_control" : shellVerification ? shellVerificationFamily : void 0),
           verificationImpact: input.result.completionVerificationImpact ?? (input.result.alreadyApplied === true ? "neutral" : realFileMutation ? "invalidates" : void 0),
           metrics: input.result.completionEvidenceMetrics
         });
@@ -581804,7 +581915,17 @@ ${modelVisible}` : modelVisible || result.error || displayOutput || "";
         }
         this._saveCompletionLedgerSafe();
       }
-      _shellVerificationFamily(args) {
+      _shellVerificationFamily(args, actionReason) {
+        if (actionReason?.scope === "verification") {
+          const stableParts = [
+            actionReason.task_anchor,
+            actionReason.expected_result
+          ].map((part) => String(part ?? "").trim()).filter(Boolean);
+          const semanticKey = (stableParts.length > 0 ? stableParts : [String(actionReason.intent ?? "").trim()].filter(Boolean)).join(" | ");
+          const normalized2 = normalizeCompletionKey(semanticKey || "shell verification", "shell_verification").slice(0, 140);
+          if (normalized2)
+            return `shell-action:${normalized2}`;
+        }
         const command = String(args?.["command"] ?? args?.["cmd"] ?? "").trim();
         const normalized = normalizeShellCommand(command);
         return `shell:${(normalized || command || "verification").slice(0, 160)}`;
@@ -581813,10 +581934,8 @@ ${modelVisible}` : modelVisible || result.error || displayOutput || "";
         const command = String(args?.["command"] ?? args?.["cmd"] ?? "");
         if (!command.trim())
           return false;
-        const text2 = `${command}
-${result.output ?? ""}
-${result.error ?? ""}`;
-        return /\b(test|tests|vitest|jest|pytest|go test|cargo test|npm test|pnpm test|yarn test|typecheck|tsc|build|verify|verification|check)\b/i.test(text2);
+        void result;
+        return /\b(test|tests|vitest|jest|pytest|go test|cargo test|npm test|pnpm test|yarn test|typecheck|tsc|build|verify|verification|check)\b/i.test(command);
       }
       _shouldSuppressCompletionDiscoveryEvidence(toolName, result, targetPaths) {
         if (result.success !== true)
@@ -583757,17 +583876,18 @@ ${contentPreview}
         const cmd = rawCmd.trim();
         if (!cmd)
           return false;
-        if (/(^|[^&\d])(>|>>)\s*\S/.test(cmd))
+        const unquoted = stripShellQuotedSegments(cmd);
+        if (/(^|[^&\d])(>|>>)\s*\S/.test(unquoted))
           return true;
-        if (/\|\s*(?:tee|dd)\b/i.test(cmd))
+        if (/\|\s*(?:tee|dd)\b/i.test(unquoted))
           return true;
-        if (/\b(?:sed|gsed)\s+(?:[^\n;&|]*\s)?(?:-i|--in-place)\b/i.test(cmd))
+        if (/\b(?:sed|gsed)\s+(?:[^\n;&|]*\s)?(?:-i|--in-place)\b/i.test(unquoted))
           return true;
-        if (/\bperl\s+-[A-Za-z]*i[A-Za-z]*\b/.test(cmd))
+        if (/\bperl\s+-[A-Za-z]*i[A-Za-z]*\b/.test(unquoted))
           return true;
-        if (/\b(?:cp|mv|rm|mkdir|rmdir|touch|truncate|ln|install|chmod|chown|chgrp|setfacl)\b/i.test(cmd))
+        if (/\b(?:cp|mv|rm|mkdir|rmdir|touch|truncate|ln|install|chmod|chown|chgrp|setfacl)\b/i.test(unquoted))
           return true;
-        if (/\b(?:udevadm|mount|umount|modprobe|insmod)\b/i.test(cmd))
+        if (/\b(?:udevadm|mount|umount|modprobe|insmod)\b/i.test(unquoted))
           return true;
         if (/\b(?:python3?|node|ruby|deno|bun)\b[\s\S]{0,240}\b(?:writeFile|writeFileSync|openSync|mkdirSync|renameSync|unlinkSync|rmSync)\b/i.test(cmd))
           return true;
@@ -584227,7 +584347,7 @@ ${sections.join("\n")}` : sections.join("\n");
       _buildRepeatCachedEvidenceNotice(toolName, args, hits, cachedResult) {
         const argPreview = JSON.stringify(args ?? {}).slice(0, 200);
         const target = this.extractPrimaryToolPath(args) || argPreview;
-        const summary = this._summarizeCachedToolResult(cachedResult);
+        const summary = this._summarizeCachedToolResult(toolName, cachedResult);
         return [
           "[REPEAT GATE - cached evidence not re-sent]",
           `Exact repeat #${hits} of ${toolName}(${argPreview}).`,
@@ -584239,17 +584359,46 @@ ${sections.join("\n")}` : sections.join("\n");
           "If you need different information, use a distinct offset/limit/query. For broad multi-file discovery, use file_explore, grep_search, fanout_explore, or full_sub_agent instead of repeating this call."
         ].join("\n");
       }
-      _summarizeCachedToolResult(output) {
+      _summarizeCachedToolResult(toolName, output) {
         const text2 = output || "";
         const lineCount = text2 ? text2.split("\n").length : 0;
         const sha = text2.match(/sha256=([a-f0-9]{8,64})/i)?.[1];
         const header = text2.match(/\[FILE CONTEXT \|[^\]]+\]/)?.[0];
+        const preview = toolName === "shell" ? this._meaningfulCachedShellPreview(text2) : "";
         return [
           `cached_size=${lineCount} lines, ${text2.length} chars`,
           sha ? `cached_sha256=${sha.slice(0, 16)}` : "",
-          header ? `cached_header=${header.slice(0, 220)}` : ""
+          header ? `cached_header=${header.slice(0, 220)}` : "",
+          preview ? `cached_preview=${preview}` : ""
         ].filter(Boolean).join("\n");
       }
+      _meaningfulCachedShellPreview(text2) {
+        const lines = text2.split("\n").map((line) => line.trim()).filter(Boolean);
+        const preview = [];
+        const push = (value2) => {
+          if (!value2 || preview.includes(value2))
+            return;
+          preview.push(value2);
+        };
+        for (let i2 = 0; i2 < lines.length; i2++) {
+          const line = lines[i2];
+          if (line.startsWith("[trust_tier:") || line.startsWith("[quoted_tool_output:") || line === "---" || line === "[SHELL RESULT CACHE]" || line === "[SHELL TRANSCRIPT]" || /^cwd_(?:before|after|note):/i.test(line) || line === "output:" || line === "stderr:" || line === "[no stderr captured]") {
+            continue;
+          }
+          if (line === "stdout:" || line === "error:") {
+            const next = lines.slice(i2 + 1).find((candidate) => candidate && candidate !== "[no stdout captured]" && candidate !== "[no stderr captured]" && candidate !== "[SHELL TRANSCRIPT]" && candidate !== "stderr:" && !/^cwd_(?:before|after|note):/i.test(candidate));
+            if (next)
+              push(`${line} ${next}`);
+            continue;
+          }
+          if (line === "[no stdout captured]")
+            continue;
+          push(line);
+          if (preview.join(" | ").length >= 520 || preview.length >= 5)
+            break;
+        }
+        return preview.join(" | ").slice(0, 700);
+      }
       _renderKnowledgeBlock(recentToolResults) {
         if (recentToolResults.size === 0)
           return null;
@@ -586026,44 +586175,13 @@ Respond with your assessment, then take action.`;
         }
         const cleanedTask = cleanForStorage(task) || task.slice(0, 500);
         const start2 = Date.now();
-        const taskTimeoutMs = this.options.taskTimeoutMs;
-        const hardDeadlineMs = Number.isFinite(taskTimeoutMs) && taskTimeoutMs > 0 ? start2 + taskTimeoutMs : Number.POSITIVE_INFINITY;
-        let timedOut = false;
-        let timeoutSummary = "";
-        const remainingTaskMs = () => Number.isFinite(hardDeadlineMs) ? Math.max(0, hardDeadlineMs - Date.now()) : Number.POSITIVE_INFINITY;
+        const taskTimeoutMs = Number.isFinite(this.options.taskTimeoutMs) && this.options.taskTimeoutMs > 0 ? this.options.taskTimeoutMs : Number.POSITIVE_INFINITY;
         const boundedRequestTimeoutMs = () => {
           const configured = Number.isFinite(this.options.requestTimeoutMs) && this.options.requestTimeoutMs > 0 ? this.options.requestTimeoutMs : 3e5;
-          const remaining = remainingTaskMs();
-          return Number.isFinite(remaining) ? Math.max(1, Math.min(configured, remaining)) : configured;
-        };
-        const markTaskTimedOut = (phase, turn) => {
-          if (timedOut)
-            return;
-          timedOut = true;
-          timeoutSummary = `Incomplete: task timed out after ${taskTimeoutMs}ms during ${phase}.`;
-          this.emit({
-            type: "error",
-            content: timeoutSummary,
-            ...typeof turn === "number" ? { turn } : {},
-            timestamp: (/* @__PURE__ */ new Date()).toISOString()
-          });
-          this._onTypedEvent?.({
-            type: "run_failed",
-            runId: this._sessionId ?? "unknown",
-            error: timeoutSummary,
-            timestamp: (/* @__PURE__ */ new Date()).toISOString()
-          });
-        };
-        const checkTaskTimeout = (phase, turn) => {
-          if (!Number.isFinite(hardDeadlineMs))
-            return false;
-          if (Date.now() < hardDeadlineMs)
-            return false;
-          markTaskTimedOut(phase, turn);
-          return true;
+          return configured;
         };
         const selfEvalInterval = taskTimeoutMs;
-        let nextSelfEval = start2 + selfEvalInterval;
+        let nextSelfEval = Number.isFinite(selfEvalInterval) ? start2 + selfEvalInterval : Number.POSITIVE_INFINITY;
         let selfEvalCount = 0;
         const toolCallLog = [];
         this.aborted = false;
@@ -586930,8 +587048,6 @@ TASK: ${scrubbedTask}` : scrubbedTask;
         };
         const turnCap = this.options.maxTurns && this.options.maxTurns > 0 ? this.options.maxTurns : Number.MAX_SAFE_INTEGER;
         for (let turn = 0; turn < turnCap; turn++) {
-          if (checkTaskTimeout("primary turn", turn))
-            break;
           clearTurnState(this._appState);
           this._maybeApplyThinkGuard();
           if (this._paused) {
@@ -588604,10 +588720,8 @@ ${memoryLines.join("\n")}`
                 break;
               }
             } else {
-              const recovered = await this.retryOnTransient(reqErr, chatRequest, turn, hardDeadlineMs);
+              const recovered = await this.retryOnTransient(reqErr, chatRequest, turn);
               if (!recovered) {
-                if (checkTaskTimeout("backend request", turn))
-                  break;
                 const errMsg = reqErr instanceof Error ? reqErr.message : String(reqErr);
                 const cause = reqErr instanceof Error && reqErr.cause ? ` (${reqErr.cause.message ?? ""} ${reqErr.cause?.code ?? ""})` : "";
                 this.emit({
@@ -591591,6 +591705,7 @@ Then use file_read on individual FILES inside it.`);
                 toolName: tc.name,
                 argsKey: tc.arguments ? JSON.stringify(tc.arguments) : "",
                 args: tc.arguments,
+                actionReason: toolActionReason,
                 result,
                 outputPreview: this._toolEvidencePreview(result, output, 1200, tc.name),
                 realFileMutation,
@@ -592287,9 +592402,7 @@ Your most recent tool calls SUCCEEDED. If the task is complete, call task_comple
           }
         }
         let prevCycleToolCalls = toolCallCount;
-        while (!completed && !this.aborted && !this._completionIncompleteVerification && !timedOut && this.options.bruteForce && bruteForceCycle < this.options.bruteForceMaxCycles) {
-          if (checkTaskTimeout("brute-force re-engagement"))
-            break;
+        while (!completed && !this.aborted && !this._completionIncompleteVerification && this.options.bruteForce && bruteForceCycle < this.options.bruteForceMaxCycles) {
           bruteForceCycle++;
           const totalTurns = messages2.filter((m2) => m2.role === "assistant").length;
           if (bruteForceCycle > 1 && toolCallCount === prevCycleToolCalls) {
@@ -592353,8 +592466,6 @@ ${this.options.maxTurns && this.options.maxTurns > 0 ? `You have ${this.options.
           }
           const restartTurnCap = this.options.maxTurns && this.options.maxTurns > 0 ? this.options.maxTurns : Number.MAX_SAFE_INTEGER;
           for (let turn = 0; turn < restartTurnCap; turn++) {
-            if (checkTaskTimeout("brute-force turn", turn))
-              break;
             if (this._completionIncompleteVerification)
               break;
             this._maybeApplyThinkGuard();
@@ -592483,10 +592594,8 @@ ${this.options.maxTurns && this.options.maxTurns > 0 ? `You have ${this.options.
                   break;
                 }
               } else {
-                const recovered = await this.retryOnTransient(reqErr, chatRequest, turn, hardDeadlineMs);
+                const recovered = await this.retryOnTransient(reqErr, chatRequest, turn);
                 if (!recovered) {
-                  if (checkTaskTimeout("brute-force backend request", turn))
-                    break;
                   const errMsg2 = reqErr instanceof Error ? reqErr.message : String(reqErr);
                   const cause2 = reqErr instanceof Error && reqErr.cause ? ` (${reqErr.cause.message ?? ""} ${reqErr.cause?.code ?? ""})` : "";
                   this.emit({
@@ -592590,6 +592699,7 @@ ${this.options.maxTurns && this.options.maxTurns > 0 ? `You have ${this.options.
                 if (this.aborted)
                   break;
                 toolCallCount++;
+                const bfActionReason = this._toolActionReasonForCall(tc.name, tc.arguments ?? {});
                 const bfArgsKey = this._buildExactArgsKey(tc.arguments ?? {});
                 toolCallLog.push({ name: tc.name, argsKey: bfArgsKey });
                 this._toolLastUsedTurn.set(tc.name, turn);
@@ -592734,6 +592844,7 @@ Full content available via: repl_exec(code="data = retrieve('${handleId}')")  or
                   toolName: tc.name,
                   argsKey: bfArgsKey,
                   args: tc.arguments,
+                  actionReason: bfActionReason,
                   result,
                   outputPreview: this._toolEvidencePreview(result, output, 1200, tc.name),
                   realFileMutation: bfRealFileMutation,
@@ -592963,9 +593074,6 @@ Full content available via: repl_exec(code="data = retrieve('${handleId}')")  or
         }
         const durationMs = Date.now() - start2;
         const incompleteVerification = this._completionIncompleteVerification;
-        if (timedOut && !summary) {
-          summary = timeoutSummary || `Incomplete: task timed out after ${taskTimeoutMs}ms.`;
-        }
         if (incompleteVerification && !summary) {
           summary = incompleteVerification.summary;
         }
@@ -594512,10 +594620,11 @@ ${marker}` : marker);
           return null;
         if (process.env["OMNIUS_ALLOW_STALE_REPAIR_OVERWRITE"] === "1")
           return null;
-        if (this.options.modelTier !== "small" && this.options.modelTier !== "medium")
-          return null;
         if (args?.["dry_run"] === true || args?.["dryRun"] === true)
           return null;
+        const tier = this.options.modelTier ?? "large";
+        if (tier !== "small" && tier !== "medium")
+          return null;
         const path12 = this.extractPrimaryToolPath(args);
         if (!path12)
           return null;
@@ -594529,7 +594638,7 @@ ${marker}` : marker);
           return null;
         return [
           `[EDIT REPAIR LOCK] A recent narrow edit to ${active.path} failed because the model-visible target diverged from disk (${active.errorKind}; latest_file_hash=${active.latestFileHash || "unknown"}).`,
-          `This full-file overwrite was NOT executed. A stale narrow edit must not be repaired by broad file regeneration on ${this.options.modelTier ?? "unknown"} tier models.`,
+          `This full-file overwrite was NOT executed. A stale narrow edit must not be repaired by broad file regeneration; preserve a constrained edit path until fresh target evidence is used.`,
           ``,
           `Allowed next actions:`,
           `1. file_read ${active.path} once and construct file_edit from exact current text.`,
@@ -597851,6 +597960,8 @@ ${result}`
           return true;
         if (/stream timeout|no response or chunk within|no response within \d+\s*s|stream stalled/i.test(msg))
           return true;
+        if (/AbortError|operation was aborted|aborted due to timeout|signal timed out|timeout.*aborted/i.test(msg))
+          return true;
         if (/received HTML error page/i.test(msg))
           return true;
         if (/model is loading|server busy|overloaded/i.test(msg))
@@ -598131,11 +598242,13 @@ ${description}`
        * until recovery; other transient backend errors use bounded backoff.
        * Returns the response on success, or null if recovery did not apply.
        */
-      async retryOnTransient(initialErr, chatRequest, turn, hardDeadlineMs) {
+      async retryOnTransient(initialErr, chatRequest, turn) {
+        if (this.aborted)
+          return null;
         if (!this.isTransientError(initialErr))
           return null;
         const errMsg = flattenErrorText(initialErr);
-        const isNetworkError2 = /fetch failed|ECONNREFUSED|ECONNRESET|ETIMEDOUT|socket hang up|UND_ERR|other side closed|stream timeout|no response or chunk within|no response within \d+\s*s|stream stalled/i.test(errMsg);
+        const isNetworkError2 = /fetch failed|ECONNREFUSED|ECONNRESET|ETIMEDOUT|socket hang up|UND_ERR|other side closed|stream timeout|no response or chunk within|no response within \d+\s*s|stream stalled|AbortError|operation was aborted|aborted due to timeout|signal timed out|timeout.*aborted/i.test(errMsg);
         const isAuthError = this.isRecoverableAuthError(initialErr);
         const isGpuSlotUnavailable = this.isGpuSlotUnavailableError(initialErr);
         const maxRetries = isNetworkError2 || isGpuSlotUnavailable || isAuthError ? Infinity : 3;
@@ -598146,15 +598259,6 @@ ${description}`
         while (attempt <= (maxRetries === Infinity ? Number.MAX_SAFE_INTEGER : maxRetries)) {
           if (this.aborted)
             return null;
-          if (Number.isFinite(hardDeadlineMs) && Date.now() >= hardDeadlineMs) {
-            this.emit({
-              type: "error",
-              content: "Task timeout reached during backend retry",
-              turn,
-              timestamp: (/* @__PURE__ */ new Date()).toISOString()
-            });
-            return null;
-          }
           if (this.isPaymentRequiredError(initialErr) && typeof backend.rotateKey === "function") {
             const rotated = backend.rotateKey();
             if (rotated) {
@@ -598204,7 +598308,7 @@ ${description}`
             }
           }
           const delay4 = isGpuSlotUnavailable ? baseDelayMs : Math.min(baseDelayMs * Math.pow(2, attempt - 1), maxDelayMs);
-          const effectiveDelay = Number.isFinite(hardDeadlineMs) ? Math.max(0, Math.min(delay4, hardDeadlineMs - Date.now())) : delay4;
+          const effectiveDelay = delay4;
           const attemptLabel = maxRetries === Infinity ? `${attempt}` : `${attempt}/${maxRetries}`;
           if (isGpuSlotUnavailable) {
             this.emit({
@@ -598222,15 +598326,6 @@ ${description}`
           await new Promise((r2) => setTimeout(r2, effectiveDelay));
           if (this.aborted)
             return null;
-          if (Number.isFinite(hardDeadlineMs) && Date.now() >= hardDeadlineMs) {
-            this.emit({
-              type: "error",
-              content: "Task timeout reached before backend retry could resume",
-              turn,
-              timestamp: (/* @__PURE__ */ new Date()).toISOString()
-            });
-            return null;
-          }
           try {
             this._recordContextWindowDump("agent_turn_transient_retry", chatRequest, turn, attempt);
             const response = this.options.streamEnabled && this.hasStreamingSupport() ? await this.streamingRequest(chatRequest, turn) : await this.backend.chatCompletion(chatRequest);
@@ -728316,8 +728411,9 @@ function adoptHandoffRuns() {
       } catch {
       }
     }
-    if (r2.deadlineAtMs && r2.deadlineAtMs > 0 && process.env["OMNIUS_DISABLE_DAEMON_TIMEOUT_KILL"] !== "1") {
-      const remainingMs = r2.deadlineAtMs - Date.now();
+    const adoptedDeadlineAtMs = typeof r2.deadlineAtMs === "number" && r2.deadlineAtMs > 0 ? r2.deadlineAtMs : 0;
+    if (false) {
+      const remainingMs = adoptedDeadlineAtMs - Date.now();
       const adoptedPid = r2.pid;
       const adoptedJobId = r2.jobId;
       const fireTimeout = () => {
@@ -728803,13 +728899,13 @@ function handleHelp(req3, res) {
         enable: "POST /v1/chat/completions with body {agent_loop: true} runs an N-turn server-side loop. Daemon executes any tool_calls matching daemon-resident tools and re-prompts; client-side tool_calls cause the loop to yield back so caller can execute them.",
         merge_daemon_tools: "Body field include_daemon_tools: ['read'] (or ['read','run']) merges the daemon's matching tools into the offered tools[] array automatically — no need to hand-list web_search/web_fetch/file_read/etc.",
         max_turns: "Body field max_turns (default 8, max 64).",
-        timeout: "Body field timeout_s caps the whole loop (default 30 min, max 1 hour). Per-backend-call timeout is separate (see OMNIUS_BACKEND_TIMEOUT_S).",
+        timeout: "Body field timeout_s is treated as a backend/request liveness hint only; it must not kill an active agent loop.",
         prompt_template: "Body field prompt_template: 'factual-first' prepends a system message instructing the model to call web_search FIRST for any factual question.",
         response_envelope: "Standard OpenAI chat.completion shape PLUS a _agent_loop: {turns, log:[], done, reason} field. Reason is one of: model_returned_content, client_tools_pending, max_turns_exhausted."
       },
       backend_timeout: {
         env: "OMNIUS_BACKEND_TIMEOUT_S — default 120 seconds, max 3600 (1 hour).",
-        per_request: "Body field timeout_s on /v1/chat/completions, /v1/run, agent_loop. Caps to 1h.",
+        per_request: "Body field timeout_s on /v1/chat/completions, /v1/run, agent_loop is request/backend liveness only, not a task deadline.",
         rationale: "Q1 (Cody/SA) — was hardcoded 120s, broke cold-start tool-calling thinks on large models."
       },
       run_lifecycle: {
@@ -730111,32 +730207,6 @@ ${task}` : task;
         }
       };
       onChildClose(child, finish);
-      const deadline = setTimeout(
-        () => {
-          if (done) return;
-          try {
-            if (child.pid) process.kill(-child.pid, "SIGTERM");
-          } catch {
-          }
-          try {
-            if (child.pid) process.kill(child.pid, "SIGTERM");
-          } catch {
-          }
-          setTimeout(() => {
-            try {
-              if (child.pid) process.kill(-child.pid, "SIGKILL");
-            } catch {
-            }
-            try {
-              if (child.pid) process.kill(child.pid, "SIGKILL");
-            } catch {
-            }
-            finish();
-          }, 3e3).unref();
-        },
-        (generateTimeoutS + 30) * 1e3
-      );
-      deadline.unref();
     });
     if (buf.trim()) finalLines.push(buf);
     const rawFinal = finalLines.join("\n").trim();
@@ -730203,33 +730273,6 @@ ${task}` : task;
       }
     };
     onChildClose(child, finish);
-    const deadline = setTimeout(
-      () => {
-        if (done) return;
-        killedByDeadline = true;
-        try {
-          if (child.pid) process.kill(-child.pid, "SIGTERM");
-        } catch {
-        }
-        try {
-          if (child.pid) process.kill(child.pid, "SIGTERM");
-        } catch {
-        }
-        setTimeout(() => {
-          try {
-            if (child.pid) process.kill(-child.pid, "SIGKILL");
-          } catch {
-          }
-          try {
-            if (child.pid) process.kill(child.pid, "SIGKILL");
-          } catch {
-          }
-          finish();
-        }, 3e3).unref();
-      },
-      (generateTimeoutS + 30) * 1e3
-    );
-    deadline.unref();
   });
   if (nonStreamBuf.trim()) nonStreamLines.push(nonStreamBuf);
   const rawNonStream = nonStreamLines.join("\n").trim();
@@ -730253,7 +730296,7 @@ ${task}` : task;
   } catch {
   }
   if (!content) {
-    const errMsg = killedByDeadline ? `Agent exceeded ${generateTimeoutS}s timeout and was killed.` : backendError ? `Backend error: ${backendError}` : "Agent produced no response.";
+    const errMsg = backendError ? `Backend error: ${backendError}` : "Agent produced no response.";
     jsonResponse(res, 200, {
       model: model.replace(/^[a-z]+\//, ""),
       created_at: createdAt,
@@ -730842,9 +730885,7 @@ async function handleV1Run(req3, res) {
   } catch {
   }
   let _rca1DeadlineFired = false;
-  const _rca1KillSwitch = process.env["OMNIUS_DISABLE_DAEMON_TIMEOUT_KILL"] === "1";
-  const _rca1EffectiveTimeoutS = timeout2 && timeout2 > 0 ? timeout2 : activeProfile?.limits?.timeout_s && activeProfile.limits.timeout_s > 0 ? activeProfile.limits.timeout_s : 1800;
-  const _rca1DeadlineAtMs = Date.now() + (_rca1EffectiveTimeoutS + 60) * 1e3;
+  const _rca1Deadline = null;
   if (job.pid > 0) {
     const runCtx = getOmniusRunContext();
     registerProcessLease({
@@ -730859,50 +730900,9 @@ async function handleV1Run(req3, res) {
       reason: `API run: ${task.slice(0, 240)}`,
       command: sandbox === "container" ? `container:${`omnius-${id2}`}` : [process.execPath, omniusBin, ...args].join(" "),
       cwd: cwd4,
-      hardDeadlineAt: _rca1DeadlineAtMs
+      hardDeadlineAt: void 0
     });
   }
-  if (!_rca1KillSwitch) {
-    job.deadlineAtMs = _rca1DeadlineAtMs;
-    atomicJobWrite(dir, id2, job);
-  }
-  const _rca1Deadline = _rca1KillSwitch ? null : setTimeout(
-    () => {
-      if (job.status !== "running") return;
-      _rca1DeadlineFired = true;
-      job.status = "timeout";
-      job.completedAt = (/* @__PURE__ */ new Date()).toISOString();
-      atomicJobWrite(dir, id2, job);
-      try {
-        if (child.pid) process.kill(-child.pid, "SIGTERM");
-      } catch {
-      }
-      try {
-        if (child.pid) process.kill(child.pid, "SIGTERM");
-      } catch {
-      }
-      setTimeout(() => {
-        try {
-          if (child.pid) process.kill(-child.pid, "SIGKILL");
-        } catch {
-        }
-        try {
-          if (child.pid) process.kill(child.pid, "SIGKILL");
-        } catch {
-        }
-      }, 3e4).unref();
-      try {
-        publishEvent(
-          "run.timeout",
-          { run_id: id2, deadline_s: _rca1EffectiveTimeoutS },
-          { subject: authUser, aimsControl: "A.6.2.6" }
-        );
-      } catch {
-      }
-    },
-    (_rca1EffectiveTimeoutS + 60) * 1e3
-  );
-  if (_rca1Deadline) _rca1Deadline.unref();
   if (streamMode) {
     res.writeHead(200, {
       "Content-Type": "text/event-stream",
@@ -733988,7 +733988,7 @@ ${historyLines}
           reason: `chat run ${session.id}`,
           command: [process.execPath, omniusBin, ...args].join(" "),
           cwd: cwdPath,
-          hardDeadlineAt: Date.now() + chatTimeoutS * 1e3 + 3e4
+          hardDeadlineAt: void 0
         });
       }
       const releaseChatLease = (status2, reason) => {
@@ -734212,7 +734212,6 @@ ${historyLines}
         });
         child.stderr?.on("data", () => {
         });
-        const killDeadlineMs = chatTimeoutS * 1e3 + 3e4;
         let killedByDeadline = false;
         await new Promise((resolve77) => {
           let done = false;
@@ -734223,30 +734222,6 @@ ${historyLines}
             }
           };
           onChildClose(child, finish);
-          const deadline = setTimeout(() => {
-            if (done) return;
-            killedByDeadline = true;
-            try {
-              if (child.pid) process.kill(-child.pid, "SIGTERM");
-            } catch {
-            }
-            try {
-              if (child.pid) process.kill(child.pid, "SIGTERM");
-            } catch {
-            }
-            setTimeout(() => {
-              try {
-                if (child.pid) process.kill(-child.pid, "SIGKILL");
-              } catch {
-              }
-              try {
-                if (child.pid) process.kill(child.pid, "SIGKILL");
-              } catch {
-              }
-              finish();
-            }, 3e3).unref();
-          }, killDeadlineMs);
-          deadline.unref();
         });
         if (nonStreamBuf.trim()) nonStreamLines.push(nonStreamBuf);
         const rawNonStream = nonStreamLines.join("\n").trim();
@@ -734288,7 +734263,7 @@ ${historyLines}
           "X-Session-ID, X-Request-ID, X-API-Version, ETag"
         );
         if (!content) {
-          const errMsg = killedByDeadline ? `Agent exceeded ${chatTimeoutS}s timeout and was killed. Try a simpler prompt or increase timeout_s in the request body.` : backendError ? `Backend error: ${backendError}` : "Agent produced no response. The model may have failed to load (try a smaller model or check 'ollama ps' for VRAM contention).";
+          const errMsg = backendError ? `Backend error: ${backendError}` : "Agent produced no response. The model may have failed to load (try a smaller model or check 'ollama ps' for VRAM contention).";
           try {
             finishInFlightChat(
               session.id,
@@ -739711,8 +739686,6 @@ Only tools allowed by this profile are visible and executable.`
     maxTokens: realtimeEnabled ? 512 : 16384,
     temperature: realtimeEnabled ? 0.6 : 0,
     requestTimeoutMs: config.timeoutMs,
-    taskTimeoutMs: 36e5,
-    // 60 minutes — never give up prematurely
     compactionThreshold,
     deepContext: deepContext ?? false,
     dynamicContext,

package/npm-shrinkwrap.json

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

package/package.json

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