dexto 1.5.1 → 1.5.3

package/dist/agents/agent-registry.json

@@ -134,6 +134,15 @@
       "tags": ["gaming", "gameboy", "pokemon", "emulator", "mcp"],
       "source": "gaming-agent/",
       "main": "gaming-agent.yml"
+    },
+    "explore-agent": {
+      "id": "explore-agent",
+      "name": "Explore Agent",
+      "description": "Fast, read-only agent for codebase exploration. Use for: 'explore the codebase', 'what's in this folder', 'how does X work', 'find where Y is handled', 'understand the architecture'. Optimized for speed with Haiku.",
+      "author": "Truffle AI",
+      "tags": ["explore", "search", "understand", "find", "research"],
+      "source": "explore-agent/",
+      "main": "explore-agent.yml"
     }
   }
 }

package/dist/agents/coding-agent/coding-agent.yml

@@ -24,8 +24,27 @@ systemPrompt:
         - Debug issues by examining error messages and code structure
         - Refactor code following best practices and design patterns
         - Explain complex code concepts clearly
+        - Delegate exploration tasks to specialized sub-agents
 
-        Guidelines:
+        ## Task Delegation
+
+        You have access to spawn_agent for delegating tasks to specialized sub-agents.
+
+        **When to delegate to explore-agent:**
+        - Open-ended exploration: "explore the codebase", "what's in this folder", "how does X work"
+        - Understanding architecture: "explain the project structure", "how are components organized"
+        - Finding patterns: "where is authentication handled", "find all API endpoints"
+        - Research tasks: "what testing framework is used", "how is state managed"
+
+        **When to use your own tools directly:**
+        - Specific file operations: "read src/index.ts", "edit the config file"
+        - Targeted searches: "find the User class", "grep for 'TODO'"
+        - Writing/editing code: any task that requires modifications
+        - Running commands: build, test, install dependencies
+
+        **Rule of thumb:** If the task requires understanding or exploring before you know what to do, delegate to explore-agent first. If you know exactly what file/function to target, use your tools directly.
+
+        ## Guidelines
         - Always read relevant code before making changes to understand context
         - Use glob_files to find files and grep_content to search within files
         - Test changes when possible using bash_exec
@@ -70,13 +89,14 @@ toolConfirmation:
   # Tool policies optimized for coding workflows
   toolPolicies:
     # Tools that never require approval (safe, read-only operations)
+    # Use qualified names: custom--{tool_id} for custom tools, internal--{tool_id} for internal tools
     alwaysAllow:
       - internal--ask_user
-      - custom--filesystem-tools--read_file      # Read files without approval
-      - custom--filesystem-tools--glob_files     # Search for files without approval
-      - custom--filesystem-tools--grep_content   # Search within files without approval
-      - custom--process-tools--bash_output       # Check background process output
-      - custom--process-tools--kill_process      # Kill processes without approval
+      - custom--read_file      # Read files without approval
+      - custom--glob_files     # Search for files without approval
+      - custom--grep_content   # Search within files without approval
+      - custom--bash_output    # Check background process output
+      - custom--kill_process   # Kill processes without approval (only processes started by agent)
 
     # Tools that are always denied (dangerous operations)
     # Uncomment to restrict certain operations
@@ -101,6 +121,17 @@ customTools:
     enableBackups: false
   - type: process-tools
     securityLevel: moderate
+  - type: agent-spawner
+    maxConcurrentAgents: 5
+    defaultTimeout: 300000
+    allowSpawning: true
+    # List of agent IDs from the registry that can be spawned.
+    # Agent metadata (name, description) is pulled from the registry at runtime.
+    allowedAgents:
+      - explore-agent
+    # Agents with read-only tools that should have auto-approved tool calls
+    autoApproveAgents:
+      - explore-agent
 
 # Internal resources configuration - expanded for coding projects
 internalResources:

package/dist/agents/explore-agent/explore-agent.yml

