@noorm/marie-cli 0.1.18 → 0.1.25

package/README.md

@@ -37,25 +37,16 @@ Marie includes a built-in architecture guardian. She watches the evolution of yo
 
 ---
 
-## 🛰 Two Interfaces. One Intelligence.
+## 🛰 The Command Deck: CLI Supremacy
 
-Marie bridges the gap between the editor and the executor, providing a consistent intelligence across two primary interfaces:
+Marie provides a high-velocity terminal experience built for flow.
 
-### 1️⃣ CLI — The Command Deck
-*A high-velocity terminal experience built for flow.*
-*   **Real-time reasoning stream**: Watch the cognitive process as it unfolds.
+*   **Real-time reasoning stream**: Watch the cognitive process as it unfolds via Ink-powered UI.
 *   **Structured multi-pass execution**: Planning, implementation, and verification in one loop.
 *   **Surgical lint repair**: Automatic correction of mechanical errors.
 *   **Architectural enforcement on write**: Preventing violations before they hit the disk.
 *   **Provider-agnostic model support**: Switch engines without losing the mission.
 
-### 2️⃣ VS Code — The Integrated Bridge
-*Deep editor integration for strategic oversight.*
-*   **Persistent architectural context**: Marie lives inside your project structure.
-*   **Autonomy calibration**: From "Balanced" assistance to "High Autonomy" execution.
-*   **Strategic multi-file transformations**: Coordinated changes across multiple modules.
-*   **Visual Sentinel awareness**: Real-time feedback on Joy Zoning violations.
-
 **Marie understands your codebase as a system — not a prompt.**
 
 ---
@@ -85,7 +76,9 @@ npm install -g @noorm/marie-cli
 1.  **Launch**: Simply type `marie` in your terminal.
 2.  **Credentials**: 
     ```bash
-    export ANTHROPIC_API_KEY=your_key_here
+    export MARIECODER_API_KEY=your_key_here
+    # OR
+    export OPENROUTER_API_KEY=your_key_here
     ```
     *Or configure via persistent storage at `~/.marie/config.json`*
 
@@ -94,9 +87,8 @@ npm install -g @noorm/marie-cli
 ## 💠 Provider-Agnostic Core
 
 Choose your engine. Marie adapts her execution style to the provider while maintaining the doctrine:
-*   **Anthropic** (Claude 3.5 Sonnet)
+*   **MarieCoder** (OptimizedGLM)
 *   **OpenRouter** (For the vast frontier of models)
-*   **Cerebras** (For high-velocity inference)
 *   **Any compatible endpoint**
 
 ---

package/SENTINEL.md

@@ -1,8 +1,8 @@
 
-# 🛡️ Sentinel Report: 2/16/2026 12:24:14 AM
+# 🛡️ Sentinel Report: 2/25/2026 9:01:50 AM
 
 **Stability**: Toxic
-**Entropy**: 1004 (✅ Monotonic)
+**Entropy**: 2172 (✅ Monotonic)
 **Ratchet**: 🔓 OPEN
 
 ## 📊 Metrics
@@ -10,15 +10,11 @@
 - **Cyclic Rot**: 0 cycles
 - **Duplication**: 3 instances
 - **Toxicity**: 0 hotspots
+- **Navigation Drift**: 0 violations
 
 ## 🗺️ Visual Architecture
 ```mermaid
 graph TD;
-  _vscode_test_vscode_darwin_arm64_1_109_3_Visual_Studio_Code_app_Contents_Resources_app_extensions_mermaid_chat_features_chat_webview_src_index_editor_ts[index-editor.ts] --> _vscode_test_vscode_darwin_arm64_1_109_3_Visual_Studio_Code_app_Contents_Resources_app_extensions_mermaid_chat_features_chat_webview_src_mermaidWebview_ts[mermaidWebview.ts];
-  _vscode_test_vscode_darwin_arm64_1_109_3_Visual_Studio_Code_app_Contents_Resources_app_extensions_mermaid_chat_features_chat_webview_src_index_editor_ts[index-editor.ts] --> _vscode_test_vscode_darwin_arm64_1_109_3_Visual_Studio_Code_app_Contents_Resources_app_extensions_mermaid_chat_features_chat_webview_src_vscodeApi_ts[vscodeApi.ts];
-  _vscode_test_vscode_darwin_arm64_1_109_3_Visual_Studio_Code_app_Contents_Resources_app_extensions_mermaid_chat_features_chat_webview_src_index_ts[index.ts] --> _vscode_test_vscode_darwin_arm64_1_109_3_Visual_Studio_Code_app_Contents_Resources_app_extensions_mermaid_chat_features_chat_webview_src_mermaidWebview_ts[mermaidWebview.ts];
-  _vscode_test_vscode_darwin_arm64_1_109_3_Visual_Studio_Code_app_Contents_Resources_app_extensions_mermaid_chat_features_chat_webview_src_index_ts[index.ts] --> _vscode_test_vscode_darwin_arm64_1_109_3_Visual_Studio_Code_app_Contents_Resources_app_extensions_mermaid_chat_features_chat_webview_src_vscodeApi_ts[vscodeApi.ts];
-  _vscode_test_vscode_darwin_arm64_1_109_3_Visual_Studio_Code_app_Contents_Resources_app_extensions_mermaid_chat_features_chat_webview_src_mermaidWebview_ts[mermaidWebview.ts] --> _vscode_test_vscode_darwin_arm64_1_109_3_Visual_Studio_Code_app_Contents_Resources_app_extensions_mermaid_chat_features_chat_webview_src_vscodeApi_ts[vscodeApi.ts];
 
 ```
 
