omnius 1.0.484 → 1.0.486

package/dist/index.js

@@ -576193,6 +576193,7 @@ function normalizeCompletionStatus(value2) {
 function isEvidenceGatheringTool(toolName) {
   return [
     "file_read",
+    "file_explore",
     "grep_search",
     "find_files",
     "list_directory",
@@ -576200,6 +576201,9 @@ function isEvidenceGatheringTool(toolName) {
     "todo_write"
   ].includes(toolName);
 }
+function isEvidenceLike(toolName, isReadLike) {
+  return isReadLike || isEvidenceGatheringTool(toolName);
+}
 function isEditTool(toolName) {
   return ["file_write", "file_edit", "file_patch", "batch_edit"].includes(toolName);
 }
@@ -576541,7 +576545,7 @@ var init_focusSupervisor = __esm({
             return this.pass();
           }
           const strict = this.shouldStrictlyIntervene(input.context);
-          const sameTurnAsDirective = input.turn <= prior.createdTurn;
+          const sameTurnAsDirective = prior.state === "verify_or_block" ? input.turn < prior.createdTurn : input.turn <= prior.createdTurn;
           const alreadyCountedThisTurn = this.lastIgnoredDirectiveTurn === input.turn;
           if (sameTurnAsDirective || alreadyCountedThisTurn) {
             if (strict) {
@@ -576692,10 +576696,32 @@ var init_focusSupervisor = __esm({
           this.clearSatisfiedDirective("requested edit already applied", input.turn);
           return;
         }
-        if (input.success && input.noop && input.isReadLike && (this.directive?.requiredNextAction === "use_cached_evidence" || this.directive?.requiredNextAction === "read_authoritative_target")) {
+        if (input.success && input.noop && isEvidenceLike(input.toolName, input.isReadLike) && (this.directive?.requiredNextAction === "use_cached_evidence" || this.directive?.requiredNextAction === "read_authoritative_target")) {
           this.clearSatisfiedDirective(input.runtimeAuthored ? "cached authoritative evidence reused" : "authoritative evidence already available", input.turn);
           return;
         }
+        if (input.success && isEvidenceLike(input.toolName, input.isReadLike) && this.directive?.requiredNextAction === "use_cached_evidence") {
+          this.clearSatisfiedDirective(input.runtimeAuthored ? "cached evidence reused via successful read" : "alternative read action succeeded after cached evidence", input.turn);
+          return;
+        }
+        if (input.toolName === "shell" && input.success) {
+          if (this.convergenceBreaker) {
+            const fam = actionFamily(input.toolName, input.args, this.familyCwd);
+            this.convergenceBreaker.resolve(fam);
+            this.convergenceFamilyCounts.delete(fam);
+          }
+          if (this.directive?.requiredNextAction === "run_verification") {
+            this.clearSatisfiedDirective(input.runtimeAuthored ? "cached verification replay consumed" : "verification ran successfully", input.turn);
+          } else if (isEvidenceLike(input.toolName, input.isReadLike) && this.directive?.requiredNextAction === "read_authoritative_target") {
+            this.clearSatisfiedDirective("authoritative evidence read via shell", input.turn);
+          } else if (!input.isReadLike && this.directive?.requiredNextAction === "use_cached_evidence") {
+            this.clearSatisfiedDirective("distinct shell action executed after cached evidence", input.turn);
+          } else if (input.runtimeAuthored) {
+            this.lastDecision = "runtime_authored_not_satisfied";
+            this.lastReason = "runtime-authored control result did not execute the requested tool";
+          }
+          return;
+        }
         if (input.runtimeAuthored) {
           this.lastDecision = "runtime_authored_not_satisfied";
           this.lastReason = "runtime-authored control result did not execute the requested tool";
@@ -576725,21 +576751,6 @@ var init_focusSupervisor = __esm({
           }
           return;
         }
-        if (input.toolName === "shell" && input.success) {
-          if (this.convergenceBreaker) {
-            const fam = actionFamily(input.toolName, input.args, this.familyCwd);
-            this.convergenceBreaker.resolve(fam);
-            this.convergenceFamilyCounts.delete(fam);
-          }
-          if (this.directive?.requiredNextAction === "run_verification") {
-            this.clearSatisfiedDirective("verification ran successfully", input.turn);
-          } else if (input.isReadLike && this.directive?.requiredNextAction === "read_authoritative_target") {
-            this.clearSatisfiedDirective("authoritative evidence read via shell", input.turn);
-          } else if (!input.isReadLike && this.directive?.requiredNextAction === "use_cached_evidence") {
-            this.clearSatisfiedDirective("distinct shell action executed after cached evidence", input.turn);
-          }
-          return;
-        }
         if (input.success)
           return;
         const family = failureFamilyKey(input.toolName, input.args, input.error, input.output, this.familyCwd);
@@ -576828,8 +576839,9 @@ var init_focusSupervisor = __esm({
       markCompletionBlocked(input) {
         if (!this.enabled)
           return;
+        const effectiveTurn = input.turn + 1;
         this.setDirective({
-          turn: input.turn,
+          turn: effectiveTurn,
           state: "verify_or_block",
           reason: input.reason,
           requiredNextAction: this.resolveRequiredNextAction(input.requiredNextAction ?? "run_verification"),
@@ -576896,7 +576908,7 @@ var init_focusSupervisor = __esm({
           createdTurn: input.turn,
           ignoredCount: 0
         };
-        if (!stable) {
+        if (!stable && (!existing || existing.state !== input.state || existing.requiredNextAction !== input.requiredNextAction)) {
           this.repeatedViolationCounts.clear();
         }
         this.directive = directive;
@@ -583713,6 +583725,8 @@ ${result.output ?? ""}`;
         if (this._completionIncompleteVerification)
           return true;
         const directive = this._focusSupervisor?.snapshot().directive;
+        if (directive?.state === "forced_replan" && directive.requiredNextAction === "creative_pivot_or_research")
+          return true;
         return directive?.state === "terminal_incomplete" || directive?.requiredNextAction === "report_incomplete" || directive?.requiredNextAction === "report_blocked";
       }
       /**
@@ -585600,7 +585614,13 @@ ${contentPreview}
           return true;
         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(unquoted))
+        if (/\b(?:udevadm|mount|umount|modprobe|insmod|kill|pkill|killall)\b/i.test(unquoted))
+          return true;
+        if (/\b(?:nohup|systemctl|service|chvt|renice)\b/i.test(unquoted))
+          return true;
+        if (/\bservice\s+(start|stop|restart|reload|reload-or-restart)\b/i.test(unquoted))
+          return true;
+        if (/\bsystemctl\s+(start|stop|restart|reload|daemon-reload|enable|disable|isolate|set-default)\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;
@@ -588778,6 +588798,7 @@ TASK: ${scrubbedTask}` : scrubbedTask;
             timestamp: (/* @__PURE__ */ new Date()).toISOString()
           });
         };
+        let executeSingle = async () => null;
         const turnCap = this.options.maxTurns && this.options.maxTurns > 0 ? this.options.maxTurns : Number.MAX_SAFE_INTEGER;
         for (let turn = 0; turn < turnCap; turn++) {
           clearTurnState(this._appState);
@@ -590810,7 +590831,7 @@ ${memoryLines.join("\n")}`
               });
             }
             let editFeedbackRequiredBeforeMoreEdits = null;
-            const executeSingle = async (tc) => {
+            executeSingle = async (tc) => {
               if (this.aborted)
                 return null;
               const actionReasonForAdvisory = this._toolActionReasonForCall(tc.name, tc.arguments ?? {});
@@ -591530,7 +591551,7 @@ Read the current file if needed, make a different concrete edit, or move to veri
                   });
                 }
                 const _repeatGateMax = this._resolveRepeatGateMax();
-                const isFailedShellRepeat = tc.name === "shell" && typeof _existingFp?.result === "string" && _existingFp.result.includes("status: failure");
+                const isFailedShellRepeat = tc.name === "shell" && typeof _existingFp?.result === "string" && _existingFp.result.includes("status: failure") && !shellLikelyMutatesFilesystem;
                 const repeatGateEligible = isReadLike || tc.name === "memory_write" || isFailedShellRepeat;
                 const suppressSuccessfulShellCacheGuidance = tc.name === "shell" && !isFailedShellRepeat;
                 if (suppressSuccessfulShellCacheGuidance)
@@ -592673,7 +592694,8 @@ Respond with EXACTLY this structure before your next tool call:
               }
               const cacheableMemoryNoop = tc.name === "memory_write" && result.success && result.noop;
               const cacheableProjectWriteNoop = this._isProjectEditTool(tc.name) && result.success && !this._isRealProjectMutation(tc.name, result) && (result.noop === true || result.mutated === false);
-              if (isReadLike && result.success && result.runtimeAuthored !== true || tc.name === "shell" && result.runtimeAuthored !== true || cacheableMemoryNoop || cacheableProjectWriteNoop) {
+              const cacheableShellResult = tc.name === "shell" && result.runtimeAuthored !== true && !shellLikelyMutatesFilesystem;
+              if (isReadLike && result.success && result.runtimeAuthored !== true || cacheableShellResult || cacheableMemoryNoop || cacheableProjectWriteNoop) {
                 recentToolResults.set(toolFingerprint, {
                   result: tc.name === "shell" ? this._buildShellCacheResult(tc.arguments, result) : (
                     // Read-like results are SERVED BACK to the model when the
@@ -594577,183 +594599,21 @@ ${this.options.maxTurns && this.options.maxTurns > 0 ? `You have ${this.options.
               for (const tc of msg.toolCalls) {
                 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);
-                if (this._contextTree) {
-                  this._contextTree.observeToolCall(tc.name, bfArgsKey, turn);
-                  const transition = this._contextTree.maybeTransition(turn);
-                  if (transition) {
-                    const phaseSlice = messages2.slice(this._phaseMessageStartIdx);
-                    if (phaseSlice.length > 0) {
-                      const fromNode = this._contextTree.getSnapshot().phases[transition.from];
-                      if (fromNode) {
-                        fromNode.messages = phaseSlice;
-                      }
-                    }
-                    this.emit({
-                      type: "status",
-                      content: `Phase: ${transition.from} → ${transition.to} (brute-force cycle)`,
-                      timestamp: (/* @__PURE__ */ new Date()).toISOString()
-                    });
-                    const summarizer = this.makePhaseSummarizer();
-                    const contracted = this._contextTree.contractInactive(turn, summarizer ? (msgs) => summarizer(transition.from, msgs) : void 0);
-                    if (contracted.length > 0) {
-                      this.emit({
-                        type: "status",
-                        content: `Phase contraction: ${contracted.join(", ")} → contracted (${summarizer ? "LLM-summarized" : "stub-summarized"}, anchors retained, brute-force)`,
-                        timestamp: (/* @__PURE__ */ new Date()).toISOString()
-                      });
-                    }
-                    this._phaseMessageStartIdx = messages2.length;
-                    this._taskState.phase = transition.to;
-                    this._taskState.phaseSince = turn;
-                  }
-                }
-                this.emit({
-                  type: "tool_call",
-                  toolName: tc.name,
-                  toolArgs: tc.arguments,
-                  turn,
-                  timestamp: (/* @__PURE__ */ new Date()).toISOString()
-                });
-                const _decomp2BFBlock = this._maybeDecomp2Block(tc, turn);
-                if (_decomp2BFBlock) {
-                  this.emit({
-                    type: "tool_result",
-                    toolName: tc.name,
-                    content: _decomp2BFBlock.slice(0, 200),
-                    success: false,
-                    turn,
-                    timestamp: (/* @__PURE__ */ new Date()).toISOString()
-                  });
-                  messages2.push(this.buildToolMessage(_decomp2BFBlock, tc.id, tc.name));
+                const r2 = await executeSingle(tc);
+                if (!r2)
                   continue;
-                }
-                const resolvedTool = this.lookupRegisteredTool(tc.name);
-                const tool = resolvedTool?.tool;
-                let result;
-                if (!tool) {
-                  result = {
-                    success: false,
-                    output: "",
-                    error: this.unknownToolError(tc.name)
-                  };
-                } else {
-                  try {
-                    result = await tool.execute(tc.arguments);
-                    result = this.applyRegisteredToolResultTriage(result, resolvedTool?.name ?? tc.name, tool);
-                  } catch (err) {
-                    result = {
-                      success: false,
-                      output: "",
-                      error: err instanceof Error ? err.message : String(err)
-                    };
-                  }
-                }
-                if (!result.success && tc.name === "shell" && /\[PERMISSION_ERROR\]/.test(result.error ?? "")) {
-                  this.emit({
-                    type: "sudo_request",
-                    content: `Command requires elevated privileges: ${tc.arguments.command?.slice(0, 100) ?? ""}`,
-                    timestamp: (/* @__PURE__ */ new Date()).toISOString()
-                  });
-                  const pw2 = await this.waitForSudoPassword(12e4);
-                  if (pw2 && tool) {
-                    try {
-                      result = await tool.execute(tc.arguments);
-                      result = this.applyRegisteredToolResultTriage(result, resolvedTool?.name ?? tc.name, tool);
-                    } catch (err) {
-                      result = {
-                        success: false,
-                        output: "",
-                        error: err instanceof Error ? err.message : String(err)
-                      };
-                    }
-                  }
-                }
-                const { toolOutputMaxChars: maxLen2 } = this.contextLimits();
-                let output;
-                const modelContent2 = result.llmContent ?? result.output;
-                const isAlreadyTriaged = modelContent2.startsWith(TRIAGE_ENVELOPE_MARKER) && modelContent2.includes(TRIAGE_SAVED_PATH_MARKER);
-                if (!result.success) {
-                  output = `Error: ${result.error || "unknown error"}
-${modelContent2}`;
-                } else if (isAlreadyTriaged) {
-                  output = modelContent2;
-                } else if (modelContent2.length > maxLen2) {
-                  const handleId = this.quickHash(tc.name + String(tc.arguments?.["path"] ?? "") + String(turn));
-                  const lineCount = (result.output.match(/\n/g) || []).length + 1;
-                  const preview = result.output.slice(0, 500).replace(/\n/g, " ");
-                  this._memexArchive.set(handleId, {
-                    id: handleId,
-                    toolName: tc.name,
-                    summary: `${tc.name} output (${lineCount} lines, ${result.output.length} chars)`,
-                    fullContent: result.output,
-                    turn,
-                    timestamp: (/* @__PURE__ */ new Date()).toISOString()
+                messages2.push(this.buildModelFacingToolMessage(r2.output, r2.tc.id, r2.tc.name, r2.tc.arguments, r2.success));
+                if (r2.systemGuidance) {
+                  messages2.push({
+                    role: "system",
+                    content: r2.systemGuidance
                   });
-                  output = `[${tc.name} succeeded — output externalized: ${result.output.length} chars, ${lineCount} lines]
-Handle: ${handleId}
-Preview: ${preview}...
-Full content available via: repl_exec(code="data = retrieve('${handleId}')")  or  memex_retrieve(id="${handleId}")`;
-                } else {
-                  output = modelContent2;
                 }
-                const bfRealFileMutation = this._isRealProjectMutation(tc.name, result);
-                const bfRealMutationPaths = bfRealFileMutation ? this._extractToolTargetPaths(tc.name, tc.arguments, result) : [];
-                const bfLogEntry = toolCallLog[toolCallLog.length - 1];
-                if (bfLogEntry) {
-                  bfLogEntry.success = result.success;
-                  bfLogEntry.mutated = bfRealFileMutation;
-                  bfLogEntry.mutatedFiles = bfRealMutationPaths;
-                  bfLogEntry.outputPreview = this._toolEvidencePreview(result, output, 1200, tc.name);
-                }
-                this.emit({
-                  type: "tool_result",
-                  toolName: tc.name,
-                  content: this.toolResultEventContent(tc.name, output || result.output || result.error || ""),
-                  success: result.success,
-                  turn,
-                  timestamp: (/* @__PURE__ */ new Date()).toISOString()
-                });
-                this._trackDecomp2(tc, result, turn);
-                this._recordCompletionToolEvidenceFromResult({
-                  toolName: tc.name,
-                  argsKey: bfArgsKey,
-                  args: tc.arguments,
-                  actionReason: bfActionReason,
-                  result,
-                  outputPreview: this._toolEvidencePreview(result, output, 1200, tc.name),
-                  realFileMutation: bfRealFileMutation,
-                  realMutationPaths: bfRealMutationPaths
-                });
-                const enoentTools2 = /* @__PURE__ */ new Set([
-                  "file_read",
-                  "list_directory",
-                  "find_files"
-                ]);
-                if (!result.success && enoentTools2.has(tc.name) && /ENOENT|no such file|does not exist|not found/i.test(result.error ?? result.output)) {
-                  this._consecutiveEnoent++;
-                  if (this._consecutiveEnoent >= 2) {
-                    const failedPath2 = String(tc.arguments?.["path"] ?? tc.arguments?.["file"] ?? "unknown");
-                    this.enqueueRuntimeGuidance(`[SYSTEM] ${this._consecutiveEnoent} consecutive file-not-found errors (last: "${failedPath2}"). You are repeating failed paths. CHANGE YOUR APPROACH:
-1. Call list_directory(".") to see what exists at the project root
-2. Entries in a directory listing are RELATIVE to that directory. If you listed "parent/" and saw "child", the full path is "parent/child" — NOT ".child" or just "child"
-3. If an entry is a directory (marked "d"), use list_directory on it, NOT file_read
-4. Use the FULL relative paths shown in list_directory output — they are copy-paste ready`);
-                  }
-                } else {
-                  this._consecutiveEnoent = 0;
-                }
-                const toolMsg = this.buildModelFacingToolMessage(output, tc.id, tc.name, tc.arguments, result.success);
-                messages2.push(toolMsg);
-                if (tc.name === "task_complete") {
-                  if (!result.success) {
+                if (r2.tc.name === "task_complete") {
+                  if (!r2.success) {
                     messages2.push({
                       role: "system",
-                      content: this.buildTaskCompleteToolFailureGuard(output)
+                      content: this.buildTaskCompleteToolFailureGuard(r2.output)
                     });
                     this.emit({
                       type: "status",
@@ -594762,7 +594622,7 @@ Full content available via: repl_exec(code="data = retrieve('${handleId}')")  or
                     });
                     continue;
                   }
-                  const taskCompleteArgs = tc.arguments;
+                  const taskCompleteArgs = r2.tc.arguments;
                   const open2 = this.getOpenTodoItems();
                   if (open2.length > 0 && !this._shouldBypassTodoCompletionGuardForTaskComplete(taskCompleteArgs)) {
                     const guard = this.buildTodoCompletionGuard(open2);

package/npm-shrinkwrap.json

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

package/package.json

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