swiftroutercli 4.0.2 → 4.0.4

package/dist/index.js

@@ -4,8 +4,8 @@ import * as readline from "readline/promises";
 import chalk from "chalk";
 import ora from "ora";
 import { loadConfig, saveConfig } from "./config.js";
-import { fetchModels } from "./api/client.js";
 import { startChat } from "./ui/Chat.js";
+import { fetchModels } from "./api/client.js";
 import { DEFAULT_BASE_URL, DEFAULT_MODEL, CONFIG_FILE } from "./constants.js";
 import terminalImage from "terminal-image";
 import { fileURLToPath } from "url";
@@ -52,10 +52,26 @@ async function ensureConfig() {
     console.log(chalk.green("\n✅ Configuration saved securely! Starting your session...\n"));
     return config;
 }
+async function resolveModel(config) {
+    const spinner = ora("Auto-detecting model from SwiftRouter...").start();
+    try {
+        const models = await fetchModels(config);
+        if (models.length > 0) {
+            const picked = models[0].id || models[0].name || DEFAULT_MODEL;
+            spinner.succeed(chalk.green(`Auto-selected model: ${picked}`));
+            return picked;
+        }
+    }
+    catch (e) {
+        // Silently fall back
+    }
+    spinner.warn(chalk.yellow(`Could not auto-detect. Falling back to: ${DEFAULT_MODEL}`));
+    return DEFAULT_MODEL;
+}
 program
     .name("swiftroutercli")
     .description("CLI for SwiftRouter AI Gateway")
-    .version("4.0.2");
+    .version("4.0.4");
 program
     .command("config")
     .description("Manually configure the CLI with your SwiftRouter API Key and Base URL")
@@ -102,17 +118,13 @@ program
     .command("chat")
     .description("Start an interactive chat session")
     .argument("[prompt]", "Initial prompt to start the chat")
-    .option("-m, --model <model>", "Model to use", DEFAULT_MODEL)
+    .option("-m, --model <model>", "Model to use (auto-detected from server if not specified)")
     .option("-a, --approval-mode <mode>", "AI assistant's permission mode (suggest, auto-edit, full-auto)", "suggest")
     .option("-q, --quiet", "Run in headless CI/CD mode without interactive TUI rendering", false)
     .action(async (prompt, options) => {
     const config = await ensureConfig();
-    if (!prompt) {
-        startChat(config, options.model, "", options.approvalMode, options.quiet);
-    }
-    else {
-        startChat(config, options.model, prompt, options.approvalMode, options.quiet);
-    }
+    const model = options.model || await resolveModel(config);
+    startChat(config, model, prompt || "", options.approvalMode, options.quiet);
 });
 program
     .command("status")
@@ -152,11 +164,12 @@ program
 // Default action: if no subcommand is given, launch chat (just like `codex`)
 program
     .argument("[prompt]", "Initial prompt to start chat directly")
-    .option("-m, --model <model>", "Model to use", DEFAULT_MODEL)
+    .option("-m, --model <model>", "Model to use (auto-detected from server if not specified)")
     .option("-a, --approval-mode <mode>", "AI assistant's permission mode (suggest, auto-edit, full-auto)", "suggest")
     .option("-q, --quiet", "Run in headless CI/CD mode without interactive TUI rendering", false)
     .action(async (prompt, options) => {
     const config = await ensureConfig();
-    startChat(config, options.model, prompt || "", options.approvalMode, options.quiet);
+    const model = options.model || await resolveModel(config);
+    startChat(config, model, prompt || "", options.approvalMode, options.quiet);
 });
 program.parse();

package/dist/ui/Chat.js

@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from "react";
 import { render, Box, Text, useInput, Static } from "ink";
+import TextInput from "ink-text-input";
 import { streamChatCompletion, fetchModels } from "../api/client.js";
 import chalk from "chalk";
 import { loadHistory, saveHistory } from "../config.js";
