omnius 1.0.462 → 1.0.463

package/dist/index.js

@@ -567631,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)}".`;
@@ -567661,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();
@@ -567756,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(``);
@@ -575157,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")
@@ -575204,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];
 }
@@ -585300,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] ?? []) {
@@ -586794,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 || "",
@@ -586801,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,
@@ -587181,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: [
@@ -587194,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,
@@ -587359,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: [
@@ -587369,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({
@@ -587497,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: [
@@ -587507,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({
@@ -589483,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) {
@@ -593798,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;
@@ -593815,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 }.`,
@@ -593854,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.462",
+  "version": "1.0.463",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "omnius",
-      "version": "1.0.462",
+      "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.462",
+  "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",