@wrongstack/tui 0.275.1 → 0.276.2

package/dist/index.js

@@ -2,18 +2,18 @@ import { writeErr, resolveProjectDir, wstackGlobalRoot, createHqPublisherFromEnv
 export { buildGoalPreamble } from '@wrongstack/core';
 import { Box as Box$1, useStdout, Static, measureElement, useInput, useStdin, Text as Text$1, render, useApp } from 'ink';
 import { randomUUID } from 'crypto';
-import * as path5 from 'path';
+import * as path6 from 'path';
 import React5, { forwardRef, useState, useEffect, useMemo, memo, useRef, useLayoutEffect, useCallback, useReducer, isValidElement, Fragment as Fragment$1 } from 'react';
-import * as fs3 from 'fs/promises';
+import * as fsp from 'fs/promises';
 import { createRequire } from 'module';
-import { expectDefined, toErrorMessage, resolveWstackPaths as resolveWstackPaths$1 } from '@wrongstack/core/utils';
+import { expectDefined, toErrorMessage, resolveWstackPaths as resolveWstackPaths$1, sessionScopedPath } from '@wrongstack/core/utils';
 import { routeImagesForModel } from '@wrongstack/runtime/vision';
 import { getIndexState, onIndexStateChange, getProcessRegistry } from '@wrongstack/tools';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { readClipboardImage, readClipboardText } from '@wrongstack/runtime/clipboard';
 import { getToolIcon, TOOL_ICON_CONFIG } from '@wrongstack/tools/tool-icons';
 import * as v8 from 'v8';
 import { spawn } from 'child_process';
+import { readClipboardText, readClipboardImage } from '@wrongstack/runtime/clipboard';
 
 // src/run-tui.ts
 
@@ -97,7 +97,7 @@ function snapshotTokenCounter(tokenCounter) {
     cacheStats: tokenCounter.cacheStats()
   };
 }
-function useTokenCounterRefresh(tokenCounter, events) {
+function useTokenCounterRefresh(tokenCounter, events, sessionId) {
   const [data, setData] = useState(
     () => tokenCounter ? snapshotTokenCounter(tokenCounter) : void 0
   );
@@ -109,11 +109,12 @@ function useTokenCounterRefresh(tokenCounter, events) {
     const snapshot = () => snapshotTokenCounter(tokenCounter);
     setData(snapshot());
     if (!events) return;
-    const off = events.on("token.accounted", () => {
+    const off = events.on("token.accounted", (event) => {
+      if (sessionId && event.sessionId && event.sessionId !== sessionId) return;
       setData(snapshot());
     });
     return off;
-  }, [tokenCounter, events]);
+  }, [tokenCounter, events, sessionId]);
   return data;
 }
 