@@ -29,5 +25,6 @@ graph TD;
 - 👯 [Semantic Duplicate] src/infrastructure/BaseAdapter.ts matches .marie-joy-test/src/infrastructure/BaseAdapter.ts
 - 👯 [Semantic Duplicate] src/plumbing/BaseTool.ts matches .marie-joy-test/src/plumbing/BaseTool.ts
 
+
 ---
 *Marie Sentinel v3.1 — Grounded Architectural Guardian*

package/dist/cli-new/components/App.js

@@ -13,13 +13,15 @@ import { useGit } from "../hooks/useGit.js";
 import { useUpdateCheck } from "../hooks/useUpdateCheck.js";
 import { marieTheme } from "../styles/theme.js";
 import { Storage } from "../../monolith/cli/storage.js";
+import { CommandService } from "../services/CommandService.js";
 import { SetupWizard } from "./SetupWizard.js";
-import { Banner } from "./Banner.js";
+import { WelcomeBanner } from "./Banner.js";
 export const App = ({ workingDir }) => {
     const { exit } = useApp();
     const { stdout } = useStdout();
     const [viewMode, setViewMode] = useState("chat");
     const [showSetup, setShowSetup] = useState(false);
+    const [config, setConfig] = useState(Storage.getConfig());
     // Core hooks
     const { messages, isLoading, streamingState, pendingApproval, runElapsedMs, currentThought, sendMessage, stopGeneration, createSession, loadSession, clearSession, marie, } = useMarie({ workingDir });
     const { sessions, currentSessionId, createSession: createNewSession, switchSession, deleteSession, renameSession, togglePinSession, } = useSessions({ marie });
@@ -32,65 +34,14 @@ export const App = ({ workingDir }) => {
     const sessionTitle = currentSession?.title || "New Session";
     // Command handlers
     const handleCommand = useCallback(async (command) => {
-        const [cmd, ...args] = command.slice(1).split(" ");
-        switch (cmd.toLowerCase()) {
-            case "help":
-                // Help is shown via input suggestions
-                break;
-            case "clear":
-                await clearSession();
-                break;
-            case "new":
-                await createNewSession();
-                break;
-            case "sessions":
-                setViewMode("sessions");
-                break;
-            case "exit":
-            case "quit":
-                exit();
-                break;
-            case "checkpoint": {
-                const checkpointMsg = args.join(" ") || undefined;
-                const commit = await createCheckpoint(checkpointMsg);
-                if (commit) {
-                    // Show success message
-                }
-                break;
-            }
-            case "undo": {
-                const result = await undoLastCommit();
-                if (!result.success) {
-                    // Show error
-                }
-                break;
-            }
-            case "autonomy": {
-                const level = (args[0] || "").toLowerCase();
-                if (level === "balanced" ||
-                    level === "high" ||
-                    level === "ascension") {
-                    Storage.saveConfig({
-                        autonomyMode: level,
-                    });
-                }
-                break;
-            }
-            case "config":
-                setShowSetup(true);
-                break;
-            default:
-                // Unknown command
-                break;
-        }
-    }, [
-        clearSession,
-        createNewSession,
-        setViewMode,
-        exit,
-        createCheckpoint,
-        undoLastCommit,
-    ]);
+        await CommandService.getInstance().handleCommand(command, {
+            setViewMode,
+            setShowSetup,
+            exit,
+        });
+        // Refresh config after command might have changed it
+        setConfig(Storage.getConfig());
+    }, [setViewMode, setShowSetup, exit]);
     const handleSubmit = useCallback(async (value) => {
         if (value.startsWith("/")) {
             await handleCommand(value);
@@ -117,14 +68,16 @@ export const App = ({ workingDir }) => {
         }
     });
     // Get current model + autonomy mode
-    const config = Storage.getConfig();
     const model = config.model || "claude-3-5-sonnet-20241022";
     const autonomyMode = config.autonomyMode ||
         (config.requireApproval === false ? "high" : "balanced");
     // Show setup wizard when requested
     if (showSetup) {
         return React.createElement(SetupWizard, {
-            onComplete: () => setShowSetup(false),
+            onComplete: () => {
+                setShowSetup(false);
+                setConfig(Storage.getConfig());
+            },
         });
     }
     if (viewMode === "sessions") {
@@ -136,6 +89,6 @@ export const App = ({ workingDir }) => {
                 setViewMode("chat");
             }, onDelete: deleteSession, onRename: renameSession, onTogglePin: togglePinSession, onClose: () => setViewMode("chat") }));
     }