@@ -0,0 +1,124 @@
+# Explore Agent Configuration
+# Lightweight, read-only agent optimized for codebase exploration
+# Designed to be spawned by other agents for research tasks
+
+# No image bundle - uses only explicitly defined tools below
+
+# System prompt optimized for exploration tasks
+systemPrompt:
+  contributors:
+    - id: primary
+      type: static
+      priority: 0
+      content: |
+        You are a fast, focused exploration agent specialized in understanding codebases and finding information.
+
+        ## Your Mission
+        Quickly and thoroughly explore codebases to answer questions, find patterns, locate files, and understand architecture. You are optimized for speed and accuracy.
+
+        ## Available Tools
+        You have access to read-only tools:
+        - `glob_files` - Find files matching patterns (e.g., "src/**/*.ts", "*.config.js")
+        - `grep_content` - Search for text/patterns within files
+        - `read_file` - Read file contents
+
+        ## Exploration Strategy
+
+        ### For "quick" searches:
+        - Single glob or grep to find the target
+        - Read 1-2 most relevant files
+        - Return focused answer
+
+        ### For "medium" exploration:
+        - Multiple search patterns to find related files
+        - Read key files to understand connections
+        - Summarize findings with file references
+
+        ### For "very thorough" analysis:
+        - Comprehensive search across multiple naming conventions
+        - Trace imports, exports, and dependencies
+        - Map relationships between components
+        - Provide detailed analysis with evidence
+
+        ## Guidelines
+        - Start with broad searches, then narrow down
+        - Use glob for file discovery, grep for content search
+        - Try multiple naming conventions (camelCase, snake_case, kebab-case, PascalCase)
+        - Check common locations: src/, lib/, packages/, tests/, config/
+        - Report what you found AND what you didn't find
+        - Include file paths and line numbers in your response
+        - Be concise but complete
+
+        ## Response Format
+        Structure your response as:
+        1. **Summary** - Brief answer to the question
+        2. **Key Files** - List of relevant files found
+        3. **Details** - Specific findings with code references
+        4. **Notes** - Any caveats or areas that need further exploration
+
+# LLM configuration - Haiku for speed and cost efficiency
+llm:
+  provider: anthropic
+  model: claude-haiku-4-5-20251001
+  apiKey: $ANTHROPIC_API_KEY
+
+# Minimal storage - in-memory only for ephemeral use
+storage:
+  cache:
+    type: in-memory
+  database:
+    type: in-memory
+  blob:
+    type: in-memory
+
+# Auto-approve all tools since they're read-only
+toolConfirmation:
+  mode: auto-approve
+  allowedToolsStorage: memory
+
+# No internal tools needed for exploration
+internalTools: []
+
+# Read-only filesystem tools only - explicitly enable only read operations
+customTools:
+  - type: filesystem-tools
+    enabledTools: ["read_file", "glob_files", "grep_content"]  # Read-only tools only
+    allowedPaths: ["."]
+    blockedPaths:
+      # Version control
+      - ".git"
+      # Binaries
+      - "node_modules/.bin"
+      # Environment files with secrets
+      - ".env"
+      - ".env.local"
+      - ".env.production"
+      - ".env.development"
+      - ".env.test"
+      - ".env.staging"
+      # Package manager credentials
+      - ".npmrc"
+      - ".yarnrc"
+      - ".pypirc"
+      # Git credentials
+      - ".git-credentials"
+      - ".gitconfig"
+      # SSH keys
+      - ".ssh"
+      # Cloud provider credentials
+      - ".aws"
+      - ".gcp"
+      - ".azure"
+      # Kubernetes config
+      - ".kube"
+      # Docker credentials
+      - ".docker"
+    blockedExtensions: [".exe", ".dll", ".so", ".dylib"]
+    maxFileSize: 10485760  # 10MB
+    enableBackups: false
+
+# Note: This agent intentionally excludes:
+# - write_file, edit_file (write operations) - not in enabledTools
+# - process-tools (bash execution) - provider not included
+# - agent-spawner (no sub-agent spawning) - provider not included
+# This ensures it remains a safe, read-only exploration tool

