omnius 1.0.462 → 1.0.464

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];
 }
@@ -578503,7 +578528,7 @@ function classifyThinkOutcome(raw) {
   }
   return null;
 }
-var TOOL_SUBSETS, TOOL_AUTO_DEMOTE_TURNS, TOOL_ACTION_REASON_KEYS, TOOL_ACTION_REASON_SCOPES, TOOL_ACTION_REASON_SCHEMA, SYSTEM_PROMPT, SYSTEM_PROMPT_MEDIUM, SYSTEM_PROMPT_SMALL, VISUAL_TOOLS, AUDIO_TOOLS, SOCIAL_TOOLS, SPATIAL_TOOLS, CODE_TOOLS, AgenticRunner, OllamaAgenticBackend;
+var TOOL_SUBSETS, TOOL_AUTO_DEMOTE_TURNS, TOOL_ACTION_REASON_KEYS, TOOL_ACTION_REASON_SCOPES, READ_ONLY_ACTION_REASON_OPTIONAL_TOOLS, TOOL_ACTION_REASON_SCHEMA, SYSTEM_PROMPT, SYSTEM_PROMPT_MEDIUM, SYSTEM_PROMPT_SMALL, VISUAL_TOOLS, AUDIO_TOOLS, SOCIAL_TOOLS, SPATIAL_TOOLS, CODE_TOOLS, AgenticRunner, OllamaAgenticBackend;
 var init_agenticRunner = __esm({
   "packages/orchestrator/dist/agenticRunner.js"() {
     "use strict";
@@ -578608,6 +578633,25 @@ var init_agenticRunner = __esm({
       "completion",
       "other"
     ]);
+    READ_ONLY_ACTION_REASON_OPTIONAL_TOOLS = /* @__PURE__ */ new Set([
+      "file_read",
+      "file_explore",
+      "list_directory",
+      "grep_search",
+      "grep",
+      "glob_find",
+      "find_files",
+      "todo_read",
+      "memory_read",
+      "memory_search",
+      "semantic_map",
+      "code_graph",
+      "graph_query",
+      "graph_traverse",
+      "web_search",
+      "web_fetch",
+      "tool_search"
+    ]);
     TOOL_ACTION_REASON_SCHEMA = {
       type: "object",
       description: "Compact public action contract for this exact tool call. Do not include hidden chain-of-thought; use concise task-state facts.",
@@ -579548,7 +579592,7 @@ ${parts.join("\n")}
         if (ts.failedApproaches.length > 0) {
           lines.push(`recent_failed_approaches=${ts.failedApproaches.slice(-3).join(" | ").replace(/\s+/g, " ").slice(0, 420)}`);
         }
-        lines.push("tool_call_contract=Each tool call must include action_reason {task_anchor,intent,evidence,expected_result,scope}; compact public facts only, no hidden chain-of-thought.");
+        lines.push("tool_call_contract=Mutating/side-effectful tool calls require action_reason {task_anchor,intent,evidence,expected_result,scope}; read-only evidence tools may include it but must never be blocked only for missing metadata. Compact public facts only, no hidden chain-of-thought.");
         lines.push(`scope_contract=${Array.from(TOOL_ACTION_REASON_SCOPES).join("|")}; use targeted_patch for constrained code edits and full_file_rewrite only for deliberate whole-file replacement.`);
         const focus = this._focusSupervisor?.snapshot().directive ?? null;
         if (focus) {
@@ -584760,7 +584804,7 @@ ${blob}
        * size. The hash is computed over the full canonical value.
        */
       _buildExactArgsKey(args) {
-        return Object.entries(args ?? {}).sort(([a2], [b]) => a2.localeCompare(b)).map(([k, v]) => `${k}=${this._formatExactArgValue(v)}`).join(",");
+        return Object.entries(args ?? {}).filter(([key]) => !TOOL_ACTION_REASON_KEYS.has(key)).sort(([a2], [b]) => a2.localeCompare(b)).map(([k, v]) => `${k}=${this._formatExactArgValue(v)}`).join(",");
       }
       _buildToolFingerprint(name10, args) {
         const canonical = this.lookupRegisteredTool(name10)?.name ?? name10;
@@ -585235,7 +585279,8 @@ Rewrite it now for ${ctx3.model}.`;
         const unknownKeys = providedKeys.filter((key) => !props.has(key));
         const aliases = this.suggestArgumentAliases(missingRequired, providedKeys, args, props);
         const corrected = this.buildCorrectedArgsPreview(args, props, aliases);
-        const siblingMatches = this.findSiblingToolSchemaMatches(toolName, providedKeys);
+        const actionReasonOnlyFailure = validationError.includes("[TOOL ACTION REASON CONTRACT]");
+        const siblingMatches = actionReasonOnlyFailure ? [] : this.findSiblingToolSchemaMatches(toolName, providedKeys);
         const lines = [
           `[RUNTIME TOOL ARGUMENT REPAIR]`,
           `Tool call failed before execution: ${toolName}`,
@@ -585300,7 +585345,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 +586842,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 +586850,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 +587235,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 +587267,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 +587422,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 +587453,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 +587569,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 +587598,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({
@@ -588619,7 +588700,7 @@ ${memoryLines.join("\n")}`
             const executeSingle = async (tc) => {
               if (this.aborted)
                 return null;
-              const actionReasonForAdvisory = this._extractToolActionReason(tc.arguments ?? {});
+              const actionReasonForAdvisory = this._toolActionReasonForCall(tc.name, tc.arguments ?? {});
               const cohortKey = this.buildArgCohortKey(tc.name, tc.arguments);
               const cohort = this._argCohorts.get(cohortKey);
               if (cohort && cohort.failure >= 3 && cohort.success === 0) {
@@ -589483,6 +589564,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) {
@@ -593769,21 +593851,40 @@ ${marker}` : marker);
         }
         return matchesFresh(args);
       }
-      _requiresToolActionReason(toolName) {
+      _toolActionReasonPolicy(toolName, args) {
         if (process.env["OMNIUS_DISABLE_TOOL_ACTION_REASON"] === "1") {
-          return false;
+          return "disabled";
         }
         if ((process.env["VITEST"] || process.env["NODE_ENV"] === "test") && process.env["OMNIUS_REQUIRE_TOOL_ACTION_REASON"] !== "1") {
-          return false;
+          return "disabled";
         }
         if (this.options.artifactMode === "internal")
-          return false;
+          return "disabled";
         if (toolName.startsWith("__"))
-          return false;
-        return true;
+          return "disabled";
+        return this._toolActionReasonIsOptional(toolName, args) ? "optional" : "required";
+      }
+      _requiresToolActionReason(toolName, args) {
+        return this._toolActionReasonPolicy(toolName, args) === "required";
+      }
+      _toolActionReasonIsOptional(toolName, args) {
+        const resolved = this.lookupRegisteredTool(toolName);
+        const canonical = resolved?.name ?? toolName;
+        if (READ_ONLY_ACTION_REASON_OPTIONAL_TOOLS.has(canonical))
+          return true;
+        const tool = resolved?.tool;
+        if (typeof tool?.isReadOnly === "function") {
+          try {
+            if (tool.isReadOnly(args ?? {}))
+              return true;
+          } catch {
+          }
+        }
+        return false;
       }
       _withToolActionReasonSchema(toolName, parameters) {
-        if (!this._requiresToolActionReason(toolName)) {
+        const policy = this._toolActionReasonPolicy(toolName);
+        if (policy === "disabled") {
           return parameters ?? { type: "object", properties: {} };
         }
         const base3 = parameters && typeof parameters === "object" && !Array.isArray(parameters) ? { ...parameters } : { type: "object" };
@@ -593794,11 +593895,21 @@ ${marker}` : marker);
           ...base3,
           type: "object",
           properties,
-          required: [.../* @__PURE__ */ new Set([...required, "action_reason"])]
+          required: policy === "required" ? [.../* @__PURE__ */ new Set([...required, "action_reason"])] : required
         };
       }
       _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;
@@ -593811,20 +593922,46 @@ ${marker}` : marker);
         };
         return reason;
       }
+      _toolActionReasonForCall(toolName, args) {
+        const explicit = this._extractToolActionReason(args);
+        if (explicit)
+          return explicit;
+        if (this._toolActionReasonPolicy(toolName, args) !== "optional")
+          return null;
+        return this._synthesizeReadOnlyToolActionReason(toolName, args);
+      }
+      _synthesizeReadOnlyToolActionReason(toolName, args) {
+        const canonical = this.lookupRegisteredTool(toolName)?.name ?? toolName;
+        const goal = this._taskState.currentStep || this._taskState.nextAction || this._taskState.goal || this._taskState.originalGoal || "current task";
+        const targets = this._extractToolTargetPaths(canonical, args).slice(0, 3);
+        const targetText = targets.length > 0 ? ` for ${targets.join(", ")}` : "";
+        return {
+          task_anchor: String(goal).replace(/\s+/g, " ").trim().slice(0, 160),
+          intent: `Run read-only ${canonical}${targetText} to gather current evidence.`,
+          evidence: "Read-only metadata fallback; no project mutation is authorized by this action.",
+          expected_result: `Current ${canonical} evidence for the next decision.`,
+          scope: "discovery"
+        };
+      }
       _validateToolActionReason(toolName, args) {
-        if (!this._requiresToolActionReason(toolName))
+        const policy = this._toolActionReasonPolicy(toolName, args);
+        if (policy === "disabled")
           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()) {
+          if (policy === "optional")
+            return null;
           return [
             "[TOOL ACTION REASON CONTRACT]",
-            `Every tool call must include action_reason: { task_anchor, intent, evidence, expected_result, scope }.`,
+            `This side-effectful tool call must include action_reason: { task_anchor, intent, evidence, expected_result, scope }.`,
             `Use compact public facts only; do not include hidden chain-of-thought.`,
             `scope must be one of: ${Array.from(TOOL_ACTION_REASON_SCOPES).join(", ")}.`
           ].join("\n");
         }
         const reason = this._extractToolActionReason(args);
         if (!reason) {
+          if (policy === "optional")
+            return null;
           return "[TOOL ACTION REASON CONTRACT] action_reason must be an object with compact public task-state fields.";
         }
         const missing = [
@@ -593835,9 +593972,13 @@ ${marker}` : marker);
           "scope"
         ].filter((key) => reason[key].length < 3);
         if (missing.length > 0) {
+          if (policy === "optional")
+            return null;
           return `[TOOL ACTION REASON CONTRACT] action_reason missing non-empty field(s): ${missing.join(", ")}.`;
         }
         if (!TOOL_ACTION_REASON_SCOPES.has(reason.scope)) {
+          if (policy === "optional")
+            return null;
           return `[TOOL ACTION REASON CONTRACT] action_reason.scope="${reason.scope}" is invalid. Use one of: ${Array.from(TOOL_ACTION_REASON_SCOPES).join(", ")}.`;
         }
         return null;
@@ -593854,6 +593995,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;
@@ -595862,7 +596036,7 @@ ${trimmedNew}`;
               args = JSON.parse(tc.function.arguments);
             } catch {
             }
-            const actionReason = this._extractToolActionReason(args);
+            const actionReason = this._toolActionReasonForCall(name10, args);
             const argsKey = this._buildExactArgsKey(args);
             const fingerprint = this._buildToolFingerprint(name10, args);
             const prior = this._adversaryToolOutcomes.find((o2) => o2.succeeded && o2.tool === name10 && o2.fingerprint === fingerprint && o2.stateVersion === this._adversaryStateVersion && o2.turn < turn);
@@ -627821,6 +627995,7 @@ var omnius_directory_exports = {};
 __export(omnius_directory_exports, {
   OMNIUS_DIR: () => OMNIUS_DIR,
   buildContextRestorePrompt: () => buildContextRestorePrompt,
+  buildContextRestoreSnapshot: () => buildContextRestoreSnapshot,
   buildHandoffPrompt: () => buildHandoffPrompt,
   cleanPromptForDiary: () => cleanPromptForDiary,
   clearTaskHandoff: () => clearTaskHandoff,
@@ -628764,9 +628939,7 @@ function selectActiveTaskAnchor(repoRoot) {
     return null;
   }
 }
-function buildActiveTaskAnchor(repoRoot) {
-  const selected = selectActiveTaskAnchor(repoRoot);
-  if (!selected) return null;
+function formatActiveTaskAnchor(selected) {
   const ledger = selected.ledger;
   const evidence = ledger.evidence ?? [];
   const selectedEvidence = [...evidence.slice(0, 2), ...evidence.slice(-4)];
@@ -628800,6 +628973,131 @@ ${boardCards.join("\n")}
 ` : "") + `Continuation rule: when the user asks to continue, resume this active task unless the new prompt names a different target.
 </active-task-anchor>`;
 }
+function uniqueSessionIds(ids) {
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const raw of ids) {
+    const id2 = String(raw || "").trim();
+    if (!id2 || seen.has(id2)) continue;
+    seen.add(id2);
+    out.push(id2);
+  }
+  return out;
+}
+function collectRestoreSessionIds(ctx3, activeTask, historySessionId) {
+  const entries = ctx3?.entries ?? [];
+  const usefulEntries = entries.filter((entry) => !isManualSessionEntry(entry));
+  const chronological = usefulEntries.length > 0 ? usefulEntries : entries;
+  return uniqueSessionIds([
+    activeTask?.ledger.runId,
+    ...[...chronological].reverse().map((entry) => entry.sessionId),
+    ...[...entries].reverse().map((entry) => entry.sessionId),
+    historySessionId
+  ]);
+}
+function childMapForTodos(todos) {
+  const byId = new Set(todos.map((todo) => todo.id));
+  const byParent = /* @__PURE__ */ new Map();
+  for (const todo of todos) {
+    if (!todo.parentId || !byId.has(todo.parentId)) continue;
+    const bucket = byParent.get(todo.parentId) ?? [];
+    bucket.push(todo);
+    byParent.set(todo.parentId, bucket);
+  }
+  for (const bucket of byParent.values()) {
+    bucket.sort((a2, b) => a2.createdAt - b.createdAt || a2.id.localeCompare(b.id));
+  }
+  return byParent;
+}
+function statusRank2(status) {
+  switch (status) {
+    case "in_progress":
+      return 0;
+    case "blocked":
+      return 1;
+    case "pending":
+      return 2;
+    case "completed":
+      return 3;
+    default:
+      return 4;
+  }
+}
+function orderedTodoTree(todos) {
+  const byId = new Set(todos.map((todo) => todo.id));
+  const byParent = childMapForTodos(todos);
+  const roots = todos.filter((todo) => !todo.parentId || !byId.has(todo.parentId)).sort((a2, b) => statusRank2(a2.status) - statusRank2(b.status) || a2.createdAt - b.createdAt || a2.id.localeCompare(b.id));
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  const visit = (todo, depth) => {
+    if (seen.has(todo.id)) return;
+    seen.add(todo.id);
+    out.push({ todo, depth });
+    for (const child of byParent.get(todo.id) ?? []) visit(child, depth + 1);
+  };
+  for (const root of roots) visit(root, 0);
+  for (const todo of todos) visit(todo, 0);
+  return out;
+}
+function formatTodoLine(todo, depth) {
+  const indent2 = "  ".repeat(Math.min(depth, 6));
+  const blocker = todo.blocker ? ` blocker="${normalizeSessionText(todo.blocker, 120)}"` : "";
+  const verify2 = todo.verifyCommand ? ` verify="${normalizeSessionText(todo.verifyCommand, 120)}"` : "";
+  const artifacts = todo.declaredArtifacts && todo.declaredArtifacts.length > 0 ? ` artifacts=${todo.declaredArtifacts.slice(0, 4).map((item) => normalizeSessionText(item, 80)).join(",")}` : "";
+  return `${indent2}- [${todo.status}] ${normalizeSessionText(todo.content, 180)} (id=${todo.id}${todo.parentId ? ` parent=${todo.parentId}` : ""}${blocker}${verify2}${artifacts})`;
+}
+function buildRestoredTodoBlock(sessionId, todos) {
+  const byParent = childMapForTodos(todos);
+  const leafTodos = todos.filter((todo) => (byParent.get(todo.id)?.length ?? 0) === 0);
+  const completedLeaves = leafTodos.filter((todo) => todo.status === "completed").length;
+  const activeTodos = todos.filter((todo) => todo.status === "in_progress" || todo.status === "blocked").sort((a2, b) => statusRank2(a2.status) - statusRank2(b.status) || b.updatedAt - a2.updatedAt).slice(0, 8);
+  const ordered = orderedTodoTree(todos);
+  const visible = ordered.slice(0, 48);
+  const omitted = Math.max(0, ordered.length - visible.length);
+  const activeLines = activeTodos.map((todo) => `- [${todo.status}] ${normalizeSessionText(todo.content, 180)} (id=${todo.id})`);
+  const treeLines = visible.map(({ todo, depth }) => formatTodoLine(todo, depth));
+  return `<restored-todo-state>
+todo_session_id=${sessionId}
+total=${todos.length}; leaf_progress=${completedLeaves}/${leafTodos.length || todos.length}
+` + (activeLines.length > 0 ? `Active/blocked items:
+${activeLines.join("\n")}
+` : "") + `Todo tree:
+${treeLines.join("\n")}${omitted > 0 ? `
+- ... ${omitted} more todo(s) in restored session` : ""}
+Continuation contract: this is the live checklist from the restored run. Continue it and update it with todo_write; do not recreate a parallel plan unless the new user request explicitly changes direction.
+</restored-todo-state>`;
+}
+function findRestoredTodoState(sessionIds) {
+  for (const sessionId of sessionIds) {
+    const todos = readTodos(sessionId).filter((todo) => todo && todo.id && todo.content);
+    if (todos.length === 0) continue;
+    return {
+      sessionId,
+      todos,
+      block: buildRestoredTodoBlock(sessionId, todos)
+    };
+  }
+  return null;
+}
+function buildRestoreHistoryAnchor(repoRoot) {
+  const [latest] = listSessions(repoRoot);
+  if (!latest?.id) return null;
+  const lines = loadSessionHistory(repoRoot, latest.id) ?? [];
+  const meaningfulTail = lines.map((line) => cleanSessionHistoryDisplayLine(line)).filter((line) => line && !isNoisySessionHistoryLine(line)).slice(-18).map((line) => `- ${normalizeSessionText(line, 220)}`);
+  const path12 = join136(OMNIUS_DIR, SESSIONS_DIR, `${latest.id}.jsonl`);
+  const block = `<restored-interface-history>
+latest_visual_session_id=${latest.id}
+full_transcript_path=${path12}
+recorded_lines=${lines.length}
+` + (meaningfulTail.length > 0 ? `Recent visible transcript tail:
+${meaningfulTail.join("\n")}
+` : "") + `Recall contract: the full transcript artifact above is restored into the TUI scrollback and is the authoritative previous interface state. Read it only when exact prior UI/tool output is needed; otherwise use this restored state to avoid rediscovery.
+</restored-interface-history>`;
+  return { sessionId: latest.id, path: path12, lineCount: lines.length, block };
+}
+function appendRestoreBlocks(base3, blocks) {
+  return [base3, ...blocks].filter((part) => part && part.trim()).join("\n\n");
+}
 function formatSessionHistoryDisplay(ctx3) {
   return buildSessionHistoryBoxLines(
     sessionContextToHistoryBoxData(ctx3),
@@ -628825,10 +629123,15 @@ function sessionContextToHistoryBoxData(ctx3, title = "Session History") {
     updatedAt: ctx3?.updatedAt ?? null
   };
 }
-function buildContextRestorePrompt(repoRoot) {
+function buildContextRestoreSnapshot(repoRoot) {
   const ctx3 = loadSessionContext(repoRoot);
   const handoffPrompt = buildHandoffPrompt(repoRoot);
-  const activeTaskAnchor = buildActiveTaskAnchor(repoRoot);
+  const activeTask = selectActiveTaskAnchor(repoRoot);
+  const activeTaskAnchor = activeTask ? formatActiveTaskAnchor(activeTask) : null;
+  const historyAnchor = buildRestoreHistoryAnchor(repoRoot);
+  const restoreSessionIds = collectRestoreSessionIds(ctx3, activeTask, historyAnchor?.sessionId);
+  const restoredTodos = findRestoredTodoState(restoreSessionIds);
+  const sourceSessionId = restoredTodos?.sessionId ?? restoreSessionIds[0];
   if (handoffPrompt) {
     const usefulEntries2 = (ctx3?.entries ?? []).filter((entry) => !isManualSessionEntry(entry));
     const baseCtx = ctx3 && ctx3.entries.length > 0 ? `
@@ -628838,13 +629141,37 @@ Recent tasks: ${(usefulEntries2.length > 0 ? usefulEntries2 : ctx3.entries).slic
       (e2) => `[${e2.completed ? "done" : "partial"}] ${normalizeSessionText(e2.summary || e2.task, 80)}`
     ).join(", ")}
 </session-recap>` : "";
-    return handoffPrompt + (activeTaskAnchor ? `
+    const prompt2 = appendRestoreBlocks(
+      handoffPrompt + (activeTaskAnchor ? `
 
-${activeTaskAnchor}` : "") + baseCtx;
+${activeTaskAnchor}` : "") + baseCtx,
+      [restoredTodos?.block, historyAnchor?.block]
+    );
+    return {
+      prompt: prompt2,
+      sourceSessionId,
+      todoSessionId: restoredTodos?.sessionId,
+      todoCount: restoredTodos?.todos.length ?? 0,
+      historySessionId: historyAnchor?.sessionId,
+      historyPath: historyAnchor?.path,
+      historyLineCount: historyAnchor?.lineCount
+    };
+  }
+  if (!ctx3 || ctx3.entries.length === 0) {
+    const prompt2 = appendRestoreBlocks(activeTaskAnchor ?? "", [restoredTodos?.block, historyAnchor?.block]);
+    if (!prompt2.trim()) return null;
+    return {
+      prompt: prompt2,
+      sourceSessionId,
+      todoSessionId: restoredTodos?.sessionId,
+      todoCount: restoredTodos?.todos.length ?? 0,
+      historySessionId: historyAnchor?.sessionId,
+      historyPath: historyAnchor?.path,
+      historyLineCount: historyAnchor?.lineCount
+    };
   }
-  if (!ctx3 || ctx3.entries.length === 0) return activeTaskAnchor;
   const usefulEntries = ctx3.entries.filter((entry) => !isManualSessionEntry(entry));
-  const recent = (usefulEntries.length > 0 ? usefulEntries : ctx3.entries).slice(-5);
+  const recent = (usefulEntries.length > 0 ? usefulEntries : ctx3.entries).slice(-20);
   const chronology = recent.map((e2) => {
     const status = e2.completed ? "done" : "partial";
     const summary = normalizeSessionText(e2.assistantResponse || e2.summary || e2.task, 140);
@@ -628855,7 +629182,7 @@ ${activeTaskAnchor}` : "") + baseCtx;
   const last2 = recent[recent.length - 1] ?? ctx3.entries[ctx3.entries.length - 1];
   const lastCompleted = [...usefulEntries].reverse().find((entry) => entry.completed);
   const latestCompleted = lastCompleted ? `Latest completed task: ${normalizeSessionText(lastCompleted.assistantResponse || lastCompleted.summary || lastCompleted.task, 180)}` : "";
-  const recentDialogue = recent.slice(-3).map((entry) => {
+  const recentDialogue = recent.slice(-8).map((entry) => {
     const assistant = normalizeSessionText(entry.assistantResponse || entry.summary, 320) || "(no assistant reply captured)";
     const user = cleanPromptForDiary(entry.task).slice(0, 220);
     return `User: ${user}
@@ -628865,10 +629192,12 @@ Assistant: ${assistant}`;
 Provenance: ${last2.provenance} (file_read to expand)` : "";
   const kg = `
 KG summary: .omnius/context/kg-summary/latest.md (file_read to expand; legacy pointer: .omnius/context/kg-summary-latest.md)`;
-  return `<session-recap>
+  const prompt = appendRestoreBlocks(
+    `<session-recap>
 ` + (activeTaskAnchor ? `${activeTaskAnchor}
 
 ` : "") + `Project chronology (older to newer):
+Scope: full retained rolling window (${recent.length} entr${recent.length === 1 ? "y" : "ies"}).
 ${chronology.join("\n")}
 ` + (latestCompleted ? `
 ${latestCompleted}
@@ -628877,7 +629206,21 @@ Most recent exchanges (older to newer):
 ${recentDialogue}
 ` + (activeTaskAnchor ? `For continuation prompts, resume the active task anchor above; use chronology only to avoid repeating completed work.${prov}${kg}
 ` : `Continue from the latest exchange and do not repeat completed work.${prov}${kg}
-`) + `</session-recap>`;
+`) + `</session-recap>`,
+    [restoredTodos?.block, historyAnchor?.block]
+  );
+  return {
+    prompt,
+    sourceSessionId,
+    todoSessionId: restoredTodos?.sessionId,
+    todoCount: restoredTodos?.todos.length ?? 0,
+    historySessionId: historyAnchor?.sessionId,
+    historyPath: historyAnchor?.path,
+    historyLineCount: historyAnchor?.lineCount
+  };
+}
+function buildContextRestorePrompt(repoRoot) {
+  return buildContextRestoreSnapshot(repoRoot)?.prompt ?? null;
 }
 function getLastTaskSummary(repoRoot) {
   const ctx3 = loadSessionContext(repoRoot);
@@ -629204,6 +629547,7 @@ var OMNIUS_DIR, LEGACY_DIRS, SUBDIRS, gitignoreWatchers, gitignoreRetryTimers, C
 var init_omnius_directory = __esm({
   "packages/cli/src/tui/omnius-directory.ts"() {
     "use strict";
+    init_dist5();
     init_task_complete_box();
     OMNIUS_DIR = ".omnius";
     LEGACY_DIRS = [".oa", ".open-agents"];
@@ -632134,6 +632478,12 @@ var init_status_bar = __esm({
         }
         return out;
       }
+      /** Capture the main session scrollback for persistence, independent of active tab. */
+      capturePersistedSessionLines(width = 100) {
+        const mainView = this._agentViews.get("main");
+        const lines = mainView?.contentLines ?? this._contentLines;
+        return this.expandDynamicBlockSentinels(lines, width);
+      }
       /**
        * Append a previously-registered dynamic block's sentinel to scrollback
        * and trigger a repaint. The block's renderer fires immediately at the
@@ -633500,6 +633850,40 @@ var init_status_bar = __esm({
         this.fillContentArea();
         this.renderFooterAndPositionInput();
       }
+      /**
+       * Restore persisted scrollback into the main TUI view after process restart.
+       *
+       * Session transcripts are persisted with dynamic blocks already expanded, so
+       * this intentionally restores plain rendered lines rather than stale sentinel
+       * callbacks from a prior process.
+       */
+      restoreMainContentLines(lines) {
+        const mainView = this._agentViews.get("main");
+        const restored = lines.filter((line) => typeof line === "string").slice(-this._contentMaxLines);
+        if (mainView) {
+          mainView.contentLines.splice(0, mainView.contentLines.length, ...restored);
+          mainView.scrollOffset = 0;
+          this._activeViewId = "main";
+          this._contentLines = mainView.contentLines;
+        } else {
+          this._contentLines.splice(0, this._contentLines.length, ...restored);
+        }
+        this._contentScrollOffset = 0;
+        this._pendingTrailingBlanks = 0;
+        this._inProgressLine = "";
+        this.clearStreamingRepaintTimer();
+        this._lastBufferedFingerprint = "";
+        this._lastBufferedAt = 0;
+        this._autoScroll = true;
+        this.markContentMutated();
+        this.clampContentScrollOffset();
+        if (this.active) {
+          this.fillContentArea();
+          this.repaintContent();
+          this.renderFooterAndPositionInput();
+          this.refreshHeaderContent();
+        }
+      }
       /** Set callback for header focus changes (wired by interactive.ts to banner) */
       setHeaderFocusHandler(handler) {
         this._headerFocusHandler = handler;
@@ -659283,11 +659667,12 @@ sleep 1
           const prompt = ctx3.contextRestore?.();
           if (prompt) {
             const info = ctx3.contextShow?.();
+            const snapshot = typeof prompt === "string" ? null : prompt;
+            ctx3.setRestoredContext?.(prompt);
             renderInfo(
-              `Context restored from ${info?.entries ?? 0} saved session(s). Will be injected into your next task.`
+              `Context restored from ${info?.entries ?? 0} saved session(s)${snapshot?.historyLineCount ? `; replayed ${snapshot.historyLineCount} transcript line(s)` : ""}${snapshot?.todoCount ? `; restored ${snapshot.todoCount} todo(s)` : ""}. Will be injected into your next task.`
             );
-            renderContextHistory(ctx3, "Session History");
-            ctx3.setRestoredContext?.(prompt);
+            if (!snapshot?.historyLineCount) renderContextHistory(ctx3, "Session History");
           } else {
             renderWarning(
               "No saved session context found. Complete a task first, or use /context save."
@@ -738589,7 +738974,7 @@ async function runSelfImprovementCycle(repoRoot) {
   } catch {
   }
 }
-function startTask(task, config, repoRoot, voice, stream, taskStores, bruteForce, statusBar, sudoCallback, costTracker, onComplete, taskType, contextWindowSize, modelCaps, personality, deepContext, onCompaction, emotionEngine, flowEnabled, slashCommandHandler, thinkingEnabled, askUserCallback, selfModifyEnabled, sessionMetrics, realtimeEnabled) {
+function startTask(task, config, repoRoot, voice, stream, taskStores, bruteForce, statusBar, sudoCallback, costTracker, onComplete, taskType, contextWindowSize, modelCaps, personality, deepContext, onCompaction, emotionEngine, flowEnabled, slashCommandHandler, thinkingEnabled, askUserCallback, selfModifyEnabled, sessionMetrics, realtimeEnabled, restoredRunSessionId) {
   const voiceStyleMap = {
     concise: 1,
     balanced: 3,
@@ -738610,7 +738995,7 @@ function startTask(task, config, repoRoot, voice, stream, taskStores, bruteForce
     if (emotionEngine) emotionEngine.autistMode = true;
   }
   const modelTier2 = getModelTier(config.model);
-  const sessionId = `${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+  const sessionId = typeof restoredRunSessionId === "string" && restoredRunSessionId.trim() ? restoredRunSessionId.trim() : `${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
   const taskMetricDescription = cleanForStorage(task).replace(/\s+/g, " ").slice(0, 160) || "task";
   costTracker?.startTask(taskMetricDescription);
   sessionMetrics?.startTask(taskMetricDescription);
@@ -740614,7 +740999,8 @@ When done, either call task_complete with your answer, or use FINAL_VAR(variable
             toolCalls: result.toolCalls,
             completed: result.completed,
             model: config.model,
-            source: "task_complete"
+            source: "task_complete",
+            sessionId
           });
         } catch {
         }
@@ -740651,7 +741037,8 @@ When done, either call task_complete with your answer, or use FINAL_VAR(variable
               toolCalls: result.toolCalls,
               completed: result.completed,
               model: config.model,
-              source: "task_complete"
+              source: "task_complete",
+              sessionId
             },
             accomplishments: extractedAccomplishments.length > 0 ? extractedAccomplishments : [
               `Completed task in ${result.turns} turns with ${result.toolCalls} tool calls`
@@ -740675,11 +741062,7 @@ When done, either call task_complete with your answer, or use FINAL_VAR(variable
         }
         try {
           const historySessionId = process.env["OMNIUS_SESSION_ID"] || `session-${Date.now().toString(36)}`;
-          const rawContentLines = statusBar?._contentLines ?? [];
-          const contentLines = typeof statusBar?.expandDynamicBlockSentinels === "function" ? statusBar.expandDynamicBlockSentinels(
-            rawContentLines,
-            100
-          ) : rawContentLines;
+          const contentLines = typeof statusBar?.capturePersistedSessionLines === "function" ? statusBar.capturePersistedSessionLines(100) : statusBar?._contentLines ?? [];
           if (contentLines.length > 0) {
             const description = cleanPromptForDiary(task).slice(0, 240);
             const historyTitle = description.slice(0, 80) || void 0;
@@ -740920,6 +741303,8 @@ async function startInteractive(config, repoPath2) {
   }
   await bootstrapMcpAndPlugins(repoRoot);
   let restoredSessionContext = null;
+  let restoredTaskSessionId = null;
+  let saveVisualSessionSnapshotRef = null;
   let terminalRestoredForExit = false;
   let interactiveExiting = false;
   let idleMemoryMaintenance = null;
@@ -740948,6 +741333,10 @@ async function startInteractive(config, repoPath2) {
     );
     const cleanupAndExit = (code8) => {
       interactiveExiting = true;
+      try {
+        saveVisualSessionSnapshotRef?.("process exit");
+      } catch {
+      }
       if (_shellToolRef) _shellToolRef.killAll();
       idleMemoryMaintenance?.stop();
       killAllFullSubAgents();
@@ -741464,14 +741853,14 @@ ${result.summary}`
       const { getLastTaskSummary: getLastTaskSummary2 } = (init_omnius_directory(), __toCommonJS(omnius_directory_exports));
       const taskSummary = hasTaskToResume ? getLastTaskSummary2(repoRoot) : null;
       const resumeMsg = taskSummary ? `v${version5} — picking up: ${taskSummary}` : `Updated to v${version5}.`;
+      const restoreSnapshot = buildContextRestoreSnapshot(repoRoot);
+      const replayedVisual = restoreSnapshot ? applyRestoreSnapshot(restoreSnapshot, { replayVisual: true }) : false;
       writeContent(() => {
         renderInfo(resumeMsg);
-        const resumePrompt = buildContextRestorePrompt(repoRoot);
-        if (resumePrompt) {
-          restoredSessionContext = resumePrompt;
+        if (restoreSnapshot) {
           const info = loadSessionContext(repoRoot);
           renderInfo(
-            `Context restored from ${info?.entries.length ?? 0} session(s).`
+            `Context restored from ${info?.entries.length ?? 0} session(s)${replayedVisual ? `; replayed ${restoreSnapshot.historyLineCount ?? 0} transcript line(s).` : "."}`
           );
         }
       });
@@ -742455,6 +742844,69 @@ This is an independent background session started from /background.`
     }
   }
   setDreamWriteContent(writeContent);
+  function saveVisualSessionSnapshot(reason) {
+    try {
+      const historySessionId = process.env["OMNIUS_SESSION_ID"] || process.env["OMNIUS_TUI_SESSION_ID"] || `session-${Date.now().toString(36)}`;
+      const contentLines = statusBar.capturePersistedSessionLines(100);
+      if (contentLines.length === 0) return;
+      const description = cleanPromptForDiary(lastSubmittedPrompt || lastCompletedSummary || reason).slice(0, 240) || reason;
+      const historyTitle = description.slice(0, 80) || void 0;
+      saveSessionHistory(repoRoot, historySessionId, contentLines, {
+        name: historyTitle,
+        description,
+        taskCount: 1,
+        model: currentConfig.model
+      });
+      importTranscriptSession({
+        id: `tui:${historySessionId}`,
+        projectRoot: repoRoot,
+        model: currentConfig.model,
+        title: historyTitle,
+        description,
+        transcriptLines: contentLines,
+        updatedAt: Date.now()
+      });
+    } catch {
+    }
+  }
+  saveVisualSessionSnapshotRef = saveVisualSessionSnapshot;
+  function replayRestoredVisualSession(snapshot) {
+    if (!snapshot.historySessionId) return false;
+    const lines = loadSessionHistory(repoRoot, snapshot.historySessionId);
+    if (!lines || lines.length === 0) return false;
+    try {
+      statusBar.restoreMainContentLines(lines);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  function applyRestoreSnapshot(snapshot, options2 = {}) {
+    if (options2.injectNextTask !== false) {
+      restoredSessionContext = snapshot.prompt;
+    }
+    const restoredId = snapshot.todoSessionId || snapshot.sourceSessionId || null;
+    restoredTaskSessionId = restoredId;
+    if (restoredId) {
+      try {
+        process.env["OMNIUS_SESSION_ID"] = restoredId;
+      } catch {
+      }
+      try {
+        setTodoSessionId(restoredId);
+      } catch {
+      }
+      try {
+        setTuiTasksSession(restoredId);
+      } catch {
+      }
+      try {
+        refreshTuiTasks();
+      } catch {
+      }
+    }
+    return options2.replayVisual ? replayRestoredVisualSession(snapshot) : false;
+  }
   async function writeContentAsync(fn) {
     if (!statusBar.isActive) return fn();
     if (isNeovimActive()) {
@@ -743230,6 +743682,7 @@ Log: ${nexusLogPath}`
         clearInterval(reminderDispatchTimer);
         reminderDispatchTimer = null;
       }
+      saveVisualSessionSnapshot("command exit");
       statusBar.deactivate();
       if (carousel.isRunning) carousel.stop();
       banner.stop();
@@ -745446,7 +745899,8 @@ Respond concisely and safely. Remember: you are talking to the general public.`;
           toolCalls: sessionToolCallCount,
           source: "manual",
           completed: false,
-          model: currentConfig.model
+          model: currentConfig.model,
+          sessionId: getTodoSessionId() || process.env["OMNIUS_SESSION_ID"]
         };
         saveSessionContext(repoRoot, entry);
         return true;
@@ -745455,10 +745909,14 @@ Respond concisely and safely. Remember: you are talking to the general public.`;
       }
     },
     contextRestore() {
-      return buildContextRestorePrompt(repoRoot);
+      return buildContextRestoreSnapshot(repoRoot);
     },
     setRestoredContext(ctx3) {
-      restoredSessionContext = ctx3;
+      if (typeof ctx3 === "string") {
+        restoredSessionContext = ctx3;
+      } else {
+        applyRestoreSnapshot(ctx3, { replayVisual: true });
+      }
     },
     contextShow() {
       const ctx3 = loadSessionContext(repoRoot);
@@ -745601,28 +746059,30 @@ Respond concisely and safely. Remember: you are talking to the general public.`;
         const auto = countdown <= 0;
         const doRestore = selectResult.confirmed && selectResult.key === "restore";
         if (doRestore) {
-          const prompt = buildContextRestorePrompt(repoRoot);
-          if (prompt) {
-            restoredSessionContext = prompt;
+          const snapshot = buildContextRestoreSnapshot(repoRoot);
+          if (snapshot) {
+            const replayedVisual = applyRestoreSnapshot(snapshot, { replayVisual: true });
             const info = loadSessionContext(repoRoot);
             writeContent(() => {
               renderInfo(
-                auto ? `Context auto-restored from ${info?.entries.length ?? 0} session(s).` : `Context restored from ${info?.entries.length ?? 0} session(s).`
+                auto ? `Context auto-restored from ${info?.entries.length ?? 0} session(s)${replayedVisual ? `; replayed ${snapshot.historyLineCount ?? 0} transcript line(s)` : ""}${snapshot.todoCount ? `; restored ${snapshot.todoCount} todo(s)` : ""}.` : `Context restored from ${info?.entries.length ?? 0} session(s)${replayedVisual ? `; replayed ${snapshot.historyLineCount ?? 0} transcript line(s)` : ""}${snapshot.todoCount ? `; restored ${snapshot.todoCount} todo(s)` : ""}.`
               );
-              if (statusBar.isActive && !isNeovimActive() && !isOverlayActive()) {
-                renderSessionHistoryBox(
-                  {
-                    registerDynamicBlock: (id2, render2) => statusBar.registerDynamicBlock(id2, render2),
-                    appendDynamicBlock: (id2) => statusBar.appendDynamicBlock(id2)
-                  },
-                  sessionContextToHistoryBoxData(info, "Session History")
-                );
-              } else {
-                const historyDisplay = formatSessionHistoryDisplay(info);
-                process.stdout.write(
-                  historyDisplay.endsWith("\n") ? historyDisplay : `${historyDisplay}
+              if (!replayedVisual) {
+                if (statusBar.isActive && !isNeovimActive() && !isOverlayActive()) {
+                  renderSessionHistoryBox(
+                    {
+                      registerDynamicBlock: (id2, render2) => statusBar.registerDynamicBlock(id2, render2),
+                      appendDynamicBlock: (id2) => statusBar.appendDynamicBlock(id2)
+                    },
+                    sessionContextToHistoryBoxData(info, "Session History")
+                  );
+                } else {
+                  const historyDisplay = formatSessionHistoryDisplay(info);
+                  process.stdout.write(
+                    historyDisplay.endsWith("\n") ? historyDisplay : `${historyDisplay}
 `
-                );
+                  );
+                }
               }
             });
           } else {
@@ -745682,7 +746142,14 @@ Respond concisely and safely. Remember: you are talking to the general public.`;
     const pendingTask = loadPendingTask(repoRoot);
     if (pendingTask) {
       setTimeout(() => {
-        const sessionCtx = buildContextRestorePrompt(repoRoot);
+        const restoreSnapshot = buildContextRestoreSnapshot(repoRoot);
+        if (restoreSnapshot) {
+          applyRestoreSnapshot(restoreSnapshot, {
+            replayVisual: true,
+            injectNextTask: false
+          });
+        }
+        const sessionCtx = restoreSnapshot?.prompt ?? buildContextRestorePrompt(repoRoot);
         const resumeContext = [
           sessionCtx || "",
           `Continuing task after update: ${pendingTask.prompt}`,
@@ -745853,6 +746320,7 @@ ${result.content.slice(0, 2e3)}${result.content.length > 2e3 ? "\n[truncated]" :
       const quitMatch = input.trim().replace(/^\//, "").toLowerCase();
       if (quitMatch === "quit" || quitMatch === "exit" || quitMatch === "q") {
         interactiveExiting = true;
+        saveVisualSessionSnapshot("quit");
         if (activeTask) activeTask.runner.abort();
         idleMemoryMaintenance?.stop();
         taskManager.stopAll();
@@ -745870,6 +746338,7 @@ ${result.content.slice(0, 2e3)}${result.content.length > 2e3 ? "\n[truncated]" :
       );
       if (cmdResult === "exit") {
         interactiveExiting = true;
+        saveVisualSessionSnapshot("command exit");
         if (activeTask) activeTask.runner.abort();
         idleMemoryMaintenance?.stop();
         taskManager.stopAll();
@@ -746434,6 +746903,7 @@ ${formatTaskCompletionMeta(previousMetaForIntake)}`
     } catch {
     }
     let taskInput = fullInput;
+    let taskSessionId = restoredTaskSessionId;
     if (restoredSessionContext) {
       taskInput = `${restoredSessionContext}
 
@@ -746442,6 +746912,7 @@ ${formatTaskCompletionMeta(previousMetaForIntake)}`
 NEW TASK: ${fullInput}`;
       restoredSessionContext = null;
     }
+    restoredTaskSessionId = null;
     if (taskIntakePacket) {
       taskInput = `${taskIntakePacket}
 
@@ -746490,7 +746961,8 @@ ${taskInput}`;
         handleAskUser,
         selfModifyEnabled,
         sessionMetrics,
-        realtimeEnabled
+        realtimeEnabled,
+        taskSessionId
       );
       activeTask = task;
       _recallText = null;
@@ -746729,6 +747201,7 @@ Rationale: ${proposal.rationale}${provenanceNote}${dmnDevDiscipline(proposal.cat
   rl.on("close", () => {
     if (interactiveExiting) return;
     interactiveExiting = true;
+    saveVisualSessionSnapshot("readline close");
     if (peerMesh) {
       peerMesh.stop().catch(() => {
       });

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "omnius",
-  "version": "1.0.462",
+  "version": "1.0.464",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "omnius",
-      "version": "1.0.462",
+      "version": "1.0.464",
       "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.464",
   "description": "AI coding agent powered by open-source models (Ollama/vLLM) — interactive TUI with agentic tool-calling loop",
   "type": "module",
   "main": "./dist/index.js",