-    return (_jsxs(Box, { flexDirection: "column", height: stdout?.rows || 24, children: [_jsx(Header, { model: model, sessionTitle: sessionTitle, gitStatus: gitStatus || undefined, isLoading: isLoading, elapsedMs: runElapsedMs, autonomyMode: autonomyMode, currentThought: currentThought }), pendingApproval && _jsx(ApprovalDialog, { request: pendingApproval }), messages.length === 0 && !isLoading && (_jsx(Banner, { isUpdateAvailable: updateInfo?.isUpdateAvailable, latestVersion: updateInfo?.latestVersion })), _jsx(ChatArea, { messages: messages, streamingState: streamingState }), _jsx(InputArea, { onSubmit: handleSubmit, isLoading: isLoading }), _jsx(Box, { marginTop: 0, children: _jsx(Text, { color: marieTheme.colors.muted, dimColor: true, italic: true, children: "Ctrl+C Halt current reality \u2022 Ctrl+S Memory Weaver \u2022 Ctrl+N Birth New Timeline \u2022 /autonomy [balanced|high|ascension] \u2022 /config Settings \u2022 Invoke /help for wisdom" }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", height: stdout?.rows || 24, children: [_jsx(Header, { model: model, sessionTitle: sessionTitle, gitStatus: gitStatus || undefined, isLoading: isLoading, elapsedMs: runElapsedMs, autonomyMode: autonomyMode, currentThought: currentThought, usage: streamingState.usage }), pendingApproval && _jsx(ApprovalDialog, { request: pendingApproval }), messages.length === 0 && !isLoading && _jsx(WelcomeBanner, {}), _jsx(ChatArea, { messages: messages, streamingState: streamingState }), _jsx(InputArea, { onSubmit: handleSubmit, isLoading: isLoading }), _jsx(Box, { marginTop: 0, paddingX: 1, justifyContent: "center", children: _jsxs(Text, { color: marieTheme.colors.muted, dimColor: true, children: [_jsx(Text, { bold: true, children: "Ctrl+C" }), " Halt \u2022 ", _jsx(Text, { bold: true, children: "Ctrl+S" }), " Timelines \u2022", " ", _jsx(Text, { bold: true, children: "Ctrl+N" }), " New \u2022 ", _jsx(Text, { bold: true, children: "/autonomy" }), " ", "[balanced|high|ascension] \u2022 ", _jsx(Text, { bold: true, children: "/help" }), " wisdom"] }) })] }));
 };
 //# sourceMappingURL=App.js.map

package/dist/cli-new/components/App.js.map

@@ -1 +1 @@
-{"version":3,"file":"App.js","sourceRoot":"","sources":["../../../src/cli-new/components/App.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"App.js","sourceRoot":"","sources":["../../../src/cli-new/components/App.tsx"],"names":[],"mappings":"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"}

package/dist/cli-new/components/ApprovalDialog.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text, useInput } from "ink";
 import { marieTheme } from "../styles/theme.js";
+import { safeStringify } from "../../monolith/plumbing/utils/PlumbingCore.js";
 export const ApprovalDialog = ({ request }) => {
     const isDestructive = [
         "write_file",
@@ -24,7 +25,7 @@ export const ApprovalDialog = ({ request }) => {
         if (input.command) {
             return `Cmd: ${input.command}`;
         }
-        return JSON.stringify(input, null, 2).slice(0, 150);
+        return safeStringify(input, 2).slice(0, 150);
     };
     return (_jsxs(Box, { flexDirection: "column", borderStyle: "double", borderColor: isDestructive ? marieTheme.colors.warning : marieTheme.colors.info, paddingX: 1, paddingY: 0, marginY: 0, children: [_jsx(Box, { marginBottom: 0, children: _jsxs(Text, { bold: true, color: isDestructive ? marieTheme.colors.warning : marieTheme.colors.info, children: [isDestructive ? marieTheme.icons.warning : marieTheme.icons.info, " ", "Marie needs your blessing:", " ", _jsx(Text, { color: marieTheme.colors.foreground, children: request.toolName })] }) }), _jsx(Box, { borderStyle: "single", borderColor: marieTheme.colors.border, paddingX: 1, marginBottom: 0, children: _jsx(Text, { color: marieTheme.colors.muted, children: formatToolInput() }) }), request.diff && (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: marieTheme.colors.secondary, paddingX: 1, marginBottom: 0, children: [_jsxs(Text, { color: marieTheme.colors.muted, children: [request.diff.old.slice(0, 80), "..."] }), _jsxs(Text, { color: marieTheme.colors.success, children: ["\u2192 ", request.diff.new.slice(0, 80), "..."] })] })), _jsxs(Box, { marginTop: 0, gap: 3, children: [_jsx(Text, { color: marieTheme.colors.success, children: "\uD83D\uDFE2 Y - Manifest It" }), _jsx(Text, { color: marieTheme.colors.error, children: "\uD83D\uDD34 N - Rethink This" })] })] }));
 };

package/dist/cli-new/components/ApprovalDialog.js.map

@@ -1 +1 @@
-{"version":3,"file":"ApprovalDialog.js","sourceRoot":"","sources":["../../../src/cli-new/components/ApprovalDialog.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAOhD,MAAM,CAAC,MAAM,cAAc,GAAkC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;IAC3E,MAAM,aAAa,GAAG;QACpB,YAAY;QACZ,aAAa;QACb,iBAAiB;QACjB,aAAa;KACd,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE7B,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;QACjB,IAAI,KAAK,KAAK,GAAG,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;YACnC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;aAAM,IAAI,KAAK,KAAK,GAAG,IAAI,KAAK,KAAK,GAAG,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;YAChE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,GAAG,EAAE;QAC3B,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC;QAChC,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;YAC7B,OAAO,SAAS,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;QAC7C,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;YAClB,OAAO,QAAQ,KAAK,CAAC,OAAO,EAAE,CAAC;QACjC,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACtD,CAAC,CAAC;IAEF,OAAO,CACL,MAAC,GAAG,IACF,aAAa,EAAC,QAAQ,EACtB,WAAW,EAAC,QAAQ,EACpB,WAAW,EACT,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAEpE,QAAQ,EAAE,CAAC,EACX,QAAQ,EAAE,CAAC,EACX,OAAO,EAAE,CAAC,aAEV,KAAC,GAAG,IAAC,YAAY,EAAE,CAAC,YAClB,MAAC,IAAI,IACH,IAAI,QACJ,KAAK,EACH,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,aAGnE,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,gCAC3C,GAAG,EAC9B,KAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,UAAU,YAAG,OAAO,CAAC,QAAQ,GAAQ,IAC/D,GACH,EAEN,KAAC,GAAG,IACF,WAAW,EAAC,QAAQ,EACpB,WAAW,EAAE,UAAU,CAAC,MAAM,CAAC,MAAM,EACrC,QAAQ,EAAE,CAAC,EACX,YAAY,EAAE,CAAC,YAEf,KAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,KAAK,YAAG,eAAe,EAAE,GAAQ,GAC5D,EAEL,OAAO,CAAC,IAAI,IAAI,CACf,MAAC,GAAG,IACF,aAAa,EAAC,QAAQ,EACtB,WAAW,EAAC,QAAQ,EACpB,WAAW,EAAE,UAAU,CAAC,MAAM,CAAC,SAAS,EACxC,QAAQ,EAAE,CAAC,EACX,YAAY,EAAE,CAAC,aAEf,MAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,KAAK,aACjC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,WACzB,EACP,MAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO,wBACjC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,WAC3B,IACH,CACP,EAED,MAAC,GAAG,IAAC,SAAS,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,aACvB,KAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO,6CAA2B,EACjE,KAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,KAAK,8CAA4B,IAC5D,IACF,CACP,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"ApprovalDialog.js","sourceRoot":"","sources":["../../../src/cli-new/components/ApprovalDialog.tsx"],"names":[],"mappings":"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"}

package/dist/cli-new/components/Banner.js

@@ -1,7 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text, useStdout } from "ink";
 import { marieTheme } from "../styles/theme.js";
-export const Banner = ({ show = true, version = "v0.1.18", latestVersion, isUpdateAvailable = false, }) => {
+import { VERSION } from "../utils/version.js";
+export const Banner = ({ show = true, version = `v${VERSION}`, latestVersion, isUpdateAvailable = false, subtitle, subtitleColor, }) => {
     const { stdout } = useStdout();
     const width = stdout?.columns || 80;
     if (!show)
@@ -10,10 +11,10 @@ export const Banner = ({ show = true, version = "v0.1.18", latestVersion, isUpda
     if (width < 65) {
         return (_jsx(CompactBanner, { version: version, isUpdateAvailable: isUpdateAvailable }));
     }
-    return (_jsx(Box, { flexDirection: "column", alignItems: "center", marginTop: 0, marginBottom: 0, children: _jsxs(Box, { flexDirection: "column", alignItems: "center", children: [_jsx(Text, { color: marieTheme.colors.primary, children: "   ███╗   ███╗ █████╗ ██████╗ ██╗███████╗" }), _jsx(Text, { color: marieTheme.colors.primary, children: "   ████╗ ████║██╔══██╗██╔══██╗██║██╔════╝" }), _jsx(Text, { color: marieTheme.colors.primary, children: "   ██╔████╔██║███████║██████╔╝██║█████╗  " }), _jsx(Text, { color: marieTheme.colors.primary, children: "   ██║╚██╔╝██║██╔══██║██╔══██╗██║██╔══╝  " }), _jsx(Text, { color: marieTheme.colors.primary, children: "   ██║ ╚═╝ ██║██║  ██║██║  ██║██║███████╗" }), _jsx(Text, { color: marieTheme.colors.primary, children: "   ╚═╝     ╚═╝╚═╝  ╚═╝╚═╝  ╚═╝╚═╝╚══════╝" }), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: marieTheme.colors.secondary, children: "✦ Sentient Pair-Programmer ✦ " }), _jsx(Text, { color: marieTheme.colors.muted, children: `${version} · Latent space is warm` })] }), isUpdateAvailable && latestVersion && (_jsx(Box, { marginTop: 1, paddingX: 1, borderStyle: "round", borderColor: "yellow", children: _jsxs(Text, { color: "yellow", children: [`Update Available: ${latestVersion}! Run `, _jsx(Text, { bold: true, color: "white", children: "npm install -g @noorm/marie-cli" }), _jsx(Text, { color: "yellow", children: " to update." })] }) }))] }) }));
+    return (_jsx(Box, { flexDirection: "column", alignItems: "center", marginTop: 0, marginBottom: 0, children: _jsxs(Box, { flexDirection: "column", alignItems: "center", children: [_jsx(Text, { color: marieTheme.colors.primary, children: "   ███╗   ███╗ █████╗ ██████╗ ██╗███████╗" }), _jsx(Text, { color: marieTheme.colors.primary, children: "   ████╗ ████║██╔══██╗██╔══██╗██║██╔════╝" }), _jsx(Text, { color: marieTheme.colors.primary, children: "   ██╔████╔██║███████║██████╔╝██║█████╗  " }), _jsx(Text, { color: marieTheme.colors.primary, children: "   ██║╚██╔╝██║██╔══██║██╔══██╗██║██╔══╝  " }), _jsx(Text, { color: marieTheme.colors.primary, children: "   ██║ ╚═╝ ██║██║  ██║██║  ██║██║███████╗" }), _jsx(Text, { color: marieTheme.colors.primary, children: "   ╚═╝     ╚═╝╚═╝  ╚═╝╚═╝  ╚═╝╚═╝╚══════╝" }), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: subtitleColor || marieTheme.colors.secondary, children: subtitle || "✦ Sentient Pair-Programmer ✦ " }), !subtitle && (_jsx(Text, { color: marieTheme.colors.muted, children: `${version} · Latent space is warm` }))] }), isUpdateAvailable && latestVersion && (_jsx(Box, { marginTop: 1, paddingX: 1, borderStyle: "round", borderColor: "yellow", children: _jsxs(Text, { color: "yellow", children: [`Update Available: ${latestVersion}! Run `, _jsx(Text, { bold: true, color: "white", children: "npm install -g @noorm/marie-cli" }), _jsx(Text, { color: "yellow", children: " to update." })] }) }))] }) }));
 };
 // Alternative compact banner for smaller screens