package/dist/cli/approval/cli-approval-handler.d.ts

@@ -0,0 +1,28 @@
+/**
+ * CLI-specific Approval Handler
+ *
+ * Creates a manual approval handler that works directly with AgentEventBus
+ * for the CLI/TUI mode. Unlike the server's ManualApprovalHandler which uses
+ * ApprovalCoordinator for HTTP-based flows, this handler emits events directly
+ * to the event bus that the TUI listens to.
+ *
+ * Flow:
+ * 1. Handler emits 'approval:request' → EventBus → TUI shows prompt
+ * 2. User responds in TUI → EventBus emits 'approval:response' → Handler resolves
+ * 3. For auto-approvals (parallel tools), handler emits 'approval:response' → TUI dismisses
+ */
+import type { ApprovalHandler, AgentEventBus } from '@dexto/core';
+/**
+ * Creates a manual approval handler for CLI mode that uses AgentEventBus directly.
+ *
+ * @param eventBus The agent event bus for request/response communication
+ * @returns ApprovalHandler with cancellation and auto-approve support
+ *
+ * @example
+ * ```typescript
+ * const handler = createCLIApprovalHandler(agent.agentEventBus);
+ * agent.setApprovalHandler(handler);
+ * ```
+ */
+export declare function createCLIApprovalHandler(eventBus: AgentEventBus): ApprovalHandler;
+//# sourceMappingURL=cli-approval-handler.d.ts.map

package/dist/cli/approval/cli-approval-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli-approval-handler.d.ts","sourceRoot":"","sources":["../../../src/cli/approval/cli-approval-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EACR,eAAe,EAGf,aAAa,EAChB,MAAM,aAAa,CAAC;AAGrB;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,aAAa,GAAG,eAAe,CAyJjF"}

package/dist/cli/approval/cli-approval-handler.js

