@hydra-acp/cli 0.1.34 → 0.1.36

package/dist/cli.js

@@ -5620,7 +5620,7 @@ async function pickSession(term, opts) {
           move(viewportSize);
           return;
         case "HOME":
-          move(-total);
+          move(1 - selectedIdx);
           return;
         case "END":
           move(total);
@@ -5779,10 +5779,8 @@ var init_cwd = __esm({
   }
 });
 
-// src/tui/import-cwd-prompt.ts
-import * as os5 from "os";
-async function promptForImportCwd(term, session, opts = {}) {
-  const defaultCwd = opts.defaultCwd ?? os5.homedir();
+// src/tui/prompt-utils.ts
+function resetTerminalModes() {
   process.stdout.write("\x1B[<u");
   process.stdout.write("\x1B[?2004l");
   process.stdout.write("\x1B[>4;0m");
@@ -5792,52 +5790,165 @@ async function promptForImportCwd(term, session, opts = {}) {
   process.stdout.write("\x1B[?1006l");
   process.stdout.write("\x1B[?1l");
   process.stdout.write("\x1B>");
+}
+function readTermWidth2(term) {
+  return term.width ?? 80;
+}
+function readTermHeight2(term) {
+  return term.height ?? 24;
+}
+function drawBox(term, opts) {
+  const termW = readTermWidth2(term);
+  const termH = readTermHeight2(term);
+  const desiredContentW = opts.contentWidth ?? MAX_BOX_WIDTH;
+  const maxContentW = Math.max(10, Math.min(MAX_BOX_WIDTH, termW - 4));
+  const contentW = Math.min(desiredContentW, maxContentW);
+  const w = contentW + 2;
+  const contentH = Math.max(1, Math.min(opts.contentHeight, termH - 4));
+  const h = contentH + 2;
+  const x = Math.max(1, Math.floor((termW - w) / 2) + 1);
+  const y = Math.max(1, Math.floor((termH - h) / 2) + 1);
+  term.moveTo(1, 1).eraseDisplayBelow();
+  const topInner = HORIZ.repeat(w - 2);
+  const top = renderTitleStrip(topInner, opts.title);
+  term.moveTo(x, y);
+  term.dim.noFormat(TL);
+  paintTopStrip(term, top);
+  term.dim.noFormat(TR);
+  for (let row = 1; row <= contentH; row++) {
+    term.moveTo(x, y + row);
+    term.dim.noFormat(VERT);
+    term.moveTo(x + w - 1, y + row);
+    term.dim.noFormat(VERT);
+  }
+  term.moveTo(x, y + h - 1);
+  term.dim.noFormat(BL + HORIZ.repeat(w - 2) + BR);
+  return {
+    x,
+    y,
+    w,
+    h,
+    contentX: x + 1,
+    contentY: y + 1,
+    contentW,
+    contentH
+  };
+}
+function renderTitleStrip(innerDashes, title) {
+  if (!title) {
+    return { dashes: innerDashes };
+  }
+  const chip = ` ${title} `;
+  if (chip.length + 4 > innerDashes.length) {
+    return { dashes: innerDashes };
+  }
+  const offset = 2;
+  const dashes = innerDashes.slice(0, offset) + " ".repeat(chip.length) + innerDashes.slice(offset + chip.length);
+  return { dashes, title: { offset, text: chip } };
+}
+function paintTopStrip(term, strip) {
+  if (!strip.title) {
+    term.dim.noFormat(strip.dashes);
+    return;
+  }
+  term.dim.noFormat(strip.dashes.slice(0, strip.title.offset));
+  term.brightCyan.noFormat(strip.title.text);
+  term.dim.noFormat(strip.dashes.slice(strip.title.offset + strip.title.text.length));
+}
+var MAX_BOX_WIDTH, HORIZ, VERT, TL, TR, BL, BR;
+var init_prompt_utils = __esm({
+  "src/tui/prompt-utils.ts"() {
+    "use strict";
+    MAX_BOX_WIDTH = 64;
+    HORIZ = "\u2500";
+    VERT = "\u2502";
+    TL = "\u250C";
+    TR = "\u2510";
+    BL = "\u2514";
+    BR = "\u2518";
+  }
+});
+
+// src/tui/import-cwd-prompt.ts
+import * as os5 from "os";
+async function promptForImportCwd(term, session, opts = {}) {
+  const defaultCwd = opts.defaultCwd ?? os5.homedir();
+  resetTerminalModes();
   const shortId2 = stripHydraSessionPrefix(session.sessionId);
   const fromMachine = session.importedFromMachine ?? "another machine";
-  const originalCwd = session.cwd;
+  const originalCwd = shortenHomePath(session.cwd);
   let buffer = defaultCwd;
   let errorLine = null;
   let busy = false;
+  let layout = null;
   const render = () => {
-    term("\n");
-    term.bold.cyan("Imported session: ");
-    term(`${shortId2}
-`);
-    term.dim(`  from machine:   `);
-    term(`${fromMachine}
-`);
-    term.dim(`  original cwd:   `);
-    term(`${shortenHomePath(originalCwd)}
-`);
-    term("\n");
-    term(
-      "This session has never been launched on this machine. Pick a local\n"
-    );
-    term("cwd for the agent (Enter to accept, Esc to cancel):\n\n");
-    paintInput();
-    if (errorLine) {
-      term("\n");
-      term.red(`  ${errorLine}
-`);
+    const contentHeight = 9;
+    layout = drawBox(term, {
+      contentHeight,
+      title: "Run locally \u2014 choose cwd"
+    });
+    const innerW = layout.contentW;
+    const headerRows = [
+      { label: "session: ", value: shortId2 },
+      { label: "from:    ", value: fromMachine },
+      { label: "cwd:     ", value: originalCwd }
+    ];
+    let row = 0;
+    for (const hr of headerRows) {
+      term.moveTo(layout.contentX, layout.contentY + row);
+      term.dim.noFormat(` ${hr.label}`);
+      term.noFormat(truncate(hr.value, innerW - hr.label.length - 2));
+      row++;
+    }
+    row++;
+    term.moveTo(layout.contentX, layout.contentY + row);
+    term.noFormat(" Pick a local cwd for this session:");
+    row += 2;
+    paintInputRow(row);
+    row += 2;
+    if (errorLine !== null) {
+      term.moveTo(layout.contentX, layout.contentY + row);
+      term.red.noFormat(` ${truncate(errorLine, innerW - 2)}`);
+    } else {
+      term.moveTo(layout.contentX, layout.contentY + row);
+      term.dim.noFormat(
+        " Enter accept \xB7 Esc back \xB7 ^U clear \xB7 ^W kill word"
+      );
     }
   };
-  const paintInput = () => {
-    term.bold("cwd: ");
-    term(buffer);
+  const inputRow = () => 7;
+  const paintInputRow = (rowOffset) => {
+    if (!layout) {
+      return;
+    }
+    const r = rowOffset ?? inputRow();
+    term.moveTo(layout.contentX, layout.contentY + r).eraseLineAfter();
+    term.moveTo(layout.x + layout.w - 1, layout.contentY + r);
+    term.dim.noFormat("\u2502");
+    term.moveTo(layout.contentX, layout.contentY + r);
+    term.bold.noFormat(" cwd: ");
+    const available = layout.contentW - " cwd: ".length - 2;
+    term.noFormat(truncateLeft(buffer, available));
     if (!busy) {
       term.bgWhite(" ");
     }
   };
   const repaintInput = () => {
-    term.column(1);
-    term.eraseLine();
-    paintInput();
+    paintInputRow();
+    if (!layout) {
+      return;
+    }
+    const errRow = inputRow() + 2;
+    term.moveTo(layout.contentX, layout.contentY + errRow).eraseLineAfter();
+    term.moveTo(layout.x + layout.w - 1, layout.contentY + errRow);
+    term.dim.noFormat("\u2502");
+    term.moveTo(layout.contentX, layout.contentY + errRow);
     if (errorLine !== null) {
-      term("\n");
-      term.eraseLine();
-      term.red(`  ${errorLine}`);
-      term.up(1);
-      term.column(1);
+      term.red.noFormat(` ${truncate(errorLine, layout.contentW - 2)}`);
+    } else {
+      term.dim.noFormat(
+        " Enter accept \xB7 Esc back \xB7 ^U clear \xB7 ^W kill word"
+      );
     }
   };
   render();
@@ -5849,14 +5960,21 @@ async function promptForImportCwd(term, session, opts = {}) {
       }
       resolved = true;
       term.off("key", onKey);
+      term.off("resize", onResize);
       term.grabInput(false);
       term.hideCursor(false);
-      term("\n\n");
+      term.moveTo(1, 1).eraseDisplayBelow();
     };
     const finish = (value) => {
       cleanup();
       resolve6(value);
     };
+    const onResize = () => {
+      if (resolved) {
+        return;
+      }
+      render();
+    };
     const onKey = (name, _matches, data) => {
       if (busy) {
         return;
@@ -5869,7 +5987,7 @@ async function promptForImportCwd(term, session, opts = {}) {
         void validateLocalCwd(candidate).then((result) => {
           busy = false;
           if (result.ok) {
-            finish(result.path);
+            finish({ kind: "ok", path: result.path });
             return;
           }
           errorLine = result.reason;
@@ -5877,8 +5995,12 @@ async function promptForImportCwd(term, session, opts = {}) {
         });
         return;
       }
-      if (name === "ESCAPE" || name === "CTRL_C" || name === "CTRL_D") {
-        finish(null);
+      if (name === "ESCAPE") {
+        finish({ kind: "back" });
+        return;
+      }
+      if (name === "CTRL_C" || name === "CTRL_D") {
+        finish({ kind: "cancel" });
         return;
       }
       if (name === "BACKSPACE") {
@@ -5915,14 +6037,251 @@ async function promptForImportCwd(term, session, opts = {}) {
     };
     term.grabInput({});
     term.on("key", onKey);
+    term.on("resize", onResize);
   });
 }
+function truncate(s, max) {
+  if (max <= 1) {
+    return "";
+  }
+  if (s.length <= max) {
+    return s;
+  }
+  return s.slice(0, Math.max(0, max - 1)) + "\u2026";
+}
+function truncateLeft(s, max) {
+  if (max <= 1) {
+    return "";
+  }
+  if (s.length <= max) {
+    return s;
+  }
+  return "\u2026" + s.slice(s.length - (max - 1));
+}
 var init_import_cwd_prompt = __esm({
   "src/tui/import-cwd-prompt.ts"() {
     "use strict";
     init_paths();
     init_session();
     init_cwd();
+    init_prompt_utils();
+  }
+});
+
+// src/tui/import-action-prompt.ts
+function actionPromptStep(selected, key, choices = ACTION_CHOICES) {
+  if (key.kind === "cancel") {
+    return { kind: "cancel" };
+  }
+  if (key.kind === "back") {
+    return { kind: "back" };
+  }
+  if (key.kind === "enter") {
+    const choice = choices[selected];
+    if (!choice) {
+      return { kind: "back" };
+    }
+    return { kind: "resolve", action: choice.key };
+  }
+  if (key.kind === "up") {
+    return {
+      kind: "continue",
+      selected: Math.max(0, selected - 1)
+    };
+  }
+  if (key.kind === "down") {
+    return {
+      kind: "continue",
+      selected: Math.min(choices.length - 1, selected + 1)
+    };
+  }
+  if (key.kind === "char") {
+    const lower = key.ch.toLowerCase();
+    if (lower === "n") {
+      return {
+        kind: "continue",
+        selected: Math.min(choices.length - 1, selected + 1)
+      };
+    }
+    if (lower === "p") {
+      return {
+        kind: "continue",
+        selected: Math.max(0, selected - 1)
+      };
+    }
+    const idx = choices.findIndex((c) => c.hotkey.toLowerCase() === lower);
+    if (idx >= 0) {
+      const choice = choices[idx];
+      if (choice) {
+        return { kind: "resolve", action: choice.key };
+      }
+    }
+  }
+  return { kind: "continue", selected };
+}
+async function promptForImportAction(term, session) {
+  resetTerminalModes();
+  const shortId2 = stripHydraSessionPrefix(session.sessionId);
+  const fromMachine = session.importedFromMachine ?? "another machine";
+  const originalCwd = shortenHomePath(session.cwd);
+  let selected = 0;
+  const render = () => {
+    const choiceRows = ACTION_CHOICES.length * 2;
+    const contentHeight = 7 + choiceRows + 2;
+    const layout = drawBox(term, {
+      contentHeight,
+      title: "Imported session"
+    });
+    const innerW = layout.contentW;
+    const headerRows = [
+      { label: "session: ", value: shortId2 },
+      { label: "from:    ", value: fromMachine },
+      { label: "cwd:     ", value: originalCwd }
+    ];
+    let row = 0;
+    for (const hr of headerRows) {
+      term.moveTo(layout.contentX, layout.contentY + row);
+      term.dim.noFormat(` ${hr.label}`);
+      term.noFormat(truncate2(hr.value, innerW - hr.label.length - 2));
+      row++;
+    }
+    row++;
+    term.moveTo(layout.contentX, layout.contentY + row);
+    term.noFormat(" What do you want to do?");
+    row += 2;
+    for (let i = 0; i < ACTION_CHOICES.length; i++) {
+      const choice = ACTION_CHOICES[i];
+      if (!choice) {
+        continue;
+      }
+      const pointer = i === selected ? "\u276F" : " ";
+      const label = ` ${pointer} ${choice.label}`;
+      term.moveTo(layout.contentX, layout.contentY + row);
+      if (i === selected) {
+        term.brightWhite.bgBlue.noFormat(padRight(label, innerW));
+      } else {
+        term.noFormat(label);
+      }
+      row++;
+      term.moveTo(layout.contentX, layout.contentY + row);
+      term.dim.noFormat(`     ${choice.description}`);
+      row++;
+    }
+    row++;
+    term.moveTo(layout.contentX, layout.contentY + row);
+    term.dim.noFormat(" \u2191/\u2193 navigate \xB7 Enter select \xB7 r/v jump \xB7 Esc back");
+    return layout;
+  };
+  render();
+  term.hideCursor();
+  return await new Promise((resolve6) => {
+    let resolved = false;
+    const cleanup = () => {
+      if (resolved) {
+        return;
+      }
+      resolved = true;
+      term.off("key", onKey);
+      term.off("resize", onResize);
+      term.grabInput(false);
+      term.hideCursor(false);
+      term.moveTo(1, 1).eraseDisplayBelow();
+    };
+    const finish = (value) => {
+      cleanup();
+      resolve6(value);
+    };
+    const onResize = () => {
+      if (resolved) {
+        return;
+      }
+      render();
+    };
+    const onKey = (name, _matches, data) => {
+      const input = mapKey(name, data);
+      if (!input) {
+        return;
+      }
+      const step = actionPromptStep(selected, input);
+      if (step.kind === "cancel") {
+        finish("cancel");
+        return;
+      }
+      if (step.kind === "back") {
+        finish("back");
+        return;
+      }
+      if (step.kind === "resolve") {
+        finish(step.action);
+        return;
+      }
+      if (step.selected !== selected) {
+        selected = step.selected;
+        render();
+      }
+    };
+    term.grabInput({});
+    term.on("key", onKey);
+    term.on("resize", onResize);
+  });
+}
+function mapKey(name, data) {
+  if (name === "UP") {
+    return { kind: "up" };
+  }
+  if (name === "DOWN") {
+    return { kind: "down" };
+  }
+  if (name === "ENTER" || name === "KP_ENTER") {
+    return { kind: "enter" };
+  }
+  if (name === "ESCAPE") {
+    return { kind: "back" };
+  }
+  if (name === "CTRL_C" || name === "CTRL_D") {
+    return { kind: "cancel" };
+  }
+  if (data?.isCharacter) {
+    return { kind: "char", ch: name };
+  }
+  return null;
+}
+function truncate2(s, max) {
+  if (max <= 1) {
+    return "";
+  }
+  if (s.length <= max) {
+    return s;
+  }
+  return s.slice(0, Math.max(0, max - 1)) + "\u2026";
+}
+function padRight(s, w) {
+  if (s.length >= w) {
+    return s.slice(0, w);
+  }
+  return s + " ".repeat(w - s.length);
+}
+var ACTION_CHOICES;
+var init_import_action_prompt = __esm({
+  "src/tui/import-action-prompt.ts"() {
+    "use strict";
+    init_paths();
+    init_session();
+    init_prompt_utils();
+    ACTION_CHOICES = [
+      {
+        key: "run-local",
+        label: "Run locally",
+        hotkey: "r",
+        description: "spawn the agent on this machine with a local cwd"
+      },
+      {
+        key: "view",
+        label: "View transcript",
+        hotkey: "v",
+        description: "open read-only, no agent spawn"
+      }
+    ];
   }
 });
 
@@ -6389,7 +6748,7 @@ function graphemeSegments(text) {
   }
   return out;
 }
-function truncate(text, max, opts = {}) {
+function truncate3(text, max, opts = {}) {
   if (max <= 0) {
     return "";
   }
@@ -6630,8 +6989,12 @@ function mapCsiUToKeyName(code, mod) {
     101: "ctrl-e",
     102: "ctrl-f",
     103: "ctrl-g",
+    104: "backspace",
+    105: "tab",
+    106: "ctrl-enter",
     107: "ctrl-k",
     108: "ctrl-l",
+    109: "enter",
     110: "ctrl-n",
     111: "ctrl-o",
     112: "ctrl-p",
@@ -6641,6 +7004,7 @@ function mapCsiUToKeyName(code, mod) {
     117: "ctrl-u",
     118: "ctrl-v",
     119: "ctrl-w",
+    120: "ctrl-x",
     121: "ctrl-y"
   };
   if (mod === 5) {
@@ -6985,27 +7349,21 @@ uncaught: ${err.stack ?? err.message}
           this.handleRawStdinSegment(text);
           return;
         }
-        const legacyMarkers = [
-          { seq: "\x1B[27;2;13~", name: "shift-enter" },
-          { seq: "\x1B[27;5;13~", name: "ctrl-enter" },
-          // Bare LF — universal fallback for terminals without
-          // modifyOtherKeys / kitty protocol. Last so the longer escape
-          // sequences match first and we don't double-fire.
-          { seq: "\n", name: "ctrl-enter" }
-        ];
-        for (const { seq, name } of legacyMarkers) {
-          if (text.includes(seq)) {
-            const parts = text.split(seq);
-            for (let i = 0; i < parts.length; i++) {
-              if (parts[i].length > 0) {
-                this.handleRawStdin(Buffer.from(parts[i], "binary"));
-              }
-              if (i < parts.length - 1) {
-                this.onKey([{ type: "key", name }]);
-              }
+        if (/\x1b\[27;\d+;\d+~/.test(text)) {
+          this.handleCsi27Stdin(text);
+          return;
+        }
+        if (text.includes("\n")) {
+          const parts = text.split("\n");
+          for (let i = 0; i < parts.length; i++) {
+            if (parts[i].length > 0) {
+              this.handleRawStdin(Buffer.from(parts[i], "binary"));
+            }
+            if (i < parts.length - 1) {
+              this.onKey([{ type: "key", name: "ctrl-enter" }]);
             }
-            return;
           }
+          return;
         }
         if (text.includes("\x1B[") && /\x1b\[\d+(?:;\d+)?u/.test(text)) {
           this.handleCsiUStdin(text);
@@ -7013,6 +7371,36 @@ uncaught: ${err.stack ?? err.message}
         }
         this.handleRawStdinSegment(text);
       }
+      // Walk `text` extracting every legacy modifyOtherKeys CSI-27 sequence
+      // (\x1b[27;<mod>;<code>~). Each match is dispatched through
+      // mapCsiUToKeyName; unmapped printable codes with no modifier or
+      // shift are injected as text (Shift+I -> "I"), so xterm's
+      // modifyOtherKeys=2 echo doesn't leak escape sequences into the
+      // prompt. Other unmapped combos (Ctrl+symbol etc.) are dropped.
+      handleCsi27Stdin(text) {
+        const csi27 = /\x1b\[27;(\d+);(\d+)~/g;
+        let lastEnd = 0;
+        let m;
+        while ((m = csi27.exec(text)) !== null) {
+          if (m.index > lastEnd) {
+            this.handleRawStdin(
+              Buffer.from(text.slice(lastEnd, m.index), "binary")
+            );
+          }
+          const mod = parseInt(m[1], 10);
+          const code = parseInt(m[2], 10);
+          const name = mapCsiUToKeyName(code, mod);
+          if (name !== null) {
+            this.onKey([{ type: "key", name }]);
+          } else if ((mod === 1 || mod === 2) && code >= 32 && code < 127) {
+            this.handleRawStdinSegment(String.fromCharCode(code));
+          }
+          lastEnd = m.index + m[0].length;
+        }
+        if (lastEnd < text.length) {
+          this.handleRawStdin(Buffer.from(text.slice(lastEnd), "binary"));
+        }
+      }
       // Walk `text` extracting every kitty CSI-u sequence. Each non-CSI-u
       // span is recursed back into handleRawStdin so paste markers and
       // legacy-modifyOtherKeys sequences in the same chunk still get
@@ -8010,9 +8398,9 @@ uncaught: ${err.stack ?? err.message}
             titleRoom = 0;
             cwdRoom = variableRoom;
           }
-          this.term.yellow(sid)(" \xB7 ").cyan.noFormat(agentCell)(" \xB7 ").dim.noFormat(truncate(cwdDisplay, cwdRoom));
+          this.term.yellow(sid)(" \xB7 ").cyan.noFormat(agentCell)(" \xB7 ").dim.noFormat(truncate3(cwdDisplay, cwdRoom));
           if (title) {
-            this.term(" \xB7 ").bold.noFormat(truncate(title, titleRoom));
+            this.term(" \xB7 ").bold.noFormat(truncate3(title, titleRoom));
           }
           if (usage) {
             const col = Math.max(1, w - usage.length + 1);
@@ -8123,7 +8511,7 @@ uncaught: ${err.stack ?? err.message}
             const namePadded = item.name.padEnd(nameWidth);
             const desc = item.description ?? "";
             const remaining = w - namePadded.length - 4;
-            const truncated = remaining > 0 ? truncate(desc, remaining) : "";
+            const truncated = remaining > 0 ? truncate3(desc, remaining) : "";
             this.term("  ").brightCyan(namePadded);
             if (truncated.length > 0) {
               this.term("  ").dim(truncated);
@@ -8200,7 +8588,7 @@ uncaught: ${err.stack ?? err.message}
           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 summary = text === void 0 ? "" : isLast ? `+ ${overflow + 1} more queued` : truncate3(firstLine2(text), w - 4);
           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, () => {
@@ -8277,10 +8665,10 @@ uncaught: ${err.stack ?? err.message}
         const w = this.term.width;
         const top = this.term.height - CONFIRM_PROMPT_ROWS - BANNER_ROWS - SEPARATOR_ROWS - SESSIONBAR_ROWS + 1;
         this.paintRow(top, `confirm|q|${w}|${spec.question}`, () => {
-          this.term.brightYellow(` ? ${truncate(spec.question, w - 4)}`);
+          this.term.brightYellow(` ? ${truncate3(spec.question, w - 4)}`);
         });
         this.paintRow(top + 1, `confirm|h|${w}|${spec.hint}`, () => {
-          this.term.dim(` ${truncate(spec.hint, w - 2)}`);
+          this.term.dim(` ${truncate3(spec.hint, w - 2)}`);
         });
       }
       drawHelpPrompt() {
@@ -8300,7 +8688,7 @@ uncaught: ${err.stack ?? err.message}
           row += 1;
         };
         writeRow(`help|t|${w}|${spec.title}`, () => {
-          this.term.brightYellow(` \u2753 ${truncate(spec.title, w - 5)}`);
+          this.term.brightYellow(` \u2753 ${truncate3(spec.title, w - 5)}`);
         });
         const keysWidth = Math.min(
           24,
@@ -8322,11 +8710,11 @@ uncaught: ${err.stack ?? err.message}
           writeRow(`help|e|${w}|${keys}|${desc}`, () => {
             this.term(" ");
             this.term.brightCyan.noFormat(paddedKeys);
-            this.term.noFormat(` ${truncate(desc, w - 2 - keysWidth - 1)}`);
+            this.term.noFormat(` ${truncate3(desc, w - 2 - keysWidth - 1)}`);
           });
         }
         writeRow(`help|hint|${w}|${spec.hint}`, () => {
-          this.term.dim(` ${truncate(spec.hint, w - 2)}`);
+          this.term.dim(` ${truncate3(spec.hint, w - 2)}`);
         });
       }
       helpRows() {
@@ -8352,7 +8740,7 @@ uncaught: ${err.stack ?? err.message}
           row += 1;
         };
         writeRow(`perm|t|${w}|${spec.title}`, () => {
-          this.term.brightYellow(` \u{1F512} ${truncate(spec.title, w - 5)}`);
+          this.term.brightYellow(` \u{1F512} ${truncate3(spec.title, w - 5)}`);
         });
         writeRow(`perm|sub|${w}`, () => {
           this.term.dim(" This action requires approval");
@@ -8370,7 +8758,7 @@ uncaught: ${err.stack ?? err.message}
           }
           const isSel = i === spec.selectedIndex;
           const marker = isSel ? "\u276F" : " ";
-          const body = ` ${marker} ${i + 1}. ${truncate(opt.label, w - 8)}`;
+          const body = ` ${marker} ${i + 1}. ${truncate3(opt.label, w - 8)}`;
           writeRow(`perm|o|${w}|${i}|${isSel ? "1" : "0"}|${opt.label}`, () => {
             if (isSel) {
               this.term.brightCyan(body);
@@ -8417,7 +8805,7 @@ uncaught: ${err.stack ?? err.message}
           }
           const hint = this.banner.currentMode ? this.banner.hint.replace(
             "\u21E7\u21E5 mode",
-            `\u21E7\u21E5 mode(${this.banner.currentMode})`
+            `\u21E7\u21E5 mode: ${this.banner.currentMode}`
           ) : this.banner.hint;
           this.term(" \xB7 ").dim(hint);
           if (right) {
@@ -8459,6 +8847,10 @@ uncaught: ${err.stack ?? err.message}
           this.term.hideCursor(true);
           return;
         }
+        if (this.readonly) {
+          this.term.hideCursor(true);
+          return;
+        }
         this.term.hideCursor(false);
         const w = this.term.width;
         const room = Math.max(1, w - 2);
@@ -8600,7 +8992,7 @@ uncaught: ${err.stack ?? err.message}
         }
         const remaining = Math.max(0, width - (line.prefix?.length ?? 0));
         const stripMarkup = line.bodyStyle === "agent";
-        const bodyText = line.ansi ? line.body : truncate(line.body, remaining, { stripMarkup });
+        const bodyText = line.ansi ? line.body : truncate3(line.body, remaining, { stripMarkup });
         if (this.scrollbackHighlight !== null && !line.ansi) {
           writeBodyWithHighlight(
             this.term,
@@ -11179,19 +11571,52 @@ async function runSession(term, config, target, opts, exitHint) {
     screen.pauseRepaint();
     screen.stop();
     saveHistory(historyFile, history).catch(() => void 0);
-    const sessions = await listSessions(target);
-    const choice = await pickSession(term, {
-      cwd: resolvedCwd,
-      sessions,
-      config,
-      target,
-      currentSessionId: resolvedSessionId
-    });
-    if (choice.kind === "abort") {
-      screen.start();
-      screen.resumeRepaint();
-      return;
+    let resolvedChoice = null;
+    let attachOverrides = null;
+    while (resolvedChoice === null) {
+      const sessions = await listSessions(target);
+      const choice2 = await pickSession(term, {
+        cwd: resolvedCwd,
+        sessions,
+        config,
+        target,
+        currentSessionId: resolvedSessionId
+      });
+      if (choice2.kind === "abort") {
+        screen.start();
+        screen.resumeRepaint();
+        return;
+      }
+      if (choice2.kind === "new") {
+        resolvedChoice = { choice: choice2, sessions };
+        break;
+      }
+      const chosen = sessions.find((s) => s.sessionId === choice2.sessionId);
+      const isImportedFirstLaunch = chosen !== void 0 && !!chosen.importedFromMachine && !chosen.upstreamSessionId && choice2.readonly !== true;
+      if (!isImportedFirstLaunch) {
+        resolvedChoice = { choice: choice2, sessions };
+        break;
+      }
+      const opsShim = { ...opts, readonly: false };
+      const decided = await runImportedFirstLaunchFlow(term, chosen, choice2, opsShim);
+      if (decided.kind === "cancel") {
+        screen.start();
+        screen.resumeRepaint();
+        return;
+      }
+      if (decided.kind === "back") {
+        continue;
+      }
+      resolvedChoice = { choice: choice2, sessions };
+      attachOverrides = {
+        readonly: opsShim.readonly === true,
+        cwd: decided.ctx.cwd
+      };
+      if (decided.ctx.importAttachHint !== void 0) {
+        attachOverrides.importAttachHint = decided.ctx.importAttachHint;
+      }
     }
+    const { choice } = resolvedChoice;
     const resume = finishSession;
     finishSession = null;
     process.off("SIGINT", sigintHandler);
@@ -11202,15 +11627,23 @@ async function runSession(term, config, target, opts, exitHint) {
       resume({ ...rest, cwd: resolvedCwd, forceNew: true, readonly: false });
       return;
     }
+    if (choice.kind !== "attach") {
+      return;
+    }
     const nextOpts = {
       ...opts,
       sessionId: choice.sessionId,
-      cwd: resolvedCwd,
-      readonly: choice.readonly === true
+      cwd: attachOverrides?.cwd ?? resolvedCwd,
+      readonly: attachOverrides?.readonly ?? choice.readonly === true
     };
     if (choice.agentId !== void 0) {
       nextOpts.agentId = choice.agentId;
     }
+    if (attachOverrides?.importAttachHint !== void 0) {
+      nextOpts.importAttachHint = attachOverrides.importAttachHint;
+    } else {
+      delete nextOpts.importAttachHint;
+    }
     resume(nextOpts);
   };
   const cycleLiveSession = async () => {
@@ -12257,18 +12690,22 @@ connection lost: ${err.message}
 async function resolveSession(term, config, target, opts) {
   const cwd = opts.cwd ?? process.cwd();
   if (opts.sessionId) {
-    return {
+    const ctx = {
       sessionId: opts.sessionId,
       agentId: opts.agentId ?? "",
       cwd
     };
+    if (opts.importAttachHint !== void 0) {
+      ctx.importAttachHint = opts.importAttachHint;
+    }
+    return ctx;
   }
   if (opts.forceNew) {
     return newCtx(opts, cwd, config);
   }
   if (opts.resume) {
-    const sessions2 = await listSessions(target, { cwd, all: true });
-    const recent = pickMostRecent(sessions2, cwd);
+    const sessions = await listSessions(target, { cwd, all: true });
+    const recent = pickMostRecent(sessions, cwd);
     if (!recent) {
       term.yellow(`No sessions found for ${cwd}.
 `);
@@ -12280,43 +12717,82 @@ async function resolveSession(term, config, target, opts) {
       cwd
     };
   }
-  const sessions = await listSessions(target);
-  if (sessions.length === 0) {
-    return newCtx(opts, cwd, config);
-  }
-  const choice = await pickSession(term, {
-    cwd,
-    sessions,
-    config,
-    target
-  });
-  if (choice.kind === "abort") {
-    return null;
-  }
-  if (choice.kind === "new") {
-    return newCtx(opts, cwd, config);
-  }
-  opts.readonly = choice.readonly === true;
-  const chosen = sessions.find((s) => s.sessionId === choice.sessionId);
-  const isImportedFirstLaunch = chosen !== void 0 && !!chosen.importedFromMachine && !chosen.upstreamSessionId && !opts.readonly;
-  if (isImportedFirstLaunch) {
-    const promptedCwd = await promptForImportCwd(term, chosen);
-    if (promptedCwd === null) {
+  while (true) {
+    const sessions = await listSessions(target);
+    if (sessions.length === 0) {
+      return newCtx(opts, cwd, config);
+    }
+    const choice = await pickSession(term, {
+      cwd,
+      sessions,
+      config,
+      target
+    });
+    if (choice.kind === "abort") {
       return null;
     }
-    const agentId = choice.agentId ?? chosen.agentId ?? "";
+    if (choice.kind === "new") {
+      return newCtx(opts, cwd, config);
+    }
+    opts.readonly = choice.readonly === true;
+    const chosen = sessions.find((s) => s.sessionId === choice.sessionId);
+    const isImportedFirstLaunch = chosen !== void 0 && !!chosen.importedFromMachine && !chosen.upstreamSessionId && !opts.readonly;
+    if (isImportedFirstLaunch) {
+      const decided = await runImportedFirstLaunchFlow(term, chosen, choice, opts);
+      if (decided.kind === "cancel") {
+        return null;
+      }
+      if (decided.kind === "back") {
+        continue;
+      }
+      return decided.ctx;
+    }
     return {
       sessionId: choice.sessionId,
-      agentId,
-      cwd: promptedCwd,
-      importAttachHint: { agentId, cwd: promptedCwd }
+      agentId: choice.agentId ?? "",
+      cwd
+    };
+  }
+}
+async function runImportedFirstLaunchFlow(term, chosen, choice, opts) {
+  while (true) {
+    const action = await promptForImportAction(term, chosen);
+    if (action === "cancel") {
+      return { kind: "cancel" };
+    }
+    if (action === "back") {
+      return { kind: "back" };
+    }
+    if (action === "view") {
+      opts.readonly = true;
+      const agentId2 = choice.agentId ?? chosen.agentId ?? "";
+      return {
+        kind: "ctx",
+        ctx: {
+          sessionId: choice.sessionId,
+          agentId: agentId2,
+          cwd: chosen.cwd
+        }
+      };
+    }
+    const cwdResult = await promptForImportCwd(term, chosen);
+    if (cwdResult.kind === "cancel") {
+      return { kind: "cancel" };
+    }
+    if (cwdResult.kind === "back") {
+      continue;
+    }
+    const agentId = choice.agentId ?? chosen.agentId ?? "";
+    return {
+      kind: "ctx",
+      ctx: {
+        sessionId: choice.sessionId,
+        agentId,
+        cwd: cwdResult.path,
+        importAttachHint: { agentId, cwd: cwdResult.path }
+      }
     };
   }
-  return {
-    sessionId: choice.sessionId,
-    agentId: choice.agentId ?? "",
-    cwd
-  };
 }
 function newCtx(opts, cwd, config) {
   return {
@@ -12467,6 +12943,7 @@ var init_app = __esm({
     init_discovery();
     init_picker();
     init_import_cwd_prompt();
+    init_import_action_prompt();
     init_screen();
     init_input();
     init_attachments();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hydra-acp/cli",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "description": "Multi-client ACP session daemon: spawn agents, attach over WSS, multiplex sessions across editors.",
   "license": "MIT",
   "type": "module",