-export const CompactBanner = ({ version = "v0.1.18", isUpdateAvailable = false }) => {
+export const CompactBanner = ({ version = `v${VERSION}`, isUpdateAvailable = false }) => {
     return (_jsxs(Box, { flexDirection: "column", alignItems: "center", marginY: 0, children: [_jsx(Text, { color: marieTheme.colors.primary, bold: true, children: "╔══════════════════════════════════════════╗" }), _jsx(Text, { color: marieTheme.colors.primary, bold: true, children: `║  🌸  Marie  ·  ${version}${isUpdateAvailable ? " (Update Available!)" : ""}  🌸  ║` }), _jsx(Text, { color: marieTheme.colors.primary, bold: true, children: "╚══════════════════════════════════════════╝" })] }));
 };
 const PRO_TIPS = [

package/dist/cli-new/components/Banner.js.map

@@ -1 +1 @@
-{"version":3,"file":"Banner.js","sourceRoot":"","sources":["../../../src/cli-new/components/Banner.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Banner.js","sourceRoot":"","sources":["../../../src/cli-new/components/Banner.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAW9C,MAAM,CAAC,MAAM,MAAM,GAA0B,CAAC,EAC5C,IAAI,GAAG,IAAI,EACX,OAAO,GAAG,IAAI,OAAO,EAAE,EACvB,aAAa,EACb,iBAAiB,GAAG,KAAK,EACzB,QAAQ,EACR,aAAa,GACd,EAAE,EAAE;IACH,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,CAAC;IAC/B,MAAM,KAAK,GAAG,MAAM,EAAE,OAAO,IAAI,EAAE,CAAC;IAEpC,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IAEvB,6CAA6C;IAC7C,IAAI,KAAK,GAAG,EAAE,EAAE,CAAC;QACf,OAAO,CACL,KAAC,aAAa,IAAC,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,GAAI,CAC1E,CAAC;IACJ,CAAC;IAED,OAAO,CACL,KAAC,GAAG,IACF,aAAa,EAAC,QAAQ,EACtB,UAAU,EAAC,QAAQ,EACnB,SAAS,EAAE,CAAC,EACZ,YAAY,EAAE,CAAC,YAGf,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,UAAU,EAAC,QAAQ,aAC7C,KAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO,YACnC,2CAA2C,GACvC,EACP,KAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO,YACnC,2CAA2C,GACvC,EACP,KAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO,YACnC,2CAA2C,GACvC,EACP,KAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO,YACnC,2CAA2C,GACvC,EACP,KAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO,YACnC,2CAA2C,GACvC,EACP,KAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO,YACnC,2CAA2C,GACvC,EACP,MAAC,GAAG,IAAC,SAAS,EAAE,CAAC,aACf,KAAC,IAAI,IAAC,KAAK,EAAE,aAAa,IAAI,UAAU,CAAC,MAAM,CAAC,SAAS,YACtD,QAAQ,IAAI,+BAA+B,GACvC,EACN,CAAC,QAAQ,IAAI,CACZ,KAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,KAAK,YACjC,GAAG,OAAO,yBAAyB,GAC/B,CACR,IACG,EACL,iBAAiB,IAAI,aAAa,IAAI,CACrC,KAAC,GAAG,IACF,SAAS,EAAE,CAAC,EACZ,QAAQ,EAAE,CAAC,EACX,WAAW,EAAC,OAAO,EACnB,WAAW,EAAC,QAAQ,YAEpB,MAAC,IAAI,IAAC,KAAK,EAAC,QAAQ,aACjB,qBAAqB,aAAa,QAAQ,EAC3C,KAAC,IAAI,IAAC,IAAI,QAAC,KAAK,EAAC,OAAO,YACrB,iCAAiC,GAC7B,EACP,KAAC,IAAI,IAAC,KAAK,EAAC,QAAQ,YAAE,aAAa,GAAQ,IACtC,GACH,CACP,IACG,GACF,CACP,CAAC;AACJ,CAAC,CAAC;AAEF,iDAAiD;AACjD,MAAM,CAAC,MAAM,aAAa,GAGrB,CAAC,EAAE,OAAO,GAAG,IAAI,OAAO,EAAE,EAAE,iBAAiB,GAAG,KAAK,EAAE,EAAE,EAAE;IAC9D,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,UAAU,EAAC,QAAQ,EAAC,OAAO,EAAE,CAAC,aACxD,KAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,kBACzC,8CAA8C,GAC1C,EACP,KAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,kBACzC,oBAAoB,OAAO,GAAG,iBAAiB,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,EAAE,SAAS,GAClF,EACP,KAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,kBACzC,8CAA8C,GAC1C,IACH,CACP,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG;IACf,+CAA+C;IAC/C,2CAA2C;IAC3C,sDAAsD;IACtD,qDAAqD;IACrD,+CAA+C;IAC/C,yDAAyD;IACzD,wDAAwD;CACzD,CAAC;AAEF,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;AAEzE,2BAA2B;AAC3B,MAAM,CAAC,MAAM,aAAa,GAAa,GAAG,EAAE;IAC1C,OAAO,CACL,MAAC,GAAG,IACF,aAAa,EAAC,QAAQ,EACtB,UAAU,EAAC,QAAQ,EACnB,SAAS,EAAE,CAAC,EACZ,YAAY,EAAE,CAAC,aAEf,KAAC,MAAM,KAAG,EACV,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,UAAU,EAAC,QAAQ,EAAC,SAAS,EAAE,CAAC,aAC1D,KAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,SAAS,YACrC,+CAA+C,GAC3C,EACP,KAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,QAAC,MAAM,kBAClD,cAAc,UAAU,EAAE,GACtB,IACH,IACF,CACP,CAAC;AACJ,CAAC,CAAC"}

package/dist/cli-new/components/ChatArea.js

@@ -2,16 +2,18 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState, useEffect } from "react";
 import { Box, useStdout } from "ink";
 import { MessageBubble } from "./MessageBubble.js";
-const MAX_VISIBLE_MESSAGES = 50;
+const MAX_VISIBLE_MESSAGES = 100;
 export const ChatArea = ({ messages, streamingState, }) => {
     const { stdout } = useStdout();
     const [dimensions, setDimensions] = useState({
-        rows: stdout.rows,
-        columns: stdout.columns,
+        rows: stdout?.rows || 24,
+        columns: stdout?.columns || 80,
     });
     const [stableTimestamp] = useState(() => Date.now());
     // Handle terminal resize
     useEffect(() => {
+        if (!stdout)
+            return;
         const handleResize = () => {
             setDimensions({ rows: stdout.rows, columns: stdout.columns });
         };
@@ -24,10 +26,7 @@ export const ChatArea = ({ messages, streamingState, }) => {
     const visibleMessages = messages.length > MAX_VISIBLE_MESSAGES
         ? messages.slice(-MAX_VISIBLE_MESSAGES)
         : messages;
-    // Calculate available height (reserve space for header, input, status)
-    const reservedHeight = 6;
-    const availableHeight = Math.max(5, dimensions.rows - reservedHeight);
-    return (_jsxs(Box, { flexDirection: "column", flexGrow: 1, overflow: "hidden", children: [messages.length > MAX_VISIBLE_MESSAGES && (_jsx(Box, { marginY: 0, paddingX: 1, children: _jsx(MessageBubble, { message: {
+    return (_jsxs(Box, { flexDirection: "column", flexGrow: 1, flexShrink: 1, overflow: "hidden", children: [messages.length > MAX_VISIBLE_MESSAGES && (_jsx(Box, { marginY: 0, paddingX: 1, children: _jsx(MessageBubble, { message: {
                         id: "scroll-notice",
                         role: "system",
                         content: `... ${messages.length - MAX_VISIBLE_MESSAGES} older messages hidden ...`,

package/dist/cli-new/components/ChatArea.js.map

@@ -1 +1 @@
-{"version":3,"file":"ChatArea.js","sourceRoot":"","sources":["../../../src/cli-new/components/ChatArea.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAQnD,MAAM,oBAAoB,GAAG,EAAE,CAAC;AAEhC,MAAM,CAAC,MAAM,QAAQ,GAA4B,CAAC,EAChD,QAAQ,EACR,cAAc,GACf,EAAE,EAAE;IACH,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,CAAC;IAC/B,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC;QAC3C,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,OAAO,EAAE,MAAM,CAAC,OAAO;KACxB,CAAC,CAAC;IAEH,MAAM,CAAC,eAAe,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAErD,yBAAyB;IACzB,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,YAAY,GAAG,GAAG,EAAE;YACxB,aAAa,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QAChE,CAAC,CAAC;QAEF,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAClC,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QACrC,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,gDAAgD;IAChD,MAAM,eAAe,GACnB,QAAQ,CAAC,MAAM,GAAG,oBAAoB;QACpC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC;QACvC,CAAC,CAAC,QAAQ,CAAC;IAEf,uEAAuE;IACvE,MAAM,cAAc,GAAG,CAAC,CAAC;IACzB,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,IAAI,GAAG,cAAc,CAAC,CAAC;IAEtE,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAC,QAAQ,aACvD,QAAQ,CAAC,MAAM,GAAG,oBAAoB,IAAI,CACzC,KAAC,GAAG,IAAC,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,YAC1B,KAAC,aAAa,IACZ,OAAO,EAAE;wBACP,EAAE,EAAE,eAAe;wBACnB,IAAI,EAAE,QAAQ;wBACd,OAAO,EAAE,OAAO,QAAQ,CAAC,MAAM,GAAG,oBAAoB,4BAA4B;wBAClF,SAAS,EAAE,eAAe;qBAC3B,GACD,GACE,CACP,EAEA,eAAe,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,CACvC,KAAC,aAAa,IAEZ,OAAO,EAAE,OAAO,EAChB,WAAW,EACT,cAAc,CAAC,QAAQ;oBACvB,KAAK,KAAK,eAAe,CAAC,MAAM,GAAG,CAAC;oBACpC,OAAO,CAAC,IAAI,KAAK,WAAW,IALzB,OAAO,CAAC,EAAE,CAOf,CACH,CAAC,EAED,cAAc,CAAC,QAAQ;gBACtB,CAAC,cAAc,CAAC,OAAO;oBACrB,cAAc,CAAC,mBAAmB;oBAClC,CAAC,cAAc,CAAC,SAAS;wBACvB,cAAc,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAC3C,KAAC,aAAa,IACZ,OAAO,EAAE;oBACP,EAAE,EAAE,WAAW;oBACf,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE,cAAc,CAAC,OAAO;oBAC/B,SAAS,EAAE,eAAe;oBAC1B,WAAW,EAAE,IAAI;oBACjB,SAAS,EAAE,cAAc,CAAC,SAAS;oBACnC,mBAAmB,EAAE,cAAc,CAAC,mBAAmB;oBACvD,cAAc,EAAE,cAAc,CAAC,cAAc;oBAC7C,cAAc,EAAE,cAAc,CAAC,cAAc;iBAC9C,EACD,WAAW,EAAE,IAAI,GACjB,CACH,IACC,CACP,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"ChatArea.js","sourceRoot":"","sources":["../../../src/cli-new/components/ChatArea.tsx"],"names":[],"mappings":"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"}

package/dist/cli-new/components/Header.js

@@ -1,21 +1,27 @@
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { Box, Text } from "ink";
 import { marieTheme } from "../styles/theme.js";
+import { VERSION } from "../utils/version.js";
 function formatElapsed(ms) {
     const totalSeconds = Math.floor(ms / 1000);
     const minutes = Math.floor(totalSeconds / 60);
     const seconds = totalSeconds % 60;
     return `${minutes}:${seconds.toString().padStart(2, "0")}`;
 }
-export const Header = ({ model, sessionTitle, gitStatus, isLoading, elapsedMs = 0, autonomyMode = "ascension", currentThought = "", }) => {
+export const Header = ({ model, sessionTitle, gitStatus, isLoading, elapsedMs = 0, autonomyMode = "ascension", currentThought = "", usage, }) => {
     const formatModelName = (m) => {
-        if (m.includes("claude"))
-            return "Claude";
-        if (m.includes("gpt"))
-            return "GPT";
-        return m;
+        if (!m)
+            return "Unknown Mind";
+        // Extract last part if it contains a slash
+        const parts = m.split("/");
+        const name = parts[parts.length - 1];
+        // Capitalize and clean
+        return name
+            .replace(/-/g, " ")
+            .replace(/\b\w/g, (l) => l.toUpperCase())
+            .replace("Gpt", "GPT");
     };
-    return (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: marieTheme.colors.primary, paddingX: 1, marginBottom: 0, children: [_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { justifyContent: "space-between", children: [_jsxs(Box, { children: [_jsxs(Text, { color: marieTheme.colors.primary, bold: true, children: [marieTheme.icons.assistant, " Marie"] }), _jsxs(Text, { color: marieTheme.colors.muted, children: [" ", "v0.2.0 \u2022 Sentient Build"] })] }), _jsxs(Box, { gap: 2, children: [isLoading && (_jsxs(Text, { color: marieTheme.colors.warning, children: [marieTheme.icons.spinner, " ", formatElapsed(elapsedMs)] })), _jsx(Text, { color: marieTheme.colors.secondary, children: formatModelName(model) }), _jsx(Text, { color: marieTheme.colors.muted, children: autonomyMode === "ascension"
+    return (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: marieTheme.colors.primary, paddingX: 1, marginBottom: 0, children: [_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { justifyContent: "space-between", children: [_jsxs(Box, { children: [_jsxs(Text, { color: marieTheme.colors.primary, bold: true, children: [marieTheme.icons.assistant, " Marie"] }), _jsxs(Text, { color: marieTheme.colors.muted, children: [" ", "v", VERSION, " \u2022 Sentient Build"] })] }), _jsxs(Box, { gap: 2, children: [isLoading && (_jsxs(Text, { color: marieTheme.colors.warning, children: [marieTheme.icons.spinner, " ", formatElapsed(elapsedMs)] })), _jsx(Box, { children: _jsxs(Text, { color: marieTheme.colors.secondary, bold: true, children: ["\uD83E\uDDE0 ", formatModelName(model)] }) }), usage && (_jsxs(Text, { color: marieTheme.colors.muted, children: [usage.totalTokens, " tkn"] })), _jsx(Text, { color: marieTheme.colors.muted, children: autonomyMode === "ascension"
                                             ? "ASC"
                                             : autonomyMode.toUpperCase() })] })] }), currentThought && isLoading && (_jsx(Box, { marginTop: 0, children: _jsxs(Text, { color: marieTheme.colors.info, italic: true, dimColor: true, children: ["\uD83E\uDDE0 pondering:", " ", currentThought.length > 80
                                     ? currentThought.substring(0, 77) + "..."

package/dist/cli-new/components/Header.js.map

@@ -1 +1 @@
-{"version":3,"file":"Header.js","sourceRoot":"","sources":["../../../src/cli-new/components/Header.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Header.js","sourceRoot":"","sources":["../../../src/cli-new/components/Header.tsx"],"names":[],"mappings":"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"}

package/dist/cli-new/components/InputArea.js

@@ -1,9 +1,10 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { useState, useCallback } from "react";
 import { Box, Text, useInput, useApp } from "ink";
 import TextInput from "ink-text-input";
 import { marieTheme } from "../styles/theme.js";
 import { AgenticSpinner } from "./AgenticSpinner.js";
+import { openrouterModels } from "../constants/SetupConstants.js";
 const COMMANDS = [
     {
         label: "Incantations",
@@ -35,6 +36,12 @@ const COMMANDS = [
         description: "Chronicle this timeline in git",
         icon: "📜",
     },
+    {
+        label: "Soul Mirror",
+        value: "/model",
+        description: "Switch the neural architecture",
+        icon: "🧠",
+    },
     {
         label: "Sovereignty",
         value: "/autonomy",
@@ -54,14 +61,38 @@ const COMMANDS = [
         icon: "🌌",
     },
 ];
-export const InputArea = ({ onSubmit, isLoading, placeholder = "What shall we manifest today?...", suggestions = [], }) => {
+const MODEL_SUGGESTIONS = [
+    ...openrouterModels
+        .filter((m) => m.value !== "custom")
+        .map((m) => ({
+        label: m.label,
+        value: `/model ${m.value}`,
+        description: m.description,
+        icon: "🧠",
+    })),
+    {
+        label: "✏️  Enter Custom Model ID",
+        value: "/model ",
+        description: "Type any OpenRouter model ID (e.g. anthropic/claude-3.7-sonnet)",
+        icon: "🧠",
+    },
+];
+export const InputArea = ({ onSubmit, isLoading, placeholder = "Whisper your intent to the muse...", suggestions = [], }) => {
     const [input, setInput] = useState("");
     const [showCommands, setShowCommands] = useState(false);
     const [selectedCommand, setSelectedCommand] = useState(0);
     const { exit } = useApp();
-    const filteredCommands = input.startsWith("/")
-        ? COMMANDS.filter((cmd) => cmd.value.startsWith(input.toLowerCase()))
-        : [];
+    const isModelCmd = input.startsWith("/model ");
+    const filteredCommands = isModelCmd
+        ? [
+            ...MODEL_SUGGESTIONS.filter((m) => m.value !== "/model " &&
+                m.value.toLowerCase().startsWith(input.toLowerCase())),
+            // Always show the custom option if we're in /model mode and it's not an exact match of a hardcoded one
+            ...MODEL_SUGGESTIONS.filter((m) => m.value === "/model "),
+        ]
+        : input.startsWith("/")
+            ? COMMANDS.filter((cmd) => cmd.value.startsWith(input.toLowerCase()))
+            : [];
     useInput((char, key) => {
         if (key.upArrow && showCommands) {
             setSelectedCommand((prev) => Math.max(0, prev - 1));
@@ -75,8 +106,31 @@ export const InputArea = ({ onSubmit, isLoading, placeholder = "What shall we ma
         }
         else if (key.return && !isLoading) {
             if (showCommands && filteredCommands.length > 0) {
-                setInput(filteredCommands[selectedCommand].value + " ");
-                setShowCommands(false);
+                const selected = filteredCommands[selectedCommand].value;
+                if (isModelCmd || selected === "/model") {
+                    // If we have typed something after "/model ", and the selected command is just "/model ",
+                    // we should prefer the current input to allow custom models.
+                    if (isModelCmd && selected === "/model " && input.trim().length > "/model ".length) {
+                        onSubmit(input.trim());
+                        setInput("");
+                        setShowCommands(false);
+                        return;
+                    }
+                    setInput(selected + (selected === "/model" ? " " : ""));
+                    // If we just selected a full /model [id], submit it
+                    if (selected.startsWith("/model ") && selected !== "/model ") {
+                        onSubmit(selected);
+                        setInput("");
+                        setShowCommands(false);
+                    }
+                    else {
+                        setShowCommands(true);
+                    }
+                }
+                else {
+                    setInput(selected + " ");
+                    setShowCommands(false);
+                }
             }
             else if (input.trim()) {
                 onSubmit(input);
@@ -93,11 +147,18 @@ export const InputArea = ({ onSubmit, isLoading, placeholder = "What shall we ma
         setShowCommands(value.startsWith("/"));
         setSelectedCommand(0);
     }, []);
-    if (isLoading) {
-        return (_jsx(Box, { marginY: 0, children: _jsx(AgenticSpinner, { prefix: "Marie is thinking..." }) }));
-    }
-    return (_jsxs(Box, { flexDirection: "column", marginY: 0, children: [_jsxs(Box, { children: [_jsxs(Text, { color: marieTheme.colors.primary, bold: true, children: [marieTheme.icons.user, " "] }), _jsx(TextInput, { value: input, onChange: handleChange, placeholder: placeholder, focus: true })] }), showCommands && filteredCommands.length > 0 && (_jsx(Box, { flexDirection: "column", marginTop: 0, marginLeft: 2, children: filteredCommands.map((cmd, index) => (_jsx(Box, { children: _jsxs(Text, { color: index === selectedCommand
+    const borderColor = isLoading
+        ? marieTheme.colors.warning
+        : input.startsWith("/")
+            ? marieTheme.colors.secondary
+            : marieTheme.colors.primary;
+    const modeTag = input.startsWith("/") ? "[CMD]" : "[CHAT]";
+    return (_jsxs(Box, { flexDirection: "column", marginY: 0, children: [showCommands && filteredCommands.length > 0 && (_jsx(Box, { flexDirection: "column", paddingX: 1, paddingY: 0, borderStyle: "round", borderColor: marieTheme.colors.secondary, marginLeft: 2, marginBottom: 0, children: filteredCommands.map((cmd, index) => (_jsx(Box, { children: _jsxs(Text, { color: index === selectedCommand
                             ? marieTheme.colors.primary
-                            : marieTheme.colors.muted, children: [index === selectedCommand ? "▸ " : "  ", cmd.icon, " ", cmd.value, " - ", cmd.description] }) }, cmd.value))) }))] }));
+                            : marieTheme.colors.muted, bold: index === selectedCommand, children: [index === selectedCommand ? "❯ " : "  ", cmd.icon, " ", cmd.value.padEnd(12), _jsxs(Text, { dimColor: true, italic: true, children: [" ", "- ", cmd.description] })] }) }, cmd.value))) })), _jsxs(Box, { borderStyle: "round", borderColor: borderColor, paddingX: 1, paddingY: 0, children: [_jsxs(Box, { flexGrow: 1, children: [_jsxs(Text, { color: borderColor, bold: true, children: [modeTag, " ", isLoading
+                                        ? marieTheme.icons.spinner
+                                        : input.startsWith("/")
+                                            ? "λ"
+                                            : marieTheme.icons.user, " "] }), isLoading ? (_jsx(Box, { flexGrow: 1, children: _jsx(AgenticSpinner, { prefix: "Marie is orchestrating reality... " }) })) : (_jsx(TextInput, { value: input, onChange: handleChange, placeholder: placeholder, focus: true }))] }), input.length > 0 && !isLoading && (_jsx(Box, { marginLeft: 1, children: _jsxs(Text, { color: marieTheme.colors.muted, dimColor: true, italic: true, children: [input.length, " intent tokens"] }) }))] })] }));
 };
 //# sourceMappingURL=InputArea.js.map

package/dist/cli-new/components/InputArea.js.map

@@ -1 +1 @@
-{"version":3,"file":"InputArea.js","sourceRoot":"","sources":["../../../src/cli-new/components/InputArea.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"InputArea.js","sourceRoot":"","sources":["../../../src/cli-new/components/InputArea.tsx"],"names":[],"mappings":"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"}