@hydra-acp/cli 0.1.23 → 0.1.24

package/dist/cli.js

@@ -4067,7 +4067,7 @@ var init_session_row = __esm({
 
 // src/cli/commands/sessions.ts
 import * as fs17 from "fs/promises";
-import * as path10 from "path";
+import * as path11 from "path";
 async function runSessionsList(opts = {}) {
   const config = await loadConfig();
   const serviceToken = await loadServiceToken();
@@ -4195,7 +4195,7 @@ async function runSessionsExport(id, outPath) {
     return;
   }
   const resolved = outPath === "." ? deriveFilenameFrom(response, id) : outPath;
-  await fs17.mkdir(path10.dirname(path10.resolve(resolved)), { recursive: true });
+  await fs17.mkdir(path11.dirname(path11.resolve(resolved)), { recursive: true });
   await fs17.writeFile(resolved, body, { encoding: "utf8", mode: 384 });
   process.stdout.write(`Wrote ${resolved}
 `);
@@ -4214,7 +4214,7 @@ async function runSessionsTranscript(idOrFile, outPath) {
     const bundle = decodeBundleOrExit(localFile.raw);
     body = bundleToMarkdown(bundle);
     const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-    defaultName = `${path10.basename(idOrFile, path10.extname(idOrFile))}-${stamp}.md`;
+    defaultName = `${path11.basename(idOrFile, path11.extname(idOrFile))}-${stamp}.md`;
   } else {
     const config = await loadConfig();
     const serviceToken = await loadServiceToken();
@@ -4243,7 +4243,7 @@ async function runSessionsTranscript(idOrFile, outPath) {
     return;
   }
   const resolved = outPath === "." ? defaultName : outPath;
-  await fs17.mkdir(path10.dirname(path10.resolve(resolved)), { recursive: true });
+  await fs17.mkdir(path11.dirname(path11.resolve(resolved)), { recursive: true });
   await fs17.writeFile(resolved, body, { encoding: "utf8", mode: 384 });
   process.stdout.write(`Wrote ${resolved}
 `);
@@ -4284,7 +4284,7 @@ async function runSessionsImport(file, opts = {}) {
   }
   let cwdOverride;
   if (opts.cwd !== void 0) {
-    const resolved = path10.resolve(opts.cwd);
+    const resolved = path11.resolve(opts.cwd);
     try {
       const stat4 = await fs17.stat(resolved);
       if (!stat4.isDirectory()) {
@@ -4955,6 +4955,10 @@ async function pickSession(term, opts) {
   const indicatorRow = () => startRow + 3 + viewportSize;
   const sessionRow = (sessionIdx) => startRow + 3 + (sessionIdx - scrollOffset);
   const renderFromScratch = () => {
+    if (mode === "help") {
+      renderHelp();
+      return;
+    }
     computeLayout();
     adjustScroll();
     startRow = 1;
@@ -4969,6 +4973,21 @@ async function pickSession(term, opts) {
     paintIndicator();
     term("\n");
   };
+  const renderHelp = () => {
+    term.moveTo(1, 1).eraseDisplayBelow();
+    term.brightWhite.bold.noFormat("  Picker hotkeys")("\n\n");
+    for (const entry of HELP_ENTRIES) {
+      if (entry === null) {
+        term("\n");
+        continue;
+      }
+      const [keys, desc] = entry;
+      term.brightCyan.noFormat(`  ${keys.padEnd(HELP_KEYS_WIDTH)}`);
+      term.noFormat(desc)("\n");
+    }
+    term("\n");
+    term.dim.noFormat("  press any key to dismiss")("\n");
+  };
   const repaintNewItem = () => {
     term.moveTo(1, startRow).eraseLineAfter();
     paintNewItem();
@@ -5099,6 +5118,16 @@ async function pickSession(term, opts) {
       if (mode === "busy") {
         return;
       }
+      if (mode === "help") {
+        if (name === "CTRL_C") {
+          cleanup();
+          resolve5({ kind: "abort" });
+          return;
+        }
+        mode = "normal";
+        renderFromScratch();
+        return;
+      }
       if (mode === "confirm-kill" || mode === "confirm-delete") {
         if (data?.isCharacter && (name === "y" || name === "Y")) {
           const kind = mode === "confirm-kill" ? "kill" : "delete";
@@ -5114,6 +5143,11 @@ async function pickSession(term, opts) {
         return;
       }
       clearTransient();
+      if (!searchActive && data?.isCharacter && name === "?") {
+        mode = "help";
+        renderHelp();
+        return;
+      }
       if (searchActive) {
         if (data?.isCharacter) {
           searchTerm += name;
@@ -5262,6 +5296,7 @@ async function pickSession(term, opts) {
         }
         case "ESCAPE":
         case "CTRL_C":
+        case "CTRL_D":
           cleanup();
           resolve5({ kind: "abort" });
           return;
@@ -5303,7 +5338,7 @@ function matchesSearch(s, term) {
   }
   return false;
 }
-var ROW_PREFIX_WIDTH;
+var ROW_PREFIX_WIDTH, HELP_KEYS_WIDTH, HELP_ENTRIES;
 var init_picker = __esm({
   "src/tui/picker.ts"() {
     "use strict";
@@ -5312,13 +5347,31 @@ var init_picker = __esm({
     init_session();
     init_discovery();
     ROW_PREFIX_WIDTH = 2;
+    HELP_KEYS_WIDTH = 20;
+    HELP_ENTRIES = [
+      ["\u2191 / \u2193 or n / p", "navigate"],
+      ["PgUp / PgDn", "page up / page down"],
+      ["Home / End", "first / last"],
+      ["Enter", "open selected session (or create new)"],
+      null,
+      ["/", "search sessions"],
+      ["o", "toggle cwd-only filter"],
+      ["r", "refresh from daemon"],
+      null,
+      ["k", "kill the selected live session"],
+      ["d", "delete the selected cold session"],
+      null,
+      ["c", "create new session"],
+      ["?", "toggle this help"],
+      ["q / Esc / ^C / ^D", "quit picker (detach)"]
+    ];
   }
 });
 
 // src/tui/attachments.ts
-import path11 from "path";
+import path12 from "path";
 function mimeFromExtension(p) {
-  return EXTENSION_TO_MIME[path11.extname(p).toLowerCase()] ?? null;
+  return EXTENSION_TO_MIME[path12.extname(p).toLowerCase()] ?? null;
 }
 function isSupportedImagePath(p) {
   return mimeFromExtension(p) !== null;
@@ -5894,6 +5947,12 @@ function mapKeyName(name) {
     case "ALT_ENTER":
     case "META_ENTER":
       return "alt-enter";
+    case "ALT_B":
+    case "META_B":
+      return "alt-b";
+    case "ALT_F":
+    case "META_F":
+      return "alt-f";
     case "CTRL_T":
       return "ctrl-t";
     case "SHIFT_TAB":
@@ -5928,6 +5987,8 @@ function mapKeyName(name) {
       return "ctrl-e";
     case "CTRL_F":
       return "ctrl-f";
+    case "CTRL_G":
+      return "ctrl-g";
     case "CTRL_K":
       return "ctrl-k";
     case "CTRL_L":
@@ -5956,7 +6017,7 @@ function mapKeyName(name) {
       return null;
   }
 }
-var SESSIONBAR_ROWS, BANNER_ROWS, SEPARATOR_ROWS, MAX_PROMPT_ROWS, MAX_QUEUED_ROWS, MAX_PERMISSION_ROWS, MAX_COMPLETION_ROWS, MAX_CHIP_ROWS, CONFIRM_PROMPT_ROWS, DEFAULT_CONTENT_REPAINT_THROTTLE_MS, DEFAULT_MAX_SCROLLBACK_LINES, BARE_URL_RE, Screen, NON_ASCII, SEGMENTER, TK_MARKUP_STYLE_CHAR, shortId;
+var SESSIONBAR_ROWS, BANNER_ROWS, SEPARATOR_ROWS, MAX_PROMPT_ROWS, MAX_QUEUED_ROWS, MAX_PERMISSION_ROWS, MAX_HELP_ROWS, MAX_COMPLETION_ROWS, MAX_CHIP_ROWS, CONFIRM_PROMPT_ROWS, DEFAULT_CONTENT_REPAINT_THROTTLE_MS, DEFAULT_MAX_SCROLLBACK_LINES, BARE_URL_RE, Screen, NON_ASCII, SEGMENTER, TK_MARKUP_STYLE_CHAR, shortId;
 var init_screen = __esm({
   "src/tui/screen.ts"() {
     "use strict";
@@ -5970,6 +6031,7 @@ var init_screen = __esm({
     MAX_PROMPT_ROWS = 8;
     MAX_QUEUED_ROWS = 5;
     MAX_PERMISSION_ROWS = 12;
+    MAX_HELP_ROWS = 30;
     MAX_COMPLETION_ROWS = 6;
     MAX_CHIP_ROWS = 4;
     CONFIRM_PROMPT_ROWS = 2;
@@ -6032,6 +6094,7 @@ var init_screen = __esm({
       lastFrameH = 0;
       permissionPrompt = null;
       confirmPrompt = null;
+      helpPrompt = null;
       completions = [];
       // Scrollback offset: 0 = pinned to bottom (live), N = N wrapped lines
       // above the bottom. Mouse wheel and PgUp/PgDn adjust this; new content
@@ -6060,7 +6123,7 @@ var init_screen = __esm({
       banner = {
         status: "ready",
         currentMode: void 0,
-        hint: "\u21E7\u21E5 mode \xB7 \u2303V paste \xB7 \u2303P pick \xB7 \u2303C cancel \xB7 \u2303D detach",
+        hint: "\u21E7\u21E5 mode \xB7 \u2303P pick \xB7 \u2303G guide \xB7 \u2303D detach",
         queued: 0
       };
       sessionbar = { agent: "?", cwd: "?", sessionId: "?" };
@@ -6623,6 +6686,16 @@ var init_screen = __esm({
         this.confirmPrompt = spec ? { ...spec } : null;
         this.repaint();
       }
+      // Multi-row help cheatsheet that takes over the prompt area. Used by
+      // the ^G hotkey to surface every binding without dropping the user
+      // out of the session. Pass null to dismiss.
+      setHelpPrompt(spec) {
+        this.helpPrompt = spec ? { ...spec, entries: [...spec.entries] } : null;
+        this.repaint();
+      }
+      isHelpPromptActive() {
+        return this.helpPrompt !== null;
+      }
       // Slash-command completion list shown directly above the separator. App
       // calls this after each keystroke; pass [] to dismiss. Suppressed when
       // the permission modal is active (the modal owns the prompt area).
@@ -7158,7 +7231,7 @@ var init_screen = __esm({
         this.repaint();
       }
       completionRows() {
-        if (this.permissionPrompt) {
+        if (this.permissionPrompt || this.confirmPrompt || this.helpPrompt) {
           return 0;
         }
         return Math.min(MAX_COMPLETION_ROWS, this.completions.length);
@@ -7302,6 +7375,10 @@ var init_screen = __esm({
           this.drawConfirmPrompt();
           return;
         }
+        if (this.helpPrompt) {
+          this.drawHelpPrompt();
+          return;
+        }
         const w = this.term.width;
         const room = Math.max(1, w - 2);
         const state = this.dispatcher.state();
@@ -7351,6 +7428,58 @@ var init_screen = __esm({
           this.term.dim(` ${truncate(spec.hint, w - 2)}`);
         });
       }
+      drawHelpPrompt() {
+        const spec = this.helpPrompt;
+        if (!spec) {
+          return;
+        }
+        const w = this.term.width;
+        const rows = this.helpRows();
+        const top = this.term.height - rows - BANNER_ROWS - SEPARATOR_ROWS - SESSIONBAR_ROWS + 1;
+        let row = top;
+        const writeRow = (sig, paint) => {
+          if (row >= top + rows) {
+            return;
+          }
+          this.paintRow(row, sig, paint);
+          row += 1;
+        };
+        writeRow(`help|t|${w}|${spec.title}`, () => {
+          this.term.brightYellow(` \u2753 ${truncate(spec.title, w - 5)}`);
+        });
+        const keysWidth = Math.min(
+          24,
+          Math.max(
+            ...spec.entries.map((e) => e === null ? 0 : e[0].length),
+            4
+          )
+        );
+        for (const entry of spec.entries) {
+          if (row >= top + rows - 1) {
+            break;
+          }
+          if (entry === null) {
+            writeRow(`help|sep|${w}|${row}`, () => void 0);
+            continue;
+          }
+          const [keys, desc] = entry;
+          const paddedKeys = keys.padEnd(keysWidth);
+          writeRow(`help|e|${w}|${keys}|${desc}`, () => {
+            this.term(" ");
+            this.term.brightCyan.noFormat(paddedKeys);
+            this.term.noFormat(` ${truncate(desc, w - 2 - keysWidth - 1)}`);
+          });
+        }
+        writeRow(`help|hint|${w}|${spec.hint}`, () => {
+          this.term.dim(` ${truncate(spec.hint, w - 2)}`);
+        });
+      }
+      helpRows() {
+        if (!this.helpPrompt) {
+          return 0;
+        }
+        return Math.min(MAX_HELP_ROWS, 2 + this.helpPrompt.entries.length);
+      }
       drawPermissionPrompt() {
         const spec = this.permissionPrompt;
         if (!spec) {
@@ -7460,6 +7589,12 @@ var init_screen = __esm({
           this.term.moveTo(2, top2);
           return;
         }
+        if (this.helpPrompt) {
+          const rows = this.helpRows();
+          const top2 = this.term.height - rows - BANNER_ROWS - SEPARATOR_ROWS - SESSIONBAR_ROWS + 1;
+          this.term.moveTo(2, top2);
+          return;
+        }
         if (this.scrollbackSearch) {
           this.term.hideCursor(true);
           return;
@@ -7486,6 +7621,9 @@ var init_screen = __esm({
         if (this.confirmPrompt) {
           return CONFIRM_PROMPT_ROWS;
         }
+        if (this.helpPrompt) {
+          return this.helpRows();
+        }
         const w = this.term.width;
         const room = Math.max(1, w - 2);
         const state = this.dispatcher.state();
@@ -7844,6 +7982,14 @@ var init_input = __esm({
           case "ctrl-f":
             this.moveRight();
             return [];
+          case "ctrl-g":
+            return [{ type: "show-help" }];
+          case "alt-b":
+            this.moveWordBackward();
+            return [];
+          case "alt-f":
+            this.moveWordForward();
+            return [];
           case "ctrl-k":
             this.killToEnd();
             return [];
@@ -8047,6 +8193,44 @@ var init_input = __esm({
           this.col = 0;
         }
       }
+      moveWordBackward() {
+        if (this.col === 0) {
+          if (this.row === 0) {
+            return;
+          }
+          this.row -= 1;
+          this.col = this.currentLine().length;
+          return;
+        }
+        const line = this.currentLine();
+        let i = this.col;
+        while (i > 0 && /\s/.test(line[i - 1] ?? "")) {
+          i -= 1;
+        }
+        while (i > 0 && !/\s/.test(line[i - 1] ?? "")) {
+          i -= 1;
+        }
+        this.col = i;
+      }
+      moveWordForward() {
+        const line = this.currentLine();
+        if (this.col >= line.length) {
+          if (this.row >= this.buffer.length - 1) {
+            return;
+          }
+          this.row += 1;
+          this.col = 0;
+          return;
+        }
+        let i = this.col;
+        while (i < line.length && /\s/.test(line[i] ?? "")) {
+          i += 1;
+        }
+        while (i < line.length && !/\s/.test(line[i] ?? "")) {
+          i += 1;
+        }
+        this.col = i;
+      }
       // 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
@@ -8362,7 +8546,7 @@ var init_input = __esm({
 import { spawn as nodeSpawn } from "child_process";
 import fs18 from "fs/promises";
 import os4 from "os";
-import path12 from "path";
+import path13 from "path";
 async function readClipboard(envIn = {}) {
   const env = { ...defaultEnv, ...envIn };
   if (env.platform === "darwin") {
@@ -8377,7 +8561,7 @@ async function readClipboard(envIn = {}) {
   };
 }
 async function readMacOS(env) {
-  const tmpPath = path12.join(
+  const tmpPath = path13.join(
     env.tmpdir(),
     `hydra-clipboard-${Date.now()}-${process.pid}.png`
   );
@@ -8981,7 +9165,7 @@ import { appendFileSync, statSync, renameSync } from "fs";
 import { nanoid as nanoid3 } from "nanoid";
 import termkit from "terminal-kit";
 import fs19 from "fs/promises";
-import path13 from "path";
+import path14 from "path";
 async function runTuiApp(opts) {
   const config = await loadConfig();
   const serviceToken = await ensureServiceToken();
@@ -9087,14 +9271,27 @@ async function runSession(term, config, serviceToken, opts, exitHint) {
   };
   let screenRef = null;
   let dispatcherRef = null;
-  conn.onNotification("session/update", (params) => {
-    if (teardownStarted) {
-      return;
-    }
+  let lastSeenMessageId = void 0;
+  let reconnectReplayBuffer = null;
+  const STATE_UPDATE_KINDS2 = /* @__PURE__ */ new Set([
+    "session_info_update",
+    "current_model_update",
+    "current_mode_update",
+    "available_commands_update",
+    "available_modes_update",
+    "usage_update"
+  ]);
+  const handleSessionUpdate = (params) => {
     const { update } = params ?? {};
     const event = mapUpdate(update);
     debugLogUpdate(update, event);
     const rawTag = update?.sessionUpdate;
+    if (typeof rawTag === "string" && !STATE_UPDATE_KINDS2.has(rawTag)) {
+      const u = update ?? {};
+      if (typeof u.messageId === "string") {
+        lastSeenMessageId = u.messageId;
+      }
+    }
     if (rawTag === "prompt_received") {
       adjustPendingTurns(1);
     } else if (event?.kind === "turn-complete") {
@@ -9106,6 +9303,16 @@ async function runSession(term, config, serviceToken, opts, exitHint) {
     }
     appendRender(event);
     maybeDismissPermissionByToolUpdate(update);
+  };
+  conn.onNotification("session/update", (params) => {
+    if (teardownStarted) {
+      return;
+    }
+    if (reconnectReplayBuffer !== null) {
+      reconnectReplayBuffer.push(params);
+      return;
+    }
+    handleSessionUpdate(params);
   });
   conn.onNotification("hydra-acp/session_closed", () => {
     if (teardownStarted) {
@@ -9184,6 +9391,7 @@ async function runSession(term, config, serviceToken, opts, exitHint) {
           text: echo.text,
           attachments: echo.attachments
         });
+        currentTurnEcho = echo;
       }
     }
   });
@@ -9420,6 +9628,9 @@ async function runSession(term, config, serviceToken, opts, exitHint) {
         if (exitConfirmation && tryHandleExitConfirmKey(ev)) {
           continue;
         }
+        if (tryHandleHelpKey(ev)) {
+          continue;
+        }
         if (tryHandleScrollbackSearchKey(ev)) {
           continue;
         }
@@ -9705,6 +9916,28 @@ async function runSession(term, config, serviceToken, opts, exitHint) {
     }
     return true;
   };
+  const toggleHelpModal = () => {
+    if (screen.isHelpPromptActive()) {
+      screen.setHelpPrompt(null);
+      return;
+    }
+    screen.setHelpPrompt({
+      title: "Hotkeys",
+      entries: HELP_ENTRIES2,
+      hint: "any key dismisses \xB7 /help lists commands"
+    });
+  };
+  const tryHandleHelpKey = (ev) => {
+    if (!screen.isHelpPromptActive()) {
+      return false;
+    }
+    if (ev.type === "key" && ev.name === "ctrl-g") {
+      screen.setHelpPrompt(null);
+      return true;
+    }
+    screen.setHelpPrompt(null);
+    return true;
+  };
   const teardown = () => {
     teardownStarted = true;
     process.off("SIGINT", sigintHandler);
@@ -9885,6 +10118,9 @@ async function runSession(term, config, serviceToken, opts, exitHint) {
         toolsExpanded = !toolsExpanded;
         renderToolsBlock();
         return;
+      case "show-help":
+        toggleHelpModal();
+        return;
       case "escalate-search":
         screen.enterScrollbackSearch();
         screen.updateScrollbackSearchTerm(effect.query);
@@ -9924,7 +10160,7 @@ async function runSession(term, config, serviceToken, opts, exitHint) {
       }
       const mimeType = mimeFromExtension(token);
       if (!mimeType) {
-        screen.notify(`unsupported image type: ${path13.basename(token)}`);
+        screen.notify(`unsupported image type: ${path14.basename(token)}`);
         continue;
       }
       try {
@@ -9938,13 +10174,13 @@ async function runSession(term, config, serviceToken, opts, exitHint) {
         dispatcher.addAttachment({
           mimeType,
           data: buf.toString("base64"),
-          name: path13.basename(token),
+          name: path14.basename(token),
           sizeBytes: buf.length
         });
         added++;
       } catch (err) {
         screen.notify(
-          `cannot read ${path13.basename(token)}: ${err.message}`
+          `cannot read ${path14.basename(token)}: ${err.message}`
         );
       }
     }
@@ -9998,6 +10234,7 @@ async function runSession(term, config, serviceToken, opts, exitHint) {
   const queueCache = /* @__PURE__ */ new Map();
   const pendingEchoes = [];
   const ownPendingByMid = /* @__PURE__ */ new Map();
+  let currentTurnEcho = null;
   const refreshQueueDisplay = () => {
     const entries = [...queueCache.values()];
     const displayTexts = entries.map(formatQueueChipText);
@@ -10254,10 +10491,11 @@ async function runSession(term, config, serviceToken, opts, exitHint) {
     } finally {
       turnInFlight = null;
       adjustPendingTurns(-1);
-      if (echo.flushed) {
+      if (echo.flushed && currentTurnEcho === echo) {
         appendRender(
           stopReason !== void 0 ? { kind: "turn-complete", stopReason } : { kind: "turn-complete" }
         );
+        currentTurnEcho = null;
       }
       if (pendingPrefill !== null) {
         const { text: pt, attachments: pa } = pendingPrefill;
@@ -10440,6 +10678,11 @@ async function runSession(term, config, serviceToken, opts, exitHint) {
     }
     if (event.kind === "user-text") {
       closeAgentText();
+      if (toolsBlockStartedAt !== null) {
+        toolsBlockEndedAt = Date.now();
+        renderToolsBlock();
+      }
+      currentTurnEcho = null;
       screen.ensureSeparator();
       const formatted2 = formatEvent(event);
       if (formatted2.length > 0) {
@@ -10508,6 +10751,15 @@ async function runSession(term, config, serviceToken, opts, exitHint) {
         toolsBlockStopReason = event.stopReason ?? null;
         renderToolsBlock();
         screen.clearKey("tools");
+      } else if (event.stopReason !== void 0 && event.stopReason !== "end_turn") {
+        screen.appendLines([
+          {
+            prefix: "\u26A0 ",
+            prefixStyle: "tool-status-fail",
+            body: `turn ended: ${event.stopReason}`,
+            bodyStyle: "tool-status-fail"
+          }
+        ]);
       }
       toolStates.clear();
       toolCallOrder.length = 0;
@@ -10555,23 +10807,21 @@ async function runSession(term, config, serviceToken, opts, exitHint) {
       resolve5({ outcome: { outcome: "cancelled" } });
     }
     closeAgentText();
-    if (toolsBlockStartedAt !== null) {
-      toolsBlockEndedAt = Date.now();
-      toolsBlockStopReason = null;
-      renderToolsBlock();
-      screen.clearKey("tools");
-      toolStates.clear();
-      toolCallOrder.length = 0;
-      toolsBlockStartedAt = null;
-      toolsBlockEndedAt = null;
-      toolsBlockStopReason = null;
-      toolsExpanded = false;
-    }
-    screen.clearKey("plan");
-    lastPlanEvent = null;
-    if (pendingTurns > 0) {
-      adjustPendingTurns(-pendingTurns);
+  };
+  const markToolsBlockRecoveryFailed = () => {
+    if (toolsBlockStartedAt === null) {
+      return;
     }
+    toolsBlockEndedAt = Date.now();
+    toolsBlockStopReason = "reconnect-recovery-failed";
+    renderToolsBlock();
+    screen.clearKey("tools");
+    toolStates.clear();
+    toolCallOrder.length = 0;
+    toolsBlockStartedAt = null;
+    toolsBlockEndedAt = null;
+    toolsBlockStopReason = null;
+    toolsExpanded = false;
   };
   onDisconnectHook = () => {
     screen.setBanner({ status: "disconnected", elapsedMs: void 0 });
@@ -10595,13 +10845,15 @@ async function runSession(term, config, serviceToken, opts, exitHint) {
       await stream.request(initReq);
     } catch {
     }
+    const useAfterMessage = lastSeenMessageId !== void 0;
     const attachReq = {
       jsonrpc: "2.0",
       id: `tui-reattach-${nanoid3()}`,
       method: "session/attach",
       params: {
         sessionId: resolvedSessionId,
-        historyPolicy: "none",
+        historyPolicy: useAfterMessage ? "after_message" : "none",
+        ...useAfterMessage ? { afterMessageId: lastSeenMessageId } : {},
         clientInfo: { name: "hydra-acp-tui", version: HYDRA_VERSION },
         ...upstreamSessionId !== void 0 ? {
           _meta: {
@@ -10616,19 +10868,46 @@ async function runSession(term, config, serviceToken, opts, exitHint) {
         } : {}
       }
     };
+    reconnectReplayBuffer = [];
+    let appliedPolicy;
+    let attachErr;
     try {
       const resp = await stream.request(attachReq);
       if (resp.error) {
         throw new Error(resp.error.message);
       }
+      const result = resp.result ?? {};
+      if (typeof result.historyPolicy === "string") {
+        appliedPolicy = result.historyPolicy;
+      }
     } catch (err) {
+      attachErr = err;
+    }
+    const buffered2 = reconnectReplayBuffer ?? [];
+    reconnectReplayBuffer = null;
+    if (attachErr) {
+      markToolsBlockRecoveryFailed();
       screen.appendLines([
         {
           prefix: "  ",
-          body: `reattach failed: ${err.message}`,
+          body: `reattach failed: ${attachErr.message}`,
           bodyStyle: "tool-status-fail"
         }
       ]);
+    } else if (useAfterMessage && appliedPolicy !== "after_message") {
+      markToolsBlockRecoveryFailed();
+      screen.appendLines([
+        {
+          prefix: "\u26A0 ",
+          prefixStyle: "tool-status-fail",
+          body: "reconnect couldn't replay events since last seen \u2014 scrollback may be incomplete",
+          bodyStyle: "tool-status-fail"
+        }
+      ]);
+    } else {
+      for (const params of buffered2) {
+        handleSessionUpdate(params);
+      }
     }
     screen.setBanner({
       status: pendingTurns > 0 ? "busy" : "ready",
@@ -10735,7 +11014,7 @@ function rotateIfBig(target) {
   } catch {
   }
 }
-var logMaxBytes;
+var HELP_ENTRIES2, logMaxBytes;
 var init_app = __esm({
   "src/tui/app.ts"() {
     "use strict";
@@ -10759,6 +11038,34 @@ var init_app = __esm({
     init_completion();
     init_render_update();
     init_format();
+    HELP_ENTRIES2 = [
+      ["Enter", "send prompt (or queue while a turn is running)"],
+      ["Alt+Enter", "newline in prompt"],
+      ["Shift+Tab", "cycle agent modes (plan / accept-edits / etc.)"],
+      ["Tab", "indent \xB7 slash-command completion"],
+      null,
+      ["\u2191 / \u2193", "prompt history \xB7 queue navigation"],
+      ["\u2190/\u2192 Home/End", "cursor movement"],
+      ["Alt+B / Alt+F", "word back / forward"],
+      ["^A / ^E", "line start / end"],
+      ["^W / ^U / ^K", "kill word / line / to end"],
+      ["^Y", "yank last kill"],
+      null,
+      ["^P", "switch session (picker)"],
+      ["^T", "next live session"],
+      ["^V", "paste image from clipboard"],
+      ["^O", "expand / collapse tools block"],
+      null,
+      ["^R / ^S", "history reverse / forward search"],
+      ["PgUp / PgDn", "scroll scrollback"],
+      ["Mouse wheel", "scroll scrollback (when mouse capture is on)"],
+      null,
+      ["^C", "cancel turn (twice to exit)"],
+      ["Esc", "cancel turn and prefill draft"],
+      ["^D", "exit (or delete-forward in prompt)"],
+      ["^L", "force full redraw"],
+      ["^G", "toggle this help"]
+    ];
     logMaxBytes = 5 * 1024 * 1024;
   }
 });
@@ -10891,13 +11198,13 @@ New token: ${newToken}
 init_paths();
 init_config();
 init_service_token();
-import * as fsp6 from "fs/promises";
+import * as fsp7 from "fs/promises";
 import { setTimeout as sleep2 } from "timers/promises";
 
 // src/daemon/server.ts
 init_config();
 import * as fs15 from "fs";
-import * as fsp4 from "fs/promises";
+import * as fsp5 from "fs/promises";
 import Fastify from "fastify";
 import websocketPlugin from "@fastify/websocket";
 import pino from "pino";
@@ -11284,10 +11591,12 @@ var RegistryDocument = z2.object({
   extensions: z2.array(z2.unknown()).optional()
 });
 var Registry = class {
-  constructor(config) {
+  constructor(config, options = {}) {
     this.config = config;
+    this.options = options;
   }
   config;
+  options;
   cache;
   async load() {
     if (this.cache && this.isFresh(this.cache.fetchedAt)) {
@@ -11337,7 +11646,12 @@ var Registry = class {
     }
     const raw = await response.json();
     const data = RegistryDocument.parse(raw);
-    return { fetchedAt: Date.now(), raw, data };
+    const cached2 = { fetchedAt: Date.now(), raw, data };
+    const hook = this.options.onFetched;
+    if (hook) {
+      void Promise.resolve().then(() => hook(data)).catch(() => void 0);
+    }
+    return cached2;
   }
   async readDiskCache() {
     let text;
@@ -11399,6 +11713,7 @@ function npxPackageBasename(agent) {
   return atIdx <= 0 ? afterSlash : afterSlash.slice(0, atIdx);
 }
 async function planSpawn(agent, callerArgs = [], options = {}) {
+  const version = agent.version ?? "current";
   if (agent.distribution.npx) {
     const npx = agent.distribution.npx;
     const tail = callerArgs.length > 0 ? callerArgs : npx.args ?? [];
@@ -11406,13 +11721,14 @@ async function planSpawn(agent, callerArgs = [], options = {}) {
       return {
         command: "npx",
         args: ["-y", npx.package, ...tail],
-        env: npx.env ?? {}
+        env: npx.env ?? {},
+        version
       };
     }
     const bin = npx.bin ?? npxPackageBasename(agent) ?? npx.package;
     const binPath = await ensureNpmPackage({
       agentId: agent.id,
-      version: agent.version ?? "current",
+      version,
       packageSpec: npx.package,
       bin,
       registry: options.npmRegistry
@@ -11420,7 +11736,8 @@ async function planSpawn(agent, callerArgs = [], options = {}) {
     return {
       command: binPath,
       args: tail,
-      env: npx.env ?? {}
+      env: npx.env ?? {},
+      version
     };
   }
   if (agent.distribution.binary) {
@@ -11432,14 +11749,15 @@ async function planSpawn(agent, callerArgs = [], options = {}) {
     }
     const cmdPath = await ensureBinary({
       agentId: agent.id,
-      version: agent.version ?? "current",
+      version,
       target
     });
     const tail = callerArgs.length > 0 ? callerArgs : target.args ?? [];
     return {
       command: cmdPath,
       args: tail,
-      env: target.env ?? {}
+      env: target.env ?? {},
+      version
     };
   }
   if (agent.distribution.uvx) {
@@ -11448,7 +11766,8 @@ async function planSpawn(agent, callerArgs = [], options = {}) {
     return {
       command: "uvx",
       args: [uvx.package, ...tail],
-      env: uvx.env ?? {}
+      env: uvx.env ?? {},
+      version
     };
   }
   throw new Error(`Agent ${agent.id} has no usable distribution method.`);
@@ -11539,6 +11858,9 @@ init_connection();
 var DEFAULT_STDERR_TAIL_BYTES = 4096;
 var AgentInstance = class _AgentInstance {
   agentId;
+  // Version this process was spawned from — used by the registry-fetch
+  // prune sweep to skip install dirs belonging to a live agent.
+  version;
   cwd;
   connection;
   child;
@@ -11550,6 +11872,7 @@ var AgentInstance = class _AgentInstance {
   exitHandlers = [];
   constructor(opts, child) {
     this.agentId = opts.agentId;
+    this.version = opts.plan.version;
     this.cwd = opts.cwd;
     this.child = child;
     this.stderrTailBytes = opts.stderrTailBytes ?? DEFAULT_STDERR_TAIL_BYTES;
@@ -12213,6 +12536,23 @@ var SessionManager = class {
   get(sessionId) {
     return this.sessions.get(sessionId);
   }
+  // Snapshot of which agent versions are currently in use by live
+  // sessions, keyed by agentId. Read by the registry-fetch prune sweep
+  // so it can skip install dirs that still back a running process.
+  activeAgentVersions() {
+    const out = /* @__PURE__ */ new Map();
+    for (const session of this.sessions.values()) {
+      const id = session.agent.agentId;
+      const version = session.agent.version;
+      let set = out.get(id);
+      if (!set) {
+        set = /* @__PURE__ */ new Set();
+        out.set(id, set);
+      }
+      set.add(version);
+    }
+    return out;
+  }
   // Resolve a user-typed session id (which may have the hydra_session_
   // prefix stripped — that's what `sessions list` and the picker show) to
   // the canonical form that actually exists. Tries the input as-given
@@ -13189,12 +13529,91 @@ function withCode2(err, code) {
 
 // src/daemon/server.ts
 init_paths();
+
+// src/core/agent-prune.ts
+init_paths();
+import * as fsp4 from "fs/promises";
+import * as path8 from "path";
+var logSink3 = (msg) => {
+  process.stderr.write(msg + "\n");
+};
+function setAgentPruneLogger(log) {
+  logSink3 = log ?? ((msg) => process.stderr.write(msg + "\n"));
+}
+async function pruneStaleAgentVersions(registry, sessionManager) {
+  const platformKey = currentPlatformKey();
+  if (!platformKey) {
+    return;
+  }
+  const doc = await registry.load();
+  const desiredByAgent = /* @__PURE__ */ new Map();
+  for (const a of doc.agents) {
+    desiredByAgent.set(a.id, a.version ?? "current");
+  }
+  const activeByAgent = sessionManager.activeAgentVersions();
+  const platformDir = path8.join(paths.agentsDir(), platformKey);
+  let agentEntries;
+  try {
+    agentEntries = await fsp4.readdir(platformDir, { withFileTypes: true });
+  } catch (err) {
+    const e = err;
+    if (e.code === "ENOENT") {
+      return;
+    }
+    logSink3(`hydra-acp: prune: failed to read ${platformDir}: ${e.message}`);
+    return;
+  }
+  for (const agentEntry of agentEntries) {
+    if (!agentEntry.isDirectory()) {
+      continue;
+    }
+    const agentId = agentEntry.name;
+    const desired = desiredByAgent.get(agentId);
+    if (desired === void 0) {
+      continue;
+    }
+    const activeVersions = activeByAgent.get(agentId) ?? /* @__PURE__ */ new Set();
+    const agentDir = path8.join(platformDir, agentId);
+    let versionEntries;
+    try {
+      versionEntries = await fsp4.readdir(agentDir, { withFileTypes: true });
+    } catch (err) {
+      logSink3(
+        `hydra-acp: prune: failed to read ${agentDir}: ${err.message}`
+      );
+      continue;
+    }
+    for (const versionEntry of versionEntries) {
+      if (!versionEntry.isDirectory()) {
+        continue;
+      }
+      const version = versionEntry.name;
+      if (version === desired) {
+        continue;
+      }
+      if (activeVersions.has(version)) {
+        continue;
+      }
+      const versionDir = path8.join(agentDir, version);
+      try {
+        await fsp4.rm(versionDir, { recursive: true, force: true });
+        logSink3(`hydra-acp: pruned stale ${agentId} ${version} (${versionDir})`);
+      } catch (err) {
+        logSink3(
+          `hydra-acp: prune: failed to remove ${versionDir}: ${err.message}`
+        );
+      }
+    }
+  }
+}
+
+// src/daemon/server.ts
 init_hydra_version();
 
 // src/core/session-tokens.ts
 init_paths();
 import * as fs13 from "fs/promises";
-import * as path8 from "path";
+import * as path9 from "path";
 import { createHash, randomBytes, timingSafeEqual } from "crypto";
 var TOKEN_PREFIX = "hydra_session_";
 var DEFAULT_TTL_SEC = 60 * 60 * 24 * 30;
@@ -13202,7 +13621,7 @@ var ID_LENGTH = 12;
 var TOKEN_BYTES = 32;
 var WRITE_DEBOUNCE_MS = 50;
 function tokensFilePath() {
-  return path8.join(paths.home(), "session-tokens.json");
+  return path9.join(paths.home(), "session-tokens.json");
 }
 function sha256Hex(input) {
   return createHash("sha256").update(input).digest("hex");
@@ -13872,12 +14291,12 @@ import { z as z6 } from "zod";
 // src/core/password.ts
 init_paths();
 import * as fs14 from "fs/promises";
-import * as path9 from "path";
+import * as path10 from "path";
 import { randomBytes as randomBytes2, scrypt, timingSafeEqual as timingSafeEqual2 } from "crypto";
 import { promisify } from "util";
 var scryptAsync = promisify(scrypt);
 function passwordHashPath() {
-  return path9.join(paths.home(), "password-hash");
+  return path10.join(paths.home(), "password-hash");
 }
 var DEFAULT_N = 1 << 15;
 var DEFAULT_R = 8;
@@ -14464,10 +14883,10 @@ function bindClientToSession(connection, session, state, clientInfo, callerClien
 async function startDaemon(config, serviceToken) {
   ensureLoopbackOrTls(config);
   const httpsOptions = config.daemon.tls ? {
-    key: await fsp4.readFile(config.daemon.tls.key),
-    cert: await fsp4.readFile(config.daemon.tls.cert)
+    key: await fsp5.readFile(config.daemon.tls.key),
+    cert: await fsp5.readFile(config.daemon.tls.cert)
   } : void 0;
-  await fsp4.mkdir(paths.home(), { recursive: true });
+  await fsp5.mkdir(paths.home(), { recursive: true });
   const { stream: logStream, fileStream } = await buildLogStream(
     config.daemon.logLevel
   );
@@ -14511,7 +14930,12 @@ async function startDaemon(config, serviceToken) {
     5 * 60 * 1e3
   );
   sweepInterval.unref();
-  const registry = new Registry(config);
+  const registry = new Registry(config, {
+    onFetched: () => {
+      void pruneStaleAgentVersions(registry, manager);
+    }
+  });
+  setAgentPruneLogger((msg) => app.log.info(msg));
   const agentLogger = {
     info: (msg) => app.log.info(msg),
     warn: (msg) => app.log.warn(msg)
@@ -14552,8 +14976,8 @@ async function startDaemon(config, serviceToken) {
   await app.listen({ host: config.daemon.host, port: config.daemon.port });
   const address = app.server.address();
   const boundPort = address && typeof address === "object" ? address.port : config.daemon.port;
-  await fsp4.mkdir(paths.home(), { recursive: true });
-  await fsp4.writeFile(
+  await fsp5.mkdir(paths.home(), { recursive: true });
+  await fsp5.writeFile(
     paths.pidFile(),
     JSON.stringify({
       pid: process.pid,
@@ -14587,6 +15011,7 @@ async function startDaemon(config, serviceToken) {
     await manager.flushMetaWrites();
     setBinaryInstallLogger(null);
     setNpmInstallLogger(null);
+    setAgentPruneLogger(null);
     await app.close();
     try {
       fs15.unlinkSync(paths.pidFile());
@@ -14629,12 +15054,12 @@ init_daemon_bootstrap();
 
 // src/cli/commands/log-tail.ts
 import * as fs16 from "fs";
-import * as fsp5 from "fs/promises";
+import * as fsp6 from "fs/promises";
 async function runLogTail(logPath, argv, notFoundMessage) {
   const opts = parseLogTailFlags(argv);
   let stat4;
   try {
-    stat4 = await fsp5.stat(logPath);
+    stat4 = await fsp6.stat(logPath);
   } catch (err) {
     const e = err;
     if (e.code === "ENOENT") {
@@ -14660,14 +15085,14 @@ async function runLogTail(logPath, argv, notFoundMessage) {
     setImmediate(async () => {
       pending = false;
       try {
-        const s = await fsp5.stat(logPath);
+        const s = await fsp6.stat(logPath);
         if (s.size <= position) {
           if (s.size < position) {
             position = s.size;
           }
           return;
         }
-        const fd = await fsp5.open(logPath, "r");
+        const fd = await fsp6.open(logPath, "r");
         try {
           const buf = Buffer.alloc(s.size - position);
           await fd.read(buf, 0, buf.length, position);
@@ -14694,7 +15119,7 @@ async function printTail(logPath, fileSize, lines) {
     return fileSize;
   }
   const CHUNK = 64 * 1024;
-  const fd = await fsp5.open(logPath, "r");
+  const fd = await fsp6.open(logPath, "r");
   try {
     let position = fileSize;
     let collected = "";
@@ -14866,7 +15291,7 @@ async function runDaemonStatus() {
 }
 async function readPidFile() {
   try {
-    const raw = await fsp6.readFile(paths.pidFile(), "utf8");
+    const raw = await fsp7.readFile(paths.pidFile(), "utf8");
     return JSON.parse(raw);
   } catch (err) {
     const e = err;
@@ -14892,7 +15317,7 @@ init_sessions();
 init_config();
 init_service_token();
 init_paths();
-import * as fsp7 from "fs/promises";
+import * as fsp8 from "fs/promises";
 init_sessions();
 async function runExtensionsList() {
   const config = await loadConfig();
@@ -15091,11 +15516,11 @@ async function runExtensionsRemove(name) {
   }
 }
 async function readRawConfig() {
-  const raw = await fsp7.readFile(paths.config(), "utf8");
+  const raw = await fsp8.readFile(paths.config(), "utf8");
   return JSON.parse(raw);
 }
 async function writeRawConfig(raw) {
-  await fsp7.writeFile(
+  await fsp8.writeFile(
     paths.config(),
     JSON.stringify(raw, null, 2) + "\n",
     { encoding: "utf8", mode: 384 }