swiftroutercli 1.0.0 → 1.1.0

package/dist/config.js

@@ -1,18 +1,28 @@
 import fs from "fs";
 import path from "path";
-import os from "os";
-const CONFIG_FILE = path.join(os.homedir(), ".swiftrouter-cli", "config.json");
+import { CONFIG_FILE, ENV_API_KEY, ENV_BASE_URL } from "./constants.js";
 export function loadConfig() {
+    // 1. Check for Environment Variables overriding everything else
+    const envApiKey = process.env[ENV_API_KEY];
+    const envBaseUrl = process.env[ENV_BASE_URL];
+    let fileConfig = null;
+    // 2. Load from file if exists
     try {
-        if (!fs.existsSync(CONFIG_FILE)) {
-            return null;
+        if (fs.existsSync(CONFIG_FILE)) {
+            const data = fs.readFileSync(CONFIG_FILE, "utf-8");
+            fileConfig = JSON.parse(data);
         }
-        const data = fs.readFileSync(CONFIG_FILE, "utf-8");
-        return JSON.parse(data);
     }
     catch (error) {
-        return null;
+        // ignore parse errors and fallback
     }
+    // 3. Merge Env Vars with File Config (Env wins)
+    const finalApiKey = envApiKey || fileConfig?.apiKey;
+    const finalBaseUrl = envBaseUrl || fileConfig?.baseUrl;
+    if (finalApiKey && finalBaseUrl) {
+        return { apiKey: finalApiKey, baseUrl: finalBaseUrl };
+    }
+    return null;
 }
 export function saveConfig(config) {
     const dir = path.dirname(CONFIG_FILE);

package/dist/constants.js

@@ -0,0 +1,11 @@
+import os from "os";
+import path from "path";
+// Application Defaults
+export const DEFAULT_BASE_URL = "http://localhost:8080";
+export const DEFAULT_MODEL = "gpt-4o-mini";
+// System Paths
+export const CONFIG_DIR = path.join(os.homedir(), ".swiftrouter-cli");
+export const CONFIG_FILE = path.join(CONFIG_DIR, "config.json");
+// Environment Variable Keys
+export const ENV_API_KEY = "SWIFTROUTER_API_KEY";
+export const ENV_BASE_URL = "SWIFTROUTER_BASE_URL";

package/dist/index.js

@@ -1,36 +1,54 @@
 #!/usr/bin/env node
 import { Command } from "commander";
 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 { DEFAULT_BASE_URL, DEFAULT_MODEL, CONFIG_FILE } from "./constants.js";
+import terminalImage from "terminal-image";
+import { fileURLToPath } from "url";
+import path from "path";
+import fs from "fs";
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 const program = new Command();
 async function ensureConfig() {
     const existingConfig = loadConfig();
     if (existingConfig && existingConfig.apiKey && existingConfig.baseUrl) {
         return existingConfig;
     }
-    console.log("🌊 Welcome to SwiftRouterCLI!");
-    console.log("It looks like this is your first time. Let's get you set up.\n");
+    try {
+        const logoPath = path.join(__dirname, "..", "assets", "logo.png");
+        if (fs.existsSync(logoPath)) {
+            console.log(await terminalImage.file(logoPath, { height: "25%" }));
+        }
+    }
+    catch (e) {
+        // Ignore if logo cannot be rendered
+    }
+    console.log(chalk.cyan.bold("\n🌊 Welcome to SwiftRouterCLI!"));
+    console.log(chalk.gray("It looks like this is your first time. Let's get you set up.\n"));
     const rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout,
     });
-    const apiKey = await rl.question("Please enter your SwiftRouter API Key: ");
-    const baseUrlInput = await rl.question("Please enter your SwiftRouter Base URL (default: http://localhost:8080): ");
+    const apiKey = await rl.question(chalk.bold("Please enter your SwiftRouter API Key: "));
+    const baseUrlInput = await rl.question(chalk.bold(`Please enter your SwiftRouter Base URL (default: ${DEFAULT_BASE_URL}): `));
     rl.close();
     const config = {
         apiKey: apiKey.trim(),
-        baseUrl: baseUrlInput.trim() || "http://localhost:8080",
+        baseUrl: baseUrlInput.trim() || DEFAULT_BASE_URL,
     };
     saveConfig(config);
-    console.log("\n✅ Configuration saved securely! Starting your session...\n");
+    console.log(chalk.green("\n✅ Configuration saved securely! Starting your session...\n"));
     return config;
 }
 program
     .name("swiftrouter")
     .description("CLI for SwiftRouter AI Gateway")