@@ -12,11 +13,10 @@ marked.setOptions({
     renderer: new TerminalRenderer()
 });
 const Chat = ({ config, model, initialPrompt, approvalMode }) => {
-    const [messages, setMessages] = useState([
-        { id: 0, role: "user", content: initialPrompt },
-    ]);
+    const hasInitialPrompt = initialPrompt.trim().length > 0;
+    const [messages, setMessages] = useState(hasInitialPrompt ? [{ id: 0, role: "user", content: initialPrompt }] : []);
     const [streamingContent, setStreamingContent] = useState("");
-    const [isStreaming, setIsStreaming] = useState(true);
+    const [isStreaming, setIsStreaming] = useState(hasInitialPrompt);
     const [error, setError] = useState(null);
     const [input, setInput] = useState("");
     const [history, setHistory] = useState([]);
@@ -56,7 +56,6 @@ const Chat = ({ config, model, initialPrompt, approvalMode }) => {
                             { id: prev.length, role: "system", content: `Sandbox Output:\n${output || "Done"}` }
                         ]);
                         setIsExecuting(false);
-                        // Recursive automation could go here in V5
                     });
                 }
                 else {
@@ -70,6 +69,7 @@ const Chat = ({ config, model, initialPrompt, approvalMode }) => {
             setIsStreaming(false);
         });
     }, [messages, isStreaming, config, activeModel]);
