llm-switcher 1.1.7 → 1.1.9

package/README.md

@@ -191,7 +191,16 @@ flowchart LR
 
 ---
 
-## Changes in 1.1.7
+## Changes in 1.1.9
+
+- **Dashboard.** Open `http://127.0.0.1:3456/ui` directly. The page no longer needs the link from `switch ui`: the gateway puts the admin token in the page. Pages of other sites still cannot read it.
+
+### Changes in 1.1.8
+
+- **Claude Code tools.** A tool schema value of `0`, `false`, `""` or `null` (for example `minimum: 0`) became an empty object schema. Gemini refused every Claude Code request with HTTP 400 "Starting an object on a scalar field". These values now stay as they are.
+- **Shim PATH order.** If the shim folder is on `PATH` but after the real `claude` or `codex`, `switch shim status` and `switch doctor` now tell you to put the export line last in your shell files.
+
+### Changes in 1.1.7
 
 - **Codex tools.** With `publicModels` set, Codex lost its tools and ended after one answer. The model catalog copied the metadata of a real OpenAI model, which puts Codex in the "Responses Lite" form. The catalog now keeps Codex in its direct tool mode, and the gateway also reads tools that arrive as an `additional_tools` input item.
 
@@ -604,7 +613,7 @@ Before it sends a sample, the gateway masks every string value with `x` of the s
 ## Security Model
 
 - The gateway binds to `127.0.0.1` only and rejects requests whose `Host` is not a loopback name (DNS-rebinding protection) or whose `Origin` is not the dashboard itself (CSRF protection).
-- The admin API (`/api/*`) requires the `x-llm-switcher-token` header. The gateway creates the token in `admin.token`, next to `config.json`, with mode 0600. `switch ui` opens the dashboard with this token, and the MCP server reads the file. The dashboard keeps the token in `sessionStorage` of that tab only, so a page that another account serves on the same port while the gateway is off cannot read it; open the dashboard with `switch ui` again after the browser restarts. `/v1/*` and `/health` need no token.
+- The admin API (`/api/*`) requires the `x-llm-switcher-token` header. The gateway creates the token in `admin.token`, next to `config.json`, with mode 0600. The gateway puts this token in the dashboard page, so `http://127.0.0.1:3456/ui` works when you open it directly. The Host and Origin checks keep the page and the token from other sites. The MCP server reads the file. `/v1/*` and `/health` need no token.
 - API keys are never sent to the browser: `/api/status` returns redacted profiles and the dashboard keeps the stored key unless you type a new one. The stored key goes only to the stored `baseURL` and `endpoints` of that profile. A save that changes either one must carry the key again.
 - Every dashboard change carries the config revision that the page loaded. If another tab, the CLI or the MCP server saved in the meantime, the gateway answers 409 and the page reloads instead of overwriting that change.
 - Client credentials such as `x-api-key`, `authorization` or `x-goog-api-key` are **not** forwarded to upstreams. Other `x-*` headers, `traceparent` and `tracestate` pass through. The gateway drops its own control headers (`x-profile`, `x-llm-profile`) and the network identity headers (`x-forwarded-*`, `x-real-ip`).

package/README.vi.md

@@ -191,7 +191,16 @@ flowchart LR
 
 ---
 
-## Thay đổi trong bản 1.1.7
+## Thay đổi trong bản 1.1.9
+
+- **Dashboard.** Mở thẳng `http://127.0.0.1:3456/ui` là dùng được. Trang không cần link từ `switch ui` nữa: gateway đặt admin token vào trang. Trang của web khác vẫn không đọc được token.
+
+### Thay đổi trong bản 1.1.8
+
+- **Tool của Claude Code.** Giá trị `0`, `false`, `""` hoặc `null` trong schema của tool (ví dụ `minimum: 0`) bị đổi thành schema object rỗng. Gemini từ chối mọi request của Claude Code với HTTP 400 "Starting an object on a scalar field". Giờ các giá trị này được giữ nguyên.
+- **Thứ tự PATH của shim.** Nếu thư mục shim có trong `PATH` nhưng đứng sau `claude` hoặc `codex` thật, `switch shim status` và `switch doctor` giờ chỉ cách sửa: đặt dòng export ở cuối các file cấu hình shell.
+
+### Thay đổi trong bản 1.1.7
 
 - **Tool của Codex.** Khi có `publicModels`, Codex mất hết tool và dừng sau một câu trả lời. Model catalog chép metadata của một model OpenAI thật, và metadata này đưa Codex sang dạng "Responses Lite". Giờ catalog giữ Codex ở chế độ tool trực tiếp, và gateway cũng đọc tool gửi đến dưới dạng input item `additional_tools`.
 
