omnius 1.0.458 → 1.0.460

package/dist/index.js

@@ -572346,6 +572346,20 @@ var init_streaming_executor = __esm({
       setExecutor(fn) {
         this.executeFn = fn;
       }
+      /** Rename a queued streaming tool entry when the provider reveals its real id late. */
+      rename(oldId, newId) {
+        if (!oldId || !newId || oldId === newId)
+          return;
+        const entry = this.tools.get(oldId);
+        if (!entry || this.tools.has(newId))
+          return;
+        this.tools.delete(oldId);
+        entry.id = newId;
+        this.tools.set(newId, entry);
+        const idx = this.insertionOrder.indexOf(oldId);
+        if (idx >= 0)
+          this.insertionOrder[idx] = newId;
+      }
       /** Update the parsed-input concurrency classifier. */
       setConcurrencyResolver(fn) {
         this.config.concurrencyResolver = fn;
@@ -572583,7 +572597,7 @@ var init_streaming_executor = __esm({
         entry.state = "executing";
         entry.startedAt = Date.now();
         const exec7 = this.executeFn;
-        entry.promise = exec7(entry.name, entry.args).then((result) => {
+        entry.promise = exec7(entry.id, entry.name, entry.args).then((result) => {
           entry.state = "completed";
           entry.result = result;
           entry.completedAt = Date.now();
@@ -573206,6 +573220,7 @@ var init_context_fabric = __esm({
       GOAL: 100,
       ACTION_CONTRACT: 98,
       USER_STEERING: 95,
+      RUNTIME_GUIDANCE: 94,
       TASK_STATE: 80,
       KNOWN_FILES: 70,
       RECENT_FAILURE: 65,
@@ -573222,6 +573237,7 @@ var init_context_fabric = __esm({
     KIND_ORDER = [
       "goal",
       "user_steering",
+      "runtime_guidance",
       "action_contract",
       "task_state",
       "known_files",
@@ -573239,6 +573255,7 @@ var init_context_fabric = __esm({
     KIND_LABELS = {
       goal: "Goal",
       user_steering: "User Steering",
+      runtime_guidance: "Runtime Guidance",
       action_contract: "Next Action Contract",
       task_state: "Task State",
       known_files: "Known Files",
@@ -573256,6 +573273,7 @@ var init_context_fabric = __esm({
     DEFAULT_KIND_CHAR_BUDGET = {
       goal: 900,
       user_steering: 1400,
+      runtime_guidance: 1800,
       action_contract: 1800,
       task_state: 1800,
       known_files: 2400,
@@ -574740,8 +574758,87 @@ function diagnoseContextDump(record) {
   if (record.metrics.estimatedTokens > 1e5) {
     diagnoses.add("large-context-window");
   }
+  if (hasToolResultBindingMismatch(record)) {
+    diagnoses.add("tool-result-binding-mismatch");
+  }
   return [...diagnoses].sort();
 }
+function hasToolResultBindingMismatch(record) {
+  const messages2 = Array.isArray(record.request?.["messages"]) ? record.request["messages"] : [];
+  if (messages2.length === 0)
+    return false;
+  const callsById = /* @__PURE__ */ new Map();
+  for (const message2 of messages2) {
+    if (message2["role"] !== "assistant")
+      continue;
+    const calls = Array.isArray(message2["tool_calls"]) ? message2["tool_calls"] : [];
+    for (const call of calls) {
+      const id2 = typeof call["id"] === "string" ? call["id"] : "";
+      const fn = call["function"] && typeof call["function"] === "object" ? call["function"] : {};
+      const name10 = typeof fn["name"] === "string" ? fn["name"] : "";
+      const argsRaw = typeof fn["arguments"] === "string" ? fn["arguments"] : "{}";
+      let args = {};
+      try {
+        args = JSON.parse(argsRaw);
+      } catch {
+        args = {};
+      }
+      if (id2)
+        callsById.set(id2, { name: name10, args });
+    }
+  }
+  for (const message2 of messages2) {
+    if (message2["role"] !== "tool")
+      continue;
+    const id2 = typeof message2["tool_call_id"] === "string" ? message2["tool_call_id"] : "";
+    const call = id2 ? callsById.get(id2) : void 0;
+    if (!call)
+      continue;
+    const requested = extractToolTarget(call.args);
+    if (!requested)
+      continue;
+    const content = typeof message2["content"] === "string" ? message2["content"] : "";
+    const reported = extractReportedToolTarget(content);
+    if (!reported)
+      continue;
+    if (!targetsCompatible(requested, reported))
+      return true;
+  }
+  return false;
+}
+function extractToolTarget(args) {
+  const value2 = args["path"] ?? args["file"] ?? args["file_path"] ?? args["filepath"] ?? args["directory"] ?? args["cwd"];
+  return typeof value2 === "string" ? value2.trim() : "";
+}
+function extractReportedToolTarget(content) {
+  const patterns = [
+    /^target=([^\n\r]+)/m,
+    /^path=([^\n\r]+)/m,
+    /\bfile\s+([^\s]+)\s+already contains/i,
+    /\bEdited\s+([^\s]+)\s+at line/i,
+    /\bat\s+([^\s]+)\s+\(sha256\b/i,
+    /\bRefusing to (?:edit|overwrite existing file)\s+([^\s]+)/i
+  ];
+  for (const pattern of patterns) {
+    const match = content.match(pattern);
+    const raw = match?.[1]?.trim();
+    if (raw)
+      return raw.replace(/[),.;:]+$/, "");
+  }
+  return "";
+}
+function targetsCompatible(requested, reported) {
+  const left = normalizeTargetForCompare(requested);
+  const right = normalizeTargetForCompare(reported);
+  if (!left || !right)
+    return true;
+  if (left === right)
+    return true;
+  return left.endsWith(`/${right}`) || right.endsWith(`/${left}`);
+}
+function normalizeTargetForCompare(value2) {
+  return value2.trim().replace(/^["']|["']$/g, "").replace(/\\/g, "/").replace(/\/+/g, "/").replace(/\/$/, "");
+}
 function summarizeToolEvent(toolName, success, diagnoses, command) {
   const status = success ? "success" : "failure";
   const parts = [`${toolName} ${status}`];
@@ -574853,6 +574950,7 @@ function writeContract(contractPath) {
     "- `focus-supervisor-cached-evidence`: the focus supervisor short-circuited a call successfully by reusing current cached evidence.",
     "- `background-task-id-missing`: task status lookup could not find the spawned task id.",
     "- `raw-discovery-dominates-context`: context-window metrics show low signal/noise around raw discovery output.",
+    "- `tool-result-binding-mismatch`: the outbound model transcript contains a tool result whose reported target does not match the assistant tool call it is attached to.",
     ""
   ].join("\n");
   writeFileSync49(contractPath, body, "utf-8");
@@ -578125,32 +578223,75 @@ function sanitizeHistoryThink(messages2) {
   const stripped = messages2.map((m2) => {
     if (m2.role !== "assistant" || typeof m2.content !== "string")
       return m2;
-    return { ...m2, content: stripThinkBlocks(m2.content) };
+    const withoutThink = stripThinkBlocks(m2.content);
+    const collapsed = collapseDegenerateAssistantRepetition(withoutThink);
+    return { ...m2, content: collapsed ?? withoutThink };
   });
   const sanitized = [];
   for (let i2 = 0; i2 < stripped.length; i2++) {
     const current = stripped[i2];
-    const next = stripped[i2 + 1];
-    if (isOrphanDuplicateAssistantToolAnchor(current, next, referencedToolCallIds)) {
+    if (isOrphanDuplicateAssistantToolAnchor(stripped, i2, referencedToolCallIds)) {
       continue;
     }
     sanitized.push(current);
   }
   return sanitized;
 }
-function isOrphanDuplicateAssistantToolAnchor(current, next, referencedToolCallIds) {
-  if (!next)
+function collapseDegenerateAssistantRepetition(content) {
+  const trimmed = content.trim();
+  if (trimmed.length < 160)
+    return null;
+  const lineUnits = trimmed.split(/\n+/).map((line) => line.trim()).filter((line) => line.length >= 12);
+  const sentenceUnits = lineUnits.length >= 3 ? lineUnits : trimmed.split(/(?<=[.!?])\s+/).map((part) => part.trim()).filter((part) => part.length >= 12);
+  if (sentenceUnits.length < 3)
+    return null;
+  const counts = /* @__PURE__ */ new Map();
+  for (const unit of sentenceUnits) {
+    const key = unit.toLowerCase().replace(/\s+/g, " ").slice(0, 220);
+    const current = counts.get(key) ?? { count: 0, chars: 0, sample: unit };
+    current.count++;
+    current.chars += unit.length;
+    counts.set(key, current);
+  }
+  let best = null;
+  for (const value2 of counts.values()) {
+    if (!best || value2.count > best.count || value2.count === best.count && value2.chars > best.chars) {
+      best = value2;
+    }
+  }
+  if (!best || best.count < 3)
+    return null;
+  const repeatedRatio = best.chars / Math.max(1, trimmed.length);
+  if (repeatedRatio < 0.55)
+    return null;
+  return `[assistant repetitive text suppressed: repeated ${best.count}x "${best.sample.slice(0, 180)}"]`;
+}
+function isOrphanDuplicateAssistantToolAnchor(messages2, index, referencedToolCallIds) {
+  const current = messages2[index];
+  if (!current)
     return false;
-  if (current.role !== "assistant" || next.role !== "assistant")
+  if (current.role !== "assistant")
     return false;
-  if (!Array.isArray(current.tool_calls) || !Array.isArray(next.tool_calls)) {
+  if (!Array.isArray(current.tool_calls) || current.tool_calls.length === 0) {
     return false;
   }
-  if (current.tool_calls.length === 0 || next.tool_calls.length === 0) {
+  if (assistantVisibleText(current).length > 0)
     return false;
+  let next;
+  for (let i2 = index + 1; i2 < Math.min(messages2.length, index + 8); i2++) {
+    const candidate = messages2[i2];
+    if (candidate.role === "system")
+      continue;
+    if (candidate.role !== "assistant")
+      return false;
+    next = candidate;
+    break;
   }
-  if (assistantVisibleText(current).length > 0)
+  if (!next)
+    return false;
+  if (!Array.isArray(next.tool_calls) || next.tool_calls.length === 0) {
     return false;
+  }
   if (toolCallsFingerprint(current.tool_calls) !== toolCallsFingerprint(next.tool_calls)) {
     return false;
   }
@@ -578423,6 +578564,7 @@ var init_agenticRunner = __esm({
       _onTypedEvent;
       handlers = [];
       pendingUserMessages = [];
+      pendingRuntimeGuidanceMessages = [];
       aborted = false;
       _abortController = new AbortController();
       _paused = false;
@@ -578802,6 +578944,7 @@ var init_agenticRunner = __esm({
       //
       // Kill switch: OMNIUS_DISABLE_REG61_COERCE=1 disables BOTH set and enforce.
       _reg61PerpetualGateActive = false;
+      _reg61DeferredFocusDirectiveId = null;
       // DECOMP-2 (root-cause from batch531-midi-decomp, 2026-05-03): compelling
       // sub_agent delegation. DECOMP-1's informational directive was ignored
       // (0 sub_agent calls in 466 tool-call run despite directive at turn 1).
@@ -578921,28 +579064,58 @@ var init_agenticRunner = __esm({
         return this.options.workboardDir || this._workingDirectory || process.cwd();
       }
       getOrCreateWorkboard() {
-        if (this._workboard)
+        const goal = this._taskState.originalGoal || this._taskState.goal || "";
+        if (this._workboard) {
+          this._workboard = this._seedWorkboardCardsIfNeeded(this._workboard, goal);
           return this._workboard;
+        }
         const dir = this._workboardDir();
         const runId = this._sessionId;
         const existing = loadWorkboardSnapshot(dir, runId);
         if (existing) {
-          this._workboard = existing;
-          return existing;
+          this._workboard = this._seedWorkboardCardsIfNeeded(existing, goal);
+          return this._workboard;
         }
         try {
           this._workboard = createWorkboard(dir, {
             runId,
             owner: this.options.subAgent ? "sub-agent" : "agent",
-            goal: this._taskState.originalGoal || this._taskState.goal || void 0,
+            goal: goal || void 0,
             title: (this._taskState.goal || "").slice(0, 120) || void 0,
-            cards: this._initialWorkboardCardsForGoal(this._taskState.originalGoal || this._taskState.goal || "")
+            cards: this._initialWorkboardCardsForGoal(goal)
           });
         } catch {
           this._workboard = loadWorkboardSnapshot(dir, runId);
         }
+        if (this._workboard) {
+          this._workboard = this._seedWorkboardCardsIfNeeded(this._workboard, goal);
+        }
         return this._workboard;
       }
+      _seedWorkboardCardsIfNeeded(snapshot, goal) {
+        if (snapshot.cards.length > 0)
+          return snapshot;
+        const cards = this._initialWorkboardCardsForGoal(goal);
+        if (cards.length === 0)
+          return snapshot;
+        let current = snapshot;
+        const dir = this._workboardDir();
+        for (const card of cards) {
+          try {
+            current = addWorkboardCard(dir, {
+              ...card,
+              runId: snapshot.runId,
+              actor: this.options.subAgent ? "sub-agent" : "agent",
+              decisionReason: "Seeded missing workboard card after an empty persisted board was detected for an active user task."
+            });
+          } catch {
+            const refreshed = readActiveWorkboardSnapshot(dir, snapshot.runId);
+            if (refreshed)
+              current = refreshed;
+          }
+        }
+        return readActiveWorkboardSnapshot(dir, snapshot.runId) ?? current;
+      }
       _initialWorkboardCardsForGoal(goal) {
         if (!this.writesUserTaskArtifacts())
           return [];
@@ -579060,9 +579233,11 @@ var init_agenticRunner = __esm({
       injectWorkboardContext() {
         if (this._workboard || this.options.subAgent) {
           const dir = this._workboardDir();
-          const snapshot = readActiveWorkboardSnapshot(dir, this._sessionId);
+          let snapshot = readActiveWorkboardSnapshot(dir, this._sessionId);
           if (!snapshot)
             return null;
+          snapshot = this._seedWorkboardCardsIfNeeded(snapshot, this._taskState.originalGoal || this._taskState.goal || "");
+          this._workboard = snapshot;
           const activeCards = snapshot.cards.filter((c9) => c9.status === "in_progress" || c9.status === "open" || c9.status === "needs_changes");
           if (activeCards.length === 0 && snapshot.cards.every((c9) => c9.status === "verified" || c9.status === "completed"))
             return null;
@@ -579092,11 +579267,13 @@ ${parts.join("\n")}
         const dir = this._workboardDir();
         const fromDisk = readActiveWorkboardSnapshot(dir, this._sessionId);
         if (fromDisk) {
-          this._workboard = fromDisk;
-          return fromDisk;
+          this._workboard = this._seedWorkboardCardsIfNeeded(fromDisk, this._taskState.originalGoal || this._taskState.goal || "");
+          return this._workboard;
         }
-        if (this._workboard)
+        if (this._workboard) {
+          this._workboard = this._seedWorkboardCardsIfNeeded(this._workboard, this._taskState.originalGoal || this._taskState.goal || "");
           return this._workboard;
+        }
         const goal = this._taskState.originalGoal || this._taskState.goal || "";
         if (this._initialWorkboardCardsForGoal(goal).length === 0)
           return null;
@@ -580445,6 +580622,25 @@ Your hypotheses MUST address this specific error, not generic causes.
         const fa = this._detectFailingApproachSignal(turn);
         return fa ? this._failingApproachDirective(fa) : null;
       }
+      _focusDirectiveSuppressesEditPressure() {
+        return this._focusSupervisor?.currentDirective ?? null;
+      }
+      _deferReg61ToFocusDirective(input) {
+        if (this._reg61PerpetualGateActive) {
+          this._reg61PerpetualGateActive = false;
+        }
+        if (this._reg61DeferredFocusDirectiveId === input.directive.id)
+          return;
+        this._reg61DeferredFocusDirectiveId = input.directive.id;
+        const _cyclePart = input.cycleLabel ? ` (${input.cycleLabel})` : "";
+        const _detail = input.detail ? `; ${input.detail}` : "";
+        this.emit({
+          type: "status",
+          content: `REG-61 deferred to focus supervisor at turn ${input.turn}${_cyclePart}; source=${input.source}; directive_id=${input.directive.id}; required_next_action=${input.directive.requiredNextAction}${_detail}`,
+          turn: input.turn,
+          timestamp: (/* @__PURE__ */ new Date()).toISOString()
+        });
+      }
       /**
        * REG-61 sliding-window first-edit / sustained-edit nudge.
        *
@@ -580536,11 +580732,23 @@ Your hypotheses MUST address this specific error, not generic causes.
         }
         if (_readsInWindow < REG61_MIN_READS)
           return;
+        const _gapDesc = this._lastFileWriteTurn < 0 ? `no creative edits yet this run` : `${turn - this._lastFileWriteTurn} turns since last creative edit (turn ${this._lastFileWriteTurn})`;
+        const focusDirective = this._focusDirectiveSuppressesEditPressure();
+        if (focusDirective) {
+          this._deferReg61ToFocusDirective({
+            directive: focusDirective,
+            turn,
+            cycleLabel,
+            source: "trigger",
+            detail: `reads_in_window=${_readsInWindow}; ${_gapDesc}`
+          });
+          return;
+        }
+        this._reg61DeferredFocusDirectiveId = null;
         this._reg61CooldownUntilTurn = turn + REG61_COOLDOWN;
         if (process.env["OMNIUS_DISABLE_REG61_COERCE"] !== "1") {
           this._reg61PerpetualGateActive = true;
         }
-        const _gapDesc = this._lastFileWriteTurn < 0 ? `no creative edits yet this run` : `${turn - this._lastFileWriteTurn} turns since last creative edit (turn ${this._lastFileWriteTurn})`;
         const reg61Msg = `[FIRST-EDIT NUDGE — REG-61]
 You have made ${_readsInWindow} read/exploration calls in the trailing window — ${_gapDesc}. Reading is preparation; writing is progress. Runs that stay in pure-read mode produce zero deliverables.
 
@@ -581463,7 +581671,7 @@ ${context2 ?? ""}`;
             }
             if (critique2) {
               this._visualNudgesEmitted.add(nudgeKey);
-              this.pendingUserMessages.push(critique2);
+              this.enqueueRuntimeGuidance(critique2);
             }
           }
         }
@@ -584312,7 +584520,7 @@ ${blob}
           });
           if (!this._microcompactHintEmitted && this.tools.has("memory_write")) {
             this._microcompactHintEmitted = true;
-            this.pendingUserMessages.push(`[SYSTEM] Older tool results have been cleared to save context. If you discovered important patterns or facts, use memory_write to persist them before they are lost from context.`);
+            this.enqueueRuntimeGuidance(`[SYSTEM] Older tool results have been cleared to save context. If you discovered important patterns or facts, use memory_write to persist them before they are lost from context.`);
           }
         }
       }
@@ -585045,6 +585253,11 @@ ${notice}`;
       injectUserMessage(content) {
         this.pendingUserMessages.push(this.scrubUserInput(content, "injected-user-message"));
       }
+      enqueueRuntimeGuidance(content) {
+        const cleaned = this.scrubUserInput(content, "runtime-guidance").trim();
+        if (cleaned)
+          this.pendingRuntimeGuidanceMessages.push(cleaned);
+      }
       /** Retract the last pending user message (Esc cancel).
        *  Returns the retracted text, or null if queue is empty or already consumed. */
       retractLastPendingMessage() {
@@ -585892,7 +586105,7 @@ TASK: ${scrubbedTask}` : scrubbedTask;
             onCritique: (critique2, sourceTurn) => {
               const runClosed = completed || this._completionIncompleteVerification || this.aborted;
               if (!runClosed && (this._adversaryMode === "skillcoach" || this._adversaryMode === "both")) {
-                this.pendingUserMessages.push(AdversaryStream.formatInjection(critique2));
+                this.enqueueRuntimeGuidance(AdversaryStream.formatInjection(critique2));
               }
               this.emit({
                 type: "adversary_reaction",
@@ -587292,7 +587505,7 @@ ${_staleSamples.join("\n")}` : ``,
               timestamp: (/* @__PURE__ */ new Date()).toISOString()
             });
             messages2.push({
-              role: "user",
+              role: "system",
               content: this.buildHealthCheckPrompt(elapsed, toolCallCount, repetitionScore, selfEvalCount)
             });
             nextSelfEval = now2 + selfEvalInterval;
@@ -587327,6 +587540,7 @@ ${_staleSamples.join("\n")}` : ``,
               });
             }
           }
+          this.drainPendingRuntimeGuidance(turn);
           while (this.pendingUserMessages.length > 0) {
             const userMsg = this.pendingUserMessages.shift();
             await this.appendInjectedUserMessage(userMsg, messages2, turn);
@@ -587334,7 +587548,7 @@ ${_staleSamples.join("\n")}` : ``,
           if (!this.options.disableTodoPlanningNudges) {
             const maybeReminder = this.getTodoReminderContent(turn);
             if (maybeReminder) {
-              messages2.push({ role: "user", content: maybeReminder });
+              messages2.push({ role: "system", content: maybeReminder });
               this.emit({
                 type: "status",
                 content: `todo_reminder injected (turn ${turn}, last todo_write turn ${this._lastTodoWriteTurn})`,
@@ -587353,7 +587567,7 @@ ${_staleSamples.join("\n")}` : ``,
             const isComplex = !explicitSingleTool && (wordCount2 > 40 || hasMultipleActions || hasMultipleFiles);
             if (isComplex) {
               messages2.push({
-                role: "user",
+                role: "system",
                 content: `[TASK DECOMPOSITION — Multi-step task detected]
 
 MANDATORY FIRST ACTION: Call todo_write NOW with the complete plan.
@@ -587379,7 +587593,7 @@ Call todo_write FIRST, then start with step 1.`
             const isGreenfield = /\bcreate\b.*\bnew\b|\bimplement\b.*\bclass\b|\bwrite\b.*\bfrom scratch\b|\bbuild\b.*\bmodule\b/i.test(goal);
             if (isGreenfield && !isComplex) {
               messages2.push({
-                role: "user",
+                role: "system",
                 content: `[GREENFIELD TASK — Write code immediately]
 
 MANDATORY: Your FIRST tool call MUST be file_write.
@@ -587505,7 +587719,7 @@ ${hints.join("\n")}`);
             const isLooping = repetitionRatio > 0.4;
             const highArousal = errorRatio > 0.5 || isLooping;
             if (highArousal && !isLooping && !noProgress) {
-              this.pendingUserMessages.push(`[COGNITIVE STATE: HIGH AROUSAL] Recent error rate is ${Math.round(errorRatio * 100)}%. Your current approach may be hitting a wall. Consider:
+              this.enqueueRuntimeGuidance(`[COGNITIVE STATE: HIGH AROUSAL] Recent error rate is ${Math.round(errorRatio * 100)}%. Your current approach may be hitting a wall. Consider:
 1. Read related files you haven't examined yet
 2. Search for similar patterns in the codebase
 3. Check if your assumptions about the API/framework are correct
@@ -587515,7 +587729,7 @@ State what you've learned from the errors before trying again.`);
               const progress = this._taskState.completedSteps.slice(-3).join("; ");
               const failures = this._taskState.failedApproaches.slice(-2).join("; ");
               messages2.push({
-                role: "user",
+                role: "system",
                 content: `[PROGRESS CHECK — Turn ${turn}]
 **Goal:** ${this._taskState.goal}
 ` + (progress ? `**Done so far:** ${progress}
@@ -587926,7 +588140,7 @@ ${memoryLines.join("\n")}`
                           const result = this.applyRegisteredToolResultTriage(rawResult, resolvedParsedTool.name, tool);
                           messages2.push({ role: "assistant", content });
                           messages2.push({
-                            role: "user",
+                            role: "system",
                             content: `Tool result (${parsed.tool}): ${result.output.slice(0, 2e3)}`
                           });
                           if (resolvedParsedTool.name === "task_complete") {
@@ -588115,7 +588329,7 @@ ${memoryLines.join("\n")}`
                 timestamp: (/* @__PURE__ */ new Date()).toISOString()
               });
               messages2.push({
-                role: "user",
+                role: "system",
                 content: `[SYSTEM] You produced ${consecutiveEmptyResponses} empty responses in a row. You MUST take action now. Your task: ${this._taskState.goal}
 
 ` + (this._taskState.nextAction ? `**DO THIS NOW:** ${this._taskState.nextAction}
@@ -588213,7 +588427,7 @@ ${memoryLines.join("\n")}`
                   }
                 });
                 if (this._adversaryMode === "skillcoach" || this._adversaryMode === "both") {
-                  this.pendingUserMessages.push(`[ADVERSARY CRITIQUE — non-blocking]
+                  this.enqueueRuntimeGuidance(`[ADVERSARY CRITIQUE — non-blocking]
 Evidence: ${tc.name} with similar arguments has failed ${cohort.failure}× recently.
 Root cause hypothesis: the argument family may be wrong, a prerequisite may be missing, or the tool is being used before enough state is known.
 Corrective action: try a different approach first: read relevant files, adjust arguments, or verify prerequisites.`);
@@ -588226,7 +588440,7 @@ Corrective action: try a different approach first: read relevant files, adjust a
                   const _injKey = `resfix:${_sug.fix.from.join(" ")}=>${_sug.fix.to.join(" ")}`;
                   if (!this._errorGuidanceInjected.has(_injKey)) {
                     this._errorGuidanceInjected.add(_injKey);
-                    this.pendingUserMessages.push(_sug.message);
+                    this.enqueueRuntimeGuidance(_sug.message);
                     this.emit({
                       type: "status",
                       content: `Resolution memory: suggested \`${_sug.fix.from.join(" ")}\`→\`${_sug.fix.to.join(" ")}\` before shell call`,
@@ -588449,7 +588663,16 @@ Corrective action: try a different approach first: read relevant files, adjust a
                 "priority_delegate",
                 "background_run"
               ]);
-              if (this._reg61PerpetualGateActive && !REG61_BYPASS_TOOLS.has(tc.name) && process.env["OMNIUS_DISABLE_REG61_COERCE"] !== "1") {
+              const focusDirectiveForEditPressure = this._focusDirectiveSuppressesEditPressure();
+              if (this._reg61PerpetualGateActive && focusDirectiveForEditPressure) {
+                this._deferReg61ToFocusDirective({
+                  directive: focusDirectiveForEditPressure,
+                  turn,
+                  source: "latched_steer",
+                  detail: `attempted_tool=${tc.name}`
+                });
+              }
+              if (this._reg61PerpetualGateActive && !focusDirectiveForEditPressure && !REG61_BYPASS_TOOLS.has(tc.name) && process.env["OMNIUS_DISABLE_REG61_COERCE"] !== "1") {
                 const _dbgLoop = this._detectDebugLoop([
                   ...toolCallLog,
                   { name: tc.name, argsKey }
@@ -589107,7 +589330,7 @@ ${cachedResult}`,
                       });
                       if (this._hookDenyHintCount < 3 && this.tools.has("memory_write")) {
                         this._hookDenyHintCount++;
-                        this.pendingUserMessages.push(`[SYSTEM] Tool "${tc.name}" was blocked: ${hookCheck.reason}. If this constraint should persist across sessions, use memory_write to save it (e.g., memory_write(topic="constraints", key="${tc.name}_blocked", value="${(hookCheck.reason ?? "hook").slice(0, 80)}")).`);
+                        this.enqueueRuntimeGuidance(`[SYSTEM] Tool "${tc.name}" was blocked: ${hookCheck.reason}. If this constraint should persist across sessions, use memory_write to save it (e.g., memory_write(topic="constraints", key="${tc.name}_blocked", value="${(hookCheck.reason ?? "hook").slice(0, 80)}")).`);
                       }
                     } else {
                       const finalArgs = hookCheck.modifiedArgs ?? tc.arguments;
@@ -590345,7 +590568,7 @@ ${bookkeepingGuidance}` : bookkeepingGuidance;
               }
               if (this._isAtomicBatchEditAbort(tc.name, result)) {
                 editFeedbackRequiredBeforeMoreEdits = this._buildBatchEditAtomicAbortGuidance(tc.arguments);
-                this.pendingUserMessages.push(editFeedbackRequiredBeforeMoreEdits);
+                this.enqueueRuntimeGuidance(editFeedbackRequiredBeforeMoreEdits);
               }
               const currentLogEntry = toolCallLog[_toolLogTailIdx];
               if (currentLogEntry) {
@@ -590594,7 +590817,7 @@ Evidence: ${evidencePreview}`.slice(0, 500);
                 }
                 const consecutiveSameTool = Math.max(sameToolFailStreak, this._taskState.failedApproaches.slice(-2).filter((f2) => f2.startsWith(`${tc.name}(`)).length);
                 if (sameToolFailStreak >= 5 && (this.options.modelTier === "small" || this.options.modelTier === "medium")) {
-                  this.pendingUserMessages.push(`[BRANCH — evaluate alternatives before acting]
+                  this.enqueueRuntimeGuidance(`[BRANCH — evaluate alternatives before acting]
 Tool "${tc.name}" has failed ${sameToolFailStreak} times. STOP and enumerate:
 Option A: [describe a completely different approach]
 Option B: [describe another alternative]
@@ -590604,7 +590827,7 @@ Pick the BEST option and explain why, then execute it. Do NOT retry ${tc.name} w
                   sameToolFailName = null;
                 }
                 if (consecutiveSameTool >= 2 && (this.options.modelTier === "small" || this.options.modelTier === "medium")) {
-                  this.pendingUserMessages.push(`[PIVOT REQUIRED] You have failed ${consecutiveSameTool + 1} times in a row with ${tc.name}. Your current approach is not working. You MUST try something fundamentally different:
+                  this.enqueueRuntimeGuidance(`[PIVOT REQUIRED] You have failed ${consecutiveSameTool + 1} times in a row with ${tc.name}. Your current approach is not working. You MUST try something fundamentally different:
 - If file_edit keeps failing: re-read the file first, then use the EXACT text from the file
 - If shell keeps failing: try a different command or check prerequisites
 - If grep_search finds nothing: try broader patterns or list_directory
@@ -590617,7 +590840,7 @@ Do NOT retry ${tc.name} with similar arguments.`);
                     this._taskState.failedApproaches.shift();
                   }
                   if (this._taskState.failedApproaches.length === 3 && this.tools.has("memory_write")) {
-                    this.pendingUserMessages.push(`[SYSTEM] You have ${this._taskState.failedApproaches.length} failed approaches this session. Consider using memory_write to save these failure patterns so you avoid them in future sessions:
+                    this.enqueueRuntimeGuidance(`[SYSTEM] You have ${this._taskState.failedApproaches.length} failed approaches this session. Consider using memory_write to save these failure patterns so you avoid them in future sessions:
 ` + this._taskState.failedApproaches.map((f2) => `- ${f2}`).join("\n"));
                   }
                 }
@@ -590625,7 +590848,7 @@ Do NOT retry ${tc.name} with similar arguments.`);
                 sameToolFailStreak = 0;
                 sameToolFailName = null;
                 if (isGenerationArtifactSuccess(tc.name, result.output ?? "")) {
-                  this.pendingUserMessages.push(`[GENERATION COMPLETE] ${tc.name} succeeded. Do not call the same generation tool again for the same request. Use the artifact/path from the tool result; if delivery is needed, send it, otherwise call task_complete.`);
+                  this.enqueueRuntimeGuidance(`[GENERATION COMPLETE] ${tc.name} succeeded. Do not call the same generation tool again for the same request. Use the artifact/path from the tool result; if delivery is needed, send it, otherwise call task_complete.`);
                 }
               }
               if (filePath && (tc.name === "file_read" || tc.name === "file_write" || tc.name === "file_edit" || tc.name === "batch_edit" || tc.name === "file_patch")) {
@@ -590653,7 +590876,7 @@ Do NOT retry ${tc.name} with similar arguments.`);
                 if (isModify && (turnTier === "small" || turnTier === "medium")) {
                   const modCount = this._taskState.modifiedFiles.size;
                   if (modCount >= 2 && modCount % 2 === 0) {
-                    this.pendingUserMessages.push(`[Test reminder] You've modified ${modCount} files. Run relevant tests NOW to verify: shell(command="npm test") or the project's test command. Fix any failures before continuing.`);
+                    this.enqueueRuntimeGuidance(`[Test reminder] You've modified ${modCount} files. Run relevant tests NOW to verify: shell(command="npm test") or the project's test command. Fix any failures before continuing.`);
                   }
                 }
               }
@@ -590697,7 +590920,7 @@ Do NOT retry ${tc.name} with similar arguments.`);
               }
               if (isEisdir) {
                 const failedPath = String(tc.arguments?.["path"] ?? tc.arguments?.["file"] ?? "unknown");
-                this.pendingUserMessages.push(`[SYSTEM] "${failedPath}" is a DIRECTORY, not a file. You CANNOT use file_read on directories.
+                this.enqueueRuntimeGuidance(`[SYSTEM] "${failedPath}" is a DIRECTORY, not a file. You CANNOT use file_read on directories.
 Use list_directory("${failedPath}") to see its contents instead.
 Then use file_read on individual FILES inside it.`);
                 this._taskState.failedApproaches.push(`file_read("${failedPath}"): EISDIR — this is a directory, use list_directory`);
@@ -590708,7 +590931,7 @@ Then use file_read on individual FILES inside it.`);
                 if (this._consecutiveEnoent >= 2 || windowEnoents >= 4) {
                   const failedPath = String(tc.arguments?.["path"] ?? tc.arguments?.["file"] ?? "unknown");
                   const triggerReason = this._consecutiveEnoent >= 2 ? `${this._consecutiveEnoent} consecutive file-not-found errors` : `${windowEnoents}/8 recent file operations failed`;
-                  this.pendingUserMessages.push(`[SYSTEM] ${triggerReason} (last: "${failedPath}"). You are repeating failed paths. CHANGE YOUR APPROACH:
+                  this.enqueueRuntimeGuidance(`[SYSTEM] ${triggerReason} (last: "${failedPath}"). 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
@@ -590807,10 +591030,12 @@ Then use file_read on individual FILES inside it.`);
             const rawToolCalls = msg.toolCalls;
             if (this.options.streamEnabled && this._streamingExecutor.hasTools) {
               const streamFpInFlight = /* @__PURE__ */ new Map();
-              this._streamingExecutor.setExecutor(async (name10, args) => {
-                let matchTc = rawToolCalls.find((tc) => tc.name === name10 && JSON.stringify(tc.arguments) === JSON.stringify(args)) ?? rawToolCalls.find((tc) => tc.name === name10);
+              this._streamingExecutor.setExecutor(async (id2, name10, args) => {
+                const argsFingerprint = this._buildToolFingerprint(name10, args);
+                const exactArgMatches = rawToolCalls.filter((tc) => tc.name === name10 && this._buildToolFingerprint(tc.name, tc.arguments ?? {}) === argsFingerprint);
+                let matchTc = rawToolCalls.find((tc) => tc.id === id2) ?? (exactArgMatches.length === 1 ? exactArgMatches[0] : void 0);
                 if (!matchTc) {
-                  const synthId = globalThis.crypto?.randomUUID?.() || `call_${Date.now()}`;
+                  const synthId = id2 || globalThis.crypto?.randomUUID?.() || `call_${Date.now()}`;
                   matchTc = { id: synthId, name: name10, arguments: args };
                   messages2.push({
                     role: "assistant",
@@ -591331,7 +591556,7 @@ Your most recent tool calls SUCCEEDED. If the task is complete, call task_comple
                   timestamp: (/* @__PURE__ */ new Date()).toISOString()
                 });
                 messages2.push({
-                  role: "user",
+                  role: "system",
                   content: "You have been reasoning internally for several turns without producing visible output or tool calls. Please take action now — call a tool or produce a visible response." + successHint
                 });
               }
@@ -591351,7 +591576,7 @@ Your most recent tool calls SUCCEEDED. If the task is complete, call task_comple
               if (shellCommands.length > 0 && shellCommands.length < 2e3) {
                 if (looksLikeShellFileWrite(shellCommands)) {
                   messages2.push({
-                    role: "user",
+                    role: "system",
                     content: `You wrote a shell code block that appears to create or overwrite files. I did NOT auto-execute it because shell redirection bypasses file_write/file_edit/file_patch/batch_edit tracking and version checks. Use file_write/content_base64 for full-file writes, file_edit or batch_edit for exact replacements, or file_patch/new_content_base64 for line-range patches.`
                   });
                   this.emit({
@@ -591411,7 +591636,7 @@ Your most recent tool calls SUCCEEDED. If the task is complete, call task_comple
               } else {
                 correction = `CRITICAL: You cannot use ${toolName} by writing text. After ${narratedToolCallCount} attempts, it is clear this approach will not work. Try a COMPLETELY DIFFERENT tool or approach. For example: if trying skill_execute, try shell("cat .omnius/skills/*/SKILL.md") instead. If trying file_read, try shell("cat path/to/file") instead.`;
               }
-              messages2.push({ role: "user", content: correction });
+              messages2.push({ role: "system", content: correction });
               this.emit({
                 type: "status",
                 content: `Narrated tool call #${narratedToolCallCount}: model wrote ${toolName} as text`,
@@ -591420,11 +591645,12 @@ Your most recent tool calls SUCCEEDED. If the task is complete, call task_comple
             } else {
               narratedToolCallCount = 0;
               messages2.push({
-                role: "user",
+                role: "system",
                 content: "Continue working. Use tools to read files, make changes, and run validation. Call task_complete when done."
               });
             }
             if (adversaryAddedGuidance) {
+              this.drainPendingRuntimeGuidance(turn);
               while (this.pendingUserMessages.length > 0) {
                 const userMsg = this.pendingUserMessages.shift();
                 await this.appendInjectedUserMessage(userMsg, messages2, turn);
@@ -591494,7 +591720,7 @@ Your most recent tool calls SUCCEEDED. If the task is complete, call task_comple
           });
           this._reg61CooldownUntilTurn = -1;
           messages2.push({
-            role: "user",
+            role: "system",
             content: `[CONTINUATION — Cycle ${bruteForceCycle}]
 
 You have used ${totalTurns} turns and ${toolCallCount} tool calls so far. The task is NOT yet complete. DO NOT give up — re-evaluate and continue:
@@ -591585,11 +591811,12 @@ ${this.options.maxTurns && this.options.maxTurns > 0 ? `You have ${this.options.
                 timestamp: (/* @__PURE__ */ new Date()).toISOString()
               });
               messages2.push({
-                role: "user",
+                role: "system",
                 content: this.buildHealthCheckPrompt(elapsed, toolCallCount, repetitionScore, selfEvalCount)
               });
               nextSelfEval = bfNow + selfEvalInterval;
             }
+            this.drainPendingRuntimeGuidance(turn);
             while (this.pendingUserMessages.length > 0) {
               const userMsg = this.pendingUserMessages.shift();
               await this.appendInjectedUserMessage(userMsg, messages2, turn);
@@ -591931,7 +592158,7 @@ Full content available via: repl_exec(code="data = retrieve('${handleId}')")  or
                   this._consecutiveEnoent++;
                   if (this._consecutiveEnoent >= 2) {
                     const failedPath2 = String(tc.arguments?.["path"] ?? tc.arguments?.["file"] ?? "unknown");
-                    this.pendingUserMessages.push(`[SYSTEM] ${this._consecutiveEnoent} consecutive file-not-found errors (last: "${failedPath2}"). You are repeating failed paths. CHANGE YOUR APPROACH:
+                    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
@@ -592068,7 +592295,7 @@ Full content available via: repl_exec(code="data = retrieve('${handleId}')")  or
                   const recentSucc = this._adversaryToolOutcomes.slice(-3).filter((o2) => o2.succeeded);
                   const succHint = recentSucc.length > 0 ? "\n\nYour most recent tool calls SUCCEEDED. If the task is complete, call task_complete now with a summary." : "";
                   messages2.push({
-                    role: "user",
+                    role: "system",
                     content: "You have been reasoning internally for several turns without producing visible output or tool calls. Please take action now — call a tool or produce a visible response." + succHint
                   });
                 }
@@ -592083,7 +592310,7 @@ Full content available via: repl_exec(code="data = retrieve('${handleId}')")  or
                 break;
               }
               messages2.push({
-                role: "user",
+                role: "system",
                 content: "Continue working. Use tools to read files, make changes, and run validation. Call task_complete when done."
               });
             }
@@ -593639,11 +593866,20 @@ ${result.output}`, "utf-8");
         const folded = this.foldOutput(modelContent, maxLen);
         return this.wrapToolOutputForModel(toolName, `[Tool output truncated — ${result.output.length} chars, ${lineCount} lines]
 Full output saved to: ${savedPath}
-To read the complete output, use file_read with path="${savedPath}".
+${this.truncatedToolOutputAccessHint(savedPath)}
 
 Truncated preview (beginning + end):
 ${folded}`);
       }
+      truncatedToolOutputAccessHint(savedPath) {
+        if (this.tools.has("file_read")) {
+          return `To read the complete output, use file_read with path="${savedPath}".`;
+        }
+        if (this.tools.has("shell")) {
+          return `To inspect the complete output, use shell with a read-only command for ${JSON.stringify(savedPath)}.`;
+        }
+        return `No file-reading tool is available in this agent role. Do not call file_read for this saved path; use the truncated preview, or report that the full payload is archived at ${savedPath}.`;
+      }
       wrapToolOutputForModel(toolName, output) {
         if (toolName === "task_complete" || output.startsWith("[trust_tier:")) {
           return output;
@@ -594113,6 +594349,50 @@ ${tail}`;
           timestamp: (/* @__PURE__ */ new Date()).toISOString()
         });
       }
+      drainPendingRuntimeGuidance(turn) {
+        while (this.pendingRuntimeGuidanceMessages.length > 0) {
+          const guidance = this.pendingRuntimeGuidanceMessages.shift();
+          this.appendRuntimeGuidance(guidance, turn);
+        }
+      }
+      appendRuntimeGuidance(guidance, turn) {
+        const packet = this.formatRuntimeGuidance(guidance);
+        const guidanceHash = _createHash("sha256").update(packet).digest("hex").slice(0, 16);
+        const signal = signalFromBlock("runtime_guidance", "runtime.guidance", packet, {
+          id: `runtime-guidance-${turn}-${guidanceHash}`,
+          dedupeKey: `runtime.guidance:${guidanceHash}`,
+          priority: 94,
+          createdTurn: turn,
+          ttlTurns: 8
+        });
+        if (signal)
+          this._contextLedger.upsert(signal);
+        this.emit({
+          type: "status",
+          content: `Runtime guidance queued: ${guidance.replace(/\s+/g, " ").slice(0, 140)}`,
+          turn,
+          timestamp: (/* @__PURE__ */ new Date()).toISOString()
+        });
+      }
+      formatRuntimeGuidance(guidance) {
+        if (guidance.trim().startsWith("[RUNTIME_GUIDANCE_INTAKE")) {
+          return guidance;
+        }
+        return [
+          "[RUNTIME_GUIDANCE_INTAKE v1]",
+          "Source: Omnius runtime control/advisory signal, not an external user message.",
+          "",
+          "<<<RUNTIME_GUIDANCE>>>",
+          guidance,
+          "<<<END_RUNTIME_GUIDANCE>>>",
+          "",
+          "Contract:",
+          "- Treat this as diagnostic/control-plane guidance for the next action.",
+          "- Reconcile it with the user goal and fresh tool evidence.",
+          "- Do not quote or summarize this wrapper to the user.",
+          "[/RUNTIME_GUIDANCE_INTAKE]"
+        ].join("\n");
+      }
       formatInjectedUserMessage(userMsg) {
         if (userMsg.trim().startsWith("[MID_TASK_STEERING_INTAKE")) {
           return userMsg;
@@ -597200,14 +597480,17 @@ ${description}`
               }
             }
             const acc = toolCallAccumulators.get(idx);
+            if (chunk.toolCallId && chunk.toolCallId !== acc.id) {
+              const previousId = acc.id;
+              acc.id = chunk.toolCallId;
+              this._streamingExecutor.rename(previousId, acc.id);
+            }
             if (chunk.toolCallName) {
               acc.name = chunk.toolCallName;
               if (!this._streamingExecutor.getStates().has(acc.id) && acc.name) {
                 this._streamingExecutor.queue(acc.id, acc.name);
               }
             }
-            if (chunk.toolCallId)
-              acc.id = chunk.toolCallId;
             if (chunk.toolCallArgs) {
               acc.args += chunk.toolCallArgs;
             }
@@ -742968,13 +743251,15 @@ The user pasted a clipboard image saved at ${relPath}. Use the OCR, vision analy
     },
     savePendingTaskState() {
       if (lastSubmittedPrompt && activeTask) {
+        const activeToolCallCount = activeTask.toolCallCount;
+        const activeFilesTouched = Array.from(activeTask.filesTouched);
         savePendingTask(repoRoot, {
           prompt: lastSubmittedPrompt,
-          progressSummary: `Task paused by user. ${sessionToolCallCount} tool calls completed.`,
-          filesModified: sessionFilesTouched,
+          progressSummary: `Task paused by user. ${activeToolCallCount} tool calls completed.`,
+          filesModified: activeFilesTouched,
           bruteForce: bruteForceEnabled,
           savedAt: (/* @__PURE__ */ new Date()).toISOString(),
-          toolCallCount: sessionToolCallCount
+          toolCallCount: activeToolCallCount
         });
         return true;
       }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "omnius",
-  "version": "1.0.458",
+  "version": "1.0.460",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "omnius",
-      "version": "1.0.458",
+      "version": "1.0.460",
       "bundleDependencies": [
         "image-to-ascii"
       ],
@@ -5940,9 +5940,9 @@
       }
     },
     "node_modules/p-queue": {
-      "version": "9.3.0",
-      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-9.3.0.tgz",
-      "integrity": "sha512-7NED7xhQ74Ngp4JP/2e0VZHp7vSWfJfqeiR92jPgxsz6m0Se4P03YoTKa9dDXyZ3r6P616gUXttrB6nnHYKang==",
+      "version": "9.3.1",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-9.3.1.tgz",
+      "integrity": "sha512-POWdiIPmsUPGwb4FeQ4OBg46aqmcInSWe45CKDsGHiOBiVQM9chqfQTuqhuTzcg2Vz9faTI65at0KkVyVEiCHw==",
       "license": "MIT",
       "dependencies": {
         "eventemitter3": "^5.0.4",

package/package.json

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