flavor-code 1.4.0-beta.10 → 1.4.0-beta.12

package/dist/{app-SMIB6P23.js → app-F44LTVBV.js}

@@ -19,9 +19,9 @@ import {
   thinkingWindow,
   transcriptReducer,
   withTimeout
-} from "./chunk-BYHO2CA5.js";
+} from "./chunk-AOOVLNX4.js";
 import "./chunk-N5MXHJKD.js";
-import "./chunk-EXOSMO57.js";
+import "./chunk-7YFHRORG.js";
 import {
   Box_default,
   ClockContext,
@@ -34,13 +34,15 @@ import {
   instances_default,
   osc,
   shiftAnchor,
+  stringWidth,
   stripAnsi,
   useStdout,
   use_app_default,
   use_input_default
-} from "./chunk-XMRKRPNC.js";
+} from "./chunk-VMQWXQEC.js";
 import {
-  execFileNoThrow
+  execFileNoThrow,
+  getGraphemeSegmenter
 } from "./chunk-ZJCAQXA7.js";
 import "./chunk-S32JRDZK.js";
 
@@ -969,7 +971,13 @@ function wrapPromptInput(input, codePointCursor, options) {
 // src/ui/task-progress.tsx
 import { useRef as useRef3 } from "react";
 import { Fragment as Fragment2, jsx as jsx3, jsxs as jsxs2 } from "react/jsx-runtime";
-function TaskStatusLine({ block, interactive }) {
+function TaskStatusLine({
+  block,
+  interactive,
+  textWidth,
+  maxTextLines,
+  showRoleBadge = true
+}) {
   const running = block.state === "running";
   const { stdout } = useStdout();
   const foreground = interactive && (block.activity === "model" || block.task?.role === "main");
@@ -982,6 +990,8 @@ function TaskStatusLine({ block, interactive }) {
   const elapsed = block.startedAt === void 0 ? startedAt.current === void 0 ? 0 : Math.max(0, time - startedAt.current) : Math.max(0, Date.now() - block.startedAt);
   const presentation = statusPresentation(block, elapsed, foreground);
   const { metaColor, metaLabel, statusLabel, statusColor, text } = presentation;
+  const badge = showRoleBadge ? presentation.badge : void 0;
+  const badgeColor = presentation.badgeColor;
   let before = text;
   let after = "";
   if (statusLabel !== void 0) {
@@ -1007,14 +1017,26 @@ function TaskStatusLine({ block, interactive }) {
     thinkingScroll.current = { start: state.start, lastTime: time };
     return state.text;
   })() : void 0;
+  const textSegments = [
+    { text: `${presentation.glyph} `, color: presentation.color },
+    ...badge ? [{ text: `${badge} `, color: badgeColor }] : [],
+    { text: before, color: presentation.color },
+    ...statusLabel === void 0 ? [] : [
+      { text: " \xB7 ", color: presentation.color },
+      { text: statusLabel, color: statusColor ?? presentation.color }
+    ],
+    ...after ? [{ text: after, color: presentation.color }] : [],
+    ...metaLabel === void 0 ? [] : [{ text: `  ${metaLabel}`, color: metaColor ?? "ansi:blackBright" }]
+  ];
+  const boundedText = textWidth === void 0 || maxTextLines === void 0 ? void 0 : limitTaskTextSegments(textSegments, textWidth, maxTextLines).segments;
   return /* @__PURE__ */ jsxs2(Box_default, { flexDirection: "column", width: "100%", children: [
-    /* @__PURE__ */ jsxs2(Box_default, { ref, flexDirection: "row", children: [
+    /* @__PURE__ */ jsx3(Box_default, { ref, flexDirection: "row", width: "100%", children: boundedText === void 0 ? /* @__PURE__ */ jsxs2(Fragment2, { children: [
       /* @__PURE__ */ jsxs2(Text, { ...presentation.color === void 0 ? {} : { color: presentation.color }, children: [
         presentation.glyph,
         " "
       ] }),
-      presentation.badge ? /* @__PURE__ */ jsxs2(Text, { color: presentation.badgeColor, children: [
-        presentation.badge,
+      badge ? /* @__PURE__ */ jsxs2(Text, { color: badgeColor, children: [
+        badge,
         " "
       ] }) : null,
       /* @__PURE__ */ jsx3(Text, { ...presentation.color === void 0 ? {} : { color: presentation.color }, children: before }),
@@ -1027,10 +1049,69 @@ function TaskStatusLine({ block, interactive }) {
         "  ",
         metaLabel
       ] })
-    ] }),
+    ] }) : /* @__PURE__ */ jsx3(Text, { children: boundedText.map((segment, index) => /* @__PURE__ */ jsx3(Text, { ...segment.color === void 0 ? {} : { color: segment.color }, children: segment.text }, index)) }) }),
     thinkingLine === void 0 ? null : /* @__PURE__ */ jsx3(ThinkingLineView, { text: thinkingLine })
   ] });
 }
+function limitTaskTextSegments(segments, width, maxLines = 3) {
+  const lineWidth = Math.max(3, Math.floor(width));
+  const lineLimit = Math.max(1, Math.floor(maxLines));
+  const lines = [[]];
+  const widths = [0];
+  let truncated = false;
+  outer: for (let segmentIndex = 0; segmentIndex < segments.length; segmentIndex += 1) {
+    const segment = segments[segmentIndex];
+    for (const { segment: grapheme } of getGraphemeSegmenter().segment(segment.text)) {
+      if (grapheme === "\n" || grapheme === "\r" || grapheme === "\r\n") {
+        if (lines.length >= lineLimit) {
+          truncated = true;
+          break outer;
+        }
+        lines.push([]);
+        widths.push(0);
+        continue;
+      }
+      const glyphWidth = stringWidth(grapheme);
+      const lineIndex = lines.length - 1;
+      if (glyphWidth > 0 && widths[lineIndex] + glyphWidth > lineWidth && lines[lineIndex].length > 0) {
+        if (lines.length >= lineLimit) {
+          truncated = true;
+          break outer;
+        }
+        lines.push([]);
+        widths.push(0);
+      }
+      const target = lines.length - 1;
+      lines[target].push({ value: grapheme, width: glyphWidth, segmentIndex });
+      widths[target] = widths[target] + glyphWidth;
+    }
+  }
+  if (truncated) {
+    const lastIndex = lines.length - 1;
+    const last = lines[lastIndex];
+    while (last.length > 0 && widths[lastIndex] > lineWidth - 3) {
+      widths[lastIndex] = widths[lastIndex] - last.pop().width;
+    }
+    while (last.length > 0 && /^\s$/u.test(last.at(-1).value)) {
+      widths[lastIndex] = widths[lastIndex] - last.pop().width;
+    }
+    last.push({ value: "...", width: 3, segmentIndex: last.at(-1)?.segmentIndex ?? 0 });
+  }
+  const output = [];
+  const append = (value, segmentIndex) => {
+    const previous = output.at(-1);
+    if (previous?.segmentIndex === segmentIndex) previous.text += value;
+    else output.push({ text: value, color: segments[segmentIndex]?.color, segmentIndex });
+  };
+  lines.forEach((line, lineIndex) => {
+    if (lineIndex > 0) append("\n", line[0]?.segmentIndex ?? output.at(-1)?.segmentIndex ?? 0);
+    for (const token of line) append(token.value, token.segmentIndex);
+  });
+  return {
+    truncated,
+    segments: output.map(({ text, color }) => ({ text, ...color === void 0 ? {} : { color } }))
+  };
+}
 var THINKING_RAIL = "#416f84";
 var THINKING_TEXT = "#91a0a8";
 function ThinkingLineView({ text }) {
@@ -1039,13 +1120,16 @@ function ThinkingLineView({ text }) {
     /* @__PURE__ */ jsx3(Text, { color: THINKING_TEXT, wrap: "truncate-end", children: text })
   ] });
 }
-var SPLIT_TRACK_MIN_COLUMNS = 72;
+var SPLIT_TRACK_MIN_COLUMNS = 96;
+var SPLIT_TRACK_GUTTER_COLUMNS = 3;
+var SPLIT_TRACK_MAIN_RATIO = 0.44;
 function TaskProgressPanel({
   blocks,
   interactive,
   maxHeight = 8,
   columns = 80,
-  scrollRef,
+  mainScrollRef,
+  subagentScrollRef,
   onHoverChange
 }) {
   if (blocks.length === 0 || maxHeight <= 0) return null;
@@ -1054,54 +1138,210 @@ function TaskProgressPanel({
   const hasTasks = taskBlocks.length > 0;
   const hasSubagents = subagentBlocks.length > 0;
   const split = hasTasks && hasSubagents && columns >= SPLIT_TRACK_MIN_COLUMNS;
-  return /* @__PURE__ */ jsxs2(
+  const hoverProps = (track) => ({
+    onMouseEnter: () => onHoverChange?.(track)
+  });
+  return /* @__PURE__ */ jsx3(
     Box_default,
     {
       flexDirection: "column",
       flexShrink: 0,
       width: "100%",
       maxHeight,
-      onMouseEnter: () => onHoverChange?.(true),
-      onMouseLeave: () => onHoverChange?.(false),
-      children: [
-        split ? /* @__PURE__ */ jsx3(SplitTrackHeaders, {}) : /* @__PURE__ */ jsx3(TrackHeader, { role: hasTasks ? "main" : "subagent" }),
-        maxHeight > 1 ? /* @__PURE__ */ jsx3(
-          ScrollBox_default,
-          {
-            ...scrollRef === void 0 ? {} : { ref: scrollRef },
-            flexDirection: "column",
-            flexShrink: 1,
-            width: "100%",
-            maxHeight: maxHeight - 1,
-            children: split ? pairedTrackRows(taskBlocks, subagentBlocks).map(([task, subagent], index) => /* @__PURE__ */ jsxs2(Box_default, { flexDirection: "row", width: "100%", columnGap: 2, children: [
-              /* @__PURE__ */ jsx3(Box_default, { flexBasis: 0, flexGrow: 1, minWidth: 0, flexDirection: "column", children: task === void 0 ? null : /* @__PURE__ */ jsx3(TaskStatusLine, { block: task, interactive }) }),
-              /* @__PURE__ */ jsx3(Box_default, { flexBasis: 0, flexGrow: 1, minWidth: 0, flexDirection: "column", children: subagent === void 0 ? null : /* @__PURE__ */ jsx3(TaskStatusLine, { block: subagent, interactive }) })
-            ] }, `${task?.id ?? "task"}:${subagent?.id ?? "subagent"}:${index}`)) : hasTasks && hasSubagents ? /* @__PURE__ */ jsxs2(Fragment2, { children: [
-              taskBlocks.map((block) => /* @__PURE__ */ jsx3(TaskStatusLine, { block, interactive }, block.id)),
-              /* @__PURE__ */ jsx3(TrackHeader, { role: "subagent" }),
-              subagentBlocks.map((block) => /* @__PURE__ */ jsx3(TaskStatusLine, { block, interactive }, block.id))
-            ] }) : (hasTasks ? taskBlocks : subagentBlocks).map((block) => /* @__PURE__ */ jsx3(TaskStatusLine, { block, interactive }, block.id))
-          }
-        ) : null
-      ]
+      onMouseLeave: () => onHoverChange?.(null),
+      children: split ? /* @__PURE__ */ jsx3(
+        SplitTracks,
+        {
+          taskBlocks,
+          subagentBlocks,
+          interactive,
+          height: maxHeight,
+          columns,
+          mainScrollRef,
+          subagentScrollRef,
+          hoverProps
+        }
+      ) : hasTasks && hasSubagents ? /* @__PURE__ */ jsx3(
+        StackedTracks,
+        {
+          taskBlocks,
+          subagentBlocks,
+          interactive,
+          height: maxHeight,
+          columns,
+          mainScrollRef,
+          subagentScrollRef,
+          hoverProps
+        }
+      ) : /* @__PURE__ */ jsx3(
+        SingleTrack,
+        {
+          role: hasTasks ? "main" : "subagent",
+          blocks: hasTasks ? taskBlocks : subagentBlocks,
+          interactive,
+          height: maxHeight,
+          width: columns,
+          scrollRef: hasTasks ? mainScrollRef : subagentScrollRef,
+          hoverProps
+        }
+      )
     }
   );
 }
-function TrackHeader({ role }) {
-  return /* @__PURE__ */ jsxs2(Text, { dimColor: true, children: [
-    "\u2500\u2500 ",
-    role === "main" ? "task plan" : "subagent exploration",
-    " \u2500\u2500"
+function SplitTracks({
+  taskBlocks,
+  subagentBlocks,
+  interactive,
+  height,
+  columns,
+  mainScrollRef,
+  subagentScrollRef,
+  hoverProps
+}) {
+  const contentHeight = Math.max(0, height - 1);
+  const availableWidth = columns - SPLIT_TRACK_GUTTER_COLUMNS;
+  const leftWidth = Math.max(1, Math.floor(availableWidth * SPLIT_TRACK_MAIN_RATIO));
+  const rightWidth = Math.max(1, availableWidth - leftWidth);
+  return /* @__PURE__ */ jsxs2(Fragment2, { children: [
+    /* @__PURE__ */ jsxs2(Box_default, { flexDirection: "row", width: "100%", children: [
+      /* @__PURE__ */ jsx3(Box_default, { width: leftWidth, ...hoverProps("main"), children: /* @__PURE__ */ jsx3(TrackHeader, { role: "main", count: taskBlocks.length, width: leftWidth }) }),
+      /* @__PURE__ */ jsx3(Text, { color: "ansi:white", children: "\u2500\u252C\u2500" }),
+      /* @__PURE__ */ jsx3(Box_default, { width: rightWidth, ...hoverProps("subagent"), children: /* @__PURE__ */ jsx3(TrackHeader, { role: "subagent", count: subagentBlocks.length, width: rightWidth }) })
+    ] }),
+    contentHeight <= 0 ? null : /* @__PURE__ */ jsxs2(Box_default, { flexDirection: "row", width: "100%", height: contentHeight, children: [
+      /* @__PURE__ */ jsx3(Box_default, { width: leftWidth, minWidth: 0, flexDirection: "column", ...hoverProps("main"), children: /* @__PURE__ */ jsx3(
+        TrackScrollBox,
+        {
+          ref: mainScrollRef,
+          blocks: taskBlocks,
+          interactive,
+          height: contentHeight,
+          width: leftWidth,
+          maxTextLines: 2
+        }
+      ) }),
+      /* @__PURE__ */ jsx3(TrackDivider, { height: contentHeight }),
+      /* @__PURE__ */ jsx3(Box_default, { width: rightWidth, minWidth: 0, flexDirection: "column", ...hoverProps("subagent"), children: /* @__PURE__ */ jsx3(
+        TrackScrollBox,
+        {
+          ref: subagentScrollRef,
+          blocks: subagentBlocks,
+          interactive,
+          height: contentHeight,
+          width: rightWidth,
+          maxTextLines: 2
+        }
+      ) })
+    ] })
   ] });
 }
-function SplitTrackHeaders() {
-  return /* @__PURE__ */ jsxs2(Box_default, { flexDirection: "row", width: "100%", columnGap: 2, children: [
-    /* @__PURE__ */ jsx3(Box_default, { flexBasis: 0, flexGrow: 1, minWidth: 0, children: /* @__PURE__ */ jsx3(TrackHeader, { role: "main" }) }),
-    /* @__PURE__ */ jsx3(Box_default, { flexBasis: 0, flexGrow: 1, minWidth: 0, children: /* @__PURE__ */ jsx3(TrackHeader, { role: "subagent" }) })
+function StackedTracks({
+  taskBlocks,
+  subagentBlocks,
+  interactive,
+  height,
+  columns,
+  mainScrollRef,
+  subagentScrollRef,
+  hoverProps
+}) {
+  if (height <= 1) {
+    return /* @__PURE__ */ jsx3(Box_default, { ...hoverProps("main"), children: /* @__PURE__ */ jsx3(TrackHeader, { role: "main", count: taskBlocks.length, width: columns }) });
+  }
+  const mainHeight = Math.ceil(height / 2);
+  const subagentHeight = Math.floor(height / 2);
+  return /* @__PURE__ */ jsxs2(Fragment2, { children: [
+    /* @__PURE__ */ jsx3(
+      SingleTrack,
+      {
+        role: "main",
+        blocks: taskBlocks,
+        interactive,
+        height: mainHeight,
+        width: columns,
+        scrollRef: mainScrollRef,
+        hoverProps
+      }
+    ),
+    /* @__PURE__ */ jsx3(
+      SingleTrack,
+      {
+        role: "subagent",
+        blocks: subagentBlocks,
+        interactive,
+        height: subagentHeight,
+        width: columns,
+        scrollRef: subagentScrollRef,
+        hoverProps
+      }
+    )
+  ] });
+}
+function SingleTrack({
+  role,
+  blocks,
+  interactive,
+  height,
+  width,
+  scrollRef,
+  hoverProps
+}) {
+  const contentHeight = Math.max(0, height - 1);
+  return /* @__PURE__ */ jsxs2(Box_default, { flexDirection: "column", width: "100%", height, ...hoverProps(role), children: [
+    /* @__PURE__ */ jsx3(TrackHeader, { role, count: blocks.length, width }),
+    contentHeight <= 0 ? null : /* @__PURE__ */ jsx3(
+      TrackScrollBox,
+      {
+        ref: scrollRef,
+        blocks,
+        interactive,
+        height: contentHeight,
+        width,
+        maxTextLines: 3
+      }
+    )
   ] });
 }
-function pairedTrackRows(tasks, subagents) {
-  return Array.from({ length: Math.max(tasks.length, subagents.length) }, (_, index) => [tasks[index], subagents[index]]);
+function TrackScrollBox({
+  ref,
+  blocks,
+  interactive,
+  height,
+  width,
+  maxTextLines
+}) {
+  return /* @__PURE__ */ jsx3(
+    ScrollBox_default,
+    {
+      ...ref === void 0 ? {} : { ref },
+      flexDirection: "column",
+      flexShrink: 1,
+      width: "100%",
+      height,
+      maxHeight: height,
+      paddingX: 1,
+      children: blocks.map((block) => /* @__PURE__ */ jsx3(
+        TaskStatusLine,
+        {
+          block,
+          interactive,
+          textWidth: Math.max(3, width - 2),
+          maxTextLines,
+          showRoleBadge: false
+        },
+        block.id
+      ))
+    }
+  );
+}
+function TrackHeader({ role, count, width }) {
+  const label = role === "main" ? `task plan (${count})` : `subagents (${count})`;
+  const prefix = `\u2500\u2500 ${label} `;
+  const line = prefix.length >= width ? prefix.slice(0, Math.max(0, width)) : `${prefix}${"\u2500".repeat(width - prefix.length)}`;
+  return /* @__PURE__ */ jsx3(Text, { color: "ansi:white", wrap: "truncate-end", children: line });
+}
+function TrackDivider({ height }) {
+  return /* @__PURE__ */ jsx3(Box_default, { flexDirection: "column", width: SPLIT_TRACK_GUTTER_COLUMNS, flexShrink: 0, children: Array.from({ length: height }, (_, index) => /* @__PURE__ */ jsx3(Text, { color: "ansi:white", children: " \u2502 " }, index)) });
 }
 
 // src/ui/file-diff-style.ts
@@ -1117,6 +1357,12 @@ function fileDiffLineStyle(kind) {
 }
 
 // src/ui/slash-completion.ts
+var CANDIDATE_KIND_PRIORITY = {
+  skill: 0,
+  plugin: 0,
+  command: 1,
+  tool: 2
+};
 function slashCandidatePresentation(selected) {
   return {
     marker: selected ? "\u203A " : "  ",
@@ -1177,6 +1423,8 @@ function deriveSlashCompletion(input, cursor, candidates, selectedIndex, visible
     const leftPrefix = left.name.toLowerCase().startsWith(normalized);
     const rightPrefix = right.name.toLowerCase().startsWith(normalized);
     if (leftPrefix !== rightPrefix) return leftPrefix ? -1 : 1;
+    const kindPriority = CANDIDATE_KIND_PRIORITY[left.kind] - CANDIDATE_KIND_PRIORITY[right.kind];
+    if (kindPriority !== 0) return kindPriority;
     return left.name.localeCompare(right.name);
   });
   if (items.length === 0) return null;
@@ -1656,21 +1904,63 @@ import { Fragment as Fragment3, jsx as jsx5, jsxs as jsxs4 } from "react/jsx-run
 var HISTORY_CAP = 200;
 var BUILTIN_SLASH_CANDIDATES = MVP_COMMANDS.map((name) => ({ name, description: COMMAND_DESCRIPTIONS[name] }));
 var PROMPT_HORIZONTAL_PADDING = 1;
+function clonePromptDraft(state) {
+  return {
+    ...state,
+    pastedBlocks: [...state.pastedBlocks],
+    imageAttachments: [...state.imageAttachments]
+  };
+}
+var PromptEditHistory = class {
+  constructor(limit = 100) {
+    this.limit = limit;
+  }
+  limit;
+  #undo = [];
+  #redo = [];
+  record(previous, next) {
+    if (previous.text === next.text && previous.pastedBlocks === next.pastedBlocks && previous.imageAttachments === next.imageAttachments) return;
+    this.#undo.push(clonePromptDraft(previous));
+    if (this.#undo.length > this.limit) this.#undo.shift();
+    this.#redo.length = 0;
+  }
+  undo(current) {
+    const previous = this.#undo.pop();
+    if (previous === void 0) return void 0;
+    this.#redo.push(clonePromptDraft(current));
+    return clonePromptDraft(previous);
+  }
+  redo(current) {
+    const next = this.#redo.pop();
+    if (next === void 0) return void 0;
+    this.#undo.push(clonePromptDraft(current));
+    return clonePromptDraft(next);
+  }
+  reset() {
+    this.#undo.length = 0;
+    this.#redo.length = 0;
+  }
+};
+function promptHistoryAction(character, key, platform = process.platform) {
+  const modifier = platform === "darwin" ? key.super : key.ctrl;
+  if (!modifier || character.toLowerCase() !== "z") return null;
+  return key.shift ? "redo" : "undo";
+}
+function isCopyShortcut(character, key, platform = process.platform) {
+  return character.toLowerCase() === "c" && (platform === "darwin" ? key.super : key.ctrl);
+}
 function removeLastCliImageOnBackspace(input, cursor, images) {
   if (input.length === 0 && cursor === 0 && images.length > 0) {
     return { handled: true, images: images.slice(0, -1) };
   }
   return { handled: false, images: [...images] };
 }
-function prepareCliSubmission(input, images, activeSession) {
+function prepareCliSubmission(input, images) {
   const entered = input.trim();
   if (entered.length === 0 && images.length === 0) return { kind: "empty" };
   if (images.length > 0 && entered.startsWith("/")) {
     return { kind: "error", message: "Image attachments cannot be used with slash commands." };
   }
-  if (images.length > 0 && activeSession) {
-    return { kind: "error", message: "Images can only be attached to a new prompt." };
-  }
   const text = entered || "Analyze the attached image(s).";
   if (images.length === 0) return { kind: "ready", text, displayText: text };
   const content = [{ type: "text", text }, ...images];
@@ -1694,45 +1984,91 @@ function resolvePromptDelivery(activeSession, key, input) {
   }
   return { delivery: promptDelivery(activeSession, key), prompt: input };
 }
-var SinglePendingPrompt = class {
-  #value;
+function cloneQueuedPrompt(prompt) {
+  return {
+    text: prompt.text,
+    displayText: prompt.displayText,
+    ...prompt.content === void 0 ? {} : { content: [...prompt.content] }
+  };
+}
+function normalizeQueuedPrompt(prompt) {
+  if (typeof prompt === "string") {
+    const text2 = prompt.trim();
+    return text2.length === 0 ? void 0 : { text: text2, displayText: text2 };
+  }
+  const text = prompt.text.trim();
+  if (text.length === 0) return void 0;
+  const displayText = prompt.displayText.trim() || text;
+  return cloneQueuedPrompt({
+    text,
+    displayText,
+    ...prompt.content === void 0 ? {} : { content: prompt.content }
+  });
+}
+function queuedPromptLabel(prompt) {
+  const imageCount = prompt.content?.filter((block) => block.type === "image").length ?? 0;
+  const text = prompt.text.replace(/\s+/gu, " ").trim();
+  if (imageCount === 0) return text;
+  return `${text} \xB7 ${imageCount} ${imageCount === 1 ? "image" : "images"}`;
+}
+function restoreQueuedPrompt(prompt) {
+  const imageAttachments = prompt.content?.filter(
+    (block) => block.type === "image"
+  ) ?? [];
+  return {
+    text: prompt.text,
+    cursor: [...prompt.text].length,
+    pastedBlocks: [],
+    imageAttachments
+  };
+}
+var PendingPromptQueue = class {
+  #values = [];
   get value() {
-    return this.#value;
+    const value = this.#values.at(-1);
+    return value === void 0 ? void 0 : cloneQueuedPrompt(value);
+  }
+  get values() {
+    return this.#values.map(cloneQueuedPrompt);
+  }
+  get size() {
+    return this.#values.length;
   }
   queue(prompt) {
-    const value = prompt.trim();
-    if (value.length === 0 || this.#value !== void 0) return false;
-    this.#value = value;
+    const value = normalizeQueuedPrompt(prompt);
+    if (value === void 0) return false;
+    this.#values.push(value);
     return true;
   }
   cancel() {
-    const value = this.#value;
-    this.#value = void 0;
-    return value;
+    const value = this.#values.pop();
+    return value === void 0 ? void 0 : cloneQueuedPrompt(value);
   }
   take() {
-    return this.cancel();
+    const value = this.#values.shift();
+    return value === void 0 ? void 0 : cloneQueuedPrompt(value);
   }
 };
 async function runTerminalSubmissionChain(options) {
-  let prompt = options.initialPrompt;
-  let initial = true;
+  let prompt = normalizeQueuedPrompt({
+    text: options.initialPrompt,
+    displayText: options.initialDisplayPrompt ?? options.initialPrompt,
+    ...options.initialContent === void 0 ? {} : { content: options.initialContent }
+  });
   while (prompt !== void 0) {
-    options.onStart(initial ? options.initialDisplayPrompt ?? prompt : prompt);
-    if (initial && options.initialSubmit !== void 0) {
+    options.onStart(prompt.displayText);
+    if (prompt.content === void 0) await submitSafely(options.session, prompt.text, options.report);
+    else {
       try {
-        await options.initialSubmit(prompt);
+        await options.session.submit({ text: prompt.text, content: prompt.content });
       } catch (error) {
         safeReport(options.report, safeUiError(error));
       }
-    } else {
-      await submitSafely(options.session, prompt, options.report);
     }
     options.onFinish();
     if (options.shouldContinue?.() === false) return;
     prompt = options.pending.take();
-    if (prompt !== void 0) options.onPendingConsumed();
-    initial = false;
+    if (prompt !== void 0) options.onPendingConsumed(options.pending.values);
   }
 }
 function classifyTerminalInput(key) {
@@ -1755,6 +2091,9 @@ function completionKeyAction(key, menuOpen) {
 function slashKeyAction(key, completion) {
   return completionKeyAction(key, completion !== null);
 }
+function canShowSlashCompletion(_activeSession, input, dismissedInput, blockedByModal) {
+  return dismissedInput !== input && !blockedByModal;
+}
 function appRuntimeOptions(props, output, onApprovalChange) {
   return {
     workspace: props.workspace,
@@ -1788,7 +2127,7 @@ function App({ workspace, home, resumeSession, instanceId, palAlias }) {
   const [mentionCandidates, setMentionCandidates] = useState2([]);
   const [mentionSelection, setMentionSelection] = useState2(0);
   const [dismissedMentionInput, setDismissedMentionInput] = useState2();
-  const [pendingPrompt, setPendingPrompt] = useState2();
+  const [pendingPrompts, setPendingPrompts] = useState2([]);
   const [revision, setRevision] = useState2(0);
   const [ideContext, setIdeContext] = useState2();
   const [questionIndex, setQuestionIndex] = useState2(0);
@@ -1799,11 +2138,12 @@ function App({ workspace, home, resumeSession, instanceId, palAlias }) {
   const [updateTo, setUpdateTo] = useState2();
   const [transcript, dispatch] = useReducer(transcriptReducer, void 0, createTranscriptState);
   const scrollRef = useRef4(null);
-  const taskScrollRef = useRef4(null);
-  const taskPanelHovered = useRef4(false);
+  const mainTaskScrollRef = useRef4(null);
+  const subagentTaskScrollRef = useRef4(null);
+  const hoveredTaskTrack = useRef4(null);
   const runtimeRef = useRef4(void 0);
   const pendingPromptRef = useRef4(void 0);
-  pendingPromptRef.current ??= new SinglePendingPrompt();
+  pendingPromptRef.current ??= new PendingPromptQueue();
   const closing = useRef4(false);
   const clipboardBusy = useRef4(false);
   const textBuf = useRef4({ pending: "", timer: null });
@@ -1814,8 +2154,9 @@ function App({ workspace, home, resumeSession, instanceId, palAlias }) {
     pastedBlocks,
     imageAttachments
   });
+  const promptEditHistory = useRef4(new PromptEditHistory());
   promptDraftRef.current = { text: input, cursor: promptCursor, pastedBlocks, imageAttachments };
-  const commitPromptDraft = (next) => {
+  const commitPromptDraft = (next, recordHistory = true) => {
     const current = promptDraftRef.current;
     const resolved = {
       text: next.text,
@@ -1823,6 +2164,7 @@ function App({ workspace, home, resumeSession, instanceId, palAlias }) {
       pastedBlocks: next.pastedBlocks ?? current.pastedBlocks,
       imageAttachments: next.imageAttachments ?? current.imageAttachments
     };
+    if (recordHistory) promptEditHistory.current.record(current, resolved);
     promptDraftRef.current = resolved;
     setInput(resolved.text);
     setPromptCursor(resolved.cursor);
@@ -2044,7 +2386,12 @@ function App({ workspace, home, resumeSession, instanceId, palAlias }) {
     setCustomQuestionActive(false);
   }, [questions]);
   const derivedSlashCompletion = deriveSlashCompletion(input, promptCursor, slashCandidates, slashSelection);
-  const slashCompletion = dismissedSlashInput === input || transcript.active !== void 0 || approval !== void 0 || questions !== void 0 ? null : derivedSlashCompletion;
+  const slashCompletion = canShowSlashCompletion(
+    transcript.active !== void 0,
+    input,
+    dismissedSlashInput,
+    approval !== void 0 || questions !== void 0
+  ) ? derivedSlashCompletion : null;
   const derivedMentionCompletion = slashCompletion === null ? deriveMentionCompletion(input, promptCursor, mentionCandidates, mentionSelection) : null;
   const mentionCompletion = dismissedMentionInput === input || transcript.active !== void 0 || approval !== void 0 || questions !== void 0 ? null : derivedMentionCompletion;
   const completedTokenLength = completedSlashTokenLength(input, slashCandidates, slashCompletion !== null);
@@ -2062,11 +2409,7 @@ function App({ workspace, home, resumeSession, instanceId, palAlias }) {
       setClipboardNotice("Flavor is still starting; try pasting the image again.");
       return;
     }
-    if (transcript.active !== void 0) {
-      setClipboardNotice("Images can only be attached to a new prompt.");
-      return;
-    }
-    if (imageAttachments.length >= DEFAULT_MAX_IMAGES) {
+    if (promptDraftRef.current.imageAttachments.length >= DEFAULT_MAX_IMAGES) {
       setClipboardNotice(`A prompt can contain at most ${DEFAULT_MAX_IMAGES} images.`);
       return;
     }
@@ -2080,14 +2423,15 @@ function App({ workspace, home, resumeSession, instanceId, palAlias }) {
         return;
       }
       const incomingBytes = Buffer.byteLength(attachment.dataBase64, "base64");
-      const currentBytes = imageAttachments.reduce((sum, image) => sum + image.bytes, 0);
+      const currentDraft = promptDraftRef.current;
+      const currentBytes = currentDraft.imageAttachments.reduce((sum, image) => sum + image.bytes, 0);
       if (currentBytes + incomingBytes > DEFAULT_MAX_TOTAL_IMAGE_BYTES) {
         throw new Error(`Image attachments exceed the maximum total size of ${DEFAULT_MAX_TOTAL_IMAGE_BYTES} bytes`);
       }
       const [stored] = await new SessionAssetStore({ workspace }).store(active.sessionId, [attachment]);
       if (stored === void 0) throw new Error("Clipboard image could not be stored");
-      setImageAttachments((current) => [...current, stored]);
-      setClipboardNotice(`Added [Image #${imageAttachments.length + 1}] ${stored.name ?? basename3(stored.source.path)}`);
+      commitPromptDraft({ ...currentDraft, imageAttachments: [...currentDraft.imageAttachments, stored] });
+      setClipboardNotice(`Added [Image #${currentDraft.imageAttachments.length + 1}] ${stored.name ?? basename3(stored.source.path)}`);
     } catch (error) {
       setClipboardNotice(safeUiError(error));
     } finally {
@@ -2097,7 +2441,12 @@ function App({ workspace, home, resumeSession, instanceId, palAlias }) {
   use_input_default((character, key, event) => {
     const terminalAction = classifyTerminalInput(key);
     if (terminalAction?.type === "scroll") {
-      const scroll = selectWheelScrollTarget(scrollRef.current, taskScrollRef.current, taskPanelHovered.current);
+      const scroll = selectWheelScrollTarget(
+        scrollRef.current,
+        mainTaskScrollRef.current,
+        subagentTaskScrollRef.current,
+        hoveredTaskTrack.current
+      );
       if (scroll !== null) {
         if (terminalAction.rows < 0) scrollUp(scroll, -terminalAction.rows);
         else scrollDown(scroll, terminalAction.rows);
@@ -2110,12 +2459,13 @@ function App({ workspace, home, resumeSession, instanceId, palAlias }) {
       return;
     }
     const active = runtimeRef.current;
-    if (key.ctrl && character === "c") {
-      if (selection.hasSelection()) {
-        selection.copySelection();
-      } else {
-        interrupt();
-      }
+    if (isCopyShortcut(character, key)) {
+      if (selection.hasSelection()) selection.copySelection();
+      else if (process.platform !== "darwin") interrupt();
+      return;
+    }
+    if (key.ctrl && character.toLowerCase() === "c") {
+      interrupt();
       return;
     }
     if (shouldReadClipboardImage(character, key, event.keypress.isPasted)) {
@@ -2188,23 +2538,20 @@ function App({ workspace, home, resumeSession, instanceId, palAlias }) {
           setPromptCursor(0);
           return;
         }
-        if (!key.ctrl && !key.meta && character) setCustomQuestionActive(true);
+        if (!key.ctrl && !key.meta && !key.super && character) setCustomQuestionActive(true);
         else return;
       }
     }
-    if (key.escape && transcript.active !== void 0) {
-      const restored = pendingPromptRef.current.cancel();
-      if (restored !== void 0) {
-        setPendingPrompt(void 0);
-        setInput(restored);
-        setPastedBlocks([]);
-        setPromptCursor([...restored].length);
-        setSlashSelection(0);
-        setDismissedSlashInput(void 0);
-        setMentionSelection(0);
-        setDismissedMentionInput(void 0);
-        return;
-      }
+    const historyAction = promptHistoryAction(character, key);
+    if (historyAction !== null) {
+      const draft = promptDraftRef.current;
+      const restored = historyAction === "undo" ? promptEditHistory.current.undo(draft) : promptEditHistory.current.redo(draft);
+      if (restored !== void 0) commitPromptDraft(restored, false);
+      setSlashSelection(0);
+      setDismissedSlashInput(void 0);
+      setMentionSelection(0);
+      setDismissedMentionInput(void 0);
+      return;
     }
     const menuAction = slashKeyAction(key, slashCompletion);
     if (menuAction?.type === "select" && slashCompletion !== null) {
@@ -2215,8 +2562,7 @@ function App({ workspace, home, resumeSession, instanceId, palAlias }) {
       const selected = slashCompletion.items[slashCompletion.selectedIndex];
       if (selected !== void 0) {
         const next = completeSlashSelection(input, promptCursor, selected.name);
-        setInput(next.text);
-        setPromptCursor(next.cursor);
+        commitPromptDraft(next);
         setDismissedSlashInput(next.text);
       }
       return;
@@ -2239,9 +2585,24 @@ function App({ workspace, home, resumeSession, instanceId, palAlias }) {
       setDismissedMentionInput(input);
       return;
     }
+    if (key.escape && transcript.active !== void 0) {
+      const restored = pendingPromptRef.current.cancel();
+      if (restored !== void 0) {
+        setPendingPrompts([...pendingPromptRef.current.values]);
+        const restoredDraft = restoreQueuedPrompt(restored);
+        promptEditHistory.current.reset();
+        commitPromptDraft(restoredDraft, false);
+        setClipboardNotice(restoredDraft.imageAttachments.length === 0 ? void 0 : `Restored ${restoredDraft.imageAttachments.length} pending ${restoredDraft.imageAttachments.length === 1 ? "image" : "images"}.`);
+        setSlashSelection(0);
+        setDismissedSlashInput(void 0);
+        setMentionSelection(0);
+        setDismissedMentionInput(void 0);
+        return;
+      }
+    }
     if (key.return) {
       const images = [...imageAttachments];
-      const prepared = prepareCliSubmission(input, images, transcript.active !== void 0);
+      const prepared = prepareCliSubmission(input, images);
       if (prepared.kind === "empty" || active === void 0) return;
       if (prepared.kind === "error") {
         setClipboardNotice(prepared.message);
@@ -2251,8 +2612,12 @@ function App({ workspace, home, resumeSession, instanceId, palAlias }) {
       const { delivery, prompt } = resolvePromptDelivery(transcript.active !== void 0, key, submittedText);
       if (!prompt) return;
       if (delivery === "followUp" && transcript.active !== void 0) {
-        if (!pendingPromptRef.current.queue(prompt)) return;
-        setPendingPrompt(prompt);
+        if (!pendingPromptRef.current.queue({
+          text: prompt,
+          displayText: prepared.content === void 0 ? prompt : prepared.displayText,
+          ...prepared.content === void 0 ? {} : { content: prepared.content }
+        })) return;
+        setPendingPrompts([...pendingPromptRef.current.values]);
       }
       scrollRef.current?.scrollToBottom();
       setHistory((current) => [...current, submittedText].slice(-HISTORY_CAP));
@@ -2261,6 +2626,7 @@ function App({ workspace, home, resumeSession, instanceId, palAlias }) {
       setPastedBlocks([]);
       setImageAttachments([]);
       promptDraftRef.current = { text: "", cursor: 0, pastedBlocks: [], imageAttachments: [] };
+      promptEditHistory.current.reset();
       setClipboardNotice(void 0);
       setPromptCursor(0);
       setSlashSelection(0);
@@ -2273,15 +2639,12 @@ function App({ workspace, home, resumeSession, instanceId, palAlias }) {
           initialPrompt: prompt,
           ...prepared.content === void 0 ? {} : {
             initialDisplayPrompt: prepared.displayText,
-            initialSubmit: (text) => active.session.submit({
-              text,
-              content: prepared.content
-            })
+            initialContent: prepared.content
           },
           pending: pendingPromptRef.current,
           onStart: (next) => dispatch({ type: "submit", prompt: next }),
           onFinish: () => dispatch({ type: "finish" }),
-          onPendingConsumed: () => setPendingPrompt(void 0),
+          onPendingConsumed: (remaining) => setPendingPrompts([...remaining]),
           report: (error) => dispatch({ type: "submit-error", message: error }),
           shouldContinue: () => !closing.current
         });
@@ -2298,8 +2661,7 @@ function App({ workspace, home, resumeSession, instanceId, palAlias }) {
       const draft = promptDraftRef.current;
       const imageEdit = removeLastCliImageOnBackspace(draft.text, draft.cursor, draft.imageAttachments);
       if (imageEdit.handled) {
-        setImageAttachments(imageEdit.images);
-        promptDraftRef.current = { ...draft, imageAttachments: imageEdit.images };
+        commitPromptDraft({ ...draft, imageAttachments: imageEdit.images });
         setClipboardNotice(imageEdit.images.length === 0 ? "Removed image attachment." : `Removed image attachment; ${imageEdit.images.length} remaining.`);
         return;
       }
@@ -2342,7 +2704,7 @@ function App({ workspace, home, resumeSession, instanceId, palAlias }) {
       setDismissedSlashInput(void 0);
       setMentionSelection(0);
       setDismissedMentionInput(void 0);
-    } else if (!key.ctrl && !key.meta && character) {
+    } else if (!key.ctrl && !key.meta && !key.super && character) {
       const draft = promptDraftRef.current;
       const nextPastedBlocks = /[\r\n]/u.test(character) ? [...draft.pastedBlocks, { id: draft.pastedBlocks.length + 1, text: character }] : draft.pastedBlocks;
       commitPromptDraft({
@@ -2388,9 +2750,10 @@ function App({ workspace, home, resumeSession, instanceId, palAlias }) {
       ...ideContext === void 0 ? {} : { ideContext },
       completedSlashTokenLength: completedTokenLength,
       scrollRef,
-      taskScrollRef,
-      onTaskPanelHoverChange: (hovered) => {
-        taskPanelHovered.current = hovered;
+      mainTaskScrollRef,
+      subagentTaskScrollRef,
+      onTaskPanelHoverChange: (track) => {
+        hoveredTaskTrack.current = track;
       },
       ...slashCompletion === null ? {} : { completion: slashCompletion },
       ...mentionCompletion === null ? {} : { mentionCompletion, onMentionSelect: selectMention },
@@ -2398,7 +2761,7 @@ function App({ workspace, home, resumeSession, instanceId, palAlias }) {
       ...questions === void 0 ? {} : { questions },
       memoryReviews,
       memoryAutoDismissSeconds,
-      ...pendingPrompt === void 0 ? {} : { pendingPrompt },
+      pendingPrompts,
       questionIndex,
       questionAnswers,
       customQuestionActive
@@ -2511,7 +2874,7 @@ function TerminalLayout({
   columns,
   rows = 24,
   activeSession,
-  pendingPrompt,
+  pendingPrompts = [],
   approval,
   questions,
   memoryReviews = [],
@@ -2524,7 +2887,8 @@ function TerminalLayout({
   onMentionSelect,
   completedSlashTokenLength: tokenLength = 0,
   scrollRef,
-  taskScrollRef,
+  mainTaskScrollRef,
+  subagentTaskScrollRef,
   onTaskPanelHoverChange,
   onPromptCursorChange,
   ideContext
@@ -2546,7 +2910,7 @@ function TerminalLayout({
   const completedWindow = cliTranscriptWindow(completed);
   const questionRows = questions === void 0 ? 0 : 4 + (questions[questionIndex]?.options.length ?? 0) + questions.length * 2;
   const memoryReviewRows = memoryReviews.length === 0 ? 0 : 5;
-  const fixedBottomRows = (approval === void 0 ? 0 : 3) + questionRows + memoryReviewRows + menuRows + (pendingPrompt === void 0 ? 0 : 1) + imageAttachments.length + (clipboardNotice === void 0 ? 0 : 1) + 2;
+  const fixedBottomRows = (approval === void 0 ? 0 : 3) + questionRows + memoryReviewRows + menuRows + (pendingPrompts.length === 0 ? 0 : 1) + imageAttachments.length + (clipboardNotice === void 0 ? 0 : 1) + 2;
   const taskPanelRows = taskPanelViewportRows(rows, fixedBottomRows, activeTaskBlocks.length > 0);
   const availableBottomRows = Math.max(1, rows - taskPanelRows - 1);
   const bottomMaxRows = Math.min(availableBottomRows, Math.max(Math.floor(rows / 2), fixedBottomRows + 1));
@@ -2583,7 +2947,8 @@ function TerminalLayout({
         interactive: activeSession,
         maxHeight: taskPanelRows,
         columns,
-        ...taskScrollRef === void 0 ? {} : { scrollRef: taskScrollRef },
+        ...mainTaskScrollRef === void 0 ? {} : { mainScrollRef: mainTaskScrollRef },
+        ...subagentTaskScrollRef === void 0 ? {} : { subagentScrollRef: subagentTaskScrollRef },
         ...onTaskPanelHoverChange === void 0 ? {} : { onHoverChange: onTaskPanelHoverChange }
       }
     ),
@@ -2617,10 +2982,12 @@ function TerminalLayout({
       memoryReviews.length === 0 ? null : /* @__PURE__ */ jsx5(MemoryReviewCards, { reviews: memoryReviews, autoDismissSeconds: memoryAutoDismissSeconds }),
       completion === void 0 ? null : /* @__PURE__ */ jsx5(SlashMenu, { completion }),
       mentionCompletion === void 0 ? null : /* @__PURE__ */ jsx5(MentionMenu, { completion: mentionCompletion, ...onMentionSelect === void 0 ? {} : { onSelect: onMentionSelect } }),
-      pendingPrompt === void 0 ? null : /* @__PURE__ */ jsxs4(Text, { color: "yellow", wrap: "truncate-end", children: [
-        "Pending \xB7 ",
-        pendingPrompt,
-        " \xB7 Esc edit"
+      pendingPrompts.length === 0 ? null : /* @__PURE__ */ jsxs4(Text, { color: "yellow", wrap: "truncate-end", children: [
+        "Pending (",
+        pendingPrompts.length,
+        ") \xB7 ",
+        queuedPromptLabel(pendingPrompts.at(-1)),
+        " \xB7 Esc edit latest"
       ] }),
       /* @__PURE__ */ jsx5(Text, { dimColor: true, children: "\u2500".repeat(dividerWidth) }),
       imageAttachments.map((image, index) => /* @__PURE__ */ jsxs4(Text, { color: "cyan", wrap: "truncate-end", children: [
@@ -2645,7 +3012,7 @@ function TerminalLayout({
       /* @__PURE__ */ jsx5(
         FooterStatus,
         {
-          hint: activeSession ? "Ctrl+C cancel \xB7 Enter queue \xB7 Esc edit pending \xB7 /steer sends now" : completion !== void 0 ? "\u2191/\u2193 select \xB7 Tab complete \xB7 Esc close" : mentionCompletion !== void 0 ? "\u2191/\u2193 select \xB7 Tab complete \xB7 click choose \xB7 Esc close" : "Enter send \xB7 Ctrl/Cmd+V image \xB7 \u2191\u2193 history \xB7 Ctrl+C exit",
+          hint: activeSession ? "Ctrl+C cancel \xB7 Enter queue \xB7 Esc edit latest \xB7 / menu \xB7 Ctrl/Cmd+V image" : completion !== void 0 ? "\u2191/\u2193 select \xB7 Tab complete \xB7 Esc close" : mentionCompletion !== void 0 ? "\u2191/\u2193 select \xB7 Tab complete \xB7 click choose \xB7 Esc close" : "Enter send \xB7 Ctrl/Cmd+V image \xB7 \u2191\u2193 history \xB7 Ctrl+C exit",
           ...ideContext === void 0 ? {} : { ideContext }
         }
       )
@@ -2749,6 +3116,7 @@ function SlashMenu({ completion }) {
     return /* @__PURE__ */ jsxs4(Text, { ...presentation.rowStyle, wrap: "truncate-end", children: [
       presentation.marker,
       /* @__PURE__ */ jsx5(HighlightedName, { name: candidate.name, query: completion.query, matchStyle: presentation.matchStyle }),
+      candidate.kind === "skill" || candidate.kind === "plugin" ? /* @__PURE__ */ jsx5(Text, { color: candidate.kind === "skill" ? "magentaBright" : "cyanBright", children: `  ${candidate.kind}` }) : null,
       candidate.description === void 0 ? null : /* @__PURE__ */ jsx5(Text, { dimColor: true, children: `  ${candidate.description}` })
     ] }, `${candidate.kind}:${candidate.name}`);
   }) });
@@ -2804,8 +3172,10 @@ function jumpScroll(scroll, delta) {
     scroll.scrollTo(Math.max(0, target));
   }
 }
-function selectWheelScrollTarget(transcript, tasks, taskPanelHovered) {
-  return taskPanelHovered && tasks !== null ? tasks : transcript;
+function selectWheelScrollTarget(transcript, mainTasks, subagentTasks, hoveredTrack) {
+  if (hoveredTrack === "main" && mainTasks !== null) return mainTasks;
+  if (hoveredTrack === "subagent" && subagentTasks !== null) return subagentTasks;
+  return transcript;
 }
 function taskPanelViewportRows(rows, reservedBottomRows, hasTasks) {
   if (!hasTasks) return 0;
@@ -3682,12 +4052,14 @@ export {
   FooterStatus,
   HISTORY_CAP,
   MentionMenu,
+  PendingPromptQueue,
+  PromptEditHistory,
   PromptLine,
   SHUTDOWN_TIMEOUT_MS,
-  SinglePendingPrompt,
   TerminalLayout,
   appRuntimeOptions,
   boundedCliTurn,
+  canShowSlashCompletion,
   classifyTerminalInput,
   cliTranscriptWindow,
   closeAndDisposeRuntime,
@@ -3695,13 +4067,17 @@ export {
   editPrompt,
   editPromptWithPastedBlocks,
   ideFooterPresentation,
+  isCopyShortcut,
   navigateHistory,
   pastedDraftPresentation,
   prepareCliSubmission,
   promptCursorFromClick,
   promptDelivery,
+  promptHistoryAction,
+  queuedPromptLabel,
   removeLastCliImageOnBackspace,
   resolvePromptDelivery,
+  restoreQueuedPrompt,
   runTerminalSubmissionChain,
   selectWheelScrollTarget,
   shutdownRuntime,