@polterware/polter 0.4.0 → 0.4.1

package/dist/index.js

@@ -3,6 +3,7 @@ import {
   allCommands,
   applyActions,
   commandExists,
+  createIpcServer,
   detectPkgManager,
   executePipeline,
   features,
@@ -21,6 +22,7 @@ import {
   getOrCreateProjectConfig,
   getProcessOutput,
   getProjectConfigPath,
+  getSocketPath,
   getToolDisplayName,
   getToolInfo,
   getToolLinkInfo,
@@ -42,7 +44,7 @@ import {
   stopProcess,
   translateCommand,
   writeProjectConfig
-} from "./chunk-YNOZDU75.js";
+} from "./chunk-ZHVOYB5M.js";
 
 // src/index.tsx
 import React28 from "react";
@@ -1659,26 +1661,11 @@ function FlagSelection({
 
 // src/screens/CommandExecution.tsx
 import { useState as useState12, useEffect as useEffect9 } from "react";
-import { Box as Box13, Text as Text17, useInput as useInput8 } from "ink";
-
-// src/components/Spinner.tsx
-import { Text as Text12 } from "ink";
-import InkSpinner from "ink-spinner";
-import { jsx as jsx12, jsxs as jsxs11 } from "react/jsx-runtime";
-function Spinner({
-  label = "Running...",
-  color = inkColors.accent
-}) {
-  return /* @__PURE__ */ jsxs11(Text12, { children: [
-    /* @__PURE__ */ jsx12(Text12, { color, children: /* @__PURE__ */ jsx12(InkSpinner, { type: "dots" }) }),
-    " ",
-    /* @__PURE__ */ jsx12(Text12, { children: label })
-  ] });
-}
+import { Box as Box13, Text as Text15, useInput as useInput8 } from "ink";
 
 // src/components/ConfirmPrompt.tsx
-import { Box as Box11, Text as Text13, useInput as useInput6 } from "ink";
-import { jsx as jsx13, jsxs as jsxs12 } from "react/jsx-runtime";
+import { Box as Box11, Text as Text12, useInput as useInput6 } from "ink";
+import { jsx as jsx12, jsxs as jsxs11 } from "react/jsx-runtime";
 function ConfirmPrompt({
   message,
   defaultValue = true,
@@ -1704,16 +1691,16 @@ function ConfirmPrompt({
       onConfirm(defaultValue);
     }
   }, { isActive: isInputActive });
-  return /* @__PURE__ */ jsxs12(Box11, { gap: 1, children: [
-    /* @__PURE__ */ jsx13(Text13, { color: inkColors.accent, bold: true, children: "?" }),
-    /* @__PURE__ */ jsx13(Text13, { children: message }),
-    /* @__PURE__ */ jsx13(Text13, { dimColor: true, children: defaultValue ? "(Y/n)" : "(y/N)" })
+  return /* @__PURE__ */ jsxs11(Box11, { gap: 1, children: [
+    /* @__PURE__ */ jsx12(Text12, { color: inkColors.accent, bold: true, children: "?" }),
+    /* @__PURE__ */ jsx12(Text12, { children: message }),
+    /* @__PURE__ */ jsx12(Text12, { dimColor: true, children: defaultValue ? "(Y/n)" : "(y/N)" })
   ] });
 }
 
 // src/components/Divider.tsx
-import { Text as Text14 } from "ink";
-import { jsx as jsx14, jsxs as jsxs13 } from "react/jsx-runtime";
+import { Text as Text13 } from "ink";
+import { jsx as jsx13, jsxs as jsxs12 } from "react/jsx-runtime";
 function Divider({
   label,
   width
@@ -1724,7 +1711,7 @@ function Divider({
     const sideLen = Math.max(2, Math.floor((effectiveWidth - labelLen) / 2));
     const left = "\u2500".repeat(sideLen);
     const right = "\u2500".repeat(sideLen);
-    return /* @__PURE__ */ jsxs13(Text14, { dimColor: true, children: [
+    return /* @__PURE__ */ jsxs12(Text13, { dimColor: true, children: [
       left,
       " ",
       label,
@@ -1732,16 +1719,13 @@ function Divider({
       right
     ] });
   }
-  return /* @__PURE__ */ jsx14(Text14, { dimColor: true, children: "\u2500".repeat(effectiveWidth) });
+  return /* @__PURE__ */ jsx13(Text13, { dimColor: true, children: "\u2500".repeat(effectiveWidth) });
 }
 
-// src/components/CommandOutput.tsx
-import { Text as Text16 } from "ink";
-
 // src/components/ScrollableBox.tsx
 import { useState as useState10, useEffect as useEffect6, useRef } from "react";
-import { Box as Box12, Text as Text15, useInput as useInput7 } from "ink";
-import { jsx as jsx15, jsxs as jsxs14 } from "react/jsx-runtime";
+import { Box as Box12, Text as Text14, useInput as useInput7 } from "ink";
+import { jsx as jsx14, jsxs as jsxs13 } from "react/jsx-runtime";
 function ScrollableBox({
   height,
   isActive = true,
@@ -1780,42 +1764,10 @@ function ScrollableBox({
   const showScrollUp = scrollOffset > 0;
   const showScrollDown = scrollOffset + visibleCount < totalItems;
   const visible = children.slice(scrollOffset, scrollOffset + visibleCount);
-  return /* @__PURE__ */ jsxs14(Box12, { flexDirection: "column", height, children: [
-    showScrollUp && /* @__PURE__ */ jsx15(Text15, { dimColor: true, children: "  \u2191 more" }),
+  return /* @__PURE__ */ jsxs13(Box12, { flexDirection: "column", height, children: [
+    showScrollUp && /* @__PURE__ */ jsx14(Text14, { dimColor: true, children: "  \u2191 more" }),
     visible,
-    showScrollDown && /* @__PURE__ */ jsx15(Text15, { dimColor: true, children: "  \u2193 more" })
-  ] });
-}
-
-// src/lib/ansi.ts
-var ANSI_RE = (
-  // biome-ignore lint/suspicious/noControlCharactersInRegex: intentional ANSI stripping
-  /[\u001B\u009B][[\]()#;?]*(?:(?:(?:[a-zA-Z\d]*(?:;[-a-zA-Z\d/#&.:=?%@~_]*)*)?\u0007)|(?:(?:\d{1,4}(?:;\d{0,4})*)?[\dA-PR-TZcf-nq-uy=><~]))/g
-);
-function stripAnsi(text) {
-  return text.replace(ANSI_RE, "");
-}
-
-// src/components/CommandOutput.tsx
-import { jsx as jsx16 } from "react/jsx-runtime";
-function cleanLines(raw) {
-  const stripped = stripAnsi(raw);
-  return stripped.replace(/\r/g, "").split("\n").filter((line) => line.length > 0);
-}
-function CommandOutput({
-  stdout,
-  stderr,
-  height,
-  isActive = false
-}) {
-  const outLines = stdout ? cleanLines(stdout) : [];
-  const errLines = stderr ? cleanLines(stderr) : [];
-  if (outLines.length === 0 && errLines.length === 0) {
-    return null;
-  }
-  return /* @__PURE__ */ jsx16(ScrollableBox, { height: Math.max(3, height), isActive, children: [
-    ...outLines.map((line, i) => /* @__PURE__ */ jsx16(Text16, { children: line }, `o-${i}`)),
-    ...errLines.map((line, i) => /* @__PURE__ */ jsx16(Text16, { color: "red", children: line }, `e-${i}`))
+    showScrollDown && /* @__PURE__ */ jsx14(Text14, { dimColor: true, children: "  \u2193 more" })
   ] });
 }
 
@@ -1945,6 +1897,15 @@ async function copyToClipboard(text) {
   });
 }
 
+// src/lib/ansi.ts
+var ANSI_RE = (
+  // biome-ignore lint/suspicious/noControlCharactersInRegex: intentional ANSI stripping
+  /[\u001B\u009B][[\]()#;?]*(?:(?:(?:[a-zA-Z\d]*(?:;[-a-zA-Z\d/#&.:=?%@~_]*)*)?\u0007)|(?:(?:\d{1,4}(?:;\d{0,4})*)?[\dA-PR-TZcf-nq-uy=><~]))/g
+);
+function stripAnsi(text) {
+  return text.replace(ANSI_RE, "");
+}
+
 // src/lib/errorSuggestions.ts
 var KNOWN_TOOLS = ["supabase", "gh", "vercel", "git"];
 var BACKTICK_CMD = /(?:try\s+)?(?:run(?:ning)?|use|execute)\s+`([^`]+)`/gi;
@@ -1991,7 +1952,7 @@ ${stderr}`);
 }
 
 // src/screens/CommandExecution.tsx
-import { jsx as jsx17, jsxs as jsxs15 } from "react/jsx-runtime";
+import { jsx as jsx15, jsxs as jsxs14 } from "react/jsx-runtime";
 function CommandExecution({
   args: initialArgs,
   tool = "supabase",
@@ -2016,27 +1977,38 @@ function CommandExecution({
   const { runInteractive } = useInteractiveRun();
   const [outputFocused, setOutputFocused] = useState12(false);
   const [copyMessage, setCopyMessage] = useState12();
+  const [feedback, setFeedback] = useState12();
+  const [aborting, setAborting] = useState12(false);
   const cmdDisplay = rawCommand ? `${rawCommand} ${currentArgs.join(" ")}`.trim() : `${getToolDisplayName(tool)} ${currentArgs.join(" ")}`;
   const runCommand2 = currentArgs.join(" ");
   useInput8(
-    (_input, key) => {
+    (input2, key) => {
       if (key.escape) {
         abort();
         onBack();
+        return;
+      }
+      if (input2 === "x" && !aborting) {
+        abort();
+        setAborting(true);
+        setFeedback("Aborting...");
+        return;
+      }
+      if (input2 === "c") {
+        const output2 = [partialStdout, partialStderr].filter(Boolean).join("\n");
+        copyToClipboard(output2).then(() => setFeedback("Copied to clipboard"));
+        return;
       }
     },
     { isActive: isInputActive && phase === "running" }
   );
   useInput8(
-    (input2, key) => {
-      if (input2 === "o" && !outputFocused) {
-        setOutputFocused(true);
-      }
-      if (key.escape && outputFocused) {
-        setOutputFocused(false);
+    (input2, _key) => {
+      if (input2 === "/") {
+        setOutputFocused((prev) => !prev);
       }
     },
-    { isActive: isInputActive && phase === "error-menu" }
+    { isActive: isInputActive && (phase === "error-menu" || phase === "success") }
   );
   useEffect9(() => {
     if (phase === "background-started") {
@@ -2070,6 +2042,12 @@ function CommandExecution({
       setPhase("error-menu");
     }
   }, [phase, runCommand2, status]);
+  useEffect9(() => {
+    if (feedback) {
+      const timer = setTimeout(() => setFeedback(void 0), 2e3);
+      return () => clearTimeout(timer);
+    }
+  }, [feedback]);
   if (phase === "confirm") {
     const pinned = isPinnedRun(runCommand2);
     const confirmItems = [
@@ -2086,17 +2064,17 @@ function CommandExecution({
       },
       { value: "cancel", label: "\u2190 Cancel" }
     ];
-    const confirmContent = /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs15(Box13, { marginBottom: 1, gap: 1, children: [
-        /* @__PURE__ */ jsxs15(Text17, { color: inkColors.accent, bold: true, children: [
+    const confirmContent = /* @__PURE__ */ jsxs14(Box13, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsxs14(Box13, { marginBottom: 1, gap: 1, children: [
+        /* @__PURE__ */ jsxs14(Text15, { color: inkColors.accent, bold: true, children: [
           "\u25B6",
           " ",
           cmdDisplay
         ] }),
-        /* @__PURE__ */ jsx17(ToolBadge, { tool })
+        /* @__PURE__ */ jsx15(ToolBadge, { tool })
       ] }),
-      pinMessage && /* @__PURE__ */ jsx17(Box13, { marginBottom: 1, children: /* @__PURE__ */ jsx17(Text17, { color: inkColors.accent, children: pinMessage }) }),
-      /* @__PURE__ */ jsx17(
+      pinMessage && /* @__PURE__ */ jsx15(Box13, { marginBottom: 1, children: /* @__PURE__ */ jsx15(Text15, { color: inkColors.accent, children: pinMessage }) }),
+      /* @__PURE__ */ jsx15(
         SelectList,
         {
           items: confirmItems,
@@ -2139,7 +2117,7 @@ function CommandExecution({
         }
       )
     ] });
-    return /* @__PURE__ */ jsx17(Box13, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: panelMode ? /* @__PURE__ */ jsx17(
+    return /* @__PURE__ */ jsx15(Box13, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: panelMode ? /* @__PURE__ */ jsx15(
       Box13,
       {
         flexDirection: "column",
@@ -2152,54 +2130,71 @@ function CommandExecution({
     ) : confirmContent });
   }
   if (phase === "background-started") {
-    return /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: [
-      /* @__PURE__ */ jsxs15(Box13, { marginY: 1, gap: 1, children: [
-        /* @__PURE__ */ jsx17(Text17, { color: "#3ECF8E", bold: true, children: "\u2713" }),
-        /* @__PURE__ */ jsx17(Text17, { color: "#3ECF8E", bold: true, children: "Started in background" })
+    return /* @__PURE__ */ jsxs14(Box13, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: [
+      /* @__PURE__ */ jsxs14(Box13, { marginY: 1, gap: 1, children: [
+        /* @__PURE__ */ jsx15(Text15, { color: "#3ECF8E", bold: true, children: "\u2713" }),
+        /* @__PURE__ */ jsx15(Text15, { color: "#3ECF8E", bold: true, children: "Started in background" })
       ] }),
-      /* @__PURE__ */ jsxs15(Box13, { children: [
-        /* @__PURE__ */ jsx17(Text17, { dimColor: true, children: "Command: " }),
-        /* @__PURE__ */ jsx17(Text17, { children: cmdDisplay })
+      /* @__PURE__ */ jsxs14(Box13, { children: [
+        /* @__PURE__ */ jsx15(Text15, { dimColor: true, children: "Command: " }),
+        /* @__PURE__ */ jsx15(Text15, { children: cmdDisplay })
       ] })
     ] });
   }
   if (phase === "running") {
-    const hasPartialOutput = partialStdout.length > 0 || partialStderr.length > 0;
-    const streamOutputHeight = Math.max(3, height - 10);
-    return /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: [
-      /* @__PURE__ */ jsx17(Divider, { width: panelMode ? width - 4 : width }),
-      /* @__PURE__ */ jsxs15(Box13, { marginY: 1, gap: 1, children: [
-        /* @__PURE__ */ jsx17(Text17, { color: inkColors.accent, bold: true, children: "\u25B6" }),
-        /* @__PURE__ */ jsx17(Text17, { dimColor: true, children: "Running:" }),
-        /* @__PURE__ */ jsx17(Text17, { children: cmdDisplay }),
-        /* @__PURE__ */ jsx17(ToolBadge, { tool })
+    const outputText = [partialStdout, partialStderr].filter(Boolean).join("\n");
+    const outputLines = outputText ? stripAnsi(outputText).split("\n") : [];
+    const logBoxHeight = Math.max(3, height - 7);
+    const cardWidth = Math.max(30, (panelMode ? width - 4 : width) - 2);
+    return /* @__PURE__ */ jsxs14(Box13, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: [
+      /* @__PURE__ */ jsxs14(Box13, { marginBottom: 1, gap: 1, children: [
+        /* @__PURE__ */ jsxs14(Text15, { color: inkColors.accent, bold: true, children: [
+          "\u25B6",
+          " ",
+          cmdDisplay
+        ] }),
+        /* @__PURE__ */ jsx15(ToolBadge, { tool }),
+        /* @__PURE__ */ jsxs14(Text15, { color: aborting ? "yellow" : "green", children: [
+          "\u25CF ",
+          aborting ? "aborting" : "running"
+        ] })
       ] }),
-      /* @__PURE__ */ jsx17(Divider, { width: panelMode ? width - 4 : width }),
-      /* @__PURE__ */ jsx17(Box13, { marginTop: 1, children: /* @__PURE__ */ jsx17(Spinner, { label: `Executing ${cmdDisplay}...` }) }),
-      hasPartialOutput && /* @__PURE__ */ jsx17(
-        CommandOutput,
+      /* @__PURE__ */ jsx15(
+        Box13,
         {
-          stdout: partialStdout,
-          stderr: partialStderr,
-          height: streamOutputHeight,
-          isActive: false
+          flexDirection: "column",
+          borderStyle: "round",
+          borderColor: inkColors.accent,
+          paddingX: 1,
+          width: cardWidth,
+          children: /* @__PURE__ */ jsx15(
+            ScrollableBox,
+            {
+              height: logBoxHeight,
+              isActive: isInputActive,
+              autoScrollToBottom: true,
+              children: outputLines.length === 0 ? [/* @__PURE__ */ jsx15(Text15, { dimColor: true, children: "Waiting for output..." }, "empty")] : outputLines.map((line, i) => /* @__PURE__ */ jsx15(Text15, { wrap: "truncate", children: line }, i))
+            }
+          )
         }
       ),
-      /* @__PURE__ */ jsxs15(Box13, { marginTop: 1, children: [
-        /* @__PURE__ */ jsx17(Text17, { dimColor: true, children: "Press " }),
-        /* @__PURE__ */ jsx17(Text17, { color: inkColors.accent, children: "Esc" }),
-        /* @__PURE__ */ jsx17(Text17, { dimColor: true, children: " to abort" })
+      feedback && /* @__PURE__ */ jsx15(Box13, { children: /* @__PURE__ */ jsx15(Text15, { color: inkColors.accent, children: feedback }) }),
+      /* @__PURE__ */ jsxs14(Box13, { marginTop: 1, gap: 2, children: [
+        /* @__PURE__ */ jsx15(Text15, { dimColor: true, children: "\u2191\u2193:scroll" }),
+        /* @__PURE__ */ jsx15(Text15, { dimColor: true, children: "x:abort" }),
+        /* @__PURE__ */ jsx15(Text15, { dimColor: true, children: "c:copy" }),
+        /* @__PURE__ */ jsx15(Text15, { dimColor: true, children: "Esc:back" })
       ] })
     ] });
   }
   if (phase === "success-pin-offer") {
-    return /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: [
-      /* @__PURE__ */ jsx17(Divider, { width: panelMode ? width - 4 : width }),
-      /* @__PURE__ */ jsxs15(Box13, { marginY: 1, gap: 1, children: [
-        /* @__PURE__ */ jsx17(Text17, { color: inkColors.accent, bold: true, children: "\u2713" }),
-        /* @__PURE__ */ jsx17(Text17, { color: inkColors.accent, bold: true, children: "Command completed successfully!" })
+    return /* @__PURE__ */ jsxs14(Box13, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: [
+      /* @__PURE__ */ jsx15(Divider, { width: panelMode ? width - 4 : width }),
+      /* @__PURE__ */ jsxs14(Box13, { marginY: 1, gap: 1, children: [
+        /* @__PURE__ */ jsx15(Text15, { color: inkColors.accent, bold: true, children: "\u2713" }),
+        /* @__PURE__ */ jsx15(Text15, { color: inkColors.accent, bold: true, children: "Command completed successfully!" })
       ] }),
-      /* @__PURE__ */ jsx17(
+      /* @__PURE__ */ jsx15(
         ConfirmPrompt,
         {
           message: "Pin this exact command?",
@@ -2222,24 +2217,49 @@ function CommandExecution({
     const successItems = [
       { value: "__back__", label: "\u2190 Back to menu" }
     ];
-    const outputHeight = Math.max(3, height - 12);
-    return /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: [
-      /* @__PURE__ */ jsx17(Divider, { width: panelMode ? width - 4 : width }),
-      /* @__PURE__ */ jsxs15(Box13, { marginY: 1, gap: 1, children: [
-        /* @__PURE__ */ jsx17(Text17, { color: inkColors.accent, bold: true, children: "\u2713" }),
-        /* @__PURE__ */ jsx17(Text17, { color: inkColors.accent, bold: true, children: "Command completed successfully!" })
+    const successOutput = [result?.stdout, result?.stderr].filter(Boolean).join("\n");
+    const successLines = successOutput ? stripAnsi(successOutput).split("\n") : [];
+    const successLogHeight = Math.max(3, height - 9 - (pinMessage ? 1 : 0));
+    const successCardWidth = Math.max(30, (panelMode ? width - 4 : width) - 2);
+    return /* @__PURE__ */ jsxs14(Box13, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: [
+      /* @__PURE__ */ jsxs14(Box13, { marginBottom: 1, gap: 1, children: [
+        /* @__PURE__ */ jsxs14(Text15, { color: inkColors.accent, bold: true, children: [
+          "\u2713",
+          " ",
+          cmdDisplay
+        ] }),
+        /* @__PURE__ */ jsx15(ToolBadge, { tool }),
+        /* @__PURE__ */ jsx15(Text15, { color: "green", children: "\u25CF completed" })
       ] }),
-      pinMessage && /* @__PURE__ */ jsx17(Box13, { marginBottom: 1, children: /* @__PURE__ */ jsx17(Text17, { color: inkColors.accent, children: pinMessage }) }),
-      /* @__PURE__ */ jsx17(
-        CommandOutput,
+      pinMessage && /* @__PURE__ */ jsx15(Box13, { marginBottom: 1, children: /* @__PURE__ */ jsx15(Text15, { color: inkColors.accent, children: pinMessage }) }),
+      /* @__PURE__ */ jsx15(
+        Box13,
         {
-          stdout: result?.stdout,
-          stderr: result?.stderr,
-          height: outputHeight,
-          isActive: isInputActive
+          flexDirection: "column",
+          borderStyle: "round",
+          borderColor: outputFocused ? inkColors.accent : panel.borderDim,
+          paddingX: 1,
+          width: successCardWidth,
+          children: /* @__PURE__ */ jsx15(
+            ScrollableBox,
+            {
+              height: successLogHeight,
+              isActive: isInputActive && outputFocused,
+              autoScrollToBottom: true,
+              children: successLines.length === 0 ? [/* @__PURE__ */ jsx15(Text15, { dimColor: true, children: "No output" }, "empty")] : successLines.map((line, i) => /* @__PURE__ */ jsx15(Text15, { wrap: "truncate", children: line }, i))
+            }
+          )
         }
       ),
-      /* @__PURE__ */ jsx17(
+      /* @__PURE__ */ jsxs14(Box13, { marginTop: 1, gap: 2, children: [
+        /* @__PURE__ */ jsxs14(Text15, { dimColor: true, children: [
+          "/:",
+          outputFocused ? "menu" : "scroll"
+        ] }),
+        outputFocused && /* @__PURE__ */ jsx15(Text15, { dimColor: true, children: "\u2191\u2193:scroll" }),
+        /* @__PURE__ */ jsx15(Text15, { dimColor: true, children: "Esc:back" })
+      ] }),
+      /* @__PURE__ */ jsx15(
         SelectList,
         {
           items: successItems,
@@ -2247,10 +2267,10 @@ function CommandExecution({
           onCancel: onHome ?? onBack,
           width: panelMode ? Math.max(20, width - 4) : width,
           maxVisible: panelMode ? Math.max(6, height - 6) : void 0,
-          isInputActive,
+          isInputActive: isInputActive && !outputFocused,
           arrowNavigation: panelMode,
           boxedSections: panelMode,
-          panelFocused: isInputActive
+          panelFocused: isInputActive && !outputFocused
         }
       )
     ] });
@@ -2313,65 +2333,67 @@ function CommandExecution({
     value: "menu",
     label: "\u2190 Back to menu"
   });
-  return /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: [
-    /* @__PURE__ */ jsx17(Divider, { width: panelMode ? width - 4 : width }),
-    result?.spawnError ? /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", marginY: 1, children: [
-      /* @__PURE__ */ jsxs15(Box13, { gap: 1, children: [
-        /* @__PURE__ */ jsx17(Text17, { color: "red", bold: true, children: "\u2717" }),
-        /* @__PURE__ */ jsx17(Text17, { color: "red", bold: true, children: "Failed to start command" })
-      ] }),
-      /* @__PURE__ */ jsxs15(Box13, { marginLeft: 2, marginTop: 1, children: [
-        /* @__PURE__ */ jsx17(Text17, { dimColor: true, children: "Error: " }),
-        /* @__PURE__ */ jsx17(Text17, { color: "red", children: result.spawnError })
-      ] }),
-      (result.spawnError.includes("ENOENT") || result.spawnError.includes("not found")) && /* @__PURE__ */ jsx17(Box13, { flexDirection: "column", marginLeft: 2, marginTop: 1, children: /* @__PURE__ */ jsxs15(Text17, { color: inkColors.accent, bold: true, children: [
-        "\u{1F4A1}",
+  const errorOutput = [result?.stdout, result?.stderr].filter(Boolean).join("\n");
+  const errorLines = errorOutput ? stripAnsi(errorOutput).split("\n") : [];
+  const errorLogHeight = Math.max(3, height - 8 - Math.min(errorItems.length, 6) - (copyMessage ? 1 : 0));
+  const errorCardWidth = Math.max(30, (panelMode ? width - 4 : width) - 2);
+  const errorStatusLabel = result?.spawnError ? "spawn error" : `exit ${result?.exitCode}`;
+  return /* @__PURE__ */ jsxs14(Box13, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: [
+    /* @__PURE__ */ jsxs14(Box13, { marginBottom: 1, gap: 1, children: [
+      /* @__PURE__ */ jsxs14(Text15, { color: "red", bold: true, children: [
+        "\u2717",
         " ",
+        cmdDisplay
+      ] }),
+      /* @__PURE__ */ jsx15(ToolBadge, { tool }),
+      /* @__PURE__ */ jsxs14(Text15, { color: "red", children: [
+        "\u25CF ",
+        errorStatusLabel
+      ] })
+    ] }),
+    result?.spawnError && /* @__PURE__ */ jsxs14(Box13, { marginBottom: 1, children: [
+      /* @__PURE__ */ jsx15(Text15, { dimColor: true, children: "Error: " }),
+      /* @__PURE__ */ jsx15(Text15, { color: "red", children: result.spawnError }),
+      (result.spawnError.includes("ENOENT") || result.spawnError.includes("not found")) && /* @__PURE__ */ jsxs14(Text15, { color: inkColors.accent, children: [
+        " \u2014 ",
         tool,
         " CLI not found in this repository or PATH"
-      ] }) })
-    ] }) : /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", marginY: 1, children: [
-      /* @__PURE__ */ jsxs15(Box13, { gap: 1, children: [
-        /* @__PURE__ */ jsx17(Text17, { color: "red", bold: true, children: "\u2717" }),
-        /* @__PURE__ */ jsx17(Text17, { color: "red", children: "Command failed " }),
-        /* @__PURE__ */ jsx17(Text17, { dimColor: true, children: "(exit code " }),
-        /* @__PURE__ */ jsx17(Text17, { color: "red", bold: true, children: String(result?.exitCode) }),
-        /* @__PURE__ */ jsx17(Text17, { dimColor: true, children: ")" })
-      ] }),
-      /* @__PURE__ */ jsxs15(Box13, { marginLeft: 2, marginTop: 1, children: [
-        /* @__PURE__ */ jsx17(Text17, { dimColor: true, children: "Command: " }),
-        /* @__PURE__ */ jsx17(Text17, { children: cmdDisplay })
-      ] }),
-      !hasDebug && /* @__PURE__ */ jsxs15(Box13, { marginLeft: 2, marginTop: 1, gap: 1, children: [
-        /* @__PURE__ */ jsxs15(Text17, { dimColor: true, children: [
-          "\u{1F4A1}",
-          " Tip: retry with"
-        ] }),
-        /* @__PURE__ */ jsx17(Text17, { color: inkColors.accent, children: "--debug" }),
-        /* @__PURE__ */ jsx17(Text17, { dimColor: true, children: "to see detailed logs" })
       ] })
     ] }),
-    /* @__PURE__ */ jsx17(
-      CommandOutput,
+    !result?.spawnError && !hasDebug && /* @__PURE__ */ jsxs14(Box13, { marginBottom: 1, gap: 1, children: [
+      /* @__PURE__ */ jsx15(Text15, { dimColor: true, children: "\u{1F4A1} Tip: retry with" }),
+      /* @__PURE__ */ jsx15(Text15, { color: inkColors.accent, children: "--debug" }),
+      /* @__PURE__ */ jsx15(Text15, { dimColor: true, children: "to see detailed logs" })
+    ] }),
+    /* @__PURE__ */ jsx15(
+      Box13,
       {
-        stdout: result?.stdout,
-        stderr: result?.stderr,
-        height: Math.max(3, height - 14 - errorItems.length - (suggestions.length > 0 ? suggestions.length + 4 : 0) - (copyMessage ? 1 : 0)),
-        isActive: isInputActive && outputFocused
+        flexDirection: "column",
+        borderStyle: "round",
+        borderColor: outputFocused ? "red" : panel.borderDim,
+        paddingX: 1,
+        width: errorCardWidth,
+        children: /* @__PURE__ */ jsx15(
+          ScrollableBox,
+          {
+            height: errorLogHeight,
+            isActive: isInputActive && outputFocused,
+            autoScrollToBottom: true,
+            children: errorLines.length === 0 ? [/* @__PURE__ */ jsx15(Text15, { dimColor: true, children: "No output" }, "empty")] : errorLines.map((line, i) => /* @__PURE__ */ jsx15(Text15, { wrap: "truncate", children: line }, i))
+          }
+        )
       }
     ),
-    copyMessage && /* @__PURE__ */ jsx17(Box13, { marginTop: 1, children: /* @__PURE__ */ jsx17(Text17, { color: inkColors.accent, children: copyMessage }) }),
-    outputFocused ? /* @__PURE__ */ jsxs15(Box13, { marginTop: 1, children: [
-      /* @__PURE__ */ jsx17(Text17, { dimColor: true, children: "j/k scroll \xB7 " }),
-      /* @__PURE__ */ jsx17(Text17, { color: inkColors.accent, children: "Esc" }),
-      /* @__PURE__ */ jsx17(Text17, { dimColor: true, children: " back to menu" })
-    ] }) : /* @__PURE__ */ jsxs15(Box13, { marginTop: 1, marginBottom: 1, children: [
-      /* @__PURE__ */ jsx17(Text17, { bold: true, children: "What would you like to do?" }),
-      /* @__PURE__ */ jsx17(Text17, { dimColor: true, children: "  (press " }),
-      /* @__PURE__ */ jsx17(Text17, { color: inkColors.accent, children: "o" }),
-      /* @__PURE__ */ jsx17(Text17, { dimColor: true, children: " to scroll output)" })
+    copyMessage && /* @__PURE__ */ jsx15(Box13, { children: /* @__PURE__ */ jsx15(Text15, { color: inkColors.accent, children: copyMessage }) }),
+    /* @__PURE__ */ jsxs14(Box13, { marginTop: 1, gap: 2, children: [
+      /* @__PURE__ */ jsxs14(Text15, { dimColor: true, children: [
+        "/:",
+        outputFocused ? "menu" : "scroll"
+      ] }),
+      outputFocused && /* @__PURE__ */ jsx15(Text15, { dimColor: true, children: "\u2191\u2193:scroll" }),
+      /* @__PURE__ */ jsx15(Text15, { dimColor: true, children: "Esc:back" })
     ] }),
-    /* @__PURE__ */ jsx17(
+    /* @__PURE__ */ jsx15(
       SelectList,
       {
         items: errorItems,
@@ -2395,6 +2417,8 @@ function CommandExecution({
             case "retry":
               setPinMessage(void 0);
               setCopyMessage(void 0);
+              setAborting(false);
+              setFeedback(void 0);
               reset();
               setPhase("running");
               break;
@@ -2403,6 +2427,8 @@ function CommandExecution({
               setCurrentArgs(newArgs);
               setPinMessage(void 0);
               setCopyMessage(void 0);
+              setAborting(false);
+              setFeedback(void 0);
               reset();
               setPhase("running");
               break;
@@ -2441,13 +2467,54 @@ function CommandExecution({
         panelFocused: isInputActive && !outputFocused
       }
     ),
-    !panelMode && /* @__PURE__ */ jsx17(StatusBar, { width })
+    !panelMode && /* @__PURE__ */ jsx15(StatusBar, { width })
   ] });
 }
 
 // src/screens/SelfUpdate.tsx
 import { useEffect as useEffect10, useState as useState13 } from "react";
 import { Box as Box14, Text as Text18 } from "ink";
+
+// src/components/Spinner.tsx
+import { Text as Text16 } from "ink";
+import InkSpinner from "ink-spinner";
+import { jsx as jsx16, jsxs as jsxs15 } from "react/jsx-runtime";
+function Spinner({
+  label = "Running...",
+  color = inkColors.accent
+}) {
+  return /* @__PURE__ */ jsxs15(Text16, { children: [
+    /* @__PURE__ */ jsx16(Text16, { color, children: /* @__PURE__ */ jsx16(InkSpinner, { type: "dots" }) }),
+    " ",
+    /* @__PURE__ */ jsx16(Text16, { children: label })
+  ] });
+}
+
+// src/components/CommandOutput.tsx
+import { Text as Text17 } from "ink";
+import { jsx as jsx17 } from "react/jsx-runtime";
+function cleanLines(raw) {
+  const stripped = stripAnsi(raw);
+  return stripped.replace(/\r/g, "").split("\n").filter((line) => line.length > 0);
+}
+function CommandOutput({
+  stdout,
+  stderr,
+  height,
+  isActive = false
+}) {
+  const outLines = stdout ? cleanLines(stdout) : [];
+  const errLines = stderr ? cleanLines(stderr) : [];
+  if (outLines.length === 0 && errLines.length === 0) {
+    return null;
+  }
+  return /* @__PURE__ */ jsx17(ScrollableBox, { height: Math.max(3, height), isActive, children: [
+    ...outLines.map((line, i) => /* @__PURE__ */ jsx17(Text17, { children: line }, `o-${i}`)),
+    ...errLines.map((line, i) => /* @__PURE__ */ jsx17(Text17, { color: "red", children: line }, `e-${i}`))
+  ] });
+}
+
+// src/screens/SelfUpdate.tsx
 import { jsx as jsx18, jsxs as jsxs16 } from "react/jsx-runtime";
 var packageName = "@polterware/polter";
 var globalUpdateArgs = ["install", "-g", `${packageName}@latest`];
@@ -7576,13 +7643,21 @@ Apply completed with ${errors.length} error(s).
       process.exit(result.exitCode ?? 0);
     }
     const AppComponent2 = parsed.classic ? AppClassic : AppPanel;
+    const socketPath2 = getSocketPath();
+    const ipc2 = socketPath2 ? createIpcServer(socketPath2) : null;
+    if (ipc2) await ipc2.start();
     const inst = render(React28.createElement(AppComponent2));
     await inst.waitUntilExit();
+    if (ipc2) await ipc2.stop();
     process.exit(0);
   }
   const AppComponent = parsed.classic ? AppClassic : AppPanel;
+  const socketPath = getSocketPath();
+  const ipc = socketPath ? createIpcServer(socketPath) : null;
+  if (ipc) await ipc.start();
   const instance = render(React28.createElement(AppComponent));
   await instance.waitUntilExit();
+  if (ipc) await ipc.stop();
   process.exit(0);
 }
 main().catch((error) => {