@hydra-acp/cli 0.1.46 → 0.1.47

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 [];
@@ -13017,6 +13044,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 +13383,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];
   };
@@ -14256,6 +14284,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 +14419,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 +14433,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({
@@ -14834,7 +14880,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.47",
   "description": "Multi-client ACP session daemon: spawn agents, attach over WSS, multiplex sessions across editors.",
   "license": "MIT",
   "type": "module",