virouter 0.2.4 → 0.2.5

package/README.md

@@ -17,16 +17,15 @@ $env:VIROUTER_API_ORIGIN="http://127.0.0.1:8787"
 npx virouter@latest
 ```
 
-On the first install, the installer displays the API key while you type it, asks for the operating
-system and default model, and configures:
-
-- `1` = Windows
-- `2` = macOS
-- `3` = Linux
+On the first install, the installer detects the machine (Windows, macOS, Linux or WSL — it no
+longer asks), checks the key against the gateway and shows it masked with its plan, credit and
+expiry, asks for the default model, and configures:
 
 - `ANTHROPIC_BASE_URL=https://virouter.click`
 - `ANTHROPIC_AUTH_TOKEN`
 - `model` in `~/.claude/settings.json` — `claude-fable-5-1` on a first install
+- `env.ANTHROPIC_DEFAULT_MODEL` in the same file, so the `/model` picker's "Default" row resolves
+  to a VIROUTER model instead of Claude Code's own default (a choice saved with `/model` still wins)
 - `ANTHROPIC_SMALL_FAST_MODEL=claude-haiku-4-5`
 - `VIROUTER_API_KEY` for OpenCode
 - `~/.config/opencode/opencode.json` with VIROUTER as the default provider
@@ -43,8 +42,8 @@ back to the install-time model. An install that pinned it is migrated — that m
 `settings.json`. Only if `settings.json` is not valid JSON does the installer leave it untouched
 and fall back to pinning `ANTHROPIC_MODEL`.
 
-The installer uses visible input and prints the received key for confirmation. Do not record or
-share that terminal output.
+The key is visible while you type it; afterwards the installer only ever prints it masked
+(`viro_AbCd…UvWx`). Do not record or share the terminal while typing it.
 
 When an OpenCode configuration already exists, its enabled providers and credentials are
 preserved; VIROUTER is appended and selected as the default provider. A new configuration

package/bin/virouter.mjs

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 
 import { execFileSync } from 'node:child_process';
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
-import { homedir } from 'node:os';
+import { existsSync, mkdirSync, readFileSync, realpathSync, writeFileSync } from 'node:fs';
+import { arch, homedir, hostname, release } from 'node:os';
 import { join } from 'node:path';
 import { createInterface } from 'node:readline/promises';
-import { pathToFileURL } from 'node:url';
+import { fileURLToPath } from 'node:url';
 
 const API_ORIGIN = (process.env.VIROUTER_API_ORIGIN || 'https://virouter.click').replace(/\/$/, '');
 const MARKER_START = '# >>> VIROUTER CLAUDE CODE CONFIG >>>';
