@hydra-acp/cli 0.1.54 → 0.1.55

package/dist/cli.js

@@ -407,6 +407,17 @@ var init_config = __esm({
       // installs can grow past this — it's enforced at load time and per
       // append in memory.
       promptHistoryMaxEntries: z.number().int().positive().default(2e3),
+      // Cap on tool rows shown inside the collapsed tools block. When more
+      // tools have fired than the cap, only the most recent N are visible
+      // and the header advertises "^O expand" so the user can see the rest.
+      // 0 disables the cap entirely — every tool row stays visible.
+      maxToolItems: z.number().int().nonnegative().default(5),
+      // Cap on plan entries rendered before the formatter switches to a
+      // sliding window around the active (in_progress / first pending)
+      // entry. Counters in the header summarize what's done and what's
+      // left when truncation kicks in. 0 disables the cap — every plan
+      // entry is rendered.
+      maxPlanItems: z.number().int().nonnegative().default(5),
       // How edit-style tool calls (Edit, Write, str_replace) render in
       // scrollback, *in addition to* the normal tool row inside the tools
       // block.
@@ -495,6 +506,8 @@ var init_config = __esm({
         defaultEnterAction: "amend",
         showThoughts: true,
         promptHistoryMaxEntries: 2e3,
+        maxToolItems: 5,
+        maxPlanItems: 5,
         showFileUpdates: "edit"
       })
     });