-    .version("1.0.0");
+    .version("1.0.1");
 program
     .command("config")
     .description("Manually configure the CLI with your SwiftRouter API Key and Base URL")
@@ -43,41 +61,83 @@ program
     if (options.setBaseUrl)
         config.baseUrl = options.setBaseUrl;
     if (!config.apiKey || !config.baseUrl) {
-        console.error("Please provide both an API Key and a Base URL.");
-        console.log("Usage: swiftrouter config --set-api-key <KEY> --set-base-url <URL>");
+        console.error(chalk.red("Please provide both an API Key and a Base URL."));
+        console.log(chalk.gray("Usage: swiftrouter config --set-api-key <KEY> --set-base-url <URL>"));
         process.exit(1);
     }
     saveConfig(config);
-    console.log("✅ Configuration saved successfully!");
+    console.log(chalk.green("✅ Configuration saved successfully!"));
 });
 program
     .command("models")
     .description("List available models from SwiftRouter")
     .action(async () => {
     const config = await ensureConfig();
+    const spinner = ora("Fetching models from SwiftRouter...").start();
     try {
-        console.log("Fetching models...");
         const models = await fetchModels(config);
-        console.log(`\nAvailable Models (${models.length}):`);
-        models.forEach((m) => console.log(` - ${m.id}`));
+        spinner.succeed(`Found ${models.length} models!`);
+        console.log(chalk.dim("\nAvailable Models:"));
+        models.forEach((m) => console.log(chalk.cyan(`  - ${m.id}`)));
     }
     catch (e) {
-        console.error("Failed to fetch models:", e.message);
+        spinner.fail("Failed to fetch models.");
+        if (e.message.includes("fetch failed") || e.message.includes("ECONNREFUSED")) {
+            console.error(chalk.red.bold(`\n❌ Error: Cannot connect to SwiftRouter backend at ${config.baseUrl}`));
+            console.error(chalk.dim("Please ensure your SwiftRouter server is currently running."));
+        }
+        else {
+            console.error(chalk.red(e.message));
+        }
     }
 });
 program
     .command("chat")
     .description("Start an interactive chat session")
     .argument("[prompt]", "Initial prompt to start the chat")
-    .option("-m, --model <model>", "Model to use", "gpt-4o-mini")
+    .option("-m, --model <model>", "Model to use", DEFAULT_MODEL)
     .action(async (prompt, options) => {
     const config = await ensureConfig();
     if (!prompt) {
-        console.log("Starting empty chat session...");
         startChat(config, options.model, "");
     }
     else {
         startChat(config, options.model, prompt);
     }
 });
+program
+    .command("status")
+    .description("Check the current configuration and connection status")
+    .action(async () => {
+    const config = loadConfig();
+    if (!config || !config.apiKey || !config.baseUrl) {
+        console.log(chalk.yellow("⚠️  SwiftRouterCLI is not authenticated."));
+        console.log(`Run ${chalk.cyan("swiftrouter config")} or any command to setup.`);
+        return;
+    }
+    console.log(chalk.bold("SwiftRouterCLI Status:"));
+    console.log(chalk.green("✅ Authenticated"));
+    console.log(`${chalk.gray("Base URL:")} ${config.baseUrl}`);
+    console.log(`${chalk.gray("API Key:")} sk-...${config.apiKey.slice(-4)}`);
+    const spinner = ora("\nPinging SwiftRouter Server...").start();
+    try {
+        const models = await fetchModels(config);
+        spinner.succeed(chalk.green(`Connected! Found ${models.length} active models.`));
+    }
+    catch (e) {
+        spinner.fail(chalk.red("Failed to reach server. Are you sure it's running?"));
+    }
+});
+program
+    .command("logout")
+    .description("Clear your local SwiftRouter configuration securely")
+    .action(() => {
+    if (fs.existsSync(CONFIG_FILE)) {
+        fs.unlinkSync(CONFIG_FILE);
+        console.log(chalk.green("✅ Successfully logged out. Configuration deleted."));
+    }
+    else {
+        console.log(chalk.gray("You were not logged in."));
+    }
+});
 program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swiftroutercli",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -16,11 +16,14 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "chalk": "^4.1.2",
     "commander": "^14.0.3",
     "dotenv": "^17.3.1",
     "eventsource-parser": "^3.0.6",
     "ink": "^6.8.0",
+    "ora": "^5.4.1",
     "react": "^19.2.4",