@@ -42,30 +42,59 @@ For local testing, set VIROUTER_API_ORIGIN=http://127.0.0.1:8787.
   It does not install a server or store a local model.`);
 }
 
+// Colour only on a real terminal, and never when NO_COLOR is set (https://no-color.org).
+const USE_COLOR = Boolean(process.stdout.isTTY) && !process.env.NO_COLOR;
+const paint = (code) => (text) => (USE_COLOR ? `\x1b[${code}m${text}\x1b[0m` : String(text));
+const style = {
+  bold: paint('1'),
+  dim: paint('2'),
+  red: paint('31'),
+  green: paint('32'),
+  yellow: paint('33'),
+  cyan: paint('36'),
+};
+
+/** Enough of the key to recognise it, never enough to use it. */
+export function maskKey(key) {
+  return key.length > 16 ? `${key.slice(0, 9)}…${key.slice(-4)}` : `${key.slice(0, 5)}…`;
+}
+
+/**
+ * The machine the installer is configuring. Detected rather than asked: picking the wrong
+ * number wrote a shell profile on Windows or `setx` on Linux, and neither failed loudly.
+ */
+export function detectMachine(platform = process.platform) {
+  if (platform === 'win32') return { os: '1', name: 'Windows' };
+  if (platform === 'darwin') return { os: '2', name: 'macOS' };
+  let wsl = false;
+  try {
+    wsl = /microsoft/i.test(readFileSync('/proc/version', 'utf8'));
+  } catch {
+    // Not Linux proper, or /proc is unavailable; plain Linux it is.
+  }
+  return { os: '3', name: wsl ? 'Linux (WSL)' : 'Linux' };
+}
+
+function step(label, detail = '') {
+  console.log(`${style.green('✓')} ${label}${detail ? ` ${style.dim(detail)}` : ''}`);
+}
+
 async function readVisibleInput(prompt) {
   const line = createInterface({ input: process.stdin, output: process.stdout, terminal: true });
   const answer = await line.question(prompt);
   line.close();
-  const value = answer.trim();
-  console.log(`\nĐã nhận customer key: ${value}`);
-  return value;
-}
-
-async function chooseOs(input) {
-  console.log('Hệ điều hành:');
-  console.log('  ● 1 = Windows');
-  console.log('  ● 2 = macOS');
-  console.log('  ● 3 = Linux');
-  const answer = (await input.question('Chọn số (1/2/3): ')).trim();
-  if (!['1', '2', '3'].includes(answer)) throw new Error('Chọn 1, 2 hoặc 3.');
-  return answer;
+  return answer.trim();
 }
 
 async function chooseModel(input, currentModel) {
-  console.log('\nModel mặc định cho Claude Code:');
-  VIROUTER_MODELS.forEach((model, index) => console.log(`  ${index + 1} = ${model}`));
+  console.log(`\n${style.bold('Model mặc định cho Claude Code')} ${style.dim('(đổi lại bất cứ lúc nào bằng /model)')}`);
   const defaultIndex = Math.max(0, VIROUTER_MODELS.indexOf(currentModel));
-  const answer = (await input.question(`Chọn số [${defaultIndex + 1}]: `)).trim() || String(defaultIndex + 1);
+  VIROUTER_MODELS.forEach((model, index) => {
+    const isDefault = index === defaultIndex;
+    const number = style.cyan(String(index + 1).padStart(2));
+    console.log(`  ${number}  ${isDefault ? style.bold(model) : model}${isDefault ? style.green('  ← mặc định') : ''}`);
+  });
+  const answer = (await input.question(`Chọn số ${style.dim(`[${defaultIndex + 1}]`)}: `)).trim() || String(defaultIndex + 1);
   const selected = VIROUTER_MODELS[Number(answer) - 1];
   if (!selected) throw new Error('Lựa chọn model không hợp lệ.');
   return selected;
@@ -125,14 +154,20 @@ export function resolveStartingModel(settingsModel, legacyModel) {
   return null;
 }
 
-/** Returns new settings with `model` set and any ANTHROPIC_MODEL pin removed from `env`. */
+/**
+ * Returns new settings with `model` set, any ANTHROPIC_MODEL pin removed from `env`, and the
+ * picker's "Default" row pointed at VIROUTER's default.
+ *
+ * `/model` always lists a "Default (recommended)" row that resolves to Claude Code's own
+ * runtime default — a model name this gateway may not serve. ANTHROPIC_DEFAULT_MODEL makes
+ * that row resolve to ours instead ("Set by ANTHROPIC_DEFAULT_MODEL"), and unlike
+ * ANTHROPIC_MODEL it does not override a choice the customer saved with /model.
+ */
 export function withRememberedModel(settings, model) {
-  const next = { ...settings, model };
-  if (next.env && typeof next.env === 'object' && 'ANTHROPIC_MODEL' in next.env) {
-    const { ANTHROPIC_MODEL: _pinned, ...env } = next.env;
-    next.env = env;
-  }
-  return next;
+  const currentEnv = settings.env && typeof settings.env === 'object' ? settings.env : {};
+  const { ANTHROPIC_MODEL: _pinned, ...env } = currentEnv;
+  if (!VIROUTER_MODELS.includes(env.ANTHROPIC_DEFAULT_MODEL)) env.ANTHROPIC_DEFAULT_MODEL = DEFAULT_MODEL;
+  return { ...settings, model, env };
 }
 
 function writeClaudeSettings(path, settings) {
@@ -301,6 +336,7 @@ function configureUnix(os, apiKey, pinnedModel) {
   return profiles.join(' and ');
 }
 
+/** `{ ok: true, me }`, `{ ok: false }` when the gateway rejects the key, or null if unreachable. */
 async function validateKey(apiKey) {
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), 5000);
@@ -309,7 +345,8 @@ async function validateKey(apiKey) {
       headers: { authorization: `Bearer ${apiKey}` },
       signal: controller.signal,
     });
-    return response.ok;
+    if (!response.ok) return { ok: false };
+    return { ok: true, me: await response.json().catch(() => null) };
   } catch {
     return null;
   } finally {
@@ -317,6 +354,19 @@ async function validateKey(apiKey) {
   }
 }
 
+function describeKey(me) {
+  if (!me || typeof me !== 'object') return '';
+  const parts = [];
+  if (me.planCode) parts.push(`gói ${me.planCode}`);
+  if (typeof me.creditsRemaining === 'number') {
+    parts.push(`còn ${me.creditsRemaining.toLocaleString('vi-VN')} credit`);
+  }
+  if (typeof me.expiresAt === 'number') {
+    parts.push(`hết hạn ${new Date(me.expiresAt * 1000).toLocaleDateString('vi-VN')}`);
+  }
+  return parts.join(' · ');
+}
+
 function launchClaude(apiKey, pinnedModel) {
   const env = {
     ...process.env,
@@ -346,11 +396,13 @@ async function main() {
     return;
   }
 
-  console.log(`\nVIROUTER Claude Code installer\nTarget: ${API_ORIGIN}\n`);
+  const machine = detectMachine();
+  console.log(`\n${style.bold(style.cyan('VIROUTER'))} ${style.bold('· Claude Code installer')}`);
+  console.log(style.dim(`Gateway  ${API_ORIGIN}`));
+  console.log(style.dim(`Máy      ${machine.name} ${release()} · ${arch()} · ${hostname()}`));
+  console.log('');
   const agentToolkit = detectAgentToolkit();
-  if (agentToolkit) {
-    console.log(`Phát hiện ${agentToolkit}. Giữ nguyên skills, rules và hooks hiện có.`);
-  }
+  if (agentToolkit) step(`Phát hiện ${agentToolkit}`, '— giữ nguyên skills, rules và hooks hiện có');
   let input;
 
   try {
@@ -358,13 +410,20 @@ async function main() {
     const reuseEnvironmentKey = process.argv.includes('--reuse-key') || !process.stdin.isTTY;
     const apiKey = reuseEnvironmentKey && process.env.VIROUTER_API_KEY
       ? process.env.VIROUTER_API_KEY
-      : await readVisibleInput('Auth Token / API Key (sẽ hiển thị khi nhập): ');
+      : await readVisibleInput(`${style.bold('API key')} ${style.dim('(viro_…, hiển thị khi nhập)')}: `);
     if (!/^viro_[A-Za-z0-9_-]{20,}$/.test(apiKey)) {
       throw new Error('API key không hợp lệ. Key phải bắt đầu bằng viro_.');
     }
 
+    const checked = await validateKey(apiKey);
+    if (checked && !checked.ok) {
+      throw new Error(`API key bị từ chối bởi ${API_ORIGIN}. Kiểm tra key hoặc VIROUTER_API_ORIGIN.`);
+    }
+    if (checked) step(`Key ${style.bold(maskKey(apiKey))} hợp lệ`, describeKey(checked.me));
+    else console.log(`${style.yellow('!')} Key ${maskKey(apiKey)} — không kiểm tra được lúc này, vẫn lưu cấu hình.`);
+
     input = createInterface({ input: process.stdin, output: process.stdout });
-    const os = await chooseOs(input);
+    const { os } = machine;
     const keyChanged = previous.key !== null && previous.key !== apiKey;
     const claudeSettings = readClaudeSettings();
     // Re-running the installer keeps whatever the customer last picked with /model.
@@ -374,12 +433,7 @@ async function main() {
       : await chooseModel(input, remembered ?? DEFAULT_MODEL);
     input.close();
     input = undefined;
-
-    const valid = await validateKey(apiKey);
-    if (valid === false) {
-      throw new Error(`API key bị từ chối bởi ${API_ORIGIN}. Kiểm tra key hoặc VIROUTER_API_ORIGIN.`);
-    }
-    if (valid === null) console.log('Không kiểm tra được API lúc này. Vẫn tiếp tục lưu cấu hình.');
+    console.log('');
 
     // Remember the model in settings.json; pin it in the environment only if that file is not
     // ours to rewrite (unparseable), since a session with no model at all would be worse.
@@ -388,30 +442,46 @@ async function main() {
       writeClaudeSettings(claudeSettings.path, withRememberedModel(claudeSettings.settings, model));
     } else {
       pinnedModel = model;
-      console.log(`Không đọc được ${claudeSettings.path} (không phải JSON hợp lệ).`);
-      console.log('Model sẽ cố định qua biến môi trường; /model sẽ không được ghi nhớ giữa các phiên.');
+      console.log(`${style.yellow('!')} Không đọc được ${claudeSettings.path} (không phải JSON hợp lệ).`);
+      console.log(style.dim('  Model sẽ cố định qua biến môi trường; /model sẽ không được ghi nhớ giữa các phiên.'));
     }
 
     const location = os === '1'
       ? configureWindows(apiKey, pinnedModel)
       : configureUnix(os, apiKey, pinnedModel);
     const openCodeConfig = configureOpenCode(apiKey, model);
-    console.log(`\nĐã cấu hình Claude Code trong ${location}.`);
-    console.log(`Model: ${model}. Đổi bằng /model trong Claude Code — lần mở sau sẽ giữ model đã chọn.`);
-    if (openCodeConfig) console.log(`Đã cấu hình OpenCode chỉ dùng alias VIROUTER trong ${openCodeConfig}.`);
+    step('Claude Code', location);
+    step(`Model ${style.bold(model)}`, '— đổi bằng /model, lần mở sau giữ model đã chọn');
+    if (openCodeConfig) step('OpenCode', openCodeConfig);
     if (process.argv.includes('--no-launch')) {
-      console.log('Chạy `claude` trong terminal mới để dùng cấu hình vừa tạo.\n');
+      console.log(`\nMở terminal mới rồi chạy ${style.cyan('claude')}.\n`);
     } else {
-      console.log('\nKhởi chạy Claude Code với VIROUTER...\n');
+      console.log(`\n${style.cyan('→')} Khởi chạy Claude Code với VIROUTER…\n`);
       launchClaude(apiKey, pinnedModel);
     }
   } catch (error) {
     input?.close();
-    console.error(`\nLỗi: ${error instanceof Error ? error.message : String(error)}`);
+    console.error(`\n${style.red('Lỗi:')} ${error instanceof Error ? error.message : String(error)}`);
     process.exitCode = 1;
   }
 }
 
-if (process.argv[1] && pathToFileURL(process.argv[1]).href === import.meta.url) {
+/**
+ * True when this file is the program being run, not a module imported by a test.
+ *
+ * `npx` runs the package through a symlink (`node_modules/.bin/virouter`). Node reports that
+ * link in `argv[1]` but loads the real file, so comparing the two raw paths never matched on
+ * macOS and Linux: `npx virouter@latest` installed, printed nothing and exited.
+ */
+export function isMainModule(argv1 = process.argv[1], moduleUrl = import.meta.url) {
+  if (!argv1) return false;
+  try {
+    return realpathSync(argv1) === realpathSync(fileURLToPath(moduleUrl));
+  } catch {
+    return false;
+  }
+}
+
+if (isMainModule()) {
   await main();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "virouter",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Configure Claude Code to use the VIROUTER API gateway",
   "keywords": ["claude-code", "anthropic", "openai", "api-gateway", "cli"],
   "license": "MIT",