@pugi/cli 0.1.0-alpha.18 → 0.1.0-alpha.20

package/dist/tui/input-box.js

@@ -131,14 +131,57 @@ export function InputBox(props) {
     useInput((input, key) => {
         if (key.ctrl && input === 'c') {
             const t = now();
-            if (typeof lastCtrlCAt === 'number' && t - lastCtrlCAt <= CTRL_C_DOUBLE_TAP_MS) {
+            // α6.9: Claude Code-style double-press semantics. First Ctrl+C
+            // ALWAYS attempts to cancel an in-flight dispatch (when the
+            // session reports non-idle); second Ctrl+C within 1s exits the
+            // process. If onCancel is omitted (legacy callers, tests), the
+            // old behaviour is preserved: first Ctrl+C clears the buffer +
+            // arms the exit timer, second Ctrl+C exits.
+            const withinDoubleTapWindow = typeof lastCtrlCAt === 'number' && t - lastCtrlCAt <= CTRL_C_DOUBLE_TAP_MS;
+            if (withinDoubleTapWindow) {
+                // Second press inside the window — always exit. This matches
+                // Claude Code: even mid-dispatch, the second Ctrl+C wins so
+                // the operator can always escape a stuck REPL.
                 props.onExit();
                 return;
             }
+            // First press in a fresh window. If the host wired a cancel
+            // surface and there is something to cancel, abort the dispatch.
+            // The buffer is left untouched on a cancel (the operator's
+            // current input is NOT trashed by an accidental Ctrl+C while a
+            // tool is running).
+            //
+            // Three-valued onCancel return (see prop docstring):
+            //   - true       → dispatch cancelled, keep buffer, arm exit timer
+            //   - false      → idle, clear buffer (legacy), arm exit timer
+            //   - undefined  → handler bypassed (modal owns input); NO state
+            //                  change at all. Buffer stays, exit timer NOT
+            //                  armed (otherwise the modal would silently
+            //                  promote a Ctrl+C to "press again to exit",
+            //                  which is wrong context for a modal cancel).
+            let cancelResult;
+            if (props.onCancel) {
+                cancelResult = props.onCancel();
+            }
+            if (cancelResult === undefined && props.onCancel) {
+                // Bypass path - modal owns the input. Drop the press silently
+                // so the modal's own cancel surface (Esc / its own Ctrl+C
+                // binding inside the modal component) takes effect on its own
+                // terms. P2 fix: previously this fell through to the
+                // legacy buffer-clear + setLastCtrlCAt path and wiped modal
+                // draft text on first Ctrl+C.
+                return;
+            }
             setLastCtrlCAt(t);
-            setLine('');
-            setCursor(0);
-            setSearch(undefined);
+            // Legacy behaviour: on idle (or no onCancel wired), clear the
+            // buffer + reset search so the operator's screen is calm before
+            // they confirm exit. When we DID cancel a live dispatch, keep
+            // the buffer so a half-typed brief is not lost.
+            if (cancelResult !== true) {
+                setLine('');
+                setCursor(0);
+                setSearch(undefined);
+            }
             return;
         }
         // Search-mode key handling. Ctrl+R / Ctrl+S cycle, Enter accepts,
@@ -456,7 +499,7 @@ export function InputBox(props) {
         : Math.min(paletteIndex, paletteView.rows.length - 1);
     const divider = '─'.repeat(innerWidth);
     const focusedMatch = search ? search.matches[search.focusedIndex] : undefined;
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: "cyan", dimColor: true, children: divider }), _jsx(Box, { paddingX: 1, flexDirection: "column", children: search ? (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: "cyan", children: '(reverse-i-search) ' }), _jsx(Text, { children: `\`${search.query}\`: ` }), _jsx(Text, { color: "yellow", children: focusedMatch ? focusedMatch.brief : '(no match)' })] }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: `Ctrl+R next  ·  Ctrl+S prev  ·  Enter accept  ·  Esc cancel  ·  ${search.matches.length} match${search.matches.length === 1 ? '' : 'es'}` }) })] })) : (_jsxs(Box, { children: [_jsx(Text, { color: "cyan", children: '› ' }), _jsx(Text, { children: renderLineWithCursor(line, cursor, cursorVisible) })] })) }), _jsx(Text, { color: "cyan", dimColor: true, children: divider }), line.length > innerWidth - 4 ? (_jsxs(Box, { children: [_jsx(Text, { color: "gray", children: '┊ ' }), _jsx(Text, { dimColor: true, children: 'line wraps - Enter still submits' })] })) : null, _jsx(SlashPalette, { rows: paletteView.rows, focusedIndex: clampedPaletteIndex, totalBeforeLimit: paletteView.totalBeforeLimit }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: '↑/↓ history  ·  Ctrl+R search  ·  / commands  ·  Enter brief  ·  Esc cancel  ·  Ctrl+C ×2 exit' }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: "cyan", dimColor: true, children: divider }), _jsx(Box, { paddingX: 1, flexDirection: "column", children: search ? (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: "cyan", children: '(reverse-i-search) ' }), _jsx(Text, { children: `\`${search.query}\`: ` }), _jsx(Text, { color: "yellow", children: focusedMatch ? focusedMatch.brief : '(no match)' })] }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: `Ctrl+R next  ·  Ctrl+S prev  ·  Enter accept  ·  Esc cancel  ·  ${search.matches.length} match${search.matches.length === 1 ? '' : 'es'}` }) })] })) : (_jsxs(Box, { children: [_jsx(Text, { color: "cyan", children: '› ' }), _jsx(Text, { children: renderLineWithCursor(line, cursor, cursorVisible) })] })) }), _jsx(Text, { color: "cyan", dimColor: true, children: divider }), line.length > innerWidth - 4 ? (_jsxs(Box, { children: [_jsx(Text, { color: "gray", children: '┊ ' }), _jsx(Text, { dimColor: true, children: 'line wraps - Enter still submits' })] })) : null, _jsx(SlashPalette, { rows: paletteView.rows, focusedIndex: clampedPaletteIndex, totalBeforeLimit: paletteView.totalBeforeLimit }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: '↑/↓ history  ·  Ctrl+R search  ·  / commands  ·  Enter brief  ·  Esc cancel  ·  Ctrl+C abort / ×2 exit' }) })] }));
 }
 /**
  * Render the line with the cursor glyph inserted at `cursor`. The cursor

package/dist/tui/repl.js

@@ -156,11 +156,33 @@ export function Repl(props) {
     const handlePlanReviewResolve = useCallback((result) => {
         void props.session.resolvePlanReview(result);
     }, [props.session]);
-    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [props.updateBanner ? _jsx(UpdateBanner, { result: props.updateBanner }) : null, splashVisible ? (_jsx(ReplSplash, { cliVersion: state.cliVersion, workspaceLabel: state.workspaceLabel, plan: props.splashPlan, model: props.splashModel, tenant: props.splashTenant, onDismiss: dismissSplash, mascotPrePrinted: props.mascotPrePrinted === true })) : null, _jsx(Header, { state: state }), _jsx(Box, { flexDirection: "column", marginTop: 1, children: overlay === 'help' ? (_jsx(HelpOverlay, {})) : overlay === 'roster' ? (_jsx(RosterOverlay, {})) : overlay === 'farewell' ? (_jsx(FarewellOverlay, {})) : (_jsx(MainArea, { state: state, personaNames: personaNames, nowEpochMs: tickNow, hideToolStream: props.hideToolStream === true, toolStreamCollapsed: toolStreamCollapsed })) }), state.pendingAsk ? (_jsx(Box, { marginTop: 1, children: _jsx(AskModal, { tag: state.pendingAsk, onResolve: handleAskResolve }) })) : null, state.pendingPlanReview ? (_jsx(Box, { marginTop: 1, children: _jsx(PlanReviewModal, { tag: state.pendingPlanReview, onResolve: handlePlanReviewResolve }) })) : null, _jsxs(Box, { flexDirection: "column", marginTop: 1, children: [overlay === 'farewell' || modalActive ? null : (_jsx(InputBox, { onSubmit: handleSubmit, onExit: handleExit, now: props.now, 
+    // α6.9: Ctrl+C abort handler. Forwards to ReplSession.cancel() which
+    // aborts the in-flight dispatch, closes the SSE stream, and surfaces
+    // "Aborted." in the transcript.
+    //
+    // Return contract (consumed by InputBox):
+    //   - true        - dispatch was cancelled (keep the buffer + DO arm
+    //                   the press-again-to-exit timer; second Ctrl+C in
+    //                   the window exits).
+    //   - false       - idle / nothing to cancel (legacy: clear buffer +
+    //                   arm the exit timer so the operator sees the hint
+    //                   and can confirm exit on the next press).
+    //   - undefined   - bypassed entirely (e.g. a modal owns the input).
+    //                   InputBox MUST NOT arm the exit timer and MUST
+    //                   NOT clear the buffer. P2 fix: previously this
+    //                   returned `false` and the buffer-clear path wiped
+    //                   the operator's mid-typed modal text on the first
+    //                   Ctrl+C, costing a press of work.
+    const handleCancel = useCallback(() => {
+        if (modalActive)
+            return undefined;
+        return props.session.cancel();
+    }, [props.session, modalActive]);
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [props.updateBanner ? _jsx(UpdateBanner, { result: props.updateBanner }) : null, splashVisible ? (_jsx(ReplSplash, { cliVersion: state.cliVersion, workspaceLabel: state.workspaceLabel, plan: props.splashPlan, model: props.splashModel, tenant: props.splashTenant, onDismiss: dismissSplash, mascotPrePrinted: props.mascotPrePrinted === true })) : null, _jsx(Header, { state: state }), _jsx(Box, { flexDirection: "column", marginTop: 1, children: overlay === 'help' ? (_jsx(HelpOverlay, {})) : overlay === 'roster' ? (_jsx(RosterOverlay, {})) : overlay === 'farewell' ? (_jsx(FarewellOverlay, {})) : (_jsx(MainArea, { state: state, personaNames: personaNames, nowEpochMs: tickNow, hideToolStream: props.hideToolStream === true, toolStreamCollapsed: toolStreamCollapsed })) }), state.pendingAsk ? (_jsx(Box, { marginTop: 1, children: _jsx(AskModal, { tag: state.pendingAsk, onResolve: handleAskResolve }) })) : null, state.pendingPlanReview ? (_jsx(Box, { marginTop: 1, children: _jsx(PlanReviewModal, { tag: state.pendingPlanReview, onResolve: handlePlanReviewResolve }) })) : null, _jsxs(Box, { flexDirection: "column", marginTop: 1, children: [overlay === 'farewell' || modalActive ? null : (_jsx(InputBox, { onSubmit: handleSubmit, onExit: handleExit, onCancel: handleCancel, now: props.now, 
                         // Slug from process.cwd() (full path) so two workspaces with
                         // the same basename do not share history. state.workspaceLabel
                         // is the basename only. Codex review P2.
-                        workspaceSlug: slugForCwd(process.cwd()) })), _jsx(StatusBar, { connection: state.connection, activeAgentCount: countActive(state), tokensDownstreamTotal: state.tokensDownstreamTotal, briefStartedAtEpochMs: state.briefStartedAtEpochMs, nowEpochMs: tickNow, pulsePhase: pulsePhase, pugiMdCount: workspaceContext.pugiMdCount, mcpServerCount: workspaceContext.mcpServerCount, skillCount: workspaceContext.skillCount, quotaPct: props.quotaPct })] })] }));
+                        workspaceSlug: slugForCwd(process.cwd()) })), _jsx(StatusBar, { connection: state.connection, activeAgentCount: countActive(state), tokensDownstreamTotal: state.tokensDownstreamTotal, briefStartedAtEpochMs: state.briefStartedAtEpochMs, nowEpochMs: tickNow, pulsePhase: pulsePhase, pugiMdCount: workspaceContext.pugiMdCount, mcpServerCount: workspaceContext.mcpServerCount, skillCount: workspaceContext.skillCount, quotaPct: props.quotaPct, dispatchState: state.dispatchState, dispatchToolLabel: state.dispatchToolLabel })] })] }));
 }
 function Header({ state }) {
     return (_jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Pugi" }), _jsx(Text, { bold: true, color: "cyan", children: ".io" }), _jsx(Text, { dimColor: true, children: `  ·  workspace: ${state.workspaceLabel}  ·  v${state.cliVersion}  ·  ` }), _jsx(Text, { color: "cyan", children: state.connection === 'on_watch' ? 'on watch' : state.connection.replace('_', ' ') })] }));

package/dist/tui/status-bar.js

@@ -12,7 +12,12 @@ export function StatusBar(props) {
     const tokenLabel = formatTokens(props.tokensDownstreamTotal);
     const phase = clampPhase(props.pulsePhase);
     const glyph = PULSE_DOTS[Math.min(phase, PULSE_DOTS.length - 1)] ?? PULSE_DOTS[0];
-    const status = connectionLabel(props.connection);
+    // α6.9: composite status label — connection problems trump dispatch
+    // state because the operator needs to know about a dropped admin-api
+    // first. When the connection is healthy (`on_watch` / `connecting`),
+    // the FSM dispatch state takes over to show the dispatch lifecycle
+    // (`dispatching` / `tool: read` / `aborting` / etc.).
+    const status = composeStatusLabel(props.connection, props.dispatchState, props.dispatchToolLabel);
     return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: status.color, children: `${glyph ?? '●'} ${status.label}` }), _jsx(Text, { dimColor: true, children: `  ·  ${props.activeAgentCount} agents  ·  ` }), _jsx(Text, { children: `↓ ${tokenLabel} tokens` }), _jsx(Text, { dimColor: true, children: `  ·  ${elapsedLabel}` })] }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: `${formatCount(props.pugiMdCount)} PUGI.md  ·  ${formatCount(props.mcpServerCount)} MCP  ·  ${formatCount(props.skillCount)} skills  ·  ${formatQuota(props.quotaPct)} quota` }) })] }));
 }
 /**
@@ -28,10 +33,17 @@ function formatQuota(pct) {
         return '—';
     return `${Math.round(pct)}%`;
 }
-function connectionLabel(connection) {
+// Exported for test introspection (status-bar-fsm.spec.tsx asserts
+// connecting vs on_watch render in distinct colors; ink-testing-library
+// strips ANSI from lastFrame() so we read the resolved color directly).
+export function connectionLabel(connection) {
     switch (connection) {
         case 'connecting':
-            return { label: 'connecting', color: 'cyan' };
+            // P2 fix: was 'cyan', same as 'on_watch' - operator could not
+            // tell boot from stable. Magenta is distinct from every other
+            // state in this palette (cyan steady, yellow reconnect, gray
+            // offline) so a brief flicker through this state stands out.
+            return { label: 'connecting', color: 'magenta' };
         case 'on_watch':
             return { label: 'on watch', color: 'cyan' };
         case 'reconnecting':
@@ -40,6 +52,54 @@ function connectionLabel(connection) {
             return { label: 'offline', color: 'gray' };
     }
 }
+/**
+ * α6.9: compose the visible status label from connection + FSM state.
+ *
+ * Priority order:
+ *
+ *   1. `offline` / `reconnecting` — transport health wins; the
+ *      operator needs to know about a dropped stream before anything
+ *      about the dispatch.
+ *   2. `aborting` / `aborted` / `failed` — operator-visible terminal
+ *      states the FSM reached; the colour shifts to amber/red so the
+ *      anomaly stands out vs the calm cyan baseline.
+ *   3. `tool_running` — surfaces the tool label when available
+ *      (`tool: read`), falls back to `tool` when not.
+ *   4. `awaiting_response` — `dispatching` (matches Codex CLI's verb
+ *      for the same state).
+ *   5. `completed` — `shipped` (matches the agent tree status glyph
+ *      so the operator's eye links the two surfaces).
+ *   6. `idle` / unknown — connection label (`on watch` / `connecting`).
+ *
+ * The dispatch label `dispatchToolLabel` is already shaped as
+ * `tool: <kind>` upstream so we just concatenate; null falls through
+ * to the bare `tool` placeholder.
+ */
+function composeStatusLabel(connection, dispatchState, toolLabel) {
+    // Transport health wins.
+    if (connection === 'offline' || connection === 'reconnecting') {
+        return connectionLabel(connection);
+    }
+    // FSM dispatch state overlay (only when the FSM was wired).
+    switch (dispatchState) {
+        case 'aborting':
+            return { label: 'aborting', color: 'yellow' };
+        case 'aborted':
+            return { label: 'aborted', color: 'gray' };
+        case 'failed':
+            return { label: 'failed', color: 'red' };
+        case 'tool_running':
+            return { label: toolLabel ?? 'tool', color: 'cyan' };
+        case 'awaiting_response':
+            return { label: 'dispatching', color: 'cyan' };
+        case 'completed':
+            return { label: 'shipped', color: 'green' };
+        case 'idle':
+        case undefined:
+        default:
+            return connectionLabel(connection);
+    }
+}
 function formatElapsed(startedAt, now) {
     if (typeof startedAt !== 'number')
         return 'idle';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pugi/cli",
-  "version": "0.1.0-alpha.18",
+  "version": "0.1.0-alpha.20",
   "description": "Pugi CLI - terminal-native software execution system",
   "homepage": "https://pugi.io",
   "repository": {
@@ -52,7 +52,7 @@
     "undici": "^8.3.0",
     "zod": "^3.23.0",
     "@pugi/personas": "0.1.1",
-    "@pugi/sdk": "0.1.0-alpha.18"
+    "@pugi/sdk": "0.1.0-alpha.20"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",