@guildai/cli 0.3.14 → 0.3.16

package/dist/commands/chat.js

@@ -76,7 +76,11 @@ function CustomInput({ value, onChange, onSubmit, trackedTasksSize, setShowTaskP
     const renderedValue = value + chalk.inverse(' ');
     return React.createElement(Text, null, renderedValue);
 }
-function InputWrapper({ isReady, input, setInput, handleSubmit, trackedTasksSize, setShowTaskPanel, isActive, }) {
+function InputWrapper({ isReady, isInterrupted, input, setInput, handleSubmit, trackedTasksSize, setShowTaskPanel, isActive, }) {
+    if (isInterrupted) {
+        return (React.createElement(Box, { height: 1 },
+            React.createElement(Text, { color: "gray" }, chalk.dim('Interrupted — this session cannot be resumed. Press Ctrl+C to exit.'))));
+    }
     return (React.createElement(Box, { height: 1 },
         React.createElement(Text, { color: isReady ? BRAND_COLOR : 'gray' }, "> "),
         isReady && isActive ? (React.createElement(CustomInput, { value: input, onChange: setInput, onSubmit: handleSubmit, trackedTasksSize: trackedTasksSize, setShowTaskPanel: setShowTaskPanel, isActive: isActive })) : isReady ? (React.createElement(Text, null, input)) : (React.createElement(Text, null, chalk.dim('(connecting...)')))));
@@ -229,11 +233,22 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
             ]
             : []);
     const [input, setInput] = useState('');
+    const inputTextRef = useRef('');
+    // Keep ref in sync so useInput handler can read current input text
+    const updateInput = (value) => {
+        inputTextRef.current = value;
+        setInput(value);
+    };
     const [currentOperation, setCurrentOperation] = useState(resumeEvents ? '' : 'Waiting for response...');
     const [exitHint, setExitHint] = useState(null);
+    const [isInterrupted, setIsInterrupted] = useState(false);
     // Double-tap exit tracking (shared for Ctrl+C and Ctrl+D)
     const exitKeyPressed = useRef(false);
     const exitKeyTimeout = useRef(null);
+    // Interrupt tracking - prevents duplicate interrupt requests
+    const isInterrupting = useRef(false);
+    // Debounce Escape after mount so splash-skip doesn't trigger interrupt
+    const mountedAt = useRef(Date.now());
     // Track terminal size for layout calculations
     // Debounce resize to prevent spam during rapid resize events
     const [terminalSize, setTerminalSize] = useState({
@@ -264,11 +279,55 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
     }, []);
     // Global keyboard shortcuts
     useInput((input, key) => {
-        // Ctrl-C / Ctrl-D: Double-tap to exit
+        // Escape: Interrupt agent while processing
+        // Ignore Escape within 300ms of mount to prevent splash-skip from triggering interrupt
+        if (key.escape &&
+            client &&
+            session &&
+            currentOperation &&
+            !isInterrupting.current &&
+            Date.now() - mountedAt.current > 300) {
+            isInterrupting.current = true;
+            client
+                .post(`/sessions/${session.id}/interrupt`, {})
+                .then(() => {
+                debug('Session interrupted');
+            })
+                .catch((err) => {
+                debug('Interrupt failed (session may already be done):', err);
+            })
+                .finally(() => {
+                isInterrupting.current = false;
+            });
+            return;
+        }
+        // Ctrl-C: Clear input on first press (if text present), double-tap to exit
         const isCtrlC = input === '\x03' || (key.ctrl && input === 'c');
+        if (isCtrlC) {
+            // If there's text in the input, clear it instead of showing exit hint
+            if (inputTextRef.current && !exitKeyPressed.current) {
+                updateInput('');
+                return;
+            }
+            if (exitKeyPressed.current) {
+                if (preConnectedSession?.id && resumeCommand) {
+                    printResumeHint(preConnectedSession.id, resumeCommand);
+                }
+                process.exit(0);
+            }
+            exitKeyPressed.current = true;
+            setExitHint('ctrl-c');
+            if (exitKeyTimeout.current)
+                clearTimeout(exitKeyTimeout.current);
+            exitKeyTimeout.current = setTimeout(() => {
+                exitKeyPressed.current = false;
+                setExitHint(null);
+            }, 2000);
+            return;
+        }
+        // Ctrl-D: Double-tap to exit
         const isCtrlD = input === '\x04' || (key.ctrl && input === 'd');
-        if (isCtrlC || isCtrlD) {
-            const keyName = isCtrlC ? 'ctrl-c' : 'ctrl-d';
+        if (isCtrlD) {
             if (exitKeyPressed.current) {
                 if (preConnectedSession?.id && resumeCommand) {
                     printResumeHint(preConnectedSession.id, resumeCommand);
@@ -276,7 +335,7 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
                 process.exit(0);
             }
             exitKeyPressed.current = true;
-            setExitHint(keyName);
+            setExitHint('ctrl-d');
             if (exitKeyTimeout.current)
                 clearTimeout(exitKeyTimeout.current);
             exitKeyTimeout.current = setTimeout(() => {
@@ -539,6 +598,19 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
                                 setCurrentOperation('');
                             }
                         }
+                        else if (event.type === 'interrupted') {
+                            // Session was interrupted — interrupted sessions are terminal on the backend
+                            setMessages((prev) => [
+                                ...prev,
+                                {
+                                    key: `interrupted-${Date.now()}`,
+                                    content: chalk.dim('⊘ Interrupted'),
+                                    type: 'assistant',
+                                },
+                            ]);
+                            setCurrentOperation('');
+                            setIsInterrupted(true);
+                        }
                         else if (isUnfulfilledAgentInstallRequest(event)) {
                             // Check for agent install requests that need user approval
                             if (!promptedEventIds.current.has(event.id) && !pendingInstallRequest) {
@@ -589,7 +661,7 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
             },
         ]);
         // Clear input right after showing the message
-        setInput('');
+        updateInput('');
         try {
             await client.post(`/sessions/${session.id}/events`, {
                 content: value,
@@ -657,18 +729,21 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
     const showTasksHintText = '[ctrl-t to show tasks]';
     const showTasksHint = `[${chalk.bold('ctrl-t')} to show tasks]`;
     // Build status line with right-aligned hint
-    // Exit hint takes priority (temporary, 2s), otherwise show ctrl-t task hint
+    // Priority: exit hint > esc to interrupt > ctrl-t task hint
     // Strip ANSI codes to get visible length (statusLine contains spinner with color codes)
     const stripAnsi = (str) => str.replace(/\x1b\[[0-9;]*m/g, '');
     const statusWithHint = (() => {
-        // Pick which hint to show: exit hint takes priority
         let hintText = null;
         let hint = null;
         if (exitHint) {
             hintText = `[${exitHint} again to exit]`;
             hint = `[${chalk.bold(exitHint)} again to exit]`;
         }
-        else if (activeTaskCount > 0 && currentOperation) {
+        else if (currentOperation) {
+            hintText = '(esc to interrupt)';
+            hint = `(${chalk.bold('esc')} to interrupt)`;
+        }
+        if (!hintText && activeTaskCount > 0 && currentOperation) {
             hintText = showTaskPanel ? hideTasksHintText : showTasksHintText;
             hint = showTaskPanel ? hideTasksHint : showTasksHint;
         }
@@ -721,7 +796,7 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
             React.createElement(Text, null, statusWithHint)),
         React.createElement(Box, { height: 1 },
             React.createElement(Text, { color: "gray" }, '─'.repeat(Math.max(1, terminalWidth - 2)))),
-        React.createElement(InputWrapper, { isReady: isReady, input: input, setInput: setInput, handleSubmit: handleSubmit, trackedTasksSize: tasks.length, setShowTaskPanel: setShowTaskPanel, isActive: isActive })));
+        React.createElement(InputWrapper, { isReady: isReady, isInterrupted: isInterrupted, input: input, setInput: updateInput, handleSubmit: handleSubmit, trackedTasksSize: tasks.length, setShowTaskPanel: setShowTaskPanel, isActive: isActive })));
 }
 export async function ensureAuthenticated() {
     const token = await getAuthToken();

package/dist/components/TaskView.js

@@ -10,6 +10,7 @@ const STATUS_COLORS = {
     WAITING: '#b8860b', // dark goldenrod (readable on light and dark terminals)
     DONE: '#22c55e', // green (success)
     ERROR: '#ef4444', // red (error)
+    INTERRUPTED: '#b8860b', // dark goldenrod (warning)
 };
 // Status icons (for completed/static states)
 const STATUS_ICONS = {
@@ -19,6 +20,7 @@ const STATUS_ICONS = {
     WAITING: '◐',
     DONE: '✓',
     ERROR: '✗',
+    INTERRUPTED: '⊘',
 };
 // Animation frames for running tasks (alternates between empty and filled)
 const RUNNING_ANIMATION_FRAMES = ['○', '●'];

package/dist/lib/session-events.d.ts

@@ -4,7 +4,7 @@
  * These types match the backend event system from the messaging refactor (PR #819).
  * All CLI commands should import these types instead of defining their own.
  */
-export type TaskStatus = 'CREATED' | 'STARTED' | 'RUNNING' | 'WAITING' | 'DONE' | 'ERROR';
+export type TaskStatus = 'CREATED' | 'STARTED' | 'RUNNING' | 'WAITING' | 'DONE' | 'ERROR' | 'INTERRUPTED';
 export interface BaseTaskFields {
     id: string;
     status: TaskStatus;
@@ -143,7 +143,12 @@ export interface CredentialsRequestEvent extends BaseEvent {
 export declare function isUnfulfilledAgentInstallRequest(event: SessionEvent): event is AgentInstallRequestEvent;
 /** Check if event is an unfulfilled credentials request */
 export declare function isUnfulfilledCredentialsRequest(event: SessionEvent): event is CredentialsRequestEvent;
-export type SessionEvent = UserMessageEvent | RuntimeStartEvent | RuntimeRunningEvent | RuntimeWaitingEvent | RuntimeErrorEvent | RuntimeDoneEvent | AgentNotificationMessageEvent | AgentNotificationProgressEvent | AgentNotificationErrorEvent | AgentConsoleEvent | AgentInstallRequestEvent | CredentialsRequestEvent;
+export interface InterruptedEvent extends BaseEvent {
+    type: 'interrupted';
+    interrupted_at: string;
+    interrupted_by_id: string;
+}
+export type SessionEvent = UserMessageEvent | RuntimeStartEvent | RuntimeRunningEvent | RuntimeWaitingEvent | RuntimeErrorEvent | RuntimeDoneEvent | AgentNotificationMessageEvent | AgentNotificationProgressEvent | AgentNotificationErrorEvent | AgentConsoleEvent | AgentInstallRequestEvent | CredentialsRequestEvent | InterruptedEvent;
 export interface Session {
     id: string;
     workspace_id?: string;

package/dist/lib/session-resume.js

@@ -4,6 +4,24 @@
  * and fetching/converting session events for resume.
  */
 import chalk from 'chalk';
+import { marked } from 'marked';
+import { markedTerminal } from 'marked-terminal';
+import { brand, code as codeColor } from './colors.js';
+// Configure marked for terminal rendering (same config as chat.tsx)
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+marked.use(markedTerminal({}, { theme: {} }));
+/**
+ * Render markdown text to ANSI terminal output.
+ * Matches the live message rendering pipeline in chat.tsx.
+ */
+function renderMarkdown(text) {
+    let rendered = marked.parse(text);
+    // Fix unrendered inline markdown in list items (marked-terminal bug)
+    rendered = rendered.replace(/\*\*([^*]+)\*\*/g, (_, content) => chalk.bold(content));
+    rendered = rendered.replace(/`([^`]+)`/g, (_, content) => codeColor(content));
+    rendered = rendered.replace(/(?<![\\w])_([^_]+)_(?![\\w])/g, (_, content) => chalk.italic(content));
+    return rendered;
+}
 /**
  * Print a dimmed resume hint to stderr on session exit.
  * Only call when a session ID is available.
@@ -42,7 +60,7 @@ export function eventsToDisplayMessages(events) {
         if (event.type === 'user_message') {
             messages.push({
                 key: event.id,
-                content: `> ${event.content}`,
+                content: `${brand('>')} ${event.content}`,
                 type: 'user',
                 timestamp: event.created_at,
             });
@@ -50,9 +68,11 @@ export function eventsToDisplayMessages(events) {
         else if (event.type === 'agent_notification_message') {
             const text = typeof event.content === 'string' ? event.content : event.content?.data || '';
             if (text.trim()) {
+                const rendered = renderMarkdown(text);
+                const messageContent = `${chalk.green('●')} ${chalk.bold('assistant')}\n${rendered.trim()}`;
                 messages.push({
                     key: event.id,
-                    content: text,
+                    content: messageContent,
                     type: 'assistant',
                     timestamp: event.created_at,
                 });
@@ -63,7 +83,7 @@ export function eventsToDisplayMessages(events) {
             if (text.trim()) {
                 messages.push({
                     key: event.id,
-                    content: chalk.red(text),
+                    content: `${chalk.red('●')} ${chalk.bold('assistant')}\n${chalk.red(text)}`,
                     type: 'assistant',
                     timestamp: event.created_at,
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@guildai/cli",
-  "version": "0.3.14",
+  "version": "0.3.16",
   "description": "Guild.ai CLI - Build, test, and deploy AI agents",
   "type": "module",
   "main": "dist/index.js",