dexto 1.5.2 → 1.5.4

package/dist/cli/commands/interactive-commands/general-commands.js

@@ -15,14 +15,57 @@ import { formatForInkCli } from './utils/format-output.js';
 import { CommandOutputHelper } from './utils/command-output.js';
 import { writeToClipboard } from '../../ink-cli/utils/clipboardUtils.js';
 /**
- * Execute a shell command and return the output
+ * Get the shell rc file path for the given shell
  */
+function getShellRcFile(shell) {
+    const home = process.env.HOME;
+    if (!home)
+        return null;
+    if (shell.includes('zsh')) {
+        return `${home}/.zshrc`;
+    }
+    else if (shell.includes('bash')) {
+        return `${home}/.bashrc`;
+    }
+    return null;
+}
+/**
+ * Wrap command to source shell rc file for alias support
+ * This mimics how Claude Code handles shell aliases - by sourcing the rc file
+ * before executing the command, we get aliases without using -i flag.
+ * We use eval to force the command to be re-parsed after sourcing, since
+ * aliases are expanded at parse time, not execution time.
+ */
+function wrapCommandWithRcSource(command, shell) {
+    const rcFile = getShellRcFile(shell);
+    if (!rcFile) {
+        return command;
+    }
+    // Escape single quotes in the command for safe eval
+    const escapedCommand = command.replace(/'/g, "'\\''");
+    // Source the rc file (suppressing errors if it doesn't exist), then eval the command
+    // eval forces re-parsing after sourcing, allowing aliases to expand
+    // For bash, we also need to enable expand_aliases
+    if (shell.includes('bash')) {
+        return `source "${rcFile}" 2>/dev/null; shopt -s expand_aliases 2>/dev/null; eval '${escapedCommand}'`;
+    }
+    return `source "${rcFile}" 2>/dev/null; eval '${escapedCommand}'`;
+}
 async function executeShellCommand(command, cwd, timeoutMs = 30000) {
     return new Promise((resolve) => {
-        const child = spawn(command, [], {
+        // Use user's default shell from SHELL env var, fallback to /bin/sh
+        // Avoid -i (interactive) as it sets up job control which causes SIGTTIN
+        // when the parent process tries to read stdin while shell runs.
+        // Instead, source the shell's rc file to get aliases (similar to Claude Code).
+        // Use detached: true to create a new process group, preventing the child
+        // from interfering with the parent's terminal control.
+        const userShell = process.env.SHELL || '/bin/sh';
+        const wrappedCommand = wrapCommandWithRcSource(command, userShell);
+        const child = spawn(userShell, ['-c', wrappedCommand], {
             cwd,
-            shell: true,
             stdio: ['ignore', 'pipe', 'pipe'],
+            env: { ...process.env },
+            detached: true,
         });
         let stdout = '';
         let stderr = '';
@@ -145,6 +188,123 @@ export const generalCommands = [
             }
         },
     },
+    {
+        name: 'compact',
+        description: 'Compact context by summarizing older messages',
+        usage: '/compact',
+        category: 'General',
+        aliases: ['summarize'],
+        handler: async (_args, agent, ctx) => {
+            try {
+                const { sessionId } = ctx;
+                if (!sessionId) {
+                    return formatForInkCli('⚠️  No active session to compact');
+                }
+                // Compact context - generates summary and hides older messages
+                const result = await agent.compactContext(sessionId);
+                if (!result) {
+                    return formatForInkCli('💡 Nothing to compact - history is too short or compaction is not configured.');
+                }
+                return formatForInkCli(`📦 Context compacted → Continuing in new session\n` +
+                    `   ${result.previousSessionId.slice(0, 8)}... → ${result.newSessionId.slice(0, 8)}...\n` +
+                    `   ${result.originalMessages} messages → ~${result.summaryTokens.toLocaleString()} token summary\n` +
+                    `💡 New session created with conversation summary. Old session preserved.`);
+            }
+            catch (error) {
+                const errorMsg = `Failed to compact context: ${error instanceof Error ? error.message : String(error)}`;
+                agent.logger.error(errorMsg);
+                return formatForInkCli(`❌ ${errorMsg}`);
+            }
+        },
+    },
+    {
+        name: 'context',
+        description: 'Show context window usage statistics',
+        usage: '/context',
+        category: 'General',
+        aliases: ['ctx', 'tokens'],
+        handler: async (_args, agent, ctx) => {
+            try {
+                const { sessionId } = ctx;
+                if (!sessionId) {
+                    return formatForInkCli('⚠️  No active session');
+                }
+                const stats = await agent.getContextStats(sessionId);
+                // Create a visual progress bar (clamped to 0-100% for display)
+                const barWidth = 20;
+                const displayPercent = Math.min(Math.max(stats.usagePercent, 0), 100);
+                const filledWidth = Math.round((displayPercent / 100) * barWidth);
+                const emptyWidth = barWidth - filledWidth;
+                const progressBar = '█'.repeat(filledWidth) + '░'.repeat(emptyWidth);
+                // Color based on usage
+                let usageColor = chalk.green;
+                if (stats.usagePercent > 80)
+                    usageColor = chalk.red;
+                else if (stats.usagePercent > 60)
+                    usageColor = chalk.yellow;
+                // Helper to format token counts
+                const formatTokens = (tokens) => {
+                    if (tokens >= 1000) {
+                        return `${(tokens / 1000).toFixed(1)}k`;
+                    }
+                    return tokens.toLocaleString();
+                };
+                // Helper to calculate percentage of max
+                const pct = (tokens) => {
+                    const percent = stats.maxContextTokens > 0
+                        ? ((tokens / stats.maxContextTokens) * 100).toFixed(1)
+                        : '0.0';
+                    return `${percent}%`;
+                };
+                const overflowWarning = stats.usagePercent > 100 ? ' ⚠️  OVERFLOW' : '';
+                const { breakdown } = stats;
+                // Show actual tokens if available, otherwise estimate with indicator
+                const tokenDisplay = stats.actualTokens !== null
+                    ? `${formatTokens(stats.actualTokens)}`
+                    : `~${formatTokens(stats.estimatedTokens)}`;
+                // Calculate auto compact buffer (reserved space before compaction triggers)
+                // maxContextTokens already has thresholdPercent applied, so we need to derive
+                // the buffer as: maxContextTokens * (1 - thresholdPercent) / thresholdPercent
+                const autoCompactBuffer = stats.thresholdPercent > 0 && stats.thresholdPercent < 1.0
+                    ? Math.floor((stats.maxContextTokens * (1 - stats.thresholdPercent)) /
+                        stats.thresholdPercent)
+                    : 0;
+                const bufferPercent = Math.round((1 - stats.thresholdPercent) * 100);
+                const bufferLabel = bufferPercent > 0
+                    ? `Auto compact buffer (${bufferPercent}%)`
+                    : 'Auto compact buffer';
+                const lines = [
+                    `📊 Context Usage`,
+                    `   ${usageColor(progressBar)} ${stats.usagePercent}%${overflowWarning}`,
+                    `   ${chalk.dim(stats.modelDisplayName)} · ${tokenDisplay} / ${formatTokens(stats.maxContextTokens)} tokens`,
+                    ``,
+                    `   ${chalk.cyan('Breakdown:')} ${stats.actualTokens === null ? chalk.dim('(estimated)') : ''}`,
+                    `   ├─ System prompt: ${formatTokens(breakdown.systemPrompt)} (${pct(breakdown.systemPrompt)})`,
+                    `   ├─ Tools: ${formatTokens(breakdown.tools.total)} (${pct(breakdown.tools.total)})`,
+                    `   ├─ Messages: ${formatTokens(breakdown.messages)} (${pct(breakdown.messages)})`,
+                    `   └─ ${bufferLabel}: ${formatTokens(autoCompactBuffer)} (reserved)`,
+                    ``,
+                    `   Messages: ${stats.filteredMessageCount} visible (${stats.messageCount} total)`,
+                ];
+                // Show pruned tool count if any
+                if (stats.prunedToolCount > 0) {
+                    lines.push(`   🗑️  ${stats.prunedToolCount} tool output(s) pruned`);
+                }
+                if (stats.hasSummary) {
+                    lines.push(`   📦 Context has been compacted`);
+                }
+                if (stats.usagePercent > 100) {
+                    lines.push(`   💡 Use /compact to manually compact, or send a message to trigger auto-compaction`);
+                }
+                return formatForInkCli(lines.join('\n'));
+            }
+            catch (error) {
+                const errorMsg = `Failed to get context stats: ${error instanceof Error ? error.message : String(error)}`;
+                agent.logger.error(errorMsg);
+                return formatForInkCli(`❌ ${errorMsg}`);
+            }
+        },
+    },
     {
         name: 'copy',
         description: 'Copy the last assistant response to clipboard',

package/dist/cli/commands/interactive-commands/session/index.d.ts

@@ -7,8 +7,9 @@
  * Exports:
  * - searchCommand: Opens interactive search overlay
  * - resumeCommand: Shows interactive session selector
+ * - renameCommand: Rename the current session
  *
  * Note: For headless CLI session management, see src/cli/commands/session-commands.ts
  */
-export { searchCommand, resumeCommand } from './session-commands.js';
+export { searchCommand, resumeCommand, renameCommand } from './session-commands.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/cli/commands/interactive-commands/session/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/cli/commands/interactive-commands/session/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/cli/commands/interactive-commands/session/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC"}

package/dist/cli/commands/interactive-commands/session/index.js

@@ -7,7 +7,8 @@
  * Exports:
  * - searchCommand: Opens interactive search overlay
  * - resumeCommand: Shows interactive session selector
+ * - renameCommand: Rename the current session
  *
  * Note: For headless CLI session management, see src/cli/commands/session-commands.ts
  */
-export { searchCommand, resumeCommand } from './session-commands.js';
+export { searchCommand, resumeCommand, renameCommand } from './session-commands.js';

package/dist/cli/commands/interactive-commands/session/session-commands.d.ts

@@ -7,6 +7,7 @@
  * Commands:
  * - resume: Shows interactive session selector
  * - search: Opens interactive search overlay
+ * - rename: Rename the current session
  *
  * Note: For headless CLI session management (list, history, delete),
  * see src/cli/commands/session-commands.ts
@@ -22,4 +23,10 @@ export declare const resumeCommand: CommandDefinition;
  * Standalone search command - opens interactive search overlay
  */
 export declare const searchCommand: CommandDefinition;
+/**
+ * Rename command - rename the current session
+ * In interactive CLI, this shows the rename overlay.
+ * The overlay is triggered via commandOverlays.ts registry.
+ */
+export declare const renameCommand: CommandDefinition;
 //# sourceMappingURL=session-commands.d.ts.map

package/dist/cli/commands/interactive-commands/session/session-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-commands.d.ts","sourceRoot":"","sources":["../../../../../src/cli/commands/interactive-commands/session/session-commands.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAIH,OAAO,KAAK,EAAE,iBAAiB,EAAkB,MAAM,sBAAsB,CAAC;AAE9E;;;;GAIG;AACH,eAAO,MAAM,aAAa,EAAE,iBAsB3B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,EAAE,iBAc3B,CAAC"}
+{"version":3,"file":"session-commands.d.ts","sourceRoot":"","sources":["../../../../../src/cli/commands/interactive-commands/session/session-commands.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAIH,OAAO,KAAK,EAAE,iBAAiB,EAAkB,MAAM,sBAAsB,CAAC;AAE9E;;;;GAIG;AACH,eAAO,MAAM,aAAa,EAAE,iBAsB3B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,EAAE,iBAc3B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,EAAE,iBAa3B,CAAC"}

package/dist/cli/commands/interactive-commands/session/session-commands.js

@@ -7,6 +7,7 @@
  * Commands:
  * - resume: Shows interactive session selector
  * - search: Opens interactive search overlay
+ * - rename: Rename the current session
  *
  * Note: For headless CLI session management (list, history, delete),
  * see src/cli/commands/session-commands.ts
@@ -49,3 +50,18 @@ export const searchCommand = {
         return true;
     },
 };
+/**
+ * Rename command - rename the current session
+ * In interactive CLI, this shows the rename overlay.
+ * The overlay is triggered via commandOverlays.ts registry.
+ */
+export const renameCommand = {
+    name: 'rename',
+    description: 'Rename the current session',
+    usage: '/rename',
+    category: 'General',
+    handler: async (_args, _agent, _ctx) => {
+        // Interactive overlay handles everything - just return success
+        return true;
+    },
+};

package/dist/cli/ink-cli/InkCLIRefactored.d.ts

@@ -9,10 +9,12 @@
  */
 import type { DextoAgent } from '@dexto/core';
 import type { StartupInfo } from './state/types.js';
+import type { SoundNotificationService } from './utils/soundNotification.js';
 interface InkCLIProps {
     agent: DextoAgent;
     initialSessionId: string | null;
     startupInfo: StartupInfo;
+    soundService: SoundNotificationService | null;
 }
 /**
  * Modern CLI interface using React Ink
@@ -22,7 +24,7 @@ interface InkCLIProps {
  * - KeypressProvider for unified keyboard input
  * - MouseProvider (only in alternate buffer mode)
  */
-export declare function InkCLIRefactored({ agent, initialSessionId, startupInfo }: InkCLIProps): import("react/jsx-runtime").JSX.Element;
+export declare function InkCLIRefactored({ agent, initialSessionId, startupInfo, soundService, }: InkCLIProps): import("react/jsx-runtime").JSX.Element;
 /**
  * Start the modern Ink-based CLI
  */

package/dist/cli/ink-cli/InkCLIRefactored.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InkCLIRefactored.d.ts","sourceRoot":"","sources":["../../../src/cli/ink-cli/InkCLIRefactored.tsx"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAK9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAoBpD,UAAU,WAAW;IACjB,KAAK,EAAE,UAAU,CAAC;IAClB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,WAAW,EAAE,WAAW,CAAC;CAC5B;AAyCD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,EAAE,WAAW,2CAerF;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACvC,KAAK,EAAE,UAAU,EACjB,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAChC,OAAO,CAAC,IAAI,CAAC,CA4Bf"}
+{"version":3,"file":"InkCLIRefactored.d.ts","sourceRoot":"","sources":["../../../src/cli/ink-cli/InkCLIRefactored.tsx"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAK9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAWpD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAiB7E,UAAU,WAAW;IACjB,KAAK,EAAE,UAAU,CAAC;IAClB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,WAAW,EAAE,WAAW,CAAC;IACzB,YAAY,EAAE,wBAAwB,GAAG,IAAI,CAAC;CACjD;AA6CD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,EAC7B,KAAK,EACL,gBAAgB,EAChB,WAAW,EACX,YAAY,GACf,EAAE,WAAW,2CAgBb;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACvC,KAAK,EAAE,UAAU,EACjB,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAChC,OAAO,CAAC,IAAI,CAAC,CAgEf"}

package/dist/cli/ink-cli/InkCLIRefactored.js

@@ -13,7 +13,7 @@ import { render } from 'ink';
 import { registerGracefulShutdown } from '../../utils/graceful-shutdown.js';
 import { enableBracketedPaste, disableBracketedPaste } from './utils/bracketedPaste.js';
 // Contexts (keyboard/mouse providers)
-import { KeypressProvider, MouseProvider, ScrollProvider } from './contexts/index.js';
+import { KeypressProvider, MouseProvider, ScrollProvider, SoundProvider, } from './contexts/index.js';
 // Components
 import { ErrorBoundary } from './components/ErrorBoundary.js';
 import { AlternateBufferCLI, StaticCLI } from './components/modes/index.js';
@@ -28,7 +28,7 @@ const USE_ALTERNATE_BUFFER = false;
 /**
  * Inner component that wraps the mode-specific component with providers
  */
-function InkCLIInner({ agent, initialSessionId, startupInfo }) {
+function InkCLIInner({ agent, initialSessionId, startupInfo, soundService }) {
     // Selection hint callback for alternate buffer mode
     const [, setSelectionHintShown] = useState(false);
     // Streaming mode - can be toggled via /stream command
@@ -37,10 +37,10 @@ function InkCLIInner({ agent, initialSessionId, startupInfo }) {
         setSelectionHintShown(true);
     }, []);
     if (USE_ALTERNATE_BUFFER) {
-        return (_jsx(ScrollProvider, { onSelectionAttempt: handleSelectionAttempt, children: _jsx(AlternateBufferCLI, { agent: agent, initialSessionId: initialSessionId, startupInfo: startupInfo, onSelectionAttempt: handleSelectionAttempt, useStreaming: streaming }) }));
+        return (_jsx(SoundProvider, { soundService: soundService, children: _jsx(ScrollProvider, { onSelectionAttempt: handleSelectionAttempt, children: _jsx(AlternateBufferCLI, { agent: agent, initialSessionId: initialSessionId, startupInfo: startupInfo, onSelectionAttempt: handleSelectionAttempt, useStreaming: streaming }) }) }));
     }
     // Static mode - no ScrollProvider needed
-    return (_jsx(StaticCLI, { agent: agent, initialSessionId: initialSessionId, startupInfo: startupInfo, useStreaming: streaming }));
+    return (_jsx(SoundProvider, { soundService: soundService, children: _jsx(StaticCLI, { agent: agent, initialSessionId: initialSessionId, startupInfo: startupInfo, useStreaming: streaming }) }));
 }
 /**
  * Modern CLI interface using React Ink
@@ -50,8 +50,8 @@ function InkCLIInner({ agent, initialSessionId, startupInfo }) {
  * - KeypressProvider for unified keyboard input
  * - MouseProvider (only in alternate buffer mode)
  */
-export function InkCLIRefactored({ agent, initialSessionId, startupInfo }) {
-    return (_jsx(ErrorBoundary, { children: _jsx(KeypressProvider, { children: _jsx(MouseProvider, { mouseEventsEnabled: USE_ALTERNATE_BUFFER, children: _jsx(InkCLIInner, { agent: agent, initialSessionId: initialSessionId, startupInfo: startupInfo }) }) }) }));
+export function InkCLIRefactored({ agent, initialSessionId, startupInfo, soundService, }) {
+    return (_jsx(ErrorBoundary, { children: _jsx(KeypressProvider, { children: _jsx(MouseProvider, { mouseEventsEnabled: USE_ALTERNATE_BUFFER, children: _jsx(InkCLIInner, { agent: agent, initialSessionId: initialSessionId, startupInfo: startupInfo, soundService: soundService }) }) }) }));
 }
 /**
  * Start the modern Ink-based CLI
@@ -62,7 +62,36 @@ export async function startInkCliRefactored(agent, initialSessionId) {
     // This wraps pastes with escape sequences that our KeypressContext handles
     enableBracketedPaste();
     const startupInfo = await getStartupInfo(agent);
-    const inkApp = render(_jsx(InkCLIRefactored, { agent: agent, initialSessionId: initialSessionId, startupInfo: startupInfo }), {
+    // Initialize sound service from preferences
+    const { SoundNotificationService } = await import('./utils/soundNotification.js');
+    const { globalPreferencesExist, loadGlobalPreferences } = await import('@dexto/agent-management');
+    let soundService = null;
+    // Initialize sound config with defaults (enabled by default even without preferences file)
+    let soundConfig = {
+        enabled: true,
+        onApprovalRequired: true,
+        onTaskComplete: true,
+    };
+    // Override with user preferences if they exist
+    if (globalPreferencesExist()) {
+        try {
+            const preferences = await loadGlobalPreferences();
+            soundConfig = {
+                enabled: preferences.sounds?.enabled ?? soundConfig.enabled,
+                onApprovalRequired: preferences.sounds?.onApprovalRequired ?? soundConfig.onApprovalRequired,
+                onTaskComplete: preferences.sounds?.onTaskComplete ?? soundConfig.onTaskComplete,
+            };
+        }
+        catch (error) {
+            // Log at debug level to help troubleshoot sound configuration issues
+            // Continue with default sounds - this is non-critical functionality
+            agent.logger.debug(`Sound preferences could not be loaded: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
+    if (soundConfig.enabled) {
+        soundService = new SoundNotificationService(soundConfig);
+    }
+    const inkApp = render(_jsx(InkCLIRefactored, { agent: agent, initialSessionId: initialSessionId, startupInfo: startupInfo, soundService: soundService }), {
         exitOnCtrlC: false,
         alternateBuffer: USE_ALTERNATE_BUFFER,
         // Incremental rendering works better with VirtualizedList

package/dist/cli/ink-cli/components/ApprovalPrompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ApprovalPrompt.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/components/ApprovalPrompt.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuE,MAAM,OAAO,CAAC;AAG5F,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAC;AAK5D,MAAM,WAAW,eAAe;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,IAAI,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,oBAAoB;IACjC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B,oEAAoE;IACpE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,mEAAmE;IACnE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yCAAyC;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,gFAAgF;IAChF,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,gDAAgD;IAChD,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,UAAU,mBAAmB;IACzB,QAAQ,EAAE,eAAe,CAAC;IAC1B,SAAS,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAC;IAC9C,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,QAAQ,EAAE,MAAM,IAAI,CAAC;CACxB;AAOD;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,kGA2R1B,CAAC"}
+{"version":3,"file":"ApprovalPrompt.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/components/ApprovalPrompt.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAGf,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAC;AAM5D,MAAM,WAAW,eAAe;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,IAAI,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,oBAAoB;IACjC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B,oEAAoE;IACpE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,mEAAmE;IACnE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yCAAyC;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,gFAAgF;IAChF,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,gDAAgD;IAChD,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,UAAU,mBAAmB;IACzB,QAAQ,EAAE,eAAe,CAAC;IAC1B,SAAS,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAC;IAC9C,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,QAAQ,EAAE,MAAM,IAAI,CAAC;CACxB;AAOD;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,kGAkS1B,CAAC"}

package/dist/cli/ink-cli/components/ApprovalPrompt.js

@@ -1,9 +1,10 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { forwardRef, useState, useImperativeHandle, useRef, useEffect } from 'react';
+import { forwardRef, useState, useImperativeHandle, useRef, useEffect, useMemo, } from 'react';
 import { Box, Text } from 'ink';
 import { ElicitationForm } from './ElicitationForm.js';
 import { DiffPreview, CreateFilePreview } from './renderers/index.js';
 import { isEditWriteTool } from '../utils/toolUtils.js';
+import { formatToolHeader } from '../utils/messageFormatting.js';
 /**
  * Compact approval prompt component that displays above the input area
  * Shows options based on approval type:
@@ -20,7 +21,14 @@ export const ApprovalPrompt = forwardRef(({ approval, onApprove, onDeny, onCance
     const hasBashPatterns = suggestedPatterns.length > 0;
     // Check if this is an edit/write file tool
     const toolName = approval.metadata.toolName;
+    const toolArgs = approval.metadata.args || {};
     const isEditOrWriteTool = isEditWriteTool(toolName);
+    // Format tool header using shared utility (same format as tool messages)
+    const formattedTool = useMemo(() => {
+        if (!toolName)
+            return null;
+        return formatToolHeader(toolName, toolArgs);
+    }, [toolName, toolArgs]);
     const [selectedIndex, setSelectedIndex] = useState(0);
     // Ref for elicitation form
     const elicitationFormRef = useRef(null);
@@ -183,7 +191,7 @@ export const ApprovalPrompt = forwardRef(({ approval, onApprove, onDeny, onCance
     const directoryPath = approval.metadata.path;
     const parentDir = approval.metadata.parentDir;
     const operation = approval.metadata.operation;
-    return (_jsxs(Box, { paddingX: 0, paddingY: 0, flexDirection: "column", children: [_jsx(Box, { flexDirection: "column", marginBottom: 0, children: isDirectoryAccess ? (_jsxs(_Fragment, { children: [_jsxs(Box, { flexDirection: "row", children: [_jsxs(Text, { color: "yellowBright", bold: true, children: ["\uD83D\uDD10 Directory Access:", ' '] }), _jsx(Text, { color: "cyan", children: parentDir || directoryPath })] }), _jsxs(Box, { flexDirection: "row", marginTop: 0, children: [_jsx(Text, { color: "gray", children: '  ' }), _jsxs(Text, { color: "gray", children: [toolName ? `"${toolName}"` : 'Tool', " wants to", ' ', operation || 'access', " files outside working directory"] })] })] })) : (_jsxs(_Fragment, { children: [_jsxs(Box, { flexDirection: "row", children: [_jsxs(Text, { color: "yellowBright", bold: true, children: ["\uD83D\uDD10 Approval:", ' '] }), toolName && _jsx(Text, { color: "cyan", children: toolName })] }), isCommandConfirmation && command && (_jsxs(Box, { flexDirection: "row", marginTop: 0, children: [_jsx(Text, { color: "gray", children: '  Command: ' }), _jsx(Text, { color: "red", children: command })] }))] })) }), renderPreview(), _jsx(Box, { flexDirection: "column", marginTop: 0, children: options.map((option, index) => {
+    return (_jsxs(Box, { paddingX: 0, paddingY: 0, flexDirection: "column", children: [_jsx(Box, { flexDirection: "column", marginBottom: 0, children: isDirectoryAccess ? (_jsxs(_Fragment, { children: [_jsxs(Box, { flexDirection: "row", children: [_jsxs(Text, { color: "yellowBright", bold: true, children: ["\uD83D\uDD10 Directory Access:", ' '] }), _jsx(Text, { color: "cyan", children: parentDir || directoryPath })] }), _jsxs(Box, { flexDirection: "row", marginTop: 0, children: [_jsx(Text, { color: "gray", children: '  ' }), _jsxs(Text, { color: "gray", children: [formattedTool ? `"${formattedTool.displayName}"` : 'Tool', ' ', "wants to ", operation || 'access', " files outside working directory"] })] })] })) : (_jsxs(_Fragment, { children: [_jsxs(Box, { flexDirection: "row", children: [_jsxs(Text, { color: "yellowBright", bold: true, children: ["\uD83D\uDD10 Approval:", ' '] }), formattedTool && _jsx(Text, { color: "cyan", children: formattedTool.header })] }), isCommandConfirmation && command && (_jsxs(Box, { flexDirection: "row", marginTop: 0, children: [_jsx(Text, { color: "gray", children: '  Command: ' }), _jsx(Text, { color: "red", children: command })] }))] })) }), renderPreview(), _jsx(Box, { flexDirection: "column", marginTop: 0, children: options.map((option, index) => {
                     const isSelected = index === selectedIndex;
                     const isNo = option.id === 'no';
                     return (_jsx(Box, { children: isSelected ? (_jsxs(Text, { color: isNo ? 'red' : 'green', bold: true, children: ['  ▶ ', option.label] })) : (_jsxs(Text, { color: "gray", children: ['    ', option.label] })) }, option.id));

package/dist/cli/ink-cli/components/Footer.d.ts

@@ -7,10 +7,12 @@ interface FooterProps {
     cwd?: string;
     branchName?: string;
     autoApproveEdits?: boolean;
+    /** Whether user is in shell command mode (input starts with !) */
+    isShellMode?: boolean;
 }
 /**
  * Pure presentational component for footer status line
  */
-export declare function Footer({ modelName, cwd, branchName, autoApproveEdits }: FooterProps): import("react/jsx-runtime").JSX.Element;
+export declare function Footer({ modelName, cwd, branchName, autoApproveEdits, isShellMode }: FooterProps): import("react/jsx-runtime").JSX.Element;
 export {};
 //# sourceMappingURL=Footer.d.ts.map

package/dist/cli/ink-cli/components/Footer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Footer.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/components/Footer.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,UAAU,WAAW;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAoBD;;GAEG;AACH,wBAAgB,MAAM,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,UAAU,EAAE,gBAAgB,EAAE,EAAE,WAAW,2CAwBnF"}
+{"version":3,"file":"Footer.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/components/Footer.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,UAAU,WAAW;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,kEAAkE;IAClE,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB;AAoBD;;GAEG;AACH,wBAAgB,MAAM,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAE,EAAE,WAAW,2CAmChG"}

package/dist/cli/ink-cli/components/Footer.js

@@ -20,8 +20,10 @@ function shortenPath(path, maxLength = 40) {
 /**
  * Pure presentational component for footer status line
  */
-export function Footer({ modelName, cwd, branchName, autoApproveEdits }) {
+export function Footer({ modelName, cwd, branchName, autoApproveEdits, isShellMode }) {
     const displayPath = cwd ? shortenPath(cwd) : '';
     const displayModelName = getModelDisplayName(modelName);
-    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsxs(Box, { flexDirection: "row", justifyContent: "space-between", children: [_jsxs(Box, { children: [_jsx(Text, { color: "blue", children: displayPath }), branchName && _jsxs(Text, { color: "gray", children: [" (", branchName, ")"] })] }), _jsx(Text, { color: "cyan", children: displayModelName })] }), autoApproveEdits && (_jsxs(Box, { children: [_jsx(Text, { color: "yellowBright", children: "accept edits" }), _jsx(Text, { color: "gray", children: " (shift + tab to toggle)" })] }))] }));
+    // Shell mode changes the path color to yellow as indicator
+    const pathColor = isShellMode ? 'yellow' : 'blue';
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsxs(Box, { flexDirection: "row", justifyContent: "space-between", children: [_jsxs(Box, { children: [_jsx(Text, { color: pathColor, children: displayPath }), branchName && _jsxs(Text, { color: "gray", children: [" (", branchName, ")"] })] }), _jsx(Text, { color: "cyan", children: displayModelName })] }), isShellMode && (_jsxs(Box, { children: [_jsx(Text, { color: "yellow", bold: true, children: "!" }), _jsx(Text, { color: "gray", children: " for shell mode" })] })), autoApproveEdits && !isShellMode && (_jsxs(Box, { children: [_jsx(Text, { color: "yellowBright", children: "accept edits" }), _jsx(Text, { color: "gray", children: " (shift + tab to toggle)" })] }))] }));
 }

