agentk8 2.3.3 → 2.3.5

package/dist/cli.js

@@ -27,8 +27,14 @@ const cli = meow(`
     /exit     Exit AGENT-K
 
   Keyboard
-    Esc Esc   Exit (double-press)
+    Esc       Cancel operation (when processing)
+    Esc Esc   Exit (double-press when idle)
     Ctrl+U    Clear input line
+
+  Modes (/normal, /plan, /auto)
+    normal    Execute, confirm edits (default)
+    plan      Plan first, then execute
+    auto      No confirmations
 `, {
     importMeta: import.meta,
     flags: {

package/dist/components/App.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useRef } from 'react';
 import { Box, Text, useApp, useInput, Static } from 'ink';
 import { WelcomeBox } from './WelcomeBox.js';
 import { ChatMessage } from './ChatMessage.js';
@@ -25,7 +25,7 @@ export const App = ({ mode, version }) => {
     const [totalTokens, setTotalTokens] = useState(0);
     const [startTime] = useState(new Date());
     const [error, setError] = useState(null);
-    const [executionMode, setExecutionMode] = useState('plan');
+    const [executionMode, setExecutionMode] = useState('normal');
     const [activeAgent, setActiveAgent] = useState(undefined);
     const [completedAgents, setCompletedAgents] = useState([]);
     const [confirmationState, setConfirmationState] = useState(null);
@@ -37,6 +37,9 @@ export const App = ({ mode, version }) => {
     const [lastEscapeTime, setLastEscapeTime] = useState(0);
     const [showExitHint, setShowExitHint] = useState(false);
     const [questionWizardState, setQuestionWizardState] = useState(null);
+    const [showCancelHint, setShowCancelHint] = useState(false);
+    // Ref to track cancellation (can be checked inside async operations)
+    const cancelledRef = useRef(false);
     // Clean orchestrator internal tags from response
     const cleanOrchestratorTags = (response) => {
         let cleaned = response;
@@ -133,11 +136,13 @@ export const App = ({ mode, version }) => {
             await generatePlan(input);
         }
         else {
+            // normal or auto mode - executeTask handles autoAccept
             await executeTask(input);
         }
     };
     // Execute via Council
     const executeCouncil = async (input) => {
+        cancelledRef.current = false;
         setIsProcessing(true);
         setProcessingStartTime(new Date());
         setActiveAgent('Orchestrator');
@@ -185,6 +190,7 @@ export const App = ({ mode, version }) => {
     };
     // Generate a plan for approval
     const generatePlan = async (input) => {
+        cancelledRef.current = false;
         setIsProcessing(true);
         setProcessingStartTime(new Date());
         setActiveAgent('Orchestrator');
@@ -278,6 +284,7 @@ Format your response clearly with headers.`;
     };
     // Execute task directly
     const executeTask = async (input) => {
+        cancelledRef.current = false;
         setIsProcessing(true);
         setProcessingStartTime(new Date());
         setActiveAgent('Orchestrator');
@@ -366,35 +373,36 @@ Format your response clearly with headers.`;
                 setActiveAgent(undefined);
                 setCompletedAgents([]);
                 break;
+            case 'normal':
+                setExecutionMode('normal');
+                setAutoAccept(false);
+                addSystemMessage('Normal mode. I will execute and ask for confirmation on edits.');
+                break;
             case 'plan':
                 setExecutionMode('plan');
-                addSystemMessage('Plan mode enabled. I will show plans for approval before executing.');
+                setAutoAccept(false);
+                addSystemMessage('Plan mode. I will create a plan for approval before executing.');
                 break;
             case 'auto':
                 setConfirmationState({
-                    message: '⚠️  Are you sure you want to enable Auto Mode? This will execute actions without further approval.',
+                    message: '⚠️  Enable Auto Mode? This executes everything without any confirmations.',
                     options: [
-                        { label: 'Yes, enable auto mode', value: 'yes' },
-                        { label: 'No, stay in plan mode', value: 'no' },
+                        { label: 'Yes, enable auto', value: 'yes' },
+                        { label: 'No, keep current mode', value: 'no' },
                     ],
                     onSelect: (value) => {
                         setConfirmationState(null);
                         if (value === 'yes') {
                             setExecutionMode('auto');
-                            addSystemMessage('Auto mode enabled. I will execute tasks directly without approval.');
-                        }
-                        else {
-                            addSystemMessage('Kept in plan mode.');
+                            setAutoAccept(true);
+                            addSystemMessage('Auto mode. No confirmations, executing everything directly.');
                         }
                     },
-                    onCancel: () => {
-                        setConfirmationState(null);
-                        addSystemMessage('Kept in plan mode.');
-                    },
+                    onCancel: () => setConfirmationState(null),
                 });
                 break;
             case 'mode':
-                addSystemMessage(`Current execution mode: ${executionMode}\nUse /plan or /auto to switch.`);
+                addSystemMessage(`Current mode: ${executionMode}\nUse /normal, /plan, or /auto to switch.`);
                 break;
             case 'agents':
                 if (!activeAgent && completedAgents.length === 0) {
@@ -451,9 +459,10 @@ Format your response clearly with headers.`;
 /help     - Show this help
 /clear    - Clear chat history
 /status   - Show session status
-/plan     - Enable plan mode (ask before executing)
-/auto     - Enable auto mode (execute directly)
-/mode     - Show current execution mode
+/normal   - Normal mode (execute, confirm edits)
+/plan     - Plan mode (plan first, then execute)
+/auto     - Auto mode (no confirmations)
+/mode     - Show current mode
 /agents   - Show active agents
 /council  - Toggle council mode (multi-LLM consensus)
 /solo     - Enable solo council (multi-Claude personas)
@@ -463,8 +472,8 @@ Format your response clearly with headers.`;
 Keyboard shortcuts:
 ↑/↓       - Browse command history
 Tab       - Autocomplete commands
-Shift+Tab - Toggle auto-accept edits
-Esc Esc   - Exit
+Esc       - Cancel operation (when processing)
+Esc Esc   - Exit (when idle)
 Ctrl+U    - Clear input line`,
                     timestamp: new Date(),
                 };
@@ -494,9 +503,29 @@ Ctrl+U    - Clear input line`,
     };
     // Handle keyboard shortcuts
     useInput((input, key) => {
-        // Double-escape to exit (like Claude Code)
+        // Escape key handling
         if (key.escape) {
             const now = Date.now();
+            // If processing, single Esc cancels the operation
+            if (isProcessing) {
+                cancelledRef.current = true;
+                setIsProcessing(false);
+                setProcessingStartTime(null);
+                setActiveAgent(undefined);
+                setCouncilStage(null);
+                setShowCancelHint(true);
+                setTimeout(() => setShowCancelHint(false), 2000);
+                // Add cancellation message
+                const cancelMessage = {
+                    id: Date.now().toString(),
+                    role: 'system',
+                    content: '⚠ Operation cancelled',
+                    timestamp: new Date(),
+                };
+                setMessages(prev => [...prev, cancelMessage]);
+                return;
+            }
+            // Double-escape to exit (like Claude Code)
             if (now - lastEscapeTime < 500) {
                 // Double escape - exit
                 exit();
@@ -510,30 +539,6 @@ Ctrl+U    - Clear input line`,
                 }
             }
         }
-        // Shift+Tab to toggle auto-accept
-        if (key.shift && key.tab) {
-            if (autoAccept) {
-                // Disable silently
-                setAutoAccept(false);
-            }
-            else {
-                // Show confirmation prompt
-                setConfirmationState({
-                    message: 'Enable auto-accept for code edits?',
-                    options: [
-                        { label: 'Yes, enable auto-accept', value: 'yes' },
-                        { label: 'No, keep asking', value: 'no' },
-                    ],
-                    onSelect: (value) => {
-                        setConfirmationState(null);
-                        if (value === 'yes') {
-                            setAutoAccept(true);
-                        }
-                    },
-                    onCancel: () => setConfirmationState(null),
-                });
-            }
-        }
     });
     return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Static, { items: messages, children: (item) => {
                     if ('isWelcome' in item && item.isWelcome) {

package/dist/components/StatusBar.d.ts

@@ -3,7 +3,7 @@ import { AgentName } from './AgentPanel.js';
 type CouncilMode = 'solo' | 'council' | 'off';
 interface StatusBarProps {
     mode: 'dev' | 'ml';
-    executionMode: 'plan' | 'auto';
+    executionMode: 'normal' | 'plan' | 'auto';
     tokens: number;
     startTime: Date;
     isProcessing?: boolean;

package/dist/components/StatusBar.js

@@ -95,7 +95,7 @@ export const StatusBar = ({ mode, executionMode, tokens, startTime, isProcessing
         };
         return stages[councilStage] || councilStage;
     };
-    return (_jsxs(Box, { flexDirection: "row", justifyContent: "space-between", width: "100%", children: [_jsxs(Box, { children: [_jsx(Text, { color: theme.dim, children: "  " }), _jsx(Text, { color: theme.accent, children: modeLabel }), _jsx(Text, { color: theme.border, children: " \u2502 " }), _jsx(Text, { color: executionMode === 'auto' ? theme.active : theme.accent, children: executionMode.toUpperCase() }), _jsx(Text, { color: theme.border, children: " \u2502 " }), councilMode !== 'off' ? (_jsxs(_Fragment, { children: [Object.entries(modelIcons).map(([model, icon], i) => {
+    return (_jsxs(Box, { flexDirection: "row", justifyContent: "space-between", width: "100%", children: [_jsxs(Box, { children: [_jsx(Text, { color: theme.dim, children: "  " }), _jsx(Text, { color: theme.accent, children: modeLabel }), _jsx(Text, { color: theme.border, children: " \u2502 " }), councilMode !== 'off' ? (_jsxs(_Fragment, { children: [Object.entries(modelIcons).map(([model, icon], i) => {
                                 const isAvailable = availableModels[model];
                                 const color = isAvailable ? theme.done : theme.dim;
                                 return (_jsxs(React.Fragment, { children: [_jsx(Text, { color: color, children: "[" }), _jsx(Text, { color: color, children: icon }), _jsx(Text, { color: color, children: "]" }), i < Object.keys(modelIcons).length - 1 && _jsx(Text, { color: theme.dim, children: " " })] }, model));
@@ -106,6 +106,6 @@ export const StatusBar = ({ mode, executionMode, tokens, startTime, isProcessing
                         const leftBracket = isActive ? pulseBrackets[pulseFrame] : '[';
                         const rightBracket = isActive ? pulseBrackets[(pulseFrame + 3) % pulseBrackets.length] === '<' ? '>' : pulseBrackets[(pulseFrame + 3) % pulseBrackets.length] === '{' ? '}' : pulseBrackets[(pulseFrame + 3) % pulseBrackets.length] === '(' ? ')' : ']' : ']';
                         return (_jsxs(React.Fragment, { children: [_jsx(Text, { color: getAgentColor(agent), children: leftBracket }), _jsx(Text, { color: getAgentColor(agent), children: agentIcons[agent] }), _jsx(Text, { color: getAgentColor(agent), children: rightBracket }), i < modeAgents.length - 1 && _jsx(Text, { color: theme.dim, children: " " })] }, agent));
-                    })), _jsx(Text, { color: theme.border, children: " \u2502 " }), _jsx(Text, { color: theme.dim, children: "? help" }), councilMode !== 'off' && (_jsxs(_Fragment, { children: [_jsx(Text, { color: theme.border, children: " \u2502 " }), _jsx(Text, { color: theme.highlight, children: councilMode === 'council' ? 'COUNCIL' : 'SOLO' })] })), autoAccept && (_jsxs(_Fragment, { children: [_jsx(Text, { color: theme.border, children: " \u2502 " }), _jsx(Text, { color: theme.active, children: "FAST" })] })), isProcessing && (_jsxs(_Fragment, { children: [_jsx(Text, { color: theme.border, children: " \u2502 " }), _jsx(Text, { color: theme.highlight, children: icons.spinner[spinnerFrame] })] })), elapsed && (_jsxs(_Fragment, { children: [_jsx(Text, { color: theme.border, children: " \u2502 " }), _jsx(Text, { color: theme.dim, children: elapsed })] }))] }), _jsxs(Box, { children: [showExitHint && (_jsxs(_Fragment, { children: [_jsx(Text, { color: theme.dim, children: "Press Esc again to exit" }), _jsx(Text, { color: theme.border, children: " \u2502 " })] })), _jsxs(Text, { color: theme.accent, children: ["\u2191 ", formatTokens(tokens)] }), _jsx(Text, { color: theme.dim, children: " tokens " })] })] }));
+                    })), _jsx(Text, { color: theme.border, children: " \u2502 " }), _jsx(Text, { color: theme.dim, children: "? help" }), councilMode !== 'off' && (_jsxs(_Fragment, { children: [_jsx(Text, { color: theme.border, children: " \u2502 " }), _jsx(Text, { color: theme.highlight, children: councilMode === 'council' ? 'COUNCIL' : 'SOLO' })] })), executionMode !== 'normal' && (_jsxs(_Fragment, { children: [_jsx(Text, { color: theme.border, children: " \u2502 " }), _jsx(Text, { color: executionMode === 'auto' ? theme.active : theme.accent, children: executionMode.toUpperCase() })] })), isProcessing && (_jsxs(_Fragment, { children: [_jsx(Text, { color: theme.border, children: " \u2502 " }), _jsx(Text, { color: theme.highlight, children: icons.spinner[spinnerFrame] })] })), elapsed && (_jsxs(_Fragment, { children: [_jsx(Text, { color: theme.border, children: " \u2502 " }), _jsx(Text, { color: theme.dim, children: elapsed })] }))] }), _jsxs(Box, { children: [showExitHint && (_jsxs(_Fragment, { children: [_jsx(Text, { color: theme.dim, children: "Press Esc again to exit" }), _jsx(Text, { color: theme.border, children: " \u2502 " })] })), _jsxs(Text, { color: theme.accent, children: ["\u2191 ", formatTokens(tokens)] }), _jsx(Text, { color: theme.dim, children: " tokens " })] })] }));
 };
 export default StatusBar;

package/dist/components/ThinkingIndicator.js

@@ -54,6 +54,6 @@ export const ThinkingIndicator = ({ startTime, tokens = 0, }) => {
             return `${(t / 1000).toFixed(1)}k`;
         return t.toString();
     };
-    return (_jsxs(Box, { marginY: 1, marginLeft: 1, children: [_jsxs(Text, { color: theme.purple, bold: true, children: [symbols[frame], " "] }), _jsxs(Text, { color: theme.highlight, italic: true, children: [verb, "\u2026"] }), _jsx(Text, { color: theme.dim, children: " (" }), _jsx(Text, { color: theme.dim, children: "esc esc to exit" }), _jsx(Text, { color: theme.dim, children: " \u00B7 " }), _jsx(Text, { color: theme.accent, children: elapsed }), tokens > 0 && (_jsxs(_Fragment, { children: [_jsx(Text, { color: theme.dim, children: " \u00B7 " }), _jsxs(Text, { color: theme.accent, children: ["\u2193 ", formatTokens(tokens)] }), _jsx(Text, { color: theme.dim, children: " tokens" })] })), _jsx(Text, { color: theme.dim, children: " \u00B7 " }), _jsx(Text, { color: theme.purple, children: "thinking" }), _jsx(Text, { color: theme.dim, children: ")" })] }));
+    return (_jsxs(Box, { marginY: 1, marginLeft: 1, children: [_jsxs(Text, { color: theme.purple, bold: true, children: [symbols[frame], " "] }), _jsxs(Text, { color: theme.highlight, italic: true, children: [verb, "\u2026"] }), _jsx(Text, { color: theme.dim, children: " (" }), _jsx(Text, { color: theme.dim, children: "Esc to cancel" }), _jsx(Text, { color: theme.dim, children: " \u00B7 " }), _jsx(Text, { color: theme.accent, children: elapsed }), tokens > 0 && (_jsxs(_Fragment, { children: [_jsx(Text, { color: theme.dim, children: " \u00B7 " }), _jsxs(Text, { color: theme.accent, children: ["\u2193 ", formatTokens(tokens)] }), _jsx(Text, { color: theme.dim, children: " tokens" })] })), _jsx(Text, { color: theme.dim, children: " \u00B7 " }), _jsx(Text, { color: theme.purple, children: "thinking" }), _jsx(Text, { color: theme.dim, children: ")" })] }));
 };
 export default ThinkingIndicator;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentk8",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "description": "Multi-LLM Council Terminal Suite - Three-stage consensus with GPT, Gemini, and Claude",
   "type": "module",
   "main": "dist/index.js",