@phuetz/code-buddy 2.0.0 → 2.2.0

package/dist/ui/components/ChatInterface.js

@@ -12,20 +12,18 @@ import { MCPStatus } from "./McpStatus.js";
 import ConfirmationDialog from "./ConfirmationDialog.js";
 import { ConfirmationService, } from "../../utils/confirmation-service.js";
 import ApiKeyInput from "./ApiKeyInput.js";
-import { renderColorBanner } from "../../utils/ascii-banner.js";
 import { ThemeProvider, useTheme } from "../context/theme-context.js";
 import { getErrorMessage } from "../../types/index.js";
 import { MiniStatusBar } from "./StatusBar.js";
-import { KeyboardHelp, useKeyboardHelp, KeyboardHelpButton } from "./KeyboardHelp.js";
+import { KeyboardHelp, useKeyboardHelp } from "./KeyboardHelp.js";
 import { ToastProvider } from "./ToastNotifications.js";
-import { logger } from "../../utils/logger.js";
 import { getTTSManager } from "../../input/text-to-speech.js";
 import { announceToScreenReader, useAccessibilitySettings, useKeyboardShortcuts, } from "../utils/accessibility.js";
 // Main chat component that handles input when agent is available
-function ChatInterfaceWithAgent({ agent, initialMessage, }) {
-    const { colors, theme } = useTheme();
+function ChatInterfaceWithAgent({ agent, initialMessage, initialHistory, }) {
+    const { colors } = useTheme();
     const { settings } = useAccessibilitySettings();
-    const [chatHistory, setChatHistory] = useState([]);
+    const [chatHistory, setChatHistory] = useState(() => initialHistory ?? []);
     const [isProcessing, setIsProcessing] = useState(false);
     const [processingTime, setProcessingTime] = useState(0);
     const [tokenCount, setTokenCount] = useState(0);
@@ -98,7 +96,7 @@ function ChatInterfaceWithAgent({ agent, initialMessage, }) {
             return prev;
         });
     }, []);