package/dist/cli/ink-cli/components/StatusBar.d.ts

@@ -12,6 +12,7 @@ interface StatusBarProps {
     agent: DextoAgent;
     isProcessing: boolean;
     isThinking: boolean;
+    isCompacting: boolean;
     approvalQueueCount: number;
     copyModeEnabled?: boolean;
     /** Whether an approval prompt is currently shown */
@@ -25,6 +26,6 @@ interface StatusBarProps {
  * - Hide spinner during approval wait (user is reviewing, not waiting)
  * - Only show elapsed time after 30s (avoid visual noise for fast operations)
  */
-export declare function StatusBar({ agent, isProcessing, isThinking, approvalQueueCount, copyModeEnabled, isAwaitingApproval, }: StatusBarProps): import("react/jsx-runtime").JSX.Element | null;
+export declare function StatusBar({ agent, isProcessing, isThinking, isCompacting, approvalQueueCount, copyModeEnabled, isAwaitingApproval, }: StatusBarProps): import("react/jsx-runtime").JSX.Element | null;
 export {};
 //# sourceMappingURL=StatusBar.d.ts.map

package/dist/cli/ink-cli/components/StatusBar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StatusBar.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/components/StatusBar.tsx"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAK9C,UAAU,cAAc;IACpB,KAAK,EAAE,UAAU,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,oDAAoD;IACpD,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,CAAC,EACtB,KAAK,EACL,YAAY,EACZ,UAAU,EACV,kBAAkB,EAClB,eAAuB,EACvB,kBAA0B,GAC7B,EAAE,cAAc,kDAqFhB"}
+{"version":3,"file":"StatusBar.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/components/StatusBar.tsx"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAK9C,UAAU,cAAc;IACpB,KAAK,EAAE,UAAU,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,oDAAoD;IACpD,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,CAAC,EACtB,KAAK,EACL,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,kBAAkB,EAClB,eAAuB,EACvB,kBAA0B,GAC7B,EAAE,cAAc,kDA6GhB"}

package/dist/cli/ink-cli/components/StatusBar.js

@@ -21,9 +21,9 @@ import { useTokenCounter } from '../hooks/useTokenCounter.js';
  * - Hide spinner during approval wait (user is reviewing, not waiting)
  * - Only show elapsed time after 30s (avoid visual noise for fast operations)
  */
-export function StatusBar({ agent, isProcessing, isThinking, approvalQueueCount, copyModeEnabled = false, isAwaitingApproval = false, }) {
-    // Cycle through witty phrases while processing
-    const { phrase } = usePhraseCycler({ isActive: isProcessing });
+export function StatusBar({ agent, isProcessing, isThinking, isCompacting, approvalQueueCount, copyModeEnabled = false, isAwaitingApproval = false, }) {
+    // Cycle through witty phrases while processing (not during compacting)
+    const { phrase } = usePhraseCycler({ isActive: isProcessing && !isCompacting });
     // Track elapsed time during processing
     const { formatted: elapsedTime, elapsedMs } = useElapsedTime({ isActive: isProcessing });
     // Track token usage during processing
@@ -42,6 +42,15 @@ export function StatusBar({ agent, isProcessing, isThinking, approvalQueueCount,
     if (isAwaitingApproval) {
         return null;
     }
+    // Show compacting state - yellow/orange color to indicate context management
+    if (isCompacting) {
+        const metaParts = [];
+        if (showTime)
+            metaParts.push(`(${elapsedTime})`);
+        metaParts.push('Esc to cancel');
+        const metaContent = metaParts.join(' • ');
+        return (_jsxs(Box, { paddingX: 1, marginTop: 1, marginBottom: 1, flexDirection: "column", children: [_jsxs(Box, { flexDirection: "row", alignItems: "center", children: [_jsx(Text, { color: "yellow", children: _jsx(Spinner, { type: "dots" }) }), _jsx(Text, { color: "yellow", children: " \uD83D\uDCE6 Compacting context..." })] }), _jsx(Box, { marginLeft: 2, children: _jsx(Text, { color: "gray", children: metaContent }) })] }));
+    }
     // Show initial processing state (before streaming starts) - green/teal color
     // TODO: Rename this event/state to "reasoning" and associate it with actual reasoning tokens
     // Currently "thinking" event fires before any response, not during reasoning token generation

package/dist/cli/ink-cli/components/TextBufferInput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TextBufferInput.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/components/TextBufferInput.tsx"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGnE,+DAA+D;AAC/D,MAAM,MAAM,cAAc,GAAG,oBAAoB,GAAG,uBAAuB,GAAG,OAAO,CAAC;AActF,UAAU,oBAAoB;IAC1B,oCAAoC;IACpC,MAAM,EAAE,UAAU,CAAC;IACnB,+CAA+C;IAC/C,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,kCAAkC;IAClC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,mEAAmE;IACnE,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,4DAA4D;IAC5D,iBAAiB,CAAC,EAAE,CAAC,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACrE,0DAA0D;IAC1D,gBAAgB,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACnE,wCAAwC;IACxC,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,kDAAkD;IAClD,QAAQ,EAAE,OAAO,CAAC;IAClB,2EAA2E;IAC3E,gBAAgB,CAAC,EAAE,CAAC,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACpE,oEAAoE;IACpE,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,iDAAiD;IACjD,YAAY,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IAC3D,iEAAiE;IACjE,MAAM,CAAC,EAAE,YAAY,EAAE,GAAG,SAAS,CAAC;IACpC,4DAA4D;IAC5D,aAAa,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACxD,wDAAwD;IACxD,YAAY,CAAC,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC;IACzC,oEAAoE;IACpE,YAAY,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IAC1D,8DAA8D;IAC9D,kBAAkB,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IAC5F,iEAAiE;IACjE,kBAAkB,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IAC7D,4DAA4D;IAC5D,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACvC;AAuCD,wBAAgB,eAAe,CAAC,EAC5B,MAAM,EACN,QAAQ,EACR,WAAW,EACX,UAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAChB,gBAAqB,EACrB,QAAQ,EACR,gBAAgB,EAChB,UAAc,EACd,YAAY,EACZ,MAAW,EACX,aAAa,EACb,YAAiB,EACjB,YAAY,EACZ,kBAAkB,EAClB,kBAAkB,EAClB,cAAc,GACjB,EAAE,oBAAoB,2CA0hBtB"}
+{"version":3,"file":"TextBufferInput.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/components/TextBufferInput.tsx"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGnE,+DAA+D;AAC/D,MAAM,MAAM,cAAc,GAAG,oBAAoB,GAAG,uBAAuB,GAAG,OAAO,CAAC;AActF,UAAU,oBAAoB;IAC1B,oCAAoC;IACpC,MAAM,EAAE,UAAU,CAAC;IACnB,+CAA+C;IAC/C,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,kCAAkC;IAClC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,mEAAmE;IACnE,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,4DAA4D;IAC5D,iBAAiB,CAAC,EAAE,CAAC,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACrE,0DAA0D;IAC1D,gBAAgB,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACnE,wCAAwC;IACxC,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,kDAAkD;IAClD,QAAQ,EAAE,OAAO,CAAC;IAClB,2EAA2E;IAC3E,gBAAgB,CAAC,EAAE,CAAC,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACpE,oEAAoE;IACpE,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,iDAAiD;IACjD,YAAY,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IAC3D,iEAAiE;IACjE,MAAM,CAAC,EAAE,YAAY,EAAE,GAAG,SAAS,CAAC;IACpC,4DAA4D;IAC5D,aAAa,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACxD,wDAAwD;IACxD,YAAY,CAAC,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC;IACzC,oEAAoE;IACpE,YAAY,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IAC1D,8DAA8D;IAC9D,kBAAkB,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IAC5F,iEAAiE;IACjE,kBAAkB,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IAC7D,4DAA4D;IAC5D,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACvC;AAuCD,wBAAgB,eAAe,CAAC,EAC5B,MAAM,EACN,QAAQ,EACR,WAAW,EACX,UAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAChB,gBAAqB,EACrB,QAAQ,EACR,gBAAgB,EAChB,UAAc,EACd,YAAY,EACZ,MAAW,EACX,aAAa,EACb,YAAiB,EACjB,YAAY,EACZ,kBAAkB,EAClB,kBAAkB,EAClB,cAAc,GACjB,EAAE,oBAAoB,2CA2hBtB"}

package/dist/cli/ink-cli/components/TextBufferInput.js

@@ -433,6 +433,7 @@ export function TextBufferInput({ buffer, onSubmit, placeholder, isDisabled = fa
     const isShellMode = bufferText.startsWith('!');
     const promptPrefix = isShellMode ? '$ ' : '> ';
     const promptColor = isShellMode ? 'yellow' : 'green';
+    const separatorColor = isShellMode ? 'yellow' : 'gray';
     // Calculate visible window
     let startLine = 0;
     let endLine = totalLines;
@@ -449,7 +450,7 @@ export function TextBufferInput({ buffer, onSubmit, placeholder, isDisabled = fa
     if (bufferText === '') {
         return (_jsxs(Box, { flexDirection: "column", width: terminalWidth, children: [_jsx(Text, { color: "gray", children: separator }), _jsxs(Box, { width: terminalWidth, children: [_jsx(Text, { color: "green", bold: true, children: '> ' }), _jsx(Text, { inverse: true, children: " " }), placeholder && _jsx(Text, { color: "gray", children: placeholder }), _jsx(Text, { children: ' '.repeat(Math.max(0, terminalWidth - 3 - (placeholder?.length || 0))) })] }), _jsx(Text, { color: "gray", children: separator })] }));
     }
-    return (_jsxs(Box, { flexDirection: "column", width: terminalWidth, children: [_jsx(Text, { color: "gray", children: separator }), startLine > 0 && (_jsxs(Text, { color: "gray", children: ['  ', "\u2191 ", startLine, " more line", startLine > 1 ? 's' : '', " above (", KEY_LABELS.altUp, " to jump)"] })), visibleLines.map((line, idx) => {
+    return (_jsxs(Box, { flexDirection: "column", width: terminalWidth, children: [_jsx(Text, { color: separatorColor, children: separator }), startLine > 0 && (_jsxs(Text, { color: "gray", children: ['  ', "\u2191 ", startLine, " more line", startLine > 1 ? 's' : '', " above (", KEY_LABELS.altUp, " to jump)"] })), visibleLines.map((line, idx) => {
                 const absoluteRow = startLine + idx;
                 const isFirst = absoluteRow === 0;
                 const prefix = isFirst ? promptPrefix : '  ';
@@ -461,7 +462,7 @@ export function TextBufferInput({ buffer, onSubmit, placeholder, isDisabled = fa
                 const atCursor = line.charAt(cursorVisualCol) || ' ';
                 const after = line.slice(cursorVisualCol + 1);
                 return (_jsxs(Box, { width: terminalWidth, children: [_jsx(Text, { color: promptColor, bold: isFirst, children: prefix }), _jsx(HighlightedText, { text: before, query: highlightQuery }), _jsx(Text, { inverse: true, children: atCursor }), _jsx(HighlightedText, { text: after, query: highlightQuery }), _jsx(Text, { children: ' '.repeat(Math.max(0, terminalWidth - prefix.length - before.length - 1 - after.length)) })] }, absoluteRow));
-            }), endLine < totalLines && (_jsxs(Text, { color: "gray", children: ['  ', "\u2193 ", totalLines - endLine, " more line", totalLines - endLine > 1 ? 's' : '', ' ', "below (", KEY_LABELS.altDown, " to jump)"] })), pastedBlocks.length > 0 && (_jsx(PasteBlockHint, { pastedBlocks: pastedBlocks, expandedBlock: findExpandedBlock(), cursorOnCollapsed: findCollapsedBlockAtCursor() })), _jsx(Text, { color: "gray", children: separator })] }));
+            }), endLine < totalLines && (_jsxs(Text, { color: "gray", children: ['  ', "\u2193 ", totalLines - endLine, " more line", totalLines - endLine > 1 ? 's' : '', ' ', "below (", KEY_LABELS.altDown, " to jump)"] })), pastedBlocks.length > 0 && (_jsx(PasteBlockHint, { pastedBlocks: pastedBlocks, expandedBlock: findExpandedBlock(), cursorOnCollapsed: findCollapsedBlockAtCursor() })), _jsx(Text, { color: separatorColor, children: separator })] }));
 }
 /** Hint component for paste blocks */
 function PasteBlockHint({ pastedBlocks, expandedBlock, cursorOnCollapsed, }) {

package/dist/cli/ink-cli/components/chat/MessageItem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MessageItem.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ink-cli/components/chat/MessageItem.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EACR,OAAO,EAUV,MAAM,sBAAsB,CAAC;AAuC9B,UAAU,gBAAgB;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,2DAA2D;IAC3D,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,mEACc,gBAAgB,6CA+LrD,CAAC"}
+{"version":3,"file":"MessageItem.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ink-cli/components/chat/MessageItem.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EACR,OAAO,EAUV,MAAM,sBAAsB,CAAC;AAuC9B,UAAU,gBAAgB;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,2DAA2D;IAC3D,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,mEACc,gBAAgB,6CA6NrD,CAAC"}

package/dist/cli/ink-cli/components/chat/MessageItem.js

@@ -105,12 +105,21 @@ export const MessageItem = memo(({ message, terminalWidth = 80 }) => {
         const hasStructuredDisplay = message.toolDisplayData && message.toolContent;
         const isRunning = message.toolStatus === 'running';
         const isPending = message.toolStatus === 'pending' || message.toolStatus === 'pending_approval';
+        // Check for sub-agent progress data
+        const subAgentProgress = message.subAgentProgress;
         // Parse tool name and args for bold formatting: "ToolName(args)" → bold name + normal args
         const parenIndex = message.content.indexOf('(');
         const toolName = parenIndex > 0 ? message.content.slice(0, parenIndex) : message.content;
         const toolArgs = parenIndex > 0 ? message.content.slice(parenIndex) : '';
         // Build the full tool header text for wrapping
-        const statusSuffix = isRunning ? ' Running...' : isPending ? ' Waiting...' : '';
+        // Don't include status suffix if we have sub-agent progress (it shows its own status)
+        const statusSuffix = subAgentProgress
+            ? ''
+            : isRunning
+                ? ' Running...'
+                : isPending
+                    ? ' Waiting...'
+                    : '';
         const fullToolText = `${toolName}${toolArgs}${statusSuffix}`;
         // ToolIcon takes 2 chars ("● "), so available width is terminalWidth - 2
         const iconWidth = 2;
@@ -121,7 +130,10 @@ export const MessageItem = memo(({ message, terminalWidth = 80 }) => {
             trim: false,
         });
         const toolLines = wrappedToolText.split('\n');
-        return (_jsxs(Box, { flexDirection: "column", marginTop: 1, width: terminalWidth, children: [toolLines.map((line, i) => (_jsxs(Box, { flexDirection: "row", children: [i === 0 ? (_jsx(ToolIcon, { status: message.toolStatus || 'finished', isError: message.isError ?? false })) : (_jsx(Text, { children: '  ' })), _jsx(Text, { children: i === 0 ? (_jsxs(_Fragment, { children: [_jsx(Text, { bold: true, children: line.slice(0, toolName.length) }), _jsx(Text, { children: line.slice(toolName.length) })] })) : (line) })] }, i))), hasStructuredDisplay ? (_jsx(ToolResultRenderer, { display: message.toolDisplayData, content: message.toolContent })) : (message.toolResult && (_jsx(Box, { flexDirection: "column", children: _jsxs(Text, { color: "gray", children: [" \u23BF ", message.toolResult] }) })))] }));
+        return (_jsxs(Box, { flexDirection: "column", marginTop: 1, width: terminalWidth, children: [toolLines.map((line, i) => (_jsxs(Box, { flexDirection: "row", children: [i === 0 ? (_jsx(ToolIcon, { status: message.toolStatus || 'finished', isError: message.isError ?? false })) : (_jsx(Text, { children: '  ' })), _jsx(Text, { children: i === 0 ? (_jsxs(_Fragment, { children: [_jsx(Text, { bold: true, children: line.slice(0, toolName.length) }), _jsx(Text, { children: line.slice(toolName.length) })] })) : (line) })] }, i))), subAgentProgress && isRunning && (_jsx(Box, { marginLeft: 2, children: _jsxs(Text, { color: "gray", children: ["\u2514\u2500 ", subAgentProgress.toolsCalled, " tool", subAgentProgress.toolsCalled !== 1 ? 's' : '', " called | Current:", ' ', subAgentProgress.currentTool, subAgentProgress.tokenUsage &&
+                                subAgentProgress.tokenUsage.total > 0
+                                ? ` | ${subAgentProgress.tokenUsage.total.toLocaleString()} tokens`
+                                : ''] }) })), hasStructuredDisplay ? (_jsx(ToolResultRenderer, { display: message.toolDisplayData, content: message.toolContent })) : (message.toolResult && (_jsx(Box, { flexDirection: "column", children: _jsxs(Text, { color: "gray", children: [" \u23BF ", message.toolResult] }) })))] }));
     }
     // System message: Compact gray text
     return (_jsx(Box, { flexDirection: "column", marginBottom: 1, width: terminalWidth, children: _jsx(Text, { color: "gray", children: message.content }) }));
@@ -140,6 +152,12 @@ export const MessageItem = memo(({ message, terminalWidth = 80 }) => {
         prev.message.isError === next.message.isError &&
         prev.message.toolDisplayData === next.message.toolDisplayData &&
         prev.message.toolContent === next.message.toolContent &&
-        prev.terminalWidth === next.terminalWidth);
+        prev.terminalWidth === next.terminalWidth &&
+        prev.message.subAgentProgress?.toolsCalled ===
+            next.message.subAgentProgress?.toolsCalled &&
+        prev.message.subAgentProgress?.currentTool ===
+            next.message.subAgentProgress?.currentTool &&
+        prev.message.subAgentProgress?.tokenUsage?.total ===
+            next.message.subAgentProgress?.tokenUsage?.total);
 });
 MessageItem.displayName = 'MessageItem';

package/dist/cli/ink-cli/components/modes/AlternateBufferCLI.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AlternateBufferCLI.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ink-cli/components/modes/AlternateBufferCLI.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAG9C,OAAO,KAAK,EAAW,WAAW,EAAE,MAAM,sBAAsB,CAAC;AA2BjE,UAAU,uBAAuB;IAC7B,KAAK,EAAE,UAAU,CAAC;IAClB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,WAAW,EAAE,WAAW,CAAC;IACzB,2EAA2E;IAC3E,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;IAChC,6DAA6D;IAC7D,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAAC,EAC/B,KAAK,EACL,gBAAgB,EAChB,WAAW,EACX,kBAAkB,EAClB,YAAmB,GACtB,EAAE,uBAAuB,2CAgTzB"}
+{"version":3,"file":"AlternateBufferCLI.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ink-cli/components/modes/AlternateBufferCLI.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAG9C,OAAO,KAAK,EAAW,WAAW,EAAE,MAAM,sBAAsB,CAAC;AA2BjE,UAAU,uBAAuB;IAC7B,KAAK,EAAE,UAAU,CAAC;IAClB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,WAAW,EAAE,WAAW,CAAC;IACzB,2EAA2E;IAC3E,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;IAChC,6DAA6D;IAC7D,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAAC,EAC/B,KAAK,EACL,gBAAgB,EAChB,WAAW,EACX,kBAAkB,EAClB,YAAmB,GACtB,EAAE,uBAAuB,2CAkTzB"}