omnius 1.0.461 → 1.0.463

package/dist/index.js

@@ -563781,6 +563781,15 @@ function isSuccessfulVerificationEvidence(entry) {
 function isFailedVerificationEvidence(entry) {
   return entry.role === "verification" && entry.success === false;
 }
+function isSuccessfulPostMutationObservation(entry) {
+  if (entry.success !== true)
+    return false;
+  if (entry.role === "blocker")
+    return false;
+  if (isMutationEvidence(entry))
+    return false;
+  return entry.kind === "tool_result" || entry.kind === "runtime_observation" || entry.kind === "delivery_result";
+}
 function verificationFamily(entry) {
   if (entry.role !== "verification")
     return null;
@@ -563807,6 +563816,7 @@ function finalizeCompletionLedgerTruth(ledger) {
   let unresolved = [...ledger.unresolved];
   let lastVerificationInvalidatingMutation = -1;
   let lastVerification = -1;
+  let lastCriticApprovedVerification = -1;
   const lastSuccessfulVerificationByFamily = /* @__PURE__ */ new Map();
   ledger.evidence.forEach((entry, index) => {
     if (isVerificationInvalidatingMutation(entry))
@@ -563818,6 +563828,21 @@ function finalizeCompletionLedgerTruth(ledger) {
         lastSuccessfulVerificationByFamily.set(family, index);
     }
   });
+  for (const critique2 of ledger.critiques) {
+    if (critique2.verdict !== "approve")
+      continue;
+    if (lastVerificationInvalidatingMutation >= 0 && critique2.evidenceSequence <= lastVerificationInvalidatingMutation) {
+      continue;
+    }
+    const reviewedEvidence = ledger.evidence.slice(Math.max(0, lastVerificationInvalidatingMutation + 1), Math.max(0, critique2.evidenceSequence));
+    if (reviewedEvidence.some(isSuccessfulPostMutationObservation)) {
+      lastCriticApprovedVerification = Math.max(lastCriticApprovedVerification, critique2.evidenceSequence - 1);
+    }
+  }
+  const effectiveLastVerification = Math.max(lastVerification, lastCriticApprovedVerification);
+  if (effectiveLastVerification >= 0 && effectiveLastVerification >= lastVerificationInvalidatingMutation) {
+    unresolved = unresolved.filter((item) => item.source !== "verification_missing" && item.source !== "verification_freshness");
+  }
   ledger.evidence.forEach((entry, index) => {
     if (isFailedVerificationEvidence(entry)) {
       const family = verificationFamily(entry);
@@ -563830,12 +563855,13 @@ function finalizeCompletionLedgerTruth(ledger) {
       unresolved = appendUnresolved(unresolved, `Stale edit failure remains unresolved: ${entry.summary}`, entry.id);
     }
   });
-  if (lastVerificationInvalidatingMutation >= 0 && lastVerification < 0) {
+  if (lastVerificationInvalidatingMutation >= 0 && effectiveLastVerification < 0) {
     unresolved = appendUnresolved(unresolved, "File changes occurred without any successful verification evidence.", "verification_missing");
-  } else if (lastVerification >= 0 && lastVerificationInvalidatingMutation > lastVerification) {
+  } else if (effectiveLastVerification >= 0 && lastVerificationInvalidatingMutation > effectiveLastVerification) {
     unresolved = appendUnresolved(unresolved, "File changes occurred after the last successful verification; final verification is stale.", "verification_freshness");
   }
-  const status = ledger.status === "blocked" || ledger.status === "request_changes" ? ledger.status : unresolved.length > 0 ? "incomplete_verification" : ledger.status;
+  const latestCritique = ledger.critiques.at(-1);
+  const status = ledger.status === "blocked" || ledger.status === "request_changes" ? ledger.status : unresolved.length > 0 ? "incomplete_verification" : latestCritique?.verdict === "approve" ? "approved" : ledger.status === "incomplete_verification" ? "open" : ledger.status;
   return {
     ...ledger,
     unresolved,
@@ -567605,7 +567631,15 @@ function ago(ms) {
   const h = Math.floor(m2 / 60);
   return `${h}h ago`;
 }
-function computeNextActionHint(reconciled) {
+function computeNextActionHint(reconciled, recentFailures, focusDirective) {
+  if (focusDirective?.requiredNextAction) {
+    const reason = focusDirective.reason ? ` Reason: ${focusDirective.reason.slice(0, 180)}.` : "";
+    return `Active recovery directive requires ${focusDirective.requiredNextAction}.${reason} Follow that before completion or unrelated work.`;
+  }
+  if (recentFailures.length > 0) {
+    const first2 = recentFailures[0];
+    return `Resolve or explicitly account for unresolved failure "${first2.stem}" (${first2.attempts} attempt${first2.attempts === 1 ? "" : "s"}). Do not infer completion from plan state while failures remain.`;
+  }
   const inProgress = reconciled.find((t2) => t2.reconciled === "in_progress");
   if (inProgress)
     return `Continue your in-progress item: "${inProgress.content.slice(0, 100)}".`;
@@ -567635,7 +567669,10 @@ function computeNextActionHint(reconciled) {
     const first2 = completedUnverified[0];
     return `A completed todo has a verifyCommand that hasn't run during this snapshot: ${first2.rationale}`;
   }
-  return `All declared plan items appear satisfied. If the goal is met, declare with task_complete; otherwise add new todos for remaining work.`;
+  if (reconciled.length === 0) {
+    return `No declared plan items are available. Continue from the active goal and evidence; report completion only with direct verification.`;
+  }
+  return `Declared plan items have no visible gaps. Continue from the active goal and evidence; report completion only with direct verification.`;
 }
 function regenerate(opts) {
   const startMs = Date.now();
@@ -567730,7 +567767,18 @@ function regenerate(opts) {
     }
   }
   lines.push(``);
-  const nextActionHint = computeNextActionHint(reconciled);
+  if (opts.focusDirective?.requiredNextAction) {
+    lines.push(`ACTIVE RECOVERY DIRECTIVE:`);
+    lines.push(`  required_next_action=${opts.focusDirective.requiredNextAction}`);
+    if (opts.focusDirective.state) {
+      lines.push(`  state=${opts.focusDirective.state}`);
+    }
+    if (opts.focusDirective.reason) {
+      lines.push(`  reason=${opts.focusDirective.reason.slice(0, 240)}`);
+    }
+    lines.push(``);
+  }
+  const nextActionHint = computeNextActionHint(reconciled, opts.recentFailures, opts.focusDirective);
   lines.push(`SUGGESTED NEXT STEP (derived from gap analysis, not authoritative):`);
   lines.push(`  ${nextActionHint}`);
   lines.push(``);
@@ -575131,21 +575179,13 @@ function violatesDirective(directive, input) {
   }
   if (input.toolName === "ask_user")
     return false;
+  const family = actionFamily(input.toolName, input.args);
+  if (directive.requiredNextAction !== "update_todos" && directiveExplicitlyForbidsCall(directive, input, family)) {
+    return true;
+  }
   if (directive.requiredNextAction === "read_authoritative_target" && input.usesAuthoritativeTargetEvidence && isEditTool(input.toolName)) {
     return false;
   }
-  const family = actionFamily(input.toolName, input.args);
-  if (directive.requiredNextAction !== "update_todos") {
-    if (directive.forbiddenActionFamilies.includes(family))
-      return true;
-    if (directive.forbiddenActionFamilies.includes(input.toolName)) {
-      if (input.toolName === "shell" && input.isReadLike)
-        return false;
-      if (input.toolName === "shell" && input.shellLikelyMutatesFilesystem)
-        return false;
-      return true;
-    }
-  }
   switch (directive.requiredNextAction) {
     case "update_todos":
       if (input.toolName === "shell")
@@ -575178,6 +575218,17 @@ function violatesDirective(directive, input) {
       return false;
   }
 }
+function directiveExplicitlyForbidsCall(directive, input, family) {
+  if (directive.forbiddenActionFamilies.includes(family))
+    return true;
+  if (!directive.forbiddenActionFamilies.includes(input.toolName))
+    return false;
+  if (input.toolName === "shell" && input.isReadLike)
+    return false;
+  if (input.toolName === "shell" && input.shellLikelyMutatesFilesystem)
+    return false;
+  return true;
+}
 function forbiddenCachedEvidenceFamilies(input, family) {
   return [family];
 }
@@ -579170,6 +579221,15 @@ var init_agenticRunner = __esm({
       _workboardDir() {
         return this.options.workboardDir || this._workingDirectory || process.cwd();
       }
+      _todoWriteAvailable() {
+        return this.tools.has("todo_write");
+      }
+      _availablePreferredTools(candidates) {
+        const available = candidates.filter((name10) => this.tools.has(name10));
+        if (available.length > 0)
+          return available;
+        return this.tools.has("task_complete") ? ["task_complete"] : [];
+      }
       getOrCreateWorkboard() {
         const goal = this._taskState.originalGoal || this._taskState.goal || "";
         if (this._workboard) {
@@ -579425,7 +579485,7 @@ ${parts.join("\n")}
             cardId: integration.id,
             title: integration.title,
             reason: "implementation evidence exists; exercise the changed runtime path before more discovery",
-            preferredTools: ["shell"]
+            preferredTools: this._availablePreferredTools(["shell"])
           };
         }
         if (hasVerificationEvidence && verification) {
@@ -579433,7 +579493,10 @@ ${parts.join("\n")}
             cardId: verification.id,
             title: verification.title,
             reason: "verification evidence exists; reconcile outcome, todos, and blockers",
-            preferredTools: ["todo_write", "task_complete"]
+            preferredTools: this._availablePreferredTools([
+              "todo_write",
+              "task_complete"
+            ])
           };
         }
         if (discoveryEvidence > 0 && !hasImplementationEvidence && implementation2) {
@@ -579441,7 +579504,12 @@ ${parts.join("\n")}
             cardId: implementation2.id,
             title: implementation2.title,
             reason: "discovery evidence is already present; land the smallest concrete repair",
-            preferredTools: ["file_patch", "batch_edit", "file_edit", "file_write"]
+            preferredTools: this._availablePreferredTools([
+              "file_patch",
+              "batch_edit",
+              "file_edit",
+              "file_write"
+            ])
           };
         }
         const active = snapshot.cards.find((card) => card.status === "in_progress") ?? snapshot.cards.find((card) => card.status === "needs_changes") ?? snapshot.cards.find((card) => card.status === "open") ?? discovery;
@@ -579451,13 +579519,24 @@ ${parts.join("\n")}
           cardId: active.id,
           title: active.title,
           reason: active.id === "discover-current-state" ? "no authoritative target evidence is recorded yet" : "workboard card is the next unresolved card",
-          preferredTools: active.id === "discover-current-state" ? ["file_read", "grep_search", "list_directory", "shell"] : ["file_patch", "batch_edit", "file_edit", "file_write", "shell"]
+          preferredTools: active.id === "discover-current-state" ? this._availablePreferredTools([
+            "file_read",
+            "grep_search",
+            "list_directory",
+            "shell"
+          ]) : this._availablePreferredTools([
+            "file_patch",
+            "batch_edit",
+            "file_edit",
+            "file_write",
+            "shell"
+          ])
         };
       }
       _focusToolsForRequiredAction(action) {
         switch (action) {
           case "update_todos":
-            return "todo_write with a changed plan/status, or a real file edit if that is the active work";
+            return this._todoWriteAvailable() ? "todo_write with a changed plan/status, or a real file edit if that is the active work" : "todo_write is unavailable in this tool surface; continue with the intended substantive action, or task_complete with evidence if done";
           case "read_authoritative_target":
             return "use cached evidence or one authoritative file_read/read-only shell, then act";
           case "use_cached_evidence":
@@ -579511,7 +579590,9 @@ ${parts.join("\n")}
           const integration = byId.get("integrate-and-run");
           const verification = byId.get("verify-observed-outcome");
           lines.push(`workboard_current_card=${action.cardId} (${action.title})`);
-          lines.push(`workboard_preferred_tools=${action.preferredTools.join(", ")}`);
+          if (action.preferredTools.length > 0) {
+            lines.push(`workboard_preferred_tools=${action.preferredTools.join(", ")}`);
+          }
           lines.push(`workboard_reason=${action.reason}`);
           lines.push(`workboard_evidence_counts=discover:${this._workboardEvidenceCount(discovery)} implement:${this._workboardEvidenceCount(implementation2)} integrate:${this._workboardEvidenceCount(integration)} verify:${this._workboardEvidenceCount(verification)}`);
           if (this._workboardHasEditEvidence(implementation2)) {
@@ -579537,7 +579618,7 @@ ${parts.join("\n")}
         }
         if (lines.length === 2)
           return null;
-        lines.push("not_progress=repeat unchanged todo_write; repeat broad discovery already represented in this frame; keep discovery active after a real mutation");
+        lines.push(this._todoWriteAvailable() ? "not_progress=repeat unchanged todo_write; repeat broad discovery already represented in this frame; keep discovery active after a real mutation" : "not_progress=repeat broad discovery already represented in this frame; keep discovery active after a real mutation");
         return lines.join("\n");
       }
       _workboardTargetCardId(snapshot, toolName, result, meta = {}) {
@@ -580266,10 +580347,23 @@ ${parts.join("\n")}
         const pressureCue = pressureCheck(task);
         const rawPrompt = getSystemPromptForTier(this.options.modelTier);
         const basePrompt = rawPrompt + pressureCue;
+        const todoBatchGuidance = this._todoWriteAvailable() ? " Use todo_write between batches to mark progress." : "";
         const _BATCH_GUIDANCE = {
-          small: "\n\n## Response batching\n\nEmit AT MOST 2 tool calls per response. After observing their results, plan the next 2 in your following response. Smaller batches let the orchestrator deliver cache/failure/progress signals to you between actions. Tool calls beyond the cap are dropped. Use todo_write between batches to mark progress.",
-          medium: "\n\n## Response batching\n\nEmit AT MOST 4 tool calls per response. After observing their results, plan the next batch in your following response. Smaller batches let the orchestrator deliver cache/failure/progress signals to you between actions. Tool calls beyond the cap are dropped. Use todo_write between batches to mark progress.",
-          large: "\n\n## Response batching\n\nEmit AT MOST 6 tool calls per response. Smaller batches receive better feedback (cache/failure/progress signals between actions). Tool calls beyond the cap are dropped. Use todo_write between batches."
+          small: `
+
+## Response batching
+
+Emit AT MOST 2 tool calls per response. After observing their results, plan the next 2 in your following response. Smaller batches let the orchestrator deliver cache/failure/progress signals to you between actions. Tool calls beyond the cap are dropped.${todoBatchGuidance}`,
+          medium: `
+
+## Response batching
+
+Emit AT MOST 4 tool calls per response. After observing their results, plan the next batch in your following response. Smaller batches let the orchestrator deliver cache/failure/progress signals to you between actions. Tool calls beyond the cap are dropped.${todoBatchGuidance}`,
+          large: `
+
+## Response batching
+
+Emit AT MOST 6 tool calls per response. Smaller batches receive better feedback (cache/failure/progress signals between actions). Tool calls beyond the cap are dropped.${todoBatchGuidance}`
         };
         const batchGuidance = _BATCH_GUIDANCE[this.options.modelTier ?? "large"] ?? _BATCH_GUIDANCE.large;
         const shellGuidance = "\n\n## Shell command patterns\n\nWhen investigating a build/test/install failure, RUN THE COMMAND WITHOUT TRUNCATION FIRST to see the full error.\nAvoid `| tail -N` / `| head -N` / `| sed -n '1,Np'` on commands you don't yet trust — they drop the part of the output where errors usually appear.\nPipefail is on by default in this orchestrator: a pipeline's exit code reflects the FIRST failing stage, not just the last. So `<cmd> | tail -80` returns non-zero if `<cmd>` failed.\nWhen you DO want to limit context (after diagnosis), prefer `<cmd> 2>&1 | tail -300` (or larger) so you keep enough output to see the actual error block.\nIf your command exited 0 but produced suspiciously short output (~< 800 chars), the orchestrator will inject a [HINT — pipe-to-truncator detected] block telling you to re-run without truncation.";
@@ -581506,6 +581600,8 @@ ${result.output ?? ""}`;
       getOpenTodoItems() {
         if (this.options.disableTodoCompletionGuard)
           return [];
+        if (!this._todoWriteAvailable())
+          return [];
         const todos = this.readSessionTodos();
         if (!todos || todos.length === 0)
           return [];
@@ -582496,6 +582592,8 @@ ${_checks}`
        * Mutates `_lastTodoReminderTurn` when a reminder is produced.
        */
       getTodoReminderContent(currentTurn) {
+        if (!this._todoWriteAvailable())
+          return null;
         const todos = this.readSessionTodos();
         const result = computeTodoReminder({
           currentTurn,
@@ -582856,6 +582954,8 @@ ${contentPreview}
        * Recommends marking progress before further work. Returns null otherwise.
        */
       _renderProgressNudgeBlock(turn) {
+        if (!this._todoWriteAvailable())
+          return null;
         const n2 = this._writesSinceLastTodoWrite;
         if (n2 < 4)
           return null;
@@ -583469,11 +583569,14 @@ ${contentPreview}
           ].join("\n");
         }
         if (latest.tool === "todo_write") {
+          const raw2 = `${latest.error || ""}
+${latest.output || ""}`;
+          const unavailable = /Unknown tool/i.test(raw2);
           return [
             `[PLANNING TOOL RECOVERY]`,
             `Last failing tool: todo_write (turn ${latest.turn})`,
-            `A checklist write failure is bookkeeping/argument transport, not evidence that the target codebase is broken.`,
-            `Repair the todo_write payload if you still need the visible plan, or continue with the intended first substantive task using the plan content you already attempted to record.`,
+            unavailable ? `todo_write is not registered in this tool surface. Do not retry it.` : `A checklist write failure is bookkeeping/argument transport, not evidence that the target codebase is broken.`,
+            unavailable ? `Use the attempted checklist only as private state; continue with available substantive tools or task_complete with evidence.` : `Repair the todo_write payload if you still need the visible plan, or continue with the intended first substantive task using the plan content you already attempted to record.`,
             `Do not inspect or edit project files solely because todo_write rejected its arguments.`
           ].join("\n");
         }
@@ -583571,7 +583674,7 @@ ${latest.output || ""}`.trim();
             lines.push(`... +${ordered.length - visible.length} more todo node(s)`);
           }
           lines.push("decomposition_contract=Use stable ids plus parentId for subtasks. If the active item has multiple remaining actions, rewrite it as a parent with concrete child leaf todos; work leaf-first and do not complete a parent before all children are complete with evidence.");
-          lines.push(`(turn ${turn} — call todo_write ONLY to update state, never to re-read this plan)`);
+          lines.push(this._todoWriteAvailable() ? `(turn ${turn} — call todo_write ONLY to update state, never to re-read this plan)` : `(turn ${turn} — todo_write is unavailable in this tool surface; use this plan as read-only state)`);
           return lines.join("\n");
         } catch {
           return null;
@@ -583825,12 +583928,13 @@ ${sections.join("\n")}` : sections.join("\n");
        */
       _buildRepeatGateBlock(toolName, args, hits) {
         const argPreview = JSON.stringify(args ?? {}).slice(0, 200);
+        const progressStep = this._todoWriteAvailable() ? `  1. Call todo_write — decompose the remaining work into concrete, verifiable steps, mark the current step in_progress, and mark anything already done as completed.` : `  1. Re-anchor on the active evidence and name the concrete next action; do not call unavailable planning tools.`;
         return [
           `[REPEAT GATE] Exact repeat #${hits} of ${toolName}(${argPreview}).`,
           `You ALREADY have this result — re-reading identical arguments cannot produce new information, so this call was NOT executed.`,
           ``,
           `You are looping because progress tracking has drifted. Before any further redundant calls you MUST:`,
-          `  1. Call todo_write — decompose the remaining work into concrete, verifiable steps, mark the current step in_progress, and mark anything already done as completed.`,
+          progressStep,
           `  2. Then take a CONCRETE action on the evidence you already have: edit/write the implicated file, run a verification command, or call task_complete with evidence.`,
           ``,
           `Do NOT repeat this exact call. If you believe state changed, perform the concrete change first, then retry with distinct evidence.`
@@ -583847,7 +583951,7 @@ ${sections.join("\n")}` : sections.join("\n");
           "This call was not executed again, and the cached payload was not re-emitted because repeating it bloats the model context.",
           summary,
           "",
-          "Required next action: use the active evidence frame/tool cache and take a concrete next step: edit/write, run verification, update todos with changed state, or task_complete with evidence.",
+          this._todoWriteAvailable() ? "Required next action: use the active evidence frame/tool cache and take a concrete next step: edit/write, run verification, update todos with changed state, or task_complete with evidence." : "Required next action: use the active evidence frame/tool cache and take a concrete next step: edit/write, run verification, or task_complete with evidence.",
           "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");
       }
@@ -585221,7 +585325,10 @@ Rewrite it now for ${ctx3.model}.`;
           path: ["file", "image", "media", "filepath", "file_path", "filename"],
           image: ["path", "file", "media", "filepath", "file_path", "filename"],
           command: ["cmd", "shell_command"],
-          query: ["prompt", "task", "message", "input", "text"]
+          query: ["prompt", "task", "message", "input", "text"],
+          start_line: ["line", "lineNumber", "line_number", "startLine"],
+          end_line: ["endLine", "end_line", "lineEnd", "line_end", "end"],
+          new_content: ["content", "newContent", "new_content"]
         };
         for (const required of missingRequired) {
           for (const alias of aliasMap[required] ?? []) {
@@ -586715,6 +586822,7 @@ TASK: ${scrubbedTask}` : scrubbedTask;
                 preview: (entry.wentWrong || "").slice(0, 200),
                 distinctErrors: entry.errorSignatures?.size
               })).sort((a2, b) => b.attempts - a2.attempts).slice(0, 5);
+              const _wsFocusDirective = this._focusSupervisor?.snapshot().directive ?? null;
               const _ws = regenerate({
                 workingDir: _wsWorkingDir,
                 goal: this._taskState.originalGoal || this._taskState.goal || "",
@@ -586722,6 +586830,11 @@ TASK: ${scrubbedTask}` : scrubbedTask;
                 triggerReason: _wsTrigger,
                 todos: _wsTodos,
                 recentFailures: _wsFailures,
+                focusDirective: _wsFocusDirective ? {
+                  requiredNextAction: _wsFocusDirective.requiredNextAction,
+                  reason: _wsFocusDirective.reason,
+                  state: _wsFocusDirective.state
+                } : null,
                 maxFiles: WORLD_STATE_MAX_FILES,
                 lastBuildSuccess: this._lastBuildSuccessTurn >= 0 ? {
                   command: this._lastBuildSuccessCommand,
@@ -587102,6 +587215,25 @@ If this matches your current shape, try it before continuing.`
                   if (_m)
                     _staleSamples.push(`  - ${c9.name}: ${_m[0]}`);
                 }
+                const _reg44FocusDirective = this._focusDirectiveSuppressesEditPressure();
+                const _reg44ChoiceLines = _reg44FocusDirective ? [
+                  `A focus recovery directive is active and overrides the generic stuck escape options.`,
+                  `Required next action: ${_reg44FocusDirective.requiredNextAction}.`,
+                  `Reason: ${_reg44FocusDirective.reason}.`,
+                  `Do not choose a generic produce/complete/debate escape until this recovery directive is satisfied or reported impossible with evidence.`
+                ] : [
+                  `Pick ONE of these for your next response:`,
+                  ``,
+                  `  (a) PRODUCE: emit a file_write / file_edit / file_patch that creates or changes project content. Even a partial draft of the next planned file is progress. Use shell only for commands/tests/system operations, not as a workaround for failed edit-tool encoding.`,
+                  ``,
+                  `  (b) ERROR-INFORMED LOCAL TRIAGE: anchor on the freshest local failure, identify the implicated file/path/symbol/command, then make one targeted local move instead of broad exploration.`,
+                  ``,
+                  this._renderLocalFailureNudge(turn),
+                  ``,
+                  `  (c) DEBATE: if you've tried 3+ approaches and they all hit the same wall, invoke \`debate\` with the failed task as the prompt — get a second opinion.`,
+                  ``,
+                  `  (d) DECLARE BLOCKED: if you genuinely cannot make progress (missing dependency, ambiguous spec, external service down), call \`task_complete\` with a summary that NAMES THE BLOCKER explicitly. Don't keep looping.`
+                ];
                 messages2.push({
                   role: "system",
                   content: [
@@ -587115,17 +587247,7 @@ If this matches your current shape, try it before continuing.`
                     ``,
                     `You are consuming turns without producing new state. Every shape of "agent stuck" — read-heavy without writes, repeated cache hits, blocked-shell loops, no-op todo updates — looks like this signal. The exact tool names don't matter; the ratio does.`,
                     ``,
-                    `Pick ONE of these for your next response:`,
-                    ``,
-                    `  (a) PRODUCE: emit a file_write / file_edit / file_patch that creates or changes project content. Even a partial draft of the next planned file is progress. Use shell only for commands/tests/system operations, not as a workaround for failed edit-tool encoding.`,
-                    ``,
-                    `  (b) ERROR-INFORMED LOCAL TRIAGE: anchor on the freshest local failure, identify the implicated file/path/symbol/command, then make one targeted local move instead of broad exploration.`,
-                    ``,
-                    this._renderLocalFailureNudge(turn),
-                    ``,
-                    `  (c) DEBATE: if you've tried 3+ approaches and they all hit the same wall, invoke \`debate\` with the failed task as the prompt — get a second opinion.`,
-                    ``,
-                    `  (d) DECLARE BLOCKED: if you genuinely cannot make progress (missing dependency, ambiguous spec, external service down), call \`task_complete\` with a summary that NAMES THE BLOCKER explicitly. Don't keep looping.`,
+                    ..._reg44ChoiceLines,
                     ``,
                     `Recent failures (real or synthetic):`,
                     _failureBlocks,
@@ -587280,6 +587402,27 @@ ${_staleSamples.join("\n")}` : ``,
               });
               if (_wtWorstCount >= _wtThreshold && !_wtHadSuccessfulVerify) {
                 this._writeThrashCooldownUntilTurn = turn + 8;
+                const _reg50FocusDirective = this._focusDirectiveSuppressesEditPressure();
+                const _reg50ChoiceLines = _reg50FocusDirective ? [
+                  `A focus recovery directive is active and overrides the generic write-thrash choices.`,
+                  `Required next action: ${_reg50FocusDirective.requiredNextAction}.`,
+                  `Reason: ${_reg50FocusDirective.reason}.`,
+                  `Do not write ${_wtWorstPath} again until the focus directive is satisfied or reported impossible with evidence.`
+                ] : [
+                  `Pick ONE of these for your next response:`,
+                  ``,
+                  `  (a) RUN-AND-READ: Run the EXACT command that fails (test/typecheck/build) and READ THE FULL ERROR MESSAGE LITERALLY. Do not summarize it from memory; paste it back into context. The current write hasn't been validated against any error.`,
+                  ``,
+                  `  (b) DELETE-AND-RESTART: If the file has been rewritten ${_wtWorstCount} times, the current approach is wrong. Either delete the file and try a fundamentally different design, OR revert to a known-good earlier version (use git, working_notes, or memory_search to find one).`,
+                  ``,
+                  `  (c) ERROR-INFORMED LOCAL TRIAGE: use the exact failing local command and error line to identify one implicated path/symbol/config key, then inspect or change only that target. Do not search online for a codebase-local failure.`,
+                  ``,
+                  this._renderLocalFailureNudge(turn),
+                  ``,
+                  `  (d) DECLARE BLOCKED: If the file's correct shape genuinely isn't knowable from the spec + this codebase, call task_complete with a summary that names this specific file as the blocker. Don't burn more turns on it.`,
+                  ``,
+                  `Do NOT in your next response: write to ${_wtWorstPath} again without first running and reading the failing command's output.`
+                ];
                 messages2.push({
                   role: "system",
                   content: [
@@ -587290,19 +587433,7 @@ ${_staleSamples.join("\n")}` : ``,
                     ``,
                     `No successful test/build/typecheck command ran between writes — you are iterating the file blind, hoping the next variation works. This is a write-thrash anti-pattern. Repeated edits without verification confirm nothing.`,
                     ``,
-                    `Pick ONE of these for your next response:`,
-                    ``,
-                    `  (a) RUN-AND-READ: Run the EXACT command that fails (test/typecheck/build) and READ THE FULL ERROR MESSAGE LITERALLY. Do not summarize it from memory; paste it back into context. The current write hasn't been validated against any error.`,
-                    ``,
-                    `  (b) DELETE-AND-RESTART: If the file has been rewritten ${_wtWorstCount} times, the current approach is wrong. Either delete the file and try a fundamentally different design, OR revert to a known-good earlier version (use git, working_notes, or memory_search to find one).`,
-                    ``,
-                    `  (c) ERROR-INFORMED LOCAL TRIAGE: use the exact failing local command and error line to identify one implicated path/symbol/config key, then inspect or change only that target. Do not search online for a codebase-local failure.`,
-                    ``,
-                    this._renderLocalFailureNudge(turn),
-                    ``,
-                    `  (d) DECLARE BLOCKED: If the file's correct shape genuinely isn't knowable from the spec + this codebase, call task_complete with a summary that names this specific file as the blocker. Don't burn more turns on it.`,
-                    ``,
-                    `Do NOT in your next response: write to ${_wtWorstPath} again without first running and reading the failing command's output.`
+                    ..._reg50ChoiceLines
                   ].join("\n")
                 });
                 this.emit({
@@ -587418,6 +587549,25 @@ ${_staleSamples.join("\n")}` : ``,
               }
               if (_efWorstCount >= _efThreshold) {
                 this._editFailThrashCooldownUntilTurn = turn + 8;
+                const _reg53FocusDirective = this._focusDirectiveSuppressesEditPressure();
+                const _reg53ChoiceLines = _reg53FocusDirective ? [
+                  `A focus recovery directive is active and overrides generic stale-edit recovery choices.`,
+                  `Required next action: ${_reg53FocusDirective.requiredNextAction}.`,
+                  `Reason: ${_reg53FocusDirective.reason}.`,
+                  `Do not call file_edit or batch_edit on ${_efWorstPath} again until that directive is satisfied or reported impossible with evidence.`
+                ] : [
+                  `STOP guessing variants of old_string. Pick ONE of these for your next response:`,
+                  ``,
+                  `  (a) FILE_READ + COPY-EXACT: Call file_read on ${_efWorstPath}, then copy the EXACT bytes (whitespace, indentation, punctuation) for old_string from that read. Do not paraphrase or reformat.`,
+                  ``,
+                  `  (b) USE THE INLINE SNIPPET: Recent edit failures already include a "closest match" snippet showing the actual current content near where you tried to edit. Read that snippet in your last error message and use its content verbatim as old_string.`,
+                  ``,
+                  `  (c) REPLACE_ALL: If you want a global rename, set replace_all=true and the uniqueness check is bypassed.`,
+                  ``,
+                  `  (d) CONSTRAINED PATCH: If the exact replacement is too brittle, use file_patch with expected_old_content or batch_edit/file_edit against fresh current text. Use file_write only for new files, dry-run proposals, or deliberate hash-guarded full_file_rewrite actions.`,
+                  ``,
+                  `Do NOT in your next response: call file_edit or batch_edit on ${_efWorstPath} again with another guess at old_string.`
+                ];
                 messages2.push({
                   role: "system",
                   content: [
@@ -587428,17 +587578,7 @@ ${_staleSamples.join("\n")}` : ``,
                     ``,
                     `Each failure means your old_string did not match the file content. Your remembered version of this file has diverged from what's on disk — likely because an earlier edit succeeded and shifted things, or because you guessed at the file's content.`,
                     ``,
-                    `STOP guessing variants of old_string. Pick ONE of these for your next response:`,
-                    ``,
-                    `  (a) FILE_READ + COPY-EXACT: Call file_read on ${_efWorstPath}, then copy the EXACT bytes (whitespace, indentation, punctuation) for old_string from that read. Do not paraphrase or reformat.`,
-                    ``,
-                    `  (b) USE THE INLINE SNIPPET: Recent edit failures already include a "closest match" snippet showing the actual current content near where you tried to edit. Read that snippet in your last error message and use its content verbatim as old_string.`,
-                    ``,
-                    `  (c) REPLACE_ALL: If you want a global rename, set replace_all=true and the uniqueness check is bypassed.`,
-                    ``,
-                    `  (d) CONSTRAINED PATCH: If the exact replacement is too brittle, use file_patch with expected_old_content or batch_edit/file_edit against fresh current text. Use file_write only for new files, dry-run proposals, or deliberate hash-guarded full_file_rewrite actions.`,
-                    ``,
-                    `Do NOT in your next response: call file_edit or batch_edit on ${_efWorstPath} again with another guess at old_string.`
+                    ..._reg53ChoiceLines
                   ].join("\n")
                 });
                 this.emit({
@@ -587683,7 +587823,7 @@ ${_staleSamples.join("\n")}` : ``,
             }
           }
           const turnTier = this.options.modelTier ?? "large";
-          if (turn === 0 && !this.options.disableTodoPlanningNudges && (turnTier === "small" || turnTier === "medium")) {
+          if (turn === 0 && !this.options.disableTodoPlanningNudges && this._todoWriteAvailable() && (turnTier === "small" || turnTier === "medium")) {
             const goal = this._taskState.goal || "";
             const substantiveGoal = goal.replace(/\b(?:then\s+)?call\s+task_complete\b[^.?!;]*/gi, "").replace(/\b(?:observe|report|summarize|finish|complete)\b[^.?!;]*/gi, "");
             const wordCount2 = substantiveGoal.split(/\s+/).filter(Boolean).length;
@@ -587796,7 +587936,7 @@ ${top.map((t2) => `- ${t2.name}: ${t2.desc}`).join("\n")}`);
             const isReadTask = /\bread\b|\bshow\b|\btell me\b|\bwhat is\b/i.test(taskGoal);
             const hints = [];
             if (isSimpleTask) {
-              hints.push("This is a simple task — if it needs only ONE substantive tool call, skip todo_write and call the tool directly, then task_complete. Do not count reporting, observing output, or task_complete as planning steps. If it needs 2+ substantive work steps, use todo_write to plan.");
+              hints.push(this._todoWriteAvailable() ? "This is a simple task — if it needs only ONE substantive tool call, skip todo_write and call the tool directly, then task_complete. Do not count reporting, observing output, or task_complete as planning steps. If it needs 2+ substantive work steps, use todo_write to plan." : "This is a simple task — if it needs only ONE substantive tool call, call the tool directly, then task_complete. Do not count reporting, observing output, or task_complete as planning steps.");
             }
             if (isSearchTask) {
               hints.push("SEARCH STRATEGY: Use grep_search to find what you need FIRST, THEN file_read only the specific file and lines. Do NOT read entire files hoping to find something.");
@@ -588532,7 +588672,7 @@ ${memoryLines.join("\n")}`
                   `Best practice for this model tier: emit at most ${_responseCap} tool calls per turn.`,
                   `Observe the results of the first ${_responseCap}, then plan the next batch in the NEXT turn.`,
                   `Smaller batches let cache/dedup/progress-gate/failure signals reach you BEFORE you commit to more work.`,
-                  `Use todo_write between batches to track which items are done.`
+                  this._todoWriteAvailable() ? `Use todo_write between batches to track which items are done.` : `Track progress internally between batches; do not call unavailable planning tools.`
                 ].join("\n")
               });
             }
@@ -588873,7 +589013,7 @@ Corrective action: try a different approach first: read relevant files, adjust a
                     turn,
                     timestamp: (/* @__PURE__ */ new Date()).toISOString()
                   });
-                  const budgetMsg = `[BUDGET EXHAUSTED] You have used all ${toolBudgets[tc.name]} allowed ${tc.name} calls for the current phase. You ALREADY have enough information from previous calls. DO NOT try to call ${tc.name} again — it will be blocked. If your todo list shows more phases pending: mark the current phase completed via todo_write so a new budget allowance kicks in. If all phases are done: call task_complete with your final summary.`;
+                  const budgetMsg = `[BUDGET EXHAUSTED] You have used all ${toolBudgets[tc.name]} allowed ${tc.name} calls for the current phase. You ALREADY have enough information from previous calls. DO NOT try to call ${tc.name} again — it will be blocked. ` + (this._todoWriteAvailable() ? `If your todo list shows more phases pending: mark the current phase completed via todo_write so a new budget allowance kicks in. ` : `If more phases remain, continue with a different available tool instead of repeating the exhausted one. `) + `If all phases are done: call task_complete with your final summary.`;
                   this.emit({
                     type: "tool_result",
                     toolName: tc.name,
@@ -589404,6 +589544,7 @@ ${cachedResult}`,
                 let validationError = this._validateToolActionReason(resolvedTool?.name ?? tc.name, tc.arguments ?? {});
                 if (!validationError) {
                   tc.arguments = this._stripToolActionReasonArgs(tc.arguments ?? {});
+                  tc.arguments = this._normalizeToolArgsForExecution(resolvedTool?.name ?? tc.name, tc.arguments ?? {});
                   validationError = this._validateFileWriteOverwriteContract(resolvedTool?.name ?? tc.name, tc.arguments ?? {}, toolActionReason);
                 }
                 if (!validationError) {
@@ -590559,14 +590700,15 @@ Respond with EXACTLY this structure before your next tool call:
                 }
                 if (!_prior && !this._opaqueErrorHintInjected.has(_refStem) && _entry.subject == null && (categorizeError(_refErr) === "unknown" || _refErr.length > 100)) {
                   this._opaqueErrorHintInjected.add(_refStem);
+                  const todoWriteUnavailable = tc.name === "todo_write" && /Unknown tool/i.test(_entry.wentWrong);
                   const opaqueMessage = tc.name === "todo_write" ? [
                     `[PLANNING TOOL RECOVERY — todo_write failed before updating the visible checklist.]`,
                     ``,
                     `Tool: ${tc.name}`,
                     `Error: "${_entry.wentWrong}"`,
                     ``,
-                    `This is a recoverable planning-tool argument issue, not a local code or dependency failure.`,
-                    `Correct the todo_write payload if a visible checklist is still needed; otherwise continue with the first substantive task from the attempted plan.`,
+                    todoWriteUnavailable ? `todo_write is not registered in this tool surface. Do not retry it; continue using the available tools and call task_complete with evidence when done.` : `This is a recoverable planning-tool argument issue, not a local code or dependency failure.`,
+                    todoWriteUnavailable ? `Use the attempted checklist only as private state; do not let missing bookkeeping block substantive work.` : `Correct the todo_write payload if a visible checklist is still needed; otherwise continue with the first substantive task from the attempted plan.`,
                     `Do not pivot to broad shell discovery or code edits solely because todo_write failed.`,
                     ``,
                     this._renderLocalFailureNudge(turn)
@@ -593718,7 +593860,17 @@ ${marker}` : marker);
         };
       }
       _extractToolActionReason(args) {
-        const raw = args["action_reason"] ?? args["actionReason"] ?? args["justification"];
+        let raw = args["action_reason"] ?? args["actionReason"] ?? args["justification"];
+        if (typeof raw === "string") {
+          const trimmed = raw.trim();
+          if (!trimmed)
+            return null;
+          try {
+            raw = JSON.parse(trimmed);
+          } catch {
+            return null;
+          }
+        }
         if (!raw || typeof raw !== "object" || Array.isArray(raw))
           return null;
         const rec = raw;
@@ -593735,7 +593887,7 @@ ${marker}` : marker);
         if (!this._requiresToolActionReason(toolName))
           return null;
         const raw = args["action_reason"] ?? args["actionReason"] ?? args["justification"];
-        if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
+        if (!raw || typeof raw === "string" && !raw.trim()) {
           return [
             "[TOOL ACTION REASON CONTRACT]",
             `Every tool call must include action_reason: { task_anchor, intent, evidence, expected_result, scope }.`,
@@ -593774,6 +593926,39 @@ ${marker}` : marker);
         }
         return changed ? next : args;
       }
+      _normalizeToolArgsForExecution(toolName, args) {
+        if (toolName !== "file_patch")
+          return args;
+        let next = args;
+        const copy = () => {
+          if (next === args)
+            next = { ...args };
+          return next;
+        };
+        const coerceLineNumber = (value2) => {
+          if (typeof value2 === "number")
+            return value2;
+          if (typeof value2 === "string" && /^\d+$/.test(value2.trim())) {
+            return Number(value2.trim());
+          }
+          return value2;
+        };
+        if (next["start_line"] === void 0 && args["line"] !== void 0) {
+          copy()["start_line"] = coerceLineNumber(args["line"]);
+        }
+        if (next["end_line"] === void 0 && args["line_end"] !== void 0) {
+          copy()["end_line"] = coerceLineNumber(args["line_end"]);
+        }
+        if (next["end_line"] === void 0 && args["endLine"] !== void 0) {
+          copy()["end_line"] = coerceLineNumber(args["endLine"]);
+        }
+        for (const key of ["start_line", "end_line"]) {
+          if (typeof next[key] === "string") {
+            copy()[key] = coerceLineNumber(next[key]);
+          }
+        }
+        return next;
+      }
       _validateFileWriteOverwriteContract(toolName, args, actionReason) {
         if (toolName !== "file_write")
           return null;

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "omnius",
-  "version": "1.0.461",
+  "version": "1.0.463",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "omnius",
-      "version": "1.0.461",
+      "version": "1.0.463",
       "bundleDependencies": [
         "image-to-ascii"
       ],
@@ -430,9 +430,9 @@
       }
     },
     "node_modules/@helia/utils/node_modules/cborg": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/cborg/-/cborg-5.1.6.tgz",
-      "integrity": "sha512-apu/mOSODJ98JXBz3cbiv/gAFX4oaCZQQ53+8b4IPjc1wylYxd8eJis87QP7ic4AOE4O02j02jjfUgVZUJIIvA==",
+      "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/cborg/-/cborg-5.1.7.tgz",
+      "integrity": "sha512-rGg2MG9zZEUKtKqjkBppIWUecTXf9N1vs1Qru43vJWoDaODhCrtmzdehCaA/aq/c1cPI5A0kPrJ5Tf+jIfhV4w==",
       "license": "Apache-2.0",
       "bin": {
         "cborg": "lib/bin.js"
@@ -461,9 +461,9 @@
       }
     },
     "node_modules/@ipld/dag-cbor/node_modules/cborg": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/cborg/-/cborg-5.1.6.tgz",
-      "integrity": "sha512-apu/mOSODJ98JXBz3cbiv/gAFX4oaCZQQ53+8b4IPjc1wylYxd8eJis87QP7ic4AOE4O02j02jjfUgVZUJIIvA==",
+      "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/cborg/-/cborg-5.1.7.tgz",
+      "integrity": "sha512-rGg2MG9zZEUKtKqjkBppIWUecTXf9N1vs1Qru43vJWoDaODhCrtmzdehCaA/aq/c1cPI5A0kPrJ5Tf+jIfhV4w==",
       "license": "Apache-2.0",
       "bin": {
         "cborg": "lib/bin.js"
@@ -480,9 +480,9 @@
       }
     },
     "node_modules/@ipld/dag-json/node_modules/cborg": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/cborg/-/cborg-5.1.6.tgz",
-      "integrity": "sha512-apu/mOSODJ98JXBz3cbiv/gAFX4oaCZQQ53+8b4IPjc1wylYxd8eJis87QP7ic4AOE4O02j02jjfUgVZUJIIvA==",
+      "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/cborg/-/cborg-5.1.7.tgz",
+      "integrity": "sha512-rGg2MG9zZEUKtKqjkBppIWUecTXf9N1vs1Qru43vJWoDaODhCrtmzdehCaA/aq/c1cPI5A0kPrJ5Tf+jIfhV4w==",
       "license": "Apache-2.0",
       "bin": {
         "cborg": "lib/bin.js"
@@ -4342,9 +4342,9 @@
       }
     },
     "node_modules/ipns/node_modules/cborg": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/cborg/-/cborg-5.1.6.tgz",
-      "integrity": "sha512-apu/mOSODJ98JXBz3cbiv/gAFX4oaCZQQ53+8b4IPjc1wylYxd8eJis87QP7ic4AOE4O02j02jjfUgVZUJIIvA==",
+      "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/cborg/-/cborg-5.1.7.tgz",
+      "integrity": "sha512-rGg2MG9zZEUKtKqjkBppIWUecTXf9N1vs1Qru43vJWoDaODhCrtmzdehCaA/aq/c1cPI5A0kPrJ5Tf+jIfhV4w==",
       "license": "Apache-2.0",
       "bin": {
         "cborg": "lib/bin.js"

package/package.json

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