@@ -604,7 +613,7 @@ Trước khi gửi mẫu, gateway che mọi giá trị string bằng chuỗi `x`
 ## Mô hình Bảo mật
 
 - Gateway chỉ lắng nghe `127.0.0.1` và từ chối request có `Host` không phải loopback (chống DNS rebinding) hoặc `Origin` không phải chính dashboard (chống CSRF).
-- Admin API (`/api/*`) bắt buộc header `x-llm-switcher-token`. Gateway tạo token trong file `admin.token`, cạnh `config.json`, với mode 0600. `switch ui` mở dashboard kèm token này, MCP server đọc token từ file. Dashboard giữ token trong `sessionStorage` của đúng tab đó, nên một trang do tài khoản khác phục vụ trên cùng cổng lúc gateway tắt không đọc được token; sau khi khởi động lại trình duyệt, mở dashboard bằng `switch ui` lần nữa. `/v1/*` và `/health` không cần token.
+- Admin API (`/api/*`) bắt buộc header `x-llm-switcher-token`. Gateway tạo token trong file `admin.token`, cạnh `config.json`, với mode 0600. Gateway đặt token này vào trang dashboard, nên mở thẳng `http://127.0.0.1:3456/ui` là dùng được. Lớp kiểm tra Host và Origin ngăn trang web khác đọc trang và token. MCP server đọc token từ file. `/v1/*` và `/health` không cần token.
 - API key không bao giờ gửi xuống trình duyệt: `/api/status` trả profile đã che key, dashboard giữ nguyên key đã lưu nếu bạn không nhập key mới. Key đã lưu chỉ được gửi tới `baseURL` và `endpoints` đã lưu của chính profile đó. Lần lưu nào đổi một trong hai thì phải nhập lại key.
 - Mỗi thay đổi từ dashboard mang theo revision của config mà trang đã tải. Nếu tab khác, CLI hoặc MCP server đã lưu trước đó, gateway trả 409 và trang tải lại thay vì ghi đè thay đổi kia.
 - Credential của client (`x-api-key`, `authorization`, `x-goog-api-key`) **không** được chuyển tiếp lên upstream. Các header `x-*` khác, `traceparent` và `tracestate` được chuyển tiếp. Gateway bỏ header điều khiển của chính nó (`x-profile`, `x-llm-profile`) và header định danh mạng (`x-forwarded-*`, `x-real-ip`).

package/formats.mjs