@@ -0,0 +1,146 @@
+/**
+ * CLI-specific Approval Handler
+ *
+ * Creates a manual approval handler that works directly with AgentEventBus
+ * for the CLI/TUI mode. Unlike the server's ManualApprovalHandler which uses
+ * ApprovalCoordinator for HTTP-based flows, this handler emits events directly
+ * to the event bus that the TUI listens to.
+ *
+ * Flow:
+ * 1. Handler emits 'approval:request' → EventBus → TUI shows prompt
+ * 2. User responds in TUI → EventBus emits 'approval:response' → Handler resolves
+ * 3. For auto-approvals (parallel tools), handler emits 'approval:response' → TUI dismisses
+ */
+import { ApprovalStatus, DenialReason } from '@dexto/core';
+/**
+ * Creates a manual approval handler for CLI mode that uses AgentEventBus directly.
+ *
+ * @param eventBus The agent event bus for request/response communication
+ * @returns ApprovalHandler with cancellation and auto-approve support
+ *
+ * @example
+ * ```typescript
+ * const handler = createCLIApprovalHandler(agent.agentEventBus);
+ * agent.setApprovalHandler(handler);
+ * ```
+ */
+export function createCLIApprovalHandler(eventBus) {
+    // Track pending approvals for cancellation support
+    const pendingApprovals = new Map();
+    const handleApproval = (request) => {
+        return new Promise((resolve) => {
+            // Use per-request timeout (optional - undefined means no timeout)
+            const effectiveTimeout = request.timeout;
+            // Set timeout timer ONLY if timeout is specified
+            let timer;
+            if (effectiveTimeout !== undefined) {
+                timer = setTimeout(() => {
+                    cleanup();
+                    pendingApprovals.delete(request.approvalId);
+                    // Create timeout response
+                    const timeoutResponse = {
+                        approvalId: request.approvalId,
+                        status: ApprovalStatus.CANCELLED,
+                        sessionId: request.sessionId,
+                        reason: DenialReason.TIMEOUT,
+                        message: `Approval request timed out after ${effectiveTimeout}ms`,
+                        timeoutMs: effectiveTimeout,
+                    };
+                    // Emit timeout response so TUI can dismiss the prompt
+                    eventBus.emit('approval:response', timeoutResponse);
+                    resolve(timeoutResponse);
+                }, effectiveTimeout);
+            }
+            // Cleanup function to remove listener and clear timeout
+            const controller = new AbortController();
+            const cleanup = () => {
+                if (timer !== undefined) {
+                    clearTimeout(timer);
+                }
+                controller.abort();
+            };
+            // Listen for approval:response events
+            const listener = (res) => {
+                // Only handle responses for this specific approval
+                if (res.approvalId === request.approvalId) {
+                    cleanup();
+                    pendingApprovals.delete(request.approvalId);
+                    resolve(res);
+                }
+            };
+            // Register listener with abort signal for cleanup
+            eventBus.on('approval:response', listener, { signal: controller.signal });
+            // Store for cancellation support
+            pendingApprovals.set(request.approvalId, {
+                cleanup,
+                resolve,
+                request,
+            });
+            // Emit the approval:request event for TUI to receive
+            eventBus.emit('approval:request', request);
+        });
+    };
+    const handler = Object.assign(handleApproval, {
+        cancel: (approvalId) => {
+            const pending = pendingApprovals.get(approvalId);
+            if (pending) {
+                pending.cleanup();
+                pendingApprovals.delete(approvalId);
+                // Create cancellation response
+                const cancelResponse = {
+                    approvalId,
+                    status: ApprovalStatus.CANCELLED,
+                    sessionId: pending.request.sessionId,
+                    reason: DenialReason.SYSTEM_CANCELLED,
+                    message: 'Approval request was cancelled',
+                };
+                // Emit cancellation event so TUI can dismiss the prompt
+                eventBus.emit('approval:response', cancelResponse);
+                // Resolve with CANCELLED response
+                pending.resolve(cancelResponse);
+            }
+        },
+        cancelAll: () => {
+            for (const [approvalId] of pendingApprovals) {
+                handler.cancel?.(approvalId);
+            }
+        },
+        getPending: () => {
+            return Array.from(pendingApprovals.keys());
+        },
+        getPendingRequests: () => {
+            return Array.from(pendingApprovals.values()).map((p) => p.request);
+        },
+        /**
+         * Auto-approve pending requests that match a predicate.
+         * Used when a pattern is remembered to auto-approve other parallel requests
+         * that would now match the same pattern.
+         */
+        autoApprovePending: (predicate, responseData) => {
+            let count = 0;
+            // Find all pending approvals that match the predicate
+            for (const [approvalId, pending] of pendingApprovals) {
+                if (predicate(pending.request)) {
+                    // Clean up the pending state
+                    pending.cleanup();
+                    pendingApprovals.delete(approvalId);
+                    // Create auto-approval response
+                    const autoApproveResponse = {
+                        approvalId,
+                        status: ApprovalStatus.APPROVED,
+                        sessionId: pending.request.sessionId,
+                        message: 'Auto-approved due to matching remembered pattern',
+                        data: responseData,
+                    };
+                    // Emit response so TUI can dismiss the prompt
+                    eventBus.emit('approval:response', autoApproveResponse);
+                    // Resolve the pending promise
+                    pending.resolve(autoApproveResponse);
+                    count++;
+                }
+            }
+            return count;
+        },
+    });
+    return handler;
+}

package/dist/cli/approval/index.d.ts

@@ -0,0 +1,7 @@
+/**
+ * CLI Approval Module
+ *
+ * Provides CLI-specific approval handling that works directly with AgentEventBus.
+ */
+export { createCLIApprovalHandler } from './cli-approval-handler.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/cli/approval/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/approval/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC"}

package/dist/cli/approval/index.js

@@ -0,0 +1,6 @@
+/**
+ * CLI Approval Module
+ *
+ * Provides CLI-specific approval handling that works directly with AgentEventBus.
+ */
+export { createCLIApprovalHandler } from './cli-approval-handler.js';

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

