omnius 1.0.375 → 1.0.376

package/dist/index.js

@@ -4806,6 +4806,9 @@ var init_shell = __esm({
         const lines = [
           "[SHELL TRANSCRIPT]",
           `command: ${args.command}`,
+          args.cwdBefore ? `cwd_before: ${args.cwdBefore}` : null,
+          args.cwdAfter ? `cwd_after: ${args.cwdAfter}` : null,
+          args.cwdBefore && args.cwdAfter && args.nextCwd && args.cwdAfter !== args.nextCwd ? `cwd_note: cd changes are command-local; next shell call starts at ${args.nextCwd}` : null,
           args.timedOut ? "status: timeout" : args.exitCode === 0 ? "status: success" : "status: failure",
           args.exitCode === void 0 || args.exitCode === null ? null : `exit_code: ${args.exitCode}`,
           args.error ? `error: ${args.error}` : null,
@@ -4919,6 +4922,8 @@ ${elevatedResult.stderr}` : ""),
       runCommand(command, timeout2, stdinInput, onOutput) {
         const start2 = performance.now();
         const isWin2 = process.platform === "win32";
+        const cwdBefore = this.currentCwd;
+        let cwdAfter = cwdBefore;
         let pwdDir = mkdtempSync(join6(tmpdir(), "omnius-shell-"));
         let pwdFile = join6(pwdDir, `cwd-${randomUUID3()}`);
         let wrappedCommand;
@@ -4987,13 +4992,13 @@ exit $__omnius_exit
           heartbeatTimer.unref?.();
           const captureFinalCwd = () => {
             if (!pwdFile)
-              return;
+              return cwdAfter;
             try {
               const raw = readFileSync7(pwdFile, "utf8").trim();
-              if (raw && raw !== this.currentCwd) {
+              if (raw) {
                 try {
                   if (statSync5(raw).isDirectory()) {
-                    this.currentCwd = raw;
+                    cwdAfter = raw;
                   }
                 } catch {
                 }
@@ -5008,6 +5013,7 @@ exit $__omnius_exit
             }
             pwdFile = null;
             pwdDir = null;
+            return cwdAfter;
           };
           const doResolve = (result) => {
             if (resolved)
@@ -5017,7 +5023,6 @@ exit $__omnius_exit
             clearInterval(heartbeatTimer);
             if (exitFlushTimer)
               clearTimeout(exitFlushTimer);
-            captureFinalCwd();
             releaseProcessLease(leaseId, killed ? "killed" : result.success ? "completed" : "released", killed ? "shell command timed out" : "shell command exited");
             resolve73(result);
           };
@@ -5056,6 +5061,7 @@ exit $__omnius_exit
             exitFlushTimer = setTimeout(() => {
               const durationMs = performance.now() - start2;
               if (killed) {
+                const finalCwd2 = captureFinalCwd();
                 const combined = stdout + stderr;
                 const looksInteractive = /\? .+[›>]|y\/n|yes\/no|\(Y\/n\)|\[y\/N\]/i.test(combined);
                 const hint = looksInteractive ? " The command appears to be waiting for interactive input. Use non-interactive flags (e.g., --yes, --no-input) or provide input via the stdin parameter." : ` To run longer, retry with a higher timeout parameter (e.g. timeout: ${Math.min(timeout2 * 10, 6e5)} for ${Math.min(timeout2 * 10, 6e5) / 1e3}s). Or use background_run to run in the background and check with task_output later.`;
@@ -5065,6 +5071,9 @@ exit $__omnius_exit
                   error: `Command timed out after ${timeout2}ms.${hint}`,
                   llmContent: this.formatShellTranscript({
                     command,
+                    cwdBefore,
+                    cwdAfter: finalCwd2,
+                    nextCwd: this.currentCwd,
                     timedOut: true,
                     stdout,
                     stderr,
@@ -5075,6 +5084,7 @@ exit $__omnius_exit
                 return;
               }
               const success = code8 === 0;
+              const finalCwd = captureFinalCwd();
               doResolve({
                 success,
                 output: stdout + (stderr && success ? `
@@ -5083,6 +5093,9 @@ ${stderr}` : ""),
                 error: success ? void 0 : stderr || `Exit code ${code8}`,
                 llmContent: this.formatShellTranscript({
                   command,
+                  cwdBefore,
+                  cwdAfter: finalCwd,
+                  nextCwd: this.currentCwd,
                   exitCode: code8,
                   stdout,
                   stderr,
@@ -5095,6 +5108,7 @@ ${stderr}` : ""),
           child.on("close", (code8) => {
             const durationMs = performance.now() - start2;
             if (killed) {
+              const finalCwd2 = captureFinalCwd();
               const combined = stdout + stderr;
               const looksInteractive = /\? .+[›>]|y\/n|yes\/no|\(Y\/n\)|\[y\/N\]/i.test(combined);
               const hint = looksInteractive ? " The command appears to be waiting for interactive input. Use non-interactive flags (e.g., --yes, --no-input) or provide input via the stdin parameter." : ` To run longer, retry with a higher timeout parameter (e.g. timeout: ${Math.min(timeout2 * 10, 6e5)} for ${Math.min(timeout2 * 10, 6e5) / 1e3}s). Or use background_run to run in the background and check with task_output later.`;
@@ -5104,6 +5118,9 @@ ${stderr}` : ""),
                 error: `Command timed out after ${timeout2}ms.${hint}`,
                 llmContent: this.formatShellTranscript({
                   command,
+                  cwdBefore,
+                  cwdAfter: finalCwd2,
+                  nextCwd: this.currentCwd,
                   timedOut: true,
                   stdout,
                   stderr,
@@ -5114,6 +5131,7 @@ ${stderr}` : ""),
               return;
             }
             const success = code8 === 0;
+            const finalCwd = captureFinalCwd();
             doResolve({
               success,
               output: stdout + (stderr && success ? `
@@ -5122,6 +5140,9 @@ ${stderr}` : ""),
               error: success ? void 0 : stderr || `Exit code ${code8}`,
               llmContent: this.formatShellTranscript({
                 command,
+                cwdBefore,
+                cwdAfter: finalCwd,
+                nextCwd: this.currentCwd,
                 exitCode: code8,
                 stdout,
                 stderr,
@@ -5131,12 +5152,16 @@ ${stderr}` : ""),
             });
           });
           child.on("error", (err) => {
+            const finalCwd = captureFinalCwd();
             doResolve({
               success: false,
               output: stdout,
               error: err.message,
               llmContent: this.formatShellTranscript({
                 command,
+                cwdBefore,
+                cwdAfter: finalCwd,
+                nextCwd: this.currentCwd,
                 stdout,
                 stderr,
                 error: err.message
@@ -16742,6 +16767,20 @@ function clamp01Local(x) {
     return 1;
   return x;
 }
+function stableJson2(value2) {
+  if (value2 === null || typeof value2 !== "object") {
+    return JSON.stringify(value2);
+  }
+  if (Array.isArray(value2)) {
+    return `[${value2.map((item) => stableJson2(item)).join(",")}]`;
+  }
+  const entries = Object.entries(value2).filter(([, v]) => v !== void 0).sort(([a2], [b]) => a2.localeCompare(b));
+  return `{${entries.map(([k, v]) => `${JSON.stringify(k)}:${stableJson2(v)}`).join(",")}}`;
+}
+function episodeIdentityHash(ep) {
+  const identity3 = ep.metadata ? `${ep.content}\0metadata:${stableJson2(ep.metadata)}` : ep.content;
+  return createHash8("sha256").update(identity3).digest("hex").slice(0, 16);
+}
 function sanitizeImportance(raw, fallback = 5) {
   if (typeof raw !== "number" || !Number.isFinite(raw))
     return fallback;
@@ -16926,7 +16965,7 @@ var init_episodeStore = __esm({
       insert(ep) {
         const id = randomUUID10();
         const now2 = Date.now();
-        const contentHash2 = createHash8("sha256").update(ep.content).digest("hex").slice(0, 16);
+        const contentHash2 = episodeIdentityHash(ep);
         const modality = ep.modality ?? "text";
         const rawImportance = ep.importance ?? autoImportance(ep.toolName ?? null, modality, ep.content);
         const modulated = ep.emotionalState ? modulateImportance(sanitizeImportance(rawImportance), ep.emotionalState) : sanitizeImportance(rawImportance);
@@ -16935,7 +16974,11 @@ var init_episodeStore = __esm({
           return "";
         }
         const decayClass = ep.decayClass ?? autoDecayClass(ep.toolName ?? null, modality, ep.content);
-        const existing = this.db.prepare("SELECT id FROM episodes WHERE content_hash = ? AND session_id = ? LIMIT 1").get(contentHash2, ep.sessionId ?? null);
+        const existing = this.db.prepare(`SELECT id FROM episodes
+       WHERE content_hash = ?
+         AND COALESCE(session_id, '') = COALESCE(?, '')
+         AND COALESCE(tool_name, '') = COALESCE(?, '')
+       LIMIT 1`).get(contentHash2, ep.sessionId ?? null, ep.toolName ?? null);
         if (existing)
           return existing.id;
         this.db.prepare(`
@@ -37611,12 +37654,12 @@ function catalogAdaptersDir() {
 function nowIso() {
   return (/* @__PURE__ */ new Date()).toISOString();
 }
-function stableJson2(value2) {
+function stableJson3(value2) {
   if (Array.isArray(value2))
-    return `[${value2.map(stableJson2).join(",")}]`;
+    return `[${value2.map(stableJson3).join(",")}]`;
   if (value2 && typeof value2 === "object") {
     const obj = value2;
-    return `{${Object.keys(obj).sort().map((key) => `${JSON.stringify(key)}:${stableJson2(obj[key])}`).join(",")}}`;
+    return `{${Object.keys(obj).sort().map((key) => `${JSON.stringify(key)}:${stableJson3(obj[key])}`).join(",")}}`;
   }
   return JSON.stringify(value2);
 }
@@ -37996,7 +38039,7 @@ function builtInMediaModelSpec(seed) {
       evidence: seed.evidence
     }
   };
-  spec.provenance.contentHash = sha256(stableJson2({ ...spec, provenance: { ...spec.provenance, contentHash: void 0 } }));
+  spec.provenance.contentHash = sha256(stableJson3({ ...spec, provenance: { ...spec.provenance, contentHash: void 0 } }));
   return spec;
 }
 function builtInMediaModelCatalog() {
@@ -38148,7 +38191,7 @@ function draftMediaModelAdapter(args) {
       dependencies: ["torch", "transformers", "diffusers", "accelerate", "safetensors"]
     };
   }
-  spec.provenance.contentHash = sha256(stableJson2({ ...spec, provenance: { ...spec.provenance, contentHash: void 0 } }));
+  spec.provenance.contentHash = sha256(stableJson3({ ...spec, provenance: { ...spec.provenance, contentHash: void 0 } }));
   return spec;
 }
 function validateMediaModelAdapter(spec) {
@@ -38312,7 +38355,7 @@ function saveMediaModelAdapter(spec) {
       contentHash: void 0
     }
   };
-  updated.provenance.contentHash = sha256(stableJson2(updated));
+  updated.provenance.contentHash = sha256(stableJson3(updated));
   const json = `${JSON.stringify(updated, null, 2)}
 `;
   const path12 = specPathFor(updated.id);
@@ -41699,7 +41742,39 @@ function bwrapAvailable() {
   if (_bwrapAvailable !== null)
     return _bwrapAvailable;
   try {
-    const r2 = spawnSync5("bwrap", ["--version"], { timeout: 4e3 });
+    const r2 = spawnSync5("bwrap", [
+      "--unshare-all",
+      "--die-with-parent",
+      "--new-session",
+      "--ro-bind-try",
+      "/usr",
+      "/usr",
+      "--ro-bind-try",
+      "/bin",
+      "/bin",
+      "--ro-bind-try",
+      "/lib",
+      "/lib",
+      "--ro-bind-try",
+      "/lib64",
+      "/lib64",
+      "--proc",
+      "/proc",
+      "--tmpfs",
+      "/tmp",
+      "--chdir",
+      "/tmp",
+      "--clearenv",
+      "--setenv",
+      "PATH",
+      "/usr/bin:/bin",
+      "--",
+      "python3",
+      "-I",
+      "-S",
+      "-c",
+      "print(1)"
+    ], { timeout: 4e3 });
     _bwrapAvailable = r2.status === 0;
   } catch {
     _bwrapAvailable = false;
@@ -289916,7 +289991,8 @@ async function saveStore(workingDir, store2) {
   await writeFile22(join62(dir, "tasks.json"), JSON.stringify(store2, null, 2), "utf-8");
 }
 function globalStoreDir() {
-  return join62(homedir14(), ".omnius", "scheduled");
+  const home = process.env["OMNIUS_HOME"]?.trim() || join62(homedir14(), ".omnius");
+  return join62(home, "scheduled");
 }
 async function loadGlobalStore() {
   try {
@@ -295009,6 +295085,9 @@ import { existsSync as existsSync56, readFileSync as readFileSync40, writeFileSy
 import { join as join69 } from "node:path";
 import { homedir as homedir16 } from "node:os";
 import { randomBytes as randomBytes17 } from "node:crypto";
+function canonicalTodoContent(content) {
+  return content.trim().replace(/\s+/g, " ").toLowerCase();
+}
 function setTodoEventPublisher(pub) {
   _eventPublisher = pub;
 }
@@ -295042,19 +295121,48 @@ function writeTodos(sessionId, incoming) {
   mkdirSync31(todoDir(), { recursive: true });
   const old = readTodos(sessionId);
   const oldById = new Map(old.map((t2) => [t2.id, t2]));
+  const oldByContent = /* @__PURE__ */ new Map();
+  for (const todo of old) {
+    const key = canonicalTodoContent(todo.content);
+    const bucket = oldByContent.get(key) ?? [];
+    bucket.push(todo);
+    oldByContent.set(key, bucket);
+  }
+  const usedOldIds = /* @__PURE__ */ new Set();
+  const idAliases = /* @__PURE__ */ new Map();
+  const indexAliases = /* @__PURE__ */ new Map();
+  for (const [index, incomingTodo] of incoming.entries()) {
+    const requestedId = incomingTodo.id;
+    if (requestedId && oldById.has(requestedId)) {
+      usedOldIds.add(requestedId);
+      continue;
+    }
+    const matches = oldByContent.get(canonicalTodoContent(incomingTodo.content)) ?? [];
+    const match = matches.find((todo) => !usedOldIds.has(todo.id));
+    if (!match)
+      continue;
+    usedOldIds.add(match.id);
+    indexAliases.set(index, match.id);
+    if (requestedId && requestedId !== match.id)
+      idAliases.set(requestedId, match.id);
+  }
   const now2 = Date.now();
-  const newTodos = incoming.map((t2) => {
-    const id = t2.id || `todo-${randomBytes17(4).toString("hex")}`;
+  const newTodos = incoming.map((t2, index) => {
+    const requestedId = t2.id || `todo-${randomBytes17(4).toString("hex")}`;
+    const id = indexAliases.get(index) ?? idAliases.get(requestedId) ?? requestedId;
     const existing = oldById.get(id);
+    const requestedParentId = t2.parentId ? idAliases.get(t2.parentId) ?? t2.parentId : void 0;
+    const requestedStatus = t2.status;
+    const status = existing?.status === "completed" && (requestedStatus === "pending" || requestedStatus === "in_progress") && !t2.blocker ? "completed" : requestedStatus;
     const next = {
       id,
       content: t2.content,
-      status: t2.status,
-      parentId: t2.parentId ?? existing?.parentId,
-      blocker: t2.blocker ?? (t2.status === "blocked" ? existing?.blocker : void 0),
+      status,
+      parentId: requestedParentId ?? existing?.parentId,
+      blocker: t2.blocker ?? (status === "blocked" ? existing?.blocker : void 0),
       createdAt: existing?.createdAt ?? now2,
       updatedAt: now2,
-      completedAt: t2.status === "completed" ? existing?.completedAt ?? now2 : void 0,
+      completedAt: status === "completed" ? existing?.completedAt ?? now2 : void 0,
       verifyCommand: t2.verifyCommand ?? existing?.verifyCommand,
       // REG-37
       declaredArtifacts: t2.declaredArtifacts ?? existing?.declaredArtifacts
@@ -549192,7 +549300,7 @@ var init_agent_tool = __esm({
           });
           return {
             success: true,
-            output: `Agent spawned (subprocess, worktree): ${agentId}
+            output: `Agent spawned (background subprocess, worktree): ${agentId}
   Type: ${subagentType}
   PID: ${spawn35.pid}
   Task: ${prompt.slice(0, 100)}
@@ -552173,6 +552281,22 @@ function deduplicateFrames(frames) {
   }
   return frames;
 }
+function normalizeFrameDescriptionForVideo(raw) {
+  let text2 = raw.replace(/\s+/g, " ").trim();
+  const answerMatch = text2.match(/\bA:\s*([\s\S]*?)(?:\s+Image:|$)/);
+  if (answerMatch?.[1])
+    text2 = answerMatch[1].replace(/\s+/g, " ").trim();
+  if (!text2)
+    return null;
+  if (/\[IMAGE_BASE64:|data:image\/|base64/i.test(text2))
+    return null;
+  if (/^\s*(?:ids?|coords?|points?)\s*=\s*\[[\d\s,.[\]-]+\]\s*$/i.test(text2))
+    return null;
+  const letters = text2.match(/[A-Za-z]/g)?.length ?? 0;
+  if (text2.length < 12 || letters < 4)
+    return null;
+  return text2.slice(0, 700);
+}
 function formatTime2(seconds) {
   const m2 = Math.floor(seconds / 60);
   const s2 = Math.floor(seconds % 60);
@@ -552221,9 +552345,9 @@ var init_video_understand = __esm({
               prompt: "Describe only the visible scene in this video frame. Note subject identity/type, pose, motion cues, contacts with the ground, and visible text if present. Do not mention file metadata, base64, data URIs, or this prompt.",
               length: "normal"
             });
-            const output = String(result.llmContent || result.output || "").replace(/\s+/g, " ").trim();
-            if (result.success && output.length > 0)
-              frame.description = output.slice(0, 700);
+            const output = normalizeFrameDescriptionForVideo(String(result.llmContent || result.output || ""));
+            if (result.success && output)
+              frame.description = output;
           } catch {
           }
         }
@@ -555078,26 +555202,34 @@ var init_VllmBackend = __esm({
         const url = `${this.baseUrl}/health`;
         const controller = new AbortController();
         const timer = setTimeout(() => controller.abort(), 5e3);
-        const maxRetries = 3;
-        for (let attempt = 0; attempt <= maxRetries; attempt++) {
-          if (attempt > 0) {
-            const backoff = Math.min(1e3 * Math.pow(2, attempt - 1), 4e3);
-            await new Promise((r2) => setTimeout(r2, backoff));
-          }
-          try {
-            const response = await fetch(url, {
-              method: "GET",
-              signal: controller.signal,
-              headers: this.authHeaders()
-            });
-            if (response.ok) {
-              this.consecutiveFailures = 0;
-              return true;
+        let healthy = false;
+        try {
+          const maxRetries = Math.max(0, this.maxRetries);
+          for (let attempt = 0; attempt <= maxRetries; attempt++) {
+            if (attempt > 0) {
+              const backoff = Math.min(1e3 * Math.pow(2, attempt - 1), 4e3);
+              await new Promise((r2) => setTimeout(r2, backoff));
+            }
+            try {
+              const response = await fetch(url, {
+                method: "GET",
+                signal: controller.signal,
+                headers: this.authHeaders()
+              });
+              if (response.ok) {
+                healthy = true;
+                break;
+              }
+            } catch {
             }
-          } catch {
           }
+        } finally {
+          clearTimeout(timer);
+        }
+        if (healthy) {
+          this.consecutiveFailures = 0;
+          return true;
         }
-        clearTimeout(timer);
         this.consecutiveFailures++;
         if (this.consecutiveFailures >= 3) {
           this.degradedUntil = Date.now() + 3e4;
@@ -555291,25 +555423,33 @@ var init_OllamaBackend = __esm({
         const url = `${this.baseUrl}/api/tags`;
         const controller = new AbortController();
         const timer = setTimeout(() => controller.abort(), 5e3);
-        const maxRetries = 3;
-        for (let attempt = 0; attempt <= maxRetries; attempt++) {
-          if (attempt > 0) {
-            const backoff = Math.min(1e3 * Math.pow(2, attempt - 1), 4e3);
-            await new Promise((r2) => setTimeout(r2, backoff));
-          }
-          try {
-            const response = await fetch(url, {
-              method: "GET",
-              signal: controller.signal
-            });
-            if (response.ok) {
-              this.consecutiveFailures = 0;
-              return true;
+        let healthy = false;
+        try {
+          const maxRetries = Math.max(0, this.maxRetries);
+          for (let attempt = 0; attempt <= maxRetries; attempt++) {
+            if (attempt > 0) {
+              const backoff = Math.min(1e3 * Math.pow(2, attempt - 1), 4e3);
+              await new Promise((r2) => setTimeout(r2, backoff));
+            }
+            try {
+              const response = await fetch(url, {
+                method: "GET",
+                signal: controller.signal
+              });
+              if (response.ok) {
+                healthy = true;
+                break;
+              }
+            } catch {
             }
-          } catch {
           }
+        } finally {
+          clearTimeout(timer);
+        }
+        if (healthy) {
+          this.consecutiveFailures = 0;
+          return true;
         }
-        clearTimeout(timer);
         this.consecutiveFailures++;
         if (this.consecutiveFailures >= 3) {
           this.degradedUntil = Date.now() + 3e4;
@@ -559114,7 +559254,7 @@ function recordToolEvidence(ledger, input) {
     input.name,
     input.success === true ? "succeeded" : input.success === false ? "failed" : "observed",
     input.argsKey ? `args=${cleanText(input.argsKey, 180)}` : "",
-    input.outputPreview ? `output=${cleanText(input.outputPreview, 700)}` : ""
+    input.outputPreview ? `output=${cleanText(input.outputPreview, 1200)}` : ""
   ].filter(Boolean).join(" ");
   return recordCompletionEvidence(ledger, {
     kind: "tool_result",
@@ -559623,7 +559763,13 @@ var init_completionAutoFinalize = __esm({
 
 // packages/orchestrator/dist/verificationCommand.js
 function normalizeShellCommand(command) {
-  return command.replace(/\s+/g, " ").trim();
+  let normalized = command.replace(/\s+/g, " ").trim();
+  let previous = "";
+  while (previous !== normalized) {
+    previous = normalized;
+    normalized = normalized.replace(/\s+(?:[12]?>&[12]|[12]?>\s*['"]?\/dev\/null['"]?)$/i, "").trim();
+  }
+  return normalized;
 }
 function splitConjunctiveVerifyCommand(command) {
   return normalizeShellCommand(command).split(/\s+&&\s+/).map((part) => part.trim()).filter(Boolean);
@@ -569421,7 +569567,7 @@ var init_resolution_memory = __esm({
       /** Load prior fixes (cross-session). */
       loadFixes(fixes) {
         for (const f2 of fixes) {
-          if (Array.isArray(f2.from) && Array.isArray(f2.to) && f2.from.length > 0) {
+          if (Array.isArray(f2.from) && Array.isArray(f2.to) && f2.from.length > 0 && !isPathSensitiveFix(f2)) {
             this.fixes.push(f2);
           }
         }
@@ -569470,6 +569616,10 @@ var init_resolution_memory = __esm({
           const delta = computeDelta(fail3.tokens, workedTokens);
           if (!delta)
             continue;
+          if (isPathSensitiveFix(delta)) {
+            this.recentFailures.splice(i2, 1);
+            return null;
+          }
           const existing = this.fixes.find((f2) => sameFix(f2, delta.from, delta.to, fail3.errorKey));
           if (existing) {
             existing.count++;
@@ -569506,6 +569656,8 @@ var init_resolution_memory = __esm({
         const tokens = new Set(tokenize6(command));
         let best = null;
         for (const f2 of this.fixes) {
+          if (isPathSensitiveFix(f2))
+            continue;
           if (f2.from.every((t2) => tokens.has(t2))) {
             if (!best || f2.count > best.count)
               best = f2;
@@ -572051,7 +572203,7 @@ ${parts.join("\n")}
       /** State root for runner-owned memory/artifacts. Defaults to cwd/.omnius. */
       omniusStateDir() {
         const configured = (this.options.stateDir || "").trim();
-        return configured ? _pathResolve(configured) : _pathJoin(process.cwd(), ".omnius");
+        return configured ? _pathResolve(configured) : _pathJoin(this.authoritativeWorkingDirectory(), ".omnius");
       }
       writesUserTaskArtifacts() {
         return this.options.artifactMode === "user-task" && !this.options.subAgent;
@@ -572178,7 +572330,7 @@ ${parts.join("\n")}
           }
         } catch {
         }
-        if (selected.size === 0) {
+        if (selected.size === 0 && process.env["OMNIUS_FAILURE_PATTERN_INFERENCE"] === "1") {
           const relevant = await this._inferRelevantFailurePatternSignatures(taskGoal, candidates, maxPatterns);
           for (const signature of relevant) {
             const raw = this._errorPatterns.get(signature);
@@ -573098,7 +573250,7 @@ Pick the SMALLEST concrete deliverable from the spec — typically the project e
         if (process.env["OMNIUS_DISABLE_REG66"] === "1")
           return { detected: false };
         const WINDOW = 20;
-        const SHELL_REPEAT_THRESHOLD = 5;
+        const SHELL_REPEAT_THRESHOLD = 3;
         const READ_REPEAT_THRESHOLD = 4;
         const window2 = toolCallLog.slice(-WINDOW);
         if (window2.length < SHELL_REPEAT_THRESHOLD)
@@ -573225,13 +573377,85 @@ Pick the SMALLEST concrete deliverable from the spec — typically the project e
           return false;
         return true;
       }
-      _toolEvidencePreview(result, displayOutput, max = 500) {
+      _toolEvidencePreview(result, displayOutput, max = 500, toolName) {
         const modelVisible = result.llmContent ?? result.output ?? displayOutput ?? "";
         const failurePrefix = result.success === false && result.error ? `Error: ${result.error}` : "";
         const combined = failurePrefix && modelVisible && !String(modelVisible).startsWith(failurePrefix) ? `${failurePrefix}
 ${modelVisible}` : modelVisible || result.error || displayOutput || "";
+        const structured = this._structuredMediaEvidencePreview(toolName, String(combined));
+        if (structured)
+          return structured.slice(0, Math.max(max, 1200));
         return String(combined).slice(0, max);
       }
+      _structuredMediaEvidencePreview(toolName, text2) {
+        if (!toolName || !text2)
+          return null;
+        if (toolName !== "audio_analyze" && toolName !== "video_understand") {
+          return null;
+        }
+        const lines = text2.replace(/\r/g, "").split("\n").map((line) => line.trim()).filter(Boolean);
+        if (lines.length === 0)
+          return null;
+        if (toolName === "audio_analyze") {
+          const kept2 = [];
+          const answer = [];
+          let inAnswer = false;
+          for (const line of lines) {
+            if (line.startsWith("# Audio comprehension:") || line.startsWith("duration ") || line.startsWith("roles:") || line.startsWith("quality:") || /^- (?:mean volume|max volume|silence|active audio windows):/i.test(line)) {
+              kept2.push(line);
+              continue;
+            }
+            if (line === "## Grounded Answer") {
+              inAnswer = true;
+              continue;
+            }
+            if (inAnswer && line.startsWith("## ")) {
+              inAnswer = false;
+            } else if (inAnswer && answer.length < 3) {
+              answer.push(line);
+            }
+          }
+          if (answer.length > 0)
+            kept2.push(`grounded_answer=${answer.join(" ")}`);
+          return kept2.length > 0 ? kept2.join(" | ") : null;
+        }
+        const kept = [];
+        let inAudio = false;
+        let audioLines = 0;
+        let frameLines = 0;
+        for (const line of lines) {
+          if (line.startsWith("# Video Analysis") || line.startsWith("Source:") || line.startsWith("Duration:")) {
+            kept.push(line);
+            continue;
+          }
+          if (line === "## Audio Comprehension") {
+            kept.push("Audio Comprehension: present");
+            inAudio = true;
+            audioLines = 0;
+            continue;
+          }
+          if (line.startsWith("## Frames")) {
+            kept.push(line);
+            inAudio = false;
+            frameLines = 0;
+            continue;
+          }
+          if (line.startsWith("## ")) {
+            inAudio = false;
+            continue;
+          }
+          if (inAudio && audioLines < 8 && (line.startsWith("# Audio comprehension:") || line.startsWith("duration ") || line.startsWith("roles:") || line.startsWith("quality:") || /^- (?:mean volume|max volume|silence|active audio windows):/i.test(line))) {
+            kept.push(line);
+            audioLines++;
+            continue;
+          }
+          if (/^\[[0-9:.]+\]\s+/.test(line) && frameLines < 3) {
+            kept.push(line);
+            frameLines++;
+          }
+        }
+        return kept.length > 0 ? kept.join(" | ") : null;
+      }
       _recordCompletionToolEvidenceFromResult(input) {
         if (!this._completionLedger || input.toolName === "task_complete")
           return;
@@ -573241,7 +573465,7 @@ ${modelVisible}` : modelVisible || result.error || displayOutput || "";
         this._completionLedger = recordToolEvidence(this._completionLedger, {
           name: input.toolName,
           success: input.result.success,
-          outputPreview: (input.outputPreview ?? this._toolEvidencePreview(input.result)).toString().slice(0, 500),
+          outputPreview: (input.outputPreview ?? this._toolEvidencePreview(input.result, void 0, 1200, input.toolName)).toString().slice(0, input.toolName === "audio_analyze" || input.toolName === "video_understand" ? 1200 : 500),
           argsKey: input.argsKey.slice(0, 300),
           targetPaths: attemptedTargetPaths
         });
@@ -573784,6 +574008,18 @@ ${shellLines.join("\n")}` : "Commands run: none"
         const failCount = toolCallLog.filter((e2) => e2.success === false).length;
         evidenceParts.push(`Failed tool calls this run: ${failCount}`);
         const evidenceDigest = evidenceParts.join("\n");
+        const hasFileAction = toolCallLog.some((e2) => e2.mutated || e2.name === "file_write" || e2.name === "file_edit" || e2.name === "batch_edit" || e2.name === "file_patch");
+        if (!hasFileAction && failCount === 0) {
+          const summaryNorm = proposedSummary.replace(/\s+/g, " ");
+          const supportedByShellOutput = toolCallLog.filter((e2) => e2.name === "shell" && e2.success === true).some((e2) => {
+            const output = String(e2.outputPreview ?? "").trim().replace(/\s+/g, " ");
+            if (output.length < 8)
+              return false;
+            return summaryNorm.includes(output.slice(0, Math.min(output.length, 120)));
+          });
+          if (supportedByShellOutput)
+            return { proceed: true };
+        }
         const degraded = failCount > 0 ? await this._inferExplicitDegradedCompletion({
           turn,
           originalGoal,
@@ -580173,7 +580409,10 @@ Corrective action: try a different approach first: read relevant files, adjust a
                 "background_run"
               ]);
               if (this._reg61PerpetualGateActive && !REG61_BYPASS_TOOLS.has(tc.name) && process.env["OMNIUS_DISABLE_REG61_COERCE"] !== "1") {
-                const _dbgLoop = this._detectDebugLoop(toolCallLog);
+                const _dbgLoop = this._detectDebugLoop([
+                  ...toolCallLog,
+                  { name: tc.name, argsKey }
+                ]);
                 const _debugLoopSampleSafe = (_dbgLoop.repeatedSample ?? "").slice(0, 120);
                 const _localFailureNudge = this._renderLocalFailureNudge(turn);
                 const reg61SteerMsg = _dbgLoop.detected ? [
@@ -580463,11 +580702,12 @@ Use the saved fact to continue the promised synthesis or next concrete step, or
                 if (repeatGateEligible && _existingFp !== void 0 && _repeatGateMax > 0) {
                   if (criticDecision.hitNumber >= _repeatGateMax) {
                     if (isReadLike) {
+                      const cachedResult = this.sanitizeCachedToolResult(tc.name, _existingFp.result);
                       repeatShortCircuit = {
                         success: true,
                         output: `[STOP RE-READING — you have requested this exact read ${criticDecision.hitNumber}× and you ALREADY HAVE its full content, shown again below. Do NOT read it again. Act on it: edit the file, run a verification, or call task_complete. If a previous edit failed with "old_string not found", your old_string did not match the file — copy it EXACTLY (including indentation) from the content below.]
 
-` + _existingFp.result
+` + cachedResult
                       };
                     } else {
                       repeatShortCircuit = {
@@ -580477,9 +580717,10 @@ Use the saved fact to continue the promised synthesis or next concrete step, or
                       };
                     }
                   } else {
+                    const cachedResult = this.sanitizeCachedToolResult(tc.name, _existingFp.result);
                     repeatShortCircuit = {
                       success: true,
-                      output: _existingFp.result
+                      output: cachedResult
                     };
                   }
                 }
@@ -581458,7 +581699,7 @@ Respond with EXACTLY this structure before your next tool call:
                     // source files (the "old_string not found" cascade). Large
                     // files are handled by branch-extract upstream, so 16KB
                     // here covers ordinary files without bloating the cache.
-                    isReadLike ? (result.output ?? "").slice(0, 16e3) : (result.output ?? "").slice(0, 2e3)
+                    isReadLike ? this.sanitizeCachedToolResult(tc.name, result.output ?? "").slice(0, 16e3) : (result.output ?? "").slice(0, 2e3)
                   ),
                   compacted: false
                 });
@@ -581750,12 +581991,12 @@ ${bookkeepingGuidance}` : bookkeepingGuidance;
                 currentLogEntry.success = result.success;
                 currentLogEntry.mutated = realFileMutation;
                 currentLogEntry.mutatedFiles = realMutationPaths;
-                currentLogEntry.outputPreview = this._toolEvidencePreview(result, output);
+                currentLogEntry.outputPreview = this._toolEvidencePreview(result, output, 1200, tc.name);
               }
               this._toolEvents.push({
                 name: tc.name,
                 success: result.success,
-                outputPreview: (result.output ?? result.error ?? output ?? "").toString().slice(0, 300),
+                outputPreview: this._toolEvidencePreview(result, output, 1200, tc.name),
                 turn
               });
               if (this._toolEvents.length > 200)
@@ -582096,7 +582337,7 @@ Then use file_read on individual FILES inside it.`);
                 argsKey: tc.arguments ? JSON.stringify(tc.arguments) : "",
                 args: tc.arguments,
                 result,
-                outputPreview: this._toolEvidencePreview(result, output),
+                outputPreview: this._toolEvidencePreview(result, output, 1200, tc.name),
                 realFileMutation,
                 realMutationPaths
               });
@@ -583202,7 +583443,7 @@ Full content available via: repl_exec(code="data = retrieve('${handleId}')")  or
                   bfLogEntry.success = result.success;
                   bfLogEntry.mutated = bfRealFileMutation;
                   bfLogEntry.mutatedFiles = bfRealMutationPaths;
-                  bfLogEntry.outputPreview = this._toolEvidencePreview(result, output);
+                  bfLogEntry.outputPreview = this._toolEvidencePreview(result, output, 1200, tc.name);
                 }
                 this.emit({
                   type: "tool_result",
@@ -583218,7 +583459,7 @@ Full content available via: repl_exec(code="data = retrieve('${handleId}')")  or
                   argsKey: bfArgsKey,
                   args: tc.arguments,
                   result,
-                  outputPreview: this._toolEvidencePreview(result, output),
+                  outputPreview: this._toolEvidencePreview(result, output, 1200, tc.name),
                   realFileMutation: bfRealFileMutation,
                   realMutationPaths: bfRealMutationPaths
                 });
@@ -584378,6 +584619,16 @@ ${marker}` : marker);
         }
         return hash.toString(16).padStart(8, "0");
       }
+      sanitizeCachedToolResult(toolName, output) {
+        let text2 = output;
+        if (text2.includes("[IMAGE_BASE64:")) {
+          text2 = text2.replace(/\[IMAGE_BASE64:[^\]]+\]/g, "[image binary omitted from repeat cache; use the OCR/image analysis text in this result]");
+        }
+        if (toolName === "image_read" && text2.length > 8e3) {
+          text2 = this.foldOutput(text2, 8e3);
+        }
+        return text2;
+      }
       /**
        * WO-NORMALIZE: Normalize tool output at source.
        * Caps output length, persists large results to .omnius/tool-results/ with preview,
@@ -601304,6 +601555,10 @@ var init_command_registry = __esm({
       ["/memory episodes", "Show recent episodes view"],
       ["/memory concepts", "Show concept clusters view"],
       ["/memory timeline", "Show temporal timeline view"],
+      [
+        "/metabolize [--dry-run] [--verbose] [--min-score <n>]",
+        "Run memory metabolism: score and compact stale episode entries"
+      ],
       ["/verbose", "Toggle verbose mode"],
       ["/clear", "Clear the screen"],
       ["/help", "Show this help"],
@@ -601407,6 +601662,7 @@ var init_command_registry = __esm({
       skillify: "tools",
       memory: "memory",
       mem: "memory",
+      metabolize: "memory",
       mouse: "ui",
       color: "ui",
       colors: "ui",
@@ -601453,6 +601709,7 @@ var init_command_registry = __esm({
       "task-type": ["tasktype", "tt"],
       stats: ["dashboard"],
       memory: ["mem"],
+      metabolize: ["metab"],
       files: ["workspace"],
       skills: ["skill"],
       commands: ["cmds"],
@@ -602166,8 +602423,8 @@ function formatTokenCount(t2) {
 }
 function buildMetricsChip(data) {
   const parts = [];
-  parts.push(`${data.turns}t`);
-  parts.push(`${data.toolCalls}c`);
+  parts.push(`${data.turns} ${data.turns === 1 ? "turn" : "turns"}`);
+  parts.push(`${data.toolCalls} ${data.toolCalls === 1 ? "call" : "calls"}`);
   if (data.tokens && data.durationMs > 0) {
     const total = data.tokens.total > 0 ? data.tokens.total : data.tokens.estimated;
     if (total > 0) {
@@ -604960,7 +605217,7 @@ function renderInfo(message2) {
   breakTelegramCoalesce();
   const redir = _contentWriteHook?.redirect?.();
   const dim = dimFg();
-  const icon = `${dim}∙\x1B[0m`;
+  const icon = `${dim}🛈\x1B[0m`;
   const prefix = `${icon} ${dim}`;
   const lines = wrapLinesWithPrefix(message2, prefix, getTermWidth());
   const text2 = `${lines.map((l2) => l2 + "\x1B[0m").join("\n")}
@@ -611306,6 +611563,27 @@ function watchForOmniusGitignore(repoRoot) {
   }
   if (watchers.length > 0) gitignoreWatchers.set(key, watchers);
 }
+function scheduleOmniusGitignoreRescans(repoRoot) {
+  const key = resolve54(repoRoot);
+  if (gitignoreRetryTimers.has(key)) return;
+  const timers = [25, 100, 250, 500, 1e3].map((delay3) => {
+    const timer = setTimeout(() => {
+      try {
+        ensureOmniusIgnored(repoRoot);
+      } catch {
+      }
+      const list = gitignoreRetryTimers.get(key);
+      if (list) {
+        const idx = list.indexOf(timer);
+        if (idx >= 0) list.splice(idx, 1);
+        if (list.length === 0) gitignoreRetryTimers.delete(key);
+      }
+    }, delay3);
+    timer.unref?.();
+    return timer;
+  });
+  gitignoreRetryTimers.set(key, timers);
+}
 function stopOmniusGitignoreWatcher(repoRoot) {
   const keys = repoRoot ? [resolve54(repoRoot)] : Array.from(gitignoreWatchers.keys());
   for (const key of keys) {
@@ -611317,6 +611595,9 @@ function stopOmniusGitignoreWatcher(repoRoot) {
       }
     }
     gitignoreWatchers.delete(key);
+    const timers = gitignoreRetryTimers.get(key) ?? [];
+    for (const timer of timers) clearTimeout(timer);
+    gitignoreRetryTimers.delete(key);
   }
 }
 function migrateLegacyDirectories(repoRoot, omniusPath) {
@@ -611348,6 +611629,10 @@ function initOmniusDirectory(repoRoot) {
     watchForOmniusGitignore(repoRoot);
   } catch {
   }
+  try {
+    scheduleOmniusGitignoreRescans(repoRoot);
+  } catch {
+  }
   return omniusPath;
 }
 function hasOmniusDirectory(repoRoot) {
@@ -612375,7 +612660,7 @@ function deleteUsageRecord(kind, value2, repoRoot) {
     remove(join126(repoRoot, OMNIUS_DIR, USAGE_HISTORY_FILE));
   }
 }
-var OMNIUS_DIR, LEGACY_DIRS, SUBDIRS, gitignoreWatchers, CONTEXT_FILES, PENDING_TASK_FILE, HANDOFF_FILE, CONTEXT_SAVE_FILE, CONTEXT_LEDGER_FILE, MAX_CONTEXT_ENTRIES, MAX_SESSION_DIARY_ENTRIES, MAX_SESSION_DIARY_DETAILED_ENTRIES, MAX_CONTEXT_LEDGER_LINES, MAX_CONTEXT_LEDGER_BYTES, SAME_TASK_REPLACE_WINDOW_MS, LOCK_TIMEOUT_MS, LOCK_RETRY_MS, LOCK_RETRY_MAX, SESSIONS_DIR, SESSIONS_INDEX, SKIP_DIRS3, HOME_SKIP_DIRS, USAGE_HISTORY_FILE, MAX_HISTORY_RECORDS;
+var OMNIUS_DIR, LEGACY_DIRS, SUBDIRS, gitignoreWatchers, gitignoreRetryTimers, CONTEXT_FILES, PENDING_TASK_FILE, HANDOFF_FILE, CONTEXT_SAVE_FILE, CONTEXT_LEDGER_FILE, MAX_CONTEXT_ENTRIES, MAX_SESSION_DIARY_ENTRIES, MAX_SESSION_DIARY_DETAILED_ENTRIES, MAX_CONTEXT_LEDGER_LINES, MAX_CONTEXT_LEDGER_BYTES, SAME_TASK_REPLACE_WINDOW_MS, LOCK_TIMEOUT_MS, LOCK_RETRY_MS, LOCK_RETRY_MAX, SESSIONS_DIR, SESSIONS_INDEX, SKIP_DIRS3, HOME_SKIP_DIRS, USAGE_HISTORY_FILE, MAX_HISTORY_RECORDS;
 var init_omnius_directory = __esm({
   "packages/cli/src/tui/omnius-directory.ts"() {
     "use strict";
@@ -612384,6 +612669,7 @@ var init_omnius_directory = __esm({
     LEGACY_DIRS = [".oa", ".open-agents"];
     SUBDIRS = ["memory", "index", "context", "history", "notes", "embedded", "provenance", "tools", "dreams"];
     gitignoreWatchers = /* @__PURE__ */ new Map();
+    gitignoreRetryTimers = /* @__PURE__ */ new Map();
     CONTEXT_FILES = [
       "AGENTS.md",
       "Omnius.md",
@@ -614844,7 +615130,7 @@ var init_status_bar = __esm({
     BOX_FG = tuiBoxFg();
     TEXT_PRIMARY = tuiTextPrimary() < 0 ? 252 : tuiTextPrimary();
     TEXT_DIM = tuiTextDim();
-    NO_SUB_AGENTS_HEADER_LABEL = " no agents ";
+    NO_SUB_AGENTS_HEADER_LABEL = " no sub-agents ";
     HEADER_BUTTON_GLYPH_FG = headerButtonGlyphFg();
     HEADER_BUTTON_BG = headerButtonBg();
     HEADER_BUTTON_FG = headerButtonFg();
@@ -615253,11 +615539,11 @@ var init_status_bar = __esm({
           return "p2p";
         if (backendType === "fake") return "fake";
         if (!backendUrl2) return "";
-        if (backendType) return backendType;
         if (backendUrl2.includes("127.0.0.1") || backendUrl2.includes("localhost") || backendUrl2.includes("0.0.0.0")) {
           return "local";
         }
-        return "remote";
+        if (/^https?:\/\//i.test(backendUrl2)) return "remote";
+        return backendType || "remote";
       }
       buildHeaderIdentitySegments() {
         const sponsorLabel = (this._sponsorHeader?.message || this._sponsorHeader?.linkText || "").trim();
@@ -615277,6 +615563,16 @@ var init_status_bar = __esm({
             last2.width += 2;
           }
         }
+        const modelSummary2 = this.summarizeHeaderModelName();
+        if (modelSummary2) {
+          const text2 = ` ${modelSummary2} `;
+          parts.push({ text: text2, width: stripAnsi(text2).length });
+        }
+        const transportSummary = this.summarizeHeaderTransport();
+        if (transportSummary) {
+          const text2 = ` ${transportSummary} `;
+          parts.push({ text: text2, width: stripAnsi(text2).length });
+        }
         if (this._processing) {
           const glyph = _StatusBar.HEADER_SPINNER_FRAMES[this._headerSpinnerFrame] ?? "";
           const last2 = parts[parts.length - 1];
@@ -615592,20 +615888,23 @@ var init_status_bar = __esm({
         return [];
       }
       getHeaderChromeLayout(termWidth) {
+        const showPrev = this._headerPanelIndex > 0;
+        const showNext = this._headerPanelIndex < this._headerPanels.length - 1;
+        const contentStartCol = showPrev ? 4 : 2;
+        const rightChrome = showNext ? 1 : 0;
         return {
-          showPrev: false,
-          showNext: true,
-          prevLabel: this._headerExpanded ? "▲" : "▼",
-          // ▲ ▼
-          contentStartCol: 2,
-          innerWidth: Math.max(1, termWidth - 4)
+          showPrev,
+          showNext,
+          contentStartCol,
+          innerWidth: Math.max(1, termWidth - contentStartCol - rightChrome)
         };
       }
       hitTestCurrentHeaderAction(row, col, termWidth) {
         const hdrRow = layout().headerContent;
         if (row !== hdrRow) return null;
         const chrome = this.getHeaderChromeLayout(termWidth);
-        if (chrome.showNext && col === termWidth - 2) return "header-toggle";
+        if (chrome.showPrev && col === 2) return "header-prev";
+        if (chrome.showNext && col === termWidth - 1) return "header-next";
         const hit = this._headerCommandZones.find(
           (zone) => col >= zone.start && col <= zone.end
         );
@@ -615698,9 +615997,14 @@ var init_status_bar = __esm({
         let buf = "\x1B7";
         buf += `\x1B[${hdrRow};1H${PANEL_BG_SEQ}\x1B[2K`;
         buf += `${BOX_FG}│${RESET4}${PANEL_BG_SEQ}`;
+        if (chromeLayout.showPrev) {
+          buf += `${HEADER_BUTTON_FG}◀${RESET4}${PANEL_BG_SEQ} `;
+        }
         buf += `\x1B[38;5;${TEXT_PRIMARY}m${PANEL_BG_SEQ}`;
         buf += content;
-        buf += `\x1B[${hdrRow};${w - 2}H${chromeLayout.prevLabel}${RESET4}${PANEL_BG_SEQ}`;
+        if (chromeLayout.showNext) {
+          buf += `\x1B[${hdrRow};${w - 1}H${HEADER_BUTTON_FG}▶${RESET4}${PANEL_BG_SEQ}`;
+        }
         buf += `\x1B[${hdrRow};${w}H${BOX_FG}│${RESET4}${PANEL_BG_SEQ}`;
         const scrollPct = this._contentScrollOffset > 0 ? `${Math.round(this._contentScrollOffset / this._contentMaxLines * 100)}%` : "live";
         if (this._headerExpanded) {
@@ -618027,6 +618331,10 @@ ${CONTENT_BG_SEQ}`);
         const digits = String(n2).split("");
         return digits.map((d2) => this.DIGIT_EMOJI[parseInt(d2)] ?? d2).join("");
       }
+      static formatInteger(n2) {
+        if (!Number.isFinite(n2) || n2 < 0) return "0";
+        return Math.round(n2).toLocaleString();
+      }
       /** Render a digit bar with a given fg color, wrapped in panel bg */
       static digitBarAnsi(n2, fgCode) {
         const bar = this.digitBar(n2);
@@ -618073,10 +618381,10 @@ ${CONTENT_BG_SEQ}`);
         const tpsStr = _StatusBar.formatTokensPerSecond(this._tokensPerSecond);
         const tpsExpanded = " " + pastel2(222, "t/s") + " " + c3.bold(tpsStr);
         const tpsW = 1 + 3 + 1 + tpsStr.length;
-        const tokExpanded = pastel2(117, "↑") + _StatusBar.digitBarAnsi(tokInRaw, 117) + " " + pastel2(151, "↓") + _StatusBar.digitBarAnsi(tokOutVal, 151) + " " + pastel2(222, "t/s") + " " + c3.bold(tpsStr);
-        const tokCompact = pastel2(117, "↑") + _StatusBar.digitBarAnsi(tokInRaw, 117) + " " + pastel2(151, "↓") + _StatusBar.digitBarAnsi(tokOutVal, 151) + " " + pastel2(222, "t/s") + " " + c3.bold(tpsStr);
-        const tokExpW = 1 + _StatusBar.digitBar(tokInRaw).length + 1 + 1 + _StatusBar.digitBar(tokOutVal).length + tpsW;
-        const tokCompW = 1 + _StatusBar.digitBar(tokInRaw).length + 1 + 1 + _StatusBar.digitBar(tokOutVal).length + tpsW;
+        const tokExpanded = pastel2(117, "↑") + pastel2(117, _StatusBar.formatInteger(tokInRaw)) + " " + pastel2(151, "↓") + pastel2(151, _StatusBar.formatInteger(tokOutVal)) + " " + pastel2(222, "t/s") + " " + c3.bold(tpsStr);
+        const tokCompact = pastel2(117, "↑") + pastel2(117, _StatusBar.formatInteger(tokInRaw)) + " " + pastel2(151, "↓") + pastel2(151, _StatusBar.formatInteger(tokOutVal)) + " " + pastel2(222, "t/s") + " " + c3.bold(tpsStr);
+        const tokExpW = 1 + _StatusBar.formatInteger(tokInRaw).length + 1 + 1 + _StatusBar.formatInteger(tokOutVal).length + tpsW;
+        const tokCompW = 1 + _StatusBar.formatInteger(tokInRaw).length + 1 + 1 + _StatusBar.formatInteger(tokOutVal).length + tpsW;
         sections.push({
           expanded: tokExpanded,
           compact: tokCompact,
@@ -618264,24 +618572,24 @@ ${CONTENT_BG_SEQ}`);
           if (rm4.cpuUtil >= 0) {
             const cpuColor = rm4.cpuUtil > 80 ? c3.red : rm4.cpuUtil > 50 ? c3.yellow : c3.green;
             const cpuCoresInfo = rm4.cpuCores > 0 ? ` (${_StatusBar.digitBar(rm4.cpuCores)}c` + (rm4.cpuModel ? " " + rm4.cpuModel.replace(/\s+/g, " ").slice(0, 30) : "") + ")" : "";
-            hwExpStr += `CPU${cpuColor(_StatusBar.digitBar(rm4.cpuUtil) + "%")}${c3.dim(cpuCoresInfo)}`;
-            hwCompStr += `CPU${cpuColor(_StatusBar.digitBar(rm4.cpuUtil) + "%")}`;
-            hwExpW += 4 + `${rm4.cpuUtil}%`.length + cpuCoresInfo.length;
-            hwCompW += 4 + `${rm4.cpuUtil}%`.length;
+            hwExpStr += `CPU ${cpuColor(_StatusBar.digitBar(rm4.cpuUtil) + "%")}${c3.dim(cpuCoresInfo)}`;
+            hwCompStr += `CPU ${cpuColor(_StatusBar.digitBar(rm4.cpuUtil) + "%")}`;
+            hwExpW += 5 + `${rm4.cpuUtil}%`.length + cpuCoresInfo.length;
+            hwCompW += 5 + `${rm4.cpuUtil}%`.length;
           }
           if (rm4.memUtil >= 0) {
             const memColor = rm4.memUtil > 80 ? c3.red : rm4.memUtil > 50 ? c3.yellow : c3.green;
             const memDetail = rm4.memTotalGB > 0 ? ` (${rm4.memUsedGB}/${rm4.memTotalGB}GB)` : "";
-            hwExpStr += ` RAM${memColor(_StatusBar.digitBar(rm4.memUtil) + "%")}${c3.dim(memDetail)}`;
-            hwCompStr += ` RAM${memColor(_StatusBar.digitBar(rm4.memUtil) + "%")}`;
+            hwExpStr += ` RAM ${memColor(_StatusBar.digitBar(rm4.memUtil) + "%")}${c3.dim(memDetail)}`;
+            hwCompStr += ` RAM ${memColor(_StatusBar.digitBar(rm4.memUtil) + "%")}`;
             hwExpW += 5 + `${rm4.memUtil}%`.length + memDetail.length;
             hwCompW += 5 + `${rm4.memUtil}%`.length;
           }
           if (rm4.diskUtil >= 0) {
             const diskColor = rm4.diskUtil > 90 ? c3.red : rm4.diskUtil > 75 ? c3.yellow : c3.green;
             const diskDetail = rm4.diskTotalGB > 0 ? ` (${rm4.diskFreeGB.toFixed(rm4.diskFreeGB < 10 ? 1 : 0)}GB free)` : "";
-            hwExpStr += ` DISK${diskColor(_StatusBar.digitBar(rm4.diskUtil) + "%")}${c3.dim(diskDetail)}`;
-            hwCompStr += ` DISK${diskColor(_StatusBar.digitBar(rm4.diskUtil) + "%")}`;
+            hwExpStr += ` DISK ${diskColor(_StatusBar.digitBar(rm4.diskUtil) + "%")}${c3.dim(diskDetail)}`;
+            hwCompStr += ` DISK ${diskColor(_StatusBar.digitBar(rm4.diskUtil) + "%")}`;
             hwExpW += 6 + `${rm4.diskUtil}%`.length + diskDetail.length;
             hwCompW += 6 + `${rm4.diskUtil}%`.length;
           }
@@ -640282,6 +640590,22 @@ The session corrections MUST become hard rules in the SKILL.md Rules section.`;
         await showCohereStatus(ctx3);
         return "handled";
       }
+      if (arg === "models") {
+        const nexus = new NexusTool(ctx3.repoRoot);
+        const result = await nexus.execute({
+          action: "cohere_list_models",
+          format: "json"
+        });
+        if (result.success) {
+          renderInfo(`COHERE all endpoint models:
+${result.output}`);
+        } else {
+          renderError(
+            result.error || result.output || "COHERE model listing failed."
+          );
+        }
+        return "handled";
+      }
       await showCohereDashboard(ctx3);
       return "handled";
     }
@@ -650566,6 +650890,7 @@ async function handleUpdate(subcommand, ctx3) {
     installOverlay.stop("Requesting permissions...");
     await new Promise((r2) => setTimeout(r2, 300));
     installOverlay.dismiss();
+    renderInfo("Global npm directory requires elevated permissions.");
     const sudoReady = await acquireSudoCredentials(
       ctx3,
       "The global npm directory requires elevated permissions for this update."
@@ -655593,12 +655918,12 @@ var init_stream_renderer = __esm({
               this.thinkingBoxOpen = true;
               this.thinkingBoxRowCount = 2;
               this.writeRaw(thinkingBoxTop(w) + "\n");
-              this.writeRaw(thinkingBoxRow(dimItalic("processing..."), w) + "\n");
+              this.writeRaw(thinkingBoxRow(dimItalic("thinking..."), w) + "\n");
               this.lineStarted = false;
             }
             if (this.thinkingTokenCount % 500 === 0) {
               this.updateThinkingBox(
-                `processing... (${this.thinkingTokenCount} tokens)`,
+                `thinking... (${this.thinkingTokenCount} tokens)`,
                 w
               );
             }
@@ -660661,12 +660986,6 @@ function buildToolDetailText(tool) {
   lines.push("🔙 <i>Tap Back to return to the tool list.</i>");
   return lines.join("\n");
 }
-function renderHelpMenu(scope) {
-  const tools = buildScopedToolList(scope);
-  const text2 = buildToolListText(tools, 0, scope);
-  const inline_keyboard = buildToolListKeyboard(tools, 0, scope);
-  return { text: text2, replyMarkup: { inline_keyboard } };
-}
 function renderHelpMenuPage(scope, page2) {
   const tools = buildScopedToolList(scope);
   const totalPages = Math.max(1, Math.ceil(tools.length / TOOLS_PER_PAGE));
@@ -660675,14 +660994,6 @@ function renderHelpMenuPage(scope, page2) {
   const inline_keyboard = buildToolListKeyboard(tools, page2, scope);
   return { text: text2, replyMarkup: { inline_keyboard } };
 }
-function renderHelpMenuPageWithCountdown(scope, page2, countdown) {
-  const tools = buildScopedToolList(scope);
-  const totalPages = Math.max(1, Math.ceil(tools.length / TOOLS_PER_PAGE));
-  page2 = Math.max(0, Math.min(page2, totalPages - 1));
-  const text2 = buildToolListText(tools, page2, scope);
-  const inline_keyboard = buildToolListKeyboard(tools, page2, scope, countdown);
-  return { text: text2, replyMarkup: { inline_keyboard } };
-}
 function renderHelpToolDetail(scope, toolName, returnPage) {
   const tools = buildScopedToolList(scope);
   const tool = tools.find((t2) => t2.name === toolName);
@@ -660727,7 +661038,7 @@ function handleHelpCallback(callbackData, currentState) {
   }
   return { render: render2, newState };
 }
-var TOOLS_PER_PAGE, GRID_COLS, CALLBACK_PREFIX, MAX_CALLBACK_DATA, INACTIVITY_TIMEOUT_MS, COUNTDOWN_SECONDS, TELEGRAM_PUBLIC_HELP_COMMANDS, HelpMenuStateStore, HelpMenuTimerManager;
+var TOOLS_PER_PAGE, GRID_COLS, CALLBACK_PREFIX, MAX_CALLBACK_DATA, TELEGRAM_PUBLIC_HELP_COMMANDS, HelpMenuStateStore;
 var init_telegram_help_menu = __esm({
   "packages/cli/src/tui/telegram-help-menu.ts"() {
     "use strict";
@@ -660736,8 +661047,6 @@ var init_telegram_help_menu = __esm({
     GRID_COLS = 5;
     CALLBACK_PREFIX = "help";
     MAX_CALLBACK_DATA = 64;
-    INACTIVITY_TIMEOUT_MS = 6e4;
-    COUNTDOWN_SECONDS = 10;
     TELEGRAM_PUBLIC_HELP_COMMANDS = /* @__PURE__ */ new Set(["help", "start", "auth", "call"]);
     HelpMenuStateStore = class {
       states = /* @__PURE__ */ new Map();
@@ -660763,124 +661072,6 @@ var init_telegram_help_menu = __esm({
         }
       }
     };
-    HelpMenuTimerManager = class {
-      inactivityTimers = /* @__PURE__ */ new Map();
-      countdownIntervals = /* @__PURE__ */ new Map();
-      stateStore;
-      callbacks;
-      constructor(stateStore, callbacks) {
-        this.stateStore = stateStore;
-        this.callbacks = callbacks;
-      }
-      key(chatId, messageId) {
-        return `${chatId}:${messageId}`;
-      }
-      /** Start the inactivity timer for a newly created menu */
-      startTimer(state) {
-        this.clearTimer(state.chatId, state.messageId);
-        const k = this.key(state.chatId, state.messageId);
-        const timer = setTimeout(() => {
-          this.inactivityTimers.delete(k);
-          this.startCountdown(state);
-        }, INACTIVITY_TIMEOUT_MS);
-        this.inactivityTimers.set(k, timer);
-      }
-      /** Reset the inactivity timer after user interaction */
-      resetTimer(chatId, messageId) {
-        const state = this.stateStore.get(chatId, messageId);
-        if (!state) return;
-        this.cancelCountdown(chatId, messageId);
-        const updated = { ...state, lastInteractionAt: Date.now(), countdownValue: null };
-        this.stateStore.set(updated);
-        this.startTimer(updated);
-      }
-      /** Clear all timers for a menu (used when menu is closed or deleted) */
-      clearTimer(chatId, messageId) {
-        const k = this.key(chatId, messageId);
-        const timer = this.inactivityTimers.get(k);
-        if (timer) {
-          clearTimeout(timer);
-          this.inactivityTimers.delete(k);
-        }
-        this.cancelCountdown(chatId, messageId);
-      }
-      /** Start the 10-second countdown, updating the close button each second */
-      startCountdown(state) {
-        const k = this.key(state.chatId, state.messageId);
-        let countdown = COUNTDOWN_SECONDS;
-        const updatedState = { ...state, countdownValue: countdown, lastInteractionAt: Date.now() };
-        this.stateStore.set(updatedState);
-        this.updateCountdownButton(updatedState);
-        const interval = setInterval(() => {
-          countdown--;
-          if (countdown <= 0) {
-            clearInterval(interval);
-            this.countdownIntervals.delete(k);
-            this.deleteMenu(state.chatId, state.messageId);
-          } else {
-            const s2 = { ...state, countdownValue: countdown, lastInteractionAt: Date.now() };
-            this.stateStore.set(s2);
-            this.updateCountdownButton(s2);
-          }
-        }, 1e3);
-        this.countdownIntervals.set(k, interval);
-      }
-      cancelCountdown(chatId, messageId) {
-        const k = this.key(chatId, messageId);
-        const interval = this.countdownIntervals.get(k);
-        if (interval) {
-          clearInterval(interval);
-          this.countdownIntervals.delete(k);
-        }
-      }
-      /** Update the close button to show countdown value */
-      async updateCountdownButton(state) {
-        try {
-          let render2;
-          if (state.view === "list") {
-            render2 = renderHelpMenuPageWithCountdown(state.scope, state.page, state.countdownValue);
-          } else {
-            render2 = renderHelpToolDetail(state.scope, state.detailToolName, state.page);
-          }
-          if (!render2) return;
-          await this.callbacks.editMessageText(
-            state.chatId,
-            state.messageId,
-            render2.text,
-            render2.replyMarkup
-          );
-        } catch {
-        }
-      }
-      /** Delete the menu message, the invoking user message, and clean up state */
-      async deleteMenu(chatId, messageId) {
-        const state = this.stateStore.get(chatId, messageId);
-        const invokerMsgId = state?.invokerMessageId;
-        this.clearTimer(chatId, messageId);
-        this.stateStore.delete(chatId, messageId);
-        try {
-          await this.callbacks.deleteMessage(chatId, messageId);
-        } catch {
-        }
-        if (invokerMsgId) {
-          try {
-            await this.callbacks.deleteMessage(chatId, invokerMsgId);
-          } catch {
-          }
-        }
-      }
-      /** Clean up all timers (for shutdown) */
-      destroyAll() {
-        for (const [k, timer] of this.inactivityTimers) {
-          clearTimeout(timer);
-        }
-        this.inactivityTimers.clear();
-        for (const [k, interval] of this.countdownIntervals) {
-          clearInterval(interval);
-        }
-        this.countdownIntervals.clear();
-      }
-    };
   }
 });
 
@@ -661140,7 +661331,7 @@ function handleStatsCallback(data, currentState, snapshot) {
       return null;
   }
 }
-var PAGE_SIZE, StatsMenuStateStore, CB_PREFIX, CATEGORY_LABELS2, INACTIVITY_TIMEOUT_MS2, COUNTDOWN_SECONDS2, StatsMenuTimerManager;
+var PAGE_SIZE, StatsMenuStateStore, CB_PREFIX, CATEGORY_LABELS2, INACTIVITY_TIMEOUT_MS, COUNTDOWN_SECONDS, StatsMenuTimerManager;
 var init_telegram_stats_menu = __esm({
   "packages/cli/src/tui/telegram-stats-menu.ts"() {
     "use strict";
@@ -661174,8 +661365,8 @@ var init_telegram_stats_menu = __esm({
       session: "Session",
       system: "System"
     };
-    INACTIVITY_TIMEOUT_MS2 = 6e4;
-    COUNTDOWN_SECONDS2 = 10;
+    INACTIVITY_TIMEOUT_MS = 6e4;
+    COUNTDOWN_SECONDS = 10;
     StatsMenuTimerManager = class {
       constructor(states2, callbacks, getSnapshot) {
         this.states = states2;
@@ -661211,12 +661402,12 @@ var init_telegram_stats_menu = __esm({
                 lastInteractionAt: Date.now()
               }
             );
-          }, INACTIVITY_TIMEOUT_MS2)
+          }, INACTIVITY_TIMEOUT_MS)
         );
       }
       startCountdown(state) {
         const k = this.key(state.chatId, state.messageId);
-        this.countdownValues.set(k, COUNTDOWN_SECONDS2);
+        this.countdownValues.set(k, COUNTDOWN_SECONDS);
         this.renderCountdown(state).catch(() => {
         });
         this.countdownTimers.set(
@@ -668572,6 +668763,7 @@ Telegram link integrity contract:
       telegramActiveWorkStartedAtMs = /* @__PURE__ */ new Map();
       /** Queued Telegram sessions waiting for a global work slot. */
       telegramQueuedSessionWork = /* @__PURE__ */ new Map();
+      telegramQueuedSessionCompletions = /* @__PURE__ */ new Map();
       telegramDispatchQueuedTimer = null;
       telegramDispatchQueuedAtMs = 0;
       telegramQueueDiagnosticLastAtMs = 0;
@@ -669474,22 +669666,41 @@ No scoped reflection artifact exists yet for this chat. Use <code>/reflect</code
           messageCount: (existing?.messageCount ?? 0) + 1
         };
       }
+      getTelegramQueuedSessionCompletion(sessionKey) {
+        const existing = this.telegramQueuedSessionCompletions.get(sessionKey);
+        if (existing) return existing;
+        let resolve73;
+        let reject;
+        const promise = new Promise((res, rej) => {
+          resolve73 = res;
+          reject = rej;
+        });
+        promise.catch(() => {
+        });
+        const completion = { promise, resolve: resolve73, reject };
+        this.telegramQueuedSessionCompletions.set(sessionKey, completion);
+        return completion;
+      }
+      shouldAwaitTelegramQueuedWorkForTests() {
+        return process.env["OMNIUS_TG_AWAIT_QUEUED_WORK"] === "1" || process.env["VITEST"] === "true";
+      }
       scheduleTelegramSessionWork(msg, toolContext) {
         const sessionKey = this.sessionKeyForMessage(msg);
         const now2 = Date.now();
         const existing = this.subAgents.get(sessionKey);
         if (existing && !existing.aborted) {
-          void this.enqueueTelegramMessageForExistingSubAgent(msg, existing).catch(
-            (err) => {
-              this.tuiWrite(
-                () => renderWarning(
-                  `Telegram context merge error: ${err instanceof Error ? err.message : String(err)}`
-                )
-              );
-            }
-          );
-          return;
+          return this.enqueueTelegramMessageForExistingSubAgent(
+            msg,
+            existing
+          ).catch((err) => {
+            this.tuiWrite(
+              () => renderWarning(
+                `Telegram context merge error: ${err instanceof Error ? err.message : String(err)}`
+              )
+            );
+          });
         }
+        const completion = this.getTelegramQueuedSessionCompletion(sessionKey);
         const queued = this.buildTelegramQueuedSessionWork(
           sessionKey,
           msg,
@@ -669507,6 +669718,7 @@ No scoped reflection artifact exists yet for this chat. Use <code>/reflect</code
             `queued Telegram work for ${msg.chatTitle || msg.chatType}; active ${this.activeTelegramInteractionCount()}/${this.getSubAgentLimit()}, queued ${this.telegramQueuedSessionWork.size}, bundled ${queued.messageCount}`
           )
         );
+        return completion.promise;
       }
       startTelegramSessionWork(work) {
         if (this.telegramSessionIsLive(work.sessionKey)) {
@@ -669521,13 +669733,20 @@ No scoped reflection artifact exists yet for this chat. Use <code>/reflect</code
         this.telegramActiveWorkStartedAtMs.set(work.sessionKey, Date.now());
         const generation = this.nextTelegramWorkGeneration(work.sessionKey);
         this.refreshActiveTelegramInteractionCount();
-        void this.processTelegramMessageWork(work, generation).catch((err) => {
+        const completion = this.telegramQueuedSessionCompletions.get(
+          work.sessionKey
+        );
+        void this.processTelegramMessageWork(work, generation).then(() => {
+          completion?.resolve();
+        }).catch((err) => {
           this.tuiWrite(
             () => renderWarning(
               `Telegram sub-agent error: ${err instanceof Error ? err.message : String(err)}`
             )
           );
+          completion?.reject(err);
         }).finally(() => {
+          this.telegramQueuedSessionCompletions.delete(work.sessionKey);
           if (this.telegramWorkGenerationIsCurrent(work.sessionKey, generation)) {
             this.telegramActiveWorkSessions.delete(work.sessionKey);
             this.telegramActiveWorkStartedAtMs.delete(work.sessionKey);
@@ -669738,58 +669957,21 @@ ${message2}`)
       }
       async replyWithTelegramHelp(msg, isAdmin) {
         const scope = isAdmin ? "admin" : "public";
-        const menu = renderHelpMenu(scope);
+        const helpText = buildTelegramHelpHTML(scope);
         if (msg.guestQueryId) {
-          const chunks = splitTelegramHTMLMessage(
-            buildTelegramHelpHTML(isAdmin ? "admin" : "public")
-          );
+          const chunks = splitTelegramHTMLMessage(helpText);
           await this.answerGuestQuery(msg.guestQueryId, chunks[0] ?? "", {
             parseMode: "HTML"
           });
           return;
         }
-        const sent = await this.apiCall("sendMessage", {
-          chat_id: msg.chatId,
-          text: menu.text,
-          parse_mode: "HTML",
-          reply_markup: JSON.stringify(menu.replyMarkup),
-          ...msg.chatType !== "private" ? { reply_to_message_id: msg.messageId } : {}
-        });
-        if (sent.ok && sent.result?.message_id) {
-          const state = {
-            chatId: msg.chatId,
-            messageId: sent.result.message_id,
-            invokerMessageId: msg.messageId,
-            scope,
-            page: 0,
-            view: "list",
-            detailToolName: null,
-            fromUserId: msg.fromUserId ?? 0,
-            createdAt: Date.now(),
-            lastInteractionAt: Date.now(),
-            countdownValue: null
-          };
-          this.helpMenuStates.set(state);
-          if (!this.helpMenuTimers) {
-            this.helpMenuTimers = new HelpMenuTimerManager(this.helpMenuStates, {
-              editMessageText: async (chatId, messageId, text2, replyMarkup) => {
-                await this.apiCall("editMessageText", {
-                  chat_id: chatId,
-                  message_id: messageId,
-                  text: text2,
-                  parse_mode: "HTML",
-                  reply_markup: JSON.stringify(replyMarkup)
-                });
-              },
-              deleteMessage: async (chatId, messageId) => {
-                await this.apiCall("deleteMessage", {
-                  chat_id: chatId,
-                  message_id: messageId
-                });
-              }
-            });
-          }
-          this.helpMenuTimers.startTimer(state);
+        for (const chunk of splitTelegramHTMLMessage(helpText)) {
+          await this.apiCall("sendMessage", {
+            chat_id: msg.chatId,
+            text: chunk,
+            parse_mode: "HTML",
+            ...msg.chatType !== "private" ? { reply_to_message_id: msg.messageId } : {}
+          });
         }
       }
       async replyWithTelegramCommandMenu(msg, isAdmin, kind, commandName) {
@@ -673854,6 +674036,10 @@ ${lines.join("\n")}`;
         const factCount = memory?.facts.length ?? 0;
         const userMemoryCount = memory ? Object.keys(memory.users).length : 0;
         const historyCount = (this.chatHistory.get(sessionKey) ?? []).length;
+        const sqliteHistoryCount = this.telegramSqliteHistoryForSession(
+          sessionKey,
+          5e3
+        ).length;
         const chatId = msg.chatId;
         let topicCount = 0;
         if (this.repoRoot && chatId !== void 0) {
@@ -673868,11 +674054,37 @@ ${lines.join("\n")}`;
           } catch {
           }
         }
-        const hasMemory = cardCount + factCount + userMemoryCount + topicCount > 0 || historyCount > 0;
+        const hasMemory = cardCount + factCount + userMemoryCount + topicCount > 0 || historyCount > 0 || sqliteHistoryCount > 0;
         if (!hasMemory) return "";
+        const sqliteLines = [];
+        if (sqliteHistoryCount > 0) {
+          const addressableRows = this.telegramMergedHistoryForSession(
+            sessionKey,
+            5e3
+          ).length;
+          const anchors = this.telegramHistoryAnchorsForSession(sessionKey, 1);
+          sqliteLines.push(`SQLite mirror rows: ${sqliteHistoryCount}`);
+          sqliteLines.push(
+            `Addressable conversation history rows: ${addressableRows}`
+          );
+          const earliest = anchors.earliest[0];
+          if (earliest?.ts) {
+            sqliteLines.push(
+              `Earliest turn: ${new Date(earliest.ts).toISOString()} ${telegramHistorySpeaker(earliest)}`
+            );
+          }
+          for (const stat8 of this.telegramParticipantActivityStats(sessionKey, {
+            limit: 5
+          })) {
+            sqliteLines.push(
+              `${stat8.speaker}: ${stat8.count} message${stat8.count === 1 ? "" : "s"}`
+            );
+          }
+        }
         return [
           "### Memory Substrate (this chat)",
           `Available: ${cardCount} cards, ${factCount} facts, ${userMemoryCount} per-user memories, ${historyCount} rolling-history msgs, ${topicCount} memory_read topics.`,
+          ...sqliteLines,
           "Recall via memory_search (semantic similarity / graph traversal / episodes). For exact reads: memory_read(topic, key). The substrate is associative — recall is by cue, not by date."
         ].join("\n");
       }
@@ -673933,6 +674145,11 @@ ${lines.join("\n")}`;
         if (socialStateContext) {
           sections.push(socialStateContext);
         }
+        try {
+          const daydreamContext = this.formatLatestTelegramChannelDaydreamContext(sessionKey);
+          if (daydreamContext) sections.push(daydreamContext);
+        } catch {
+        }
         if (participants.length > 0) {
           const fullCount = Math.min(12, participants.length);
           const tier1Count = Math.max(1, Math.round(fullCount * tier1Ratio));
@@ -674336,13 +674553,8 @@ ${this.quoteTelegramContextBlock(msg.text, 1200)}`,
         const suppressed = telegramThinkSuppressedRequest(request);
         const requestTimeoutMs = Number.isFinite(suppressed.timeoutMs) && (suppressed.timeoutMs ?? 0) > 0 ? suppressed.timeoutMs : void 0;
         const jsonStartMs = Date.now();
-        const nativeOllamaRouter = diagnostics?.backendType === "ollama" && typeof backend.nativeOllamaChatCompletion === "function";
         try {
-          jsonModeResult = nativeOllamaRouter ? await backend.nativeOllamaChatCompletion({
-            ...suppressed,
-            responseFormat: TELEGRAM_INTERACTION_DECISION_RESPONSE_FORMAT,
-            disableEmptyContentRecovery: true
-          }) : await this.telegramObservableInference(
+          jsonModeResult = await this.telegramObservableInference(
             backend,
             {
               ...suppressed,
@@ -674406,7 +674618,7 @@ ${this.quoteTelegramContextBlock(msg.text, 1200)}`,
         }
         const plainStartMs = Date.now();
         try {
-          const plainResult = nativeOllamaRouter ? await backend.nativeOllamaChatCompletion(suppressed) : await this.telegramObservableInference(
+          const plainResult = await this.telegramObservableInference(
             backend,
             suppressed,
             inferenceKind,
@@ -676480,6 +676692,10 @@ ${TELEGRAM_PUBLIC_ORCHESTRATOR_CONTRACT}`
           this.telegramDispatchQueuedAtMs = 0;
         }
         this.telegramQueuedSessionWork.clear();
+        for (const completion of this.telegramQueuedSessionCompletions.values()) {
+          completion.reject(new Error("Telegram bridge stopped before queued work completed"));
+        }
+        this.telegramQueuedSessionCompletions.clear();
         this.telegramActiveWorkSessions.clear();
         this.telegramActiveWorkGenerations.clear();
         this.telegramActiveWorkStartedAtMs.clear();
@@ -677625,7 +677841,8 @@ Join: ${newUrl}`
           await this.enqueueTelegramMessageForExistingSubAgent(msg, existing);
           return;
         }
-        this.scheduleTelegramSessionWork(msg, toolContext);
+        const queuedWork = this.scheduleTelegramSessionWork(msg, toolContext);
+        if (this.shouldAwaitTelegramQueuedWorkForTests()) await queuedWork;
       }
       async processTelegramMessageWork(work, workGeneration) {
         const msg = work.msg;
@@ -687348,11 +687565,14 @@ var init_routes_media = __esm({
 async function buildDirectToolRegistry(workingDir) {
   const mod3 = await Promise.resolve().then(() => (init_dist5(), dist_exports2)).catch(() => null);
   if (!mod3) {
-    return { entries: [], byName: /* @__PURE__ */ new Map(), executionModule: {} };
+    return { entries: [], byName: /* @__PURE__ */ new Map(), callableByName: /* @__PURE__ */ new Map(), executionModule: {} };
   }
   const buildManifest = mod3.buildToolManifestFromModule;
   const baseEntries = buildManifest ? buildManifest(mod3, { cwd: workingDir }) : [];
-  const entries = baseEntries.filter((entry) => typeof entry.name === "string" && typeof entry.className === "string").map((entry) => ({ ...entry, directCallable: true }));
+  const entries = baseEntries.filter((entry) => typeof entry.name === "string" && typeof entry.className === "string").map((entry) => ({
+    ...entry,
+    directCallable: DIRECT_BOOKKEEPING_TOOL_NAMES.has(entry.name)
+  }));
   if (!entries.some((entry) => entry.name === TASK_COMPLETE_ENTRY.name)) {
     entries.push({
       ...TASK_COMPLETE_ENTRY,
@@ -687360,14 +687580,16 @@ async function buildDirectToolRegistry(workingDir) {
     });
   }
   entries.sort((a2, b) => a2.name.localeCompare(b.name));
+  const callableEntries = entries.filter((entry) => entry.directCallable);
   return {
     entries,
     byName: new Map(entries.map((entry) => [entry.name, entry])),
+    callableByName: new Map(callableEntries.map((entry) => [entry.name, entry])),
     executionModule: mod3
   };
 }
 function instantiateDirectTool(registry4, name10, workingDir) {
-  const entry = registry4.byName.get(name10);
+  const entry = registry4.callableByName.get(name10);
   if (!entry) return null;
   if (entry.virtual && entry.name === "task_complete") {
     return createTaskCompleteDirectTool();
@@ -687415,7 +687637,7 @@ function createTaskCompleteDirectTool() {
     }
   };
 }
-var TASK_COMPLETE_ENTRY;
+var TASK_COMPLETE_ENTRY, DIRECT_BOOKKEEPING_TOOL_NAMES;
 var init_direct_tool_registry = __esm({
   "packages/cli/src/api/direct-tool-registry.ts"() {
     "use strict";
@@ -687446,6 +687668,11 @@ var init_direct_tool_registry = __esm({
       directCallable: true,
       virtual: true
     };
+    DIRECT_BOOKKEEPING_TOOL_NAMES = /* @__PURE__ */ new Set([
+      "todo_write",
+      "todo_read",
+      "working_notes"
+    ]);
   }
 });
 
@@ -691741,17 +691968,18 @@ async function handleCallTool(ctx3, name10) {
       workingDir = pathResolve3(body.working_dir);
     }
     const registry4 = await buildDirectToolRegistry(workingDir);
-    const entry = registry4.byName.get(name10);
+    const entry = registry4.callableByName.get(name10);
     if (!entry) {
       const ext = getExternalTool(workingDir, name10);
       if (ext) {
         return callExternalTool(ctx3, ext, args, workingDir, origin, scope, body);
       }
+      const builtin = registry4.byName.get(name10);
       sendProblem(res, problemDetails({
         type: P2.notFound,
         status: 404,
-        title: `Tool '${name10}' not found`,
-        detail: "This endpoint exposes the same direct-callable tool registry returned by GET /v1/tools. Use GET /v1/tools for schemas or POST /v1/run for full agent execution.",
+        title: builtin ? `Tool '${name10}' is not direct-callable` : `Tool '${name10}' not found`,
+        detail: builtin ? "This built-in tool is discoverable through GET /v1/tools but is not executable through direct REST calls. Use POST /v1/run for agent-bound workflows." : "No direct-callable built-in or registered external tool with that name. Use GET /v1/tools for schemas or POST /v1/run for full agent execution.",
         instance: requestId
       }));
       return true;