@hydra-acp/cli 0.1.6 → 0.1.7

package/dist/cli.js

@@ -32,6 +32,9 @@ var init_paths = __esm({
     paths = {
       home: hydraHome,
       config: () => path.join(hydraHome(), "config.json"),
+      // Auth token lives in its own file so config.json can be version-
+      // controlled without leaking the secret. Raw string contents, mode 0600.
+      authToken: () => path.join(hydraHome(), "auth-token"),
       pidFile: () => path.join(hydraHome(), "daemon.pid"),
       logFile: () => path.join(hydraHome(), "daemon.log"),
       currentLogFile: () => path.join(hydraHome(), "current.log"),
@@ -68,61 +71,95 @@ function extensionList(config) {
     ...body
   }));
 }
-async function loadConfig() {
-  const configPath = paths.config();
+async function readConfigFile() {
   let raw;
   try {
-    raw = await fs.readFile(configPath, "utf8");
+    raw = await fs.readFile(paths.config(), "utf8");
   } catch (err) {
     const e = err;
     if (e.code === "ENOENT") {
-      throw new Error(
-        `No config found at ${configPath}. Run \`hydra-acp init\` to create one.`
-      );
+      return {};
     }
     throw err;
   }
-  const parsed = JSON.parse(raw);
-  return HydraConfig.parse(parsed);
+  return JSON.parse(raw);
 }
-async function ensureConfig() {
+async function loadAuthToken() {
+  let tokenFile;
   try {
-    await fs.access(paths.config());
+    const text = await fs.readFile(paths.authToken(), "utf8");
+    const trimmed = text.trim();
+    if (trimmed.length > 0) {
+      tokenFile = trimmed;
+    }
   } catch (err) {
     const e = err;
     if (e.code !== "ENOENT") {
       throw err;
     }
-    const config = await writeMinimalInitConfig();
-    process.stderr.write(
-      `hydra-acp: initialized ${paths.config()} with a fresh auth token.
-`
+  }
+  const raw = await readConfigFile();
+  const daemon = raw.daemon;
+  const legacy = daemon && typeof daemon.authToken === "string" ? daemon.authToken : void 0;
+  if (tokenFile && legacy) {
+    throw new Error(
+      `Auth token present in both ${paths.authToken()} and ${paths.config()} (daemon.authToken). Remove daemon.authToken from config.json to resolve.`
     );
-    return config;
   }
-  return loadConfig();
+  if (tokenFile) {
+    return tokenFile;
+  }
+  if (legacy) {
+    await migrateLegacyAuthToken(raw, daemon, legacy);
+    return legacy;
+  }
+  return void 0;
 }
-async function writeMinimalInitConfig(authToken) {
-  const token = authToken ?? generateAuthToken();
-  const minimal = { daemon: { authToken: token } };
-  await fs.mkdir(paths.home(), { recursive: true });
-  await fs.writeFile(paths.config(), JSON.stringify(minimal, null, 2) + "\n", {
+async function migrateLegacyAuthToken(raw, daemon, token) {
+  await writeAuthToken(token);
+  delete daemon.authToken;
+  if (Object.keys(daemon).length === 0) {
+    delete raw.daemon;
+  }
+  await fs.writeFile(paths.config(), JSON.stringify(raw, null, 2) + "\n", {
     encoding: "utf8",
     mode: 384
   });
-  return HydraConfig.parse(minimal);
-}
-async function updateConfigField(mutate) {
-  const path7 = paths.config();
-  const text = await fs.readFile(path7, "utf8");
-  const raw = JSON.parse(text);
-  mutate(raw);
-  HydraConfig.parse(raw);
-  await fs.writeFile(path7, JSON.stringify(raw, null, 2) + "\n", {
+  process.stderr.write(
+    `hydra-acp: migrated auth token from ${paths.config()} to ${paths.authToken()}.
+`
+  );
+}
+async function writeAuthToken(token) {
+  await fs.mkdir(paths.home(), { recursive: true });
+  await fs.writeFile(paths.authToken(), token + "\n", {
     encoding: "utf8",
     mode: 384
   });
 }
+async function loadConfig() {
+  const token = await loadAuthToken();
+  if (!token) {
+    throw new Error(
+      `No auth token found at ${paths.authToken()}. Run \`hydra-acp init\` to create one.`
+    );
+  }
+  const raw = await readConfigFile();
+  const daemon = raw.daemon ??= {};
+  daemon.authToken = token;
+  return HydraConfig.parse(raw);
+}
+async function ensureConfig() {
+  if (!await loadAuthToken()) {
+    const token = generateAuthToken();
+    await writeAuthToken(token);
+    process.stderr.write(
+      `hydra-acp: initialized ${paths.authToken()} with a fresh auth token.
+`
+    );
+  }
+  return loadConfig();
+}
 function generateAuthToken() {
   const bytes = new Uint8Array(32);
   crypto.getRandomValues(bytes);
@@ -177,7 +214,13 @@ var init_config = __esm({
       // Cap on logical lines retained in the in-memory scrollback render
       // buffer. Oldest lines are dropped on overflow. The on-disk session
       // history is unaffected; this only bounds the TUI's local view buffer.
-      maxScrollbackLines: z.number().int().positive().default(1e4)
+      maxScrollbackLines: z.number().int().positive().default(1e4),
+      // When true (default), the TUI captures mouse events so the wheel can
+      // drive scrollback. The cost: terminals route clicks to the app, so
+      // text selection requires shift+drag to bypass mouse reporting. Set
+      // false to disable capture — wheel scrollback stops working, but
+      // plain click-drag selects text via the terminal emulator.
+      mouse: z.boolean().default(true)
     });
     ExtensionName = z.string().min(1).regex(/^[A-Za-z0-9._-]+$/, "extension name must be filename-safe");
     ExtensionBody = z.object({
@@ -210,7 +253,11 @@ var init_config = __esm({
       // recency and truncated to this count. `--all` overrides in the CLI.
       sessionListColdLimit: z.number().int().nonnegative().default(20),
       extensions: z.record(ExtensionName, ExtensionBody).default({}),
-      tui: TuiConfig.default({ repaintThrottleMs: 1e3, maxScrollbackLines: 1e4 })
+      tui: TuiConfig.default({
+        repaintThrottleMs: 1e3,
+        maxScrollbackLines: 1e4,
+        mouse: true
+      })
     });
   }
 });
@@ -395,7 +442,7 @@ var init_connection = __esm({
   "src/acp/connection.ts"() {
     "use strict";
     init_types();
-    JsonRpcConnection = class {
+    JsonRpcConnection = class _JsonRpcConnection {
       constructor(stream) {
         this.stream = stream;
         this.stream.onMessage((m) => this.handleIncoming(m));
@@ -405,6 +452,16 @@ var init_connection = __esm({
       requestHandlers = /* @__PURE__ */ new Map();
       defaultRequestHandler;
       notificationHandlers = /* @__PURE__ */ new Map();
+      // Notifications received before a handler was registered. Some agents
+      // (e.g. claude-acp) advertise their command list in the same chunk as
+      // the `session/new` response, which is processed before the consumer
+      // can attach its `session/update` handler. Without this buffer those
+      // notifications would be silently dropped, so e.g. `/model` would
+      // never appear in the TUI's slash-completion palette. Capped per
+      // method to keep the buffer from growing unboundedly when nothing
+      // ever subscribes.
+      bufferedNotifications = /* @__PURE__ */ new Map();
+      static MAX_BUFFERED_PER_METHOD = 64;
       pending = /* @__PURE__ */ new Map();
       closed = false;
       closeHandlers = [];
@@ -416,6 +473,17 @@ var init_connection = __esm({
       }
       onNotification(method, handler) {
         this.notificationHandlers.set(method, handler);
+        const queued = this.bufferedNotifications.get(method);
+        if (!queued) {
+          return;
+        }
+        this.bufferedNotifications.delete(method);
+        for (const note of queued) {
+          try {
+            handler(note.params, note.method);
+          } catch {
+          }
+        }
       }
       onClose(handler) {
         this.closeHandlers.push(handler);
@@ -501,6 +569,16 @@ var init_connection = __esm({
         const handler = this.notificationHandlers.get(note.method);
         if (handler) {
           handler(note.params, note.method);
+          return;
+        }
+        let queued = this.bufferedNotifications.get(note.method);
+        if (!queued) {
+          queued = [];
+          this.bufferedNotifications.set(note.method, queued);
+        }
+        queued.push(note);
+        if (queued.length > _JsonRpcConnection.MAX_BUFFERED_PER_METHOD) {
+          queued.shift();
         }
       }
       handleResponse(res) {
@@ -557,12 +635,12 @@ var init_hydra_commands = __esm({
     HYDRA_COMMANDS = [
       {
         verb: "title",
-        name: "/hydra title",
+        name: "hydra title",
         description: "Regenerate the session title via the agent (or set manually with an arg)"
       },
       {
         verb: "agent",
-        name: "/hydra agent",
+        name: "hydra agent",
         argsHint: "<agent>",
         description: "Swap the agent backing this session, preserving context"
       }
@@ -3437,6 +3515,7 @@ var init_screen = __esm({
       streamingActive = false;
       lastPromptRows = 0;
       queuedTexts = [];
+      lastQueueEditingIndex = -1;
       repaintPaused = 0;
       repaintPending = false;
       lastRepaintAt = 0;
@@ -3493,12 +3572,14 @@ var init_screen = __esm({
       pasteActive = false;
       pasteBuffer = "";
       rawStdinHandler;
+      mouseEnabled;
       constructor(opts) {
         this.term = opts.term;
         this.dispatcher = opts.dispatcher;
         this.onKey = opts.onKey;
         this.contentRepaintThrottleMs = opts.repaintThrottleMs ?? DEFAULT_CONTENT_REPAINT_THROTTLE_MS;
         this.maxScrollbackLines = opts.maxScrollbackLines ?? DEFAULT_MAX_SCROLLBACK_LINES;
+        this.mouseEnabled = opts.mouse ?? true;
         this.resizeHandler = () => this.repaint();
         this.keyHandler = (name, _matches, data) => this.handleKey(name, data);
         this.mouseHandler = (name) => this.handleMouse(name);
@@ -3515,10 +3596,16 @@ var init_screen = __esm({
         this.lastFrameH = 0;
         this.lastWindowTitle = null;
         process.stdout.write("\x1B[?7l");
-        this.term.grabInput({ mouse: "button" });
+        if (this.mouseEnabled) {
+          this.term.grabInput({ mouse: "button" });
+        } else {
+          this.term.grabInput(true);
+        }
         this.term.hideCursor(false);
         this.term.on("key", this.keyHandler);
-        this.term.on("mouse", this.mouseHandler);
+        if (this.mouseEnabled) {
+          this.term.on("mouse", this.mouseHandler);
+        }
         this.term.on("resize", this.resizeHandler);
         this.installBracketedPaste();
         this.repaint();
@@ -3530,7 +3617,9 @@ var init_screen = __esm({
         this.started = false;
         this.uninstallBracketedPaste();
         this.term.off("key", this.keyHandler);
-        this.term.off("mouse", this.mouseHandler);
+        if (this.mouseEnabled) {
+          this.term.off("mouse", this.mouseHandler);
+        }
         this.term.off("resize", this.resizeHandler);
         this.term.grabInput(false);
         this.term.hideCursor(false);
@@ -3880,6 +3969,7 @@ var init_screen = __esm({
       }
       setQueuedPrompts(texts) {
         this.queuedTexts = [...texts];
+        this.lastQueueEditingIndex = this.dispatcher.state().queueIndex;
         this.repaint();
       }
       // While a permission prompt is active, the prompt area is replaced with
@@ -3932,12 +4022,19 @@ var init_screen = __esm({
       // row count changed (alt+enter added a line, backspace joined two), the
       // separator and scrollback bottom shift, so we need a full repaint;
       // otherwise an in-place prompt redraw is enough. (Queued-zone changes
-      // already trigger a full repaint via setQueuedPrompts.)
+      // already trigger a full repaint via setQueuedPrompts.) Queue-edit
+      // navigation may also change which queued row is marked, so check
+      // for that and redraw just that zone in-place.
       refreshPrompt() {
         if (this.promptRows() !== this.lastPromptRows) {
           this.repaint();
           return;
         }
+        const editingIndex = this.dispatcher.state().queueIndex;
+        if (editingIndex !== this.lastQueueEditingIndex) {
+          this.lastQueueEditingIndex = editingIndex;
+          this.drawQueuedZone();
+        }
         this.drawPrompt();
         this.placeCursor();
       }
@@ -3988,6 +4085,14 @@ var init_screen = __esm({
         this.scrollOffset = 0;
         this.repaint();
       }
+      scrollToTop() {
+        const max = this.maxScrollOffset();
+        if (this.scrollOffset === max) {
+          return;
+        }
+        this.scrollOffset = max;
+        this.repaint();
+      }
       scrollPageSize() {
         return Math.max(1, this.scrollbackVisibleRows() - 2);
       }
@@ -4215,19 +4320,26 @@ var init_screen = __esm({
         const separatorRow = this.term.height - promptRows - BANNER_ROWS;
         const queuedBottom = separatorRow - 1;
         const queuedTop = queuedBottom - rows + 1;
+        const editingIndex = this.dispatcher.state().queueIndex;
         for (let i = 0; i < rows; i++) {
           const row = queuedTop + i;
           const text = this.queuedTexts[i];
           const isLast = i === rows - 1 && this.queuedTexts.length > MAX_QUEUED_ROWS;
           const overflow = this.queuedTexts.length - MAX_QUEUED_ROWS;
           const summary = text === void 0 ? "" : isLast ? `+ ${overflow + 1} more queued` : truncate(firstLine2(text), w - 4);
-          const sig = text === void 0 ? `queued|${w}|empty` : `queued|${w}|${isLast ? "ovf" : "row"}|${summary}`;
+          const editing = !isLast && i === editingIndex;
+          const sig = text === void 0 ? `queued|${w}|empty` : `queued|${w}|${editing ? "edit" : isLast ? "ovf" : "row"}|${summary}`;
           this.paintRow(row, sig, () => {
             if (text === void 0) {
               return;
             }
-            const display = ` \u23F3 ${summary}`;
-            const padded = display + " ".repeat(Math.max(0, w - display.length));
+            const rest = `\u23F3 ${summary}`;
+            const padded = rest + " ".repeat(Math.max(0, w - 1 - rest.length));
+            if (editing) {
+              this.term.bgBlue.brightYellow("\u25B8");
+            } else {
+              this.term.bgBlue(" ");
+            }
             this.term.bgBlue.brightWhite.noFormat(padded);
           });
         }
@@ -4533,8 +4645,17 @@ var init_input = __esm({
       col = 0;
       planMode = false;
       historyIndex = -1;
+      // Queue editing: when the user walks Up past row 0 with queued prompts
+      // present, the most-recently-queued item lands in the buffer and
+      // queueIndex tracks which slot of `queue` is being edited. Enter submits
+      // the edit (queue-edit) or, on an empty buffer, drops the slot
+      // (queue-remove). -1 means not editing a queue slot.
+      queueIndex = -1;
       savedDraft = null;
       history = [];
+      // Waiting queue snapshot (excludes the in-flight head). Newest item lives
+      // at the end so Up walks the array right-to-left.
+      queue = [];
       turnRunning = false;
       // Single-slot kill ring. The most recent killed text (^U, ^K, ^W) lands
       // here so ^Y can yank it back. Standard readline keeps a stack; we
@@ -4550,7 +4671,8 @@ var init_input = __esm({
           row: this.row,
           col: this.col,
           planMode: this.planMode,
-          historyIndex: this.historyIndex
+          historyIndex: this.historyIndex,
+          queueIndex: this.queueIndex
         };
       }
       setTurnRunning(running) {
@@ -4561,6 +4683,16 @@ var init_input = __esm({
         this.historyIndex = -1;
         this.savedDraft = null;
       }
+      // Snapshot of the waiting queue (head excluded). Called by the app after
+      // every queue mutation so Up/Down can walk a fresh view. queueIndex is
+      // only invalidated when it falls outside the new bounds — staying in
+      // bounds preserves the user's edit if the queue grew or stayed put.
+      setQueue(queue) {
+        this.queue = [...queue];
+        if (this.queueIndex >= this.queue.length) {
+          this.queueIndex = -1;
+        }
+      }
       // Replace the contents of the first row, leaving subsequent rows alone.
       // Used by slash-command completion: the partial /foo gets swapped for the
       // matched command name. Cursor moves to the end of the replacement.
@@ -4570,6 +4702,15 @@ var init_input = __esm({
           this.col = text.length;
         }
       }
+      // Public seed for the buffer (used for Escape pre-fill). Treated like a
+      // fresh draft: nav state and any saved draft are cleared, cursor lands
+      // at the end so the user can edit immediately.
+      setBuffer(text) {
+        this.loadEntry(text);
+        this.historyIndex = -1;
+        this.queueIndex = -1;
+        this.savedDraft = null;
+      }
       feed(event) {
         if (event.type === "char") {
           this.insertChar(event.ch);
@@ -4607,14 +4748,16 @@ var init_input = __esm({
           case "right":
             this.moveRight();
             return [];
-          case "home":
           case "ctrl-a":
             this.col = 0;
             return [];
-          case "end":
           case "ctrl-e":
             this.col = this.currentLine().length;
             return [];
+          case "home":
+            return this.handleHome();
+          case "end":
+            return this.handleEnd();
           case "ctrl-b":
             this.moveLeft();
             return [];
@@ -4637,7 +4780,11 @@ var init_input = __esm({
           case "ctrl-c":
             return this.handleCtrlC();
           case "ctrl-d":
-            return this.bufferIsEmpty() ? [{ type: "exit" }] : [];
+            if (this.bufferIsEmpty()) {
+              return [{ type: "exit" }];
+            }
+            this.deleteForward();
+            return [];
           case "ctrl-l":
             return [{ type: "redraw" }];
           case "ctrl-p":
@@ -4652,6 +4799,9 @@ var init_input = __esm({
             this.yank();
             return [];
           case "escape":
+            if (this.turnRunning) {
+              return [{ type: "cancel", prefill: true }];
+            }
             return [];
         }
       }
@@ -4672,6 +4822,7 @@ var init_input = __esm({
         this.row = 0;
         this.col = 0;
         this.historyIndex = -1;
+        this.queueIndex = -1;
         this.savedDraft = null;
       }
       insertChar(ch) {
@@ -4805,50 +4956,92 @@ var init_input = __esm({
           this.col = 0;
         }
       }
-      // Up scrolls back through history when the cursor is on the first line of
-      // the buffer; otherwise it just moves the cursor up one line.
+      // Up walks the navigation stack from newest to oldest: pending queue
+      // items first (so the user can edit something they just enqueued),
+      // then prompt history. Cursor movement within a multi-line buffer
+      // takes priority when not already navigating.
       handleUp() {
         if (this.row > 0) {
           this.row -= 1;
           this.col = Math.min(this.col, this.currentLine().length);
           return [];
         }
-        if (this.history.length === 0) {
-          return [];
-        }
-        if (this.historyIndex === -1) {
+        if (this.queueIndex === -1 && this.historyIndex === -1) {
+          if (this.queue.length === 0 && this.history.length === 0) {
+            return [];
+          }
           this.savedDraft = {
             buffer: [...this.buffer],
             row: this.row,
             col: this.col
           };
+          if (this.queue.length > 0) {
+            this.queueIndex = this.queue.length - 1;
+            this.loadEntry(this.queue[this.queueIndex] ?? "");
+          } else {
+            this.historyIndex = this.history.length - 1;
+            this.loadEntry(this.history[this.historyIndex] ?? "");
+          }
+          return [];
+        }
+        if (this.queueIndex >= 0) {
+          if (this.queueIndex > 0) {
+            this.queueIndex -= 1;
+            this.loadEntry(this.queue[this.queueIndex] ?? "");
+            return [];
+          }
+          if (this.history.length === 0) {
+            return [];
+          }
+          this.queueIndex = -1;
           this.historyIndex = this.history.length - 1;
-        } else if (this.historyIndex > 0) {
-          this.historyIndex -= 1;
-        } else {
+          this.loadEntry(this.history[this.historyIndex] ?? "");
           return [];
         }
-        this.loadHistoryEntry(this.historyIndex);
+        if (this.historyIndex > 0) {
+          this.historyIndex -= 1;
+          this.loadEntry(this.history[this.historyIndex] ?? "");
+        }
         return [];
       }
-      // Down advances within history; when we walk off the end, restore the
-      // saved draft. When already on a multi-line buffer's middle row, just
-      // moves the cursor down.
+      // Down reverses the Up walk: history (older → newer), then queue
+      // (oldest → newest), then restore the original draft. Within a
+      // multi-line buffer, plain cursor movement still wins when no
+      // navigation is in progress.
       handleDown() {
-        if (this.row < this.buffer.length - 1 && this.historyIndex === -1) {
+        if (this.row < this.buffer.length - 1 && this.historyIndex === -1 && this.queueIndex === -1) {
           this.row += 1;
           this.col = Math.min(this.col, this.currentLine().length);
           return [];
         }
-        if (this.historyIndex === -1) {
+        if (this.historyIndex >= 0) {
+          if (this.historyIndex < this.history.length - 1) {
+            this.historyIndex += 1;
+            this.loadEntry(this.history[this.historyIndex] ?? "");
+            return [];
+          }
+          this.historyIndex = -1;
+          if (this.queue.length > 0) {
+            this.queueIndex = 0;
+            this.loadEntry(this.queue[this.queueIndex] ?? "");
+            return [];
+          }
+          this.restoreDraft();
           return [];
         }
-        if (this.historyIndex < this.history.length - 1) {
-          this.historyIndex += 1;
-          this.loadHistoryEntry(this.historyIndex);
+        if (this.queueIndex >= 0) {
+          if (this.queueIndex < this.queue.length - 1) {
+            this.queueIndex += 1;
+            this.loadEntry(this.queue[this.queueIndex] ?? "");
+            return [];
+          }
+          this.queueIndex = -1;
+          this.restoreDraft();
           return [];
         }
-        this.historyIndex = -1;
+        return [];
+      }
+      restoreDraft() {
         if (this.savedDraft) {
           this.buffer = [...this.savedDraft.buffer];
           this.row = this.savedDraft.row;
@@ -4857,11 +5050,9 @@ var init_input = __esm({
         } else {
           this.clearBuffer();
         }
-        return [];
       }
-      loadHistoryEntry(index) {
-        const entry = this.history[index] ?? "";
-        this.buffer = entry.split("\n");
+      loadEntry(text) {
+        this.buffer = text.split("\n");
         if (this.buffer.length === 0) {
           this.buffer = [""];
         }
@@ -4870,6 +5061,14 @@ var init_input = __esm({
       }
       send() {
         const text = this.bufferText();
+        if (this.queueIndex >= 0 && this.queueIndex < this.queue.length) {
+          const index = this.queueIndex;
+          this.clearBuffer();
+          if (text.trim().length === 0) {
+            return [{ type: "queue-remove", index }];
+          }
+          return [{ type: "queue-edit", index, text }];
+        }
         if (text.trim().length === 0) {
           return [];
         }
@@ -4877,25 +5076,105 @@ var init_input = __esm({
         this.clearBuffer();
         return [{ type: "send", text, planMode }];
       }
-      handleCtrlC() {
-        if (this.turnRunning) {
-          return [{ type: "cancel" }];
+      // Home: jump to the very start of the prompt buffer. If we're already
+      // there, fall through to scrolling the scrollback to its top.
+      handleHome() {
+        if (this.row !== 0 || this.col !== 0) {
+          this.row = 0;
+          this.col = 0;
+          return [];
+        }
+        return [{ type: "scroll-to-top" }];
+      }
+      // End: jump to the end of the last line of the prompt buffer. Already
+      // there → scroll the scrollback to the bottom (newest).
+      handleEnd() {
+        const lastRow = this.buffer.length - 1;
+        const lastCol = (this.buffer[lastRow] ?? "").length;
+        if (this.row !== lastRow || this.col !== lastCol) {
+          this.row = lastRow;
+          this.col = lastCol;
+          return [];
         }
+        return [{ type: "scroll-to-bottom" }];
+      }
+      handleCtrlC() {
         if (!this.bufferIsEmpty()) {
-          this.clearBuffer();
+          this.buffer = [""];
+          this.row = 0;
+          this.col = 0;
+          if (this.queueIndex === -1) {
+            this.historyIndex = -1;
+            this.savedDraft = null;
+          }
           return [];
         }
+        if (this.queueIndex >= 0) {
+          this.queueIndex = -1;
+          this.restoreDraft();
+          return [];
+        }
+        if (this.turnRunning) {
+          return [{ type: "cancel" }];
+        }
         return [{ type: "exit" }];
       }
     };
   }
 });
 
+// src/tui/completion.ts
+function longestCommonPrefix(names) {
+  if (names.length === 0) {
+    return "";
+  }
+  let prefix = names[0] ?? "";
+  for (let i = 1; i < names.length; i++) {
+    const n = names[i] ?? "";
+    let j = 0;
+    while (j < prefix.length && j < n.length && prefix[j] === n[j]) {
+      j += 1;
+    }
+    prefix = prefix.slice(0, j);
+    if (prefix.length === 0) {
+      break;
+    }
+  }
+  return prefix;
+}
+function computeTabCompletion(args) {
+  const { matches, firstLine: firstLine3 } = args;
+  if (matches.length === 0) {
+    return null;
+  }
+  const space = firstLine3.indexOf(" ");
+  const typedPrefix = space === -1 ? firstLine3 : firstLine3.slice(0, space);
+  const tail = space === -1 ? "" : firstLine3.slice(space);
+  if (matches.length === 1) {
+    const name = matches[0] ?? "";
+    const suffix = tail.startsWith(" ") ? "" : " ";
+    return name + suffix + tail;
+  }
+  const commonPrefix = longestCommonPrefix(matches);
+  if (commonPrefix.length <= typedPrefix.length) {
+    return null;
+  }
+  return commonPrefix + tail;
+}
+var init_completion = __esm({
+  "src/tui/completion.ts"() {
+    "use strict";
+  }
+});
+
 // src/tui/render-update.ts
 import stripAnsi from "strip-ansi";
 function sanitizeWireText(text) {
   return stripAnsi(text).replace(STRIP_CONTROLS, "");
 }
+function sanitizeSingleLine(text) {
+  return sanitizeWireText(text).replace(/[\n\t]+/g, " ").replace(/  +/g, " ").trim();
+}
 function mapUpdate(update) {
   if (!update || typeof update !== "object") {
     return null;
@@ -4939,7 +5218,7 @@ function mapUpdate(update) {
 }
 function mapSessionInfo(u) {
   const rawTitle = readString(u, "title");
-  const title = rawTitle !== void 0 ? sanitizeWireText(rawTitle) : void 0;
+  const title = rawTitle !== void 0 ? sanitizeSingleLine(rawTitle) : void 0;
   const meta = u._meta;
   let agentId;
   if (meta && typeof meta === "object" && !Array.isArray(meta)) {
@@ -4963,10 +5242,9 @@ function mapSessionInfo(u) {
   }
   return event;
 }
-function mapAvailableCommands(u) {
-  const list = u.availableCommands ?? u.commands;
+function normalizeAdvertisedCommands(list) {
   if (!Array.isArray(list)) {
-    return null;
+    return [];
   }
   const out = [];
   for (const raw of list) {
@@ -4978,13 +5256,20 @@ function mapAvailableCommands(u) {
       continue;
     }
     const rawName = c.name.startsWith("/") ? c.name : `/${c.name}`;
-    const cmd = { name: sanitizeWireText(rawName) };
+    const cmd = { name: sanitizeSingleLine(rawName) };
     if (typeof c.description === "string") {
-      cmd.description = sanitizeWireText(c.description);
+      cmd.description = sanitizeSingleLine(c.description);
     }
     out.push(cmd);
   }
-  return { kind: "available-commands", commands: out };
+  return out;
+}
+function mapAvailableCommands(u) {
+  const list = u.availableCommands ?? u.commands;
+  if (!Array.isArray(list)) {
+    return null;
+  }
+  return { kind: "available-commands", commands: normalizeAdvertisedCommands(list) };
 }
 function mapUsage(u) {
   const event = { kind: "usage-update" };
@@ -5046,7 +5331,7 @@ function mapToolCall(u) {
     return null;
   }
   const rawTitle = readString(u, "title") ?? readString(u, "name") ?? readString(u, "label") ?? "tool call";
-  const title = sanitizeWireText(rawTitle);
+  const title = sanitizeSingleLine(rawTitle);
   const status = readString(u, "status");
   const rawKind = readString(u, "kind");
   const event = { kind: "tool-call", toolCallId, title };
@@ -5064,7 +5349,7 @@ function mapToolCallUpdate(u) {
     return null;
   }
   const rawTitle = readString(u, "title");
-  const title = rawTitle !== void 0 ? sanitizeWireText(rawTitle) : void 0;
+  const title = rawTitle !== void 0 ? sanitizeSingleLine(rawTitle) : void 0;
   const status = readString(u, "status");
   const meaningful = title !== void 0 || status === "completed" || status === "failed" || status === "rejected" || status === "cancelled";
   if (!meaningful) {
@@ -5090,7 +5375,7 @@ function mapPlan(u) {
       continue;
     }
     const e = raw;
-    const content = typeof e.content === "string" ? sanitizeWireText(e.content) : void 0;
+    const content = typeof e.content === "string" ? sanitizeSingleLine(e.content) : void 0;
     if (!content) {
       continue;
     }
@@ -5110,14 +5395,14 @@ function mapMode(u) {
   if (!mode) {
     return null;
   }
-  return { kind: "mode-changed", mode: sanitizeWireText(mode) };
+  return { kind: "mode-changed", mode: sanitizeSingleLine(mode) };
 }
 function mapModel(u) {
   const model = readString(u, "currentModel") ?? readString(u, "model");
   if (!model) {
     return null;
   }
-  return { kind: "model-changed", model: sanitizeWireText(model) };
+  return { kind: "model-changed", model: sanitizeSingleLine(model) };
 }
 function mapTurnComplete(u) {
   const stopReason = readString(u, "stopReason");
@@ -5606,7 +5891,8 @@ async function runSession(term, config, opts, exitHint) {
     const { update } = params ?? {};
     const event = mapUpdate(update);
     debugLogUpdate(update, event);
-    if (event?.kind === "user-text") {
+    const rawTag = update?.sessionUpdate;
+    if (rawTag === "prompt_received") {
       adjustPendingTurns(1);
     } else if (event?.kind === "turn-complete") {
       adjustPendingTurns(-1);
@@ -5677,11 +5963,11 @@ async function runSession(term, config, opts, exitHint) {
     const rawOptions = Array.isArray(p.options) ? p.options : [];
     const options = rawOptions.map((o) => ({
       optionId: o.optionId,
-      name: sanitizeWireText(o.name ?? ""),
+      name: sanitizeSingleLine(o.name ?? ""),
       ...o.kind !== void 0 ? { kind: o.kind } : {}
     }));
     const rawTitle = p.toolCall?.title ?? p.toolCall?.name ?? "tool";
-    const title = sanitizeWireText(rawTitle);
+    const title = sanitizeSingleLine(rawTitle);
     const toolCallId = p.toolCall?.toolCallId;
     if (options.length === 0) {
       screen.appendLines([
@@ -5759,9 +6045,7 @@ async function runSession(term, config, opts, exitHint) {
     initialMode = hydraMeta.currentMode;
     initialTurnStartedAt = hydraMeta.turnStartedAt;
     if (hydraMeta.availableCommands) {
-      initialCommands = hydraMeta.availableCommands.map(
-        (c) => c.description !== void 0 ? { name: c.name, description: c.description } : { name: c.name }
-      );
+      initialCommands = normalizeAdvertisedCommands(hydraMeta.availableCommands);
     }
   } else {
     const attached = await conn.request("session/attach", {
@@ -5786,9 +6070,7 @@ async function runSession(term, config, opts, exitHint) {
     initialMode = hydraMeta.currentMode;
     initialTurnStartedAt = hydraMeta.turnStartedAt;
     if (hydraMeta.availableCommands) {
-      initialCommands = hydraMeta.availableCommands.map(
-        (c) => c.description !== void 0 ? { name: c.name, description: c.description } : { name: c.name }
-      );
+      initialCommands = normalizeAdvertisedCommands(hydraMeta.availableCommands);
     }
   }
   const historyFile = paths.tuiHistoryFile(resolvedSessionId);
@@ -5799,11 +6081,13 @@ async function runSession(term, config, opts, exitHint) {
     dispatcher.setTurnRunning(true);
   }
   let turnInFlight = null;
+  let pendingPrefill = null;
   const screen = new Screen({
     term,
     dispatcher,
     repaintThrottleMs: config.tui.repaintThrottleMs,
     maxScrollbackLines: config.tui.maxScrollbackLines,
+    mouse: config.tui.mouse,
     onKey: (events) => {
       for (const ev of events) {
         if (pendingPermission && tryHandlePermissionKey(ev)) {
@@ -5830,6 +6114,7 @@ async function runSession(term, config, opts, exitHint) {
     { name: "/quit", description: "Exit the TUI" },
     { name: "/clear", description: "Clear scrollback" },
     { name: "/sessions", description: "List sessions" },
+    { name: "/model", description: "Switch model: /model <model-id>" },
     { name: "/demo-plan", description: "Inject synthetic plan events (UI test)" },
     { name: "/demo-tool", description: "Inject a synthetic tool-call sequence (UI test)" }
   ];
@@ -5864,48 +6149,24 @@ async function runSession(term, config, opts, exitHint) {
     screen.setCompletions(currentCompletions());
   };
   const tryHandleCompletionKey = (ev) => {
-    if (ev.type !== "key") {
+    if (ev.type !== "key" || ev.name !== "tab") {
       return false;
     }
-    if (ev.name === "tab") {
-      const matches = currentCompletions();
-      const first = matches[0];
-      if (!first) {
-        return false;
-      }
-      const commonPrefix = longestCommonPrefix(matches.map((m) => m.name));
-      const buf = dispatcher.state().buffer;
-      const firstLine3 = buf[0] ?? "";
-      const space = firstLine3.indexOf(" ");
-      const typedPrefix = space === -1 ? firstLine3 : firstLine3.slice(0, space);
-      const tail = space === -1 ? "" : firstLine3.slice(space);
-      let next = commonPrefix;
-      if (commonPrefix.length <= typedPrefix.length || matches.length === 1) {
-        next = first.name + (tail.startsWith(" ") ? "" : " ");
-      }
-      dispatcher.replaceFirstLine(next + tail);
+    const matches = currentCompletions();
+    if (matches.length === 0) {
+      return false;
+    }
+    const firstLine3 = dispatcher.state().buffer[0] ?? "";
+    const next = computeTabCompletion({
+      matches: matches.map((m) => m.name),
+      firstLine: firstLine3
+    });
+    if (next === null) {
       return true;
     }
-    return false;
+    dispatcher.replaceFirstLine(next);
+    return true;
   };
-  function longestCommonPrefix(names) {
-    if (names.length === 0) {
-      return "";
-    }
-    let prefix = names[0] ?? "";
-    for (let i = 1; i < names.length; i++) {
-      const n = names[i] ?? "";
-      let j = 0;
-      while (j < prefix.length && j < n.length && prefix[j] === n[j]) {
-        j += 1;
-      }
-      prefix = prefix.slice(0, j);
-      if (prefix.length === 0) {
-        break;
-      }
-    }
-    return prefix;
-  }
   const tryHandlePermissionKey = (ev) => {
     if (!pendingPermission) {
       return false;
@@ -6112,22 +6373,45 @@ async function runSession(term, config, opts, exitHint) {
     }
     resume(nextOpts);
   };
+  const queueHeadOffset = () => workerActive ? 1 : 0;
   const handleEffect = (effect) => {
     switch (effect.type) {
       case "send":
         enqueuePrompt(effect.text, effect.planMode);
         return;
-      case "cancel":
+      case "queue-edit": {
+        const realIdx = effect.index + queueHeadOffset();
+        const existing = promptQueue[realIdx];
+        if (existing) {
+          promptQueue[realIdx] = { text: effect.text, planMode: existing.planMode };
+          refreshQueueDisplay();
+        }
+        return;
+      }
+      case "queue-remove": {
+        const realIdx = effect.index + queueHeadOffset();
+        if (realIdx >= 0 && realIdx < promptQueue.length) {
+          promptQueue.splice(realIdx, 1);
+          refreshQueueDisplay();
+        }
+        return;
+      }
+      case "cancel": {
+        if (effect.prefill && turnInFlight) {
+          const headOffset = workerActive ? 1 : 0;
+          const waitingEmpty = promptQueue.length <= headOffset;
+          const bufferEmpty = dispatcher.state().buffer.every((line) => line === "");
+          if (waitingEmpty && bufferEmpty) {
+            pendingPrefill = turnInFlight.text;
+          }
+        }
         if (turnInFlight) {
           turnInFlight.cancel();
         } else if (pendingTurns > 0) {
           cancelRemoteTurn();
         }
-        if (promptQueue.length > (workerActive ? 1 : 0)) {
-          promptQueue.length = workerActive ? 1 : 0;
-          refreshQueueDisplay();
-        }
         return;
+      }
       case "exit":
         void requestExit();
         return;
@@ -6140,6 +6424,12 @@ async function runSession(term, config, opts, exitHint) {
       case "redraw":
         screen.fullRedraw();
         return;
+      case "scroll-to-top":
+        screen.scrollToTop();
+        return;
+      case "scroll-to-bottom":
+        screen.scrollToBottom();
+        return;
       case "switch-session":
         void switchSession();
         return;
@@ -6155,6 +6445,7 @@ async function runSession(term, config, opts, exitHint) {
     const waiting = promptQueue.slice(workerActive ? 1 : 0);
     screen.setQueuedPrompts(waiting.map((p) => p.text));
     screen.setBanner({ queued: waiting.length });
+    dispatcher.setQueue(waiting.map((p) => p.text));
   };
   const enqueuePrompt = (text, planMode) => {
     screen.scrollToBottom();
@@ -6283,6 +6574,40 @@ async function runSession(term, config, opts, exitHint) {
           }
         ]);
         return true;
+      case "/model": {
+        const arg = space === -1 ? "" : trimmed.slice(space + 1).trim();
+        if (arg === "") {
+          screen.appendLines([
+            {
+              prefix: "  ",
+              body: "Usage: /model <model-id>",
+              bodyStyle: "info"
+            }
+          ]);
+          return true;
+        }
+        conn.request("session/set_model", {
+          sessionId: resolvedSessionId,
+          modelId: arg
+        }).then(() => {
+          screen.appendLines([
+            {
+              prefix: "  ",
+              body: `model set to ${arg}`,
+              bodyStyle: "system"
+            }
+          ]);
+        }).catch((err) => {
+          screen.appendLines([
+            {
+              prefix: "  ",
+              body: `set_model failed: ${err.message}`,
+              bodyStyle: "tool-status-fail"
+            }
+          ]);
+        });
+        return true;
+      }
       default:
         return false;
     }
@@ -6302,6 +6627,15 @@ async function runSession(term, config, opts, exitHint) {
     } finally {
       workerActive = false;
       refreshQueueDisplay();
+      if (pendingPrefill !== null) {
+        const text = pendingPrefill;
+        pendingPrefill = null;
+        const bufferEmpty = dispatcher.state().buffer.every((line) => line === "");
+        if (bufferEmpty) {
+          dispatcher.setBuffer(text);
+          screen.refreshPrompt();
+        }
+      }
     }
   };
   const processPrompt = async (text, planMode) => {
@@ -6311,6 +6645,7 @@ async function runSession(term, config, opts, exitHint) {
     appendRender({ kind: "user-text", text });
     let cancelled = false;
     turnInFlight = {
+      text,
       cancel: () => {
         if (cancelled) {
           return;
@@ -6407,12 +6742,13 @@ async function runSession(term, config, opts, exitHint) {
       }
       summary = parts.join(" \xB7 ");
     }
+    const pureThinking = total === 0 && inProgress;
     const lines = [
       {
         prefix: "\u2692 ",
-        prefixStyle: "tool",
+        prefixStyle: pureThinking ? "tool-status-running" : "tool",
         body: summary,
-        bodyStyle: "dim"
+        bodyStyle: pureThinking ? "tool-status-running" : "dim"
       }
     ];
     for (const id of visibleIds) {
@@ -6588,6 +6924,8 @@ async function runSession(term, config, opts, exitHint) {
       }, 1e3);
     }
     startToolsBlock();
+  } else if (initialTurnStartedAt === void 0 && pendingTurns > 0) {
+    adjustPendingTurns(-pendingTurns);
   }
   const resetInFlightUiState = () => {
     if (pendingPermission) {
@@ -6789,6 +7127,7 @@ var init_app = __esm({
     init_picker();
     init_screen();
     init_input();
+    init_completion();
     init_render_update();
     init_format();
     PLAN_PREFIX_TEXT = "Plan mode is on. Outline what you would do without making any changes. Do not edit files, run shell commands, or otherwise execute side effects; produce a plan only.";
@@ -6875,35 +7214,28 @@ init_config();
 import * as fs2 from "fs/promises";
 async function runInit(flags) {
   await fs2.mkdir(paths.home(), { recursive: true });
-  let existing;
-  try {
-    existing = await loadConfig();
-  } catch {
-    existing = void 0;
-  }
-  if (!existing) {
-    const config = await writeMinimalInitConfig();
+  const existingToken = await loadAuthToken();
+  if (!existingToken) {
+    const token = generateAuthToken();
+    await writeAuthToken(token);
     process.stdout.write(
-      `Initialized ${paths.config()}
-Auth token: ${config.daemon.authToken}
+      `Initialized ${paths.authToken()}
+Auth token: ${token}
 `
     );
     return;
   }
   if (flagBool(flags, "rotate-token")) {
     const newToken = generateAuthToken();
-    await updateConfigField((raw) => {
-      const daemon = raw.daemon ??= {};
-      daemon.authToken = newToken;
-    });
+    await writeAuthToken(newToken);
     process.stdout.write(
-      `Rotated token in ${paths.config()}
+      `Rotated token in ${paths.authToken()}
 New token: ${newToken}
 `
     );
     return;
   }
-  process.stdout.write(`Config already exists at ${paths.config()}.
+  process.stdout.write(`Auth token already exists at ${paths.authToken()}.
 `);
   process.stdout.write("Pass --rotate-token to generate a new auth token.\n");
 }
@@ -7294,13 +7626,13 @@ function npxPackageBasename(agent) {
   const atIdx = afterSlash.lastIndexOf("@");
   return atIdx <= 0 ? afterSlash : afterSlash.slice(0, atIdx);
 }
-async function planSpawn(agent, extraArgs = []) {
+async function planSpawn(agent, callerArgs = []) {
   if (agent.distribution.npx) {
     const npx = agent.distribution.npx;
-    const args = ["-y", npx.package, ...npx.args ?? [], ...extraArgs];
+    const tail = callerArgs.length > 0 ? callerArgs : npx.args ?? [];
     return {
       command: "npx",
-      args,
+      args: ["-y", npx.package, ...tail],
       env: npx.env ?? {}
     };
   }
@@ -7316,18 +7648,19 @@ async function planSpawn(agent, extraArgs = []) {
       version: agent.version ?? "current",
       target
     });
+    const tail = callerArgs.length > 0 ? callerArgs : target.args ?? [];
     return {
       command: cmdPath,
-      args: [...target.args ?? [], ...extraArgs],
+      args: tail,
       env: target.env ?? {}
     };
   }
   if (agent.distribution.uvx) {
     const uvx = agent.distribution.uvx;
-    const args = [uvx.package, ...uvx.args ?? [], ...extraArgs];
+    const tail = callerArgs.length > 0 ? callerArgs : uvx.args ?? [];
     return {
       command: "uvx",
-      args,
+      args: [uvx.package, ...tail],
       env: uvx.env ?? {}
     };
   }