+    "terminal-image": "^4.2.0",
     "undici": "^7.22.0",
     "zod": "^4.3.6"
   },

package/src/config.ts

@@ -1,24 +1,38 @@
 import fs from "fs";
 import path from "path";
-import os from "os";
+import { CONFIG_FILE, ENV_API_KEY, ENV_BASE_URL } from "./constants.js";
 
 export interface Config {
     apiKey: string;
     baseUrl: string;
 }
 
-const CONFIG_FILE = path.join(os.homedir(), ".swiftrouter-cli", "config.json");
-
 export function loadConfig(): Config | null {
+    // 1. Check for Environment Variables overriding everything else
+    const envApiKey = process.env[ENV_API_KEY];
+    const envBaseUrl = process.env[ENV_BASE_URL];
+
+    let fileConfig: Config | null = null;
+
+    // 2. Load from file if exists
     try {
-        if (!fs.existsSync(CONFIG_FILE)) {
-            return null;
+        if (fs.existsSync(CONFIG_FILE)) {
+            const data = fs.readFileSync(CONFIG_FILE, "utf-8");
+            fileConfig = JSON.parse(data) as Config;
         }
-        const data = fs.readFileSync(CONFIG_FILE, "utf-8");
-        return JSON.parse(data) as Config;
     } catch (error) {
-        return null;
+        // ignore parse errors and fallback
     }
+
+    // 3. Merge Env Vars with File Config (Env wins)
+    const finalApiKey = envApiKey || fileConfig?.apiKey;
+    const finalBaseUrl = envBaseUrl || fileConfig?.baseUrl;
+
+    if (finalApiKey && finalBaseUrl) {
+        return { apiKey: finalApiKey, baseUrl: finalBaseUrl };
+    }
+
+    return null;
 }
 
 export function saveConfig(config: Config) {

package/src/constants.ts

@@ -0,0 +1,14 @@
+import os from "os";
+import path from "path";
+
+// Application Defaults
+export const DEFAULT_BASE_URL = "http://localhost:8080";
+export const DEFAULT_MODEL = "gpt-4o-mini";
+
+// System Paths
+export const CONFIG_DIR = path.join(os.homedir(), ".swiftrouter-cli");
+export const CONFIG_FILE = path.join(CONFIG_DIR, "config.json");
+
+// Environment Variable Keys
+export const ENV_API_KEY = "SWIFTROUTER_API_KEY";
+export const ENV_BASE_URL = "SWIFTROUTER_BASE_URL";

package/src/index.ts

@@ -1,9 +1,19 @@
 #!/usr/bin/env node
 import { Command } from "commander";
 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 { DEFAULT_BASE_URL, DEFAULT_MODEL, CONFIG_FILE } from "./constants.js";
+import terminalImage from "terminal-image";
+import { fileURLToPath } from "url";
+import path from "path";
+import fs from "fs";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 const program = new Command();
 
@@ -13,28 +23,37 @@ async function ensureConfig(): Promise<Config> {
         return existingConfig;
     }
 
-    console.log("🌊 Welcome to SwiftRouterCLI!");
-    console.log("It looks like this is your first time. Let's get you set up.\n");
+    try {
+        const logoPath = path.join(__dirname, "..", "assets", "logo.png");
+        if (fs.existsSync(logoPath)) {
+            console.log(await terminalImage.file(logoPath, { height: "25%" }));
+        }
+    } catch (e) {
+        // Ignore if logo cannot be rendered
+    }
+
+    console.log(chalk.cyan.bold("\n🌊 Welcome to SwiftRouterCLI!"));
+    console.log(chalk.gray("It looks like this is your first time. Let's get you set up.\n"));
 
     const rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout,
     });
 
-    const apiKey = await rl.question("Please enter your SwiftRouter API Key: ");
+    const apiKey = await rl.question(chalk.bold("Please enter your SwiftRouter API Key: "));
     const baseUrlInput = await rl.question(
-        "Please enter your SwiftRouter Base URL (default: http://localhost:8080): "
+        chalk.bold(`Please enter your SwiftRouter Base URL (default: ${DEFAULT_BASE_URL}): `)
     );
 
     rl.close();
 
     const config: Config = {
         apiKey: apiKey.trim(),
-        baseUrl: baseUrlInput.trim() || "http://localhost:8080",
+        baseUrl: baseUrlInput.trim() || DEFAULT_BASE_URL,
     };
 
     saveConfig(config);