@@ -6575,7 +6588,7 @@ var init_session_row = __esm({
 import chalk2 from "chalk";
 import { highlight, supportsLanguage } from "cli-highlight";
 import stringWidth from "string-width";
-function formatEvent(event) {
+function formatEvent(event, options = {}) {
   switch (event.kind) {
     case "user-text": {
       const lines = formatBlock(
@@ -6610,7 +6623,7 @@ function formatEvent(event) {
     case "exit-plan-mode":
       return [];
     case "plan":
-      return formatPlan(event);
+      return formatPlan(event, options.maxPlanItems ?? PLAN_VISIBLE_LIMIT);
     case "mode-changed":
       return [
         {
@@ -7335,7 +7348,27 @@ function exitPlanFooter(status) {
       return null;
   }
 }
-function formatPlan(event) {
+function pickPlanWindow(entries, limit) {
+  const total = entries.length;
+  if (limit <= 0 || total <= limit) {
+    return { start: 0, end: total };
+  }
+  const inProgressIdx = entries.findIndex(
+    (e) => (e.status ?? "pending") === "in_progress"
+  );
+  const firstPendingIdx = entries.findIndex(
+    (e) => (e.status ?? "pending") === "pending"
+  );
+  const anchor = inProgressIdx >= 0 ? inProgressIdx : firstPendingIdx >= 0 ? firstPendingIdx : total - 1;
+  const aboveSlots = Math.floor((limit - 1) / 2);
+  let start = Math.max(0, anchor - aboveSlots);
+  let end = Math.min(total, start + limit);
+  if (end - start < limit) {
+    start = Math.max(0, end - limit);
+  }
+  return { start, end };
+}
+function formatPlan(event, limit) {
   const stopped = event.stopped === true;
   const amended = event.amended === true;
   const stoppedStyle = amended ? "tool-status-cancelled" : "tool-status-fail";
@@ -7343,21 +7376,43 @@ function formatPlan(event) {
     (e) => (e.status ?? "pending") === "completed"
   );
   const headerStyle = allComplete ? "plan-done" : stopped ? stoppedStyle : "plan";
+  const total = event.entries.length;
+  const { start: winStart, end: winEnd } = pickPlanWindow(
+    event.entries,
+    limit
+  );
+  const truncated = winEnd - winStart < total;
+  let headerBody = "Plan";
+  if (truncated) {
+    let doneCount = 0;
+    for (const e of event.entries) {
+      if ((e.status ?? "pending") === "completed") {
+        doneCount += 1;
+      }
+    }
+    const leftCount = total - doneCount;
+    headerBody = leftCount === 0 ? `Plan \xB7 ${doneCount} done` : `Plan \xB7 ${doneCount} done \xB7 ${leftCount} left`;
+  }
   const lines = [
     {
       prefix: "\u25A3 ",
       prefixStyle: headerStyle,
-      body: "Plan",
+      body: headerBody,
       bodyStyle: headerStyle
     }
   ];
-  for (const entry of event.entries) {
+  for (let i = winStart; i < winEnd; i++) {
+    const entry = event.entries[i];
+    if (!entry) {
+      continue;
+    }
     const status = entry.status ?? "pending";
     const marker = status === "completed" ? "[x]" : status === "in_progress" ? "[~]" : "[ ]";
     const style = status === "completed" ? "plan-done" : status === "in_progress" ? stopped ? "plan-pending" : "plan" : "plan-pending";
+    const content = entry.content.replace(/^\d+\/\d+\s+/, "").replace(/\s*\(?\d+\/\d+\)?\s*$/, "");
     lines.push({
       prefix: "  ",
-      body: `${marker} ${entry.content}`,
+      body: `${marker} ${content}`,
       bodyStyle: style
     });
   }
@@ -7383,7 +7438,7 @@ function toolStatusStyle(status) {
       return "tool-status-pending";
   }
 }
-var TABLE_MIN_COL, TABLE_PREFIX_WIDTH, TABLE_SEP_WIDTH, highlightChalk, HIGHLIGHT_THEME, EDIT_DIFF_MAX_LINES;
+var TABLE_MIN_COL, TABLE_PREFIX_WIDTH, TABLE_SEP_WIDTH, highlightChalk, HIGHLIGHT_THEME, EDIT_DIFF_MAX_LINES, PLAN_VISIBLE_LIMIT;
 var init_format = __esm({
   "src/tui/format.ts"() {
     "use strict";
@@ -7418,6 +7473,7 @@ var init_format = __esm({
       name: highlightChalk.cyanBright
     };
     EDIT_DIFF_MAX_LINES = 40;
+    PLAN_VISIBLE_LIMIT = 5;
   }
 });
 
@@ -9579,6 +9635,13 @@ var init_screen = __esm({
       // current line count so subsequent upserts splice in-place — adjusting
       // the starts of any later keyed blocks if the size changes.
       keyedBlocks = /* @__PURE__ */ new Map();
+      // When set, the named block is kept at the bottom of scrollback: any
+      // subsequent append/upsert that lands new content after it triggers a
+      // float that slides the sticky block back to the end. Used so the
+      // agent's plan stays anchored at the bottom of the current turn even
+      // as tool calls / agent text accumulate below it. Surviving past
+      // `clearKey(stickyBottomKey)` is a no-op since the block is gone.
+      stickyBottomKey = null;
       streamingActive = false;
       // When true, lines with bodyStyle="thought" are skipped at draw time
       // (they remain in `this.lines` so toggling back on reveals them again).
@@ -10103,6 +10166,7 @@ uncaught: ${err.stack ?? err.message}
         this.lines.push(...lines);
         this.trackLines(lines);
         this.adjustScrollForRowChange(this.wrappedRowsOfMany(lines));
+        this.moveStickyToEnd();
         this.trimScrollback();
         this.scheduleRepaint();
       }
@@ -10111,6 +10175,7 @@ uncaught: ${err.stack ?? err.message}
         this.lines.push(line);
         this.trackLine(line);
         this.adjustScrollForRowChange(this.wrappedRowsOf(line));
+        this.moveStickyToEnd();
         this.trimScrollback();
         this.scheduleRepaint();
       }
@@ -10233,6 +10298,9 @@ uncaught: ${err.stack ?? err.message}
           this.streamingActive = false;
         }
         this.adjustScrollForRowChange(rowDelta);
+        if (key !== this.stickyBottomKey) {
+          this.moveStickyToEnd();
+        }
         this.trimScrollback();
         this.scheduleRepaint();
       }
@@ -10291,6 +10359,7 @@ uncaught: ${err.stack ?? err.message}
         }
         this.streamingActive = true;
         this.adjustScrollForRowChange(rowDelta);
+        this.moveStickyToEnd();
         this.trimScrollback();
         this.scheduleRepaint();
       }
@@ -10490,6 +10559,48 @@ uncaught: ${err.stack ?? err.message}
       clearKey(key) {
         this.keyedBlocks.delete(key);
       }
+      // Mark `key` as the sticky-bottom block. While set, whenever new content
+      // lands after the block's lines (appendLines / appendStreaming / a new
+      // upserted block) the screen floats this block back to the end so it
+      // remains the last thing in scrollback. Pass null to disable. The key
+      // doesn't need to refer to an existing block — the float is a no-op
+      // until a block with that key is upserted.
+      setStickyBottomKey(key) {
+        this.stickyBottomKey = key;
+        this.moveStickyToEnd();
+        this.scheduleRepaint();
+      }
+      // If a sticky-bottom block is configured and isn't already at the tail,
+      // splice it out and re-push it at the end. Indices of the other keyed
+      // blocks that sat after the sticky block shift up by sticky.count to
+      // stay aligned with the lines array. Resets streamingActive because the
+      // last line is now part of the sticky block — extending the buried
+      // streaming line in place would corrupt the sticky content.
+      moveStickyToEnd() {
+        if (this.stickyBottomKey === null) {
+          return;
+        }
+        const sticky = this.keyedBlocks.get(this.stickyBottomKey);
+        if (!sticky) {
+          return;
+        }
+        const stickyEnd = sticky.start + sticky.count;
+        if (stickyEnd >= this.lines.length) {
+          return;
+        }
+        const stickyLines = this.lines.splice(sticky.start, sticky.count);
+        for (const [k, range] of this.keyedBlocks) {
+          if (k === this.stickyBottomKey) {
+            continue;
+          }
+          if (range.start >= stickyEnd) {
+            range.start -= sticky.count;
+          }
+        }
+        sticky.start = this.lines.length;
+        this.lines.push(...stickyLines);
+        this.streamingActive = false;
+      }
       // Splice a keyed block's lines out of scrollback entirely and drop the
       // key. Used when a placeholder block (e.g. "thinking…" with no tool
       // calls ever fired) shouldn't be kept as a historical artifact after
@@ -10598,18 +10709,36 @@ uncaught: ${err.stack ?? err.message}
         this.repaint();
       }
       // Adds a blank spacer line to the scrollback, but only if scrollback is
-      // non-empty and the last line isn't already a spacer. Idempotent so callers
-      // can request it freely at turn boundaries.
+      // non-empty and the last "real" line isn't already a spacer. Idempotent
+      // so callers can request it freely at turn boundaries. When a sticky
+      // block sits at the tail, the separator is inserted directly above it
+      // and the "is there already a separator" check looks at the line above
+      // the sticky block instead of the array tail. The sticky block's own
+      // first line (if blank) doesn't count: that blank floats with the
+      // plan to its eventual tail position, and the separator we're adding
+      // here is for whatever content is *about* to be appended (which will
+      // land at sticky.start and push the plan back via moveStickyToEnd).
       ensureSeparator() {
         if (this.lines.length === 0) {
           return;
         }
-        const last = this.lines[this.lines.length - 1];
-        if (last && last.body === "" && (last.prefix === void 0 || last.prefix === "")) {
+        const sticky = this.stickyBottomKey !== null ? this.keyedBlocks.get(this.stickyBottomKey) : void 0;
+        const stickyAtEnd = sticky !== void 0 && sticky.start + sticky.count === this.lines.length;
+        const probeIdx = stickyAtEnd ? sticky.start - 1 : this.lines.length - 1;
+        if (probeIdx < 0) {
+          return;
+        }
+        const probe = this.lines[probeIdx];
+        if (probe && probe.body === "" && (probe.prefix === void 0 || probe.prefix === "")) {
           return;
         }
         const sep2 = { body: "" };
-        this.lines.push(sep2);
+        if (stickyAtEnd) {
+          this.lines.splice(sticky.start, 0, sep2);
+          sticky.start += 1;
+        } else {
+          this.lines.push(sep2);
+        }
         this.trackLine(sep2);
         this.streamingActive = false;
         this.adjustScrollForRowChange(this.wrappedRowsOf(sep2));
@@ -12217,6 +12346,11 @@ async function pickSession(term, opts) {
   let renameBuffer = "";
   let transientStatus = null;
   const composer = new InputDispatcher({ history: [] });
+  const composerHistoryCap = opts.config.tui.promptHistoryMaxEntries;
+  loadHistory(paths.globalTuiHistoryFile()).then((entries) => {
+    const capped = entries.length > composerHistoryCap ? entries.slice(entries.length - composerHistoryCap) : entries;
+    composer.setHistory(capped);
+  }).catch(() => void 0);
   let termHeight = readTermHeight2(term);
   let termWidth = readTermWidth2(term);
   let viewportSize = 0;
@@ -13461,8 +13595,10 @@ ${cells}`;
           return;
         }
         if (name === "DOWN") {
+          const cs = composer.state();
+          const inWalk = cs.historyIndex !== -1 || cs.queueIndex !== -1;
           const atBottom = composerVisualRows.length === 0 || composerCursorRow === composerVisualRows.length - 1;
-          if (atBottom && visible.length > 0) {
+          if (!inWalk && atBottom && visible.length > 0) {
             move(1);
             return;
           }
@@ -13865,6 +14001,7 @@ var init_picker = __esm({
     init_session();
     init_hydra_version();
     init_discovery();
+    init_history();
     init_input();
     init_screen();
     init_import_action_prompt();
@@ -15231,6 +15368,7 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
     }
   });
   screenRef = screen;
+  screen.setStickyBottomKey("plan");
   const builtinCommands = [
     { name: "/help", description: "Show TUI built-in commands" },
     { name: "/quit", description: "Exit the TUI" },
@@ -16269,7 +16407,9 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
   let toolsBlockEndedAt = null;
   let toolsBlockStopReason = null;
   let lastPlanEvent = null;
-  const TOOLS_COLLAPSED_LIMIT = 5;
+  const TOOLS_COLLAPSED_LIMIT = config.tui.maxToolItems;
+  const PLAN_VISIBLE_LIMIT2 = config.tui.maxPlanItems;
+  const formatOptions = { maxPlanItems: PLAN_VISIBLE_LIMIT2 };
   let agentBuffer = "";
   let agentKey = null;
   let agentSeq = 0;
@@ -16336,7 +16476,8 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
       return;
     }
     const total = toolCallOrder.length;
-    const visibleIds = toolsExpanded ? toolCallOrder : toolCallOrder.slice(Math.max(0, total - TOOLS_COLLAPSED_LIMIT));
+    const capped = TOOLS_COLLAPSED_LIMIT > 0;
+    const visibleIds = !capped || toolsExpanded ? toolCallOrder : toolCallOrder.slice(Math.max(0, total - TOOLS_COLLAPSED_LIMIT));
     const hidden = total - visibleIds.length;
     const inProgress = toolsBlockEndedAt === null;
     const end = toolsBlockEndedAt ?? Date.now();
@@ -16355,7 +16496,7 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
       const noun = total === 1 ? "tool" : "tools";
       const timing = stoppedReason !== null ? stoppedLabel : inProgress ? formatElapsed(elapsed) : `took ${formatElapsed(elapsed)}`;
       const parts = [`${total} ${noun}`, timing];
-      if (inProgress) {
+      if (inProgress && capped) {
         if (hidden > 0) {
           parts.push(`${hidden} hidden \u2014 ^O expand`);
         } else if (toolsExpanded && total > TOOLS_COLLAPSED_LIMIT) {
@@ -16581,10 +16722,14 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
       closeAgentText();
       closeThought();
       lastPlanEvent = event;
-      const lines = formatEvent(event);
+      const lines = formatEvent(event, formatOptions);
       if (lines.length > 0) {
-        screen.upsertLines("plan", lines);
+        screen.upsertLines("plan", [{ body: "" }, ...lines]);
       }
+      const allComplete = event.entries.length > 0 && event.entries.every(
+        (e) => (e.status ?? "pending") === "completed"
+      );
+      screen.setStickyBottomKey(allComplete ? null : "plan");
       return;
     }
     if (event.kind === "tool-call-update") {
@@ -16620,17 +16765,21 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
         effectiveStopReason = "error";
       }
       if (lastPlanEvent !== null && effectiveStopReason !== void 0 && effectiveStopReason !== "end_turn") {
-        const lines = formatEvent({
-          ...lastPlanEvent,
-          stopped: true,
-          amended: event.amended === true
-        });
+        const lines = formatEvent(
+          {
+            ...lastPlanEvent,
+            stopped: true,
+            amended: event.amended === true
+          },
+          formatOptions
+        );
         if (lines.length > 0) {
-          screen.upsertLines("plan", lines);
+          screen.upsertLines("plan", [{ body: "" }, ...lines]);
         }
       }
       lastPlanEvent = null;
       screen.clearKey("plan");
+      screen.setStickyBottomKey("plan");
       if (toolsBlockStartedAt !== null) {
         toolsBlockEndedAt = Date.now();
         toolsBlockStopReason = effectiveStopReason ?? null;

package/dist/index.d.ts

@@ -153,6 +153,8 @@ declare const HydraConfig: z.ZodObject<{
         defaultEnterAction: z.ZodDefault<z.ZodEnum<["enqueue", "amend"]>>;
         showThoughts: z.ZodDefault<z.ZodBoolean>;
         promptHistoryMaxEntries: z.ZodDefault<z.ZodNumber>;
+        maxToolItems: z.ZodDefault<z.ZodNumber>;
+        maxPlanItems: z.ZodDefault<z.ZodNumber>;
         showFileUpdates: z.ZodDefault<z.ZodEnum<["none", "edit", "diff"]>>;
     }, "strip", z.ZodTypeAny, {
         repaintThrottleMs: number;
@@ -164,6 +166,8 @@ declare const HydraConfig: z.ZodObject<{
         defaultEnterAction: "enqueue" | "amend";
         showThoughts: boolean;
         promptHistoryMaxEntries: number;
+        maxToolItems: number;
+        maxPlanItems: number;
         showFileUpdates: "diff" | "none" | "edit";
     }, {
         repaintThrottleMs?: number | undefined;
@@ -175,6 +179,8 @@ declare const HydraConfig: z.ZodObject<{
         defaultEnterAction?: "enqueue" | "amend" | undefined;
         showThoughts?: boolean | undefined;
         promptHistoryMaxEntries?: number | undefined;
+        maxToolItems?: number | undefined;
+        maxPlanItems?: number | undefined;
         showFileUpdates?: "diff" | "none" | "edit" | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
@@ -188,6 +194,8 @@ declare const HydraConfig: z.ZodObject<{
         defaultEnterAction: "enqueue" | "amend";
         showThoughts: boolean;
         promptHistoryMaxEntries: number;
+        maxToolItems: number;
+        maxPlanItems: number;
         showFileUpdates: "diff" | "none" | "edit";
     };
     daemon: {
@@ -240,6 +248,8 @@ declare const HydraConfig: z.ZodObject<{
         defaultEnterAction?: "enqueue" | "amend" | undefined;
         showThoughts?: boolean | undefined;
         promptHistoryMaxEntries?: number | undefined;
+        maxToolItems?: number | undefined;
+        maxPlanItems?: number | undefined;
         showFileUpdates?: "diff" | "none" | "edit" | undefined;
     } | undefined;
     daemon?: {

package/dist/index.js

@@ -315,6 +315,17 @@ var TuiConfig = z.object({
   // installs can grow past this — it's enforced at load time and per
   // append in memory.
   promptHistoryMaxEntries: z.number().int().positive().default(2e3),
+  // Cap on tool rows shown inside the collapsed tools block. When more
+  // tools have fired than the cap, only the most recent N are visible
+  // and the header advertises "^O expand" so the user can see the rest.
+  // 0 disables the cap entirely — every tool row stays visible.
+  maxToolItems: z.number().int().nonnegative().default(5),
+  // Cap on plan entries rendered before the formatter switches to a
+  // sliding window around the active (in_progress / first pending)
+  // entry. Counters in the header summarize what's done and what's
+  // left when truncation kicks in. 0 disables the cap — every plan
+  // entry is rendered.
+  maxPlanItems: z.number().int().nonnegative().default(5),
   // How edit-style tool calls (Edit, Write, str_replace) render in
   // scrollback, *in addition to* the normal tool row inside the tools
   // block.
@@ -403,6 +414,8 @@ var HydraConfig = z.object({
     defaultEnterAction: "amend",
     showThoughts: true,
     promptHistoryMaxEntries: 2e3,
+    maxToolItems: 5,
+    maxPlanItems: 5,
     showFileUpdates: "edit"
   })
 });

package/package.json

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