@@ -315,6 +316,7 @@ function StatusBar({
   hiddenItems,
   mode = "detailed",
   events,
+  sessionId,
   eternalStage,
   goalSummary,
   indexState,
@@ -346,7 +348,7 @@ function StatusBar({
   const isComfortable = termWidth >= COMFORTABLE_THRESHOLD;
   const hiddenSet = useMemo(() => new Set(hiddenItems), [hiddenItems]);
   const showChip = (item) => !hiddenSet.has(item);
-  const tokenData = useTokenCounterRefresh(tokenCounter, events);
+  const tokenData = useTokenCounterRefresh(tokenCounter, events, sessionId);
   const usage = tokenData?.usage;
   const displayTokens = tokenDisplayTotals(usage, tokenData?.currentRequest);
   const showTokenDisplay = hasTokenDisplay(displayTokens);
@@ -1096,6 +1098,10 @@ function fmtDebugBytes(n) {
 function pad2(n) {
   return n < 10 ? `0${n}` : String(n);
 }
+function shortSessionId(sessionId) {
+  const leaf = sessionId.split("/").pop() ?? sessionId;
+  return leaf.length > 12 ? `${leaf.slice(0, 12)}\u2026` : leaf;
+}
 var STATUS = {
   idle: { icon: "\u25CB", color: "gray" },
   running: { icon: "\u25B6", color: "yellow" },
@@ -1223,7 +1229,7 @@ function FleetMonitor({
     collabSession ? /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginTop: 1, children: [
       /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, children: [
         /* @__PURE__ */ jsx(Text, { bold: true, color: "magenta", children: "\u26A1 COLLAB SESSION" }),
-        collabSession.sessionId ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: collabSession.sessionId.slice(0, 8) }) : null,
+        collabSession.sessionId ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: shortSessionId(collabSession.sessionId) }) : null,
         /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502" }),
         /* @__PURE__ */ jsxs(Text, { color: "red", children: [
           "\u{1F41B}",
@@ -2334,8 +2340,8 @@ function FilePicker({ query, matches, selected }) {
     ] }, m))
   ] });
 }
-function highlight(path7, _query) {
-  return path7;
+function highlight(path8, _query) {
+  return path8;
 }
 function FleetPanel({
   entries,
@@ -4554,19 +4560,19 @@ function visualEdit(toolName, text, ok) {
   const parsed = tryParseJson(text);
   if (parsed && typeof parsed === "object") {
     const obj = parsed;
-    const path7 = typeof obj["path"] === "string" ? obj["path"] : void 0;
+    const path8 = typeof obj["path"] === "string" ? obj["path"] : void 0;
     const replacements = typeof obj["replacements"] === "number" ? obj["replacements"] : void 0;
     const bytes = typeof obj["bytes"] === "number" ? obj["bytes"] : void 0;
     const created = obj["created"] === true;
     const files = Array.isArray(obj["files"]) ? obj["files"] : void 0;
     const results = Array.isArray(obj["results"]) ? obj["results"] : void 0;
-    if (toolName === "edit" && path7 !== void 0) {
+    if (toolName === "edit" && path8 !== void 0) {
       const repText = replacements !== void 0 ? `${replacements} replacement${replacements === 1 ? "" : "s"}` : void 0;
-      rows.push({ kind: "ok", text: "", marker: "edit ", path: path7 });
+      rows.push({ kind: "ok", text: "", marker: "edit ", path: path8 });
       if (repText) rows.push({ kind: "meta", text: repText });
-    } else if (toolName === "write" && path7 !== void 0) {
+    } else if (toolName === "write" && path8 !== void 0) {
       const sizeText = bytes !== void 0 ? `${bytes} bytes` : created ? "new file" : "updated";
-      rows.push({ kind: "ok", text: "", marker: "write ", path: path7 });
+      rows.push({ kind: "ok", text: "", marker: "write ", path: path8 });
       rows.push({ kind: "meta", text: sizeText });
     } else if ((toolName === "diff" || toolName === "patch") && files && files.length > 0) {
       rows.push({
@@ -4589,8 +4595,8 @@ function visualEdit(toolName, text, ok) {
         marker: "replace ",
         text: `${results.length} replacement${results.length === 1 ? "" : "s"} across ${fileCount} file${fileCount === 1 ? "" : "s"}`
       });
-    } else if (path7 !== void 0) {
-      rows.push({ kind: "ok", text: "", marker: `${toolName} `, path: path7 });
+    } else if (path8 !== void 0) {
+      rows.push({ kind: "ok", text: "", marker: `${toolName} `, path: path8 });
     } else {
       return void 0;
     }
@@ -4674,12 +4680,12 @@ function parseMatchHit(hit) {
   }
   if (hit && typeof hit === "object") {
     const o = hit;
-    const path7 = stringOf(o["file"]) ?? stringOf(o["path"]) ?? stringOf(o["url"]);
+    const path8 = stringOf(o["file"]) ?? stringOf(o["path"]) ?? stringOf(o["url"]);
     const line = numOf(o["line"]) ?? numOf(o["lineNumber"]);
     const title = stringOf(o["title"]);
     const snippet2 = stringOf(o["snippet"]);
     const text = stringOf(o["text"]) ?? stringOf(o["match"]) ?? stringOf(o["preview"]) ?? [title, snippet2].filter(Boolean).join(" \u2014 ");
-    return { path: path7, line: line === void 0 ? void 0 : String(line), text };
+    return { path: path8, line: line === void 0 ? void 0 : String(line), text };
   }
   return void 0;
 }
@@ -5381,17 +5387,19 @@ function formatMultiDiffSummary(summary, threshold = MULTI_DIFF_SUMMARY_THRESHOL
   return parts.join(" \xB7 ");
 }
 function DiffFileBlock({
-  path: path7,
+  path: path8,
   preview,
   useColor = true
 }) {
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginTop: 1, children: [
-    /* @__PURE__ */ jsx(Text, { dimColor: true, italic: true, children: path7 }),
+    /* @__PURE__ */ jsx(Text, { dimColor: true, italic: true, children: path8 }),
     /* @__PURE__ */ jsx(
       DiffBlock,
       {
         rows: preview.rows,
         hidden: preview.hidden,
+        added: preview.added,
+        removed: preview.removed,
         hiddenAdded: preview.hiddenAdded,
         hiddenRemoved: preview.hiddenRemoved,
         useColor
@@ -5402,6 +5410,8 @@ function DiffFileBlock({
 function DiffBlock({
   rows,
   hidden,
+  added = 0,
+  removed = 0,
   hiddenAdded = 0,
   hiddenRemoved = 0,
   useColor = true
@@ -5417,10 +5427,6 @@ function DiffBlock({
   }
   const blank = " ".repeat(gutterWidth);
   const gutterPad = `${blank} ${blank}`;
-  const footerStats = [
-    hiddenAdded > 0 ? `+${hiddenAdded}` : "",
-    hiddenRemoved > 0 ? `-${hiddenRemoved}` : ""
-  ].filter(Boolean);
   const markerFor = (kind) => {
     if (kind === "add") return "+";
     if (kind === "del") return "-";
@@ -5467,7 +5473,30 @@ function DiffBlock({
         /* @__PURE__ */ jsx(Text, { children: text })
       ] }, key);
     }),
-    hidden > 0 ? /* @__PURE__ */ jsx(Text, { dimColor: true, italic: true, children: `${gutterPad}  \u2026 ${hidden} more line${hidden === 1 ? "" : "s"}${footerStats.length > 0 ? ` (${footerStats.join(" ")})` : ""}` }) : null
+    summaryFooter({
+      added,
+      removed,
+      hidden,
+      hiddenAdded,
+      hiddenRemoved,
+      gutterPad
+    })
+  ] });
+}
+function summaryFooter(opts) {
+  const { added, removed, hidden, hiddenAdded, hiddenRemoved, gutterPad } = opts;
+  if (added <= 0 && removed <= 0 && hidden <= 0) return null;
+  const hiddenStats = [];
+  if (hiddenAdded > 0) hiddenStats.push(`+${hiddenAdded}`);
+  if (hiddenRemoved > 0) hiddenStats.push(`-${hiddenRemoved}`);
+  const truncNote = hidden > 0 ? `  \xB7  \u2026 ${hidden} more line${hidden === 1 ? "" : "s"}${hiddenStats.length > 0 ? ` (${hiddenStats.join(" ")} hidden)` : ""}` : "";
+  return /* @__PURE__ */ jsxs(Text, { children: [
+    /* @__PURE__ */ jsx(Text, { dimColor: true, children: `${gutterPad}  ` }),
+    /* @__PURE__ */ jsx(Text, { color: theme.success, bold: true, children: `+${added}` }),
+    /* @__PURE__ */ jsx(Text, { dimColor: true, children: ` added  ` }),
+    /* @__PURE__ */ jsx(Text, { color: theme.error, bold: true, children: `-${removed}` }),
+    /* @__PURE__ */ jsx(Text, { dimColor: true, children: ` deleted` }),
+    truncNote ? /* @__PURE__ */ jsx(Text, { dimColor: true, italic: true, children: truncNote }) : null
   ] });
 }
 function parseUnifiedDiff(diff, maxLines) {
@@ -5566,8 +5595,8 @@ function splitReplaceDiffs(obj) {
     const record = result;
     const diff = stringOf(record["diff"]);
     if (!diff?.trim()) continue;
-    const path7 = stringOf(record["path"]);
-    items.push(path7 ? { path: path7, diff } : { diff });
+    const path8 = stringOf(record["path"]);
+    items.push(path8 ? { path: path8, diff } : { diff });
   }
   return items;
 }
@@ -5631,8 +5660,8 @@ function collectMultiFileDiffItems(toolName, output, _input) {
     if (!diffText?.trim()) return void 0;
     const blocks = splitGitStyleDiff(diffText);
     if (blocks.length === 0) {
-      const path7 = explicitFiles[0] ?? extractPatchHeaderPath(diffText);
-      return [{ path: path7, diff: diffText }];
+      const path8 = explicitFiles[0] ?? extractPatchHeaderPath(diffText);
+      return [{ path: path8, diff: diffText }];
     }
     return blocks.map((block, idx) => ({
       path: explicitFiles[idx] ?? block.path,
@@ -5678,8 +5707,8 @@ function splitGitStyleDiff(diff) {
   }
   flush();
   if (blocks.length === 1 && !blocks[0].path) {
-    const path7 = extractPatchHeaderPath(blocks[0].diff);
-    if (path7) blocks[0] = { path: path7, diff: blocks[0].diff };
+    const path8 = extractPatchHeaderPath(blocks[0].diff);
+    if (path8) blocks[0] = { path: path8, diff: blocks[0].diff };
   }
   return blocks;
 }
@@ -5700,8 +5729,8 @@ function parseDiffGitPath(line) {
 function extractPatchHeaderPath(diffText) {
   for (const line of diffText.split("\n")) {
     if (line.startsWith("+++ ")) {
-      const path7 = line.slice(4).trim();
-      const cleaned = path7.replace(/^b\//, "").split("	")[0].trim();
+      const path8 = line.slice(4).trim();
+      const cleaned = path8.replace(/^b\//, "").split("	")[0].trim();
       return cleaned || void 0;
     }
   }
@@ -5712,9 +5741,9 @@ function newFileDiffFromWriteInput(output, input) {
   const obj = input;
   const content = stringOf(obj["content"]);
   if (content === void 0) return void 0;
-  const path7 = stringOf(output["path"]) ?? stringOf(obj["path"]) ?? "new file";
+  const path8 = stringOf(output["path"]) ?? stringOf(obj["path"]) ?? "new file";
   const lines = content === "" ? [] : content.replace(/\n$/, "").split("\n");
-  const header = [`+++ ${path7}`, `@@ -0,0 +1,${lines.length} @@`];
+  const header = [`+++ ${path8}`, `@@ -0,0 +1,${lines.length} @@`];
   return [...header, ...lines.map((line) => `+${line}`)].join("\n");
 }
 var MESSAGE_PANEL_CHROME_WIDTH = 2;
@@ -5814,7 +5843,7 @@ function Banner({
   entry
 }) {
   const cwdShort = shortenPath(entry.cwd, 48);
-  const projectLabel = path5.basename(entry.cwd);
+  const projectLabel = path6.basename(entry.cwd);
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "magenta", paddingX: 2, paddingY: 0, children: [
     /* @__PURE__ */ jsxs(Text, { children: [
       /* @__PURE__ */ jsx(Text, { color: "magenta", bold: true, children: "  \u259F\u259B  " }),
@@ -6183,6 +6212,8 @@ var Entry = React5.memo(function Entry2({
           {
             rows: diff.rows,
             hidden: diff.hidden,
+            added: diff.added,
+            removed: diff.removed,
             hiddenAdded: diff.hiddenAdded,
             hiddenRemoved: diff.hiddenRemoved,
             useColor: true
@@ -6428,7 +6459,7 @@ var ScrollableHistory = memo(function ScrollableHistory2({
 });
 var MB = 1024 * 1024;
 function defaultHeapLogPath() {
-  return path5.join(wstackGlobalRoot(), "logs", "heap.jsonl");
+  return path6.join(wstackGlobalRoot(), "logs", "heap.jsonl");
 }
 function takeHeapSample() {
   const m = process.memoryUsage();
@@ -6458,10 +6489,10 @@ function startHeapWatchdog(opts = {}) {
   const append = (line) => {
     writeChain = writeChain.then(async () => {
       if (!dirReady) {
-        await fs3.mkdir(path5.dirname(logPath), { recursive: true });
+        await fsp.mkdir(path6.dirname(logPath), { recursive: true });
         dirReady = true;
       }
-      await fs3.appendFile(logPath, `${line}
+      await fsp.appendFile(logPath, `${line}
 `, "utf8");
     }).catch(() => void 0);
   };
@@ -7720,12 +7751,12 @@ var STATUS_ICON = {
 function planFilePath(projectRoot, sessionId, scope) {
   const base = resolveWstackPaths$1({ projectRoot }).projectSessions;
   if (scope === "project") {
-    return path5.join(base, "backlog.plan.json");
+    return path6.join(base, "backlog.plan.json");
   }
   if (sessionId) {
-    return path5.join(base, `${sessionId}.plan.json`);
+    return sessionScopedPath(base, sessionId, ".plan.json");
   }
-  return path5.join(base, "backlog.plan.json");
+  return path6.join(base, "backlog.plan.json");
 }
 function PlanPanel({ projectRoot, sessionId, onClose: _onClose }) {
   const [items, setItems] = useState([]);
@@ -7740,7 +7771,7 @@ function PlanPanel({ projectRoot, sessionId, onClose: _onClose }) {
       const filePath = planFilePath(projectRoot, sessionId, scope_);
       let content;
       try {
-        content = await fs3.readFile(filePath, "utf-8");
+        content = await fsp.readFile(filePath, "utf-8");
       } catch {
         setItems([]);
         setTitle2(void 0);
@@ -8114,6 +8145,10 @@ function fmtDuration2(startedAt) {
   if (h < 24) return `${h}h ${min % 60}m`;
   return `${Math.floor(h / 24)}d ${h % 24}h`;
 }
+function shortSessionId2(sessionId) {
+  const leaf = sessionId.split("/").pop() ?? sessionId;
+  return leaf.length > 18 ? leaf.slice(0, 18) : leaf;
+}
 function SessionsPanel({
   sessions,
   busy,
@@ -8150,7 +8185,7 @@ function SessionsPanel({
         ] }),
         /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
           " \xB7 ",
-          s2.sessionId.slice(0, 8)
+          shortSessionId2(s2.sessionId)
         ] }),
         s2.gitBranch ? /* @__PURE__ */ jsxs(Text, { color: "magenta", children: [
           " \u2387 ",
@@ -9828,84 +9863,6 @@ function WorktreePanel({
     }
   );
 }
-var IGNORED_DIRS = /* @__PURE__ */ new Set([
-  "node_modules",
-  ".git",
-  "dist",
-  "build",
-  ".next",
-  ".turbo",
-  ".cache",
-  "coverage",
-  ".idea",
-  ".vscode"
-]);
-var MAX_FILES_INDEXED = 5e3;
-var MAX_DEPTH = 8;
-var cache = null;
-var CACHE_TTL_MS = 3e4;
-async function loadIndex(root) {
-  const now = Date.now();
-  if (cache && cache.root === root && now - cache.loadedAt < CACHE_TTL_MS) {
-    return cache.files;
-  }
-  const files = [];
-  await walk(root, "", 0, files);
-  files.sort();
-  cache = { root, files, loadedAt: now };
-  return files;
-}
-async function walk(root, rel, depth, out) {
-  if (out.length >= MAX_FILES_INDEXED) return;
-  if (depth > MAX_DEPTH) return;
-  const dir = rel ? path5.join(root, rel) : root;
-  let entries;
-  try {
-    entries = await fs3.readdir(dir, { withFileTypes: true });
-  } catch {
-    return;
-  }
-  for (const e of entries) {
-    if (out.length >= MAX_FILES_INDEXED) return;
-    if (e.name.startsWith(".") && e.name !== ".env.example") continue;
-    if (IGNORED_DIRS.has(e.name)) continue;
-    const next = rel ? `${rel}/${e.name}` : e.name;
-    if (e.isDirectory()) {
-      await walk(root, next, depth + 1, out);
-    } else if (e.isFile()) {
-      out.push(next);
-    }
-  }
-}
-function score(s2, query) {
-  if (!query) return s2.length;
-  const ql = query.toLowerCase();
-  const sl = s2.toLowerCase();
-  let si = 0;
-  let firstHit = -1;
-  let lastHit = -1;
-  for (let qi = 0; qi < ql.length; qi++) {
-    const c = ql.charCodeAt(qi);
-    while (si < sl.length && sl.charCodeAt(si) !== c) si++;
-    if (si >= sl.length) return null;
-    if (firstHit < 0) firstHit = si;
-    lastHit = si;
-    si++;
-  }
-  const span = lastHit - firstHit;
-  return span * 100 + firstHit * 2 + s2.length;
-}
-async function searchFiles(root, query, limit = 8) {
-  const all = await loadIndex(root);
-  if (!query) return all.slice(0, limit);
-  const scored = [];
-  for (const f of all) {
-    const sc = score(f, query);
-    if (sc !== null) scored.push({ path: f, score: sc });
-  }
-  scored.sort((a, b) => a.score - b.score);
-  return scored.slice(0, limit).map((x) => x.path);
-}
 async function readGitInfo(cwd) {
   const [branchRes, numstatRes, statusRes] = await Promise.all([
     runGit(cwd, ["branch", "--show-current"]),
@@ -9959,130 +9916,383 @@ function runGit(cwd, args) {
     }
   });
 }
-var ENTER_DOUBLE_TAP_MS = 50;
-function debouncedEnter(host) {
-  const now = Date.now();
-  if (now - host.lastEnterAtRef.current < ENTER_DOUBLE_TAP_MS) return true;
-  host.lastEnterAtRef.current = now;
-  return false;
+
+// src/queue-slash.ts
+var USAGE = "Usage:\n  /queue                  \u2014 list pending messages\n  /queue list             \u2014 same as /queue\n  /queue clear            \u2014 drop all pending messages\n  /queue delete N M\u2026      \u2014 drop messages at 1-based positions\n  /queue picker on|off    \u2014 toggle the mid-run send-mode picker (queue/btw/steer)\n  /queue picker           \u2014 show whether the picker is on";
+function createQueueSlashCommand(deps) {
+  return {
+    name: "queue",
+    description: "List, clear, or delete pending messages typed while the agent was running.",
+    async run(args) {
+      const out = handleQueueCommand(args, deps);
+      return { message: out };
+    }
+  };
 }
-function usePickerKeys(host) {
-  return useCallback(
-    (input, key, isEnter) => {
-      const { state, dispatch } = host;
-      if (state.modelPicker.open) {
-        if (key.escape) {
-          if (state.modelPicker.step === "model") {
-            dispatch({ type: "modelPickerBack" });
-          } else {
-            dispatch({ type: "modelPickerClose" });
-          }
-          return true;
-        }
-        if (key.mouse?.kind === "wheel") {
-          dispatch({ type: "modelPickerMove", delta: key.mouse.wheel > 0 ? -1 : 1 });
-          return true;
-        }
-        if (key.upArrow) {
-          dispatch({ type: "modelPickerMove", delta: -1 });
-          return true;
-        }
-        if (key.downArrow) {
-          dispatch({ type: "modelPickerMove", delta: 1 });
-          return true;
-        }
-        if (state.modelPicker.step === "model" && input && !key.return && !key.backspace) {
-          dispatch({ type: "modelPickerSearch", query: state.modelPicker.searchQuery + input });
-          return true;
-        }
-        if (state.modelPicker.step === "model" && key.backspace) {
-          const q = state.modelPicker.searchQuery;
-          if (q.length > 0) {
-            dispatch({ type: "modelPickerSearch", query: q.slice(0, -1) });
-          } else {
-            dispatch({ type: "modelPickerBack" });
-          }
-          return true;
-        }
-        if (isEnter) {
-          if (debouncedEnter(host)) return true;
-          host.inputGateRef.current = true;
-          try {
-            if (state.modelPicker.step === "provider") {
-              const opt = state.modelPicker.providerOptions[state.modelPicker.selected];
-              if (!opt) return true;
-              dispatch({
-                type: "modelPickerPickProvider",
-                providerId: opt.id,
-                models: opt.models
-              });
-              return true;
-            }
-            const providerId = state.modelPicker.pickedProviderId;
-            const modelId = state.modelPicker.filteredOptions[state.modelPicker.selected];
-            if (!providerId || !modelId) return true;
-            const complete = (err) => {
-              if (err) {
-                dispatch({ type: "modelPickerHint", text: err });
-                return;
-              }
-              host.setLiveProvider?.(providerId);
-              host.setLiveModel?.(modelId);
-              host.setActiveMaxContext?.(host.agentCtxMaxContext);
-              dispatch({
-                type: "addEntry",
-                entry: { kind: "info", text: `Switched to ${providerId} / ${modelId}.` }
-              });
-              dispatch({ type: "modelPickerClose" });
-            };
-            const result = host.switchProviderAndModel?.(providerId, modelId);
-            if (result && typeof result.then === "function") {
-              void result.then(complete).catch((err) => {
-                complete(err instanceof Error ? err.message : String(err));
-              });
-              return true;
-            }
-            complete(result);
-            return true;
-          } finally {
-            host.inputGateRef.current = false;
-          }
-        }
-        return true;
+function handleQueueCommand(args, deps) {
+  const trimmed = args.trim();
+  const [sub, ...rest] = trimmed.split(/\s+/);
+  const subcommand = sub?.toLowerCase() ?? "";
+  if (subcommand === "" || subcommand === "list") {
+    return renderList(deps.getQueue());
+  }
+  if (subcommand === "picker") {
+    if (!deps.getPickerEnabled || !deps.setPickerEnabled) {
+      return "Send-mode picker toggle is unavailable in this session.";
+    }
+    const arg = rest[0]?.toLowerCase() ?? "";
+    if (arg === "" || arg === "status") {
+      return `Mid-run send-mode picker is ${deps.getPickerEnabled() ? "on" : "off"}.`;
+    }
+    if (arg === "on" || arg === "off") {
+      const next = arg === "on";
+      deps.setPickerEnabled(next);
+      return next ? "Mid-run send-mode picker: on \u2014 plain messages typed while busy ask queue/btw/steer." : "Mid-run send-mode picker: off \u2014 plain messages typed while busy are queued silently.";
+    }
+    return "Usage: /queue picker on|off";
+  }
+  if (subcommand === "clear") {
+    const before = deps.getQueue().length;
+    if (before === 0) return "Queue is already empty.";
+    deps.clear();
+    return `Cleared ${before} queued message${before === 1 ? "" : "s"}.`;
+  }
+  if (subcommand === "delete" || subcommand === "del" || subcommand === "rm") {
+    if (rest.length === 0) return "Usage: /queue delete <position> [<position>\u2026]";
+    const queue = deps.getQueue();
+    if (queue.length === 0) return "Queue is empty \u2014 nothing to delete.";
+    const parsed = [];
+    const invalid = [];
+    const outOfRange = [];
+    for (const tok of rest) {
+      if (!/^\d+$/.test(tok)) {
+        invalid.push(tok);
+        continue;
       }
-      if (state.autonomyPicker.open) {
-        if (key.escape) {
-          dispatch({ type: "autonomyPickerClose" });
-          return true;
-        }
-        if (key.mouse?.kind === "wheel") {
-          dispatch({ type: "autonomyPickerMove", delta: key.mouse.wheel > 0 ? -1 : 1 });
-          return true;
-        }
-        if (key.upArrow) {
-          dispatch({ type: "autonomyPickerMove", delta: -1 });
-          return true;
-        }
-        if (key.downArrow) {
-          dispatch({ type: "autonomyPickerMove", delta: 1 });
-          return true;
-        }
-        if (isEnter) {
-          if (debouncedEnter(host)) return true;
-          const opt = state.autonomyPicker.options[state.autonomyPicker.selected];
-          if (!opt) return true;
-          const err = host.switchAutonomy?.(opt.mode);
-          if (err) {
-            dispatch({ type: "autonomyPickerHint", text: err });
-            return true;
-          }
-          dispatch({ type: "autonomyPickerClose" });
-          return true;
-        }
-        return true;
+      const n = Number.parseInt(tok, 10);
+      if (n < 1 || n > queue.length) {
+        outOfRange.push(n);
+        continue;
       }
-      if (state.designPicker.open) {
-        if (key.escape) {
+      parsed.push(n);
+    }
+    const uniqueValid = [...new Set(parsed)];
+    if (uniqueValid.length === 0) {
+      const parts2 = ["No valid positions to delete."];
+      if (invalid.length > 0) parts2.push(`Invalid: ${invalid.join(", ")}.`);
+      if (outOfRange.length > 0)
+        parts2.push(`Out of range (queue has ${queue.length}): ${outOfRange.join(", ")}.`);
+      return parts2.join(" ");
+    }
+    deps.deleteAt(uniqueValid);
+    const parts = [
+      `Deleted ${uniqueValid.length} of ${queue.length} (positions ${uniqueValid.sort((a, b) => a - b).join(", ")}).`
+    ];
+    if (invalid.length > 0) parts.push(`Ignored invalid: ${invalid.join(", ")}.`);
+    if (outOfRange.length > 0) parts.push(`Ignored out of range: ${outOfRange.join(", ")}.`);
+    return parts.join(" ");
+  }
+  return `Unknown subcommand "${sub}".
+${USAGE}`;
+}
+function renderList(queue) {
+  if (queue.length === 0) return "Queue is empty.";
+  const lines = [`Queue (${queue.length}):`];
+  for (let i = 0; i < queue.length; i++) {
+    const item = queue[i];
+    if (!item) continue;
+    const preview = oneLine(item.displayText, 100);
+    lines.push(`  ${i + 1}. ${preview}`);
+  }
+  return lines.join("\n");
+}
+function oneLine(s2, max) {
+  const collapsed = s2.replace(/\s+/g, " ").trim();
+  return collapsed.length <= max ? collapsed : `${collapsed.slice(0, max - 1)}\u2026`;
+}
+
+// src/hooks/use-queue-manager.ts
+function useQueueManager({
+  queueStore,
+  onQueueChange,
+  slashRegistry,
+  stateRef,
+  dispatch,
+  getSettings,
+  saveSettings,
+  midRunSendPickerRef
+}) {
+  useEffect(() => {
+    if (!queueStore) return;
+    let cancelled = false;
+    queueStore.read().then((items) => {
+      if (cancelled || items.length === 0) return;
+      for (const item of items) {
+        dispatch({
+          type: "enqueue",
+          item: { displayText: item.displayText, blocks: item.blocks }
+        });
+      }
+      dispatch({
+        type: "addEntry",
+        entry: {
+          kind: "info",
+          text: `Restored ${items.length} queued message${items.length === 1 ? "" : "s"} from a previous run.`
+        }
+      });
+    }).catch(() => void 0);
+    return () => {
+      cancelled = true;
+    };
+  }, [queueStore]);
+  useEffect(() => {
+    if (!queueStore) return;
+    const raw = stateRef.current.queue.map(
+      ({ displayText, blocks }) => ({
+        displayText,
+        blocks
+      })
+    );
+    queueStore.write(raw).catch(() => void 0);
+  }, [stateRef.current.queue, queueStore, stateRef]);
+  useEffect(() => {
+    onQueueChange?.(stateRef.current.queue.map((q) => q.displayText));
+  }, [stateRef.current.queue, onQueueChange, stateRef]);
+  useEffect(() => {
+    const cmd = createQueueSlashCommand({
+      getQueue: () => stateRef.current.queue,
+      clear: () => dispatch({ type: "queueClear" }),
+      deleteAt: (positions) => dispatch({ type: "queueDelete", positions }),
+      getPickerEnabled: () => midRunSendPickerRef.current,
+      setPickerEnabled: (enabled) => {
+        midRunSendPickerRef.current = enabled;
+        const cur = getSettings?.();
+        if (cur && saveSettings) {
+          Promise.resolve(saveSettings({ ...cur, midRunSendPicker: enabled })).catch(() => {
+          });
+        }
+      }
+    });
+    slashRegistry.register(cmd);
+    return () => {
+      slashRegistry.unregister("queue");
+    };
+  }, [slashRegistry, stateRef, dispatch, getSettings, saveSettings, midRunSendPickerRef]);
+}
+
+// src/hooks/use-paste-handling.ts
+function usePasteHandling({
+  builderRef,
+  dispatch,
+  draftRef,
+  setDraft,
+  tokenPreviewsRef
+}) {
+  const pasteAccumRef = useRef(null);
+  const pasteFlushTimerRef = useRef(null);
+  const commitPaste = async (full) => {
+    const builder = builderRef.current;
+    if (!builder || !full) return;
+    const { buffer, cursor } = draftRef.current;
+    const isSlashCmd = buffer.trimStart().startsWith("/");
+    const mustCollapse = builder.wouldCollapse(full);
+    const multiLine = full.includes("\n");
+    if (isSlashCmd && !mustCollapse) {
+      const next2 = buffer.slice(0, cursor) + full + buffer.slice(cursor);
+      setDraft(next2, cursor + full.length);
+      return;
+    }
+    if (mustCollapse || multiLine) {
+      const token = await builder.registerPaste(full);
+      tokenPreviewsRef.current.set(token, full);
+      const next2 = buffer.slice(0, cursor) + token + buffer.slice(cursor);
+      setDraft(next2, cursor + token.length);
+      return;
+    }
+    const next = buffer.slice(0, cursor) + full + buffer.slice(cursor);
+    setDraft(next, cursor + full.length);
+  };
+  const pasteClipboardImage = async () => {
+    const builder = builderRef.current;
+    if (!builder) return;
+    try {
+      const img = await readClipboardImage();
+      if (!img) {
+        dispatch({
+          type: "addEntry",
+          entry: { kind: "info", text: "No image on the clipboard." }
+        });
+        return;
+      }
+      const token = await builder.registerImage(img.base64, img.mediaType);
+      const kb = (img.bytes / 1024).toFixed(0);
+      tokenPreviewsRef.current.set(token, `image, ${kb} KB`);
+      const { buffer, cursor } = draftRef.current;
+      const next = buffer.slice(0, cursor) + token + buffer.slice(cursor);
+      setDraft(next, cursor + token.length);
+    } catch (err) {
+      dispatch({
+        type: "addEntry",
+        entry: {
+          kind: "error",
+          text: `Clipboard image error: ${toErrorMessage(err)}`
+        }
+      });
+    }
+  };
+  const pasteClipboardText = async () => {
+    try {
+      const text = await readClipboardText();
+      if (!text) {
+        dispatch({
+          type: "addEntry",
+          entry: { kind: "info", text: "No text on the clipboard." }
+        });
+        return;
+      }
+      await commitPaste(text);
+    } catch (err) {
+      dispatch({
+        type: "addEntry",
+        entry: {
+          kind: "error",
+          text: `Clipboard error: ${toErrorMessage(err)}`
+        }
+      });
+    }
+  };
+  return {
+    pasteAccumRef,
+    pasteFlushTimerRef,
+    commitPaste,
+    pasteClipboardImage,
+    pasteClipboardText
+  };
+}
+var ENTER_DOUBLE_TAP_MS = 50;
+function debouncedEnter(host) {
+  const now = Date.now();
+  if (now - host.lastEnterAtRef.current < ENTER_DOUBLE_TAP_MS) return true;
+  host.lastEnterAtRef.current = now;
+  return false;
+}
+function usePickerKeys(host) {
+  return useCallback(
+    (input, key, isEnter) => {
+      const { state, dispatch } = host;
+      if (state.modelPicker.open) {
+        if (key.escape) {
+          if (state.modelPicker.step === "model") {
+            dispatch({ type: "modelPickerBack" });
+          } else {
+            dispatch({ type: "modelPickerClose" });
+          }
+          return true;
+        }
+        if (key.mouse?.kind === "wheel") {
+          dispatch({ type: "modelPickerMove", delta: key.mouse.wheel > 0 ? -1 : 1 });
+          return true;
+        }
+        if (key.upArrow) {
+          dispatch({ type: "modelPickerMove", delta: -1 });
+          return true;
+        }
+        if (key.downArrow) {
+          dispatch({ type: "modelPickerMove", delta: 1 });
+          return true;
+        }
+        if (state.modelPicker.step === "model" && input && !key.return && !key.backspace) {
+          dispatch({ type: "modelPickerSearch", query: state.modelPicker.searchQuery + input });
+          return true;
+        }
+        if (state.modelPicker.step === "model" && key.backspace) {
+          const q = state.modelPicker.searchQuery;
+          if (q.length > 0) {
+            dispatch({ type: "modelPickerSearch", query: q.slice(0, -1) });
+          } else {
+            dispatch({ type: "modelPickerBack" });
+          }
+          return true;
+        }
+        if (isEnter) {
+          if (debouncedEnter(host)) return true;
+          host.inputGateRef.current = true;
+          try {
+            if (state.modelPicker.step === "provider") {
+              const opt = state.modelPicker.providerOptions[state.modelPicker.selected];
+              if (!opt) return true;
+              dispatch({
+                type: "modelPickerPickProvider",
+                providerId: opt.id,
+                models: opt.models
+              });
+              return true;
+            }
+            const providerId = state.modelPicker.pickedProviderId;
+            const modelId = state.modelPicker.filteredOptions[state.modelPicker.selected];
+            if (!providerId || !modelId) return true;
+            const complete = (err) => {
+              if (err) {
+                dispatch({ type: "modelPickerHint", text: err });
+                return;
+              }
+              host.setLiveProvider?.(providerId);
+              host.setLiveModel?.(modelId);
+              host.setActiveMaxContext?.(host.agentCtxMaxContext);
+              dispatch({
+                type: "addEntry",
+                entry: { kind: "info", text: `Switched to ${providerId} / ${modelId}.` }
+              });
+              dispatch({ type: "modelPickerClose" });
+            };
+            const result = host.switchProviderAndModel?.(providerId, modelId);
+            if (result && typeof result.then === "function") {
+              void result.then(complete).catch((err) => {
+                complete(err instanceof Error ? err.message : String(err));
+              });
+              return true;
+            }
+            complete(result);
+            return true;
+          } finally {
+            host.inputGateRef.current = false;
+          }
+        }
+        return true;
+      }
+      if (state.autonomyPicker.open) {
+        if (key.escape) {
+          dispatch({ type: "autonomyPickerClose" });
+          return true;
+        }
+        if (key.mouse?.kind === "wheel") {
+          dispatch({ type: "autonomyPickerMove", delta: key.mouse.wheel > 0 ? -1 : 1 });
+          return true;
+        }
+        if (key.upArrow) {
+          dispatch({ type: "autonomyPickerMove", delta: -1 });
+          return true;
+        }
+        if (key.downArrow) {
+          dispatch({ type: "autonomyPickerMove", delta: 1 });
+          return true;
+        }
+        if (isEnter) {
+          if (debouncedEnter(host)) return true;
+          const opt = state.autonomyPicker.options[state.autonomyPicker.selected];
+          if (!opt) return true;
+          const err = host.switchAutonomy?.(opt.mode);
+          if (err) {
+            dispatch({ type: "autonomyPickerHint", text: err });
+            return true;
+          }
+          dispatch({ type: "autonomyPickerClose" });
+          return true;
+        }
+        return true;
+      }
+      if (state.designPicker.open) {
+        if (key.escape) {
           dispatch({ type: "designPickerClose" });
           return true;
         }
@@ -10826,43 +11036,199 @@ function handleCollabPlan(event, dispatch, stateRef) {
     phaseCount: payload.plan.phases?.length ?? 0
   });
 }
-function handleCollabEvaluation(event, dispatch, stateRef) {
-  if (!stateRef.current.collabSession) return;
-  const payload = event.payload;
-  if (!payload?.evaluation) return;
-  dispatch({
-    type: "collabEvalComplete",
-    sessionId: collabSessionId(event.subagentId),
-    evalId: payload.evaluation.id ?? "unknown",
-    verdict: payload.evaluation.verdict ?? "unknown",
-    score: payload.evaluation.score ?? 0
-  });
+function handleCollabEvaluation(event, dispatch, stateRef) {
+  if (!stateRef.current.collabSession) return;
+  const payload = event.payload;
+  if (!payload?.evaluation) return;
+  dispatch({
+    type: "collabEvalComplete",
+    sessionId: collabSessionId(event.subagentId),
+    evalId: payload.evaluation.id ?? "unknown",
+    verdict: payload.evaluation.verdict ?? "unknown",
+    score: payload.evaluation.score ?? 0
+  });
+}
+function handleCollabDone(event, dispatch, stateRef) {
+  const collabSession = stateRef.current.collabSession;
+  if (!collabSession) return;
+  const payload = event.payload;
+  if (!payload?.report) return;
+  dispatch({
+    type: "collabSessionDone",
+    sessionId: payload.report.sessionId ?? collabSession.sessionId ?? "unknown",
+    verdict: payload.report.overallVerdict ?? "needs_revision"
+  });
+}
+function useAutonomousCoordinator(subscribeCoordinatorEvents, dispatch) {
+  const dispatchRef = useRef(dispatch);
+  dispatchRef.current = dispatch;
+  const handler = useCallback((event) => {
+    dispatchRef.current({
+      type: "coordinatorEvent",
+      event
+    });
+  }, []);
+  useEffect(() => {
+    if (!subscribeCoordinatorEvents) return;
+    const unsubscribe = subscribeCoordinatorEvents(handler);
+    return unsubscribe;
+  }, [subscribeCoordinatorEvents, handler]);
+}
+var IGNORED_DIRS = /* @__PURE__ */ new Set([
+  "node_modules",
+  ".git",
+  "dist",
+  "build",
+  ".next",
+  ".turbo",
+  ".cache",
+  "coverage",
+  ".idea",
+  ".vscode"
+]);
+var MAX_FILES_INDEXED = 5e3;
+var MAX_DEPTH = 8;
+var cache = null;
+var CACHE_TTL_MS = 3e4;
+async function loadIndex(root) {
+  const now = Date.now();
+  if (cache && cache.root === root && now - cache.loadedAt < CACHE_TTL_MS) {
+    return cache.files;
+  }
+  const files = [];
+  await walk(root, "", 0, files);
+  files.sort();
+  cache = { root, files, loadedAt: now };
+  return files;
+}
+async function walk(root, rel, depth, out) {
+  if (out.length >= MAX_FILES_INDEXED) return;
+  if (depth > MAX_DEPTH) return;
+  const dir = rel ? path6.join(root, rel) : root;
+  let entries;
+  try {
+    entries = await fsp.readdir(dir, { withFileTypes: true });
+  } catch {
+    return;
+  }
+  for (const e of entries) {
+    if (out.length >= MAX_FILES_INDEXED) return;
+    if (e.name.startsWith(".") && e.name !== ".env.example") continue;
+    if (IGNORED_DIRS.has(e.name)) continue;
+    const next = rel ? `${rel}/${e.name}` : e.name;
+    if (e.isDirectory()) {
+      await walk(root, next, depth + 1, out);
+    } else if (e.isFile()) {
+      out.push(next);
+    }
+  }
+}
+function score(s2, query) {
+  if (!query) return s2.length;
+  const ql = query.toLowerCase();
+  const sl = s2.toLowerCase();
+  let si = 0;
+  let firstHit = -1;
+  let lastHit = -1;
+  for (let qi = 0; qi < ql.length; qi++) {
+    const c = ql.charCodeAt(qi);
+    while (si < sl.length && sl.charCodeAt(si) !== c) si++;
+    if (si >= sl.length) return null;
+    if (firstHit < 0) firstHit = si;
+    lastHit = si;
+    si++;
+  }
+  const span = lastHit - firstHit;
+  return span * 100 + firstHit * 2 + s2.length;
 }
-function handleCollabDone(event, dispatch, stateRef) {
-  const collabSession = stateRef.current.collabSession;
-  if (!collabSession) return;
-  const payload = event.payload;
-  if (!payload?.report) return;
-  dispatch({
-    type: "collabSessionDone",
-    sessionId: payload.report.sessionId ?? collabSession.sessionId ?? "unknown",
-    verdict: payload.report.overallVerdict ?? "needs_revision"
-  });
+async function searchFiles(root, query, limit = 8) {
+  const all = await loadIndex(root);
+  if (!query) return all.slice(0, limit);
+  const scored = [];
+  for (const f of all) {
+    const sc = score(f, query);
+    if (sc !== null) scored.push({ path: f, score: sc });
+  }
+  scored.sort((a, b) => a.score - b.score);
+  return scored.slice(0, limit).map((x) => x.path);
 }
-function useAutonomousCoordinator(subscribeCoordinatorEvents, dispatch) {
-  const dispatchRef = useRef(dispatch);
-  dispatchRef.current = dispatch;
-  const handler = useCallback((event) => {
-    dispatchRef.current({
-      type: "coordinatorEvent",
-      event
-    });
-  }, []);
+
+// src/hooks/use-file-search.ts
+function detectAtToken(buffer, cursor) {
+  let i = cursor - 1;
+  while (i >= 0) {
+    const ch = buffer.charCodeAt(i);
+    if (ch === 64) {
+      if (i === 0 || /\s/.test(buffer[i - 1] ?? "")) {
+        return { start: i, end: cursor, query: buffer.slice(i + 1, cursor) };
+      }
+      return null;
+    }
+    if (ch === 32 || ch === 9 || ch === 10) return null;
+    i--;
+  }
+  return null;
+}
+function useFileSearch(options) {
+  const { state, dispatch, projectRoot, builderRef, draftRef, setDraft, tokenPreviewsRef } = options;
   useEffect(() => {
-    if (!subscribeCoordinatorEvents) return;
-    const unsubscribe = subscribeCoordinatorEvents(handler);
-    return unsubscribe;
-  }, [subscribeCoordinatorEvents, handler]);
+    const detected = detectAtToken(state.buffer, state.cursor);
+    if (!detected) {
+      if (state.picker.open) dispatch({ type: "pickerClose" });
+      return;
+    }
+    if (!state.picker.open || state.picker.query !== detected.query) {
+      dispatch({ type: "pickerOpen", query: detected.query });
+    }
+    let cancelled = false;
+    searchFiles(projectRoot, detected.query, 8).then((matches) => {
+      if (!cancelled) {
+        dispatch({ type: "pickerSetMatches", query: detected.query, matches });
+      }
+    }).catch(() => void 0);
+    return () => {
+      cancelled = true;
+    };
+  }, [state.buffer, state.cursor, projectRoot]);
+  const acceptPickerSelection = async () => {
+    const { open, matches, selected } = state.picker;
+    if (!open || matches.length === 0) return;
+    const picked = matches[selected];
+    if (!picked) return;
+    const builder = builderRef.current;
+    if (!builder) return;
+    const draft = draftRef.current;
+    const tok = detectAtToken(draft.buffer, draft.cursor);
+    if (!tok) {
+      dispatch({ type: "pickerClose" });
+      return;
+    }
+    const absPath = path6.isAbsolute(picked) ? picked : path6.join(projectRoot, picked);
+    try {
+      const data = await fsp.readFile(absPath, "utf8");
+      const token = await builder.registerFile({
+        kind: "file",
+        data,
+        meta: { filename: picked, label: picked }
+      });
+      tokenPreviewsRef.current.set(token, data);
+      const before = draft.buffer.slice(0, tok.start);
+      const after = draft.buffer.slice(tok.end);
+      const next = `${before}${token}${after}`;
+      setDraft(next, tok.start + token.length);
+      dispatch({ type: "pickerClose" });
+    } catch (err) {
+      dispatch({
+        type: "addEntry",
+        entry: {
+          kind: "error",
+          text: `Attach failed: ${toErrorMessage(err)}`
+        }
+      });
+      dispatch({ type: "pickerClose" });
+    }
+  };
+  return { onPickerEnter: acceptPickerSelection };
 }
 function useStatuslineState(opts) {
   const [liveModel, setLiveModel] = useState(opts.model);
@@ -10959,8 +11325,12 @@ function useTuiControllers({
     };
   }, [onPanelOpen, dispatch]);
 }
-function useBrainEvents(events, dispatch) {
+function useBrainEvents(events, dispatch, getSessionId) {
   useEffect(() => {
+    const isCurrentSession = (sessionId) => {
+      const current = getSessionId?.();
+      return !sessionId || !current || sessionId === current;
+    };
     const requestSummary = (request) => `${request.source}: ${request.question}`.slice(0, 80);
     const addBrainEntry = (status, payload) => {
       const p = payload;
@@ -10981,13 +11351,21 @@ function useBrainEvents(events, dispatch) {
       }
       dispatch({ type: "addEntry", entry: { kind: "brain", status, source: p.request.source, risk: p.request.risk, question: p.request.question, decision, rationale: p.decision.rationale } });
     };
-    const offRequested = events.on("brain.decision_requested", ({ request }) => {
+    const offRequested = events.on("brain.decision_requested", ({ sessionId, request }) => {
+      if (!isCurrentSession(sessionId)) return;
       dispatch({ type: "brainStatus", state: "deciding", source: request.source, risk: request.risk, summary: requestSummary(request) });
     });
-    const offAnswered = events.on("brain.decision_answered", (payload) => addBrainEntry("answered", payload));
-    const offAskHuman = events.on("brain.decision_ask_human", (payload) => addBrainEntry("ask_human", payload));
-    const offDenied = events.on("brain.decision_denied", (payload) => addBrainEntry("denied", payload));
+    const offAnswered = events.on("brain.decision_answered", (payload) => {
+      if (isCurrentSession(payload.sessionId)) addBrainEntry("answered", payload);
+    });
+    const offAskHuman = events.on("brain.decision_ask_human", (payload) => {
+      if (isCurrentSession(payload.sessionId)) addBrainEntry("ask_human", payload);
+    });
+    const offDenied = events.on("brain.decision_denied", (payload) => {
+      if (isCurrentSession(payload.sessionId)) addBrainEntry("denied", payload);
+    });
     const offIntervention = events.on("brain.intervention", (payload) => {
+      if (!isCurrentSession(payload.sessionId)) return;
       const decision = payload.intervened ? `steered the agent (${payload.kind.replace(/_/g, " ")})` : "observed \u2014 no action needed";
       const rationale = payload.decision.type === "answer" ? payload.decision.rationale : void 0;
       dispatch({
@@ -11010,7 +11388,7 @@ function useBrainEvents(events, dispatch) {
       offDenied();
       offIntervention();
     };
-  }, [events, dispatch]);
+  }, [events, dispatch, getSessionId]);
 }
 var STREAM_COLORS2 = ["cyan", "magenta", "yellow", "green", "blue"];
 function labelFor2(labelsRef, id, name) {
@@ -11025,7 +11403,7 @@ function labelFor2(labelsRef, id, name) {
   m.set(id, v);
   return v;
 }
-function useSubagentEvents(events, dispatch, setActiveMaxContext) {
+function useSubagentEvents(events, dispatch, setActiveMaxContext, getSessionId) {
   const labelsRef = useRef(/* @__PURE__ */ new Map());
   const lbl = useCallback(
     (id, name) => labelFor2(labelsRef, id, name),
@@ -11033,7 +11411,12 @@ function useSubagentEvents(events, dispatch, setActiveMaxContext) {
     // labelsRef is a stable ref
   );
   useEffect(() => {
+    const isCurrentSession = (sessionId) => {
+      const current = getSessionId?.();
+      return !sessionId || !current || sessionId === current;
+    };
     const offSpawned = events.on("subagent.spawned", (e) => {
+      if (!isCurrentSession(e.sessionId)) return;
       const l = lbl(e.subagentId, e.name);
       dispatch({ type: "fleetSpawn", id: e.subagentId, name: e.name, provider: e.provider, model: e.model, transcriptPath: e.transcriptPath });
       const where = e.provider && e.model ? `${e.provider}/${e.model}` : "spawned";
@@ -11041,12 +11424,14 @@ function useSubagentEvents(events, dispatch, setActiveMaxContext) {
       dispatch({ type: "addEntry", entry: { kind: "subagent", agentLabel: l.label, agentColor: l.color, icon: "\u25B6", text: `${where}${desc}` } });
     });
     const offStarted = events.on("subagent.task_started", (e) => {
+      if (!isCurrentSession(e.sessionId)) return;
       const l = lbl(e.subagentId);
       dispatch({ type: "fleetStart", id: e.subagentId, taskId: e.taskId });
       const desc = e.description ? ` \u2014 ${e.description.slice(0, 80)}` : "";
       dispatch({ type: "addEntry", entry: { kind: "subagent", agentLabel: l.label, agentColor: l.color, icon: "\u25CF", text: `task started${desc}` } });
     });
     const offCompleted = events.on("subagent.task_completed", (e) => {
+      if (!isCurrentSession(e.sessionId)) return;
       const l = lbl(e.subagentId);
       const errKind = e.error?.kind;
       dispatch({ type: "fleetDone", id: e.subagentId, status: e.status, iterations: e.iterations, toolCalls: e.toolCalls, failureReason: errKind });
@@ -11058,17 +11443,20 @@ function useSubagentEvents(events, dispatch, setActiveMaxContext) {
       dispatch({ type: "addEntry", entry: { kind: "subagent", agentLabel: l.label, agentColor: l.color, icon, text: `${e.status} (${e.iterations} iter \xB7 ${e.toolCalls} tools \xB7 ${secs}s)${errChip}${errMsgTail}` } });
     });
     const offBudgetWarning = events.on("subagent.budget_warning", (e) => {
+      if (!isCurrentSession(e.sessionId)) return;
       const l = lbl(e.subagentId);
       dispatch({ type: "fleetBudgetWarning", id: e.subagentId, kind: e.kind, used: e.used, limit: e.limit });
       const timeoutSuffix = e.kind === "timeout" ? " (subagent continues running)" : " \u2014 extending";
       dispatch({ type: "addEntry", entry: { kind: "subagent", agentLabel: l.label, agentColor: l.color, icon: "\u26A1", text: `hitting ${e.kind} limit (${e.used}/${e.limit})${timeoutSuffix}` } });
     });
     const offBudgetExtended = events.on("subagent.budget_extended", (e) => {
+      if (!isCurrentSession(e.sessionId)) return;
       const l = lbl(e.subagentId);
       dispatch({ type: "fleetBudgetExtended", id: e.subagentId, totalExtensions: e.totalExtensions });
       dispatch({ type: "addEntry", entry: { kind: "subagent", agentLabel: l.label, agentColor: l.color, icon: "\u26A1", text: `extended ${e.kind} \u2192 ${e.newLimit} (\xD7${e.totalExtensions})` } });
     });
     const offIterationSummary = events.on("subagent.iteration_summary", (e) => {
+      if (!isCurrentSession(e.sessionId)) return;
       const l = lbl(e.subagentId);
       const costStr = e.costUsd > 0 ? ` \xB7 ${e.costUsd.toFixed(4)}` : "";
       const toolStr = e.currentTool ? ` \xB7 doing ${e.currentTool}` : "";
@@ -11076,22 +11464,39 @@ function useSubagentEvents(events, dispatch, setActiveMaxContext) {
       dispatch({ type: "addEntry", entry: { kind: "subagent", agentLabel: l.label, agentColor: l.color, icon: "\u{1F4AC}", text: `L${e.iteration} \xB7 ${e.toolCalls} tools${costStr}${toolStr}${partial}` } });
     });
     const offCtxPct = events.on("subagent.ctx_pct", (e) => {
+      if (!isCurrentSession(e.sessionId)) return;
       dispatch({ type: "fleetCtxPct", id: e.subagentId, load: e.load, tokens: e.tokens, maxContext: e.maxContext });
     });
     const offConcurrencyChanged = events.on("concurrency.changed", (e) => {
-      const { n } = e;
+      const { n, sessionId } = e;
+      if (!isCurrentSession(sessionId)) return;
       if (typeof n === "number" && n > 0) {
         dispatch({ type: "fleetConcurrency", n });
       }
     });
     const offLeaderCtxPct = events.on("ctx.pct", (e) => {
+      if (!isCurrentSession(e.sessionId)) return;
       setActiveMaxContext(e.maxContext);
       dispatch({ type: "leaderCtxPct", load: e.load, tokens: e.tokens, maxContext: e.maxContext });
     });
     const offLeaderMaxContext = events.on("ctx.max_context", (e) => {
+      if (!isCurrentSession(e.sessionId)) return;
       if (e.maxContext > 0) setActiveMaxContext(e.maxContext);
     });
+    const offCompactionFired = events.on("compaction.fired", (e) => {
+      const saved = e.report.before - e.report.after;
+      let label;
+      if (saved > 0) {
+        label = `\u26A1 compact: ${e.report.before} \u2192 ${e.report.after} tokens (\u2212${saved}) [${e.level}]`;
+      } else if (saved < 0) {
+        label = `\u26A0\uFE0F compact: context GREW by ${-saved} tokens [${e.level}]`;
+      } else {
+        label = "\u26A1 compact: no reduction needed";
+      }
+      dispatch({ type: "addEntry", entry: { kind: "warn", text: label } });
+    });
     const offTool = events.on("subagent.tool_executed", (e) => {
+      if (!isCurrentSession(e.sessionId)) return;
       dispatch({ type: "fleetTool", id: e.subagentId, name: e.name, ok: e.ok, durationMs: e.durationMs, outputBytes: e.outputBytes });
       dispatch({ type: "fleetToolEnd", id: e.subagentId });
     });
@@ -11106,9 +11511,10 @@ function useSubagentEvents(events, dispatch, setActiveMaxContext) {
       offConcurrencyChanged();
       offLeaderCtxPct();
       offLeaderMaxContext();
+      offCompactionFired();
       offTool();
     };
-  }, [events, dispatch, setActiveMaxContext, lbl]);
+  }, [events, dispatch, setActiveMaxContext, getSessionId, lbl]);
 }
 
 // src/hooks/use-tui-event-bridge.ts
@@ -11117,17 +11523,23 @@ function useTuiEventBridge({
   dispatch,
   stateRef,
   setActiveMaxContext,
+  getSessionId,
   subscribeAutoPhase,
   onClearHistory
 }) {
-  useSubagentEvents(events, dispatch, setActiveMaxContext);
-  useSessionEvents(events, dispatch, onClearHistory);
-  useBrainEvents(events, dispatch);
-  useAutoPhaseEvents(subscribeAutoPhase, dispatch, stateRef);
+  useSubagentEvents(events, dispatch, setActiveMaxContext, getSessionId);
+  useSessionEvents(events, dispatch, onClearHistory, getSessionId);
+  useBrainEvents(events, dispatch, getSessionId);
+  useAutoPhaseEvents(subscribeAutoPhase, dispatch, stateRef, getSessionId);
 }
-function useSessionEvents(events, dispatch, onClearHistory) {
+function useSessionEvents(events, dispatch, onClearHistory, getSessionId) {
   useEffect(() => {
+    const isCurrentSession = (sessionId) => {
+      const current = getSessionId?.();
+      return !sessionId || !current || sessionId === current;
+    };
     const offCheckpoint = events.on("checkpoint.written", (e) => {
+      if (!isCurrentSession(e.sessionId)) return;
       dispatch({
         type: "checkpointReceived",
         cp: {
@@ -11138,7 +11550,8 @@ function useSessionEvents(events, dispatch, onClearHistory) {
         }
       });
     });
-    const offRewound = events.on("session.rewound", () => {
+    const offRewound = events.on("session.rewound", (e) => {
+      if (!isCurrentSession(e.sessionId)) return;
       dispatch({ type: "sessionRewound", toPromptIndex: 0 });
       dispatch({ type: "clearHistory" });
       dispatch({ type: "resetContextChip" });
@@ -11148,12 +11561,18 @@ function useSessionEvents(events, dispatch, onClearHistory) {
       offCheckpoint();
       offRewound();
     };
-  }, [events, dispatch, onClearHistory]);
+  }, [events, dispatch, onClearHistory, getSessionId]);
 }
-function useAutoPhaseEvents(subscribeAutoPhase, dispatch, stateRef) {
+function useAutoPhaseEvents(subscribeAutoPhase, dispatch, stateRef, getSessionId) {
   useEffect(() => {
     if (!subscribeAutoPhase) return;
+    const isCurrentSession = (sessionId) => {
+      const current = getSessionId?.();
+      return !sessionId || !current || sessionId === current;
+    };
     const handler = (event, payload) => {
+      const sessionId = payload && typeof payload === "object" && "sessionId" in payload ? payload.sessionId : void 0;
+      if (!isCurrentSession(sessionId)) return;
       switch (event) {
         case "phase.started": {
           const p = payload;
@@ -11349,9 +11768,9 @@ function useAutoPhaseEvents(subscribeAutoPhase, dispatch, stateRef) {
       }
     };
     return subscribeAutoPhase(handler);
-  }, [subscribeAutoPhase, dispatch, stateRef]);
+  }, [subscribeAutoPhase, dispatch, stateRef, getSessionId]);
 }
-var USAGE = "Usage:\n  /kill             \u2014 list active processes + breaker state\n  /kill list        \u2014 same as /kill\n  /kill all         \u2014 kill all tracked processes (SIGTERM \u2192 SIGKILL)\n  /kill force       \u2014 kill all with SIGKILL immediately\n  /kill reset       \u2014 reset the circuit breaker to closed\n  /kill <pid>       \u2014 kill a specific process by PID";
+var USAGE2 = "Usage:\n  /kill             \u2014 list active processes + breaker state\n  /kill list        \u2014 same as /kill\n  /kill all         \u2014 kill all tracked processes (SIGTERM \u2192 SIGKILL)\n  /kill force       \u2014 kill all with SIGKILL immediately\n  /kill reset       \u2014 reset the circuit breaker to closed\n  /kill <pid>       \u2014 kill a specific process by PID";
 function createKillSlashCommand() {
   return {
     name: "kill",
@@ -11361,7 +11780,7 @@ function createKillSlashCommand() {
       const parts = trimmed.split(/\s+/);
       const sub = parts[0]?.toLowerCase() ?? "";
       if (sub === "" || sub === "list") {
-        return { message: renderList() };
+        return { message: renderList2() };
       }
       if (sub === "all") {
         const pids = getProcessRegistry().killAll();
@@ -11390,11 +11809,11 @@ function createKillSlashCommand() {
         return { message: `Process ${pid} not found in registry.` };
       }
       return { message: `Unknown subcommand "${sub}".
-${USAGE}` };
+${USAGE2}` };
     }
   };
 }
-function renderList() {
+function renderList2() {
   const registry = getProcessRegistry();
   const stats = registry.stats();
   const all = registry.list();
@@ -11445,146 +11864,52 @@ var ANSI_RE = new RegExp(
     "\\x1b"
   ].join("|"),
   "g"
-);
-function feedPaste(accum, input) {
-  if (accum === null && !input.includes(BEGIN)) {
-    if (input.startsWith("[") && !input.startsWith(BEGIN) && !input.startsWith(END)) {
-      if (PARTIAL_ANSI_RE.test(input)) {
-        return { accum: "", complete: null };
-      }
-      return null;
-    }
-    return null;
-  }
-  const piece = input.replace(BEGIN_RE, "").replace(END_RE, "").replace(ANSI_RE, "");
-  const next = (accum ?? "") + piece;
-  if (input.includes(END)) return { accum: null, complete: next };
-  return { accum: next, complete: null };
-}
-function createPsSlashCommand() {
-  return {
-    name: "ps",
-    description: "List all active bash/exec processes tracked by the process registry.",
-    async run(_args) {
-      return { message: renderList2() };
-    }
-  };
-}
-function renderList2() {
-  const registry = getProcessRegistry();
-  const stats = registry.stats();
-  const all = registry.list();
-  if (all.length === 0) return "No active processes.";
-  const breaker = stats.breaker;
-  const stateLabel = breaker.state === "closed" ? "\u{1F7E2} closed" : breaker.state === "half-open" ? "\u{1F7E1} half-open" : `\u{1F534} open`;
-  const now = Date.now();
-  const lines = [
-    `Active processes (${all.length}) \u2014 breaker ${stateLabel}`,
-    `  failure=${breaker.consecutiveFailures}/5  slow=${breaker.slowCallsInWindow}/3  rate=${breaker.callsInWindow}/30`,
-    ""
-  ];
-  for (const p of all) {
-    const age = ((now - p.startedAt) / 1e3).toFixed(1);
-    const killedTag = p.killed ? " [killed]" : "";
-    const cmd = p.command.length > 80 ? p.command.slice(0, 77) + "\u2026" : p.command;
-    lines.push(`  ${p.pid}  ${p.name}  ${age}s  ${cmd}${killedTag}`);
-  }
-  return lines.join("\n");
-}
-
-// src/queue-slash.ts
-var USAGE2 = "Usage:\n  /queue                  \u2014 list pending messages\n  /queue list             \u2014 same as /queue\n  /queue clear            \u2014 drop all pending messages\n  /queue delete N M\u2026      \u2014 drop messages at 1-based positions\n  /queue picker on|off    \u2014 toggle the mid-run send-mode picker (queue/btw/steer)\n  /queue picker           \u2014 show whether the picker is on";
-function createQueueSlashCommand(deps) {
-  return {
-    name: "queue",
-    description: "List, clear, or delete pending messages typed while the agent was running.",
-    async run(args) {
-      const out = handleQueueCommand(args, deps);
-      return { message: out };
-    }
-  };
-}
-function handleQueueCommand(args, deps) {
-  const trimmed = args.trim();
-  const [sub, ...rest] = trimmed.split(/\s+/);
-  const subcommand = sub?.toLowerCase() ?? "";
-  if (subcommand === "" || subcommand === "list") {
-    return renderList3(deps.getQueue());
-  }
-  if (subcommand === "picker") {
-    if (!deps.getPickerEnabled || !deps.setPickerEnabled) {
-      return "Send-mode picker toggle is unavailable in this session.";
-    }
-    const arg = rest[0]?.toLowerCase() ?? "";
-    if (arg === "" || arg === "status") {
-      return `Mid-run send-mode picker is ${deps.getPickerEnabled() ? "on" : "off"}.`;
-    }
-    if (arg === "on" || arg === "off") {
-      const next = arg === "on";
-      deps.setPickerEnabled(next);
-      return next ? "Mid-run send-mode picker: on \u2014 plain messages typed while busy ask queue/btw/steer." : "Mid-run send-mode picker: off \u2014 plain messages typed while busy are queued silently.";
-    }
-    return "Usage: /queue picker on|off";
-  }
-  if (subcommand === "clear") {
-    const before = deps.getQueue().length;
-    if (before === 0) return "Queue is already empty.";
-    deps.clear();
-    return `Cleared ${before} queued message${before === 1 ? "" : "s"}.`;
-  }
-  if (subcommand === "delete" || subcommand === "del" || subcommand === "rm") {
-    if (rest.length === 0) return "Usage: /queue delete <position> [<position>\u2026]";
-    const queue = deps.getQueue();
-    if (queue.length === 0) return "Queue is empty \u2014 nothing to delete.";
-    const parsed = [];
-    const invalid = [];
-    const outOfRange = [];
-    for (const tok of rest) {
-      if (!/^\d+$/.test(tok)) {
-        invalid.push(tok);
-        continue;
-      }
-      const n = Number.parseInt(tok, 10);
-      if (n < 1 || n > queue.length) {
-        outOfRange.push(n);
-        continue;
-      }
-      parsed.push(n);
-    }
-    const uniqueValid = [...new Set(parsed)];
-    if (uniqueValid.length === 0) {
-      const parts2 = ["No valid positions to delete."];
-      if (invalid.length > 0) parts2.push(`Invalid: ${invalid.join(", ")}.`);
-      if (outOfRange.length > 0)
-        parts2.push(`Out of range (queue has ${queue.length}): ${outOfRange.join(", ")}.`);
-      return parts2.join(" ");
+);
+function feedPaste(accum, input) {
+  if (accum === null && !input.includes(BEGIN)) {
+    if (input.startsWith("[") && !input.startsWith(BEGIN) && !input.startsWith(END)) {
+      if (PARTIAL_ANSI_RE.test(input)) {
+        return { accum: "", complete: null };
+      }
+      return null;
     }
-    deps.deleteAt(uniqueValid);
-    const parts = [
-      `Deleted ${uniqueValid.length} of ${queue.length} (positions ${uniqueValid.sort((a, b) => a - b).join(", ")}).`
-    ];
-    if (invalid.length > 0) parts.push(`Ignored invalid: ${invalid.join(", ")}.`);
-    if (outOfRange.length > 0) parts.push(`Ignored out of range: ${outOfRange.join(", ")}.`);
-    return parts.join(" ");
+    return null;
   }
-  return `Unknown subcommand "${sub}".
-${USAGE2}`;
+  const piece = input.replace(BEGIN_RE, "").replace(END_RE, "").replace(ANSI_RE, "");
+  const next = (accum ?? "") + piece;
+  if (input.includes(END)) return { accum: null, complete: next };
+  return { accum: next, complete: null };
 }
-function renderList3(queue) {
-  if (queue.length === 0) return "Queue is empty.";
-  const lines = [`Queue (${queue.length}):`];
-  for (let i = 0; i < queue.length; i++) {
-    const item = queue[i];
-    if (!item) continue;
-    const preview = oneLine(item.displayText, 100);
-    lines.push(`  ${i + 1}. ${preview}`);
+function createPsSlashCommand() {
+  return {
+    name: "ps",
+    description: "List all active bash/exec processes tracked by the process registry.",
+    async run(_args) {
+      return { message: renderList3() };
+    }
+  };
+}
+function renderList3() {
+  const registry = getProcessRegistry();
+  const stats = registry.stats();
+  const all = registry.list();
+  if (all.length === 0) return "No active processes.";
+  const breaker = stats.breaker;
+  const stateLabel = breaker.state === "closed" ? "\u{1F7E2} closed" : breaker.state === "half-open" ? "\u{1F7E1} half-open" : `\u{1F534} open`;
+  const now = Date.now();
+  const lines = [
+    `Active processes (${all.length}) \u2014 breaker ${stateLabel}`,
+    `  failure=${breaker.consecutiveFailures}/5  slow=${breaker.slowCallsInWindow}/3  rate=${breaker.callsInWindow}/30`,
+    ""
+  ];
+  for (const p of all) {
+    const age = ((now - p.startedAt) / 1e3).toFixed(1);
+    const killedTag = p.killed ? " [killed]" : "";
+    const cmd = p.command.length > 80 ? p.command.slice(0, 77) + "\u2026" : p.command;
+    lines.push(`  ${p.pid}  ${p.name}  ${age}s  ${cmd}${killedTag}`);
   }
   return lines.join("\n");
 }
-function oneLine(s2, max) {
-  const collapsed = s2.replace(/\s+/g, " ").trim();
-  return collapsed.length <= max ? collapsed : `${collapsed.slice(0, max - 1)}\u2026`;
-}
 
 // src/slash-command-search.ts
 var CATEGORY_ORDER = ["Run", "Session", "Inspect", "Agent", "Config", "App"];
@@ -14174,8 +14499,8 @@ function App({
       let bundledDir;
       try {
         const req = createRequire(import.meta.url);
-        bundledDir = path5.join(
-          path5.dirname(req.resolve("@wrongstack/core/package.json")),
+        bundledDir = path6.join(
+          path6.dirname(req.resolve("@wrongstack/core/package.json")),
           "data",
           "prompts"
         );
@@ -14263,28 +14588,26 @@ function App({
   if (builderRef.current === null) {
     builderRef.current = new InputBuilder({ store: attachments });
   }
-  const pasteAccumRef = useRef(null);
-  const pasteFlushTimerRef = useRef(null);
   const activeCtrlRef = useRef(null);
   const exitRequestedRef = useRef(false);
   const inputGateRef = useRef(false);
   const lastEnterAtRef = useRef(0);
   const tokenPreviewsRef = useRef(/* @__PURE__ */ new Map());
   const projectName = React5.useMemo(() => {
-    const base = path5.basename(projectRoot);
-    return base && base !== path5.sep ? base : void 0;
+    const base = path6.basename(projectRoot);
+    return base && base !== path6.sep ? base : void 0;
   }, [projectRoot]);
   const [workingDirChip, setWorkingDirChip] = React5.useState(() => {
     const ctx = agent.ctx;
     if (ctx.workingDir && ctx.workingDir !== projectRoot) {
-      return path5.relative(projectRoot, ctx.workingDir) || ".";
+      return path6.relative(projectRoot, ctx.workingDir) || ".";
     }
     return void 0;
   });
   React5.useEffect(() => {
     const ctx = agent.ctx;
     return ctx.onWorkingDirChanged((newDir) => {
-      const rel = path5.relative(projectRoot, newDir) || ".";
+      const rel = path6.relative(projectRoot, newDir) || ".";
       setWorkingDirChip(rel === "." ? void 0 : rel);
     });
   }, [agent.ctx, projectRoot]);
@@ -14711,7 +15034,7 @@ function App({
     let cancelled = false;
     const poll = async () => {
       try {
-        const data = await fs3.readFile(planPath, "utf8");
+        const data = await fsp.readFile(planPath, "utf8");
         const parsed = JSON.parse(data);
         if (cancelled) return;
         if (!Array.isArray(parsed.items)) {
@@ -14745,7 +15068,7 @@ function App({
     let cancelled = false;
     const poll = async () => {
       try {
-        const data = await fs3.readFile(taskPath, "utf8");
+        const data = await fsp.readFile(taskPath, "utf8");
         const parsed = JSON.parse(data);
         if (cancelled) return;
         if (!Array.isArray(parsed.tasks)) {
@@ -14944,25 +15267,6 @@ function App({
   React5.useLayoutEffect(() => {
     if (state.enhanceBusy || state.enhance != null) eraseLiveRegion();
   });
-  useEffect(() => {
-    const detected = detectAtToken(state.buffer, state.cursor);
-    if (!detected) {
-      if (state.picker.open) dispatch({ type: "pickerClose" });
-      return;
-    }
-    if (!state.picker.open || state.picker.query !== detected.query) {
-      dispatch({ type: "pickerOpen", query: detected.query });
-    }
-    let cancelled = false;
-    searchFiles(projectRoot, detected.query, 8).then((matches) => {
-      if (!cancelled) {
-        dispatch({ type: "pickerSetMatches", query: detected.query, matches });
-      }
-    }).catch(() => void 0);
-    return () => {
-      cancelled = true;
-    };
-  }, [state.buffer, state.cursor, projectRoot]);
   useEffect(() => {
     const trimmed = state.buffer.trimStart();
     if (!trimmed.startsWith("/")) {
@@ -14981,93 +15285,6 @@ function App({
       dispatch({ type: "slashPickerOpen", query, matches });
     }
   }, [state.buffer, slashRegistry]);
-  const pasteClipboardImage = async () => {
-    const builder = builderRef.current;
-    if (!builder) return;
-    try {
-      const img = await readClipboardImage();
-      if (!img) {
-        dispatch({
-          type: "addEntry",
-          entry: { kind: "info", text: "No image on the clipboard." }
-        });
-        return;
-      }
-      const token = await builder.registerImage(img.base64, img.mediaType);
-      const kb = (img.bytes / 1024).toFixed(0);
-      tokenPreviewsRef.current.set(token, `image, ${kb} KB`);
-      const { buffer, cursor } = draftRef.current;
-      const next = buffer.slice(0, cursor) + token + buffer.slice(cursor);
-      setDraft(next, cursor + token.length);
-    } catch (err) {
-      dispatch({
-        type: "addEntry",
-        entry: {
-          kind: "error",
-          text: `Clipboard image error: ${toErrorMessage(err)}`
-        }
-      });
-    }
-  };
-  const pasteClipboardText = async () => {
-    try {
-      const text = await readClipboardText();
-      if (!text) {
-        dispatch({
-          type: "addEntry",
-          entry: { kind: "info", text: "No text on the clipboard." }
-        });
-        return;
-      }
-      await commitPaste(text);
-    } catch (err) {
-      dispatch({
-        type: "addEntry",
-        entry: {
-          kind: "error",
-          text: `Clipboard error: ${toErrorMessage(err)}`
-        }
-      });
-    }
-  };
-  const acceptPickerSelection = async () => {
-    const { open, matches, selected } = state.picker;
-    if (!open || matches.length === 0) return;
-    const picked = matches[selected];
-    if (!picked) return;
-    const builder = builderRef.current;
-    if (!builder) return;
-    const draft = draftRef.current;
-    const tok = detectAtToken(draft.buffer, draft.cursor);
-    if (!tok) {
-      dispatch({ type: "pickerClose" });
-      return;
-    }
-    const absPath = path5.isAbsolute(picked) ? picked : path5.join(projectRoot, picked);
-    try {
-      const data = await fs3.readFile(absPath, "utf8");
-      const token = await builder.registerFile({
-        kind: "file",
-        data,
-        meta: { filename: picked, label: picked }
-      });
-      tokenPreviewsRef.current.set(token, data);
-      const before = draft.buffer.slice(0, tok.start);
-      const after = draft.buffer.slice(tok.end);
-      const next = `${before}${token}${after}`;
-      setDraft(next, tok.start + token.length);
-      dispatch({ type: "pickerClose" });
-    } catch (err) {
-      dispatch({
-        type: "addEntry",
-        entry: {
-          kind: "error",
-          text: `Attach failed: ${toErrorMessage(err)}`
-        }
-      });
-      dispatch({ type: "pickerClose" });
-    }
-  };
   const acceptSlashPickerSelection = () => {
     const { open, matches, selected } = state.slashPicker;
     if (!open || matches.length === 0) return;
@@ -15077,56 +15294,6 @@ function App({
     setDraft(cmd, cmd.length);
     dispatch({ type: "slashPickerClose" });
   };
-  useEffect(() => {
-    if (!queueStore) return;
-    let cancelled = false;
-    queueStore.read().then((items) => {
-      if (cancelled || items.length === 0) return;
-      for (const item of items) {
-        dispatch({
-          type: "enqueue",
-          item: { displayText: item.displayText, blocks: item.blocks }
-        });
-      }
-      dispatch({
-        type: "addEntry",
-        entry: {
-          kind: "info",
-          text: `Restored ${items.length} queued message${items.length === 1 ? "" : "s"} from a previous run.`
-        }
-      });
-    }).catch(() => void 0);
-    return () => {
-      cancelled = true;
-    };
-  }, [queueStore]);
-  useEffect(() => {
-    if (!queueStore) return;
-    queueStore.write(state.queue.map(({ displayText, blocks }) => ({ displayText, blocks }))).catch(() => void 0);
-  }, [state.queue, queueStore]);
-  useEffect(() => {
-    onQueueChange?.(state.queue.map((q) => q.displayText));
-  }, [state.queue, onQueueChange]);
-  useEffect(() => {
-    const cmd = createQueueSlashCommand({
-      getQueue: () => stateRef.current.queue,
-      clear: () => dispatch({ type: "queueClear" }),
-      deleteAt: (positions) => dispatch({ type: "queueDelete", positions }),
-      getPickerEnabled: () => midRunSendPickerRef.current,
-      setPickerEnabled: (enabled) => {
-        midRunSendPickerRef.current = enabled;
-        const cur = getSettings?.();
-        if (cur && saveSettings) {
-          Promise.resolve(saveSettings({ ...cur, midRunSendPicker: enabled })).catch(() => {
-          });
-        }
-      }
-    });
-    slashRegistry.register(cmd);
-    return () => {
-      slashRegistry.unregister("queue");
-    };
-  }, [slashRegistry]);
   useEffect(() => {
     slashRegistry.register(createKillSlashCommand());
     slashRegistry.register(createPsSlashCommand());
@@ -16046,6 +16213,7 @@ Available chords:
       events.emit("client.status", {
         clientType: "tui",
         clientId,
+        sessionId: agent.ctx.session.id,
         projectHash: agent.ctx.projectRoot ? projectSlug(agent.ctx.projectRoot) : "unknown",
         agentCount: 1,
         // TUI is a single leader agent
@@ -16110,16 +16278,41 @@ Available chords:
   }, [state.enhanceEnabled]);
   const midRunSendPickerRef = useRef(midRunSendPicker);
   const enhanceAbortRef = useRef(null);
+  const {
+    pasteAccumRef,
+    pasteFlushTimerRef,
+    commitPaste,
+    pasteClipboardImage,
+    pasteClipboardText
+  } = usePasteHandling({
+    builderRef,
+    dispatch,
+    draftRef,
+    setDraft,
+    tokenPreviewsRef
+  });
+  useQueueManager({
+    queueStore,
+    onQueueChange,
+    slashRegistry,
+    stateRef,
+    dispatch,
+    getSettings,
+    saveSettings,
+    midRunSendPickerRef
+  });
   const [enhanceCountdown, setEnhanceCountdown] = useState(null);
   const [nextStepsAutoSubmitCountdown, setNextStepsAutoSubmitCountdown] = useState(null);
   const [nextStepsAutoSubmitLabel, setNextStepsAutoSubmitLabel] = useState(null);
   const nextStepsAutoSubmitSuggestionRef = useRef(null);
   const nextStepsAutoSubmitTimerRef = useRef(void 0);
+  const getActiveSessionId = useCallback(() => agent.ctx.session.id, [agent]);
   useTuiEventBridge({
     events,
     dispatch,
     stateRef,
     setActiveMaxContext,
+    getSessionId: getActiveSessionId,
     subscribeAutoPhase,
     onClearHistory
   });
@@ -16150,6 +16343,15 @@ Available chords:
     stateRef,
     streamFleet: state.streamFleet
   });
+  const { onPickerEnter } = useFileSearch({
+    state,
+    dispatch,
+    projectRoot,
+    builderRef,
+    draftRef,
+    setDraft,
+    tokenPreviewsRef
+  });
   const submitRef = useRef(() => {
   });
   const tryPickerKey = usePickerKeys({
@@ -16330,9 +16532,7 @@ Available chords:
       const action = actionForFKeyPanel(entry, statuslineHiddenForPicker());
       if (action) dispatch(action);
     },
-    onPickerEnter: async () => {
-      await acceptPickerSelection();
-    }
+    onPickerEnter
   });
   useEffect(() => {
     const onSigint = () => {
@@ -16456,28 +16656,6 @@ Available chords:
       process.off("SIGINT", onSigint);
     };
   }, [director, getEternalEngine, getParallelEngine, getSddRun, switchAutonomy, onExit, exit]);
-  const commitPaste = async (full) => {
-    const builder = builderRef.current;
-    if (!builder || !full) return;
-    const { buffer, cursor } = draftRef.current;
-    const isSlashCmd = buffer.trimStart().startsWith("/");
-    const mustCollapse = builder.wouldCollapse(full);
-    const multiLine = full.includes("\n");
-    if (isSlashCmd && !mustCollapse) {
-      const next2 = buffer.slice(0, cursor) + full + buffer.slice(cursor);
-      setDraft(next2, cursor + full.length);
-      return;
-    }
-    if (mustCollapse || multiLine) {
-      const token = await builder.registerPaste(full);
-      tokenPreviewsRef.current.set(token, full);
-      const next2 = buffer.slice(0, cursor) + token + buffer.slice(cursor);
-      setDraft(next2, cursor + token.length);
-      return;
-    }
-    const next = buffer.slice(0, cursor) + full + buffer.slice(cursor);
-    setDraft(next, cursor + full.length);
-  };
   const handleKey = async (input, key) => {
     if (state.status === "aborting" && !state.steeringPending && state.interrupts === 0) return;
     if (state.confirmQueue.length > 0) return;
@@ -16545,6 +16723,7 @@ Available chords:
       }
       return;
     }
+    if (pasteAccumRef.current !== null && isEnter) return;
     if (tryPickerKey(input, key, isEnter)) return;
     if (key.escape && state.status !== "idle" && state.confirmQueue.length === 0) {
       const runningTools = Array.from(state.runningTools.values()).map((t) => t.name);
@@ -18239,6 +18418,7 @@ ${content}
           mode: liveStatuslineMode,
           visibleChips: state.statuslinePicker.visibleChips,
           events,
+          sessionId: agent.ctx.session.id,
           eternalStage: state.eternalStage,
           goalSummary: state.goalSummary,
           indexState,
@@ -18377,21 +18557,6 @@ function renderRunningTools(running) {
   const more = running.size > 1 ? ` (+${running.size - 1})` : "";
   return `running: ${oldest.name} ${elapsedSec}s${more}`;
 }
-function detectAtToken(buffer, cursor) {
-  let i = cursor - 1;
-  while (i >= 0) {
-    const ch = buffer.charCodeAt(i);
-    if (ch === 64) {
-      if (i === 0 || /\s/.test(buffer[i - 1] ?? "")) {
-        return { start: i, end: cursor, query: buffer.slice(i + 1, cursor) };
-      }
-      return null;
-    }
-    if (ch === 32 || ch === 9 || ch === 10) return null;
-    i--;
-  }
-  return null;
-}
 function fmtTok3(n) {
   if (n < 1e3) return String(n);
   if (n < 1e6) return `${(n / 1e3).toFixed(n < 1e4 ? 1 : 0)}k`;
@@ -18524,7 +18689,7 @@ async function runTui(opts) {
       stdout,
       events: opts.events,
       model: opts.model,
-      appName: opts.projectRoot ? path5.basename(opts.projectRoot) : void 0
+      appName: opts.projectRoot ? path6.basename(opts.projectRoot) : void 0
     });
   };
   const stopTitle = () => {
@@ -18617,19 +18782,19 @@ async function runTui(opts) {
     if (!opts.projectRoot) return null;
     try {
       const projectDir = resolveProjectDir(opts.projectRoot, wstackGlobalRoot());
-      const hqPublisher = createHqPublisherFromEnv({ clientKind: "tui", projectRoot: opts.projectRoot, projectName: path5.basename(opts.projectRoot), appConfig: opts.appConfig });
+      const hqPublisher = createHqPublisherFromEnv({ clientKind: "tui", projectRoot: opts.projectRoot, projectName: path6.basename(opts.projectRoot), appConfig: opts.appConfig });
       hqPublisher?.connect();
       const mailbox = new GlobalMailbox(projectDir, opts.events, hqPublisher);
       const clientId = `tui@${randomUUID().slice(0, 8)}`;
       await mailbox.registerClient({
         clientId,
-        sessionId: opts.projectRoot,
-        name: `TUI [${path5.basename(opts.projectRoot)}]`,
+        sessionId: opts.getSessionId?.() ?? opts.projectRoot,
+        name: `TUI [${path6.basename(opts.projectRoot)}]`,
         source: "tui",
         pid: process.pid
       });
       clientHeartbeatTimer = setInterval(() => {
-        mailbox.clientHeartbeat({ clientId }).catch(() => {
+        mailbox.clientHeartbeat({ clientId, sessionId: opts.getSessionId?.() ?? opts.projectRoot }).catch(() => {
         });
       }, CLIENT_HEARTBEAT_MS);
       clientHeartbeatTimer.unref();