-    console.log("\n✅ Configuration saved securely! Starting your session...\n");
+    console.log(chalk.green("\n✅ Configuration saved securely! Starting your session...\n"));
 
     return config;
 }
@@ -42,7 +61,7 @@ async function ensureConfig(): Promise<Config> {
 program
     .name("swiftrouter")
     .description("CLI for SwiftRouter AI Gateway")
-    .version("1.0.0");
+    .version("1.0.1");
 
 program
     .command("config")
@@ -56,13 +75,13 @@ program
         if (options.setBaseUrl) config.baseUrl = options.setBaseUrl;
 
         if (!config.apiKey || !config.baseUrl) {
-            console.error("Please provide both an API Key and a Base URL.");
-            console.log("Usage: swiftrouter config --set-api-key <KEY> --set-base-url <URL>");
+            console.error(chalk.red("Please provide both an API Key and a Base URL."));
+            console.log(chalk.gray("Usage: swiftrouter config --set-api-key <KEY> --set-base-url <URL>"));
             process.exit(1);
         }
 
         saveConfig(config);
-        console.log("✅ Configuration saved successfully!");
+        console.log(chalk.green("✅ Configuration saved successfully!"));
     });
 
 program
@@ -70,14 +89,21 @@ program
     .description("List available models from SwiftRouter")
     .action(async () => {
         const config = await ensureConfig();
+        const spinner = ora("Fetching models from SwiftRouter...").start();
 
         try {
-            console.log("Fetching models...");
             const models = await fetchModels(config);
-            console.log(`\nAvailable Models (${models.length}):`);
-            models.forEach((m: any) => console.log(` - ${m.id}`));
+            spinner.succeed(`Found ${models.length} models!`);
+            console.log(chalk.dim("\nAvailable Models:"));
+            models.forEach((m: any) => console.log(chalk.cyan(`  - ${m.id}`)));
         } catch (e: any) {
-            console.error("Failed to fetch models:", e.message);
+            spinner.fail("Failed to fetch models.");
+            if (e.message.includes("fetch failed") || e.message.includes("ECONNREFUSED")) {
+                console.error(chalk.red.bold(`\n❌ Error: Cannot connect to SwiftRouter backend at ${config.baseUrl}`));
+                console.error(chalk.dim("Please ensure your SwiftRouter server is currently running."));
+            } else {
+                console.error(chalk.red(e.message));
+            }
         }
     });
 
@@ -85,16 +111,52 @@ program
     .command("chat")
     .description("Start an interactive chat session")
     .argument("[prompt]", "Initial prompt to start the chat")
-    .option("-m, --model <model>", "Model to use", "gpt-4o-mini")
+    .option("-m, --model <model>", "Model to use", DEFAULT_MODEL)
     .action(async (prompt, options) => {
         const config = await ensureConfig();
 
         if (!prompt) {
-            console.log("Starting empty chat session...");
             startChat(config, options.model, "");
         } else {
             startChat(config, options.model, prompt);
         }
     });
 
+program
+    .command("status")
+    .description("Check the current configuration and connection status")
+    .action(async () => {
+        const config = loadConfig();
+        if (!config || !config.apiKey || !config.baseUrl) {
+            console.log(chalk.yellow("⚠️  SwiftRouterCLI is not authenticated."));
+            console.log(`Run ${chalk.cyan("swiftrouter config")} or any command to setup.`);
+            return;
+        }
+
+        console.log(chalk.bold("SwiftRouterCLI Status:"));
+        console.log(chalk.green("✅ Authenticated"));
+        console.log(`${chalk.gray("Base URL:")} ${config.baseUrl}`);
+        console.log(`${chalk.gray("API Key:")} sk-...${config.apiKey.slice(-4)}`);
+
+        const spinner = ora("\nPinging SwiftRouter Server...").start();
+        try {
+            const models = await fetchModels(config);
+            spinner.succeed(chalk.green(`Connected! Found ${models.length} active models.`));
+        } catch (e) {
+            spinner.fail(chalk.red("Failed to reach server. Are you sure it's running?"));
+        }
+    });
+
+program
+    .command("logout")
+    .description("Clear your local SwiftRouter configuration securely")
+    .action(() => {
+        if (fs.existsSync(CONFIG_FILE)) {
+            fs.unlinkSync(CONFIG_FILE);
+            console.log(chalk.green("✅ Successfully logged out. Configuration deleted."));
+        } else {
+            console.log(chalk.gray("You were not logged in."));
+        }
+    });
+
 program.parse();