@polterware/polter 0.1.1 → 0.2.0

package/dist/index.js

@@ -24,7 +24,7 @@ import {
   runSupabaseCommand,
   savePipeline,
   writeProjectConfig
-} from "./chunk-TWWRDI3Q.js";
+} from "./chunk-2OZZNSKW.js";
 
 // src/index.tsx
 import React19 from "react";
@@ -743,8 +743,8 @@ function buildHomeItems({
     kind: "header",
     selectable: false
   });
-  const toolOrder = { supabase: 0, vercel: 1, gh: 2, pulumi: 3 };
-  const toolIcons = { supabase: "\u{1F7E2}", vercel: "\u26AA", gh: "\u{1F535}", pulumi: "\u{1F7E3}" };
+  const toolOrder = { supabase: 0, vercel: 1, gh: 2, git: 3 };
+  const toolIcons = { supabase: "\u{1F7E2}", vercel: "\u26AA", gh: "\u{1F535}", git: "\u{1F7E0}" };
   const grouped = /* @__PURE__ */ new Map();
   for (const cmd of activeFeature.commands) {
     const existing = grouped.get(cmd.tool) ?? [];
@@ -997,13 +997,13 @@ var toolColors = {
   supabase: "#3ECF8E",
   gh: "#58A6FF",
   vercel: "#FFFFFF",
-  pulumi: "#8B5CF6"
+  git: "#F05032"
 };
 var toolLabels = {
   supabase: "supabase",
   gh: "github",
   vercel: "vercel",
-  pulumi: "pulumi"
+  git: "git"
 };
 function ToolBadge({ tool }) {
   return /* @__PURE__ */ jsx7(Text7, { color: toolColors[tool], dimColor: true, children: toolLabels[tool] });
@@ -1255,24 +1255,28 @@ function CustomCommand({
   onNavigate,
   onBack,
   width = 80,
+  height = 24,
   panelMode = false,
   isInputActive = true
 }) {
   const [phase, setPhase] = useState7("tool-select");
   const [selectedTool, setSelectedTool] = useState7("supabase");
   if (phase === "tool-select") {
-    return /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", children: [
+    const toolItems = [
+      { value: "__section__", label: "\u{1F6E0} Select Tool", kind: "header", selectable: false },
+      { value: "supabase", label: "Supabase CLI", hint: "supabase ...", kind: "action" },
+      { value: "gh", label: "GitHub CLI", hint: "gh ...", kind: "action" },
+      { value: "vercel", label: "Vercel CLI", hint: "vercel ...", kind: "action" },
+      { value: "git", label: "Git", hint: "git ...", kind: "action" },
+      ...!panelMode ? [{ value: "__back__", label: "\u2190 Back" }] : []
+    ];
+    return /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: [
       /* @__PURE__ */ jsx9(Box8, { marginBottom: 1, children: /* @__PURE__ */ jsx9(Text9, { bold: true, color: inkColors.accent, children: "\u270F\uFE0F Custom Command" }) }),
-      /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: "Select tool:" }),
+      !panelMode && /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: "Select tool:" }),
       /* @__PURE__ */ jsx9(
         SelectList,
         {
-          items: [
-            { value: "supabase", label: "Supabase CLI", hint: "supabase ..." },
-            { value: "gh", label: "GitHub CLI", hint: "gh ..." },
-            { value: "vercel", label: "Vercel CLI", hint: "vercel ..." },
-            { value: "__back__", label: "\u2190 Back" }
-          ],
+          items: toolItems,
           onSelect: (value) => {
             if (value === "__back__") {
               onBack();
@@ -1282,7 +1286,9 @@ function CustomCommand({
             setPhase("input");
           },
           onCancel: onBack,
-          width,
+          boxedSections: panelMode,
+          width: panelMode ? Math.max(20, width - 4) : width,
+          maxVisible: panelMode ? Math.max(6, height - 6) : void 0,
           isInputActive,
           arrowNavigation: panelMode
         }
@@ -1290,7 +1296,7 @@ function CustomCommand({
       !panelMode && /* @__PURE__ */ jsx9(StatusBar, { hint: "\u2191\u2193 navigate \xB7 Enter select \xB7 Esc back", width })
     ] });
   }
-  return /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", children: [
+  return /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: [
     /* @__PURE__ */ jsxs8(Box8, { marginBottom: 1, gap: 1, children: [
       /* @__PURE__ */ jsx9(Text9, { bold: true, color: inkColors.accent, children: "\u270F\uFE0F Custom Command" }),
       /* @__PURE__ */ jsxs8(Text9, { dimColor: true, children: [
@@ -1329,7 +1335,9 @@ import { jsx as jsx10, jsxs as jsxs9 } from "react/jsx-runtime";
 function FlagToggle({
   flags,
   onSubmit,
-  onCancel
+  onCancel,
+  isInputActive = true,
+  arrowNavigation = false
 }) {
   const [cursor, setCursor] = useState8(0);
   const [selected, setSelected] = useState8(/* @__PURE__ */ new Set());
@@ -1358,7 +1366,10 @@ function FlagToggle({
     if (key.escape && onCancel) {
       onCancel();
     }
-  });
+    if (arrowNavigation && key.leftArrow && onCancel) {
+      onCancel();
+    }
+  }, { isActive: isInputActive });
   return /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", children: [
     /* @__PURE__ */ jsxs9(Box9, { marginBottom: 1, children: [
       /* @__PURE__ */ jsx10(Text10, { bold: true, color: inkColors.accent, children: "\u2691 Global Flags" }),
@@ -1417,7 +1428,9 @@ function FlagSelection({
           const finalArgs = selectedFlags.length > 0 ? [...args, ...selectedFlags] : args;
           onNavigate("confirm-execute", { args: finalArgs, tool });
         },
-        onCancel: onBack
+        onCancel: onBack,
+        isInputActive,
+        arrowNavigation: panelMode
       }
     ),
     !panelMode && /* @__PURE__ */ jsx11(StatusBar, { hint: "Space toggle \xB7 Enter confirm \xB7 Esc back", width })
@@ -1449,9 +1462,20 @@ import { jsx as jsx13, jsxs as jsxs12 } from "react/jsx-runtime";
 function ConfirmPrompt({
   message,
   defaultValue = true,
-  onConfirm
+  onConfirm,
+  onCancel,
+  isInputActive = true,
+  arrowNavigation = false
 }) {
-  useInput5((input2) => {
+  useInput5((input2, key) => {
+    if (key.escape && onCancel) {
+      onCancel();
+      return;
+    }
+    if (arrowNavigation && key.leftArrow && onCancel) {
+      onCancel();
+      return;
+    }
     if (input2 === "y" || input2 === "Y") {
       onConfirm(true);
     } else if (input2 === "n" || input2 === "N") {
@@ -1459,7 +1483,7 @@ function ConfirmPrompt({
     } else if (input2 === "\r") {
       onConfirm(defaultValue);
     }
-  });
+  }, { isActive: isInputActive });
   return /* @__PURE__ */ jsxs12(Box11, { gap: 1, children: [
     /* @__PURE__ */ jsx13(Text12, { color: inkColors.accent, bold: true, children: "?" }),
     /* @__PURE__ */ jsx13(Text12, { children: message }),
@@ -1548,6 +1572,7 @@ function CommandExecution({
   onBack,
   onExit,
   width = 80,
+  height = 24,
   panelMode = false,
   isInputActive = true
 }) {
@@ -1575,7 +1600,7 @@ function CommandExecution({
     }
   }, [phase, runCommand2, status]);
   if (phase === "confirm") {
-    return /* @__PURE__ */ jsx15(Box12, { flexDirection: "column", children: /* @__PURE__ */ jsx15(
+    return /* @__PURE__ */ jsx15(Box12, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: /* @__PURE__ */ jsx15(
       ConfirmPrompt,
       {
         message: `Execute ${cmdDisplay}?`,
@@ -1586,26 +1611,29 @@ function CommandExecution({
           } else {
             onBack();
           }
-        }
+        },
+        onCancel: onBack,
+        isInputActive,
+        arrowNavigation: panelMode
       }
     ) });
   }
   if (phase === "running") {
-    return /* @__PURE__ */ jsxs14(Box12, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx15(Divider, { width }),
+    return /* @__PURE__ */ jsxs14(Box12, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: [
+      /* @__PURE__ */ jsx15(Divider, { width: panelMode ? width - 4 : width }),
       /* @__PURE__ */ jsxs14(Box12, { marginY: 1, gap: 1, children: [
         /* @__PURE__ */ jsx15(Text14, { color: inkColors.accent, bold: true, children: "\u25B6" }),
         /* @__PURE__ */ jsx15(Text14, { dimColor: true, children: "Running:" }),
         /* @__PURE__ */ jsx15(Text14, { children: cmdDisplay }),
         /* @__PURE__ */ jsx15(ToolBadge, { tool })
       ] }),
-      /* @__PURE__ */ jsx15(Divider, { width }),
+      /* @__PURE__ */ jsx15(Divider, { width: panelMode ? width - 4 : width }),
       /* @__PURE__ */ jsx15(Box12, { marginTop: 1, children: /* @__PURE__ */ jsx15(Spinner, { label: `Executing ${cmdDisplay}...` }) })
     ] });
   }
   if (phase === "success-pin-offer") {
-    return /* @__PURE__ */ jsxs14(Box12, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx15(Divider, { width }),
+    return /* @__PURE__ */ jsxs14(Box12, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: [
+      /* @__PURE__ */ jsx15(Divider, { width: panelMode ? width - 4 : width }),
       /* @__PURE__ */ jsxs14(Box12, { marginY: 1, gap: 1, children: [
         /* @__PURE__ */ jsx15(Text14, { color: inkColors.accent, bold: true, children: "\u2713" }),
         /* @__PURE__ */ jsx15(Text14, { color: inkColors.accent, bold: true, children: "Command completed successfully!" })
@@ -1621,28 +1649,34 @@ function CommandExecution({
               setPinMessage("Exact command pinned to Pinned Runs.");
             }
             setPhase("success");
-          }
+          },
+          onCancel: () => setPhase("success"),
+          isInputActive,
+          arrowNavigation: panelMode
         }
       )
     ] });
   }
   if (phase === "success") {
-    return /* @__PURE__ */ jsxs14(Box12, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx15(Divider, { width }),
+    const successItems = panelMode ? [] : [{ value: "__back__", label: "\u2190 Back to menu" }];
+    return /* @__PURE__ */ jsxs14(Box12, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: [
+      /* @__PURE__ */ jsx15(Divider, { width: panelMode ? width - 4 : width }),
       /* @__PURE__ */ jsxs14(Box12, { marginY: 1, gap: 1, children: [
         /* @__PURE__ */ jsx15(Text14, { color: inkColors.accent, bold: true, children: "\u2713" }),
         /* @__PURE__ */ jsx15(Text14, { color: inkColors.accent, bold: true, children: "Command completed successfully!" })
       ] }),
       pinMessage && /* @__PURE__ */ jsx15(Box12, { marginBottom: 1, children: /* @__PURE__ */ jsx15(Text14, { color: inkColors.accent, children: pinMessage }) }),
-      /* @__PURE__ */ jsx15(
+      successItems.length > 0 && /* @__PURE__ */ jsx15(
         SelectList,
         {
-          items: [{ value: "__back__", label: "\u2190 Back to menu" }],
+          items: successItems,
           onSelect: onBack,
           onCancel: onBack,
-          width,
+          width: panelMode ? Math.max(20, width - 4) : width,
+          maxVisible: panelMode ? Math.max(6, height - 6) : void 0,
           isInputActive,
-          arrowNavigation: panelMode
+          arrowNavigation: panelMode,
+          boxedSections: panelMode
         }
       )
     ] });
@@ -1659,16 +1693,16 @@ function CommandExecution({
       });
     }
   }
-  errorItems.push(
-    {
-      value: "copy",
-      label: "\u{1F4CB} Copy command to clipboard"
-    },
-    { value: "menu", label: "\u2190 Return to main menu" },
-    { value: "exit", label: "\u{1F6AA} Exit Polter" }
-  );
-  return /* @__PURE__ */ jsxs14(Box12, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx15(Divider, { width }),
+  errorItems.push({
+    value: "copy",
+    label: "\u{1F4CB} Copy command to clipboard"
+  });
+  if (!panelMode) {
+    errorItems.push({ value: "menu", label: "\u2190 Return to main menu" });
+  }
+  errorItems.push({ value: "exit", label: "\u{1F6AA} Exit Polter" });
+  return /* @__PURE__ */ jsxs14(Box12, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: [
+    /* @__PURE__ */ jsx15(Divider, { width: panelMode ? width - 4 : width }),
     result?.spawnError ? /* @__PURE__ */ jsxs14(Box12, { flexDirection: "column", marginY: 1, children: [
       /* @__PURE__ */ jsxs14(Box12, { gap: 1, children: [
         /* @__PURE__ */ jsx15(Text14, { color: "red", bold: true, children: "\u2717" }),
@@ -1733,7 +1767,9 @@ function CommandExecution({
           }
         },
         onCancel: onBack,
-        width,
+        boxedSections: panelMode,
+        width: panelMode ? Math.max(20, width - 4) : width,
+        maxVisible: panelMode ? Math.max(6, height - 6) : void 0,
         isInputActive,
         arrowNavigation: panelMode
       }
@@ -1756,6 +1792,7 @@ function SelfUpdate({
   onBack,
   onExit,
   width = 80,
+  height = 24,
   panelMode = false,
   isInputActive = true
 }) {
@@ -1784,24 +1821,28 @@ function SelfUpdate({
     }
   }, [phase, status]);
   if (phase === "target") {
-    return /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", children: [
+    const targetItems = [
+      { value: "__section__", label: "\u{1F4E6} Update Target", kind: "header", selectable: false },
+      {
+        value: "repository",
+        label: "Current repository",
+        hint: "Pin the latest version in package.json",
+        kind: "action"
+      },
+      {
+        value: "global",
+        label: "Global install",
+        hint: "Update the shared version available in PATH",
+        kind: "action"
+      },
+      ...!panelMode ? [{ value: "back", label: "\u2190 Back to menu" }] : []
+    ];
+    return /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: [
       /* @__PURE__ */ jsx16(Box13, { marginBottom: 1, children: /* @__PURE__ */ jsx16(Text15, { bold: true, children: "Choose where to update Polter." }) }),
       /* @__PURE__ */ jsx16(
         SelectList,
         {
-          items: [
-            {
-              value: "repository",
-              label: "Current repository",
-              hint: "Pin the latest version in package.json"
-            },
-            {
-              value: "global",
-              label: "Global install",
-              hint: "Update the shared version available in PATH"
-            },
-            { value: "back", label: "\u2190 Back to menu" }
-          ],
+          items: targetItems,
           onSelect: (value) => {
             if (value === "back") {
               onBack();
@@ -1812,7 +1853,9 @@ function SelfUpdate({
             setPhase("confirm");
           },
           onCancel: onBack,
-          width,
+          boxedSections: panelMode,
+          width: panelMode ? Math.max(20, width - 4) : width,
+          maxVisible: panelMode ? Math.max(6, height - 6) : void 0,
           isInputActive,
           arrowNavigation: panelMode
         }
@@ -1824,7 +1867,7 @@ function SelfUpdate({
     ] });
   }
   if (phase === "confirm") {
-    return /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", children: [
+    return /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: [
       /* @__PURE__ */ jsx16(
         ConfirmPrompt,
         {
@@ -1841,7 +1884,16 @@ function SelfUpdate({
               return;
             }
             onBack();
-          }
+          },
+          onCancel: () => {
+            if (repositoryRoot) {
+              setPhase("target");
+            } else {
+              onBack();
+            }
+          },
+          isInputActive,
+          arrowNavigation: panelMode
         }
       ),
       /* @__PURE__ */ jsxs15(Box13, { marginTop: 1, marginLeft: 2, flexDirection: "column", children: [
@@ -1854,20 +1906,25 @@ function SelfUpdate({
     ] });
   }
   if (phase === "running") {
-    return /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx16(Divider, { width }),
+    return /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: [
+      /* @__PURE__ */ jsx16(Divider, { width: panelMode ? width - 4 : width }),
       /* @__PURE__ */ jsxs15(Box13, { marginY: 1, gap: 1, children: [
         /* @__PURE__ */ jsx16(Text15, { color: inkColors.accent, bold: true, children: "\u25B6" }),
         /* @__PURE__ */ jsx16(Text15, { dimColor: true, children: "Running:" }),
         /* @__PURE__ */ jsx16(Text15, { children: updateDisplay })
       ] }),
-      /* @__PURE__ */ jsx16(Divider, { width }),
+      /* @__PURE__ */ jsx16(Divider, { width: panelMode ? width - 4 : width }),
       /* @__PURE__ */ jsx16(Box13, { marginTop: 1, children: /* @__PURE__ */ jsx16(Spinner, { label: "Updating Polter..." }) })
     ] });
   }
   if (phase === "success") {
-    return /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx16(Divider, { width }),
+    const successItems = [
+      { value: "__section__", label: "\u2705 Update Complete", kind: "header", selectable: false },
+      ...!panelMode ? [{ value: "__back__", label: "\u2190 Back to menu", kind: "action" }] : [],
+      { value: "__exit__", label: "\u{1F6AA} Exit Polter", kind: "action" }
+    ];
+    return /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: [
+      /* @__PURE__ */ jsx16(Divider, { width: panelMode ? width - 4 : width }),
       /* @__PURE__ */ jsxs15(Box13, { marginY: 1, gap: 1, children: [
         /* @__PURE__ */ jsx16(Text15, { color: inkColors.accent, bold: true, children: "\u2713" }),
         /* @__PURE__ */ jsx16(Text15, { color: inkColors.accent, bold: true, children: "Update completed successfully!" })
@@ -1882,10 +1939,7 @@ function SelfUpdate({
       /* @__PURE__ */ jsx16(
         SelectList,
         {
-          items: [
-            { value: "__back__", label: "\u2190 Back to menu" },
-            { value: "__exit__", label: "\u{1F6AA} Exit Polter" }
-          ],
+          items: successItems,
           onSelect: (value) => {
             if (value === "__exit__") {
               onExit();
@@ -1894,15 +1948,24 @@ function SelfUpdate({
             onBack();
           },
           onCancel: onBack,
-          width,
+          boxedSections: panelMode,
+          width: panelMode ? Math.max(20, width - 4) : width,
+          maxVisible: panelMode ? Math.max(6, height - 6) : void 0,
           isInputActive,
           arrowNavigation: panelMode
         }
       )
     ] });
   }
-  return /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx16(Divider, { width }),
+  const errorItems = [
+    { value: "__section__", label: "\u{1F527} Recovery Options", kind: "header", selectable: false },
+    { value: "retry", label: "\u{1F504} Retry update", kind: "action" },
+    ...repositoryRoot ? [{ value: "target", label: "\u2194 Choose update target", kind: "action" }] : [],
+    ...!panelMode ? [{ value: "menu", label: "\u2190 Return to main menu", kind: "action" }] : [],
+    { value: "exit", label: "\u{1F6AA} Exit Polter", kind: "action" }
+  ];
+  return /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: [
+    /* @__PURE__ */ jsx16(Divider, { width: panelMode ? width - 4 : width }),
     result?.spawnError ? /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", marginY: 1, children: [
       /* @__PURE__ */ jsxs15(Box13, { gap: 1, children: [
         /* @__PURE__ */ jsx16(Text15, { color: "red", bold: true, children: "\u2717" }),
@@ -1933,16 +1996,11 @@ function SelfUpdate({
         repositoryRoot
       ] })
     ] }),
-    /* @__PURE__ */ jsx16(Box13, { marginTop: 1, marginBottom: 1, children: /* @__PURE__ */ jsx16(Text15, { bold: true, children: "What would you like to do?" }) }),
+    !panelMode && /* @__PURE__ */ jsx16(Box13, { marginTop: 1, marginBottom: 1, children: /* @__PURE__ */ jsx16(Text15, { bold: true, children: "What would you like to do?" }) }),
     /* @__PURE__ */ jsx16(
       SelectList,
       {
-        items: [
-          { value: "retry", label: "\u{1F504} Retry update" },
-          ...repositoryRoot ? [{ value: "target", label: "\u2194 Choose update target" }] : [],
-          { value: "menu", label: "\u2190 Return to main menu" },
-          { value: "exit", label: "\u{1F6AA} Exit Polter" }
-        ],
+        items: errorItems,
         onSelect: (value) => {
           switch (value) {
             case "retry":
@@ -1962,7 +2020,9 @@ function SelfUpdate({
           }
         },
         onCancel: onBack,
-        width,
+        boxedSections: panelMode,
+        width: panelMode ? Math.max(20, width - 4) : width,
+        maxVisible: panelMode ? Math.max(6, height - 6) : void 0,
         isInputActive,
         arrowNavigation: panelMode
       }
@@ -1975,9 +2035,19 @@ function SelfUpdate({
 import { useMemo as useMemo4 } from "react";
 import { Box as Box14, Text as Text16 } from "ink";
 import { jsx as jsx17, jsxs as jsxs16 } from "react/jsx-runtime";
-var toolIds = ["supabase", "gh", "vercel", "pulumi"];
-function ToolStatus({ onBack, width = 80, panelMode = false, isInputActive = true }) {
+var toolIds = ["supabase", "gh", "vercel", "git"];
+function ToolStatus({ onBack, width = 80, height = 24, panelMode = false, isInputActive = true }) {
   const tools = useMemo4(() => toolIds.map(getToolInfo), []);
+  if (panelMode) {
+    return /* @__PURE__ */ jsxs16(Box14, { flexDirection: "column", paddingX: 1, children: [
+      /* @__PURE__ */ jsx17(Box14, { marginBottom: 1, children: /* @__PURE__ */ jsx17(Text16, { bold: true, color: inkColors.accent, children: "\u{1F527} Tool Status" }) }),
+      tools.map((tool) => /* @__PURE__ */ jsxs16(Box14, { gap: 1, marginLeft: 2, children: [
+        /* @__PURE__ */ jsx17(Text16, { color: tool.installed ? inkColors.accent : "red", children: tool.installed ? "\u2713" : "\u2717" }),
+        /* @__PURE__ */ jsx17(Box14, { width: 16, children: /* @__PURE__ */ jsx17(Text16, { bold: true, children: tool.label }) }),
+        /* @__PURE__ */ jsx17(Text16, { dimColor: true, children: tool.installed ? tool.version ?? "installed" : "not found" })
+      ] }, tool.id))
+    ] });
+  }
   return /* @__PURE__ */ jsxs16(Box14, { flexDirection: "column", children: [
     /* @__PURE__ */ jsx17(Box14, { marginBottom: 1, children: /* @__PURE__ */ jsx17(Text16, { bold: true, color: inkColors.accent, children: "\u{1F527} Tool Status" }) }),
     tools.map((tool) => /* @__PURE__ */ jsxs16(Box14, { gap: 1, marginLeft: 2, children: [
@@ -1992,11 +2062,10 @@ function ToolStatus({ onBack, width = 80, panelMode = false, isInputActive = tru
         onSelect: onBack,
         onCancel: onBack,
         width,
-        isInputActive,
-        arrowNavigation: panelMode
+        isInputActive
       }
     ) }),
-    !panelMode && /* @__PURE__ */ jsx17(StatusBar, { hint: "Enter to go back", width })
+    /* @__PURE__ */ jsx17(StatusBar, { hint: "Enter to go back", width })
   ] });
 }
 
@@ -2081,6 +2150,7 @@ import { jsx as jsx18, jsxs as jsxs17 } from "react/jsx-runtime";
 function ProjectConfig({
   onBack,
   width = 80,
+  height = 24,
   panelMode = false,
   isInputActive = true
 }) {
@@ -2090,23 +2160,22 @@ function ProjectConfig({
   const [feedback, setFeedback] = useState13();
   const { openEditor, isEditing } = useEditor();
   if (!configPath) {
-    return /* @__PURE__ */ jsxs17(Box15, { flexDirection: "column", children: [
+    return /* @__PURE__ */ jsxs17(Box15, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: [
       /* @__PURE__ */ jsx18(Text17, { color: "red", children: "No package.json found. Run from a project directory." }),
-      /* @__PURE__ */ jsx18(
+      !panelMode && /* @__PURE__ */ jsx18(
         SelectList,
         {
           items: [{ value: "__back__", label: "\u2190 Back" }],
           onSelect: onBack,
           onCancel: onBack,
           width,
-          isInputActive,
-          arrowNavigation: panelMode
+          isInputActive
         }
       )
     ] });
   }
   if (phase === "edit-supabase-ref") {
-    return /* @__PURE__ */ jsx18(Box15, { flexDirection: "column", children: /* @__PURE__ */ jsx18(
+    return /* @__PURE__ */ jsx18(Box15, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: /* @__PURE__ */ jsx18(
       TextPrompt,
       {
         label: "Supabase project ref:",
@@ -2129,7 +2198,7 @@ function ProjectConfig({
     ) });
   }
   if (phase === "edit-vercel-id") {
-    return /* @__PURE__ */ jsx18(Box15, { flexDirection: "column", children: /* @__PURE__ */ jsx18(
+    return /* @__PURE__ */ jsx18(Box15, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: /* @__PURE__ */ jsx18(
       TextPrompt,
       {
         label: "Vercel project ID:",
@@ -2152,7 +2221,7 @@ function ProjectConfig({
     ) });
   }
   if (phase === "edit-gh-repo") {
-    return /* @__PURE__ */ jsx18(Box15, { flexDirection: "column", children: /* @__PURE__ */ jsx18(
+    return /* @__PURE__ */ jsx18(Box15, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: /* @__PURE__ */ jsx18(
       TextPrompt,
       {
         label: "GitHub repo (owner/name):",
@@ -2174,6 +2243,77 @@ function ProjectConfig({
       }
     ) });
   }
+  const configItems = [
+    { value: "__section_current__", label: "\u{1F4CB} Current Values", kind: "header", selectable: false },
+    { value: "__info_supabase__", label: `Supabase ref: ${config2.tools.supabase?.projectRef ?? "not set"}`, kind: "header", selectable: false },
+    { value: "__info_vercel__", label: `Vercel ID: ${config2.tools.vercel?.projectId ?? "not set"}`, kind: "header", selectable: false },
+    { value: "__info_gh__", label: `GitHub repo: ${config2.tools.gh?.repo ?? "not set"}`, kind: "header", selectable: false },
+    { value: "__section_actions__", label: "\u26A1 Actions", kind: "header", selectable: false },
+    { value: "supabase", label: "Set Supabase project ref", kind: "action" },
+    { value: "vercel", label: "Set Vercel project ID", kind: "action" },
+    { value: "gh", label: "Set GitHub repo", kind: "action" },
+    { value: "editor", label: "Open config in editor", kind: "action" },
+    ...!panelMode ? [{ value: "__back__", label: "\u2190 Back" }] : []
+  ];
+  const flatItems = [
+    { value: "supabase", label: "Set Supabase project ref" },
+    { value: "vercel", label: "Set Vercel project ID" },
+    { value: "gh", label: "Set GitHub repo" },
+    { value: "editor", label: "Open config in editor" },
+    ...!panelMode ? [{ value: "__back__", label: "\u2190 Back" }] : []
+  ];
+  const handleSelect = (value) => {
+    switch (value) {
+      case "supabase":
+        setPhase("edit-supabase-ref");
+        break;
+      case "vercel":
+        setPhase("edit-vercel-id");
+        break;
+      case "gh":
+        setPhase("edit-gh-repo");
+        break;
+      case "editor":
+        openEditor(configPath.file).then(() => {
+          try {
+            const reloaded = getOrCreateProjectConfig();
+            setConfig(reloaded);
+            setFeedback("Config reloaded from file");
+          } catch {
+            setFeedback("Warning: could not parse config after editing");
+          }
+        });
+        break;
+      default:
+        onBack();
+    }
+  };
+  if (panelMode) {
+    return /* @__PURE__ */ jsxs17(Box15, { flexDirection: "column", paddingX: 1, children: [
+      /* @__PURE__ */ jsx18(Box15, { marginBottom: 1, children: /* @__PURE__ */ jsx18(Text17, { bold: true, color: inkColors.accent, children: "\u2699\uFE0F Project Config" }) }),
+      /* @__PURE__ */ jsx18(Box15, { marginBottom: 1, marginLeft: 2, children: /* @__PURE__ */ jsxs17(Text17, { dimColor: true, children: [
+        "Path: ",
+        configPath.file
+      ] }) }),
+      feedback && /* @__PURE__ */ jsx18(Box15, { marginBottom: 1, children: /* @__PURE__ */ jsxs17(Text17, { color: inkColors.accent, children: [
+        "\u2713 ",
+        feedback
+      ] }) }),
+      /* @__PURE__ */ jsx18(
+        SelectList,
+        {
+          items: configItems,
+          onSelect: handleSelect,
+          onCancel: onBack,
+          boxedSections: true,
+          width: Math.max(20, width - 4),
+          maxVisible: Math.max(6, height - 6),
+          isInputActive,
+          arrowNavigation: true
+        }
+      )
+    ] });
+  }
   return /* @__PURE__ */ jsxs17(Box15, { flexDirection: "column", children: [
     /* @__PURE__ */ jsx18(Box15, { marginBottom: 1, children: /* @__PURE__ */ jsx18(Text17, { bold: true, color: inkColors.accent, children: "\u2699\uFE0F Project Config" }) }),
     /* @__PURE__ */ jsxs17(Box15, { marginBottom: 1, marginLeft: 2, flexDirection: "column", children: [
@@ -2201,46 +2341,15 @@ function ProjectConfig({
     /* @__PURE__ */ jsx18(
       SelectList,
       {
-        items: [
-          { value: "supabase", label: "Set Supabase project ref" },
-          { value: "vercel", label: "Set Vercel project ID" },
-          { value: "gh", label: "Set GitHub repo" },
-          { value: "editor", label: "Open config in editor" },
-          { value: "__back__", label: "\u2190 Back" }
-        ],
-        onSelect: (value) => {
-          switch (value) {
-            case "supabase":
-              setPhase("edit-supabase-ref");
-              break;
-            case "vercel":
-              setPhase("edit-vercel-id");
-              break;
-            case "gh":
-              setPhase("edit-gh-repo");
-              break;
-            case "editor":
-              openEditor(configPath.file).then(() => {
-                try {
-                  const reloaded = getOrCreateProjectConfig();
-                  setConfig(reloaded);
-                  setFeedback("Config reloaded from file");
-                } catch {
-                  setFeedback("Warning: could not parse config after editing");
-                }
-              });
-              break;
-            default:
-              onBack();
-          }
-        },
+        items: flatItems,
+        onSelect: handleSelect,
         onCancel: onBack,
         width,
         isInputActive,
         arrowNavigation: panelMode
       }
     ),
-    !panelMode && /* @__PURE__ */ jsx18(StatusBar, { hint: "\u2191\u2193 navigate \xB7 Enter select \xB7 Esc back", width })
+    /* @__PURE__ */ jsx18(StatusBar, { hint: "\u2191\u2193 navigate \xB7 Enter select \xB7 Esc back", width })
   ] });
 }
 
@@ -2252,6 +2361,7 @@ function PipelineList({
   onNavigate,
   onBack,
   width = 80,
+  height = 24,
   panelMode = false,
   isInputActive = true
 }) {
@@ -2299,15 +2409,17 @@ function PipelineList({
       icon: "\u2795",
       kind: "action"
     });
-    list.push({
-      id: "action-back",
-      value: "__back__",
-      label: "\u2190 Back",
-      kind: "action"
-    });
+    if (!panelMode) {
+      list.push({
+        id: "action-back",
+        value: "__back__",
+        label: "\u2190 Back",
+        kind: "action"
+      });
+    }
     return list;
-  }, [pipelines]);
-  return /* @__PURE__ */ jsxs18(Box16, { flexDirection: "column", children: [
+  }, [pipelines, panelMode]);
+  return /* @__PURE__ */ jsxs18(Box16, { flexDirection: "column", paddingX: panelMode ? 1 : 0, children: [
     /* @__PURE__ */ jsx19(Box16, { marginBottom: 1, children: /* @__PURE__ */ jsx19(Text18, { bold: true, color: inkColors.accent, children: "\u{1F517} Pipelines" }) }),
     /* @__PURE__ */ jsx19(
       SelectList,
@@ -2325,7 +2437,9 @@ function PipelineList({
           onNavigate("pipeline-execution", { pipelineId: value });
         },
         onCancel: onBack,
-        width,
+        boxedSections: panelMode,
+        width: panelMode ? Math.max(20, width - 4) : width,
+        maxVisible: panelMode ? Math.max(6, height - 6) : void 0,
         isInputActive,
         arrowNavigation: panelMode
       }
@@ -2952,30 +3066,30 @@ function usePanelFocus() {
 
 // src/hooks/useSidebarItems.ts
 import { useMemo as useMemo8 } from "react";
-function useSidebarItems(hasPins = false) {
+function useSidebarItems() {
   return useMemo8(() => {
     const items = [];
-    if (hasPins) {
-      items.push({ id: "pinned", label: "Pinned", icon: "\u{1F4CC}", type: "action" });
-      items.push({ id: "__sep_pinned__", label: "---", icon: "", type: "separator" });
-    }
+    items.push({ id: "__sep_workflows__", label: "---", icon: "", type: "separator", sectionTitle: "Workflows" });
+    items.push({ id: "pipelines", label: "Pipelines", icon: "\u{1F517}", type: "action", section: "workflows" });
+    items.push({ id: "pinned", label: "Pinned", icon: "\u{1F4CC}", type: "action", section: "workflows" });
+    items.push({ id: "custom-command", label: "Custom Cmd", icon: "\u270F\uFE0F", type: "action", section: "workflows" });
+    items.push({ id: "__sep_features__", label: "---", icon: "", type: "separator", sectionTitle: "Features" });
     for (const feature of features) {
       items.push({
         id: feature.id,
         label: feature.label,
         icon: feature.icon,
-        type: "feature"
+        type: "feature",
+        section: "features"
       });
     }
-    items.push({ id: "__sep__", label: "---", icon: "", type: "separator" });
-    items.push({ id: "custom-command", label: "Custom Cmd", icon: "\u270F\uFE0F", type: "action" });
-    items.push({ id: "pipelines", label: "Pipelines", icon: "\u{1F517}", type: "action" });
-    items.push({ id: "tool-status", label: "Tool Status", icon: "\u{1F527}", type: "action" });
-    items.push({ id: "config", label: "Config", icon: "\u2699\uFE0F", type: "action" });
-    items.push({ id: "self-update", label: "Update", icon: "\u2B06\uFE0F", type: "action" });
-    items.push({ id: "exit", label: "Exit", icon: "\u{1F6AA}", type: "action" });
+    items.push({ id: "__sep_system__", label: "---", icon: "", type: "separator", sectionTitle: "System" });
+    items.push({ id: "tool-status", label: "Tool Status", icon: "\u{1F527}", type: "action", section: "system" });
+    items.push({ id: "config", label: "Config", icon: "\u2699\uFE0F", type: "action", section: "system" });
+    items.push({ id: "self-update", label: "Update", icon: "\u2B06\uFE0F", type: "action", section: "system" });
+    items.push({ id: "exit", label: "Exit", icon: "\u{1F6AA}", type: "action", section: "system" });
     return items;
-  }, [hasPins]);
+  }, []);
 }
 
 // src/hooks/useModal.ts
@@ -3061,6 +3175,19 @@ function Panel({
 import { useEffect as useEffect9, useMemo as useMemo9, useState as useState19 } from "react";
 import { Box as Box24, Text as Text25, useInput as useInput6 } from "ink";
 import { jsx as jsx26, jsxs as jsxs26 } from "react/jsx-runtime";
+function groupSections(items) {
+  const groups = [];
+  let current = null;
+  for (const item of items) {
+    if (item.type === "separator" && item.sectionTitle) {
+      current = { title: item.sectionTitle, items: [] };
+      groups.push(current);
+    } else if (current) {
+      current.items.push(item);
+    }
+  }
+  return groups;
+}
 function Sidebar({
   items,
   selectedId,
@@ -3075,6 +3202,7 @@ function Sidebar({
   );
   const selectedIdx = selectableItems.findIndex((item) => item.id === selectedId);
   const [cursorIdx, setCursorIdx] = useState19(Math.max(0, selectedIdx));
+  const sections = useMemo9(() => groupSections(items), [items]);
   useEffect9(() => {
     const idx = selectableItems.findIndex((item) => item.id === selectedId);
     if (idx >= 0) setCursorIdx(idx);
@@ -3106,29 +3234,47 @@ function Sidebar({
     },
     { isActive: isFocused }
   );
-  let selectableIdx = 0;
-  return /* @__PURE__ */ jsx26(Box24, { flexDirection: "column", paddingX: 1, children: items.map((item) => {
-    if (item.type === "separator") {
-      return /* @__PURE__ */ jsx26(Box24, { children: /* @__PURE__ */ jsx26(Text25, { dimColor: true, children: symbols.horizontal.repeat(10) }) }, item.id);
-    }
-    const thisIdx = selectableIdx;
-    selectableIdx++;
-    const isCursor = isFocused && thisIdx === cursorIdx;
-    const isActive = item.id === selectedId;
-    return /* @__PURE__ */ jsx26(Box24, { gap: 0, children: /* @__PURE__ */ jsxs26(
-      Text25,
+  let flatIdx = 0;
+  return /* @__PURE__ */ jsx26(Box24, { flexDirection: "column", gap: 2, children: sections.map((section) => {
+    const sectionStartIdx = flatIdx;
+    const sectionEndIdx = sectionStartIdx + section.items.length - 1;
+    const hasCursorInSection = isFocused && cursorIdx >= sectionStartIdx && cursorIdx <= sectionEndIdx;
+    const hasActiveInSection = section.items.some((item) => item.id === selectedId);
+    const borderColor = hasCursorInSection || hasActiveInSection ? inkColors.accent : "#555555";
+    const rendered = /* @__PURE__ */ jsxs26(
+      Box24,
       {
-        color: isCursor ? inkColors.accent : isActive ? inkColors.accent : void 0,
-        bold: isCursor || isActive,
-        dimColor: !isCursor && !isActive,
+        flexDirection: "column",
+        borderStyle: "round",
+        borderColor,
+        paddingX: 1,
         children: [
-          isCursor ? `${symbols.pointerActive} ` : "  ",
-          item.icon,
-          " ",
-          item.label
+          /* @__PURE__ */ jsx26(Text25, { dimColor: true, bold: true, children: section.title }),
+          section.items.map((item) => {
+            const thisIdx = flatIdx;
+            flatIdx++;
+            const isCursor = isFocused && thisIdx === cursorIdx;
+            const isActive = item.id === selectedId;
+            return /* @__PURE__ */ jsx26(Box24, { gap: 0, children: /* @__PURE__ */ jsxs26(
+              Text25,
+              {
+                color: isCursor ? inkColors.accent : isActive ? inkColors.accent : void 0,
+                bold: isCursor || isActive,
+                dimColor: !isCursor && !isActive,
+                children: [
+                  isCursor ? `${symbols.pointerActive} ` : "  ",
+                  item.icon,
+                  " ",
+                  item.label
+                ]
+              }
+            ) }, item.id);
+          })
         ]
-      }
-    ) }, item.id);
+      },
+      section.title
+    );
+    return rendered;
   }) });
 }
 
@@ -3396,6 +3542,58 @@ function PinnedCommands({
 
 // src/appPanel.tsx
 import { jsx as jsx31, jsxs as jsxs31 } from "react/jsx-runtime";
+var screenLabels = {
+  "command-args": "Args",
+  "flag-selection": "Flags",
+  "confirm-execute": "Execute",
+  "command-execution": "Execute",
+  "custom-command": "Custom Cmd",
+  "pipeline-list": "Pipelines",
+  "pipeline-builder": "Builder",
+  "pipeline-execution": "Run",
+  "self-update": "Update",
+  "tool-status": "Status",
+  "project-config": "Config"
+};
+function buildBreadcrumb(nav) {
+  let base;
+  switch (nav.view) {
+    case "feature":
+      base = getFeatureById(nav.featureId)?.label ?? nav.featureId;
+      break;
+    case "pinned":
+      base = "Pinned";
+      break;
+    case "custom-command":
+      base = "Custom Cmd";
+      break;
+    case "pipelines":
+      base = "Pipelines";
+      break;
+    case "tool-status":
+      base = "Status";
+      break;
+    case "config":
+      base = "Config";
+      break;
+    case "self-update":
+      base = "Update";
+      break;
+    default:
+      base = nav.view;
+  }
+  if (nav.innerScreen === "home") {
+    return base;
+  }
+  const parts = [base];
+  for (const entry of nav.innerStack) {
+    if (entry.screen !== "home") {
+      parts.push(screenLabels[entry.screen] ?? entry.screen);
+    }
+  }
+  parts.push(screenLabels[nav.innerScreen] ?? nav.innerScreen);
+  return parts.join(" \u203A ");
+}
 var FOOTER_HINTS = [
   { key: "\u2190\u2192", action: "panels" },
   { key: "j/k", action: "nav" },
@@ -3411,18 +3609,10 @@ function AppPanel() {
   const { exit } = useApp2();
   const nav = usePanelNavigation();
   const focus = usePanelFocus();
-  const [hasPins, setHasPins] = React18.useState(
-    () => getPinnedCommands().length > 0 || getPinnedRuns().length > 0
-  );
-  const sidebarItems = useSidebarItems(hasPins);
+  const sidebarItems = useSidebarItems();
   const modal = useModal();
   const refreshPins = React18.useCallback(() => {
-    const newHasPins = getPinnedCommands().length > 0 || getPinnedRuns().length > 0;
-    setHasPins(newHasPins);
-    if (!newHasPins && nav.view === "pinned") {
-      nav.selectSidebarItem("database");
-    }
-  }, [nav.view, nav.selectSidebarItem]);
+  }, []);
   const singlePanel = width < 60 || height < 15;
   const handleExit = () => {
     process.stdout.write(
@@ -3575,6 +3765,7 @@ function AppPanel() {
             onNavigate: nav.navigateInner,
             onBack: focus.focusSidebar,
             width: mainContentWidth - 2,
+            height: mainContentHeight,
             panelMode: true,
             isInputActive: focus.isMainFocused
           }
@@ -3586,6 +3777,7 @@ function AppPanel() {
             onNavigate: nav.navigateInner,
             onBack: focus.focusSidebar,
             width: mainContentWidth - 2,
+            height: mainContentHeight,
             panelMode: true,
             isInputActive: focus.isMainFocused
           }
@@ -3596,6 +3788,7 @@ function AppPanel() {
           {
             onBack: focus.focusSidebar,
             width: mainContentWidth - 2,
+            height: mainContentHeight,
             panelMode: true,
             isInputActive: focus.isMainFocused
           }
@@ -3606,6 +3799,7 @@ function AppPanel() {
           {
             onBack: focus.focusSidebar,
             width: mainContentWidth - 2,
+            height: mainContentHeight,
             panelMode: true,
             isInputActive: focus.isMainFocused
           }
@@ -3617,6 +3811,7 @@ function AppPanel() {
             onBack: focus.focusSidebar,
             onExit: handleExit,
             width: mainContentWidth - 2,
+            height: mainContentHeight,
             panelMode: true,
             isInputActive: focus.isMainFocused
           }
@@ -3649,6 +3844,7 @@ function AppPanel() {
             onNavigate: nav.navigateInner,
             onBack: nav.goBackInner,
             width: w,
+            height: mainContentHeight,
             panelMode: true,
             isInputActive: isActive
           }
@@ -3676,6 +3872,7 @@ function AppPanel() {
             onBack: nav.goBackInner,
             onExit: handleExit,
             width: w,
+            height: mainContentHeight,
             panelMode: true,
             isInputActive: isActive
           }
@@ -3687,6 +3884,7 @@ function AppPanel() {
             onNavigate: nav.navigateInner,
             onBack: nav.goBackInner,
             width: w,
+            height: mainContentHeight,
             panelMode: true,
             isInputActive: isActive
           }
@@ -3721,6 +3919,7 @@ function AppPanel() {
             onBack: nav.goBackInner,
             onExit: handleExit,
             width: w,
+            height: mainContentHeight,
             panelMode: true,
             isInputActive: isActive
           }
@@ -3731,6 +3930,7 @@ function AppPanel() {
           {
             onBack: nav.goBackInner,
             width: w,
+            height: mainContentHeight,
             panelMode: true,
             isInputActive: isActive
           }
@@ -3741,6 +3941,7 @@ function AppPanel() {
           {
             onBack: nav.goBackInner,
             width: w,
+            height: mainContentHeight,
             panelMode: true,
             isInputActive: isActive
           }
@@ -3781,7 +3982,7 @@ function AppPanel() {
     Panel,
     {
       id: "main",
-      title: nav.view === "feature" ? getFeatureById(nav.featureId)?.label : nav.view === "pinned" ? "Pinned" : nav.view,
+      title: buildBreadcrumb(nav),
       width: mainContentWidth,
       height: Math.max(5, height - bannerHeight - 1),
       focused: focus.isMainFocused,
@@ -3832,11 +4033,17 @@ function parseCliArgs(argv) {
   if (argv_[0] === "pipeline" && argv_[1] === "run" && argv_[2]) {
     return { mode: "pipeline-run", options: {}, pipelineName: argv_[2] };
   }
-  if (argv_[0] === "mcp" && argv_[1] === "install") {
-    let mcpScope = "local";
-    if (argv_.includes("--project")) mcpScope = "project";
-    else if (argv_.includes("--global")) mcpScope = "user";
-    return { mode: "mcp-install", options: {}, mcpScope };
+  if (argv_[0] === "mcp") {
+    const sub = argv_[1];
+    if (sub === "status") {
+      return { mode: "mcp", options: {}, mcpAction: "status" };
+    }
+    if (sub === "install" || sub === "update" || sub === "remove") {
+      let mcpScope = "local";
+      if (argv_.includes("--project")) mcpScope = "project";
+      else if (argv_.includes("--global")) mcpScope = "user";
+      return { mode: "mcp", options: {}, mcpAction: sub, mcpScope };
+    }
   }
   if (argv_[0] === "config") {
     const edit = argv_.includes("--edit");
@@ -3925,6 +4132,9 @@ function printCliHelp() {
       "  polter mcp install               Install Polter MCP server into Claude Code (local scope)",
       "  polter mcp install --project     Install for this project only (shared via repo)",
       "  polter mcp install --global      Install globally for all projects",
+      "  polter mcp update                Update MCP server to latest version",
+      "  polter mcp status                Show MCP registration and version info",
+      "  polter mcp remove                Remove MCP server registration",
       "",
       "  polter app setup ops [--path <dir>] [--create-project|--use-existing-project] [--yes]",
       "  polter app link ops [--path <dir>] [--relink]",
@@ -4750,8 +4960,10 @@ import { spawnSync as spawnSync2 } from "child_process";
 import { readFileSync as readFileSync2, writeFileSync as writeFileSync2, mkdirSync as mkdirSync2, existsSync as existsSync2 } from "fs";
 import { join as join3 } from "path";
 import { homedir as homedir2 } from "os";
+import { createRequire as createRequire2 } from "module";
 import pc4 from "picocolors";
-var MCP_ARGS = ["npx", "-y", "-p", "@polterware/polter", "polter-mcp"];
+var require3 = createRequire2(import.meta.url);
+var MCP_ARGS = ["npx", "-y", "-p", "@polterware/polter@latest", "polter-mcp"];
 var SCOPE_LABELS = {
   local: "local (this machine)",
   project: "project (shared via repo)",
@@ -4789,7 +5001,7 @@ function tryManualInstall(scope) {
   const mcpServers = settings.mcpServers ?? {};
   mcpServers.polter = {
     command: "npx",
-    args: ["-y", "-p", "@polterware/polter", "polter-mcp"]
+    args: ["-y", "-p", "@polterware/polter@latest", "polter-mcp"]
   };
   settings.mcpServers = mcpServers;
   writeFileSync2(settingsPath, JSON.stringify(settings, null, 2) + "\n");
@@ -4815,11 +5027,93 @@ async function installMcpServer(scope) {
     process.stdout.write(pc4.green("\n  Done! Restart Claude Code to use Polter tools.\n"));
   } else {
     process.stderr.write(pc4.red("\n  Failed to install. Add manually:\n\n"));
-    process.stderr.write(`  ${pc4.dim(JSON.stringify({ mcpServers: { polter: { command: "npx", args: ["-y", "-p", "@polterware/polter", "polter-mcp"] } } }, null, 2))}
+    process.stderr.write(`  ${pc4.dim(JSON.stringify({ mcpServers: { polter: { command: "npx", args: ["-y", "-p", "@polterware/polter@latest", "polter-mcp"] } } }, null, 2))}
 `);
     process.exit(1);
   }
 }
+async function removeMcpServer(scope) {
+  process.stdout.write(pc4.bold(`Removing Polter MCP server \u2014 ${SCOPE_LABELS[scope]}
+
+`));
+  if (commandExists("claude")) {
+    const result = spawnSync2("claude", ["mcp", "remove", "-s", scope, "polter"], {
+      stdio: "inherit",
+      shell: true
+    });
+    if (result.status === 0) {
+      process.stdout.write(pc4.green("\n  Done! Polter MCP server removed.\n"));
+      return;
+    }
+    process.stdout.write(pc4.yellow("  'claude mcp remove' failed, falling back to manual removal...\n\n"));
+  }
+  const settingsPath = getSettingsPath(scope);
+  if (!existsSync2(settingsPath)) {
+    process.stdout.write(pc4.yellow("  No settings file found. Nothing to remove.\n"));
+    return;
+  }
+  let settings;
+  try {
+    settings = JSON.parse(readFileSync2(settingsPath, "utf-8"));
+  } catch {
+    process.stderr.write(pc4.red(`  Failed to parse ${settingsPath}
+`));
+    process.exit(1);
+    return;
+  }
+  const mcpServers = settings.mcpServers;
+  if (!mcpServers?.polter) {
+    process.stdout.write(pc4.yellow("  Polter MCP server not found in settings. Nothing to remove.\n"));
+    return;
+  }
+  delete mcpServers.polter;
+  settings.mcpServers = mcpServers;
+  writeFileSync2(settingsPath, JSON.stringify(settings, null, 2) + "\n");
+  process.stdout.write(pc4.green("  Done! Polter MCP server removed.\n"));
+}
+async function mcpStatus() {
+  process.stdout.write(pc4.bold("Polter MCP Server Status\n\n"));
+  const pkg = require3("../../package.json");
+  process.stdout.write(`  Installed version: ${pc4.cyan(pkg.version)}
+`);
+  const latestResult = spawnSync2("npm", ["view", "@polterware/polter", "version"], {
+    encoding: "utf-8",
+    shell: true,
+    timeout: 1e4
+  });
+  const latest = latestResult.stdout?.trim();
+  if (latest) {
+    const upToDate = latest === pkg.version;
+    process.stdout.write(`  Latest version:    ${upToDate ? pc4.green(latest) : pc4.yellow(`${latest} (update available)`)}
+`);
+  }
+  process.stdout.write("\n");
+  const scopes = [
+    { label: "Project (.mcp.json)", path: join3(process.cwd(), ".mcp.json"), key: "project" },
+    { label: "User (~/.claude/settings.json)", path: join3(homedir2(), ".claude", "settings.json"), key: "user" }
+  ];
+  for (const scope of scopes) {
+    if (!existsSync2(scope.path)) {
+      process.stdout.write(`  ${scope.label}: ${pc4.dim("not found")}
+`);
+      continue;
+    }
+    try {
+      const settings = JSON.parse(readFileSync2(scope.path, "utf-8"));
+      const mcpServers = settings.mcpServers;
+      if (mcpServers?.polter) {
+        process.stdout.write(`  ${scope.label}: ${pc4.green("registered")}
+`);
+      } else {
+        process.stdout.write(`  ${scope.label}: ${pc4.dim("not registered")}
+`);
+      }
+    } catch {
+      process.stdout.write(`  ${scope.label}: ${pc4.red("error reading file")}
+`);
+    }
+  }
+}
 
 // src/index.tsx
 import pc5 from "picocolors";
@@ -4829,8 +5123,20 @@ async function main() {
     printCliHelp();
     return;
   }
-  if (parsed.mode === "mcp-install") {
-    await installMcpServer(parsed.mcpScope ?? "local");
+  if (parsed.mode === "mcp") {
+    const scope = parsed.mcpScope ?? "local";
+    switch (parsed.mcpAction) {
+      case "install":
+      case "update":
+        await installMcpServer(scope);
+        break;
+      case "remove":
+        await removeMcpServer(scope);
+        break;
+      case "status":
+        await mcpStatus();
+        break;
+    }
     return;
   }
   if (parsed.mode === "app") {
@@ -4867,7 +5173,7 @@ Pipeline completed with ${errors.length} error(s)
     return;
   }
   if (parsed.mode === "status") {
-    const tools = ["supabase", "gh", "vercel"];
+    const tools = ["supabase", "gh", "vercel", "git"];
     process.stdout.write(pc5.bold("Tool Status\n\n"));
     for (const toolId of tools) {
       const info = getToolInfo(toolId);