orion-super-agent-dev 0.1.18 → 0.1.19

package/out/main.js

@@ -2230,7 +2230,7 @@ var require_react_jsx_runtime_development = __commonJS({
     if (process.env.NODE_ENV !== "production") {
       (function() {
         "use strict";
-        var React31 = require_react();
+        var React32 = require_react();
         var REACT_ELEMENT_TYPE = Symbol.for("react.element");
         var REACT_PORTAL_TYPE = Symbol.for("react.portal");
         var REACT_FRAGMENT_TYPE = Symbol.for("react.fragment");
@@ -2256,7 +2256,7 @@ var require_react_jsx_runtime_development = __commonJS({
           }
           return null;
         }
-        var ReactSharedInternals = React31.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
+        var ReactSharedInternals = React32.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
         function error(format2) {
           {
             {
@@ -3201,7 +3201,7 @@ var require_string_width = __commonJS({
     var stripAnsi6 = require_strip_ansi();
     var isFullwidthCodePoint2 = require_is_fullwidth_code_point();
     var emojiRegex2 = require_emoji_regex();
-    var stringWidth5 = (string) => {
+    var stringWidth6 = (string) => {
       if (typeof string !== "string" || string.length === 0) {
         return 0;
       }
@@ -3226,8 +3226,8 @@ var require_string_width = __commonJS({
       }
       return width;
     };
-    module2.exports = stringWidth5;
-    module2.exports.default = stringWidth5;
+    module2.exports = stringWidth6;
+    module2.exports.default = stringWidth6;
   }
 });
 
@@ -4336,7 +4336,7 @@ var require_ansi_styles = __commonJS({
 var require_wrap_ansi = __commonJS({
   "../node_modules/wrap-ansi/index.js"(exports2, module2) {
     "use strict";
-    var stringWidth5 = require_string_width();
+    var stringWidth6 = require_string_width();
     var stripAnsi6 = require_strip_ansi();
     var ansiStyles2 = require_ansi_styles();
     var ESCAPES2 = /* @__PURE__ */ new Set([
@@ -4351,14 +4351,14 @@ var require_wrap_ansi = __commonJS({
     var ANSI_ESCAPE_LINK = `${ANSI_OSC}8;;`;
     var wrapAnsi2 = (code) => `${ESCAPES2.values().next().value}${ANSI_CSI}${code}${ANSI_SGR_TERMINATOR}`;
     var wrapAnsiHyperlink = (uri) => `${ESCAPES2.values().next().value}${ANSI_ESCAPE_LINK}${uri}${ANSI_ESCAPE_BELL}`;
-    var wordLengths = (string) => string.split(" ").map((character) => stringWidth5(character));
+    var wordLengths = (string) => string.split(" ").map((character) => stringWidth6(character));
     var wrapWord = (rows, word, columns) => {
       const characters = [...word];
       let isInsideEscape = false;
       let isInsideLinkEscape = false;
-      let visible = stringWidth5(stripAnsi6(rows[rows.length - 1]));
+      let visible = stringWidth6(stripAnsi6(rows[rows.length - 1]));
       for (const [index, character] of characters.entries()) {
-        const characterLength = stringWidth5(character);
+        const characterLength = stringWidth6(character);
         if (visible + characterLength <= columns) {
           rows[rows.length - 1] += character;
         } else {
@@ -4394,7 +4394,7 @@ var require_wrap_ansi = __commonJS({
       const words = string.split(" ");
       let last = words.length;
       while (last > 0) {
-        if (stringWidth5(words[last - 1]) > 0) {
+        if (stringWidth6(words[last - 1]) > 0) {
           break;
         }
         last--;
@@ -4417,7 +4417,7 @@ var require_wrap_ansi = __commonJS({
         if (options.trim !== false) {
           rows[rows.length - 1] = rows[rows.length - 1].trimStart();
         }
-        let rowLength = stringWidth5(rows[rows.length - 1]);
+        let rowLength = stringWidth6(rows[rows.length - 1]);
         if (index !== 0) {
           if (rowLength >= columns && (options.wordWrap === false || options.trim === false)) {
             rows.push("");
@@ -9963,9 +9963,9 @@ var require_react_reconciler_development = __commonJS({
       module2.exports = function $$$reconciler($$$hostConfig) {
         var exports3 = {};
         "use strict";
-        var React31 = require_react();
+        var React32 = require_react();
         var Scheduler = require_scheduler();
-        var ReactSharedInternals = React31.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
+        var ReactSharedInternals = React32.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
         var suppressWarning = false;
         function setSuppressWarning(newSuppressWarning) {
           {
@@ -28228,6 +28228,70 @@ var require_askAnswers = __commonJS({
   }
 });
 
+// ../packages/orion-client-core/dist/fileMentions.js
+var require_fileMentions = __commonJS({
+  "../packages/orion-client-core/dist/fileMentions.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.FILE_MENTION_LEADER = void 0;
+    exports2.findFileMentionQuery = findFileMentionQuery3;
+    exports2.insertFileMention = insertFileMention2;
+    exports2.scanFileMentionRanges = scanFileMentionRanges2;
+    exports2.toWorkspaceRelative = toWorkspaceRelative;
+    exports2.FILE_MENTION_LEADER = "@";
+    function findFileMentionQuery3(text, caret) {
+      const before = text.slice(0, caret);
+      const match = /(^|\s)@([^\s@]*)$/.exec(before);
+      if (!match)
+        return null;
+      const token = match[0];
+      const at = caret - token.length + token.lastIndexOf("@");
+      return { start: at, end: caret, query: match[2] };
+    }
+    function insertFileMention2(text, at, path13) {
+      const suffix = text.slice(at.end);
+      const token = `${exports2.FILE_MENTION_LEADER}${path13}`;
+      const closes = !path13.endsWith("/") && (suffix.length === 0 || !/^\s/.test(suffix));
+      const inserted = `${token}${closes ? " " : ""}`;
+      return {
+        text: `${text.slice(0, at.start)}${inserted}${suffix}`,
+        caret: at.start + inserted.length
+      };
+    }
+    function scanFileMentionRanges2(text, paths) {
+      if (paths.size === 0)
+        return [];
+      const ranges = [];
+      const byLongest = [...paths].filter((p) => p.length > 0).sort((a, b2) => b2.length - a.length);
+      for (const path13 of byLongest) {
+        const token = `${exports2.FILE_MENTION_LEADER}${path13}`;
+        for (let from = text.indexOf(token); from >= 0; from = text.indexOf(token, from + 1)) {
+          const end = from + token.length;
+          if (from > 0 && !/\s/.test(text[from - 1]))
+            continue;
+          if (end < text.length && !/\s/.test(text[end]))
+            continue;
+          if (ranges.some((r2) => from < r2.end && end > r2.start))
+            continue;
+          ranges.push({ start: from, end });
+        }
+      }
+      return ranges.sort((a, b2) => a.start - b2.start);
+    }
+    function toWorkspaceRelative(path13, workspaceRoot) {
+      if (!workspaceRoot)
+        return path13;
+      const root2 = workspaceRoot.replace(/\\/g, "/").replace(/\/+$/, "");
+      const normalized = path13.replace(/\\/g, "/");
+      if (normalized === root2)
+        return normalized.slice(normalized.lastIndexOf("/") + 1);
+      if (normalized.startsWith(`${root2}/`))
+        return normalized.slice(root2.length + 1);
+      return path13;
+    }
+  }
+});
+
 // ../packages/orion-client-core/dist/trustFindings.js
 var require_trustFindings = __commonJS({
   "../packages/orion-client-core/dist/trustFindings.js"(exports2) {
@@ -35522,14 +35586,14 @@ var require_agentNarration = __commonJS({
     exports2.PARTIAL_TEXT_CAP = 2e4;
     exports2.ACTIVITY_CAP = 5;
     function describeChildActivity(name2, input) {
-      const clip = (v2, n) => {
+      const clip2 = (v2, n) => {
         const s = String(v2 ?? "").trim();
         return s.length > n ? s.slice(0, n - 1) + "\u2026" : s;
       };
       const base = (v2) => {
         const s = String(v2 ?? "").trim();
         const leaf = s.split("/").filter(Boolean).pop() ?? s;
-        return clip(leaf, 40);
+        return clip2(leaf, 40);
       };
       switch (name2) {
         case "read_file":
@@ -35541,23 +35605,23 @@ var require_agentNarration = __commonJS({
         case "bash":
         case "bash_background":
         case "powershell":
-          return `Running ${clip(input.command, 48)}`;
+          return `Running ${clip2(input.command, 48)}`;
         case "grep":
-          return `Grepping "${clip(input.pattern, 40)}"`;
+          return `Grepping "${clip2(input.pattern, 40)}"`;
         case "glob":
-          return `Globbing ${clip(input.pattern, 40)}`;
+          return `Globbing ${clip2(input.pattern, 40)}`;
         case "list_dir":
-          return `Listing ${clip(input.path ?? ".", 40)}`;
+          return `Listing ${clip2(input.path ?? ".", 40)}`;
         case "search_codebase":
-          return `Searching for "${clip(input.query, 40)}"`;
+          return `Searching for "${clip2(input.query, 40)}"`;
         case "trace_codebase":
-          return `Tracing ${clip(input.target, 40)}`;
+          return `Tracing ${clip2(input.target, 40)}`;
         case "web_fetch":
-          return `Fetching ${clip(input.url, 48)}`;
+          return `Fetching ${clip2(input.url, 48)}`;
         case "web_search":
-          return `Searching the web for "${clip(input.query, 40)}"`;
+          return `Searching the web for "${clip2(input.query, 40)}"`;
         case "spawn_agent":
-          return `Spawning ${clip(input.type, 24)} sub-agent`;
+          return `Spawning ${clip2(input.type, 24)} sub-agent`;
         case "update_plan":
           return "Updating the plan";
         // The child's own progress note IS the activity line — deriving "agent progress" from the
@@ -35565,9 +35629,9 @@ var require_agentNarration = __commonJS({
         // meaningful one. Empty (no note yet, because a streamed call starts before its input
         // lands) pushes nothing at all; the handler supplies the line a moment later.
         case "agent_progress":
-          return clip(input.note, 48);
+          return clip2(input.note, 48);
         default:
-          return clip(name2.replace(/_/g, " "), 48);
+          return clip2(name2.replace(/_/g, " "), 48);
       }
     }
     function launchedText(entry) {
@@ -37613,9 +37677,9 @@ var require_agentAuth = __commonJS({
     function formatUsageBar2(pct2, width = 12) {
       if (pct2 === null || pct2 === void 0)
         return "No limit";
-      const clamped = Math.max(0, Math.min(100, Math.round(pct2)));
-      const filled = clamped === 0 ? 0 : clamped === 100 ? width : Math.min(width - 1, Math.max(1, Math.round(clamped / 100 * width)));
-      return `${"\u2588".repeat(filled)}${"\u2591".repeat(Math.max(0, width - filled))} ${clamped}%`;
+      const clamped2 = Math.max(0, Math.min(100, Math.round(pct2)));
+      const filled = clamped2 === 0 ? 0 : clamped2 === 100 ? width : Math.min(width - 1, Math.max(1, Math.round(clamped2 / 100 * width)));
+      return `${"\u2588".repeat(filled)}${"\u2591".repeat(Math.max(0, width - filled))} ${clamped2}%`;
     }
     function formatResetDate(date, now2 = /* @__PURE__ */ new Date()) {
       const months = [
@@ -41395,7 +41459,7 @@ var require_activity = __commonJS({
       }
       return target;
     }
-    function clip(text) {
+    function clip2(text) {
       const flat = text.replace(/\s+/g, " ").trim();
       return flat.length > TEXT_CAP ? `${flat.slice(0, TEXT_CAP - 1)}\u2026` : flat;
     }
@@ -41410,7 +41474,7 @@ var require_activity = __commonJS({
       }
       const input = typeof data.input === "object" && data.input !== null ? data.input : {};
       const target = typeof input.path === "string" ? relativize(input.path, workspaceRoot) : typeof input.file_path === "string" ? relativize(input.file_path, workspaceRoot) : typeof input.command === "string" ? input.command : typeof input.pattern === "string" ? input.pattern : typeof input.query === "string" ? input.query : typeof input.url === "string" ? input.url : "";
-      return clip(target === "" ? verb.replace(/:$/, "") : `${verb} ${target}`);
+      return clip2(target === "" ? verb.replace(/:$/, "") : `${verb} ${target}`);
     }
     var ActivityRing = class {
       entries = [];
@@ -43087,9 +43151,7 @@ var require_steerPromotion = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.promoteLeftoverSteers = promoteLeftoverSteers2;
-    function promoteLeftoverSteers2(outcome, leftovers) {
-      if (outcome === "cancelled")
-        return null;
+    function promoteLeftoverSteers2(leftovers) {
       const kept = leftovers.map((text) => text.trim()).filter((text) => text.length > 0);
       if (kept.length === 0)
         return null;
@@ -43237,7 +43299,7 @@ var require_zipReader = __commonJS({
     var EOCD_SIG = 101010256;
     var CENTRAL_SIG = 33639248;
     var LOCAL_SIG = 67324752;
-    var MAX_ENTRIES2 = 2e3;
+    var MAX_ENTRIES = 2e3;
     var MAX_TOTAL_BYTES = 100 * 1024 * 1024;
     var u16 = (b2, o) => b2[o] | b2[o + 1] << 8;
     var u32 = (b2, o) => (b2[o] | b2[o + 1] << 8 | b2[o + 2] << 16 | b2[o + 3] << 24) >>> 0;
@@ -43265,7 +43327,7 @@ var require_zipReader = __commonJS({
         throw new Error("not a zip archive (no end-of-central-directory)");
       const count = u16(bytes, eocd + 10);
       const cdOffset = u32(bytes, eocd + 16);
-      if (count > MAX_ENTRIES2)
+      if (count > MAX_ENTRIES)
         throw new Error(`zip has too many entries (${count})`);
       const out2 = [];
       let total = 0;
@@ -44617,6 +44679,58 @@ var require_types3 = __commonJS({
   }
 });
 
+// ../packages/orion-client-core/dist/attachments/pathAttachment.js
+var require_pathAttachment = __commonJS({
+  "../packages/orion-client-core/dist/attachments/pathAttachment.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.INLINE_IMAGE_MAX_BYTES = void 0;
+    exports2.attachmentBaseName = attachmentBaseName;
+    exports2.attachmentExtension = attachmentExtension;
+    exports2.shouldInlineImage = shouldInlineImage;
+    exports2.pathAttachment = pathAttachment;
+    var types_1 = require_types3();
+    function attachmentBaseName(p) {
+      const trimmed = p.replace(/[/\\]+$/, "");
+      if (!trimmed) {
+        return p;
+      }
+      const cut = Math.max(trimmed.lastIndexOf("/"), trimmed.lastIndexOf("\\"));
+      return cut === -1 ? trimmed : trimmed.slice(cut + 1);
+    }
+    function attachmentExtension(p) {
+      const base = attachmentBaseName(p);
+      const dot = base.lastIndexOf(".");
+      return dot > 0 ? base.slice(dot).toLowerCase() : "";
+    }
+    exports2.INLINE_IMAGE_MAX_BYTES = 10 * 1024 * 1024;
+    var INLINABLE_IMAGE_MIMES = /* @__PURE__ */ new Set([
+      "image/png",
+      "image/jpeg",
+      "image/gif",
+      "image/webp",
+      "image/bmp"
+    ]);
+    function shouldInlineImage(mime, sizeBytes) {
+      return INLINABLE_IMAGE_MIMES.has(mime) && sizeBytes <= exports2.INLINE_IMAGE_MAX_BYTES;
+    }
+    function pathAttachment(absPath, opts) {
+      const name2 = attachmentBaseName(absPath);
+      const videoMime = types_1.VIDEO_EXT[attachmentExtension(absPath)];
+      if (videoMime) {
+        return { kind: "video", mime: videoMime, path: absPath, name: name2, size_bytes: opts.sizeBytes };
+      }
+      return {
+        kind: "file",
+        path: absPath,
+        name: name2,
+        size_bytes: opts.sizeBytes,
+        ...opts.mime ? { mime: opts.mime } : {}
+      };
+    }
+  }
+});
+
 // ../packages/orion-client-core/dist/video/budget.js
 var require_budget = __commonJS({
   "../packages/orion-client-core/dist/video/budget.js"(exports2) {
@@ -44640,9 +44754,9 @@ var require_budget = __commonJS({
     };
     exports2.VideoArgError = VideoArgError;
     function clampFps(fps, durationSeconds, maxFrames) {
-      const clamped = Math.min(fps, exports2.MAX_FPS);
-      const target = Math.min(maxFrames, Math.max(1, Math.round(clamped * durationSeconds)));
-      return { fps: clamped, target };
+      const clamped2 = Math.min(fps, exports2.MAX_FPS);
+      const target = Math.min(maxFrames, Math.max(1, Math.round(clamped2 * durationSeconds)));
+      return { fps: clamped2, target };
     }
     function parseTime(value) {
       if (value === null || value === void 0)
@@ -46121,7 +46235,7 @@ var require_terminalOutputFilters = __commonJS({
     function compactForSummary(line, maxChars) {
       return cleanLine(line.replace(/\s+/g, " ").trim(), maxChars);
     }
-    function commandLabel2(profile) {
+    function commandLabel3(profile) {
       return profile.label || "terminal";
     }
     function header(level, label, detail) {
@@ -46430,16 +46544,16 @@ var require_terminalOutputFilters = __commonJS({
     function filterBuildOutput(input, lines) {
       const spec = SPECS[input.level];
       if (failureLikely(lines, input.exitCode)) {
-        return failureOutput(input, lines, commandLabel2(input.profile));
+        return failureOutput(input, lines, commandLabel3(input.profile));
       }
       const kept = tailMeaningful(lines.filter((line) => !isNoiseLine(line)), spec);
       if (input.level === "ultra") {
-        return `${commandLabel2(input.profile)} ok`;
+        return `${commandLabel3(input.profile)} ok`;
       }
       if (input.level === "full") {
-        return limitLines([header(input.level, commandLabel2(input.profile), "ok; noisy lines removed"), ...kept], spec);
+        return limitLines([header(input.level, commandLabel3(input.profile), "ok; noisy lines removed"), ...kept], spec);
       }
-      return limitLines([header(input.level, commandLabel2(input.profile), "ok; reduced noisy output"), ...kept], spec);
+      return limitLines([header(input.level, commandLabel3(input.profile), "ok; reduced noisy output"), ...kept], spec);
     }
     function logKey(line) {
       return line.replace(/\b\d{4}-\d{2}-\d{2}[T ][0-9:.+-]+Z?\b/g, "<time>").replace(/\b[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\b/gi, "<uuid>").replace(/\b0x[0-9a-f]+\b/gi, "<hex>").replace(/\/[\w./-]+/g, "<path>").replace(/\b\d{4,}\b/g, "<num>").replace(/\s+/g, " ").trim().toLowerCase();
@@ -48332,7 +48446,7 @@ var require_retrievalTokens = __commonJS({
     exports2.tokenizeSearchText = tokenizeSearchText;
     exports2.tokenizeContentText = tokenizeContentText;
     exports2.pathSegments = pathSegments;
-    exports2.basenameOf = basenameOf;
+    exports2.basenameOf = basenameOf2;
     exports2.stripExtension = stripExtension;
     exports2.acronymForPath = acronymForPath;
     exports2.isConfigPath = isConfigPath;
@@ -48441,7 +48555,7 @@ var require_retrievalTokens = __commonJS({
     function pathSegments(path13) {
       return path13.replace(/\\/g, "/").split("/").filter(Boolean);
     }
-    function basenameOf(path13) {
+    function basenameOf2(path13) {
       const parts2 = pathSegments(path13);
       return parts2.at(-1) ?? path13;
     }
@@ -58123,14 +58237,14 @@ var require_runtimeTrace = __commonJS({
         return redactTraceText(raw);
       }
     }
-    function clip(text, max) {
+    function clip2(text, max) {
       return text.length <= max ? text : text.slice(0, max - 1) + "\u2026";
     }
     function finish(input) {
       return {
         ...input,
-        text: clip(redactTraceText(input.text), exports2.TRACE_TEXT_MAX),
-        url: input.url ? clip(redactTraceUrl(input.url), exports2.TRACE_URL_MAX) : void 0
+        text: clip2(redactTraceText(input.text), exports2.TRACE_TEXT_MAX),
+        url: input.url ? clip2(redactTraceUrl(input.url), exports2.TRACE_URL_MAX) : void 0
       };
     }
     function traceFromConsole(type, text) {
@@ -58479,12 +58593,12 @@ var require_browserController = __commonJS({
         if (errors.length) {
           lines.push("", "Console errors:");
           for (const e of errors.slice(-MAX_CONSOLE))
-            lines.push(`  \u2022 ${clip(e.text, 300)}`);
+            lines.push(`  \u2022 ${clip2(e.text, 300)}`);
         }
         if (this.netFailures.length) {
           lines.push("", "Failed network requests:");
           for (const f of this.netFailures.slice(-MAX_NET_FAILURES))
-            lines.push(`  \u2022 ${clip(f, 300)}`);
+            lines.push(`  \u2022 ${clip2(f, 300)}`);
         }
         return lines.join("\n");
       }
@@ -58581,7 +58695,7 @@ var require_browserController = __commonJS({
     function errMsg(e) {
       return e instanceof Error ? e.message : String(e);
     }
-    function clip(s, n) {
+    function clip2(s, n) {
       return s.length > n ? s.slice(0, n) + "\u2026" : s;
     }
   }
@@ -58807,8 +58921,8 @@ var require_toolExecutor = __commonJS({
       if (closest) {
         return [
           `old_string not found in ${path14}.`,
-          `You sent (first line): ${clip(oldFirstLine, 120)}`,
-          `Closest match in file (line ${closest.lineNumber}): ${clip(closest.line, 120)}`,
+          `You sent (first line): ${clip2(oldFirstLine, 120)}`,
+          `Closest match in file (line ${closest.lineNumber}): ${clip2(closest.line, 120)}`,
           `Re-read the file with read_file to get the literal bytes, then retry edit_file.`
         ].join("\n");
       }
@@ -58900,7 +59014,7 @@ var require_toolExecutor = __commonJS({
         `Make it unique by adding more surrounding context, OR set replace_all: true to change every occurrence.`
       ].join("\n");
     }
-    function clip(s, n) {
+    function clip2(s, n) {
       return s.length > n ? s.slice(0, n) + "\u2026" : s;
     }
     function clipLines(s, maxLines) {
@@ -62085,7 +62199,7 @@ var require_capture = __commonJS({
     var HARD_WON_THRESHOLD = 2;
     var SUMMARY_MAX = 300;
     var digest = (text) => (0, crypto_1.createHash)("sha1").update(text, "utf8").digest("hex");
-    var clip = (text) => text.length <= SUMMARY_MAX ? text : text.slice(0, SUMMARY_MAX - 1) + "\u2026";
+    var clip2 = (text) => text.length <= SUMMARY_MAX ? text : text.slice(0, SUMMARY_MAX - 1) + "\u2026";
     function firstString(params, keys) {
       for (const key of keys) {
         const value = params[key];
@@ -62126,7 +62240,7 @@ var require_capture = __commonJS({
         this.thisTurnAnchors.clear();
         this.turn += 1;
         this.turnOptedOut = OPT_OUT_RE.test(text);
-        this.turnGoal = clip(text.trim());
+        this.turnGoal = clip2(text.trim());
         this.waveGroup = void 0;
         this.pendingVotes.clear();
         if (this.turnOptedOut) {
@@ -62136,7 +62250,7 @@ var require_capture = __commonJS({
         if (CORRECTION_RE.test(text.trim()) && this.lastTurnAnchors.length > 0) {
           this.push("user_correction", {
             anchors: this.lastTurnAnchors,
-            summary: clip(`user corrected the previous action: ${text.trim()}`)
+            summary: clip2(`user corrected the previous action: ${text.trim()}`)
           });
         }
       }
@@ -62154,8 +62268,8 @@ var require_capture = __commonJS({
           this.push(isTest ? "test_failure" : "tool_failure", {
             tool: req.name,
             anchors,
-            summary: clip(`${req.name} failed${isTest ? " (test run)" : ""}: ${payload.error ?? "unknown error"}`),
-            payload: { error: clip(String(payload.error ?? "")) }
+            summary: clip2(`${req.name} failed${isTest ? " (test run)" : ""}: ${payload.error ?? "unknown error"}`),
+            payload: { error: clip2(String(payload.error ?? "")) }
           });
           return;
         }
@@ -62164,7 +62278,7 @@ var require_capture = __commonJS({
           this.push("hard_won_success", {
             tool: req.name,
             anchors,
-            summary: clip(`${req.name} succeeded after ${attempts} consecutive failures`),
+            summary: clip2(`${req.name} succeeded after ${attempts} consecutive failures`),
             payload: { attempts }
           });
         }
@@ -62173,7 +62287,7 @@ var require_capture = __commonJS({
           this.push("edit_reverted", {
             tool: req.name,
             anchors: reverted.map((p) => this.relativize(p)),
-            summary: clip(`edit restored a prior state of ${reverted.map((p) => this.relativize(p)).join(", ")}`)
+            summary: clip2(`edit restored a prior state of ${reverted.map((p) => this.relativize(p)).join(", ")}`)
           });
         }
       }
@@ -62185,7 +62299,7 @@ var require_capture = __commonJS({
         this.push("permission_denial", {
           tool: req.tool_name,
           anchors,
-          summary: clip(`user denied ${req.tool_name}`)
+          summary: clip2(`user denied ${req.tool_name}`)
         });
       }
       /** The most recent lesson recall the backend reported this session (for `/o-vault popup`). */
@@ -62233,7 +62347,7 @@ var require_capture = __commonJS({
           if (!this.isCancellation(error)) {
             this.push("turn_error", {
               anchors: [...this.thisTurnAnchors],
-              summary: clip(`turn ended in error: ${error || "unknown"}`)
+              summary: clip2(`turn ended in error: ${error || "unknown"}`)
             });
           }
           this.flushTurn();
@@ -62258,7 +62372,7 @@ var require_capture = __commonJS({
           return;
         this.push("generative_candidate", {
           anchors: [...this.thisTurnAnchors],
-          summary: clip(`friction-free code-touching turn: ${this.turnGoal || "(no goal text)"}`),
+          summary: clip2(`friction-free code-touching turn: ${this.turnGoal || "(no goal text)"}`),
           payload: { goal: this.turnGoal }
         });
       }
@@ -62299,7 +62413,7 @@ var require_capture = __commonJS({
           return;
         this.appendDirect({
           kind: "sibling_outcome",
-          summary: clip(`sub-agent ${outcome.ordinal} [${outcome.type}] ${outcome.status}: ${outcome.summary || outcome.brief}`),
+          summary: clip2(`sub-agent ${outcome.ordinal} [${outcome.type}] ${outcome.status}: ${outcome.summary || outcome.brief}`),
           payload: {
             agent_id: outcome.agentId,
             ordinal: outcome.ordinal,
@@ -62313,7 +62427,7 @@ var require_capture = __commonJS({
               worktree_branch: outcome.worktree.branch,
               worktree_kept: outcome.worktree.kept === true
             } : {},
-            brief: clip(outcome.brief)
+            brief: clip2(outcome.brief)
           }
         }, outcome.team);
       }
@@ -62330,14 +62444,14 @@ var require_capture = __commonJS({
         this.appendDirect({
           kind: "vote_outcome",
           tool: "vote_and_gate_candidates",
-          summary: clip(`best-of-${vote.candidateCount} vote: ${winner ? `candidate ${winner[1]} won` : "winner unparsed"}${method ? ` (${method[1]})` : ""}`),
+          summary: clip2(`best-of-${vote.candidateCount} vote: ${winner ? `candidate ${winner[1]} won` : "winner unparsed"}${method ? ` (${method[1]})` : ""}`),
           payload: {
             candidate_count: vote.candidateCount,
             ...vote.estimatedCosts.some((c3) => c3 > 0) ? { estimated_costs: vote.estimatedCosts } : {},
             ...winner ? { winner_index: Number(winner[1]) } : {},
             ...key ? { winner_key_hash: key[1] } : {},
             ...method ? { method: method[1] } : {},
-            ...distribution ? { distribution_raw: clip(distribution[1]) } : {}
+            ...distribution ? { distribution_raw: clip2(distribution[1]) } : {}
           }
         });
       }
@@ -64516,7 +64630,7 @@ var require_flow = __commonJS({
     function planWaves(plan) {
       const byId = new Map(plan.phases.map((phase) => [phase.id, phase]));
       const depth = /* @__PURE__ */ new Map();
-      const depthOf = (id, visiting) => {
+      const depthOf2 = (id, visiting) => {
         const cached = depth.get(id);
         if (cached !== void 0)
           return cached;
@@ -64528,7 +64642,7 @@ var require_flow = __commonJS({
         for (const need of phase.needs ?? []) {
           if (!byId.has(need))
             continue;
-          deepest = Math.max(deepest, depthOf(need, visiting) + 1);
+          deepest = Math.max(deepest, depthOf2(need, visiting) + 1);
         }
         visiting.delete(id);
         depth.set(id, deepest);
@@ -64536,7 +64650,7 @@ var require_flow = __commonJS({
       };
       const waves = [];
       for (const phase of plan.phases) {
-        const level = depthOf(phase.id, /* @__PURE__ */ new Set());
+        const level = depthOf2(phase.id, /* @__PURE__ */ new Set());
         (waves[level] ??= []).push(phase);
       }
       return waves.map((phases, index) => ({ index: index + 1, phases: phases ?? [] })).filter((wave) => wave.phases.length > 0);
@@ -66910,6 +67024,7 @@ var require_dist = __commonJS({
     __exportStar(require_shims(), exports2);
     __exportStar(require_protocol(), exports2);
     __exportStar(require_askAnswers(), exports2);
+    __exportStar(require_fileMentions(), exports2);
     __exportStar(require_trustFindings(), exports2);
     __exportStar(require_compactionCard(), exports2);
     __exportStar(require_inputGuardCard(), exports2);
@@ -66975,6 +67090,7 @@ var require_dist = __commonJS({
     __exportStar(require_bashFileChanges(), exports2);
     __exportStar(require_multimodalRead(), exports2);
     __exportStar(require_toolText(), exports2);
+    __exportStar(require_pathAttachment(), exports2);
     __exportStar(require_types3(), exports2);
     __exportStar(require_budget(), exports2);
     __exportStar(require_transcript(), exports2);
@@ -67930,6 +68046,51 @@ var require_subagentRow = __commonJS({
   }
 });
 
+// ../packages/orion-client-ui-core/dist/steerRow.js
+var require_steerRow = __commonJS({
+  "../packages/orion-client-ui-core/dist/steerRow.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.MACHINE_STEER_CAP = void 0;
+    exports2.isEditableSteer = isEditableSteer2;
+    exports2.mergeIntoDraft = mergeIntoDraft2;
+    exports2.capMachineRows = capMachineRows2;
+    function isEditableSteer2(row) {
+      return (row.origin ?? "user") === "user";
+    }
+    function mergeIntoDraft2(restored, draft) {
+      const kept = restored.filter((text2) => text2.trim().length > 0);
+      if (kept.length === 0)
+        return null;
+      const prefix = kept.join("\n");
+      const hasDraft = draft.text.length > 0;
+      const text = hasDraft ? `${prefix}
+${draft.text}` : prefix;
+      const cursor = hasDraft ? prefix.length + 1 + draft.cursor : prefix.length;
+      return { text, cursor: Math.min(Math.max(0, cursor), text.length) };
+    }
+    exports2.MACHINE_STEER_CAP = 3;
+    function capMachineRows2(rows) {
+      const shown = [];
+      let machineShown = 0;
+      let hidden = 0;
+      for (const row of rows) {
+        if (isEditableSteer2(row)) {
+          shown.push(row);
+          continue;
+        }
+        if (machineShown < exports2.MACHINE_STEER_CAP) {
+          machineShown += 1;
+          shown.push(row);
+          continue;
+        }
+        hidden += 1;
+      }
+      return { shown, hidden };
+    }
+  }
+});
+
 // ../packages/orion-client-ui-core/dist/index.js
 var require_dist2 = __commonJS({
   "../packages/orion-client-ui-core/dist/index.js"(exports2) {
@@ -67963,6 +68124,7 @@ var require_dist2 = __commonJS({
     __exportStar(require_toolLabel(), exports2);
     __exportStar(require_toolVisibility(), exports2);
     __exportStar(require_subagentRow(), exports2);
+    __exportStar(require_steerRow(), exports2);
     var client_core_1 = require_dist();
     Object.defineProperty(exports2, "parseTrust", { enumerable: true, get: function() {
       return client_core_1.parseTrust;
@@ -71347,10 +71509,10 @@ function resolveFlexibleLengths(children, availableInnerMain, totalFlexBasis, is
   const initialFree = isDefined(availableInnerMain) ? availableInnerMain - totalFlexBasis : 0;
   for (let i2 = 0; i2 < n; i2++) {
     const c3 = children[i2];
-    const clamped = boundAxis(c3.style, isMainRow, c3._flexBasis, ownerW, ownerH);
+    const clamped2 = boundAxis(c3.style, isMainRow, c3._flexBasis, ownerW, ownerH);
     const inflexible = !isDefined(availableInnerMain) || (initialFree >= 0 ? c3.style.flexGrow === 0 : c3.style.flexShrink === 0);
     if (inflexible) {
-      c3._mainSize = Math.max(0, clamped);
+      c3._mainSize = Math.max(0, clamped2);
       frozen[i2] = true;
     } else {
       c3._mainSize = c3._flexBasis;
@@ -71398,12 +71560,12 @@ function resolveFlexibleLengths(children, availableInnerMain, totalFlexBasis, is
         t += remaining * (c3.style.flexShrink * c3._flexBasis) / totalShrinkScaled;
       }
       unclamped[i2] = t;
-      const clamped = Math.max(
+      const clamped2 = Math.max(
         0,
         boundAxis(c3.style, isMainRow, t, ownerW, ownerH)
       );
-      c3._mainSize = clamped;
-      totalViolation += clamped - t;
+      c3._mainSize = clamped2;
+      totalViolation += clamped2 - t;
     }
     if (totalViolation === 0) break;
     let anyFrozen = false;
@@ -80687,10 +80849,10 @@ var Output = class {
       softWrap
     });
   }
-  clip(clip) {
+  clip(clip2) {
     this.operations.push({
       type: "clip",
-      clip
+      clip: clip2
     });
   }
   unclip() {
@@ -80741,20 +80903,20 @@ var Output = class {
             width: regionWidth,
             height: regionHeight
           } = operation;
-          const clip = clips.at(-1);
-          const startX = Math.max(regionX, clip?.x1 ?? 0);
-          const startY = Math.max(regionY, clip?.y1 ?? 0);
+          const clip2 = clips.at(-1);
+          const startX = Math.max(regionX, clip2?.x1 ?? 0);
+          const startY = Math.max(regionY, clip2?.y1 ?? 0);
           const maxY = Math.min(
             regionY + regionHeight,
             screenHeight,
             src.height,
-            clip?.y2 ?? Infinity
+            clip2?.y2 ?? Infinity
           );
           const maxX = Math.min(
             regionX + regionWidth,
             screenWidth,
             src.width,
-            clip?.x2 ?? Infinity
+            clip2?.x2 ?? Infinity
           );
           if (startX >= maxX || startY >= maxY) continue;
           if (absoluteClears.length === 0) {
@@ -80787,48 +80949,48 @@ var Output = class {
           let lines = text.split("\n");
           let swFrom = 0;
           let prevContentEnd = 0;
-          const clip = clips.at(-1);
-          if (clip) {
-            const clipHorizontally = typeof clip?.x1 === "number" && typeof clip?.x2 === "number";
-            const clipVertically = typeof clip?.y1 === "number" && typeof clip?.y2 === "number";
+          const clip2 = clips.at(-1);
+          if (clip2) {
+            const clipHorizontally = typeof clip2?.x1 === "number" && typeof clip2?.x2 === "number";
+            const clipVertically = typeof clip2?.y1 === "number" && typeof clip2?.y2 === "number";
             if (clipHorizontally) {
               const width = widestLine(text);
-              if (x2 + width <= clip.x1 || x2 >= clip.x2) {
+              if (x2 + width <= clip2.x1 || x2 >= clip2.x2) {
                 continue;
               }
             }
             if (clipVertically) {
               const height = lines.length;
-              if (y2 + height <= clip.y1 || y2 >= clip.y2) {
+              if (y2 + height <= clip2.y1 || y2 >= clip2.y2) {
                 continue;
               }
             }
             if (clipHorizontally) {
               lines = lines.map((line) => {
-                const from = x2 < clip.x1 ? clip.x1 - x2 : 0;
+                const from = x2 < clip2.x1 ? clip2.x1 - x2 : 0;
                 const width = stringWidth(line);
-                const to = x2 + width > clip.x2 ? clip.x2 - x2 : width;
+                const to = x2 + width > clip2.x2 ? clip2.x2 - x2 : width;
                 let sliced = sliceAnsi(line, from, to);
                 if (stringWidth(sliced) > to - from) {
                   sliced = sliceAnsi(line, from, to - 1);
                 }
                 return sliced;
               });
-              if (x2 < clip.x1) {
-                x2 = clip.x1;
+              if (x2 < clip2.x1) {
+                x2 = clip2.x1;
               }
             }
             if (clipVertically) {
-              const from = y2 < clip.y1 ? clip.y1 - y2 : 0;
+              const from = y2 < clip2.y1 ? clip2.y1 - y2 : 0;
               const height = lines.length;
-              const to = y2 + height > clip.y2 ? clip.y2 - y2 : height;
+              const to = y2 + height > clip2.y2 ? clip2.y2 - y2 : height;
               if (softWrap && from > 0 && softWrap[from] === true) {
                 prevContentEnd = x2 + stringWidth(lines[from - 1]);
               }
               lines = lines.slice(from, to);
               swFrom = from;
-              if (y2 < clip.y1) {
-                y2 = clip.y1;
+              if (y2 < clip2.y1) {
+                y2 = clip2.y1;
               }
             }
           }
@@ -81566,11 +81728,11 @@ function renderNodeToOutput(node, output, {
           node.pendingScrollDelta = void 0;
         }
         let scrollTop = Math.max(0, Math.min(cur, maxScroll));
-        const clamped = haveClamp ? Math.max(cMin, Math.min(scrollTop, cMax)) : scrollTop;
+        const clamped2 = haveClamp ? Math.max(cMin, Math.min(scrollTop, cMax)) : scrollTop;
         node.scrollTop = scrollTop;
         if (scrollTop !== cur) node.pendingScrollDelta = void 0;
         if (node.pendingScrollDelta !== void 0) scrollDrainNode = node;
-        scrollTop = clamped;
+        scrollTop = clamped2;
         if (content && contentYoga) {
           const contentX = x2 + contentYoga.getComputedLeft();
           const contentY = y2 + contentYoga.getComputedTop() - scrollTop;
@@ -83528,8 +83690,8 @@ var Box2 = Box_default;
 var ScrollBox2 = ScrollBox_default;
 
 // src/main.tsx
-var import_client_core40 = __toESM(require_dist(), 1);
-var import_client_core41 = __toESM(require_dist(), 1);
+var import_client_core42 = __toESM(require_dist(), 1);
+var import_client_core43 = __toESM(require_dist(), 1);
 import { fileURLToPath as fileURLToPath3 } from "url";
 import * as os7 from "os";
 import { randomUUID as randomUUID3 } from "crypto";
@@ -84734,6 +84896,13 @@ async function readClipboardImage() {
 
 // src/commands/registry.ts
 var bare = (name2) => name2.replace(/^\//, "");
+var SOURCE_ORDER = {
+  builtin: 0,
+  skill: 1,
+  plugin: 2,
+  mcp: 3
+};
+var sourceRank = (cmd) => SOURCE_ORDER[cmd.source ?? "builtin"];
 var CommandRegistry = class {
   byName = /* @__PURE__ */ new Map();
   register(cmd) {
@@ -84786,7 +84955,9 @@ var CommandRegistry = class {
    *  `/exit` finds quit). Deduped to the canonical command. Ranked by HOW the
    *  match happened — name matches before alias matches before keyword-only
    *  matches (so typing "model" puts /model first and the keyword-related
-   *  /endpoint after it), alphabetical within a rank. */
+   *  /endpoint after it), then by catalog (SOURCE_ORDER — builtins lead), then
+   *  alphabetical. A bare "/" matches everything at rank 0, so the catalog key
+   *  is what groups that menu instead of leaving one flat alphabetical run. */
   complete(input) {
     if (!input.startsWith("/")) return [];
     const head = input.slice(1);
@@ -84798,7 +84969,9 @@ var CommandRegistry = class {
       if ((c3.keywords ?? []).some((k) => k.toLowerCase().startsWith(partial))) return 2;
       return -1;
     };
-    return this.all().filter((c3) => rank(c3) >= 0).sort((a, b2) => rank(a) - rank(b2) || a.name.localeCompare(b2.name));
+    return this.all().filter((c3) => rank(c3) >= 0).sort(
+      (a, b2) => rank(a) - rank(b2) || sourceRank(a) - sourceRank(b2) || a.name.localeCompare(b2.name)
+    );
   }
 };
 
@@ -84960,13 +85133,13 @@ function initialTranscript() {
   };
 }
 function evictSettled(s, count) {
-  const clamped = Math.min(
+  const clamped2 = Math.min(
     Math.max(s.evictedCount, Math.floor(count)),
     s.committedCount,
     s.settled.length
   );
-  if (clamped === s.evictedCount) return s;
-  return { ...s, evictedCount: clamped };
+  if (clamped2 === s.evictedCount) return s;
+  return { ...s, evictedCount: clamped2 };
 }
 function flushAssistant(s) {
   if (s.live && s.live.assistantText.trim().length > 0) {
@@ -88109,6 +88282,20 @@ function toWireAttachments(pending) {
 }
 var queuedSteer = (text, display) => display === void 0 ? { text, kind: "steer" } : { text, kind: "steer", display };
 var queuedCommand = (text) => ({ text, kind: "command" });
+var machineSteer = (text, display) => display === void 0 ? { text, kind: "steer", origin: "machine" } : { text, kind: "steer", display, origin: "machine" };
+var machineCommand = (text) => ({
+  text,
+  kind: "command",
+  origin: "machine"
+});
+function clearParkedForStop(s) {
+  return {
+    pendingPermissions: s.pendingPermissions.filter((p) => p.agentLabel),
+    pendingPlanApproval: null,
+    pendingAskUser: null,
+    pendingWorkPlan: null
+  };
+}
 function initialAppState(partial) {
   return {
     provider: "openai",
@@ -88804,13 +88991,7 @@ function drainSteersForSegment(app, transcript) {
   );
   return steers.map((q2) => q2.text);
 }
-function settleSteerQueue(outcome, deps2) {
-  if (outcome === "cancelled") {
-    if (deps2.app.getState().queuedMessages.length > 0) {
-      deps2.app.setState((s) => ({ ...s, queuedMessages: [] }));
-    }
-    return;
-  }
+function settleSteerQueue(deps2) {
   setTimeout(() => {
     void (async () => {
       if (deps2.isBusy()) return;
@@ -88829,10 +89010,7 @@ function settleSteerQueue(outcome, deps2) {
       if (deps2.isBusy()) return;
       const leftovers = deps2.app.getState().queuedMessages.filter((q2) => q2.kind === "steer");
       if (leftovers.length === 0) return;
-      const prompt = (0, import_client_core20.promoteLeftoverSteers)(
-        outcome,
-        leftovers.map((q2) => q2.text)
-      );
+      const prompt = (0, import_client_core20.promoteLeftoverSteers)(leftovers.map((q2) => q2.text));
       deps2.app.setState((s) => ({
         ...s,
         queuedMessages: s.queuedMessages.filter((q2) => q2.kind !== "steer")
@@ -89328,7 +89506,7 @@ var WorkPlanApprovalBridge = class {
 };
 
 // src/main.tsx
-var import_client_ui_core19 = __toESM(require_dist2(), 1);
+var import_client_ui_core20 = __toESM(require_dist2(), 1);
 
 // src/components/layout/Transcript.tsx
 var import_react27 = __toESM(require_react(), 1);
@@ -89338,13 +89516,25 @@ var import_react23 = __toESM(require_react(), 1);
 
 // src/components/messages/UserText.tsx
 var import_jsx_runtime16 = __toESM(require_jsx_runtime(), 1);
-function UserText({ text }) {
+function UserText({
+  text,
+  pending = false
+}) {
   const theme = useTheme();
-  return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Box2, { marginTop: 1, flexDirection: "row", paddingRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Box2, { flexGrow: 1, flexShrink: 1, children: /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(Text2, { backgroundColor: theme.userBg, color: theme.user, bold: true, wrap: "wrap", children: [
-    glyphs.user,
-    " ",
-    text
-  ] }) }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Box2, { marginTop: 1, flexDirection: "row", paddingRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Box2, { flexGrow: 1, flexShrink: 1, children: /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(
+    Text2,
+    {
+      backgroundColor: pending ? void 0 : theme.userBg,
+      color: pending ? theme.dim : theme.user,
+      bold: !pending,
+      wrap: "wrap",
+      children: [
+        glyphs.user,
+        " ",
+        text
+      ]
+    }
+  ) }) });
 }
 
 // src/components/messages/UserCommand.tsx
@@ -105670,7 +105860,7 @@ function OrionRing() {
 
 // src/services/version.ts
 function tuiVersion() {
-  return "0.1.18".length > 0 ? "0.1.18" : null;
+  return "0.1.19".length > 0 ? "0.1.19" : null;
 }
 
 // src/components/layout/WelcomeCard.tsx
@@ -105944,6 +106134,9 @@ function Transcript({
   ] });
 }
 
+// src/components/layout/ReplFooter.tsx
+var import_react45 = __toESM(require_react(), 1);
+
 // src/components/tools/PlanCard.tsx
 var import_react28 = __toESM(require_react(), 1);
 var import_jsx_runtime41 = __toESM(require_jsx_runtime(), 1);
@@ -106071,56 +106264,197 @@ function segmentSlice(text, offset, ranges) {
 }
 
 // src/components/input/Autocomplete.tsx
+var import_string_width4 = __toESM(require_string_width(), 1);
 var import_jsx_runtime43 = __toESM(require_jsx_runtime(), 1);
-var MAX_VISIBLE2 = 6;
+var MAX_VISIBLE2 = 20;
+var ROWS_RESERVED = 8;
+var INDENT2 = 2;
+var MARKER_WIDTH = 2;
+var NAME_GAP = 2;
+var MIN_NAME_WIDTH = 8;
+var MIN_DESC_WRAP = 12;
+var MIN_DESC_CLIP = 8;
+var MIN_DESC_WIDTH = 20;
+var TAG_GAP = 2;
+var KEY_HINTS = "\u2191/\u2193 select \xB7 tab/enter complete \xB7 esc dismiss";
+var KEY_HINTS_TERSE = "\u2191/\u2193 \xB7 tab \xB7 esc";
+function commandLabel(item) {
+  return `/${item.name}`;
+}
+function sourceTag(source2) {
+  return !source2 || source2 === "builtin" ? "" : source2;
+}
+function clip(text, width) {
+  if (width <= 0) return "";
+  if ((0, import_string_width4.default)(text) <= width) return text;
+  let out2 = "";
+  let used = 0;
+  for (const ch of text) {
+    const w2 = (0, import_string_width4.default)(ch);
+    if (used + w2 > width - 1) break;
+    out2 += ch;
+    used += w2;
+  }
+  return `${out2}\u2026`;
+}
+var padEnd = (text, width) => text + " ".repeat(Math.max(0, width - (0, import_string_width4.default)(text)));
+var padStart = (text, width) => " ".repeat(Math.max(0, width - (0, import_string_width4.default)(text))) + text;
+var join10 = (a, b2) => a !== "" && b2 !== "" ? `${a} \xB7 ${b2}` : a || b2;
+function wrapCells(text, width) {
+  const words = text.split(/\s+/).filter(Boolean);
+  if (width <= 0 || words.length === 0) return [text];
+  const lines = [];
+  let line = "";
+  for (const word of words) {
+    const candidate = line === "" ? word : `${line} ${word}`;
+    if ((0, import_string_width4.default)(candidate) <= width) {
+      line = candidate;
+      continue;
+    }
+    if (line !== "") {
+      lines.push(line);
+      line = "";
+    }
+    let rest = word;
+    while ((0, import_string_width4.default)(rest) > width) {
+      let take = "";
+      let used = 0;
+      for (const ch of rest) {
+        const w2 = (0, import_string_width4.default)(ch);
+        if (used + w2 > width) break;
+        take += ch;
+        used += w2;
+      }
+      if (take === "") break;
+      lines.push(take);
+      rest = rest.slice(take.length);
+    }
+    line = rest;
+  }
+  if (line !== "") lines.push(line);
+  return lines.length > 0 ? lines : [""];
+}
+function menuLayout(items, columns) {
+  const avail = Math.max(0, columns - INDENT2 - MARKER_WIDTH);
+  const longest = items.reduce((w2, item) => Math.max(w2, (0, import_string_width4.default)(commandLabel(item))), 0);
+  const nameWidth = Math.min(
+    longest + NAME_GAP,
+    Math.max(MIN_NAME_WIDTH, avail - MIN_DESC_WRAP)
+  );
+  const tags = items.map((item) => sourceTag(item.source)).filter((tag) => tag.length > 0);
+  const wanted = tags.length > 0 ? Math.max(...tags.map((tag) => (0, import_string_width4.default)(tag))) + TAG_GAP : 0;
+  const room = Math.max(0, avail - nameWidth);
+  const tagWidth = wanted > 0 && room - wanted >= MIN_DESC_WIDTH ? wanted : 0;
+  const descWidth = Math.max(1, room - tagWidth);
+  return { nameWidth, descWidth, tagWidth, wraps: descWidth >= MIN_DESC_CLIP };
+}
+function layoutItem(item, layout) {
+  const { nameWidth, descWidth, tagWidth, wraps } = layout;
+  const name2 = padEnd(clip(commandLabel(item), nameWidth - NAME_GAP), nameWidth);
+  const tag = sourceTag(item.source);
+  const tagged = tagWidth > 0 && tag.length > 0;
+  const body2 = wraps ? wrapCells(item.description, descWidth) : [clip(item.description, descWidth)];
+  return body2.map((text, i2) => ({
+    // Continuation lines hang under the description column, so a wrapped
+    // command still reads as one block against the command column's edge.
+    name: i2 === 0 ? name2 : " ".repeat(nameWidth),
+    description: i2 === 0 && tagged ? padEnd(text, descWidth) : text,
+    tag: i2 === 0 && tagged ? padStart(tag, tagWidth) : ""
+  }));
+}
+function menuWindow(total, heightAt, selected, maxItems, maxRows) {
+  if (total === 0) return { start: 0, end: 0 };
+  const sel = Math.max(0, Math.min(selected, total - 1));
+  let start2 = sel;
+  let end = sel + 1;
+  let used = heightAt(sel);
+  let count = 1;
+  let forward = true;
+  while (count < maxItems) {
+    const fits = (i2) => i2 >= 0 && i2 < total && used + heightAt(i2) <= maxRows;
+    const forwardOk = fits(end);
+    const backOk = fits(start2 - 1);
+    if (!forwardOk && !backOk) break;
+    if (forward ? forwardOk : !backOk) {
+      used += heightAt(end);
+      end += 1;
+    } else {
+      start2 -= 1;
+      used += heightAt(start2);
+    }
+    count += 1;
+    forward = !forward;
+  }
+  return { start: start2, end };
+}
+function MenuLine({
+  line,
+  first,
+  selected
+}) {
+  const marker = selected && first ? "\u276F " : "  ";
+  if (selected) {
+    return /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(GradientText, { text: `${marker}${line.name}${line.description}${line.tag}`, wrap: "truncate" });
+  }
+  return /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Text2, { wrap: "truncate", children: [
+    marker,
+    /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(ThemedText, { children: line.name }),
+    /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(ThemedText, { dim: true, children: line.description }),
+    line.tag ? /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(ThemedText, { dim: true, children: line.tag }) : null
+  ] });
+}
 function Autocomplete({
   suggestions,
   selectedIndex = 0
 }) {
+  const { columns, rows } = useTerminalSize();
   if (suggestions.length === 0) return null;
   const sel = Math.max(0, Math.min(selectedIndex, suggestions.length - 1));
-  const start2 = Math.max(0, Math.min(sel - Math.floor(MAX_VISIBLE2 / 2), suggestions.length - MAX_VISIBLE2));
-  const end = Math.min(start2 + MAX_VISIBLE2, suggestions.length);
-  return /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Box2, { flexDirection: "column", marginLeft: 2, children: [
-    start2 > 0 ? /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(ThemedText, { dim: true, children: [
-      "\u2191 ",
-      start2,
-      " more"
-    ] }) : null,
-    suggestions.slice(start2, end).map((s, vi) => {
-      const on = start2 + vi === sel;
-      if (on) {
-        const hint = s.argumentHint ? ` ${s.argumentHint}` : "";
-        return /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Box2, { flexDirection: "row", children: /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Box2, { flexGrow: 1, flexShrink: 1, children: /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(GradientText, { text: `\u276F /${s.name}${hint} \u2014 ${s.description}`, wrap: "truncate-end" }) }) }, s.name);
-      }
-      return /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Box2, { flexDirection: "row", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(ThemedText, { children: [
-          "  ",
-          "/",
-          s.name
-        ] }),
-        s.argumentHint ? /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(ThemedText, { dim: true, children: [
-          "\xA0",
-          s.argumentHint
-        ] }) : null,
-        /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Box2, { flexGrow: 1, flexShrink: 1, children: /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(ThemedText, { dim: true, wrap: "truncate-end", children: [
-          "\xA0\u2014 ",
-          s.description
-        ] }) })
-      ] }, s.name);
+  const layout = menuLayout(suggestions, columns);
+  const laid = /* @__PURE__ */ new Map();
+  const linesAt = (index) => {
+    let lines = laid.get(index);
+    if (lines === void 0) {
+      lines = layoutItem(suggestions[index], layout);
+      laid.set(index, lines);
+    }
+    return lines;
+  };
+  const budget = Math.max(1, rows - ROWS_RESERVED);
+  const { start: start2, end } = menuWindow(
+    suggestions.length,
+    (index) => linesAt(index).length,
+    sel,
+    MAX_VISIBLE2,
+    budget
+  );
+  const width = Math.max(1, columns - INDENT2);
+  const current2 = suggestions[sel];
+  const clipped = current2 !== void 0 && (0, import_string_width4.default)(commandLabel(current2)) > layout.nameWidth - NAME_GAP;
+  const signature = current2 && (current2.argumentHint || clipped) ? `${commandLabel(current2)}${current2.argumentHint ? ` ${current2.argumentHint}` : ""}` : "";
+  const position = end - start2 < suggestions.length ? `${sel + 1}/${suggestions.length}` : "";
+  const showSignature = signature !== "" && (0, import_string_width4.default)(signature) <= width;
+  const room = width - (showSignature ? (0, import_string_width4.default)(signature) + TAG_GAP : 0);
+  const hints = [join10(position, KEY_HINTS), join10(position, KEY_HINTS_TERSE), position, ""].find(
+    (candidate) => (0, import_string_width4.default)(candidate) <= room
+  ) ?? "";
+  return /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Box2, { flexDirection: "column", marginLeft: INDENT2, width, children: [
+    Array.from({ length: end - start2 }, (_2, i2) => start2 + i2).flatMap((index) => {
+      const item = suggestions[index];
+      const key = `${item.source ?? "builtin"}/${item.name}`;
+      return linesAt(index).map((line, row) => /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(MenuLine, { line, first: row === 0, selected: index === sel }, `${key}#${row}`));
     }),
-    end < suggestions.length ? /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(ThemedText, { dim: true, children: [
-      "\u2193 ",
-      suggestions.length - end,
-      " more"
-    ] }) : null,
-    /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(ThemedText, { dim: true, children: "\xA0\xA0\u2191/\u2193 select \xB7 tab/enter complete \xB7 esc dismiss" })
+    /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Box2, { flexDirection: "row", justifyContent: showSignature ? "space-between" : "flex-end", children: [
+      showSignature ? /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(ThemedText, { dim: true, wrap: "truncate", children: signature }) : null,
+      /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(ThemedText, { dim: true, wrap: "truncate", children: hints })
+    ] })
   ] });
 }
 
 // src/components/input/ContextSuggestions.tsx
+var import_client_core25 = __toESM(require_dist(), 1);
 var import_jsx_runtime44 = __toESM(require_jsx_runtime(), 1);
-var MAX_VISIBLE3 = 8;
+var MAX_VISIBLE3 = 12;
 function ContextSuggestions({
   files,
   selectedIndex = 0
@@ -106141,8 +106475,7 @@ function ContextSuggestions({
         // Unselected rows stay muted (menu chrome, not content) — `dim`, not a
         // tool color: tool text is primary-white, menus are not.
         /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(ThemedText, { colorKey: on ? "accent" : void 0, dim: !on, bold: on, children: [
-          on ? "\u276F " : "  ",
-          "@",
+          "+ ",
           f
         ] }, f)
       );
@@ -106154,14 +106487,8 @@ function ContextSuggestions({
     ] }) : null
   ] });
 }
-function tokenAtCursor(value, cursor) {
-  let start2 = cursor;
-  while (start2 > 0 && !/\s/.test(value[start2 - 1])) start2--;
-  return { start: start2, token: value.slice(start2, cursor) };
-}
 function mentionPrefix(value, cursor) {
-  const { token } = tokenAtCursor(value, cursor);
-  return token.startsWith("@") ? token.slice(1) : null;
+  return (0, import_client_core25.findFileMentionQuery)(value, cursor)?.query ?? null;
 }
 
 // src/services/posture.ts
@@ -106227,6 +106554,71 @@ function createWheelAccel(opts = {}) {
   };
 }
 
+// src/services/promptHistory.ts
+var EMPTY_DRAFT = Object.freeze({ text: "", caret: 0 });
+var NOT_RECALLING = Object.freeze({ index: null, parked: EMPTY_DRAFT });
+var HISTORY_LIMIT = 500;
+function atEnd(text) {
+  return { text, caret: text.length };
+}
+function clamped(draft) {
+  const caret = Math.min(Math.max(0, draft.caret), draft.text.length);
+  return caret === draft.caret ? draft : { text: draft.text, caret };
+}
+function moveCaretVertically(draft, dir) {
+  const { text, caret } = draft;
+  const lineStart2 = text.lastIndexOf("\n", caret - 1) + 1;
+  const column = caret - lineStart2;
+  if (dir === -1) {
+    if (lineStart2 === 0) return null;
+    const prevStart = text.lastIndexOf("\n", lineStart2 - 2) + 1;
+    const prevLength = lineStart2 - 1 - prevStart;
+    return prevStart + Math.min(column, prevLength);
+  }
+  const lineEnd2 = text.indexOf("\n", caret);
+  if (lineEnd2 === -1) return null;
+  const nextStart = lineEnd2 + 1;
+  let nextEnd = text.indexOf("\n", nextStart);
+  if (nextEnd === -1) nextEnd = text.length;
+  return nextStart + Math.min(column, nextEnd - nextStart);
+}
+function arrowUp(draft, entries, state) {
+  const caret = moveCaretVertically(draft, -1);
+  if (caret !== null) return { kind: "caret", caret };
+  if (entries.length === 0) return null;
+  const starting = state.index === null;
+  const index = starting ? 0 : Math.min(entries.length - 1, state.index + 1);
+  return {
+    kind: "recall",
+    // Park on the way out, and only on the way out — every later step keeps the
+    // draft the walk originally left behind.
+    state: { index, parked: starting ? draft : state.parked },
+    draft: atEnd(entries[index] ?? "")
+  };
+}
+function arrowDown(draft, entries, state) {
+  const caret = moveCaretVertically(draft, 1);
+  if (caret !== null) return { kind: "caret", caret };
+  if (state.index === null) return null;
+  const index = state.index - 1;
+  if (index < 0) {
+    return { kind: "recall", state: NOT_RECALLING, draft: clamped(state.parked) };
+  }
+  return {
+    kind: "recall",
+    state: { index, parked: state.parked },
+    draft: atEnd(entries[index] ?? "")
+  };
+}
+function pushEntry(entries, text, limit = HISTORY_LIMIT) {
+  if (text.trim().length === 0) return entries;
+  if (entries[0] === text) return entries;
+  return [text, ...entries].slice(0, Math.max(1, limit));
+}
+
+// src/components/input/PromptInput.tsx
+var import_client_core26 = __toESM(require_dist(), 1);
+
 // src/keybindings/match.ts
 function matchKeypress(input, key) {
   let k = "";
@@ -106615,26 +107007,11 @@ var RAIL_BORDER = {
   bottom: " ",
   bottomRight: "\u2590"
 };
-function moveVertical2(value, cursor, dir) {
-  const lineStart2 = value.lastIndexOf("\n", cursor - 1) + 1;
-  const col = cursor - lineStart2;
-  if (dir === -1) {
-    if (lineStart2 === 0) return null;
-    const prevStart = value.lastIndexOf("\n", lineStart2 - 2) + 1;
-    const prevLen = lineStart2 - 1 - prevStart;
-    return prevStart + Math.min(col, prevLen);
-  }
-  const lineEnd2 = value.indexOf("\n", cursor);
-  if (lineEnd2 === -1) return null;
-  const nextStart = lineEnd2 + 1;
-  let nextEnd = value.indexOf("\n", nextStart);
-  if (nextEnd === -1) nextEnd = value.length;
-  return nextStart + Math.min(col, nextEnd - nextStart);
-}
 var SLASH_TOKEN_COLOR = "#89CFF0";
 function PromptInput({
   indexBadge,
   onIndexBadgeActivate,
+  onQueuePop,
   onSubmit,
   onInterrupt,
   onExit: onExit2,
@@ -106652,13 +107029,15 @@ function PromptInput({
   onPasteImage,
   onToggleVerbose,
   onCycleMode,
+  onMenuOpenChange,
   mode,
   permissionMode
 }) {
   const [value, setValue2] = (0, import_react30.useState)("");
   const [cursor, setCursor] = (0, import_react30.useState)(0);
-  const [history, setHistory] = (0, import_react30.useState)(() => initialHistory ?? []);
-  const [histPos, setHistPos] = (0, import_react30.useState)(null);
+  const [history, setHistory] = (0, import_react30.useState)(
+    () => (initialHistory ?? []).slice(0, HISTORY_LIMIT)
+  );
   const [vimState, setVimState] = (0, import_react30.useState)(() => initialVimState("insert"));
   const [menuIdx, setMenuIdx] = (0, import_react30.useState)(0);
   const [menuDismissed, setMenuDismissed] = (0, import_react30.useState)(false);
@@ -106674,6 +107053,7 @@ function PromptInput({
   const cursorRef = (0, import_react30.useRef)(cursor);
   cursorRef.current = cursor;
   const pasteLedger = (0, import_react30.useRef)({ nextId: 1, texts: /* @__PURE__ */ new Map() });
+  const recall = (0, import_react30.useRef)(NOT_RECALLING);
   const wheelRef = (0, import_react30.useRef)(createWheelAccel());
   const flashTimer = (0, import_react30.useRef)(null);
   const firstPosture = (0, import_react30.useRef)(true);
@@ -106694,6 +107074,7 @@ function PromptInput({
       if (flashTimer.current) clearTimeout(flashTimer.current);
     };
   }, [mode, permissionMode]);
+  const pickedMentions = (0, import_react30.useRef)(/* @__PURE__ */ new Set());
   const suggestionsFor = (v2) => v2.startsWith("/") && !v2.includes(" ") ? getCompletions?.(v2) ?? [] : [];
   const suggestions = suggestionsFor(value);
   const mPfx = mentionPrefix(value, cursor);
@@ -106701,6 +107082,17 @@ function PromptInput({
   const menuFiles = fileSuggestions.length > 0;
   const menuLen = menuFiles ? fileSuggestions.length : suggestions.length;
   const menuOpen = !menuDismissed && menuLen > 0 && (!vim || vimState.mode === "insert");
+  const notifyMenuRef = (0, import_react30.useRef)(onMenuOpenChange);
+  notifyMenuRef.current = onMenuOpenChange;
+  (0, import_react30.useEffect)(() => {
+    notifyMenuRef.current?.(menuOpen);
+  }, [menuOpen]);
+  (0, import_react30.useEffect)(() => () => notifyMenuRef.current?.(false), []);
+  (0, import_react30.useEffect)(() => {
+    for (const path13 of pickedMentions.current) {
+      if (!value.includes(`${import_client_core26.FILE_MENTION_LEADER}${path13}`)) pickedMentions.current.delete(path13);
+    }
+  }, [value]);
   (0, import_react30.useEffect)(() => {
     setMenuIdx(0);
     setMenuDismissed(false);
@@ -106712,7 +107104,7 @@ function PromptInput({
     const c3 = cursorRef.current;
     setValue2(v2.slice(0, c3) + text + v2.slice(c3));
     setCursor(c3 + text.length);
-    setHistPos(null);
+    recall.current = NOT_RECALLING;
   };
   const requestImagePaste = () => {
     if (!onPasteImage) return;
@@ -106730,10 +107122,12 @@ function PromptInput({
   const completeMenu = (idx) => {
     if (menuFiles) {
       const pick = fileSuggestions[Math.min(idx, fileSuggestions.length - 1)];
-      const { start: start2 } = tokenAtCursor(value, cursor);
-      const completed = `@${pick} `;
-      setValue2(value.slice(0, start2) + completed + value.slice(cursor));
-      setCursor(start2 + completed.length);
+      const at2 = (0, import_client_core26.findFileMentionQuery)(value, cursor);
+      if (!at2) return;
+      const next = (0, import_client_core26.insertFileMention)(value, at2, pick);
+      pickedMentions.current.add(pick);
+      setValue2(next.text);
+      setCursor(next.caret);
     } else if (suggestions.length > 0) {
       const pick = suggestions[Math.min(idx, suggestions.length - 1)];
       const completed = `/${pick.name} `;
@@ -106746,19 +107140,37 @@ function PromptInput({
   const commitSubmit = (override) => {
     const text = override ?? value;
     if (text.trim().length === 0) return;
-    setHistory((h) => h[0] === text ? h : [text, ...h].slice(0, 200));
+    setHistory((h) => pushEntry(h, text));
     onHistoryAppend?.(text);
-    setHistPos(null);
+    recall.current = NOT_RECALLING;
     setValue2("");
     setCursor(0);
     if (vim) setVimState(initialVimState("insert"));
     const outgoing = expandPastedText(text, pasteLedger.current.texts);
     onSubmit(outgoing);
   };
+  const applyArrow = (outcome) => {
+    if (!outcome) return;
+    if (outcome.kind === "caret") {
+      setCursor(outcome.caret);
+      return;
+    }
+    recall.current = outcome.state;
+    setValue2(outcome.draft.text);
+    setCursor(outcome.draft.caret);
+  };
+  const popQueue = () => {
+    const popped = onQueuePop?.({ text: value, cursor });
+    if (!popped) return false;
+    setValue2(popped.text);
+    setCursor(popped.cursor);
+    recall.current = NOT_RECALLING;
+    return true;
+  };
   const insertNewline = () => {
     setValue2(value.slice(0, cursor) + "\n" + value.slice(cursor));
     setCursor(cursor + 1);
-    if (histPos !== null) setHistPos(null);
+    recall.current = NOT_RECALLING;
   };
   use_input_default(
     // The third argument is the production renderer's raw event (it carries the
@@ -106773,7 +107185,7 @@ function PromptInput({
           return;
         }
         const click = parseMouseClick(input);
-        if (click && indexBadge && onIndexBadgeActivate) {
+        if (click && indexBadge && !menuOpen && onIndexBadgeActivate) {
           const cols = process.stdout.columns ?? 80;
           const rows2 = process.stdout.rows ?? 24;
           if (isIndexBadgeClick(click, cols, rows2, indexBadge.length)) {
@@ -106800,7 +107212,7 @@ function PromptInput({
           if (searchMatch !== void 0) {
             setValue2(searchMatch);
             setCursor(searchMatch.length);
-            setHistPos(null);
+            recall.current = NOT_RECALLING;
           }
           setSearch(null);
           return;
@@ -106884,12 +107296,13 @@ function PromptInput({
         onInterrupt();
         return;
       }
+      if (key.escape && !vim && !streaming && popQueue()) return;
       if (key.escape && !vim && !streaming && value.length > 0) {
         const t = Date.now();
         if (escArmed && t - escAtRef.current < 1e3) {
           setValue2("");
           setCursor(0);
-          setHistPos(null);
+          recall.current = NOT_RECALLING;
           setEscArmed(false);
         } else {
           escAtRef.current = t;
@@ -106916,7 +107329,7 @@ function PromptInput({
         if (cursor === value.length && value.endsWith("\\")) {
           setValue2(value.slice(0, -1) + "\n");
           setCursor(value.length);
-          if (histPos !== null) setHistPos(null);
+          recall.current = NOT_RECALLING;
           return;
         }
         commitSubmit();
@@ -106927,37 +107340,13 @@ function PromptInput({
         return;
       }
       if (action === "chat:historyPrev") {
-        const up = moveVertical2(value, cursor, -1);
-        if (up !== null) {
-          setCursor(up);
-          return;
-        }
-        if (history.length === 0) return;
-        const next = histPos === null ? 0 : Math.min(history.length - 1, histPos + 1);
-        const v2 = history[next] ?? "";
-        setHistPos(next);
-        setValue2(v2);
-        setCursor(v2.length);
+        const outcome = arrowUp({ text: value, caret: cursor }, history, recall.current);
+        if (outcome?.kind !== "caret" && popQueue()) return;
+        applyArrow(outcome);
         return;
       }
       if (action === "chat:historyNext") {
-        const down = moveVertical2(value, cursor, 1);
-        if (down !== null) {
-          setCursor(down);
-          return;
-        }
-        if (histPos === null) return;
-        const next = histPos - 1;
-        if (next < 0) {
-          setHistPos(null);
-          setValue2("");
-          setCursor(0);
-        } else {
-          const v2 = history[next] ?? "";
-          setHistPos(next);
-          setValue2(v2);
-          setCursor(v2.length);
-        }
+        applyArrow(arrowDown({ text: value, caret: cursor }, history, recall.current));
         return;
       }
       if (res.chord.pending.length > 0) return;
@@ -106975,7 +107364,7 @@ function PromptInput({
         if (cursor > ls) {
           setValue2(value.slice(0, ls) + value.slice(cursor));
           setCursor(ls);
-          if (histPos !== null) setHistPos(null);
+          recall.current = NOT_RECALLING;
         }
         return;
       }
@@ -106984,7 +107373,7 @@ function PromptInput({
         const end = nl === -1 ? value.length : nl;
         if (end > cursor) {
           setValue2(value.slice(0, cursor) + value.slice(end));
-          if (histPos !== null) setHistPos(null);
+          recall.current = NOT_RECALLING;
         }
         return;
       }
@@ -106995,7 +107384,7 @@ function PromptInput({
         if (i2 < cursor) {
           setValue2(value.slice(0, i2) + value.slice(cursor));
           setCursor(i2);
-          if (histPos !== null) setHistPos(null);
+          recall.current = NOT_RECALLING;
         }
         return;
       }
@@ -107018,13 +107407,13 @@ function PromptInput({
         if (chip) {
           setValue2(value.slice(0, chip.start) + value.slice(cursor));
           setCursor(chip.start);
-          if (histPos !== null) setHistPos(null);
+          recall.current = NOT_RECALLING;
           return;
         }
         if (cursor > 0) {
           setValue2(value.slice(0, cursor - 1) + value.slice(cursor));
           setCursor(cursor - 1);
-          if (histPos !== null) setHistPos(null);
+          recall.current = NOT_RECALLING;
         }
         return;
       }
@@ -107037,7 +107426,7 @@ function PromptInput({
             if (chip) {
               setValue2(value.slice(0, chip.start) + text + value.slice(chip.end));
               setCursor(chip.start + text.length);
-              if (histPos !== null) setHistPos(null);
+              recall.current = NOT_RECALLING;
               return;
             }
             const id = pasteLedger.current.nextId++;
@@ -107049,7 +107438,7 @@ function PromptInput({
             setValue2(value.slice(0, cursor) + text + value.slice(cursor));
             setCursor(cursor + text.length);
           }
-          if (histPos !== null) setHistPos(null);
+          recall.current = NOT_RECALLING;
         } else if (pasted && process.platform === "darwin") {
           requestImagePaste();
         }
@@ -107060,9 +107449,13 @@ function PromptInput({
   const before = value.slice(0, cursor);
   const at = value[cursor] ?? " ";
   const after = value.slice(cursor + 1);
-  const tokenRanges = [...slashTokenRanges?.(value) ?? [], ...pasteTokenRanges(value)].sort(
-    (a, b2) => a.start - b2.start
-  );
+  const tokenRanges = [
+    ...slashTokenRanges?.(value) ?? [],
+    ...pasteTokenRanges(value),
+    // A picked `@file` is a recognized token too, and wears the same colour — the
+    // IDE and the Power App paint theirs the same way.
+    ...(0, import_client_core26.scanFileMentionRanges)(value, pickedMentions.current)
+  ].sort((a, b2) => a.start - b2.start);
   const colored = (text, offset) => tokenRanges.length === 0 ? text : segmentSlice(text, offset, tokenRanges).map(
     (seg2, i2) => seg2.token ? /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(Text2, { color: SLASH_TOKEN_COLOR, children: seg2.text }, `${offset}-${i2}`) : seg2.text
   );
@@ -107217,7 +107610,7 @@ function IndexIndicator({
 }
 
 // src/components/status/StatusBar.tsx
-var import_client_core25 = __toESM(require_dist(), 1);
+var import_client_core27 = __toESM(require_dist(), 1);
 var import_jsx_runtime48 = __toESM(require_jsx_runtime(), 1);
 var PERM_SHORT = {
   read_only: "read-only",
@@ -107263,7 +107656,7 @@ function StatusBar({
       case "persona":
         return /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(ThemedText, { dim: true, children: persona });
       case "tier":
-        return accountTier ? /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(ThemedText, { dim: true, children: (0, import_client_core25.planLabel)(accountTier) }) : null;
+        return accountTier ? /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(ThemedText, { dim: true, children: (0, import_client_core27.planLabel)(accountTier) }) : null;
       case "workrun":
         return workRun ? /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(ThemedText, { dim: true, children: `graph ${workRun.phasesDone}/${workRun.phasesTotal}` }) : null;
       case "cost":
@@ -107572,7 +107965,7 @@ function FeedbackPrompt({
 var import_react35 = __toESM(require_react(), 1);
 var import_client_ui_core13 = __toESM(require_dist2(), 1);
 var import_client_ui_core14 = __toESM(require_dist2(), 1);
-var import_client_core26 = __toESM(require_dist(), 1);
+var import_client_core28 = __toESM(require_dist(), 1);
 
 // src/components/dialogs/SelectList.tsx
 var import_react34 = __toESM(require_react(), 1);
@@ -107822,12 +108215,12 @@ function PermissionPrompt({
             label: "Don't ask again for",
             value: stage.draft,
             error: (() => {
-              const verdict = (0, import_client_core26.validateRule)(stage.draft);
+              const verdict = (0, import_client_core28.validateRule)(stage.draft);
               return verdict.ok ? null : verdict.reason;
             })(),
             onChange: (draft) => setStage({ ...stage, draft }),
             onSubmit: () => {
-              if (!(0, import_client_core26.validateRule)(stage.draft).ok) return;
+              if (!(0, import_client_core28.validateRule)(stage.draft).ok) return;
               setStage({
                 kind: "pick-destination",
                 rule: stage.draft,
@@ -108415,7 +108808,7 @@ function EndpointsPanel({
 
 // src/components/dialogs/PermissionRulesPanel.tsx
 var import_react37 = __toESM(require_react(), 1);
-var import_client_core27 = __toESM(require_dist(), 1);
+var import_client_core29 = __toESM(require_dist(), 1);
 var import_client_ui_core15 = __toESM(require_dist2(), 1);
 var import_jsx_runtime55 = __toESM(require_jsx_runtime(), 1);
 function PermissionRulesPanel({
@@ -108430,7 +108823,7 @@ function PermissionRulesPanel({
       if (stage.kind === "add-rule") {
         if (key.escape) return setStage({ kind: "list" });
         if (key.return) {
-          if ((0, import_client_core27.validateRule)(stage.draft).ok) setStage({ kind: "add-behavior", rule: stage.draft });
+          if ((0, import_client_core29.validateRule)(stage.draft).ok) setStage({ kind: "add-behavior", rule: stage.draft });
           return;
         }
         if (key.backspace || key.delete)
@@ -108442,7 +108835,7 @@ function PermissionRulesPanel({
     if (input.toLowerCase() === "a") setStage({ kind: "add-rule", draft: "" });
   });
   if (stage.kind === "add-rule") {
-    const verdict = (0, import_client_core27.validateRule)(stage.draft);
+    const verdict = (0, import_client_core29.validateRule)(stage.draft);
     return /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(Box2, { flexDirection: "column", marginTop: 1, children: [
       /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(ThemedText, { bold: true, children: "Add a permission rule" }),
       /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(ThemedText, { colorKey: "toolArgs", children: `[ ${stage.draft}\u2588 ]` }),
@@ -108568,7 +108961,7 @@ function PlanApprovalPrompt({
 
 // src/components/dialogs/WorkPlanApprovalPrompt.tsx
 var import_react39 = __toESM(require_react(), 1);
-var import_client_core28 = __toESM(require_dist(), 1);
+var import_client_core30 = __toESM(require_dist(), 1);
 var import_jsx_runtime57 = __toESM(require_jsx_runtime(), 1);
 function WorkPlanApprovalPrompt({
   pending,
@@ -108589,11 +108982,11 @@ function WorkPlanApprovalPrompt({
     if (c3 === "y") onRespond(requestId, true);
     else if (c3 === "n" || key.escape) onRespond(requestId, false);
   });
-  const worktreeCandidates = (0, import_client_core28.planWorktreeCount)(plan);
+  const worktreeCandidates = (0, import_client_core30.planWorktreeCount)(plan);
   return /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(Box2, { flexDirection: "column", marginTop: 1, children: [
     /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(Box2, { flexDirection: "row", children: /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(ThemedText, { colorKey: "planMode", bold: true, children: "Work graph \u2014 run this plan in the background?" }) }),
     /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(Box2, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(ThemedText, { dim: true, children: plan.goal }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(Box2, { flexDirection: "column", marginTop: 1, marginLeft: 2, children: (0, import_client_core28.planFlowLines)(plan).map((line, index) => /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(ThemedText, { colorKey: "planMode", children: line }, index)) }),
+    /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(Box2, { flexDirection: "column", marginTop: 1, marginLeft: 2, children: (0, import_client_core30.planFlowLines)(plan).map((line, index) => /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(ThemedText, { colorKey: "planMode", children: line }, index)) }),
     /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(Box2, { marginTop: 1, flexDirection: "column", children: plan.phases.map((phase) => /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(PhaseRow, { phase }, phase.id)) }),
     worktreeCandidates > 0 && /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(Box2, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(ThemedText, { dim: true, children: `${worktreeCandidates} isolated worktree${worktreeCandidates === 1 ? "" : "s"} will be created; changed ones are kept for review.` }) }),
     /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(Box2, { marginTop: 1, flexDirection: "row", children: [
@@ -108609,8 +109002,8 @@ function PhaseRow({ phase }) {
   const heading = phase.title && phase.title !== phase.id ? `${phase.id} \u2014 ${phase.title}` : phase.id;
   return /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(Box2, { flexDirection: "column", marginLeft: 2, marginTop: 1, children: [
     /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(ThemedText, { bold: true, children: heading }),
-    /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(Box2, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(ThemedText, { dim: true, children: (0, import_client_core28.phaseTraits)(phase).join(" \xB7 ") }) }),
-    phase.gate && /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(Box2, { marginLeft: 2, flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(ThemedText, { colorKey: "planMode", children: `gate: ${phase.gate.cmd}${(0, import_client_core28.gateRetrySuffix)(phase.gate)}` }) })
+    /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(Box2, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(ThemedText, { dim: true, children: (0, import_client_core30.phaseTraits)(phase).join(" \xB7 ") }) }),
+    phase.gate && /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(Box2, { marginLeft: 2, flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(ThemedText, { colorKey: "planMode", children: `gate: ${phase.gate.cmd}${(0, import_client_core30.gateRetrySuffix)(phase.gate)}` }) })
   ] });
 }
 
@@ -108653,19 +109046,19 @@ function matcherLabel(m2) {
   const parts2 = Object.entries(m2).map(([k, v2]) => `${k}=${String(v2)}`);
   return parts2.length ? parts2.join(", ") : "(any)";
 }
-function commandLabel(c3) {
+function commandLabel2(c3) {
   if (Array.isArray(c3)) return c3.join(" ");
   return typeof c3 === "string" ? c3 : "";
 }
 function hookSummary(h) {
-  const action = commandLabel(h.command) || h.url || h.model || h.agent_kind || "\u2014";
+  const action = commandLabel2(h.command) || h.url || h.model || h.agent_kind || "\u2014";
   return `${h.type ?? "command"}: ${action}`;
 }
 function HookDetail({ hook, onBack }) {
   use_input_default((_input, key) => {
     if (key.escape || key.return) onBack();
   });
-  const cmd = commandLabel(hook.command);
+  const cmd = commandLabel2(hook.command);
   return /* @__PURE__ */ (0, import_jsx_runtime61.jsxs)(Box2, { flexDirection: "column", marginTop: 1, children: [
     /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(ThemedText, { colorKey: "listSelection", bold: true, children: "Hook detail" }),
     /* @__PURE__ */ (0, import_jsx_runtime61.jsxs)(Box2, { flexDirection: "column", marginTop: 1, children: [
@@ -108770,7 +109163,7 @@ function HooksBrowser({
 
 // src/components/dialogs/PluginManager.tsx
 var import_react41 = __toESM(require_react(), 1);
-var import_client_core29 = __toESM(require_dist(), 1);
+var import_client_core31 = __toESM(require_dist(), 1);
 var import_jsx_runtime62 = __toESM(require_jsx_runtime(), 1);
 function pluginId(p) {
   return p.id ?? p.name ?? "";
@@ -108845,7 +109238,7 @@ function PluginManager({
       {
         dialog: {
           kind: "confirm",
-          title: `${import_client_core29.PLUGIN_TRUST_NOTICE}
+          title: `${import_client_core31.PLUGIN_TRUST_NOTICE}
 
 Install "${view.id}" from "${view.catalog}" (${scope} scope)?`,
           options: [],
@@ -109169,7 +109562,7 @@ function ModalFrame({ children }) {
 }
 
 // src/components/dialogs/UsageMetricsPanel.tsx
-var import_client_core30 = __toESM(require_dist(), 1);
+var import_client_core32 = __toESM(require_dist(), 1);
 var import_jsx_runtime66 = __toESM(require_jsx_runtime(), 1);
 function compactInt(value) {
   if (value >= 1e6) return `${(value / 1e6).toFixed(1)}m`;
@@ -109184,7 +109577,7 @@ function tokenLine(s) {
     `out ${compactInt(t.output_tokens ?? 0)}`,
     `visible ${compactInt(t.visible_output_tokens ?? 0)}`,
     `reason ${compactInt(t.reasoning_tokens ?? 0)}`,
-    `cache ${compactInt((0, import_client_core30.cacheHitTokens)(t))}`,
+    `cache ${compactInt((0, import_client_core32.cacheHitTokens)(t))}`,
     // `read`/`write`, not `hit`: this is the cache READ share. A write-heavy turn reads 0% while
     // still paying the 1.25x-2x write premium, so both rates are shown.
     `read ${Math.round(s.cacheHitPercent)}%`,
@@ -109193,7 +109586,7 @@ function tokenLine(s) {
   ].join(" \xB7 ");
 }
 function topRows(group, limit = 4) {
-  return Object.entries(group).sort((a, b2) => (0, import_client_core30.meteredTokens)(b2[1].tokens) - (0, import_client_core30.meteredTokens)(a[1].tokens) || b2[1].calls - a[1].calls).slice(0, limit);
+  return Object.entries(group).sort((a, b2) => (0, import_client_core32.meteredTokens)(b2[1].tokens) - (0, import_client_core32.meteredTokens)(a[1].tokens) || b2[1].calls - a[1].calls).slice(0, limit);
 }
 function topContextRows(group, limit = 5) {
   return Object.entries(group).filter(([, value]) => value > 0).sort((a, b2) => b2[1] - a[1]).slice(0, limit);
@@ -109279,11 +109672,11 @@ function BreakdownRows({
 }) {
   const rows = topRows(group);
   if (rows.length === 0) return null;
-  const max = Math.max(...rows.map(([, item]) => (0, import_client_core30.meteredTokens)(item.tokens)), 1);
+  const max = Math.max(...rows.map(([, item]) => (0, import_client_core32.meteredTokens)(item.tokens)), 1);
   return /* @__PURE__ */ (0, import_jsx_runtime66.jsxs)(Box2, { flexDirection: "column", marginTop: 1, children: [
     /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(ThemedText, { bold: true, children: title }),
     rows.map(([key, item], index) => {
-      const tokens = (0, import_client_core30.meteredTokens)(item.tokens);
+      const tokens = (0, import_client_core32.meteredTokens)(item.tokens);
       return /* @__PURE__ */ (0, import_jsx_runtime66.jsxs)(BarRow, { label: key, value: tokens, max, tone: index, children: [
         item.calls,
         " calls \xB7 in ",
@@ -109416,10 +109809,10 @@ function RecentTurns({ rows }) {
 function DailyRows({ summary }) {
   const rows = summary.daily.slice(-5);
   if (rows.length === 0) return null;
-  const max = Math.max(...rows.map((day) => (0, import_client_core30.meteredTokens)(day.tokens)), 1);
+  const max = Math.max(...rows.map((day) => (0, import_client_core32.meteredTokens)(day.tokens)), 1);
   return /* @__PURE__ */ (0, import_jsx_runtime66.jsxs)(Box2, { flexDirection: "column", marginTop: 1, children: [
     /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(ThemedText, { bold: true, children: "Daily history" }),
-    rows.map((day, index) => /* @__PURE__ */ (0, import_jsx_runtime66.jsxs)(BarRow, { label: day.date, value: (0, import_client_core30.meteredTokens)(day.tokens), max, tone: index, children: [
+    rows.map((day, index) => /* @__PURE__ */ (0, import_jsx_runtime66.jsxs)(BarRow, { label: day.date, value: (0, import_client_core32.meteredTokens)(day.tokens), max, tone: index, children: [
       day.calls,
       " calls \xB7 in ",
       compactInt(day.tokens.input_tokens ?? 0),
@@ -109512,15 +109905,41 @@ function WorkingStatus({
   ] });
 }
 
+// src/state/inputQueue.ts
+var import_client_ui_core16 = __toESM(require_dist2(), 1);
+function isEditable(entry) {
+  return (0, import_client_ui_core16.isEditableSteer)(entry);
+}
+function popEditableQueue(app, draft) {
+  const queued = app.getState().queuedMessages;
+  const merged = (0, import_client_ui_core16.mergeIntoDraft)(
+    queued.filter(isEditable).map((entry) => entry.text),
+    draft
+  );
+  if (merged === null) return null;
+  app.setState((s) => ({ ...s, queuedMessages: s.queuedMessages.filter((q2) => !isEditable(q2)) }));
+  return merged;
+}
+function queueRows(queued) {
+  const { shown, hidden } = (0, import_client_ui_core16.capMachineRows)(queued);
+  const rows = shown.map((entry) => ({ kind: "entry", entry }));
+  if (hidden > 0) rows.push({ kind: "overflow", hidden });
+  return rows;
+}
+
 // src/components/input/QueuedMessages.tsx
 var import_jsx_runtime68 = __toESM(require_jsx_runtime(), 1);
 function QueuedMessages({ store }) {
   const queued = useStoreSelector(store, (s) => s.queuedMessages);
   if (queued.length === 0) return null;
-  return /* @__PURE__ */ (0, import_jsx_runtime68.jsx)(Box2, { flexDirection: "column", children: queued.map((m2, i2) => /* @__PURE__ */ (0, import_jsx_runtime68.jsxs)(Box2, { flexDirection: "column", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime68.jsx)(UserText, { text: queuedInputLabel(m2) }),
-    m2.kind === "command" ? /* @__PURE__ */ (0, import_jsx_runtime68.jsx)(Text2, { dimColor: true, children: "  runs when this turn ends" }) : null
-  ] }, i2)) });
+  const rows = queueRows(queued);
+  if (rows.length === 0) return null;
+  return /* @__PURE__ */ (0, import_jsx_runtime68.jsx)(Box2, { flexDirection: "column", children: rows.map(
+    (row, i2) => row.kind === "overflow" ? /* @__PURE__ */ (0, import_jsx_runtime68.jsx)(ThemedText, { colorKey: "dim", children: `  +${row.hidden} more queued` }, `overflow-${i2}`) : /* @__PURE__ */ (0, import_jsx_runtime68.jsxs)(Box2, { flexDirection: "column", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime68.jsx)(UserText, { text: queuedInputLabel(row.entry), pending: true }),
+      row.entry.kind === "command" ? /* @__PURE__ */ (0, import_jsx_runtime68.jsx)(ThemedText, { colorKey: "dim", children: "  runs when this turn ends" }) : null
+    ] }, i2)
+  ) });
 }
 
 // src/components/input/PendingAttachments.tsx
@@ -109543,7 +109962,7 @@ function PendingAttachments({ items: all }) {
 }
 
 // src/components/layout/ReplFooter.tsx
-var import_client_core31 = __toESM(require_dist(), 1);
+var import_client_core33 = __toESM(require_dist(), 1);
 var import_jsx_runtime70 = __toESM(require_jsx_runtime(), 1);
 function ReplFooter({
   appStore,
@@ -109588,7 +110007,7 @@ function ReplFooter({
   const indexPhase = useStoreSelector(appStore, (s) => s.indexPhase);
   const indexBadgeText = useStoreSelector(
     appStore,
-    (s) => (0, import_client_core31.formatIndexBadge)({
+    (s) => (0, import_client_core33.formatIndexBadge)({
       mode: s.indexMode,
       phase: s.indexPhase,
       percent: s.indexPercent,
@@ -109603,6 +110022,11 @@ function ReplFooter({
     (s) => s.pendingPermissions.length > 0 || !!s.pendingPlanApproval || !!s.pendingAskUser || !!s.pendingWorkPlan
   );
   const closePanel = () => appStore.setState((s) => ({ ...s, activePanel: null }));
+  const onQueuePop = import_react45.default.useCallback(
+    (draft) => popEditableQueue(appStore, draft),
+    [appStore]
+  );
+  const [menuOpen, setMenuOpen] = import_react45.default.useState(false);
   return /* @__PURE__ */ (0, import_jsx_runtime70.jsxs)(import_jsx_runtime70.Fragment, { children: [
     streaming && !parked && /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(WorkingStatus, { store: appStore }),
     plan && /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(PlanCard, { plan }),
@@ -109700,22 +110124,24 @@ function ReplFooter({
           onPasteImage,
           onToggleVerbose,
           onCycleMode,
+          onMenuOpenChange: setMenuOpen,
           onScroll,
           mode,
           permissionMode,
           indexBadge,
-          onIndexBadgeActivate: openIndexChooser
+          onIndexBadgeActivate: openIndexChooser,
+          onQueuePop
         }
       )
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(StatusBar, { store: appStore, indexBadge }),
+    menuOpen ? null : /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(StatusBar, { store: appStore, indexBadge }),
     workRun ? /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(WorkRunGraph, { view: workRun.view }) : null,
     /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(SubAgentList, { agents: subAgents, awaiting: subagentsAwaiting > 0 })
   ] });
 }
 
 // src/components/layout/FullscreenLayout.tsx
-var import_react45 = __toESM(require_react(), 1);
+var import_react46 = __toESM(require_react(), 1);
 var import_jsx_runtime71 = __toESM(require_jsx_runtime(), 1);
 function FullscreenLayout({
   appStore,
@@ -109737,7 +110163,7 @@ function FullscreenLayout({
   onCycleMode
 }) {
   const { columns, rows } = useTerminalSize();
-  const scrollRef = (0, import_react45.useRef)(null);
+  const scrollRef = (0, import_react46.useRef)(null);
   const onScroll = (delta) => {
     const sb = scrollRef.current;
     if (!sb) return;
@@ -109772,9 +110198,9 @@ function FullscreenLayout({
 }
 
 // src/components/dialogs/AgentsDashboard.tsx
-var import_react46 = __toESM(require_react(), 1);
-var import_client_core32 = __toESM(require_dist(), 1);
-var import_client_ui_core16 = __toESM(require_dist2(), 1);
+var import_react47 = __toESM(require_react(), 1);
+var import_client_core34 = __toESM(require_dist(), 1);
+var import_client_ui_core17 = __toESM(require_dist2(), 1);
 var import_strip_ansi4 = __toESM(require_strip_ansi(), 1);
 var import_jsx_runtime72 = __toESM(require_jsx_runtime(), 1);
 var POLL_MS = 2500;
@@ -109819,51 +110245,51 @@ function AgentsDashboard({
   onClose
 }) {
   const { rows } = useTerminalSize();
-  const [screen, setScreen] = (0, import_react46.useState)({ kind: "list" });
-  const [cursor, setCursor] = (0, import_react46.useState)(0);
-  const [busy, setBusy] = (0, import_react46.useState)(false);
-  const [error, setError] = (0, import_react46.useState)(null);
-  const [liveJob, setLiveJob] = (0, import_react46.useState)(null);
-  const [events, setEvents] = (0, import_react46.useState)([]);
-  const [pollError, setPollError] = (0, import_react46.useState)(null);
-  const [diff3, setDiff] = (0, import_react46.useState)(null);
-  const diffFetchedFor = (0, import_react46.useRef)(null);
-  const [liveItems, setLiveItems] = (0, import_react46.useState)([]);
-  const [liveTerm, setLiveTerm] = (0, import_react46.useState)("");
-  const [liveFrames, setLiveFrames] = (0, import_react46.useState)(0);
-  const liveIdRef = (0, import_react46.useRef)(0);
-  const [messaging, setMessaging] = (0, import_react46.useState)(false);
-  const [messageText, setMessageText] = (0, import_react46.useState)("");
-  const [messageNote, setMessageNote] = (0, import_react46.useState)(null);
-  const [tokenStatus, setTokenStatus] = (0, import_react46.useState)(null);
-  const [tokenBusy, setTokenBusy] = (0, import_react46.useState)(false);
-  const [tokenNote, setTokenNote] = (0, import_react46.useState)(null);
-  const [tokenInput, setTokenInput] = (0, import_react46.useState)(false);
-  const [tokenDraft, setTokenDraft] = (0, import_react46.useState)("");
-  const [jiraStatus, setJiraStatus] = (0, import_react46.useState)(null);
-  const [jiraBusy, setJiraBusy] = (0, import_react46.useState)(false);
-  const [jiraNote, setJiraNote] = (0, import_react46.useState)(null);
-  const [jiraInput, setJiraInput] = (0, import_react46.useState)(null);
-  const [form, setForm] = (0, import_react46.useState)(EMPTY_FORM);
-  const [field2, setField] = (0, import_react46.useState)(0);
+  const [screen, setScreen] = (0, import_react47.useState)({ kind: "list" });
+  const [cursor, setCursor] = (0, import_react47.useState)(0);
+  const [busy, setBusy] = (0, import_react47.useState)(false);
+  const [error, setError] = (0, import_react47.useState)(null);
+  const [liveJob, setLiveJob] = (0, import_react47.useState)(null);
+  const [events, setEvents] = (0, import_react47.useState)([]);
+  const [pollError, setPollError] = (0, import_react47.useState)(null);
+  const [diff3, setDiff] = (0, import_react47.useState)(null);
+  const diffFetchedFor = (0, import_react47.useRef)(null);
+  const [liveItems, setLiveItems] = (0, import_react47.useState)([]);
+  const [liveTerm, setLiveTerm] = (0, import_react47.useState)("");
+  const [liveFrames, setLiveFrames] = (0, import_react47.useState)(0);
+  const liveIdRef = (0, import_react47.useRef)(0);
+  const [messaging, setMessaging] = (0, import_react47.useState)(false);
+  const [messageText, setMessageText] = (0, import_react47.useState)("");
+  const [messageNote, setMessageNote] = (0, import_react47.useState)(null);
+  const [tokenStatus, setTokenStatus] = (0, import_react47.useState)(null);
+  const [tokenBusy, setTokenBusy] = (0, import_react47.useState)(false);
+  const [tokenNote, setTokenNote] = (0, import_react47.useState)(null);
+  const [tokenInput, setTokenInput] = (0, import_react47.useState)(false);
+  const [tokenDraft, setTokenDraft] = (0, import_react47.useState)("");
+  const [jiraStatus, setJiraStatus] = (0, import_react47.useState)(null);
+  const [jiraBusy, setJiraBusy] = (0, import_react47.useState)(false);
+  const [jiraNote, setJiraNote] = (0, import_react47.useState)(null);
+  const [jiraInput, setJiraInput] = (0, import_react47.useState)(null);
+  const [form, setForm] = (0, import_react47.useState)(EMPTY_FORM);
+  const [field2, setField] = (0, import_react47.useState)(0);
   const jobs = panel.jobs;
   const safeCursor = Math.min(cursor, Math.max(0, jobs.length - 1));
   const detailId = screen.kind === "detail" ? screen.id : null;
   const detailJob = detailId ? liveJob ?? jobs.find((j2) => j2.id === detailId) ?? null : null;
-  const panelRef = (0, import_react46.useRef)(panel);
+  const panelRef = (0, import_react47.useRef)(panel);
   panelRef.current = panel;
-  const screenRef = (0, import_react46.useRef)(screen);
+  const screenRef = (0, import_react47.useRef)(screen);
   screenRef.current = screen;
-  const oauthAlive = (0, import_react46.useRef)(true);
-  const oauthTimer = (0, import_react46.useRef)(null);
-  (0, import_react46.useEffect)(
+  const oauthAlive = (0, import_react47.useRef)(true);
+  const oauthTimer = (0, import_react47.useRef)(null);
+  (0, import_react47.useEffect)(
     () => () => {
       oauthAlive.current = false;
       if (oauthTimer.current) clearTimeout(oauthTimer.current);
     },
     []
   );
-  (0, import_react46.useEffect)(() => {
+  (0, import_react47.useEffect)(() => {
     if (!detailId) return;
     let cancelled = false;
     let timer = null;
@@ -109890,11 +110316,11 @@ function AgentsDashboard({
           setEvents((prev) => [...prev, ...fresh]);
         }
         setPollError(null);
-        if (!(0, import_client_core32.isTerminal)(job.status)) timer = setTimeout(tick, POLL_MS);
+        if (!(0, import_client_core34.isTerminal)(job.status)) timer = setTimeout(tick, POLL_MS);
       } catch (e) {
         if (cancelled) return;
-        setPollError((0, import_client_core32.formatMissionsError)(e));
-        if (latest && (0, import_client_core32.isTerminal)(latest.status)) return;
+        setPollError((0, import_client_core34.formatMissionsError)(e));
+        if (latest && (0, import_client_core34.isTerminal)(latest.status)) return;
         timer = setTimeout(tick, POLL_MS);
       }
     };
@@ -109905,7 +110331,7 @@ function AgentsDashboard({
     };
   }, [detailId]);
   const branchName = detailJob?.branch_name ?? null;
-  (0, import_react46.useEffect)(() => {
+  (0, import_react47.useEffect)(() => {
     if (!detailId || !branchName) return;
     const key = `${detailId}:${branchName}`;
     if (diffFetchedFor.current === key) return;
@@ -109922,8 +110348,8 @@ function AgentsDashboard({
       cancelled = true;
     };
   }, [detailId, branchName]);
-  const liveSessionId = detailJob && !(0, import_client_core32.isTerminal)(detailJob.status) && detailJob.session_id ? detailJob.session_id : null;
-  (0, import_react46.useEffect)(() => {
+  const liveSessionId = detailJob && !(0, import_client_core34.isTerminal)(detailJob.status) && detailJob.session_id ? detailJob.session_id : null;
+  (0, import_react47.useEffect)(() => {
     if (!liveSessionId) return;
     liveIdRef.current = 0;
     setLiveItems([]);
@@ -109931,20 +110357,20 @@ function AgentsDashboard({
     setLiveFrames(0);
     const nextId = () => liveIdRef.current += 1;
     const sub = panelRef.current.watch(liveSessionId, (env3) => {
-      if ((0, import_client_core32.desktopFrameOf)(env3) !== null) {
+      if ((0, import_client_core34.desktopFrameOf)(env3) !== null) {
         setLiveFrames((n) => n + 1);
         return;
       }
-      const chunk = (0, import_client_core32.terminalChunkOf)(env3);
+      const chunk = (0, import_client_core34.terminalChunkOf)(env3);
       if (chunk !== null) {
-        setLiveTerm((tail) => (0, import_client_core32.appendTerminalTail)(tail, (0, import_strip_ansi4.default)(chunk)));
+        setLiveTerm((tail) => (0, import_client_core34.appendTerminalTail)(tail, (0, import_strip_ansi4.default)(chunk)));
         return;
       }
-      setLiveItems((prev) => (0, import_client_core32.applyLiveThreadEvent)(prev, env3, nextId));
+      setLiveItems((prev) => (0, import_client_core34.applyLiveThreadEvent)(prev, env3, nextId));
     });
     return () => sub.dispose();
   }, [liveSessionId]);
-  (0, import_react46.useEffect)(() => {
+  (0, import_react47.useEffect)(() => {
     let cancelled = false;
     void (async () => {
       try {
@@ -109972,7 +110398,7 @@ function AgentsDashboard({
   const runAction = (action) => {
     setBusy(true);
     setError(null);
-    void action().catch((e) => setError((0, import_client_core32.formatMissionsError)(e))).finally(() => setBusy(false));
+    void action().catch((e) => setError((0, import_client_core34.formatMissionsError)(e))).finally(() => setBusy(false));
   };
   const submitMessage = (id) => {
     const text = messageText.trim();
@@ -109988,7 +110414,7 @@ function AgentsDashboard({
         setMessaging(false);
         setMessageNote("Follow-up started.");
         setScreen({ kind: "detail", id: created.job_id });
-      }).catch((e) => setMessageNote((0, import_client_core32.formatMissionsError)(e))).finally(() => setBusy(false));
+      }).catch((e) => setMessageNote((0, import_client_core34.formatMissionsError)(e))).finally(() => setBusy(false));
       return;
     }
     if (detailJob?.status === "needs_human_input") {
@@ -109998,7 +110424,7 @@ function AgentsDashboard({
         setMessageText("");
         setMessaging(false);
         setMessageNote("Resumed.");
-      }).catch((e) => setMessageNote((0, import_client_core32.formatMissionsError)(e))).finally(() => setBusy(false));
+      }).catch((e) => setMessageNote((0, import_client_core34.formatMissionsError)(e))).finally(() => setBusy(false));
       return;
     }
     if (!text) {
@@ -110011,7 +110437,7 @@ function AgentsDashboard({
       setMessageText("");
       setMessaging(false);
       setMessageNote(res.delivered ? "Sent to the agent." : "Queued for the next phase.");
-    }).catch((e) => setMessageNote((0, import_client_core32.formatMissionsError)(e))).finally(() => setBusy(false));
+    }).catch((e) => setMessageNote((0, import_client_core34.formatMissionsError)(e))).finally(() => setBusy(false));
   };
   const tokenHost = tokenStatus?.host || "github.com";
   const startConnect = () => {
@@ -110092,7 +110518,7 @@ function AgentsDashboard({
       setTokenInput(false);
       setTokenDraft("");
       setTokenNote("Token saved.");
-    }).catch((e) => setTokenNote((0, import_client_core32.formatMissionsError)(e))).finally(() => setTokenBusy(false));
+    }).catch((e) => setTokenNote((0, import_client_core34.formatMissionsError)(e))).finally(() => setTokenBusy(false));
   };
   const submitJiraStep = () => {
     if (!jiraInput) return;
@@ -110121,7 +110547,7 @@ function AgentsDashboard({
       );
       setJiraInput(null);
       setJiraNote("Jira connected \u2014 the launch form's Ticket field is live.");
-    }).catch((e) => setJiraNote((0, import_client_core32.formatMissionsError)(e))).finally(() => setJiraBusy(false));
+    }).catch((e) => setJiraNote((0, import_client_core34.formatMissionsError)(e))).finally(() => setJiraBusy(false));
   };
   const removeJira = () => {
     if (jiraBusy) return;
@@ -110130,7 +110556,7 @@ function AgentsDashboard({
     void panel.clearTicketConnection().then(() => {
       setJiraStatus((p) => p ? { ...p, configured: false, base_url: null, hint: null } : p);
       setJiraNote("Jira connection removed.");
-    }).catch((e) => setJiraNote((0, import_client_core32.formatMissionsError)(e))).finally(() => setJiraBusy(false));
+    }).catch((e) => setJiraNote((0, import_client_core34.formatMissionsError)(e))).finally(() => setJiraBusy(false));
   };
   const removeToken = () => {
     if (tokenBusy) return;
@@ -110139,7 +110565,7 @@ function AgentsDashboard({
     void panel.clearToken().then(() => {
       setTokenStatus((p) => p ? { ...p, configured: false, hint: null } : p);
       setTokenNote("Token removed.");
-    }).catch((e) => setTokenNote((0, import_client_core32.formatMissionsError)(e))).finally(() => setTokenBusy(false));
+    }).catch((e) => setTokenNote((0, import_client_core34.formatMissionsError)(e))).finally(() => setTokenBusy(false));
   };
   const submitLaunch = () => {
     const repo_url = form.repo_url.trim();
@@ -110159,7 +110585,7 @@ function AgentsDashboard({
       setForm(EMPTY_FORM);
       setField(0);
       setScreen({ kind: "list" });
-    }).catch((e) => setError((0, import_client_core32.formatMissionsError)(e))).finally(() => setBusy(false));
+    }).catch((e) => setError((0, import_client_core34.formatMissionsError)(e))).finally(() => setBusy(false));
   };
   use_input_default((input, key) => {
     if (busy) return;
@@ -110198,14 +110624,14 @@ function AgentsDashboard({
         return;
       }
       if (key.escape || input === "q") return setScreen({ kind: "list" });
-      if (input === "m" && job && (!(0, import_client_core32.isTerminal)(job.status) || job.status === "complete")) {
+      if (input === "m" && job && (!(0, import_client_core34.isTerminal)(job.status) || job.status === "complete")) {
         setMessageNote(null);
         return setMessaging(true);
       }
-      if (input === "i" && job && !(0, import_client_core32.isTerminal)(job.status) && job.status !== "needs_human_input") {
+      if (input === "i" && job && !(0, import_client_core34.isTerminal)(job.status) && job.status !== "needs_human_input") {
         return runAction(() => panel.interrupt(screen.id).then(() => void 0));
       }
-      if (input === "c" && job && !(0, import_client_core32.isTerminal)(job.status)) {
+      if (input === "c" && job && !(0, import_client_core34.isTerminal)(job.status)) {
         return runAction(() => panel.cancel(screen.id));
       }
       if (input === "r") return runAction(() => panel.refresh().then(() => void 0));
@@ -110278,7 +110704,7 @@ function AgentsDashboard({
       setError(null);
       return setScreen({ kind: "detail", id: here.id });
     }
-    if (input === "c" && !(0, import_client_core32.isTerminal)(here.status)) {
+    if (input === "c" && !(0, import_client_core34.isTerminal)(here.status)) {
       return runAction(() => panel.cancel(here.id));
     }
   });
@@ -110305,7 +110731,7 @@ function AgentsDashboard({
             // point. This MUST match the `m`-key gate (which allows complete): if the
             // key opens messaging but the render gate stays !isTerminal, the user types
             // blind and errors never paint.
-            live: !!(detailJob && (!(0, import_client_core32.isTerminal)(detailJob.status) || detailJob.status === "complete")),
+            live: !!(detailJob && (!(0, import_client_core34.isTerminal)(detailJob.status) || detailJob.status === "complete")),
             messaging,
             text: messageText,
             note: messageNote,
@@ -110357,10 +110783,10 @@ function footerHint(screen, job, messaging, conn) {
     }
     if (parked) return "m resume \xB7 c cancel \xB7 r refresh \xB7 q back";
     if (job?.status === "complete") return "m follow-up \xB7 r refresh \xB7 q back";
-    const steer = job && !(0, import_client_core32.isTerminal)(job.status) ? "m message \xB7 i interrupt \xB7 c cancel \xB7 " : "";
+    const steer = job && !(0, import_client_core34.isTerminal)(job.status) ? "m message \xB7 i interrupt \xB7 c cancel \xB7 " : "";
     return `${steer}r refresh \xB7 q back`;
   }
-  const cancel = job && !(0, import_client_core32.isTerminal)(job.status) ? "c cancel \xB7 " : "";
+  const cancel = job && !(0, import_client_core34.isTerminal)(job.status) ? "c cancel \xB7 " : "";
   return `\u2191/\u2193 move \xB7 enter open \xB7 n new \xB7 s connections \xB7 ${cancel}r refresh \xB7 q close`;
 }
 function ConnectionsView({
@@ -110494,7 +110920,7 @@ function JobDetailView({
   composer
 }) {
   if (!job) return /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(ThemedText, { dim: true, children: "Job not found." });
-  const terminal = (0, import_client_core32.isTerminal)(job.status);
+  const terminal = (0, import_client_core34.isTerminal)(job.status);
   return /* @__PURE__ */ (0, import_jsx_runtime72.jsxs)(Box2, { flexDirection: "column", children: [
     /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(ThemedText, { colorKey: "listSelection", bold: true, children: jobTitle(job) }),
     /* @__PURE__ */ (0, import_jsx_runtime72.jsxs)(Box2, { flexDirection: "column", marginTop: 1, children: [
@@ -110546,7 +110972,7 @@ function JobDetailView({
         // terminal tail is showing, the thread cedes rows to it so yoga never has to
         // shrink the section headers away on a small terminal.
         live.slice(term ? -4 : -8).map(
-          (it) => it.kind === "text" ? /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(ThemedText, { wrap: "truncate-end", children: it.text.length > 500 ? `\u2026${it.text.slice(-500)}` : it.text }, it.id) : /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(ThemedText, { dim: true, children: `\u2192 ${(0, import_client_ui_core16.toolDisplayName)(it.name)}` }, it.id)
+          (it) => it.kind === "text" ? /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(ThemedText, { wrap: "truncate-end", children: it.text.length > 500 ? `\u2026${it.text.slice(-500)}` : it.text }, it.id) : /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(ThemedText, { dim: true, children: `\u2192 ${(0, import_client_ui_core17.toolDisplayName)(it.name)}` }, it.id)
         )
       ),
       frames > 0 ? /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(ThemedText, { dim: true, children: `\u{1F5A5} screen streaming \xB7 ${frames} frame${frames === 1 ? "" : "s"} (view in the desktop app)` }) : null,
@@ -110600,14 +111026,14 @@ function LaunchFormView({ form, field: field2 }) {
 }
 
 // src/components/layout/TerminalTitle.tsx
-var import_react48 = __toESM(require_react(), 1);
+var import_react49 = __toESM(require_react(), 1);
 
 // src/vendor/ink/hooks/use-terminal-title.ts
-var import_react47 = __toESM(require_react(), 1);
+var import_react48 = __toESM(require_react(), 1);
 var import_strip_ansi5 = __toESM(require_strip_ansi(), 1);
 function useTerminalTitle(title) {
-  const writeRaw = (0, import_react47.useContext)(TerminalWriteContext);
-  (0, import_react47.useEffect)(() => {
+  const writeRaw = (0, import_react48.useContext)(TerminalWriteContext);
+  (0, import_react48.useEffect)(() => {
     if (title === null || !writeRaw) return;
     const clean = (0, import_strip_ansi5.default)(title);
     if (process.platform === "win32") {
@@ -110633,8 +111059,8 @@ function composeTerminalTitle(sessionTitle, streaming, frame) {
 function TerminalTitle({ appStore }) {
   const sessionTitle = useStoreSelector(appStore, (s) => s.sessionTitle);
   const streaming = useStoreSelector(appStore, (s) => s.status === "streaming");
-  const [frame, setFrame] = (0, import_react48.useState)(0);
-  (0, import_react48.useEffect)(() => {
+  const [frame, setFrame] = (0, import_react49.useState)(0);
+  (0, import_react49.useEffect)(() => {
     if (!streaming) return;
     const id = setInterval(
       () => setFrame((f) => (f + 1) % TITLE_ANIMATION_FRAMES.length),
@@ -110733,11 +111159,11 @@ function Root({
 }
 
 // src/components/layout/SignInScreen.tsx
-var import_react50 = __toESM(require_react(), 1);
-var import_client_core33 = __toESM(require_dist(), 1);
+var import_react51 = __toESM(require_react(), 1);
+var import_client_core35 = __toESM(require_dist(), 1);
 
 // src/components/layout/splash/Splash.tsx
-var import_react49 = __toESM(require_react(), 1);
+var import_react50 = __toESM(require_react(), 1);
 
 // src/components/layout/splash/halfblock.ts
 var BLOCK = [" ", "\u2580", "\u2584", "\u2588"];
@@ -111056,7 +111482,7 @@ var TONE = {
 function Splash({ columns, rows, frame, copy }) {
   const theme = useTheme();
   const height = splashHeight(rows);
-  const shell2 = import_react49.default.useMemo(() => orbShell(), []);
+  const shell2 = import_react50.default.useMemo(() => orbShell(), []);
   const grid = splashFrame({ width: columns, rows: height, frame, shell: shell2, copy });
   return /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(Box2, { flexDirection: "column", children: grid.map((spans, y2) => /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(Text2, { wrap: "truncate", children: spans.length === 0 ? " " : spans.map((span, i2) => renderSpan(span, i2, theme)) }, y2)) });
 }
@@ -111102,15 +111528,15 @@ function SignInScreen({
   onSignedIn
 }) {
   const { exit } = use_app_default();
-  const [phase, setPhase] = import_react50.default.useState("idle");
-  const [url, setUrl] = import_react50.default.useState(null);
-  const [error, setError] = import_react50.default.useState(null);
-  const [frame, setFrame] = import_react50.default.useState(0);
+  const [phase, setPhase] = import_react51.default.useState("idle");
+  const [url, setUrl] = import_react51.default.useState(null);
+  const [error, setError] = import_react51.default.useState(null);
+  const [frame, setFrame] = import_react51.default.useState(0);
   const { columns, rows } = useTerminalSize();
-  const caps = import_react50.default.useMemo(() => detectTerminal2(), []);
+  const caps = import_react51.default.useMemo(() => detectTerminal2(), []);
   const copy = splashCopy(phase, error, url, columns);
   const useSplash = !splashDisabled() && caps.unicode && splashFits(columns, rows, copy.length);
-  import_react50.default.useEffect(() => {
+  import_react51.default.useEffect(() => {
     if (!useSplash || phase !== "idle") return;
     const t = setInterval(() => setFrame((f) => f + 1), TICK_MS);
     return () => clearInterval(t);
@@ -111120,7 +111546,7 @@ function SignInScreen({
     setUrl(null);
     setError(null);
     try {
-      await (0, import_client_core33.signInViaBrowser)(
+      await (0, import_client_core35.signInViaBrowser)(
         session,
         { accountsUrl, accountsApiUrl, client: "tui" },
         {
@@ -111229,16 +111655,16 @@ function SignInCard({
 }
 
 // src/services/presenceHost.ts
-var import_client_core34 = __toESM(require_dist(), 1);
+var import_client_core36 = __toESM(require_dist(), 1);
 function startTuiPresence(opts) {
-  const registry = opts.registry ?? new import_client_core34.PresenceRegistry({ clientType: "tui" });
+  const registry = opts.registry ?? new import_client_core36.PresenceRegistry({ clientType: "tui" });
   let currentSid = null;
   let lastStatus = "idle";
   const statusFromApp = (s) => s.pendingPermissions.length > 0 ? "waiting" : s.status === "streaming" ? "busy" : "idle";
   const stampGit = () => {
     if (!opts.workspaceRoot || !currentSid) return;
     const sid = currentSid;
-    void (0, import_client_core34.getGitInfo)(opts.workspaceRoot).then((info2) => {
+    void (0, import_client_core36.getGitInfo)(opts.workspaceRoot).then((info2) => {
       if (sid !== currentSid) return;
       registry.updateSession(sid, {
         gitRoot: info2.gitRoot ?? void 0,
@@ -111274,11 +111700,11 @@ function startTuiPresence(opts) {
         ownSessionId: currentSid ?? void 0,
         fresh: true
       });
-      return peers.map((p) => `${(0, import_client_core34.describePeer)(p)} \u2014 ${p.session.status}`);
+      return peers.map((p) => `${(0, import_client_core36.describePeer)(p)} \u2014 ${p.session.status}`);
     },
     async liveElsewhere(sessionId) {
       const peer = await registry.isSessionLiveElsewhere(sessionId);
-      return peer ? (0, import_client_core34.describePeer)(peer) : null;
+      return peer ? (0, import_client_core36.describePeer)(peer) : null;
     },
     dispose() {
       unsubscribe();
@@ -111288,7 +111714,7 @@ function startTuiPresence(opts) {
 }
 
 // src/services/remoteControlHost.ts
-var import_client_core35 = __toESM(require_dist(), 1);
+var import_client_core37 = __toESM(require_dist(), 1);
 import os5 from "os";
 var REMOTE_DENIED = /* @__PURE__ */ new Set([
   // Session/process-scoped.
@@ -111338,17 +111764,17 @@ function flattenInfoView(view) {
 function startTuiRemoteControl(opts) {
   let currentSid = null;
   const stateFromApp = (s) => s.pendingPermissions.length > 0 || s.pendingPlanApproval !== null || s.pendingAskUser !== null ? "needs_you" : s.status === "streaming" ? "running" : "idle";
-  const requireCurrent = (sessionId) => sessionId === currentSid ? null : (0, import_client_core35.rcRefuse)("unknown_session", "this terminal is on a different session");
+  const requireCurrent = (sessionId) => sessionId === currentSid ? null : (0, import_client_core37.rcRefuse)("unknown_session", "this terminal is on a different session");
   const deliverText = (text, attachments) => {
     if (opts.appStore.getState().status === "streaming") {
       if (attachments !== void 0 && attachments.length > 0) {
-        return (0, import_client_core35.rcRefusePhotosMidTurn)();
+        return (0, import_client_core37.rcRefusePhotosMidTurn)();
       }
       opts.verbs.steer(text);
-      return import_client_core35.RC_OK;
+      return import_client_core37.RC_OK;
     }
     const sent = attachments !== void 0 && attachments.length > 0 ? opts.verbs.send(text, attachments) : opts.verbs.send(text);
-    return sent ? import_client_core35.RC_OK : (0, import_client_core35.rcRefuse)("signed_out", "sign in on this machine first");
+    return sent ? import_client_core37.RC_OK : (0, import_client_core37.rcRefuse)("signed_out", "sign in on this machine first");
   };
   const commandCatalog = () => opts.commands === void 0 ? [] : opts.commands.registry.all().filter((command) => !REMOTE_DENIED.has(command.name)).map((command) => ({
     name: command.name,
@@ -111357,15 +111783,15 @@ function startTuiRemoteControl(opts) {
   }));
   const runRemoteCommand = async (text) => {
     const wired = opts.commands;
-    if (wired === void 0) return (0, import_client_core35.rcRefuse)("unsupported", "commands are not wired");
+    if (wired === void 0) return (0, import_client_core37.rcRefuse)("unsupported", "commands are not wired");
     const parsed = wired.registry.parse(text);
-    if (parsed === null) return (0, import_client_core35.rcRefuse)("unsupported", "unknown command");
+    if (parsed === null) return (0, import_client_core37.rcRefuse)("unsupported", "unknown command");
     const { command, args: args2 } = parsed;
     if (REMOTE_DENIED.has(command.name)) {
-      return (0, import_client_core35.rcRefuse)("unsupported", "this command runs at the terminal only");
+      return (0, import_client_core37.rcRefuse)("unsupported", "this command runs at the terminal only");
     }
     if (REMOTE_ARG_REQUIRED.has(command.name) && args2.trim() === "") {
-      return (0, import_client_core35.rcRefuse)(
+      return (0, import_client_core37.rcRefuse)(
         "unsupported",
         `add a value: /${command.name} ${command.argumentHint ?? "<value>"}`
       );
@@ -111391,11 +111817,11 @@ function startTuiRemoteControl(opts) {
     try {
       await command.run(args2, ctx);
     } catch (error) {
-      return (0, import_client_core35.rcRefuse)("internal", error instanceof Error ? error.message : String(error));
+      return (0, import_client_core37.rcRefuse)("internal", error instanceof Error ? error.message : String(error));
     }
     return { ok: true, ...lines.length > 0 ? { output: lines.join("\n") } : {} };
   };
-  const host = (0, import_client_core35.createRemoteControlHost)({
+  const host = (0, import_client_core37.createRemoteControlHost)({
     clientType: "tui",
     bridge: opts.bridge,
     machineId: os5.hostname(),
@@ -111427,18 +111853,18 @@ function startTuiRemoteControl(opts) {
         const refusal = requireCurrent(sessionId);
         if (refusal) return refusal;
         opts.verbs.deliverAgentMessage(message);
-        return import_client_core35.RC_OK;
+        return import_client_core37.RC_OK;
       },
       resolvePermission: (sessionId, requestId, decision) => {
         const refusal = requireCurrent(sessionId);
         if (refusal) return refusal;
-        return opts.verbs.resolvePermission(requestId, decision, sessionId) ? import_client_core35.RC_OK : (0, import_client_core35.rcRefuse)("no_pending_permission", "that prompt was already answered");
+        return opts.verbs.resolvePermission(requestId, decision, sessionId) ? import_client_core37.RC_OK : (0, import_client_core37.rcRefuse)("no_pending_permission", "that prompt was already answered");
       },
       interrupt: (sessionId) => {
         const refusal = requireCurrent(sessionId);
         if (refusal) return refusal;
         opts.verbs.interrupt();
-        return import_client_core35.RC_OK;
+        return import_client_core37.RC_OK;
       },
       runCommand: (sessionId, text) => {
         const refusal = requireCurrent(sessionId);
@@ -111450,14 +111876,14 @@ function startTuiRemoteControl(opts) {
         if (refusal) return refusal;
         const ok2 = await opts.verbs.setModel(
           model,
-          effort === void 0 ? void 0 : (0, import_client_core35.rcEffortToLocal)(effort)
+          effort === void 0 ? void 0 : (0, import_client_core37.rcEffortToLocal)(effort)
         );
-        return ok2 ? import_client_core35.RC_OK : (0, import_client_core35.rcRefuse)("internal", "couldn't switch the model");
+        return ok2 ? import_client_core37.RC_OK : (0, import_client_core37.rcRefuse)("internal", "couldn't switch the model");
       },
       setMode: (sessionId, mode) => {
         const refusal = requireCurrent(sessionId);
         if (refusal) return refusal;
-        return opts.verbs.setMode(mode) ? import_client_core35.RC_OK : (0, import_client_core35.rcRefuse)("internal", "couldn't switch permissions");
+        return opts.verbs.setMode(mode) ? import_client_core37.RC_OK : (0, import_client_core37.rcRefuse)("internal", "couldn't switch permissions");
       },
       committedMessages: (sessionId) => sessionId === currentSid ? opts.committedMessages() : [],
       // Cards parked before anyone was watching: replayed at the end of an attach
@@ -111468,7 +111894,7 @@ function startTuiRemoteControl(opts) {
         const now2 = Date.now() / 1e3;
         return [
           ...app.pendingPermissions.map(
-            (parked) => (0, import_client_core35.parkedPermissionEvent)(
+            (parked) => (0, import_client_core37.parkedPermissionEvent)(
               sessionId,
               {
                 requestId: parked.data.request_id,
@@ -111483,7 +111909,7 @@ function startTuiRemoteControl(opts) {
           // The other two parked-decision cards ride the backfill tail the same way —
           // a phone arriving mid-plan (or mid-question) has something to answer.
           ...app.pendingPlanApproval !== null ? [
-            (0, import_client_core35.parkedPlanApprovalEvent)(
+            (0, import_client_core37.parkedPlanApprovalEvent)(
               sessionId,
               {
                 requestId: app.pendingPlanApproval.requestId,
@@ -111493,7 +111919,7 @@ function startTuiRemoteControl(opts) {
             )
           ] : [],
           ...app.pendingAskUser !== null ? [
-            (0, import_client_core35.parkedAskUserEvent)(
+            (0, import_client_core37.parkedAskUserEvent)(
               sessionId,
               {
                 requestId: app.pendingAskUser.requestId,
@@ -111507,7 +111933,7 @@ function startTuiRemoteControl(opts) {
       resolvePlanApproval: (sessionId, requestId, approved) => {
         const refusal = requireCurrent(sessionId);
         if (refusal) return refusal;
-        return opts.verbs.resolvePlanApproval(requestId, approved, sessionId) ? import_client_core35.RC_OK : (0, import_client_core35.rcRefuse)("no_pending_permission", "that plan was already answered");
+        return opts.verbs.resolvePlanApproval(requestId, approved, sessionId) ? import_client_core37.RC_OK : (0, import_client_core37.rcRefuse)("no_pending_permission", "that plan was already answered");
       },
       answerQuestions: (sessionId, requestId, answers) => {
         const refusal = requireCurrent(sessionId);
@@ -111516,7 +111942,7 @@ function startTuiRemoteControl(opts) {
           requestId,
           answers,
           sessionId
-        ) ? import_client_core35.RC_OK : (0, import_client_core35.rcRefuse)("no_pending_permission", "those questions were already answered");
+        ) ? import_client_core37.RC_OK : (0, import_client_core37.rcRefuse)("no_pending_permission", "those questions were already answered");
       }
     }
   });
@@ -111541,7 +111967,7 @@ function startTuiRemoteControl(opts) {
       host.updateSession(currentSid, {
         ...model !== void 0 ? { model } : {},
         mode: app.permissionMode,
-        effort: (0, import_client_core35.rcEffortToWire)(app.reasoning)
+        effort: (0, import_client_core37.rcEffortToWire)(app.reasoning)
       });
     }
     const next = stateFromApp(app);
@@ -111575,7 +112001,7 @@ function startTuiRemoteControl(opts) {
         ...app.sessionTitle !== "" ? { title: app.sessionTitle } : {},
         ...lastModel !== void 0 ? { model: lastModel } : {},
         mode: lastMode,
-        effort: (0, import_client_core35.rcEffortToWire)(lastEffort)
+        effort: (0, import_client_core37.rcEffortToWire)(lastEffort)
       });
     },
     status: () => host.status(),
@@ -111590,7 +112016,6 @@ function startTuiRemoteControl(opts) {
 // src/services/history.ts
 import * as fs12 from "fs";
 import * as path10 from "path";
-var MAX_ENTRIES = 500;
 function historyFile() {
   return path10.join(orionHome(), "history.json");
 }
@@ -111603,11 +112028,9 @@ function loadHistory() {
   }
 }
 function appendHistory(text) {
-  const t = text.trim();
-  if (!t) return;
-  const cur = loadHistory();
-  if (cur[0] === t) return;
-  const next = [t, ...cur].slice(0, MAX_ENTRIES);
+  const current2 = loadHistory();
+  const next = pushEntry(current2, text);
+  if (next === current2) return;
   try {
     fs12.mkdirSync(orionHome(), { recursive: true });
     const tmp = `${historyFile()}.tmp`;
@@ -111619,19 +112042,19 @@ function appendHistory(text) {
 }
 
 // src/services/indexer.ts
-var import_client_core37 = __toESM(require_dist(), 1);
+var import_client_core39 = __toESM(require_dist(), 1);
 
 // src/services/nodeFileSource.ts
-var import_client_core36 = __toESM(require_dist(), 1);
+var import_client_core38 = __toESM(require_dist(), 1);
 
 // src/services/indexer.ts
 import { fileURLToPath as fileURLToPath2 } from "url";
 import * as fs13 from "fs";
 import * as path11 from "path";
-var INDEX_WATCH_INCLUDE = `**/*.{${import_client_core37.INDEX_FILE_EXTENSIONS.join(",")}}`;
-var EXCLUDE = "{" + [...import_client_core37.IGNORE_DIRS].map((d2) => `**/${d2}/**`).join(",") + "}";
+var INDEX_WATCH_INCLUDE = `**/*.{${import_client_core39.INDEX_FILE_EXTENSIONS.join(",")}}`;
+var EXCLUDE = "{" + [...import_client_core39.IGNORE_DIRS].map((d2) => `**/${d2}/**`).join(",") + "}";
 function createIndexer(bridge, workspaceRoot, store, onStatus, onFileEvent, options = {}) {
-  const fileSource = new import_client_core36.NodeFileSource(workspaceRoot, {
+  const fileSource = new import_client_core38.NodeFileSource(workspaceRoot, {
     watchInclude: INDEX_WATCH_INCLUDE,
     watchExclude: EXCLUDE
   });
@@ -111647,9 +112070,9 @@ function createIndexer(bridge, workspaceRoot, store, onStatus, onFileEvent, opti
     setFileCount: (n) => onStatus?.("orion.index.files", n)
   };
   const workerScriptPath = options.workerScriptPath ?? bundledIndexWorkerPath();
-  const controller = new import_client_core37.IndexModeController({
-    initialMode: (0, import_client_core37.normalizeIndexMode)(options.mode, "on"),
-    create: (defer) => new import_client_core37.ProcessWorkspaceIndexer({
+  const controller = new import_client_core39.IndexModeController({
+    initialMode: (0, import_client_core39.normalizeIndexMode)(options.mode, "on"),
+    create: (defer) => new import_client_core39.ProcessWorkspaceIndexer({
       getRoot: () => workspaceRoot,
       indexConfig,
       progress,
@@ -111658,7 +112081,7 @@ function createIndexer(bridge, workspaceRoot, store, onStatus, onFileEvent, opti
       rgPath: options.rgPath ?? null,
       deferBuildUntilFirstQuery: defer,
       fallback: {
-        indexer: new import_client_core37.WorkspaceIndexer(bridge, fileSource, indexConfig, progress, grammarDir, store),
+        indexer: new import_client_core39.WorkspaceIndexer(bridge, fileSource, indexConfig, progress, grammarDir, store),
         reader: store
       },
       log: (message, error) => {
@@ -111667,7 +112090,7 @@ function createIndexer(bridge, workspaceRoot, store, onStatus, onFileEvent, opti
       }
     })
   });
-  const safety = (0, import_client_core37.classifyWorkspaceRootForIndexing)(workspaceRoot);
+  const safety = (0, import_client_core39.classifyWorkspaceRootForIndexing)(workspaceRoot);
   if (!safety.safe) {
     onStatus?.("orion.index.state", "idle");
     onStatus?.("orion.index.percent", 0);
@@ -111736,6 +112159,52 @@ function indexOnFileModified(indexer, data) {
   }
 }
 
+// src/services/fileMentionIndex.ts
+var MENTION_MENU_LIMIT = 12;
+function withDirectories(files) {
+  const dirs = /* @__PURE__ */ new Set();
+  for (const file of files) {
+    for (let cut = file.indexOf("/"); cut >= 0; cut = file.indexOf("/", cut + 1)) {
+      dirs.add(`${file.slice(0, cut)}/`);
+    }
+  }
+  return [...dirs, ...files];
+}
+function depthOf(entry) {
+  let depth = 0;
+  for (let i2 = 0; i2 < entry.length - 1; i2++) {
+    if (entry[i2] === "/") depth++;
+  }
+  return depth;
+}
+function basenameOf(entry) {
+  const body2 = entry.endsWith("/") ? entry.slice(0, -1) : entry;
+  return body2.slice(body2.lastIndexOf("/") + 1);
+}
+function scoreOf(entry, query) {
+  if (query.length === 0) return 0;
+  const lowerEntry = entry.toLowerCase();
+  const base = basenameOf(lowerEntry);
+  if (base.startsWith(query)) return 0;
+  if (base.includes(query)) return 1;
+  if (lowerEntry.includes(query)) return 2;
+  return null;
+}
+function rankFileMentions(entries, query, limit = MENTION_MENU_LIMIT) {
+  const needle = query.toLowerCase();
+  const scored = [];
+  for (const entry of entries) {
+    if (entry.endsWith("/") && entry.toLowerCase() === needle) continue;
+    const score = scoreOf(entry, needle);
+    if (score === null) continue;
+    scored.push({ entry, score, depth: depthOf(entry), dir: entry.endsWith("/") ? 0 : 1 });
+  }
+  scored.sort(
+    (a, b2) => a.score - b2.score || a.depth - b2.depth || a.dir - b2.dir || a.entry.localeCompare(b2.entry)
+  );
+  return scored.slice(0, Math.max(0, limit)).map((s) => s.entry);
+}
+
 // src/main.tsx
 import * as path12 from "path";
 
@@ -111760,8 +112229,8 @@ function shouldAutoApprove(fullyAutomatic, configAutoApprove) {
 }
 
 // src/headless/runHeadless.ts
-var import_client_core38 = __toESM(require_dist(), 1);
-var import_client_ui_core17 = __toESM(require_dist2(), 1);
+var import_client_core40 = __toESM(require_dist(), 1);
+var import_client_ui_core18 = __toESM(require_dist2(), 1);
 import * as os6 from "os";
 import { randomUUID } from "crypto";
 var HEADLESS_RESULT_PREFIX = "ORION_HEADLESS_RESULT ";
@@ -111805,7 +112274,7 @@ function extractFinalAssistantText(data) {
 }
 async function runGoalLoop(deps2) {
   let turns = 0;
-  const runner = new import_client_core38.GoalRunner({
+  const runner = new import_client_core40.GoalRunner({
     // An explicit `--max-turns` overrides; without one this run takes the same default
     // ceiling every other host does. An unattended fleet is the LAST place that should be
     // the only caller running unbounded.
@@ -111823,7 +112292,7 @@ async function runHeadless(flags2) {
   const config = loadConfig();
   if (flags2.workspace) config.workspaceRoot = flags2.workspace;
   const secrets = createSecretStore();
-  const session = (0, import_client_core38.createAgentSession)(secrets, config);
+  const session = (0, import_client_core40.createAgentSession)(secrets, config);
   const signedIn = await session.isSignedIn();
   if (!signedIn && !process.env.ORION_AUTH_TOKEN) {
     throw new Error(
@@ -111848,15 +112317,15 @@ async function runHeadless(flags2) {
     reasoning: flags2.reasoning ?? ""
   });
   const authToken = async () => await session.currentAccessToken() ?? process.env.ORION_AUTH_TOKEN ?? null;
-  const bridge = new import_client_core38.OrionBridge(
+  const bridge = new import_client_core40.OrionBridge(
     () => config.apiUrl,
     authToken,
-    import_client_core38.nodeEmitterFactory,
+    import_client_core40.nodeEmitterFactory,
     () => session.refresh().then(() => true, () => false)
   );
-  const brain = (0, import_client_core38.createHostBrain)({
+  const brain = (0, import_client_core40.createHostBrain)({
     topology: config.brainTopology,
-    resolveBinary: () => (0, import_client_core38.resolveBrainBinary)({
+    resolveBinary: () => (0, import_client_core40.resolveBrainBinary)({
       configPath: config.brainPath,
       env: process.env,
       bundledCandidates: bundledBrainCandidates()
@@ -111867,19 +112336,19 @@ async function runHeadless(flags2) {
     renewBearer: async () => await session.currentFreshAccessToken() ?? process.env.ORION_AUTH_TOKEN ?? null,
     log: (message, error) => console.error(`[orion-brain] ${message}${error ? `: ${String(error)}` : ""}`)
   });
-  const turnTransport = (0, import_client_core38.createTurnTransport)({
+  const turnTransport = (0, import_client_core40.createTurnTransport)({
     mode: config.brain,
     bridge,
-    makeLocal: () => new import_client_core38.LocalBrainTransport({
+    makeLocal: () => new import_client_core40.LocalBrainTransport({
       // Proactive freshness for the segment-holding bearer (the interactive TUI's twin).
       authToken: async () => await session.currentFreshAccessToken() ?? process.env.ORION_AUTH_TOKEN ?? null,
       gatewayUrl: () => config.apiUrl,
       connect: () => brain.connect()
     })
   });
-  const codebaseIndexFallback = new import_client_core38.WorkspaceIndexStore();
-  const ripgrep = new import_client_core38.NodeRipgrepLocator({
-    bundledCandidates: () => (0, import_client_core38.vscodeRipgrepCandidates)((specifier) => __require.resolve(specifier))
+  const codebaseIndexFallback = new import_client_core40.WorkspaceIndexStore();
+  const ripgrep = new import_client_core40.NodeRipgrepLocator({
+    bundledCandidates: () => (0, import_client_core40.vscodeRipgrepCandidates)((specifier) => __require.resolve(specifier))
   });
   const indexer = createIndexer(bridge, config.workspaceRoot, codebaseIndexFallback, void 0, void 0, {
     rgPath: ripgrep.locate(),
@@ -111889,13 +112358,13 @@ async function runHeadless(flags2) {
     mode: "on-demand"
   });
   void indexer.start().catch(() => void 0);
-  const permissionStore = new import_client_core38.PermissionSettingsStore({ workspaceRoot: config.workspaceRoot });
+  const permissionStore = new import_client_core40.PermissionSettingsStore({ workspaceRoot: config.workspaceRoot });
   await permissionStore.load();
-  const executor = new import_client_core38.ToolExecutor(
+  const executor = new import_client_core40.ToolExecutor(
     () => config.workspaceRoot,
     () => appStore.getState().permissionMode,
     secrets,
-    new import_client_core38.NullLspProvider(),
+    new import_client_core40.NullLspProvider(),
     ripgrep,
     nullFrameSinkFactory,
     fallbackBrowserConfig,
@@ -111918,7 +112387,7 @@ async function runHeadless(flags2) {
     workspaceRoot: config.workspaceRoot,
     homeDir: os6.homedir()
   });
-  const sandboxAvailable = (0, import_client_core38.probeSandboxAvailable)();
+  const sandboxAvailable = (0, import_client_core40.probeSandboxAvailable)();
   await (0, import_client_core8.refreshEndpointRouting)(appStore.getState().provider, {
     workspaceRoot: config.workspaceRoot
   });
@@ -111944,7 +112413,7 @@ async function runHeadless(flags2) {
   };
   const sessionId = randomUUID();
   let messages = [];
-  const clientState = (0, import_client_ui_core17.emptyClientState)();
+  const clientState = (0, import_client_ui_core18.emptyClientState)();
   const runTurn = async (prompt) => {
     const ac = new AbortController();
     const snapshot = [...messages];
@@ -111952,7 +112421,7 @@ async function runHeadless(flags2) {
     const onEvent = (ev) => {
       lastEvent = ev;
     };
-    const outcome = await (0, import_client_core38.driveTurn)(
+    const outcome = await (0, import_client_core40.driveTurn)(
       turnTransport,
       {
         sessionId,
@@ -111962,7 +112431,7 @@ async function runHeadless(flags2) {
         routing: routing(),
         clientCapabilities: [],
         drainQueuedInput: () => [],
-        getOrionResources: () => (0, import_client_core38.buildOrionSnapshot)(config.workspaceRoot, void 0, sessionId),
+        getOrionResources: () => (0, import_client_core40.buildOrionSnapshot)(config.workspaceRoot, void 0, sessionId),
         getFileHistoryManifest: () => executor.fileHistoryManifest(sessionId)
       },
       {
@@ -111994,8 +112463,8 @@ async function runHeadless(flags2) {
 }
 
 // src/services/feedbackGate.ts
-var import_client_core39 = __toESM(require_dist(), 1);
-var import_client_ui_core18 = __toESM(require_dist2(), 1);
+var import_client_core41 = __toESM(require_dist(), 1);
+var import_client_ui_core19 = __toESM(require_dist2(), 1);
 import { randomUUID as randomUUID2 } from "crypto";
 var TuiFeedbackGate = class {
   constructor(deps2) {
@@ -112015,13 +112484,13 @@ var TuiFeedbackGate = class {
   maybeOffer(sessionId, turnId) {
     const now2 = this.now();
     const config = this.deps.loadConfig();
-    let state = (0, import_client_ui_core18.feedbackStateFromScalars)(config, now2);
+    let state = (0, import_client_ui_core19.feedbackStateFromScalars)(config, now2);
     if (config.feedbackFirstSeenAt <= 0 || config.feedbackSeed === 0) {
-      state = { ...state, seed: (0, import_client_ui_core18.mintFeedbackSeed)() };
-      this.safeSave((0, import_client_ui_core18.feedbackScalarsFromState)(state));
+      state = { ...state, seed: (0, import_client_ui_core19.mintFeedbackSeed)() };
+      this.safeSave((0, import_client_ui_core19.feedbackScalarsFromState)(state));
     }
     const pendings = this.deps.getPendings();
-    const offer = (0, import_client_ui_core18.shouldOfferFeedback)(state, {
+    const offer = (0, import_client_ui_core19.shouldOfferFeedback)(state, {
       now: now2,
       completedTurnsThisSession: this.turnsBySession.get(sessionId) ?? 0,
       turnCompletedCleanly: true,
@@ -112032,8 +112501,8 @@ var TuiFeedbackGate = class {
       forced: this.deps.forced
     });
     if (!offer) return;
-    state = (0, import_client_ui_core18.applyFeedbackShown)(state, now2);
-    this.safeSave((0, import_client_ui_core18.feedbackScalarsFromState)(state));
+    state = (0, import_client_ui_core19.applyFeedbackShown)(state, now2);
+    this.safeSave((0, import_client_ui_core19.feedbackScalarsFromState)(state));
     const routing = this.deps.getRouting();
     const requestId = randomUUID2();
     this.pendingId = requestId;
@@ -112044,7 +112513,7 @@ var TuiFeedbackGate = class {
       model: routing.model,
       provider: routing.provider
     });
-    void (0, import_client_core39.sendFeedbackImpression)(this.deps.submit, "shown", "tui");
+    void (0, import_client_core41.sendFeedbackImpression)(this.deps.submit, "shown", "tui");
   }
   /** The user rated. Snapshot the transcript SYNCHRONOUSLY (before any await), then
    *  scrub + assemble + send off the interactive path. Idempotent per requestId. */
@@ -112055,10 +112524,10 @@ var TuiFeedbackGate = class {
     const snapshot = this.deps.getMessages().slice();
     const now2 = this.now();
     const config = this.deps.loadConfig();
-    const state = (0, import_client_ui_core18.applyFeedbackSubmitted)((0, import_client_ui_core18.feedbackStateFromScalars)(config, now2), now2);
-    this.safeSave((0, import_client_ui_core18.feedbackScalarsFromState)(state));
-    const card = (0, import_client_ui_core18.feedbackSetWhy)((0, import_client_ui_core18.feedbackSelectScore)((0, import_client_ui_core18.createFeedbackCard)(), score), why);
-    const body2 = (0, import_client_ui_core18.buildFeedbackSubmission)(card, {
+    const state = (0, import_client_ui_core19.applyFeedbackSubmitted)((0, import_client_ui_core19.feedbackStateFromScalars)(config, now2), now2);
+    this.safeSave((0, import_client_ui_core19.feedbackScalarsFromState)(state));
+    const card = (0, import_client_ui_core19.feedbackSetWhy)((0, import_client_ui_core19.feedbackSelectScore)((0, import_client_ui_core19.createFeedbackCard)(), score), why);
+    const body2 = (0, import_client_ui_core19.buildFeedbackSubmission)(card, {
       submissionId: randomUUID2(),
       sessionId: meta.sessionId,
       turnId: meta.turnId,
@@ -112067,13 +112536,13 @@ var TuiFeedbackGate = class {
       model: meta.model,
       provider: meta.provider
     });
-    const { conversation, truncated } = (0, import_client_core39.scrubFeedbackConversation)(snapshot);
-    void (0, import_client_core39.sendFeedbackSubmission)(this.deps.submit, {
+    const { conversation, truncated } = (0, import_client_core41.scrubFeedbackConversation)(snapshot);
+    void (0, import_client_core41.sendFeedbackSubmission)(this.deps.submit, {
       ...body2,
       conversation,
       conversation_truncated: truncated
     });
-    this.deps.appendNote(import_client_ui_core18.FEEDBACK_WORDING.transcriptNote);
+    this.deps.appendNote(import_client_ui_core19.FEEDBACK_WORDING.transcriptNote);
     return true;
   }
   /** The session/transcript under a pending card is going away (new chat, resume) —
@@ -112092,12 +112561,12 @@ var TuiFeedbackGate = class {
     this.deps.setPendingFeedback(null);
     if (explicit) {
       const now2 = this.now();
-      const state = (0, import_client_ui_core18.applyFeedbackDismissed)(
-        (0, import_client_ui_core18.feedbackStateFromScalars)(this.deps.loadConfig(), now2),
+      const state = (0, import_client_ui_core19.applyFeedbackDismissed)(
+        (0, import_client_ui_core19.feedbackStateFromScalars)(this.deps.loadConfig(), now2),
         now2
       );
-      this.safeSave((0, import_client_ui_core18.feedbackScalarsFromState)(state));
-      void (0, import_client_core39.sendFeedbackImpression)(this.deps.submit, "dismissed", "tui");
+      this.safeSave((0, import_client_ui_core19.feedbackScalarsFromState)(state));
+      void (0, import_client_core41.sendFeedbackImpression)(this.deps.submit, "dismissed", "tui");
     }
     return true;
   }
@@ -112111,7 +112580,7 @@ var TuiFeedbackGate = class {
 
 // src/main.tsx
 var import_jsx_runtime77 = __toESM(require_jsx_runtime(), 1);
-var SANDBOX_AVAILABLE = (0, import_client_core40.probeSandboxAvailable)();
+var SANDBOX_AVAILABLE = (0, import_client_core42.probeSandboxAvailable)();
 async function main() {
   let headlessFlags = null;
   try {
@@ -112163,8 +112632,8 @@ async function main() {
     }
   });
   void (0, import_client_core8.refreshEndpointRouting)(config.provider, { workspaceRoot: config.workspaceRoot });
-  void (0, import_client_core41.prewarmInterimModels)(config.workspaceRoot);
-  void (0, import_client_core41.prewarmRepoIdentity)(config.workspaceRoot);
+  void (0, import_client_core43.prewarmInterimModels)(config.workspaceRoot);
+  void (0, import_client_core43.prewarmRepoIdentity)(config.workspaceRoot);
   const setSessionTitle = (title) => {
     appStore.setState((s) => s.sessionTitle === title ? s : { ...s, sessionTitle: title });
   };
@@ -112188,8 +112657,8 @@ async function main() {
     }
   });
   const secrets = createSecretStore();
-  const session = (0, import_client_core41.createAgentSession)(secrets, config);
-  const outcomes = new import_client_core41.OutcomeReporter({
+  const session = (0, import_client_core43.createAgentSession)(secrets, config);
+  const outcomes = new import_client_core43.OutcomeReporter({
     apiBaseUrl: () => config.accountsApiUrl,
     accessToken: () => session.currentAccessToken()
   });
@@ -112241,10 +112710,10 @@ async function main() {
     }
   }
   const authToken = async () => await session.currentAccessToken() ?? process.env.ORION_AUTH_TOKEN ?? null;
-  const bridge = new import_client_core40.OrionBridge(
+  const bridge = new import_client_core42.OrionBridge(
     () => config.apiUrl,
     authToken,
-    import_client_core41.nodeEmitterFactory,
+    import_client_core43.nodeEmitterFactory,
     // Seamless refresh: a 401 coalesces ONE refresh through the AgentSession (single-flight), so a
     // token cycling mid-chat never logs the user out. `refreshAndSyncGate` also re-syncs the cached
     // gate flag so a definitively-revoked session re-gates the chat cleanly (no stale "signed in").
@@ -112252,9 +112721,9 @@ async function main() {
   );
   let brainInstance;
   const brain = () => {
-    brainInstance ??= (0, import_client_core41.createHostBrain)({
+    brainInstance ??= (0, import_client_core43.createHostBrain)({
       topology: config.brainTopology,
-      resolveBinary: () => (0, import_client_core41.resolveBrainBinary)({
+      resolveBinary: () => (0, import_client_core43.resolveBrainBinary)({
         configPath: config.brainPath,
         env: process.env,
         bundledCandidates: bundledBrainCandidates()
@@ -112269,10 +112738,10 @@ async function main() {
     });
     return brainInstance;
   };
-  const turnTransport = (0, import_client_core41.createTurnTransport)({
+  const turnTransport = (0, import_client_core43.createTurnTransport)({
     mode: config.brain,
     bridge,
-    makeLocal: () => new import_client_core41.LocalBrainTransport({
+    makeLocal: () => new import_client_core43.LocalBrainTransport({
       // Proactive freshness: the brain holds this bearer for a whole segment and cannot
       // ride the bridge's reactive 401-refresh — so validate-or-refresh before hand-off.
       authToken: async () => await session.currentFreshAccessToken() ?? process.env.ORION_AUTH_TOKEN ?? null,
@@ -112280,14 +112749,14 @@ async function main() {
       connect: () => brain().connect()
     })
   });
-  const codebaseIndexFallback = new import_client_core40.WorkspaceIndexStore();
-  const ripgrep = new import_client_core41.NodeRipgrepLocator({
+  const codebaseIndexFallback = new import_client_core42.WorkspaceIndexStore();
+  const ripgrep = new import_client_core43.NodeRipgrepLocator({
     // Bundled-first rg: ships as an optionalDependency of this package, so an
     // `npm i -g` user gets fast search with nothing else installed. Resolved
     // from THIS package's node_modules via require.resolve (nested and hoisted
     // layouts both work); absent (install offline / postinstall failed) → the
     // locator falls through to PATH + well-known paths exactly as before.
-    bundledCandidates: () => (0, import_client_core41.vscodeRipgrepCandidates)((specifier) => __require.resolve(specifier))
+    bundledCandidates: () => (0, import_client_core43.vscodeRipgrepCandidates)((specifier) => __require.resolve(specifier))
   });
   const indexer = createIndexer(
     bridge,
@@ -112312,28 +112781,28 @@ async function main() {
     // the store's referential stability: unchanged state returns the same object.
     (relPath) => transcriptStore.setState((s) => {
       const clientState = { ...s.clientState };
-      if (!(0, import_client_ui_core19.dropSeenPath)(clientState, relPath)) return s;
+      if (!(0, import_client_ui_core20.dropSeenPath)(clientState, relPath)) return s;
       return { ...s, clientState };
     }),
     { rgPath: ripgrep.locate(), mode: config.indexMode }
   );
   void indexer.start().catch(() => void 0);
   initIndexModeService({ appStore, setMode: (m2) => indexer.setMode(m2) });
-  const permissionStore = new import_client_core41.PermissionSettingsStore({ workspaceRoot: config.workspaceRoot });
+  const permissionStore = new import_client_core43.PermissionSettingsStore({ workspaceRoot: config.workspaceRoot });
   await permissionStore.load();
-  const executor = new import_client_core40.ToolExecutor(
+  const executor = new import_client_core42.ToolExecutor(
     () => config.workspaceRoot,
     // The session's EFFECTIVE mode — the same turbo⇒full_access law the wire rides
     // (`currentRouting`), never the bare store mode: the executor's membership
     // backstop must agree with the gate that already ruled on each call. Loop-run
     // sessions never enable turbo on the bridge, so they keep the configured mode
     // their own wire rides.
-    (sessionId2) => (0, import_client_core41.effectiveWirePermissionMode)(
+    (sessionId2) => (0, import_client_core43.effectiveWirePermissionMode)(
       sessionId2 !== void 0 && bridge.isTurboModeEnabledForSession(sessionId2),
       appStore.getState().permissionMode
     ),
     secrets,
-    new import_client_core41.NullLspProvider(),
+    new import_client_core43.NullLspProvider(),
     ripgrep,
     nullFrameSinkFactory,
     fallbackBrowserConfig,
@@ -112456,11 +112925,11 @@ async function main() {
     }
     renderLane(transcriptStore, appStore, ev);
     if (ev.event === "usage_recorded") {
-      (0, import_client_core40.recordTurnMetrics)({
+      (0, import_client_core42.recordTurnMetrics)({
         app: "tui",
         sessionId,
         workspaceRoot: currentRouting().workspaceRoot,
-        turn: (0, import_client_core40.turnMetricsFromUsageRecorded)(ev.data ?? {})
+        turn: (0, import_client_core42.turnMetricsFromUsageRecorded)(ev.data ?? {})
       });
     }
     if (ev.event === "file_modified") {
@@ -112484,7 +112953,7 @@ async function main() {
     sessionSub = bridge.onSessionEvent(sid, onSessionStreamEvent);
   };
   let goalRunner = null;
-  const cronController = new import_client_core41.CronController({
+  const cronController = new import_client_core43.CronController({
     submitTurn: (prompt) => sendTurn(prompt, "\u27F3 scheduled", void 0, "system"),
     isBusy: () => appStore.getState().status === "streaming",
     persistence: fileCronPersistence(config.workspaceRoot)
@@ -112492,6 +112961,15 @@ async function main() {
   const resetTransient = () => {
     goalRunner?.stop();
     goalRunner = null;
+    const dropped = appStore.getState().queuedMessages.length;
+    if (dropped > 0) {
+      transcriptStore.setState(
+        (s) => appendNote(
+          s,
+          `${dropped} pending ${dropped === 1 ? "message was" : "messages were"} not carried into this chat.`
+        )
+      );
+    }
     appStore.setState((s) => ({
       ...s,
       contextTokens: 0,
@@ -112507,8 +112985,11 @@ async function main() {
       pendingPermissions: [],
       pendingPlanApproval: null,
       pendingAttachments: [],
+      // The ONE place queued input is discarded rather than delivered: a new
+      // chat is a different conversation, so the old one's pending text cannot
+      // ride into it. The note above says so — a silent drop is what every other
+      // path here was rewritten to stop doing.
       queuedMessages: [],
-      // the old chat's pending input must never ride into the new one
       scrollBack: 0
       // snap to bottom on session swap
     }));
@@ -112658,15 +113139,18 @@ async function main() {
     return registry.complete(input).map((c3) => ({
       name: c3.name,
       argumentHint: c3.argumentHint,
-      description: c3.description
+      description: c3.description,
+      // Carried so the menu can tag a contributed command with the catalog it
+      // came from; builtins render untagged.
+      source: c3.source
     }));
   };
   const slashTokenRanges = (v2) => {
     const anywhere = new Set(
       registry.all().filter((c3) => c3.source === "skill").map((c3) => c3.name)
     );
-    const ranges = (0, import_client_core41.scanSlashTokenRanges)(v2, anywhere);
-    const lead = (0, import_client_core41.matchSlashToken)(v2);
+    const ranges = (0, import_client_core43.scanSlashTokenRanges)(v2, anywhere);
+    const lead = (0, import_client_core43.matchSlashToken)(v2);
     if (lead && !anywhere.has(lead.name) && registry.get(lead.name)) {
       const start2 = v2.indexOf("/");
       ranges.unshift({ start: start2, end: start2 + lead.name.length + 1 });
@@ -112674,18 +113158,13 @@ async function main() {
     }
     return ranges;
   };
-  let fileCache = [];
-  let fileCacheBuilt = false;
-  const getFileSuggestions = (prefix) => {
-    if (!fileCacheBuilt) {
-      fileCacheBuilt = true;
-      void new import_client_core36.NodeFileSource(config.workspaceRoot).findFiles("**/*", "{**/node_modules/**,**/.git/**,**/dist/**,**/build/**}", 5e3).then((abs) => {
-        fileCache = abs.map((p2) => path12.relative(config.workspaceRoot, p2).split(path12.sep).join("/"));
-      }).catch(() => void 0);
-    }
-    const p = prefix.toLowerCase();
-    return (p ? fileCache.filter((f) => f.toLowerCase().includes(p)) : fileCache).slice(0, 8);
-  };
+  let fileEntries = [];
+  void new import_client_core38.NodeFileSource(config.workspaceRoot).findFiles("**/*", "{**/node_modules/**,**/.git/**,**/dist/**,**/build/**}", 5e3).then((abs) => {
+    fileEntries = withDirectories(
+      abs.map((p) => path12.relative(config.workspaceRoot, p).split(path12.sep).join("/"))
+    );
+  }).catch(() => void 0);
+  const getFileSuggestions = (prefix) => rankFileMentions(fileEntries, prefix);
   let app = null;
   const exit = () => {
     presence.dispose();
@@ -112707,23 +113186,11 @@ async function main() {
     if (turn && streaming && !turn.cancelRequested && turn.phase === "stream") {
       turn.cancelRequested = true;
       outcomes.report({ kind: "cancel_context", kept_edits: turn.hadEdits });
-      turn.disposeFallback = (0, import_client_core41.armGracefulCancel)({
+      turn.disposeFallback = (0, import_client_core43.armGracefulCancel)({
         controller: turn.abort,
         sendCancel: () => turnTransport.cancelTurn(turn.sessionId)
       });
-      appStore.setState((s) => ({
-        ...s,
-        statusText: "stopping\u2026",
-        // Parked MAIN-turn prompts are moot the moment the user stops the turn;
-        // queued steering must not leak into a later turn via drainQueuedInput.
-        // A SUB-AGENT's prompt (agentLabel) survives — stopping the turn spares
-        // running children, so their questions still need an answer.
-        pendingPermissions: s.pendingPermissions.filter((p) => p.agentLabel),
-        pendingPlanApproval: null,
-        pendingAskUser: null,
-        pendingWorkPlan: null,
-        queuedMessages: []
-      }));
+      appStore.setState((s) => ({ ...s, statusText: "stopping\u2026", ...clearParkedForStop(s) }));
       rejectPendingWorkPlan();
       return;
     }
@@ -112732,16 +113199,12 @@ async function main() {
     rejectPendingWorkPlan();
     appStore.setState((s) => ({
       ...s,
-      // Keep sub-agent prompts (agentLabel) — children outlive the turn.
-      pendingPermissions: s.pendingPermissions.filter((p) => p.agentLabel),
-      pendingPlanApproval: null,
-      pendingAskUser: null,
-      pendingWorkPlan: null,
+      ...clearParkedForStop(s),
+      // same one definition as the graceful branch
       status: "idle",
       statusText: "",
-      turnStartedAt: 0,
+      turnStartedAt: 0
       // an interrupted turn stamps no Orbited line
-      queuedMessages: []
     }));
   };
   const onScroll = (delta) => {
@@ -112779,7 +113242,7 @@ async function main() {
   };
   const heldAgentReports = [];
   let inboundPeerHop = null;
-  const agentManager = new import_client_core41.AgentManager((0, import_client_core41.brainAwareAgentTransport)(bridge, turnTransport), executor, async () => {
+  const agentManager = new import_client_core43.AgentManager((0, import_client_core43.brainAwareAgentTransport)(bridge, turnTransport), executor, async () => {
     const result = await bridge.rpc("list_personas", {});
     return result.personas ?? [];
   });
@@ -112789,8 +113252,8 @@ async function main() {
   agentManager.attachOutcomeSink((outcome) => {
     oVaultSessions.for(outcome.parentSessionId, currentRouting().workspaceRoot)?.recordSiblingOutcome(outcome);
   });
-  void (0, import_client_core41.loadAgentDefs)(config.workspaceRoot).then((defs) => agentManager.prime(defs));
-  const workGraphManager = new import_client_core41.WorkGraphManager({ agents: agentManager, tools: executor });
+  void (0, import_client_core43.loadAgentDefs)(config.workspaceRoot).then((defs) => agentManager.prime(defs));
+  const workGraphManager = new import_client_core43.WorkGraphManager({ agents: agentManager, tools: executor });
   workGraphManager.registerTools(executor);
   const workPlanApproval = new WorkPlanApprovalBridge();
   function rejectPendingWorkPlan() {
@@ -112813,7 +113276,7 @@ async function main() {
     workRunTicker = setInterval(() => {
       const record = liveRunRecord;
       if (!record) return stopWorkRunTicker();
-      const view = (0, import_client_core41.buildRunGraphView)(record, agentManager.agentsFor(sessionId), Date.now(), tuiFlowBudget());
+      const view = (0, import_client_core43.buildRunGraphView)(record, agentManager.agentsFor(sessionId), Date.now(), tuiFlowBudget());
       appStore.setState(
         (s) => s.workRun ? { ...s, workRun: { ...s.workRun, view } } : s
       );
@@ -112837,11 +113300,11 @@ async function main() {
         const status = appStore.getState().status;
         if (status !== "idle" && status !== "error") return;
         if (heldAgentReports.length === 0) return;
-        sendTurn(import_client_core41.SUBAGENT_WAKE_PROMPT, void 0, void 0, "system");
+        sendTurn(import_client_core43.SUBAGENT_WAKE_PROMPT, void 0, void 0, "system");
       },
       onRunUpdate: (record) => {
         liveRunRecord = record;
-        const view = (0, import_client_core41.buildRunGraphView)(record, agentManager.agentsFor(sessionId), Date.now(), tuiFlowBudget());
+        const view = (0, import_client_core43.buildRunGraphView)(record, agentManager.agentsFor(sessionId), Date.now(), tuiFlowBudget());
         if (view.live) {
           startWorkRunTicker();
           appStore.setState((s) => ({
@@ -112882,7 +113345,7 @@ async function main() {
     agentManager.attachParent(sid, {
       routing: () => currentRouting(),
       clientCapabilities: () => [
-        ...(0, import_client_core40.platformCapabilities)(),
+        ...(0, import_client_core42.platformCapabilities)(),
         ...appStore.getState().subagentsEnabled ? ["subagents"] : []
       ],
       transcript: () => transcriptStore.getState().messages,
@@ -112891,7 +113354,7 @@ async function main() {
         const status = appStore.getState().status;
         if (status !== "idle" && status !== "error") return;
         if (heldAgentReports.length === 0) return;
-        sendTurn(import_client_core41.SUBAGENT_WAKE_PROMPT, void 0, void 0, "system");
+        sendTurn(import_client_core43.SUBAGENT_WAKE_PROMPT, void 0, void 0, "system");
       },
       onLifecycle: (ev) => onRenderEvent({
         event: "agent_lifecycle",
@@ -112927,7 +113390,7 @@ async function main() {
         timestamp: Date.now(),
         data
       }),
-      getOrionResources: () => (0, import_client_core40.buildOrionSnapshot)(config.workspaceRoot, void 0, sid),
+      getOrionResources: () => (0, import_client_core42.buildOrionSnapshot)(config.workspaceRoot, void 0, sid),
       // Full-dose source for review-persona children (lesson dosing) — the same
       // attention payload the parent turn itself ships.
       oVaultAttention: () => {
@@ -112967,7 +113430,7 @@ async function main() {
       // the /turbo-toggle vs --fully-automatic gap: the flag already overrides the
       // store mode at launch (launchPermissionMode); the toggle now buys the same
       // backend posture, so no ask is ever born and batch-mates stop deferring.
-      permissionMode: (0, import_client_core41.effectiveWirePermissionMode)(
+      permissionMode: (0, import_client_core43.effectiveWirePermissionMode)(
         bridge.isTurboModeEnabledForSession(sessionId),
         a.permissionMode
       ),
@@ -112987,8 +113450,8 @@ async function main() {
       sandboxAvailable: SANDBOX_AVAILABLE
     };
   };
-  const oVaultSessions = new import_client_core40.OVaultSessions(() => process.env.ORION_OVAULT_CAPTURE !== "0");
-  oVaultSessions.syncRunner = new import_client_core40.OVaultSyncRunner({
+  const oVaultSessions = new import_client_core42.OVaultSessions(() => process.env.ORION_OVAULT_CAPTURE !== "0");
+  oVaultSessions.syncRunner = new import_client_core42.OVaultSyncRunner({
     auth: {
       apiBaseUrl: () => config.accountsApiUrl,
       accessToken: () => session.currentAccessToken(),
@@ -113046,7 +113509,7 @@ async function main() {
         return;
       }
     }
-    if (lastTurnComplete?.sessionId === sid && Date.now() - lastTurnComplete.at < import_client_core41.REPHRASE_WINDOW_MS) {
+    if (lastTurnComplete?.sessionId === sid && Date.now() - lastTurnComplete.at < import_client_core43.REPHRASE_WINDOW_MS) {
       outcomes.report({ kind: "rephrase" });
     }
     triggerSecurityCapabilitiesRefresh(bridge, appStore);
@@ -113064,7 +113527,7 @@ async function main() {
     };
     try {
       const peerAgents = await presence.registry.peersForWire(sid).catch(() => []);
-      const outcome = await (0, import_client_core40.driveTurn)(
+      const outcome = await (0, import_client_core42.driveTurn)(
         turnTransport,
         {
           sessionId: sid,
@@ -113085,7 +113548,7 @@ async function main() {
           // `workgraph` rides the same switch as the fan-out family: a work graph IS a
           // fan-out (its phases are sub-agents), so turning sub-agents off must hide both.
           clientCapabilities: [
-            ...(0, import_client_core40.platformCapabilities)(),
+            ...(0, import_client_core42.platformCapabilities)(),
             ...appStore.getState().subagentsEnabled ? ["scheduling", "subagents", "workgraph"] : ["scheduling"],
             // This terminal can RECEIVE a peer message, so it may also address them.
             "agent_messaging"
@@ -113105,7 +113568,7 @@ async function main() {
           // Ship the `.orion` snapshot so the backend's begin-turn loaders read
           // config / sub-agent defs / skills / hooks / memory / plugins from the
           // body — no live client-read channel in the stateless segment model.
-          getOrionResources: () => (0, import_client_core40.buildOrionSnapshot)(currentRouting().workspaceRoot, void 0, sid),
+          getOrionResources: () => (0, import_client_core42.buildOrionSnapshot)(currentRouting().workspaceRoot, void 0, sid),
           getFileHistoryManifest: () => executor.fileHistoryManifest(sid),
           // Lesson-recall anchors: the TUI has no editor attention, so recently-touched
           // paths from the capture observer are the attention set.
@@ -113115,7 +113578,7 @@ async function main() {
             return { active: null, open: [], touched, related: executor.oVaultRelatedPaths?.(touched) ?? [] };
           }
         },
-        (0, import_client_core40.withOVault)(
+        (0, import_client_core42.withOVault)(
           {
             ...boundary.makeHandlers(sid, ac.signal, onEvent),
             // Stops the driver from POSTING the next segment when the user cancelled at a
@@ -113127,7 +113590,7 @@ async function main() {
             onToolResult: (payload) => {
               if (payload.terminal_savings) {
                 terminalSavings.push(payload.terminal_savings);
-                (0, import_client_core40.recordTurnMetrics)({
+                (0, import_client_core42.recordTurnMetrics)({
                   app: "tui",
                   sessionId: sid,
                   workspaceRoot: currentRouting().workspaceRoot,
@@ -113161,12 +113624,12 @@ async function main() {
         settleOutcome = "completed";
         lastTurnComplete = { sessionId: sid, at: Date.now() };
         const data = outcome.event.data ?? {};
-        endSettle = { kind: "complete", finalText: (0, import_client_core41.finalAssistantTextFromWire)(data.messages) };
-        (0, import_client_core40.recordTurnMetrics)({
+        endSettle = { kind: "complete", finalText: (0, import_client_core43.finalAssistantTextFromWire)(data.messages) };
+        (0, import_client_core42.recordTurnMetrics)({
           app: "tui",
           sessionId: sid,
           workspaceRoot: currentRouting().workspaceRoot,
-          turn: (0, import_client_core40.turnMetricsFromComplete)(data),
+          turn: (0, import_client_core42.turnMetricsFromComplete)(data),
           terminalSavings
         });
         void oVaultSessions.reflectorFor(sid, currentRouting().workspaceRoot, bridge)?.run("turn_complete").finally(
@@ -113210,7 +113673,7 @@ async function main() {
     } finally {
       turn.disposeFallback?.();
       if (currentTurn === turn) {
-        settleSteerQueue(settleOutcome, {
+        settleSteerQueue({
           app: appStore,
           isBusy: () => currentTurn !== null || goalRunner !== null,
           send: sendTurn,
@@ -113232,7 +113695,13 @@ async function main() {
       if (remoteAttachments !== void 0 && remoteAttachments.length > 0) return "declined";
       appStore.setState((s) => ({
         ...s,
-        queuedMessages: [...s.queuedMessages, queuedSteer(text, display)]
+        queuedMessages: [
+          ...s.queuedMessages,
+          // `origin` is the caller's own: a keyboard send that lost the race to
+          // a starting turn stays the reader's to pull back, while a phone or
+          // cron send is machine-owned and stays put.
+          origin === "user" ? queuedSteer(text, display) : machineSteer(text, display)
+        ]
       }));
       return "queued";
     }
@@ -113271,7 +113740,7 @@ async function main() {
         ...s,
         queuedMessages: [
           ...s.queuedMessages,
-          queuedCommand(`/skills ${name2}${args2 ? ` ${args2}` : ""}`)
+          machineCommand(`/skills ${name2}${args2 ? ` ${args2}` : ""}`)
         ]
       }));
       return;
@@ -113297,8 +113766,8 @@ async function main() {
   executor.registerHostTool("schedule_task", makeScheduleTaskHandler(cronController));
   const loopService = new LoopService({
     workspaceRoot: config.workspaceRoot,
-    schedulePath: loopSchedulePathFor((0, import_client_core41.runsRootFor)("loops", config.workspaceRoot)),
-    transport: (0, import_client_core41.brainAwareAgentTransport)(bridge, turnTransport),
+    schedulePath: loopSchedulePathFor((0, import_client_core43.runsRootFor)("loops", config.workspaceRoot)),
+    transport: (0, import_client_core43.brainAwareAgentTransport)(bridge, turnTransport),
     tools: executor,
     // The CONFIGURED mode rides here deliberately, not the turbo-effective one
     // (currentRouting applies the turbo→full_access law): a loop is standing
@@ -113341,17 +113810,17 @@ async function main() {
     if (sessionBusy()) {
       appStore.setState((s) => ({
         ...s,
-        queuedMessages: [...s.queuedMessages, queuedCommand(`/goal ${goal}`)]
+        queuedMessages: [...s.queuedMessages, machineCommand(`/goal ${goal}`)]
       }));
       return;
     }
-    const runner = new import_client_core41.GoalRunner({ runTurn: runGoalTurn });
+    const runner = new import_client_core43.GoalRunner({ runTurn: runGoalTurn });
     goalRunner = runner;
     transcriptStore.setState((s) => appendNote(s, `Goal started \u2014 working until complete: ${goal}`));
     void runner.run(goal).then((reason) => {
       if (goalRunner === runner) goalRunner = null;
-      transcriptStore.setState((s) => appendNote(s, (0, import_client_core41.describeGoalEnd)(reason)));
-      settleSteerQueue("completed", {
+      transcriptStore.setState((s) => appendNote(s, (0, import_client_core43.describeGoalEnd)(reason)));
+      settleSteerQueue({
         app: appStore,
         isBusy: () => currentTurn !== null || goalRunner !== null,
         send: sendTurn,
@@ -113368,6 +113837,9 @@ async function main() {
       queuedMessages: [...s.queuedMessages, queuedCommand(text)]
     }));
   };
+  const enqueueMachineSteer = (text) => {
+    appStore.setState((s) => ({ ...s, queuedMessages: [...s.queuedMessages, machineSteer(text)] }));
+  };
   const drainQueuedInput = () => drainSteersForSegment(appStore, transcriptStore);
   rc = startTuiRemoteControl({
     bridge,
@@ -113384,13 +113856,13 @@ async function main() {
         const outcome = sendTurn(text, void 0, attachments, "system");
         return outcome === "started" || outcome === "queued";
       },
-      steer: (text) => enqueueSteer(text),
+      steer: (text) => enqueueMachineSteer(text),
       deliverAgentMessage: (message) => {
         inboundPeerHop = Math.max(inboundPeerHop ?? 0, message.hop);
-        heldAgentReports.push((0, import_client_core41.formatAgentMessage)(message));
+        heldAgentReports.push((0, import_client_core43.formatAgentMessage)(message));
         const status = appStore.getState().status;
         if (status !== "idle" && status !== "error") return;
-        sendTurn((0, import_client_core41.peerMessageWakePrompt)(message), void 0, void 0, "system");
+        sendTurn((0, import_client_core43.peerMessageWakePrompt)(message), void 0, void 0, "system");
       },
       resolvePermission: (requestId, decision, sid) => {
         const pending = appStore.getState().pendingPermissions.some((p) => p.data.request_id === requestId);
@@ -113553,25 +114025,25 @@ async function main() {
             defaultApiUrl: config.apiUrl,
             entries,
             add: async (entry) => {
-              await (0, import_client_core41.saveCustomProvider)(entry, "user", opts);
-              (0, import_client_core41.clearEndpointCatalog)(entry.baseUrl);
-              panel(await (0, import_client_core41.loadCustomProviders)(opts));
+              await (0, import_client_core43.saveCustomProvider)(entry, "user", opts);
+              (0, import_client_core43.clearEndpointCatalog)(entry.baseUrl);
+              panel(await (0, import_client_core43.loadCustomProviders)(opts));
             },
             remove: async (name2) => {
               for (const tier of ["user", "project", "local"]) {
-                if (await (0, import_client_core41.removeCustomProvider)(name2, tier, opts)) break;
+                if (await (0, import_client_core43.removeCustomProvider)(name2, tier, opts)) break;
               }
               (0, import_client_core8.clearEndpointRouting)();
-              (0, import_client_core41.clearEndpointCatalog)();
-              panel(await (0, import_client_core41.loadCustomProviders)(opts));
+              (0, import_client_core43.clearEndpointCatalog)();
+              panel(await (0, import_client_core43.loadCustomProviders)(opts));
             },
-            probe: (baseUrl, apiKey) => (0, import_client_core41.probeModels)(baseUrl, apiKey),
+            probe: (baseUrl, apiKey) => (0, import_client_core43.probeModels)(baseUrl, apiKey),
             // A saved endpoint's models come from the CACHED catalog — opening one costs no
             // network, so limits stay editable long after the endpoint was added.
             modelsOf: (entry) => (0, import_client_core8.endpointModelViews)(entry),
             updateModels: async (name2, update) => {
               await (0, import_client_core8.updateCustomProviderModels)(name2, update, "user", opts);
-              panel(await (0, import_client_core41.loadCustomProviders)(opts));
+              panel(await (0, import_client_core43.loadCustomProviders)(opts));
             },
             use: async (name2, model) => {
               const provider = `custom:${name2}`;
@@ -113589,7 +114061,7 @@ async function main() {
           }
         }
       }));
-      void (0, import_client_core41.loadCustomProviders)(opts).then(panel);
+      void (0, import_client_core43.loadCustomProviders)(opts).then(panel);
     }
   };
   const routeInput = (text) => routeChatInput(text, {
@@ -113598,7 +114070,7 @@ async function main() {
     addMemory: (note) => void addMemoryLine(note),
     resolveCommand: async (line) => {
       let parsed = registry.parse(line);
-      if (!parsed && (0, import_client_core41.matchSlashToken)(line)) {
+      if (!parsed && (0, import_client_core43.matchSlashToken)(line)) {
         await skillSlash.refresh().catch(() => void 0);
         parsed = registry.parse(line);
       }