@@ -1 +1 @@
-{"version":3,"file":"general-commands.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/interactive-commands/general-commands.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH,OAAO,KAAK,EAAE,iBAAiB,EAAwC,MAAM,qBAAqB,CAAC;AAiDnG;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,MAAM,iBAAiB,EAAE,GAAG,iBAAiB,CAgC9F;AAED;;;GAGG;AACH,eAAO,MAAM,eAAe,EAAE,iBAAiB,EAyO9C,CAAC"}
+{"version":3,"file":"general-commands.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/interactive-commands/general-commands.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH,OAAO,KAAK,EAAE,iBAAiB,EAAwC,MAAM,qBAAqB,CAAC;AAoDnG;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,MAAM,iBAAiB,EAAE,GAAG,iBAAiB,CAgC9F;AAED;;;GAGG;AACH,eAAO,MAAM,eAAe,EAAE,iBAAiB,EAyO9C,CAAC"}

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

@@ -19,10 +19,13 @@ import { writeToClipboard } from '../../ink-cli/utils/clipboardUtils.js';
  */
 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
+        // Use -i flag for interactive mode to load aliases from shell config
+        const userShell = process.env.SHELL || '/bin/sh';
+        const child = spawn(userShell, ['-ic', command], {
             cwd,
-            shell: true,
             stdio: ['ignore', 'pipe', 'pipe'],
+            env: { ...process.env },
         });
         let stdout = '';
         let stderr = '';

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/ResourceAutocomplete.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ResourceAutocomplete.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/components/ResourceAutocomplete.tsx"],"names":[],"mappings":"AAAA,OAAO,KAQN,MAAM,OAAO,CAAC;AAEf,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAC;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,WAAW,0BAA0B;IACvC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAED,UAAU,yBAAyB;IAC/B,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,CAAC,QAAQ,EAAE,gBAAgB,KAAK,IAAI,CAAC;IACvD,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,KAAK,EAAE,UAAU,CAAC;CACrB;AA6ED;;GAEG;AACH,QAAA,MAAM,yBAAyB,8GAgR9B,CAAC;AAEF;;;GAGG;AACH,QAAA,MAAM,oBAAoB,EAErB,OAAO,yBAAyB,CAAC;AAEtC,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"ResourceAutocomplete.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/components/ResourceAutocomplete.tsx"],"names":[],"mappings":"AAAA,OAAO,KAQN,MAAM,OAAO,CAAC;AAEf,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAC;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,WAAW,0BAA0B;IACvC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAED,UAAU,yBAAyB;IAC/B,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,CAAC,QAAQ,EAAE,gBAAgB,KAAK,IAAI,CAAC;IACvD,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,KAAK,EAAE,UAAU,CAAC;CACrB;AA6ED;;GAEG;AACH,QAAA,MAAM,yBAAyB,8GAoQ9B,CAAC;AAEF;;;GAGG;AACH,QAAA,MAAM,oBAAoB,EAErB,OAAO,yBAAyB,CAAC;AAEtC,eAAe,oBAAoB,CAAC"}

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