+    // Handle command confirmation and history navigation
     useInput((char, key) => {
         if (isSelectingModel)
             return;
@@ -93,44 +93,8 @@ const Chat = ({ config, model, initialPrompt, approvalMode }) => {
             }
             return;
         }
-        if (key.return) {
-            const trimmed = input.trim();
-            if (trimmed === "/exit" || trimmed === "/quit") {
-                process.exit(0);
-            }
-            if (trimmed === "/clear") {
-                setMessages([]);
-                setInput("");
-                setHistoryIndex(-1);
-                return;
-            }
-            if (trimmed === "/models") {
-                setIsSelectingModel(true);
-                setIsLoadingModels(true);
-                setInput("");
-                fetchModels(config).then(models => {
-                    const options = models.map(m => ({ label: m.id || m.name, value: m.id || m.name }));
-                    setModelOptions(options.length ? options : [{ label: "mock-model", value: "mock-model" }]);
-                    setIsLoadingModels(false);
-                }).catch(err => {
-                    setError(err);
-                    setIsSelectingModel(false);
-                    setIsLoadingModels(false);
-                });
-                return;
-            }
-            if (trimmed.length > 0) {
-                const newPrompt = trimmed;
-                setMessages((prev) => [...prev, { id: prev.length, role: "user", content: newPrompt }]);
-                const newHistory = [...history, newPrompt];
-                setHistory(newHistory);
-                saveHistory(newHistory);
-                setInput("");
-                setHistoryIndex(-1);
-                setIsStreaming(true);
-            }
-        }
-        else if (key.upArrow) {
+        // History navigation with Up/Down arrows
+        if (key.upArrow) {
             if (history.length > 0 && historyIndex < history.length - 1) {
                 const newIdx = historyIndex + 1;
                 setHistoryIndex(newIdx);
@@ -148,13 +112,43 @@ const Chat = ({ config, model, initialPrompt, approvalMode }) => {
                 setInput("");
             }
         }
-        else if (key.backspace || key.delete) {
-            setInput((prev) => prev.slice(0, -1));
+    });
+    const handleSubmit = (value) => {
+        const trimmed = value.trim();
+        if (!trimmed)
+            return;
+        if (trimmed === "/exit" || trimmed === "/quit") {
+            process.exit(0);
         }
-        else if (char) {
-            setInput((prev) => prev + char);
+        if (trimmed === "/clear") {
+            setMessages([]);
+            setInput("");
+            setHistoryIndex(-1);
+            return;
         }
-    });
+        if (trimmed === "/models") {
+            setIsSelectingModel(true);
+            setIsLoadingModels(true);
+            setInput("");
+            fetchModels(config).then(models => {
+                const options = models.map(m => ({ label: m.id || m.name, value: m.id || m.name }));
+                setModelOptions(options.length ? options : [{ label: "mock-model", value: "mock-model" }]);
+                setIsLoadingModels(false);
+            }).catch(err => {
+                setError(err);
+                setIsSelectingModel(false);
+                setIsLoadingModels(false);
+            });
+            return;
+        }
+        setMessages((prev) => [...prev, { id: prev.length, role: "user", content: trimmed }]);
+        const newHistory = [...history, trimmed];
+        setHistory(newHistory);
+        saveHistory(newHistory);
+        setInput("");
+        setHistoryIndex(-1);
+        setIsStreaming(true);
+    };
     return (React.createElement(React.Fragment, null,
         React.createElement(Static, { items: messages }, msg => (React.createElement(Box, { key: msg.id, flexDirection: "column", marginBottom: 1 },
             React.createElement(Text, { bold: true, color: msg.role === "user" ? "blue" : "green" },
@@ -175,10 +169,9 @@ const Chat = ({ config, model, initialPrompt, approvalMode }) => {
                             setActiveModel(item.value);
                             setIsSelectingModel(false);
                         } })))) : (React.createElement(React.Fragment, null,
-                    !isStreaming && !pendingCommand && !isExecuting && (React.createElement(Box, { flexDirection: "row" },
-                        React.createElement(Text, { bold: true, color: "blue" }, "You: "),
-                        React.createElement(Text, null, input),
-                        React.createElement(Text, { dimColor: true }, " \u2588"))),
+                    !isStreaming && !pendingCommand && !isExecuting && (React.createElement(Box, { borderStyle: "round", borderColor: "blue", paddingX: 1 },
+                        React.createElement(Text, { bold: true, color: "blue" }, "\u276F "),
+                        React.createElement(TextInput, { value: input, onChange: setInput, onSubmit: handleSubmit, placeholder: "Type a message... (/models, /clear, /exit)" }))),
                     pendingCommand && !isExecuting && (React.createElement(Box, { flexDirection: "row", borderStyle: "round", borderColor: "yellow", paddingX: 1, marginTop: 1 },
                         React.createElement(Text, { color: "yellow" }, "Execute suggested command? "),
                         React.createElement(Text, { bold: true }, pendingCommand),
@@ -215,8 +208,6 @@ export function startChat(config, model, prompt, approvalMode = "suggest", quiet
             fullResponse += text;
         }, () => {
             console.log("\n");
-            // If full-auto is requested in quiet mode, we would parse bash blocks and execute them here.
-            // For now, headless simply streams the raw text response for CI pipelines.
             if (approvalMode === "full-auto") {
                 const bashMatch = fullResponse.match(/```(?:bash|sh)\n([\s\S]*?)\n```/);
                 if (bashMatch) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swiftroutercli",
-  "version": "4.0.2",
+  "version": "4.0.4",
   "description": "The official SwiftRouter Command Line Interface using React Ink Components",
   "type": "module",
   "main": "dist/index.js",
@@ -24,6 +24,7 @@
     "eventsource-parser": "^3.0.6",
     "ink": "^6.8.0",
     "ink-select-input": "^6.2.0",
+    "ink-text-input": "^6.0.0",
     "marked": "^15.0.12",
     "marked-terminal": "^7.3.0",
     "ora": "^5.4.1",

package/src/index.ts

@@ -4,8 +4,8 @@ import * as readline from "readline/promises";
 import chalk from "chalk";
 import ora from "ora";
 import { loadConfig, saveConfig, Config } from "./config.js";
-import { fetchModels } from "./api/client.js";
 import { startChat } from "./ui/Chat.js";
+import { fetchModels } from "./api/client.js";
 import { DEFAULT_BASE_URL, DEFAULT_MODEL, CONFIG_FILE } from "./constants.js";
 import terminalImage from "terminal-image";
 import { fileURLToPath } from "url";
@@ -65,10 +65,26 @@ async function ensureConfig(): Promise<Config> {
     return config;
 }
 
+async function resolveModel(config: Config): Promise<string> {
+    const spinner = ora("Auto-detecting model from SwiftRouter...").start();
+    try {
+        const models = await fetchModels(config);
+        if (models.length > 0) {
+            const picked = models[0].id || models[0].name || DEFAULT_MODEL;
+            spinner.succeed(chalk.green(`Auto-selected model: ${picked}`));
+            return picked;
+        }
+    } catch (e) {
+        // Silently fall back
+    }
+    spinner.warn(chalk.yellow(`Could not auto-detect. Falling back to: ${DEFAULT_MODEL}`));
+    return DEFAULT_MODEL;
+}
+
 program
     .name("swiftroutercli")
     .description("CLI for SwiftRouter AI Gateway")
-    .version("4.0.2");
+    .version("4.0.4");
 
 program
     .command("config")
@@ -118,17 +134,13 @@ program
     .command("chat")
     .description("Start an interactive chat session")
     .argument("[prompt]", "Initial prompt to start the chat")
-    .option("-m, --model <model>", "Model to use", DEFAULT_MODEL)
+    .option("-m, --model <model>", "Model to use (auto-detected from server if not specified)")
     .option("-a, --approval-mode <mode>", "AI assistant's permission mode (suggest, auto-edit, full-auto)", "suggest")
     .option("-q, --quiet", "Run in headless CI/CD mode without interactive TUI rendering", false)
     .action(async (prompt, options) => {
         const config = await ensureConfig();
-
-        if (!prompt) {
-            startChat(config, options.model, "", options.approvalMode, options.quiet);
-        } else {
-            startChat(config, options.model, prompt, options.approvalMode, options.quiet);
-        }
+        const model = options.model || await resolveModel(config);
+        startChat(config, model, prompt || "", options.approvalMode, options.quiet);
     });
 
 program
@@ -171,12 +183,13 @@ program
 // Default action: if no subcommand is given, launch chat (just like `codex`)
 program
     .argument("[prompt]", "Initial prompt to start chat directly")
-    .option("-m, --model <model>", "Model to use", DEFAULT_MODEL)
+    .option("-m, --model <model>", "Model to use (auto-detected from server if not specified)")
     .option("-a, --approval-mode <mode>", "AI assistant's permission mode (suggest, auto-edit, full-auto)", "suggest")
     .option("-q, --quiet", "Run in headless CI/CD mode without interactive TUI rendering", false)
     .action(async (prompt, options) => {
         const config = await ensureConfig();
-        startChat(config, options.model, prompt || "", options.approvalMode, options.quiet);
+        const model = options.model || await resolveModel(config);
+        startChat(config, model, prompt || "", options.approvalMode, options.quiet);
     });
 
 program.parse();

package/src/ui/Chat.tsx

@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from "react";
 import { render, Box, Text, useInput, Static } from "ink";
+import TextInput from "ink-text-input";
 import { streamChatCompletion, fetchModels } from "../api/client.js";
 import chalk from "chalk";
 import { Config, loadHistory, saveHistory } from "../config.js";
@@ -26,11 +27,13 @@ interface ChatProps {
 }
 
 const Chat: React.FC<ChatProps> = ({ config, model, initialPrompt, approvalMode }) => {
-    const [messages, setMessages] = useState<{ id: number; role: string; content: string }[]>([
-        { id: 0, role: "user", content: initialPrompt },
-    ]);
+    const hasInitialPrompt = initialPrompt.trim().length > 0;
+
+    const [messages, setMessages] = useState<{ id: number; role: string; content: string }[]>(
+        hasInitialPrompt ? [{ id: 0, role: "user", content: initialPrompt }] : []
+    );
     const [streamingContent, setStreamingContent] = useState("");
-    const [isStreaming, setIsStreaming] = useState(true);
+    const [isStreaming, setIsStreaming] = useState(hasInitialPrompt);
     const [error, setError] = useState<Error | null>(null);
     const [input, setInput] = useState("");
     const [history, setHistory] = useState<string[]>([]);
@@ -82,7 +85,6 @@ const Chat: React.FC<ChatProps> = ({ config, model, initialPrompt, approvalMode
                                 { id: prev.length, role: "system", content: `Sandbox Output:\n${output || "Done"}` }
                             ]);
                             setIsExecuting(false);
-                            // Recursive automation could go here in V5
                         });
                     } else {
                         setPendingCommand(command);
@@ -99,6 +101,7 @@ const Chat: React.FC<ChatProps> = ({ config, model, initialPrompt, approvalMode
         );
     }, [messages, isStreaming, config, activeModel]);
 
+    // Handle command confirmation and history navigation
     useInput((char: string, key: any) => {
         if (isSelectingModel) return;
         if (isStreaming) return;
@@ -121,46 +124,8 @@ const Chat: React.FC<ChatProps> = ({ config, model, initialPrompt, approvalMode
             return;
         }
 
-        if (key.return) {
-            const trimmed = input.trim();
-            if (trimmed === "/exit" || trimmed === "/quit") {
-                process.exit(0);
-            }
-            if (trimmed === "/clear") {
-                setMessages([]);
-                setInput("");
-                setHistoryIndex(-1);
-                return;
-            }
-            if (trimmed === "/models") {
-                setIsSelectingModel(true);
-                setIsLoadingModels(true);
-                setInput("");
-                fetchModels(config).then(models => {
-                    const options = models.map(m => ({ label: m.id || m.name, value: m.id || m.name }));
-                    setModelOptions(options.length ? options : [{ label: "mock-model", value: "mock-model" }]);
-                    setIsLoadingModels(false);
-                }).catch(err => {
-                    setError(err);
-                    setIsSelectingModel(false);
-                    setIsLoadingModels(false);
-                });
-                return;
-            }
-
-            if (trimmed.length > 0) {
-                const newPrompt = trimmed;
-                setMessages((prev) => [...prev, { id: prev.length, role: "user", content: newPrompt }]);
-
-                const newHistory = [...history, newPrompt];
-                setHistory(newHistory);
-                saveHistory(newHistory);
-
-                setInput("");
-                setHistoryIndex(-1);
-                setIsStreaming(true);
-            }
-        } else if (key.upArrow) {
+        // History navigation with Up/Down arrows
+        if (key.upArrow) {
             if (history.length > 0 && historyIndex < history.length - 1) {
                 const newIdx = historyIndex + 1;
                 setHistoryIndex(newIdx);
@@ -175,13 +140,49 @@ const Chat: React.FC<ChatProps> = ({ config, model, initialPrompt, approvalMode
                 setHistoryIndex(-1);
                 setInput("");
             }
-        } else if (key.backspace || key.delete) {
-            setInput((prev) => prev.slice(0, -1));
-        } else if (char) {
-            setInput((prev) => prev + char);
         }
     });
 
+    const handleSubmit = (value: string) => {
+        const trimmed = value.trim();
+        if (!trimmed) return;
+
+        if (trimmed === "/exit" || trimmed === "/quit") {
+            process.exit(0);
+        }
+        if (trimmed === "/clear") {
+            setMessages([]);
+            setInput("");
+            setHistoryIndex(-1);
+            return;
+        }
+        if (trimmed === "/models") {
+            setIsSelectingModel(true);
+            setIsLoadingModels(true);
+            setInput("");
+            fetchModels(config).then(models => {
+                const options = models.map(m => ({ label: m.id || m.name, value: m.id || m.name }));
+                setModelOptions(options.length ? options : [{ label: "mock-model", value: "mock-model" }]);
+                setIsLoadingModels(false);
+            }).catch(err => {
+                setError(err);
+                setIsSelectingModel(false);
+                setIsLoadingModels(false);
+            });
+            return;
+        }
+
+        setMessages((prev) => [...prev, { id: prev.length, role: "user", content: trimmed }]);
+
+        const newHistory = [...history, trimmed];
+        setHistory(newHistory);
+        saveHistory(newHistory);
+
+        setInput("");
+        setHistoryIndex(-1);
+        setIsStreaming(true);
+    };
+
     return (
         <>
             <Static items={messages}>
@@ -224,10 +225,15 @@ const Chat: React.FC<ChatProps> = ({ config, model, initialPrompt, approvalMode
                     ) : (
                         <>
                             {!isStreaming && !pendingCommand && !isExecuting && (
-                                <Box flexDirection="row">
-                                    <Text bold color="blue">You: </Text>
-                                    <Text>{input}</Text>
-                                    <Text dimColor> █</Text>
+                                <Box borderStyle="round" borderColor="blue" paddingX={1}>
+                                    <Text bold color="blue">❯ </Text>
+                                    {/* @ts-ignore */}
+                                    <TextInput
+                                        value={input}
+                                        onChange={setInput}
+                                        onSubmit={handleSubmit}
+                                        placeholder="Type a message... (/models, /clear, /exit)"
+                                    />
                                 </Box>
                             )}
 
@@ -293,8 +299,6 @@ export function startChat(config: Config, model: string, prompt: string, approva
             () => {
                 console.log("\n");
 
-                // If full-auto is requested in quiet mode, we would parse bash blocks and execute them here.
-                // For now, headless simply streams the raw text response for CI pipelines.
                 if (approvalMode === "full-auto") {
                     const bashMatch = fullResponse.match(/```(?:bash|sh)\n([\s\S]*?)\n```/);
                     if (bashMatch) {