-    const { input, cursorPosition, showCommandSuggestions, selectedCommandIndex, showModelSelection, selectedModelIndex, showFileAutocomplete, selectedFileIndex, fileSuggestions, commandSuggestions, availableModels, autoEditEnabled, handleInputSubmit, } = useInputHandler({
+    const { input, cursorPosition, showCommandSuggestions, selectedCommandIndex, showModelSelection, selectedModelIndex, showFileAutocomplete, selectedFileIndex, fileSuggestions, commandSuggestions, availableModels, autoEditEnabled, queuedMessageCount, handleInputSubmit, } = useInputHandler({
         agent,
         chatHistory,
         setChatHistory,
@@ -110,39 +108,15 @@ function ChatInterfaceWithAgent({ agent, initialMessage, }) {
         processingStartTime,
         isProcessing,
         isStreaming,
-        isConfirmationActive: !!confirmationOptions,
+        isConfirmationActive: !!confirmationOptions || !!pendingQuestion || keyboardHelp.isVisible,
         appendStreamingContent,
         finalizeStreamingEntry,
         updateToolCallEntry,
     });
     useEffect(() => {
-        // Only clear console on non-Windows platforms or if not PowerShell
-        // Windows PowerShell can have issues with console.clear() causing flickering
-        const isWindows = process.platform === "win32";
-        const isPowerShell = process.env.ComSpec?.toLowerCase().includes("powershell") ||
-            process.env.PSModulePath !== undefined;
-        if (!isWindows || !isPowerShell) {
-            process.stdout.write('\x1b[2J\x1b[0f'); // ANSI escape code to clear screen
-        }
-        // Add top padding
-        logger.info("    ");
-        // Generate logo with MIT-licensed ascii-banner (replaces GPL cfonts)
-        const logoOutput = renderColorBanner("CODE BUDDY", ["magenta", "cyan"]);
-        // Add horizontal margin (2 spaces) to match Ink paddingX={2}
-        const logoLines = logoOutput.split("\n");
-        logoLines.forEach((line) => {
-            if (line.trim()) {
-                logger.info(" " + line); // Add 2 spaces for horizontal margin
-            }
-            else {
-                logger.info(line); // Keep empty lines as-is
-            }
-        });
-        logger.info(" "); // Spacing after logo
-        setChatHistory([]);
         // Announce to screen readers
         if (settings.screenReader) {
-            announceToScreenReader('Code Buddy started. Chat interface ready. Press Ctrl+H for help.', 'polite');
+            announceToScreenReader('Code Buddy started. Chat interface ready. Type /help for commands.', 'polite');
         }
     }, [settings.screenReader]);
     // Process initial message if provided (streaming for faster feedback)
@@ -371,6 +345,7 @@ function ChatInterfaceWithAgent({ agent, initialMessage, }) {
                         announceToScreenReader(`Error occurred: ${errorMessage}`, 'assertive');
                     }
                 }
+                await agent.persistInteractiveSession();
                 setIsProcessing(false);
                 processingStartTime.current = 0;
             };
@@ -422,53 +397,42 @@ function ChatInterfaceWithAgent({ agent, initialMessage, }) {
         }
     };
     return (React.createElement(Box, { flexDirection: "column", paddingX: 2 },
-        chatHistory.length === 0 && !confirmationOptions && (React.createElement(Box, { flexDirection: "column", marginBottom: 2 },
-            React.createElement(Text, { color: colors.primary, bold: true }, "Tips for getting started:"),
-            React.createElement(Box, { marginTop: 1, flexDirection: "column" },
-                React.createElement(Text, { color: colors.textMuted }, "1. Ask questions, edit files, or run commands."),
-                React.createElement(Text, { color: colors.textMuted }, "2. Be specific for the best results."),
-                React.createElement(Text, { color: colors.textMuted }, "3. Create CODEBUDDY.md files to customize your interactions with Code Buddy."),
-                React.createElement(Text, { color: colors.textMuted }, "4. Press Shift+Tab to toggle auto-edit mode."),
-                React.createElement(Text, { color: colors.textMuted }, "5. /help for more information."),
-                React.createElement(Text, { color: colors.textMuted }, "6. /theme to change the theme, /avatar to change avatars.")),
-            React.createElement(Box, { marginTop: 1 },
-                React.createElement(KeyboardHelpButton, null)))),
-        React.createElement(Box, { flexDirection: "column", marginBottom: 1 },
-            React.createElement(Text, { color: colors.textMuted }, "Type your request in natural language. Ctrl+C to clear, 'exit' to quit.")),
+        chatHistory.length === 0 && !confirmationOptions && (React.createElement(Box, { flexDirection: "column", marginBottom: 1 },
+            React.createElement(Text, { bold: true, color: colors.primary }, "Code Buddy"),
+            React.createElement(Text, { color: colors.textMuted, wrap: "truncate-middle" }, process.cwd()),
+            React.createElement(Text, { color: colors.textMuted }, "Ask a question or describe a change. /help commands \u00B7 /model choose a model"))),
         React.createElement(Box, { flexDirection: "column", ref: scrollRef },
             React.createElement(ChatHistory, { entries: chatHistory, isConfirmationActive: !!confirmationOptions })),
         pendingQuestion && (React.createElement(TabbedQuestion, { question: pendingQuestion.question, options: pendingQuestion.options, onAnswer: (answer) => {
                 pendingQuestion.resolve(answer);
             } })),
         confirmationOptions && (React.createElement(ConfirmationDialog, { operation: confirmationOptions.operation, filename: confirmationOptions.filename, showVSCodeOpen: confirmationOptions.showVSCodeOpen, content: confirmationOptions.content, onConfirm: handleConfirmation, onReject: handleRejection })),
-        !confirmationOptions && (React.createElement(React.Fragment, null,
+        !confirmationOptions && !pendingQuestion && !keyboardHelp.isVisible && (React.createElement(React.Fragment, null,
             React.createElement(StatusBlock, { isActive: isProcessing || isStreaming, processingTime: processingTime, tokenCount: tokenCount, activity: currentActivity }),
+            queuedMessageCount > 0 && React.createElement(Text, { color: colors.info },
+                queuedMessageCount,
+                " message(s) queued \u00B7 sent after the current reply"),
             React.createElement(ChatInput, { input: input, cursorPosition: cursorPosition, isProcessing: isProcessing, isStreaming: isStreaming, mode: agent.getMode() }),
-            React.createElement(Box, { flexDirection: "row", marginTop: 1, justifyContent: "space-between" },
-                React.createElement(Box, { flexDirection: "row" },
+            React.createElement(Text, { color: colors.textMuted, dimColor: true },
+                isProcessing || isStreaming ? 'Enter queue' : 'Enter send',
+                " \u00B7 Ctrl+J newline \u00B7 Esc cancel \u00B7 Ctrl+C quit"),
+            React.createElement(Box, { flexDirection: "row", flexWrap: "wrap", marginTop: 1, justifyContent: "space-between" },
+                React.createElement(Box, { flexDirection: "row", flexWrap: "wrap" },
                     React.createElement(Box, { marginRight: 2 },
-                        React.createElement(Text, { color: colors.primary },
-                            autoEditEnabled ? "▶" : "⏸",
-                            " auto-edit:",
-                            " ",
-                            autoEditEnabled ? "on" : "off"),
+                        React.createElement(Text, { color: colors.primary }, autoEditEnabled ? "Edits: automatic" : "Edits: ask first"),
                         React.createElement(Text, { color: colors.textMuted, dimColor: true },
                             " ",
                             "(shift + tab)")),
-                    React.createElement(Box, { marginRight: 2 },
-                        React.createElement(Text, { color: colors.secondary },
-                            "\u25D0 ",
-                            theme.name)),
                     React.createElement(MCPStatus, null)),
                 React.createElement(Box, null,
-                    React.createElement(MiniStatusBar, { tokenCount: tokenCount, modelName: agent.getCurrentModel(), mode: agent.getMode(), yolo: agent.isYoloModeEnabled() }))),
+                    React.createElement(MiniStatusBar, { tokenCount: tokenCount, modelName: agent.getCurrentModel(), providerName: agent.getClient().getProviderName(), mode: agent.getMode(), yolo: agent.isYoloModeEnabled() }))),
             React.createElement(CommandSuggestions, { suggestions: commandSuggestions, input: input, selectedIndex: selectedCommandIndex, isVisible: showCommandSuggestions }),
             React.createElement(FileAutocomplete, { input: input, visible: showFileAutocomplete, selectedIndex: selectedFileIndex, suggestions: fileSuggestions }),
             React.createElement(ModelSelection, { models: availableModels, selectedIndex: selectedModelIndex, isVisible: showModelSelection, currentModel: agent.getCurrentModel() }))),
         React.createElement(KeyboardHelp, { isVisible: keyboardHelp.isVisible, onClose: keyboardHelp.hide })));
 }
 // Inner component that handles API key input or chat interface
-function ChatInterfaceInner({ agent, initialMessage, }) {
+function ChatInterfaceInner({ agent, initialMessage, initialHistory, }) {
     const [currentAgent, setCurrentAgent] = useState(agent || null);
     const handleApiKeySet = (newAgent) => {
         setCurrentAgent(newAgent);
@@ -476,12 +440,12 @@ function ChatInterfaceInner({ agent, initialMessage, }) {
     if (!currentAgent) {
         return React.createElement(ApiKeyInput, { onApiKeySet: handleApiKeySet });
     }
-    return (React.createElement(ChatInterfaceWithAgent, { agent: currentAgent, initialMessage: initialMessage }));
+    return (React.createElement(ChatInterfaceWithAgent, { agent: currentAgent, initialMessage: initialMessage, initialHistory: initialHistory }));
 }
 // Main component wrapped with ThemeProvider and ToastProvider
-export default function ChatInterface({ agent, initialMessage, }) {
+export default function ChatInterface({ agent, initialMessage, initialHistory, }) {
     return (React.createElement(ThemeProvider, null,
         React.createElement(ToastProvider, null,
-            React.createElement(ChatInterfaceInner, { agent: agent, initialMessage: initialMessage }))));
+            React.createElement(ChatInterfaceInner, { agent: agent, initialMessage: initialMessage, initialHistory: initialHistory }))));
 }
 //# sourceMappingURL=ChatInterface.js.map

package/dist/ui/components/CommandSuggestions.d.ts

@@ -10,7 +10,6 @@ interface CommandSuggestionsProps {
     selectedIndex: number;
     isVisible: boolean;
 }
-export declare const MAX_SUGGESTIONS = 15;
 export declare const VISIBLE_SUGGESTIONS = 10;
 export declare function filterCommandSuggestions<T extends {
     command: string;

package/dist/ui/components/CommandSuggestions.js

@@ -1,7 +1,6 @@
 import React, { useMemo } from "react";
 import { Box, Text } from "ink";
 import { getSlashCommandManager } from "../../commands/slash-commands.js";
-export const MAX_SUGGESTIONS = 15;
 export const VISIBLE_SUGGESTIONS = 10;
 /**
  * Get argument suggestions for a command
@@ -50,7 +49,7 @@ export function filterCommandSuggestions(suggestions, input) {
             const currentArg = parts.length > 1 ? parts.slice(1).join(' ') : '';
             const argSuggestions = getArgumentSuggestions(command, currentArg);
             if (argSuggestions.length > 0) {
-                return argSuggestions.slice(0, MAX_SUGGESTIONS);
+                return argSuggestions;
             }
         }
     }
@@ -72,11 +71,10 @@ export function filterCommandSuggestions(suggestions, input) {
                 return -1;
             return aIndex - bIndex;
         });
-        return sorted.slice(0, MAX_SUGGESTIONS);
+        return sorted;
     }
     return suggestions
-        .filter((s) => s.command.toLowerCase().startsWith(lowerInput))
-        .slice(0, MAX_SUGGESTIONS);
+        .filter((s) => s.command.toLowerCase().startsWith(lowerInput));
 }
 // Memoized individual suggestion item
 const SuggestionItem = React.memo(function SuggestionItem({ command, description, isSelected, isArgument, }) {
@@ -126,7 +124,7 @@ export const CommandSuggestions = React.memo(function CommandSuggestions({ sugge
                 " more below..."))),
         React.createElement(Box, { marginTop: 1 },
             React.createElement(Text, { color: "gray", dimColor: true },
-                "\u2191\u2193 navigate \u2022 Enter/Tab select \u2022 Esc cancel \u2022 ",
+                "\u2191\u2193 navigate \u2022 \u2192/Tab complete \u2022 Enter run \u2022 Esc close \u2022 ",
                 totalMatches,
                 "/",
                 totalCommands,

package/dist/ui/components/FileAutocomplete.js

@@ -211,7 +211,7 @@ export const FileAutocomplete = React.memo(function FileAutocomplete({ input, vi
         return null;
     }
     return (React.createElement(Box, { flexDirection: "column", borderStyle: "round", borderColor: colors.borderActive, marginTop: 1, paddingX: 1 },
-        React.createElement(Text, { color: colors.textMuted, dimColor: true }, "File suggestions (Tab to select):"),
+        React.createElement(Text, { color: colors.textMuted, dimColor: true }, "File suggestions (\u2192/Tab complete, Enter select):"),
         suggestions.map((suggestion, index) => {
             const isSelected = index === selectedIndex;
             const icon = getFileIcon(suggestion);

package/dist/ui/components/KeyboardHelp.js

@@ -19,7 +19,9 @@ const KEYBOARD_SHORTCUTS = [
     { keys: 'Tab', description: 'Autocomplete command', category: 'Navigation' },
     { keys: 'Shift+Tab', description: 'Toggle auto-edit mode', category: 'Navigation' },
     // Editing
-    { keys: 'Ctrl+C', description: 'Clear current input / Interrupt', category: 'Editing' },
+    { keys: 'Ctrl+C', description: 'Quit Code Buddy', category: 'Session' },
+    { keys: 'Ctrl+J', description: 'Insert a new line', category: 'Editing' },
+    { keys: 'Enter', description: 'Send message (queue while working)', category: 'Editing' },
     { keys: 'Ctrl+U', description: 'Clear line', category: 'Editing' },
     { keys: 'Ctrl+W', description: 'Delete word', category: 'Editing' },
     { keys: 'Ctrl+K', description: 'Delete to end of line', category: 'Editing' },
@@ -31,7 +33,7 @@ const KEYBOARD_SHORTCUTS = [
     { keys: '/review', description: 'Code review', category: 'Tools' },
     { keys: '/test', description: 'Run tests', category: 'Tools' },
     // View
-    { keys: '?', description: 'Toggle this help', category: 'View' },
+    { keys: '/help', description: 'Show help', category: 'View' },
     { keys: '/theme', description: 'Change theme', category: 'View' },
     { keys: '/avatar', description: 'Change avatars', category: 'View' },
     { keys: '/stats', description: 'Show statistics', category: 'View' },
@@ -70,7 +72,7 @@ export function KeyboardHelp({ isVisible, onClose, categories, }) {
         if (input === '?' || key.escape || key.return) {
             onClose();
         }
-    });
+    }, { isActive: isVisible });
     if (!isVisible)
         return null;
     // Filter shortcuts by category if specified
@@ -138,9 +140,9 @@ export function KeyboardHelpButton() {
     const { colors } = useTheme();
     return (React.createElement(Box, null,
         React.createElement(Text, { dimColor: true },
-            "Press ",
-            React.createElement(Text, { bold: true, color: colors.accent }, "?"),
-            " for help")));
+            "Type ",
+            React.createElement(Text, { bold: true, color: colors.accent }, "/help"),
+            " for commands")));
 }
 export default KeyboardHelp;
 //# sourceMappingURL=KeyboardHelp.js.map

package/dist/ui/components/ModelSelection.js

@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 import { Box, Text } from 'ink';
 // Memoized individual model item to prevent re-renders
 const ModelItem = React.memo(function ModelItem({ model, isSelected, }) {
@@ -9,13 +9,14 @@ export const ModelSelection = React.memo(function ModelSelection({ models, selec
     // Early return for invisible state
     if (!isVisible)
         return null;
-    // Memoize header text to prevent re-computation
-    const headerText = useMemo(() => `Select Grok Model (current: ${currentModel}):`, [currentModel]);
+    const headerText = `Select model (current: ${currentModel}):`;
+    const start = Math.max(0, Math.min(selectedIndex - 4, models.length - 8));
+    const visibleModels = models.slice(start, start + 8);
     return (React.createElement(Box, { marginTop: 1, flexDirection: "column" },
         React.createElement(Box, { marginBottom: 1 },
             React.createElement(Text, { color: "cyan" }, headerText)),
-        models.map((modelOption, index) => (React.createElement(ModelItem, { key: modelOption.model, model: modelOption.model, isSelected: index === selectedIndex }))),
+        visibleModels.map((modelOption, index) => (React.createElement(ModelItem, { key: modelOption.model, model: modelOption.model, isSelected: start + index === selectedIndex }))),
         React.createElement(Box, { marginTop: 1 },
-            React.createElement(Text, { color: "gray", dimColor: true }, "\u2191\u2193 navigate \u2022 Enter/Tab select \u2022 Esc cancel"))));
+            React.createElement(Text, { color: "gray", dimColor: true }, "\u2191\u2193 navigate \u2022 \u2192/Enter select \u2022 \u2190/Esc cancel"))));
 });
 //# sourceMappingURL=ModelSelection.js.map

package/dist/ui/components/StatusBar.d.ts

@@ -45,10 +45,11 @@ export declare function StatusBar({ tokenCount, maxTokens, cost, budget, modelNa
 /**
  * Mini Status Bar - For inline display in chat interface
  */
-export declare function MiniStatusBar({ tokenCount, cost, modelName, mode, yolo, }: {
+export declare function MiniStatusBar({ tokenCount, cost, modelName, providerName, mode, yolo, }: {
     tokenCount: number;
     cost?: number;
     modelName?: string;
+    providerName?: string;
     mode?: string;
     yolo?: boolean;
 }): React.JSX.Element;

package/dist/ui/components/StatusBar.js

@@ -256,16 +256,17 @@ export function StatusBar({ tokenCount, maxTokens = 128000, cost = 0, budget = 1
 /**
  * Mini Status Bar - For inline display in chat interface
  */
-export function MiniStatusBar({ tokenCount, cost, modelName, mode = 'code', yolo = false, }) {
+export function MiniStatusBar({ tokenCount, cost, modelName, providerName, mode = 'code', yolo = false, }) {
     const { colors } = useTheme();
-    return (React.createElement(Box, null,
-        mode && (React.createElement(Text, { color: mode === 'plan' ? colors.info : colors.primary }, mode === 'plan' ? '📋' : mode === 'ask' ? '❓' : '💻')),
-        yolo && React.createElement(Text, { color: colors.error }, " \uD83D\uDD25"),
+    return (React.createElement(Box, { flexWrap: "wrap" },
+        mode && (React.createElement(Text, { color: mode === 'plan' ? colors.info : colors.primary }, mode)),
+        yolo && React.createElement(Text, { color: colors.error }, " \u00B7 YOLO"),
         React.createElement(Text, { dimColor: true }, " \u2022 "),
+        providerName && React.createElement(Text, { color: colors.textMuted },
+            providerName,
+            " \u00B7 "),
         modelName && (React.createElement(React.Fragment, null,
-            React.createElement(Text, { color: colors.accent },
-                "\u224B ",
-                modelName),
+            React.createElement(Text, { bold: true, color: colors.accent }, modelName),
             React.createElement(Text, { dimColor: true }, " \u2022 "))),
         React.createElement(Text, { color: colors.info },
             "\u2191 ",

package/dist/ui/context/theme-context.js

@@ -2,7 +2,7 @@
  * Theme Context for Code Buddy
  * Provides theme and avatar information to all UI components
  */
-import React, { createContext, useContext, useState, useCallback, useMemo } from 'react';
+import React, { createContext, useContext, useState, useCallback, useMemo, useSyncExternalStore } from 'react';
 import { getThemeManager } from '../../themes/theme-manager.js';
 /**
  * Create the theme context
@@ -14,6 +14,7 @@ const ThemeContext = createContext(null);
 export function ThemeProvider({ children }) {
     const [themeManager] = useState(() => getThemeManager());
     const [refreshKey, setRefreshKey] = useState(0);
+    const revision = useSyncExternalStore(themeManager.subscribe, themeManager.getSnapshot, themeManager.getSnapshot);
     // Force re-render when theme changes
     const refreshTheme = useCallback(() => {
         setRefreshKey(prev => prev + 1);
@@ -77,7 +78,7 @@ export function ThemeProvider({ children }) {
         clearCustomColors,
         refreshTheme,
     }), [
-        theme, colors, avatars, refreshKey,
+        theme, colors, avatars, refreshKey, revision,
         setTheme, getAvailableThemes, setAvatarPreset,
         setCustomAvatar, clearCustomAvatars, getAvatarPresets,
         setCustomColor, clearCustomColors, refreshTheme

package/dist/ui/index.d.ts

@@ -4,7 +4,7 @@
 export { SectionHeader, StatusWithText, AccessibleProgress, KeyboardShortcut, HelpPanel, AccessibleList, DefinitionList, Announcement, AccessibleError, AccessibleSuccess, AccessibleTable, AccessibleCodeBlock, Divider, } from "./components/AccessibleOutput.js";
 export { ChatHistory } from "./components/ChatHistory.js";
 export { ChatInput } from "./components/ChatInput.js";
-export { MAX_SUGGESTIONS, VISIBLE_SUGGESTIONS, filterCommandSuggestions, CommandSuggestions, } from "./components/CommandSuggestions.js";
+export { VISIBLE_SUGGESTIONS, filterCommandSuggestions, CommandSuggestions, } from "./components/CommandSuggestions.js";
 export { parseDiffWithLineNumbers, DiffRenderer, } from "./components/DiffRenderer.js";
 export { EnhancedChatInput, useInputHistory, } from "./components/EnhancedChatInput.js";
 export { EnhancedConfirmationDialog, type OperationType, } from "./components/EnhancedConfirmationDialog.js";

package/dist/ui/index.js

@@ -11,7 +11,7 @@ export { ChatHistory } from "./components/ChatHistory.js";
 export { ChatInput } from "./components/ChatInput.js";
 // ChatInterface (only has default export, not re-exported by barrel)
 // To use: import ChatInterface from './ui/components/ChatInterface.js'
-export { MAX_SUGGESTIONS, VISIBLE_SUGGESTIONS, filterCommandSuggestions, CommandSuggestions, } from "./components/CommandSuggestions.js";
+export { VISIBLE_SUGGESTIONS, filterCommandSuggestions, CommandSuggestions, } from "./components/CommandSuggestions.js";
 // ConfirmationDialog (only has default export, not re-exported by barrel)
 // To use: import ConfirmationDialog from './ui/components/ConfirmationDialog.js'
 export { parseDiffWithLineNumbers, DiffRenderer, } from "./components/DiffRenderer.js";

package/dist/ui/utils/markdown-renderer.js

@@ -74,19 +74,10 @@ marked.setOptions({
         },
         // Inline code styling
         codespan: (text) => `${ANSI.cyan}${text}${ANSI.reset}`,
-        // Heading styles by level
-        heading: (text, level) => {
-            const colors = [
-                ANSI.magentaBold,
-                ANSI.blueBold,
-                ANSI.yellowBold,
-                ANSI.blue,
-                ANSI.yellow,
-                ANSI.white,
-            ];
-            const color = colors[Math.min(level - 1, colors.length - 1)];
-            return `\n${color}${'#'.repeat(level)} ${text}${ANSI.reset}\n`;
-        },
+        // marked-terminal supplies styled text only here (including its prefix),
+        // unlike a marked renderer method, which also receives the heading level.
+        heading: (text) => `${ANSI.blueBold}${text}${ANSI.reset}`,
+        firstHeading: (text) => `${ANSI.magentaBold}${text}${ANSI.reset}`,
         // Text emphasis
         strong: (text) => `${ANSI.bold}${text}${ANSI.reset}`,
         em: (text) => `${ANSI.italic}${text}${ANSI.reset}`,

package/dist/utils/atomic-write.d.ts

@@ -51,6 +51,28 @@ export declare function readTextAtomic(filePath: string, fallback: string, optio
 export declare function readJsonLinesAtomic<T>(filePath: string, fallback: T[], isValid: (value: unknown) => value is T): Promise<T[]>;
 /** Reset the process-local warning guard; intended for isolated tests. */
 export declare function resetAtomicReadWarningsForTests(): void;
+/**
+ * Outcome of a strictly read-only JSON read. `missing` is normal (no file);
+ * `corrupt` means the file exists but is empty or not valid JSON; `unreadable`
+ * means the file exists but could not be read (permissions, EISDIR, ...).
+ */
+export type ReadOnlyJsonOutcome<T> = {
+    status: 'ok';
+    value: T;
+} | {
+    status: 'missing';
+} | {
+    status: 'corrupt';
+} | {
+    status: 'unreadable';
+};
+/**
+ * Strictly read-only JSON reader for diagnostics. Never restores, renames,
+ * chmods, creates, or writes anything — not the primary file, not `.bak`,
+ * not `.tmp.*`. Never consults recovery candidates. Callers that need the
+ * historical recovery policy must keep using `readJsonAtomicSync`.
+ */
+export declare function readJsonAtomicSyncReadOnly<T>(filePath: string, isValid?: (value: unknown) => value is T): ReadOnlyJsonOutcome<T>;
 export interface CleanupOrphanedTemporariesOptions extends AtomicWriteOptions {
     /**
      * A temporary older than this (in ms) is considered orphaned and removed.

package/dist/utils/atomic-write.js

@@ -475,6 +475,35 @@ async function recoverJsonLines(filePath, fallback, isValid) {
 export function resetAtomicReadWarningsForTests() {
     warnedReadPaths.clear();
 }
+/**
+ * Strictly read-only JSON reader for diagnostics. Never restores, renames,
+ * chmods, creates, or writes anything — not the primary file, not `.bak`,
+ * not `.tmp.*`. Never consults recovery candidates. Callers that need the
+ * historical recovery policy must keep using `readJsonAtomicSync`.
+ */
+export function readJsonAtomicSyncReadOnly(filePath, isValid) {
+    let contents;
+    try {
+        contents = fs.readFileSync(filePath, 'utf8');
+    }
+    catch (error) {
+        return isMissing(error) ? { status: 'missing' } : { status: 'unreadable' };
+    }
+    if (!contents.trim()) {
+        return { status: 'corrupt' };
+    }
+    let value;
+    try {
+        value = JSON.parse(contents);
+    }
+    catch {
+        return { status: 'corrupt' };
+    }
+    if (isValid && !isValid(value)) {
+        return { status: 'corrupt' };
+    }
+    return { status: 'ok', value: value };
+}
 const warnedCleanupPaths = new Set();
 /**
  * Remove stale `<filePath>.tmp.*` (and legacy `<filePath>.tmp`) siblings left

package/dist/utils/bounded-output.d.ts

@@ -0,0 +1,16 @@
+/** Bounded byte storage retaining the beginning and most recent end of output. */
+export declare class BoundedOutput {
+    readonly capacity: number;
+    private head;
+    private tail;
+    private observed;
+    constructor(capacity?: number);
+    get retainedBytes(): number;
+    get omittedBytes(): number;
+    append(chunk: string | Buffer): void;
+    text(): string;
+    /** Consume the pending preview; producers can continue into a fresh bounded buffer. */
+    drain(): string;
+}
+/** A rendered byte budget, including the omission marker, for model context. */
+export declare function truncateOutput(text: string, maxBytes: number): string;

package/dist/utils/bounded-output.js

@@ -0,0 +1,63 @@
+import { StringDecoder } from 'node:string_decoder';
+/** Decode a retained UTF-8 segment without exposing a cut code point. */
+function decode(bytes) {
+    let start = 0;
+    while (start < bytes.length && (bytes[start] & 0xc0) === 0x80)
+        start++;
+    return new StringDecoder('utf8').write(bytes.subarray(start));
+}
+/** Bounded byte storage retaining the beginning and most recent end of output. */
+export class BoundedOutput {
+    capacity;
+    head = Buffer.alloc(0);
+    tail = Buffer.alloc(0);
+    observed = 0;
+    constructor(capacity = 256 * 1024) {
+        this.capacity = capacity;
+        if (!Number.isSafeInteger(capacity) || capacity < 1)
+            throw new Error('Output capacity must be a positive integer');
+    }
+    get retainedBytes() { return this.head.length + this.tail.length; }
+    get omittedBytes() { return this.observed - this.retainedBytes; }
+    append(chunk) {
+        let bytes = typeof chunk === 'string' ? Buffer.from(chunk) : chunk;
+        this.observed += bytes.length;
+        const headRemaining = Math.ceil(this.capacity / 2) - this.head.length;
+        if (headRemaining > 0) {
+            this.head = Buffer.concat([this.head, bytes.subarray(0, headRemaining)]);
+            bytes = bytes.subarray(headRemaining);
+        }
+        const tailCapacity = Math.floor(this.capacity / 2);
+        if (tailCapacity > 0 && bytes.length > 0) {
+            this.tail = bytes.length >= tailCapacity
+                ? Buffer.from(bytes.subarray(-tailCapacity))
+                : Buffer.concat([this.tail.subarray(Math.max(0, this.tail.length + bytes.length - tailCapacity)), bytes]);
+        }
+    }
+    text() {
+        if (!this.omittedBytes)
+            return decode(Buffer.concat([this.head, this.tail]));
+        return `${decode(this.head)}\n[... ${this.omittedBytes} bytes omitted ...]\n${decode(this.tail)}`;
+    }
+    /** Consume the pending preview; producers can continue into a fresh bounded buffer. */
+    drain() {
+        const result = this.text();
+        this.head = Buffer.alloc(0);
+        this.tail = Buffer.alloc(0);
+        this.observed = 0;
+        return result;
+    }
+}
+/** A rendered byte budget, including the omission marker, for model context. */
+export function truncateOutput(text, maxBytes) {
+    if (!Number.isSafeInteger(maxBytes) || maxBytes < 1)
+        throw new Error('Output budget must be a positive integer');
+    if (Buffer.byteLength(text) <= maxBytes)
+        return text;
+    if (maxBytes < 80)
+        return decode(Buffer.from(text).subarray(0, maxBytes));
+    const buffer = new BoundedOutput(maxBytes - 80);
+    buffer.append(text);
+    return buffer.text();
+}
+//# sourceMappingURL=bounded-output.js.map

package/dist/utils/config-validation/schema.d.ts

@@ -266,17 +266,17 @@ export declare const UserSettingsSchema: z.ZodObject<{
     theme: "default" | "minimal" | "auto" | "dark" | "light" | "neon" | "pastel" | "matrix" | "ocean" | "sunset" | "high-contrast";
     language: string;
     model?: string | undefined;
-    shell?: string | undefined;
     baseURL?: string | undefined;
+    shell?: string | undefined;
     apiKey?: string | undefined;
     editor?: string | undefined;
 }, {
     provider?: "custom" | "xai" | "anthropic" | "google" | "openai" | "lmstudio" | "ollama" | "local" | "mistral" | "gemini" | "grok" | "lm-studio" | "minimax" | "moonshot" | "claude" | "vllm" | "deepseek" | "qwen" | "openrouter" | "groq" | "together" | "fireworks" | "agy-cli" | "chatgpt" | "lemonade" | "ollama-cloud" | "novita" | "zai" | "kimi-coding" | "kimi-coding-cn" | "arcee" | "gmi" | "minimax-cn" | "alibaba" | "alibaba-coding-plan" | "kilocode" | "xiaomi" | "tencent-tokenhub" | "opencode-zen" | "opencode-go" | "huggingface" | "nvidia" | "omniroute" | "ai21" | "ant-ling" | "cerebras" | "cohere" | "deepinfra" | "featherless-ai" | "friendliai" | "hyperbolic" | "inception" | "inference-net" | "internlm" | "liquid" | "longcat" | "modelscope" | "nscale" | "openadapter" | "pioneer" | "reka" | "sambanova" | "sarvam" | "scaleway" | "tokenrouter" | "typhoon" | "zenmux" | "stepfun" | "azure" | "bedrock" | "copilot" | "novita-ai" | "glm" | "kimi" | "kimi-cn" | "moonshot-cn" | "arcee-ai" | "gmi-cloud" | "gmicloud" | "dashscope" | "alibaba-coding" | "kilo-code" | "mimo" | "tencent" | "tokenhub" | "opencode" | "hf" | "nvidia-nim" | undefined;
     model?: string | undefined;
+    baseURL?: string | undefined;
     models?: string[] | undefined;
     shell?: string | undefined;
     defaultModel?: string | undefined;
-    baseURL?: string | undefined;
     apiKey?: string | undefined;
     theme?: "default" | "minimal" | "auto" | "dark" | "light" | "neon" | "pastel" | "matrix" | "ocean" | "sunset" | "high-contrast" | undefined;
     editor?: string | undefined;

package/dist/utils/device-store-file.d.ts

@@ -0,0 +1,4 @@
+/** Shared envelope: legacy SSH/ADB nodes and Android authentication coexist. */
+export declare function readDeviceStoreFile(file: string): Record<string, unknown>;
+/** Cross-process exclusion for the local CLI and server. Busy/crashed locks fail closed. */
+export declare function updateDeviceStoreFile<T>(file: string, update: (data: Record<string, unknown>) => T): T;

package/dist/utils/device-store-file.js

@@ -0,0 +1,40 @@
+import { mkdirSync, readFileSync, rmdirSync } from 'node:fs';
+import { dirname } from 'node:path';
+import { writeJsonAtomicSync } from './atomic-write.js';
+/** Shared envelope: legacy SSH/ADB nodes and Android authentication coexist. */
+export function readDeviceStoreFile(file) {
+    try {
+        const value = JSON.parse(readFileSync(file, 'utf8'));
+        if (!value || typeof value !== 'object' || Array.isArray(value)) {
+            throw new Error('Invalid device store');
+        }
+        return value;
+    }
+    catch (error) {
+        if (error.code === 'ENOENT')
+            return {};
+        // Never recover a stale backup: that could resurrect a revoked key.
+        throw new Error('Device store unavailable');
+    }
+}
+/** Cross-process exclusion for the local CLI and server. Busy/crashed locks fail closed. */
+export function updateDeviceStoreFile(file, update) {
+    mkdirSync(dirname(file), { recursive: true, mode: 0o700 });
+    const lock = `${file}.lock`;
+    try {
+        mkdirSync(lock, { mode: 0o700 });
+    }
+    catch {
+        throw new Error('Device store unavailable');
+    }
+    try {
+        const data = readDeviceStoreFile(file);
+        const result = update(data);
+        writeJsonAtomicSync(file, data, { mode: 0o600 });
+        return result;
+    }
+    finally {
+        rmdirSync(lock);
+    }
+}
+//# sourceMappingURL=device-store-file.js.map