@hydra-acp/cli 0.1.46 → 0.1.48

package/dist/cli.js

@@ -4916,6 +4916,25 @@ function buildCombinedHistory(global, session) {
   const filteredGlobal = global.filter((e) => !sessionSet.has(e));
   return [...filteredGlobal, ...session];
 }
+function mergeReplayedEntries(existing, replayed, cap = HISTORY_CAP) {
+  if (replayed.length === 0) {
+    return existing;
+  }
+  const seen = new Set(existing);
+  let out = existing;
+  for (const raw of replayed) {
+    const trimmed = raw.replace(/\n+$/, "");
+    if (trimmed.length === 0) {
+      continue;
+    }
+    if (seen.has(trimmed)) {
+      continue;
+    }
+    seen.add(trimmed);
+    out = appendEntry(out, trimmed, cap);
+  }
+  return out;
+}
 var HISTORY_CAP;
 var init_history = __esm({
   "src/tui/history.ts"() {
@@ -6388,7 +6407,7 @@ var init_input = __esm({
           case "ctrl-r":
             return this.startHistorySearch();
           case "ctrl-s":
-            return [];
+            return this.amend();
           case "ctrl-u":
             this.killLine();
             return [];
@@ -6906,22 +6925,30 @@ var init_input = __esm({
         this.clearBuffer();
         return [{ type: "send", text, planMode, attachments }];
       }
-      // Shift+Enter: amend the in-flight turn. Editing a queued slot
-      // delegates to the existing queue-edit / queue-remove path — Shift+Enter
-      // there has no special meaning since the entry is already queued (not
-      // running). With an empty draft and no attachments we emit nothing
-      // (no-op). Otherwise emit an "amend" effect; the app decides whether
-      // to route through amend_prompt or fall through to a regular send.
+      // Shift+Enter (also Ctrl+Enter / ^S): amend the in-flight turn.
+      // While editing a queued slot, this is the "drop and amend" chord:
+      // emit queue-remove for the slot AND amend with the loaded (possibly
+      // edited) text, so the queued prompt becomes the amendment for the
+      // running turn in a single keystroke. Empty buffer + no attachments
+      // on a slot collapses to just queue-remove (matches empty-Enter).
+      // Outside queue editing, an empty draft is a no-op. The app decides
+      // whether to route the amend through amend_prompt or fall through to
+      // a regular send when no turn is in flight.
       amend() {
         const text = this.bufferText();
         if (this.queueIndex >= 0 && this.queueIndex < this.queue.length) {
           const index = this.queueIndex;
+          const planMode2 = this.planMode;
           const attachments2 = [...this.attachments];
+          const empty = text.trim().length === 0 && attachments2.length === 0;
           this.clearBuffer();
-          if (text.trim().length === 0) {
+          if (empty) {
             return [{ type: "queue-remove", index }];
           }
-          return [{ type: "queue-edit", index, text, attachments: attachments2 }];
+          return [
+            { type: "queue-remove", index },
+            { type: "amend", text, planMode: planMode2, attachments: attachments2 }
+          ];
         }
         if (text.trim().length === 0 && this.attachments.length === 0) {
           return [];
@@ -9956,6 +9983,9 @@ uncaught: ${err.stack ?? err.message}
 });
 
 // src/tui/picker.ts
+function createPickerPrefs() {
+  return { filters: { cwdOnly: false, hostFilter: "__local" } };
+}
 async function pickSession(term, opts) {
   process.stdout.write("\x1B[<u");
   process.stdout.write("\x1B[?2004l");
@@ -9981,18 +10011,25 @@ async function pickSession(term, opts) {
       return b.updatedAt.slice(0, 16).localeCompare(a.updatedAt.slice(0, 16));
     });
   };
-  let cwdOnly = false;
-  let hostFilter = "__local";
-  if (opts.currentSessionId !== void 0) {
+  const prefs = opts.prefs ?? createPickerPrefs();
+  if (opts.prefs === void 0 && opts.currentSessionId !== void 0) {
     const current = opts.sessions.find(
       (s) => s.sessionId === opts.currentSessionId
     );
     if (current?.importedFromMachine) {
-      hostFilter = "__all";
+      prefs.filters.hostFilter = "__all";
     }
   }
   let allSessions = sortSessions(opts.sessions);
-  let visible = filterByHost(allSessions, hostFilter);
+  const applyPrefsFilters = (sessions) => {
+    let base = sessions;
+    if (prefs.filters.cwdOnly) {
+      base = base.filter((s) => s.cwd === opts.cwd);
+    }
+    base = filterByHost(base, prefs.filters.hostFilter);
+    return base;
+  };
+  let visible = applyPrefsFilters(allSessions);
   let rows = visible.map((s) => toRow(s, Date.now()));
   let widths = computeWidths(rows);
   let total = 1 + visible.length;
@@ -10060,11 +10097,7 @@ async function pickSession(term, opts) {
     computeLayout();
   };
   const applyFilter = () => {
-    let base = allSessions;
-    if (cwdOnly) {
-      base = base.filter((s) => s.cwd === opts.cwd);
-    }
-    base = filterByHost(base, hostFilter);
+    const base = applyPrefsFilters(allSessions);
     if (searchActive && searchTerm.length > 0) {
       visible = base.filter((s) => matchesSearch(s, searchTerm));
     } else {
@@ -10150,12 +10183,12 @@ async function pickSession(term, opts) {
     const above = scrollOffset;
     const below = Math.max(0, visible.length - scrollOffset - viewportSize);
     const parts = [];
-    if (cwdOnly) {
+    if (prefs.filters.cwdOnly) {
       parts.push("cwd-only");
     }
-    if (hostFilter !== "__all") {
+    if (prefs.filters.hostFilter !== "__all") {
       parts.push(
-        hostFilter === "__local" ? "host: local" : `host: ${hostFilter}`
+        prefs.filters.hostFilter === "__local" ? "host: local" : `host: ${prefs.filters.hostFilter}`
       );
     }
     if (above > 0) {
@@ -10785,7 +10818,7 @@ ${cells}`;
         }
         if (name === "o" || name === "O") {
           const keepId = selectedIdx > 0 ? visible[selectedIdx - 1]?.sessionId : void 0;
-          cwdOnly = !cwdOnly;
+          prefs.filters.cwdOnly = !prefs.filters.cwdOnly;
           applyFilter();
           if (keepId !== void 0) {
             const idx = visible.findIndex((s) => s.sessionId === keepId);
@@ -10799,7 +10832,10 @@ ${cells}`;
         }
         if (name === "h" || name === "H") {
           const keepId = selectedIdx > 0 ? visible[selectedIdx - 1]?.sessionId : void 0;
-          hostFilter = nextHostFilter(hostFilter, allSessions);
+          prefs.filters.hostFilter = nextHostFilter(
+            prefs.filters.hostFilter,
+            allSessions
+          );
           applyFilter();
           if (keepId !== void 0) {
             const idx = visible.findIndex((s) => s.sessionId === keepId);
@@ -11198,7 +11234,7 @@ async function promptForImportCwd(term, session, opts = {}) {
     const contentHeight = 9;
     layout = drawBox(term, {
       contentHeight,
-      title: "Run locally \u2014 choose cwd"
+      title: "Fork locally \u2014 choose cwd"
     });
     const innerW = layout.contentW;
     const headerRows = [
@@ -11437,7 +11473,10 @@ async function promptForImportAction(term, session) {
   const shortId2 = stripHydraSessionPrefix(session.sessionId);
   const fromMachine = session.importedFromMachine ?? "another machine";
   const originalCwd = shortenHomePath(session.cwd);
-  let selected = 0;
+  let selected = ACTION_CHOICES.findIndex((c) => c.key === "view");
+  if (selected < 0) {
+    selected = 0;
+  }
   const render = () => {
     const choiceRows = ACTION_CHOICES.length * 2;
     const contentHeight = 7 + choiceRows + 2;
@@ -11482,7 +11521,7 @@ async function promptForImportAction(term, session) {
     }
     row++;
     term.moveTo(layout.contentX, layout.contentY + row);
-    term.dim.noFormat(" \u2191/\u2193 navigate \xB7 Enter select \xB7 r/v jump \xB7 Esc back");
+    term.dim.noFormat(" \u2191/\u2193 navigate \xB7 Enter select \xB7 f/v jump \xB7 Esc back");
     return layout;
   };
   render();
@@ -11583,10 +11622,10 @@ var init_import_action_prompt = __esm({
     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: "fork-local",
+        label: "Fork locally",
+        hotkey: "f",
+        description: "spawn a local fork \u2014 original imported copy stays as-is"
       },
       {
         key: "view",
@@ -12460,6 +12499,7 @@ async function runTuiApp(opts) {
   const viewPrefs = {
     showThoughts: config.tui.showThoughts
   };
+  const pickerPrefs = createPickerPrefs();
   let altScreenEngaged = false;
   const enterAltScreen = () => {
     if (altScreenEngaged) {
@@ -12487,7 +12527,15 @@ async function runTuiApp(opts) {
   let nextOpts = opts;
   try {
     while (nextOpts !== null) {
-      nextOpts = await runSession(term, config, target, nextOpts, exitHint, viewPrefs);
+      nextOpts = await runSession(
+        term,
+        config,
+        target,
+        nextOpts,
+        exitHint,
+        viewPrefs,
+        pickerPrefs
+      );
     }
   } finally {
     leaveAltScreen();
@@ -12507,8 +12555,8 @@ async function runTuiApp(opts) {
     );
   }
 }
-async function runSession(term, config, target, opts, exitHint, viewPrefs) {
-  const ctx = await resolveSession(term, config, target, opts);
+async function runSession(term, config, target, opts, exitHint, viewPrefs, pickerPrefs) {
+  const ctx = await resolveSession(term, config, target, opts, pickerPrefs);
   if (!ctx) {
     term.grabInput(false);
     return null;
@@ -13017,6 +13065,7 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs) {
     history: buildCombinedHistory(globalHistory, history)
   });
   dispatcherRef = dispatcher;
+  let livePeerHistoryRecording = false;
   const recordHistoryEntry = (entry) => {
     const trimmed = entry.replace(/\n+$/, "");
     if (trimmed.length === 0) {
@@ -13355,10 +13404,10 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs) {
     const amendDesc = "amend the in-flight turn (cancel + replace)";
     const head = config.tui.defaultEnterAction === "amend" ? [
       ["Enter", amendDesc],
-      ["Ctrl+Enter / Shift+Enter", enqueueDesc]
+      ["Ctrl+Enter / Shift+Enter / ^S", enqueueDesc]
     ] : [
       ["Enter", enqueueDesc],
-      ["Ctrl+Enter / Shift+Enter", amendDesc]
+      ["Ctrl+Enter / Shift+Enter / ^S", amendDesc]
     ];
     return [...head, ...HELP_ENTRIES_TAIL];
   };
@@ -13426,7 +13475,8 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs) {
         sessions,
         config,
         target,
-        currentSessionId: resolvedSessionId
+        currentSessionId: resolvedSessionId,
+        prefs: pickerPrefs
       });
       if (choice2.kind === "abort") {
         screen.start({ skipFullscreen: true });
@@ -14256,6 +14306,9 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs) {
       return;
     }
     if (event.kind === "user-text") {
+      if (livePeerHistoryRecording) {
+        recordHistoryEntry(event.text);
+      }
       closeAgentText();
       if (toolsBlockStartedAt !== null) {
         toolsBlockEndedAt = Date.now();
@@ -14388,6 +14441,12 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs) {
   };
   const buffered = bufferedEvents;
   bufferedEvents = [];
+  const replayedPromptTexts = [];
+  for (const event of buffered) {
+    if (event.kind === "user-text" && typeof event.text === "string") {
+      replayedPromptTexts.push(event.text);
+    }
+  }
   screen.pauseRepaint();
   try {
     for (const event of buffered) {
@@ -14396,6 +14455,15 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs) {
   } finally {
     screen.resumeRepaint();
   }
+  if (replayedPromptTexts.length > 0) {
+    const merged = mergeReplayedEntries(history, replayedPromptTexts);
+    if (merged !== history) {
+      history = merged;
+      dispatcher.setHistory(buildCombinedHistory(globalHistory, history));
+      saveHistory(historyFile, history).catch(() => void 0);
+    }
+  }
+  livePeerHistoryRecording = true;
   if (initialTurnStartedAt !== void 0 && pendingTurns > 0) {
     sessionBusySince = initialTurnStartedAt;
     screen.setBanner({
@@ -14550,7 +14618,7 @@ connection lost: ${err.message}
   }
   return await sessionDone;
 }
-async function resolveSession(term, config, target, opts) {
+async function resolveSession(term, config, target, opts, pickerPrefs) {
   const cwd = opts.cwd ?? process.cwd();
   if (opts.sessionId) {
     const ctx = {
@@ -14586,7 +14654,8 @@ async function resolveSession(term, config, target, opts) {
       cwd,
       sessions,
       config,
-      target
+      target,
+      prefs: pickerPrefs
     });
     if (choice.kind === "abort") {
       return null;
@@ -14834,7 +14903,7 @@ var init_app = __esm({
       ["^V", "paste image from clipboard"],
       ["^O", "expand / collapse tools block"],
       null,
-      ["^R / ^S", "history reverse / forward search"],
+      ["^R", "history reverse search (^S walks forward once engaged)"],
       ["PgUp / PgDn", "scroll scrollback"],
       ["Mouse wheel", "scroll scrollback (when mouse capture is on)"],
       ["^X", "toggle mouse capture (wheel scroll vs. text selection)"],

package/package.json

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