@@ -74,7 +74,7 @@ const ResourceAutocompleteInner = forwardRef(function ResourceAutocomplete({ isV
     // Combined state to guarantee single render on navigation
     const [selection, setSelection] = useState({ index: 0, offset: 0 });
     const selectedIndexRef = useRef(0);
-    const MAX_VISIBLE_ITEMS = 8;
+    const MAX_VISIBLE_ITEMS = 5;
     // Update selection AND scroll offset in a single state update
     // This guarantees exactly one render per navigation action
     const updateSelection = useCallback((indexUpdater) => {
@@ -122,6 +122,10 @@ const ResourceAutocompleteInner = forwardRef(function ResourceAutocomplete({ isV
             cancelled = true;
         };
     }, [isVisible, agent]);
+    // NOTE: Auto-close logic is handled synchronously in TextBufferInput.tsx
+    // (on backspace deleting @ and on space after @). We don't use useEffect here
+    // because React batches state updates, causing race conditions where isVisible
+    // and searchQuery update at different times.
     // Extract query from @mention (everything after @)
     const mentionQuery = useMemo(() => {
         // Find the last @ that's at start or after space
@@ -250,7 +254,9 @@ const ResourceAutocompleteInner = forwardRef(function ResourceAutocomplete({ isV
                 const uriParts = resource.uri.split('/');
                 const displayName = resource.name || uriParts[uriParts.length - 1] || resource.uri;
                 const isImage = (resource.mimeType || '').startsWith('image/');
-                return (_jsx(Box, { paddingX: 0, paddingY: 0, children: _jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [isImage && (_jsx(Text, { color: isSelected ? 'cyan' : 'gray', children: "\uD83D\uDDBC\uFE0F " })), _jsx(Text, { color: isSelected ? 'cyan' : 'gray', bold: isSelected, children: displayName }), resource.serverName && (_jsx(Box, { marginLeft: 1, children: _jsxs(Text, { color: isSelected ? 'white' : 'gray', children: ["[", resource.serverName, "]"] }) }))] }), _jsx(Box, { marginLeft: isImage ? 3 : 0, children: _jsx(Text, { color: isSelected ? 'white' : 'gray', children: resource.uri }) }), resource.description && (_jsx(Box, { marginLeft: isImage ? 3 : 0, children: _jsx(Text, { color: isSelected ? 'white' : 'gray', children: resource.description }) }))] }) }, resource.uri));
+                // Truncate URI for display (show last 40 chars with ellipsis)
+                const truncatedUri = resource.uri.length > 50 ? '…' + resource.uri.slice(-49) : resource.uri;
+                return (_jsxs(Box, { children: [isImage && _jsx(Text, { color: isSelected ? 'cyan' : 'gray', children: "\uD83D\uDDBC\uFE0F " }), _jsx(Text, { color: isSelected ? 'cyan' : 'white', bold: isSelected, children: displayName }), resource.serverName && (_jsxs(Text, { color: "gray", children: [" [", resource.serverName, "]"] })), _jsxs(Text, { color: "gray", children: [" ", truncatedUri] })] }, resource.uri));
             })] }));
 });
 /**

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,2CA2gBtB"}
+{"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

@@ -250,14 +250,23 @@ export function TextBufferInput({ buffer, onSubmit, placeholder, isDisabled = fa
             buffer.backspace();
             checkRemovedImages();
             checkRemovedPasteBlocks();
+            // Check if we should close overlay after backspace
+            // NOTE: buffer.text is memoized and won't update until next render,
+            // so we calculate the expected new text ourselves
             if (onTriggerOverlay && cursorPos > 0) {
                 const deletedChar = prevText[cursorPos - 1];
-                const newText = buffer.text;
+                // Calculate what the text will be after backspace
+                const expectedNewText = prevText.slice(0, cursorPos - 1) + prevText.slice(cursorPos);
                 if (deletedChar === '/' && cursorPos === 1) {
                     onTriggerOverlay('close');
                 }
-                else if (deletedChar === '@' && !newText.includes('@')) {
-                    onTriggerOverlay('close');
+                else if (deletedChar === '@') {
+                    // Close if no valid @ mention remains
+                    // A valid @ is at start of text or after whitespace
+                    const hasValidAt = /(^|[\s])@/.test(expectedNewText);
+                    if (!hasValidAt) {
+                        onTriggerOverlay('close');
+                    }
                 }
             }
             return;
@@ -388,6 +397,11 @@ export function TextBufferInput({ buffer, onSubmit, placeholder, isDisabled = fa
                 else if (key.sequence === '@') {
                     onTriggerOverlay('resource-autocomplete');
                 }
+                else if (/\s/.test(key.sequence)) {
+                    // Close resource autocomplete when user types whitespace
+                    // Whitespace means user is done with the mention (either selected or abandoned)
+                    onTriggerOverlay('close');
+                }
             }
         }
     }, [
@@ -419,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;
@@ -435,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 : '  ';
@@ -447,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, }) {