@@ -253,22 +253,24 @@ function smartDelta(choice) {
 const SCHEMA_MAPS = new Set(['properties', 'patternProperties', '$defs', 'definitions']);
 
 function sanitizeJsonSchema(schema) {
-  if (!schema) return { type: 'object', properties: {} };
-  if (typeof schema === 'string') {
-    return schema;
-  }
-  if (typeof schema !== 'object') return schema;
-  if (Array.isArray(schema)) return schema.map(sanitizeJsonSchema);
+  if (schema === null || schema === undefined) return { type: 'object', properties: {} };
+  return sanitizeSchemaNode(schema);
+}
+
+// Inside a schema 0, false, "" and null are values (minimum: 0, additionalProperties: false), not a missing schema.
+function sanitizeSchemaNode(schema) {
+  if (schema === null || typeof schema !== 'object') return schema;
+  if (Array.isArray(schema)) return schema.map(sanitizeSchemaNode);
   const clean = {};
   for (const [k, v] of Object.entries(schema)) {
     if (k === '$schema' || k === 'cache_control' || k === 'encrypted') continue;
     if (k === 'format' && ['uri', 'uri-reference'].includes(v)) continue;
     // A name map: each value is a schema, the map itself is not. A parameter may be named "properties".
     if (SCHEMA_MAPS.has(k) && v && typeof v === 'object' && !Array.isArray(v)) {
-      clean[k] = Object.fromEntries(Object.entries(v).map(([name, sub]) => [name, sanitizeJsonSchema(sub)]));
+      clean[k] = Object.fromEntries(Object.entries(v).map(([name, sub]) => [name, sanitizeSchemaNode(sub)]));
       continue;
     }
-    clean[k] = sanitizeJsonSchema(v);
+    clean[k] = sanitizeSchemaNode(v);
   }
   if (!clean.type && clean.properties) {
     clean.type = 'object';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "llm-switcher",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "Zero-dependency multi-protocol edge gateway & provider switcher for Claude Code, Codex, OpenAI and Gemini clients",
   "keywords": [
     "llm",

package/proxy.mjs

@@ -1114,7 +1114,10 @@ async function route(req, res) {
         'X-Frame-Options': 'DENY',
         'X-Content-Type-Options': 'nosniff'
       });
-      return res.end(fs.readFileSync(uiHtmlPath, 'utf8'));
+      // One gateway serves one user, so the page opened at /ui carries its own token. The Host and Origin
+      // guard above keeps it from other sites; the token is hex, so it needs no escaping.
+      const meta = `<meta name="llm-switcher-token" content="${ADMIN_TOKEN.toString()}">`;
+      return res.end(fs.readFileSync(uiHtmlPath, 'utf8').replace('<head>', `<head>\n  ${meta}`));
     }
   }
 

package/shim.mjs

@@ -233,6 +233,15 @@ export function suggestedRcFiles(platform = process.platform) {
   return [path.join(home, '.profile')];
 }
 
+// The shim is on PATH but behind the real binary: a line that runs later prepends another directory
+// (npm-global, Homebrew). Login shells read the profile file, interactive shells the rc file.
+export function pathOrderHint(platform = process.platform) {
+  const files = suggestedRcFiles(platform);
+  if (!files.length) return [`Run this command, then open a new terminal: ${pathExportLine(platform)}`];
+  return [`Put this line LAST in ${files.join(' and ')}, after every other PATH line, then open a new terminal:`,
+    `    ${pathExportLine(platform)}`];
+}
+
 /**
  * Check whether running CLI processes have the gateway env.
  * This is the hardest failure to spot: a `claude` session opened BEFORE the gateway

package/switch.mjs

@@ -13,7 +13,7 @@ import {
 } from './state.mjs';
 import { runProbe, runCheck } from './contract.mjs';
 import {
-  SHIM_DIR, installShims, uninstallShims, shimStatus, pathExportLine,
+  SHIM_DIR, installShims, uninstallShims, shimStatus, pathExportLine, pathOrderHint,
   suggestedRcFiles, auditRunningProcesses
 } from './shim.mjs';
 import {
@@ -739,6 +739,7 @@ async function manageShim(action = 'status') {
     if (s.active) console.log(`[PASS] ${s.name}: shim active → ${s.effective}`);
     else console.log(`[WARN] ${s.name}: shim installed but '${s.name}' resolves to ${s.effective || '(not found)'} — PATH order wrong`);
   }
+  if (st.onPath && st.shims.some(s => s.installed && !s.active)) for (const line of pathOrderHint()) console.log(`       ${line}`);
 
   const audit = auditActiveClis();
   if (!audit.supported) console.log('\n[INFO] The running-session check is not supported on Windows.');
@@ -832,6 +833,7 @@ async function runDoctor() {
     else if (!s.active) warn(`[WARN] '${s.name}' resolves to ${s.effective || '(not found)'} instead of the shim — PATH order wrong.`);
     else console.log(`[PASS] '${s.name}' routed through shim.`);
   }
+  if (sh.onPath && sh.shims.some(s => s.installed && !s.active)) for (const line of pathOrderHint()) console.log(`       ${line}`);
 
   // 7. Running processes missing env => those sessions call the provider directly
   const audit = auditActiveClis();

package/tests/formats.test.mjs

@@ -799,3 +799,19 @@ test('responsesToIR reads additional_tools items and sends a tool once', () => {
   assert.deepEqual(ir.tools.map(t => t.name), ['exec_command', 'apply_patch']);
   assert.equal(ir.messages.length, 0, 'the item is not a message');
 });
+
+// ISS-CC-LS-001: a falsy value inside a schema (minimum: 0, additionalProperties: false) is a value,
+// not a missing schema. Gemini refuses an object where it expects a number.
+test('tool schemas keep 0, false, "" and null values', () => {
+  const schema = { type: 'object', additionalProperties: false, properties: {
+    total: { type: 'integer', minimum: 0, maximum: 9007199254740991 },
+    tags: { type: 'array', minItems: 0, items: { type: 'string', default: '' } },
+    note: { type: ['string', 'null'], default: null } } };
+  const ir = responsesToIR({ model: 'm', input: 'hi', tools: [{ type: 'function', name: 'f', parameters: schema }] });
+  const p = ir.tools[0].parameters;
+  assert.equal(p.additionalProperties, false);
+  assert.equal(p.properties.total.minimum, 0);
+  assert.equal(p.properties.tags.minItems, 0);
+  assert.equal(p.properties.tags.items.default, '');
+  assert.equal(p.properties.note.default, null);
+});

package/tests/gateway.e2e.test.mjs

@@ -530,6 +530,25 @@ test('Security: foreign Host / Origin are rejected (DNS rebinding & CSRF)', asyn
 
 // Any local process can reach loopback. Without a token it must get nothing from /api/*,
 // and a masked key must never be resolved for a baseURL the profile does not have.
+// One gateway serves one user on one machine: the dashboard opened at /ui, with no link from `switch ui`,
+// carries its own token. A page of another site and a rebound Host still get nothing.
+test('Dashboard: /ui opened directly carries the admin token, other sites do not get it', async () => {
+  for (const p of ['/ui', '/']) {
+    const html = await (await fetch(url(p))).text();
+    assert.ok(html.includes(`<meta name="llm-switcher-token" content="${adminToken()}">`), `${p} has no token`);
+  }
+  const foreign = await fetch(url('/ui'), { headers: { origin: 'https://evil.example' } });
+  assert.equal(foreign.status, 403);
+  assert.ok(!(await foreign.text()).includes(adminToken()));
+  const rebound = await new Promise((resolve, reject) => {
+    http.get({ host: '127.0.0.1', port: proxyPort, path: '/ui', headers: { host: 'evil.example' } }, res => {
+      let b = ''; res.on('data', d => { b += d; }); res.on('end', () => resolve({ status: res.statusCode, body: b }));
+    }).on('error', reject);
+  });
+  assert.equal(rebound.status, 403);
+  assert.ok(!rebound.body.includes(adminToken()));
+});
+
 test('Security: the admin API refuses a caller without the token and changes nothing', async () => {
   const hits = [];
   const sink = http.createServer((req, res) => { hits.push(req.headers); res.writeHead(200, { 'content-type': 'application/json' }); res.end('{"data":[]}'); });
@@ -560,10 +579,6 @@ test('Security: the admin API refuses a caller without the token and changes not
     assert.equal(hits.length, 1);
     assert.ok(!JSON.stringify(hits[0]).includes('sk-secret-chat'), 'the stored key is not sent to a foreign baseURL');
 
-    for (const p of ['/', '/ui']) {
-      const page = await (await fetch(url(p))).text();
-      assert.ok(!page.includes(adminToken()), `${p} must not embed the token`);
-    }
     assert.equal((await fetch(url('/health'))).status, 200, '/health needs no token');
     assert.equal((fs.statSync(path.join(tmpDir, 'admin.token')).mode & 0o777).toString(8), '600');
   } finally {

package/tests/shim.test.mjs

@@ -19,7 +19,7 @@ const ROOT = path.resolve(__dirname, '..');
 const STATE = fs.mkdtempSync(path.join(os.tmpdir(), 'shimstate-'));
 process.env.LLM_SWITCHER_STATE_DIR = STATE;
 
-const { SHIM_DIR, SHIMMED, pathExportLine, suggestedRcFiles, shimStatus, renderShim } =
+const { SHIM_DIR, SHIMMED, pathExportLine, pathOrderHint, suggestedRcFiles, shimStatus, renderShim } =
   await import(pathToFileURL(path.join(ROOT, 'shim.mjs')).href);
 
 // The behavioural tests run the CURRENT template, rendered into a temp dir. Running the copy
@@ -226,3 +226,19 @@ test('the POSIX shims source launch files only when this account owns them', ()
     }
   }
 });
+
+// ISS-CC-LS-002: on zsh a later line in .zshrc or .zprofile can prepend npm-global or Homebrew
+// ahead of the shim. The hint names both files and says the line must come last.
+test('pathOrderHint tells a zsh user to put the export last in .zshrc and .zprofile', () => {
+  const shell = process.env.SHELL;
+  process.env.SHELL = '/bin/zsh';
+  try {
+    const text = pathOrderHint('darwin').join('\n');
+    assert.match(text, /LAST/);
+    assert.match(text, /\.zshrc/);
+    assert.match(text, /\.zprofile/);
+    assert.ok(text.includes(pathExportLine('darwin')));
+  } finally {
+    if (shell === undefined) delete process.env.SHELL; else process.env.SHELL = shell;
+  }
+});

package/ui.html

@@ -1160,18 +1160,15 @@
   <div id="toast" class="toast" role="status" aria-live="polite" aria-atomic="true"></div>
 
   <script>
-    // /api/* needs the per-install admin token. `switch ui` passes it in the URL fragment, which
-    // the browser never sends to the server; keep it here and clear the address bar. sessionStorage, not
-    // localStorage: while the gateway is off, another account can serve a page on this origin, and that
-    // page must not find the token.
+    // /api/* needs the admin token. The gateway puts it in this page; an older `switch ui` link still
+    // brings it in the URL fragment, which is cleared from the address bar.
     const ADMIN_TOKEN_KEY = 'llmSwitcherAdminToken';
     (() => {
       localStorage.removeItem(ADMIN_TOKEN_KEY);
+      const served = document.querySelector('meta[name="llm-switcher-token"]')?.content;
       const m = location.hash.match(/(?:^#|&)token=([0-9a-f]+)/);
-      if (m) {
-        sessionStorage.setItem(ADMIN_TOKEN_KEY, m[1]);
-        history.replaceState(null, '', location.pathname + location.search);
-      }
+      if (served || m) sessionStorage.setItem(ADMIN_TOKEN_KEY, served || m[1]);
+      if (m) history.replaceState(null, '', location.pathname + location.search);
     })();
 
     // A config change carries the revision this page loaded. The gateway answers 409 when another tab