llm-switcher 1.3.7 → 1.3.8

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog — LLM Switcher
 
+## Release 1.3.8
+
+- **Update now with the new code already on disk:** The update compared the version on disk, not the version of the running gateway. When the checkout or the npm install already had the new release, the update said "Already on the latest version" and did not restart. The gateway then ran the old code and showed the update notice again and again. The gateway now restarts into the newer code on disk.
+- **Windows service without a window:** The logon task started `node.exe` directly. `node.exe` is a console program, so Windows opened a terminal window for the gateway, and when you closed that window the gateway stopped. The task now starts the gateway through `conhost.exe --headless`, and no window opens. Run `switch service install` again to update an installed task.
+
 ## Release 1.3.7
 
 - **Update notice in time:** The gateway kept the npm answer for 12 hours. A release published after the last check did not show an update button until the next day. It now asks npm again after 5 minutes.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "llm-switcher",
-  "version": "1.3.7",
+  "version": "1.3.8",
   "description": "Zero-dependency multi-protocol edge gateway & provider switcher for Claude Code and Codex, with OpenAI-compatible, Anthropic and Vertex upstreams",
   "keywords": [
     "llm",

package/service.mjs

@@ -66,8 +66,11 @@ ${envBlock}  <key>StandardOutPath</key>
 // Task Scheduler reads the command and its arguments from two elements, so no path goes through
 // the quoting rules of a /TR command line. A task made with /TR also stops after 72 hours by
 // default; PT0S removes that limit.
-export function scheduledTaskXml({ nodeBin, script, port, userId, autoupdate = false }) {
-  const args = autoupdate ? `"${script}" --port ${port} --autoupdate` : `"${script}" --port ${port}`;
+// node.exe is a console program: started directly at logon it opens a terminal window, and closing that
+// window stops the gateway. conhost --headless gives it a console that nobody sees.
+export function scheduledTaskXml({ nodeBin, script, port, userId, autoupdate = false, systemRoot = process.env.SystemRoot || 'C:\\Windows' }) {
+  const conhost = path.win32.join(systemRoot, 'System32', 'conhost.exe');
+  const args = `--headless "${nodeBin}" "${script}" --port ${port}${autoupdate ? ' --autoupdate' : ''}`;
   return `<?xml version="1.0" encoding="UTF-16"?>
 <Task version="1.2" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task">
   <RegistrationInfo>
@@ -95,7 +98,7 @@ export function scheduledTaskXml({ nodeBin, script, port, userId, autoupdate = f
   </Settings>
   <Actions Context="Author">
     <Exec>
-      <Command>${xmlEscape(nodeBin)}</Command>
+      <Command>${xmlEscape(conhost)}</Command>
       <Arguments>${xmlEscape(args)}</Arguments>
     </Exec>
   </Actions>

package/tests/service.test.mjs

@@ -28,7 +28,7 @@ test('systemd unit quotes the command and carries the environment', () => {
 });
 
 const plist = () => launchdPlist({ nodeBin: '/n', script: '/a&b/proxy.mjs', port: 4001, logPath: '/l<og>', env: [['CLAUDE_CONFIG_DIR', '/x&y']] });
-const taskXml = () => scheduledTaskXml({ nodeBin: 'C:\\Program Files\\nodejs\\node.exe', script: 'C:\\Users\\A & B\\llm-switcher\\proxy.mjs', port: 4002, userId: 'PC\\a&b' });
+const taskXml = () => scheduledTaskXml({ nodeBin: 'C:\\Program Files\\nodejs\\node.exe', script: 'C:\\Users\\A & B\\llm-switcher\\proxy.mjs', port: 4002, userId: 'PC\\a&b', systemRoot: 'C:\\Windows' });
 
 test('the plist and the task XML are well-formed', { skip: !HAS_XMLLINT && 'needs xmllint' }, () => {
   execFileSync('xmllint', ['--noout', '-'], { input: plist() });
@@ -43,8 +43,10 @@ test('launchd plist escapes values and carries the environment', () => {
 
 test('Windows task XML keeps the command and its arguments apart and has no run-time limit', () => {
   const xml = taskXml();
-  assert.match(xml, /<Command>C:\\Program Files\\nodejs\\node.exe<\/Command>/);
-  assert.match(xml, /<Arguments>&quot;C:\\Users\\A &amp; B\\llm-switcher\\proxy.mjs&quot; --port 4002<\/Arguments>/);
+  // node.exe is a console program: started directly at logon it opens a terminal window, and closing
+  // that window stops the gateway. conhost --headless gives it a console that nobody sees.
+  assert.match(xml, /<Command>C:\\Windows\\System32\\conhost.exe<\/Command>/);
+  assert.match(xml, /<Arguments>--headless &quot;C:\\Program Files\\nodejs\\node.exe&quot; &quot;C:\\Users\\A &amp; B\\llm-switcher\\proxy.mjs&quot; --port 4002<\/Arguments>/);
   assert.match(xml, /<ExecutionTimeLimit>PT0S<\/ExecutionTimeLimit>/);
   assert.match(xml, /<LogonTrigger>\s*<Enabled>true<\/Enabled>\s*<UserId>PC\\a&amp;b<\/UserId>/);
   assert.equal(portFromServiceText(xml), 4002);
@@ -60,7 +62,7 @@ test('the port is read back from UTF-16 console output, as schtasks /Query /XML
 
 test('autoupdate flag is placed into task XML, systemd unit, and launchd plist', () => {
   const xml = scheduledTaskXml({ nodeBin: 'node.exe', script: 'proxy.mjs', port: 3456, userId: 'u', autoupdate: true });
-  assert.match(xml, /<Arguments>&quot;proxy\.mjs&quot; --port 3456 --autoupdate<\/Arguments>/);
+  assert.match(xml, /<Arguments>--headless &quot;node\.exe&quot; &quot;proxy\.mjs&quot; --port 3456 --autoupdate<\/Arguments>/);
   assert.equal(portFromServiceText(xml), 3456);
 
   const unit = systemdUnit({ nodeBin: '/usr/bin/node', script: '/opt/proxy.mjs', port: 3456, autoupdate: true });

package/tests/update.test.mjs

@@ -62,6 +62,14 @@ test('a checkout level with its upstream does nothing', async (t) => {
   assert.match(r.reason, /latest/i);
 });
 
+test('a gateway that runs older code than its checkout restarts into it, with nothing to pull', async (t) => {
+  const fx = fixture(t);
+  fx.release('1.0.1');
+  git(fx.install, 'pull', '-q', '--ff-only');
+  const r = await applyUpdate({ root: fx.install, running: '1.0.0' });
+  assert.deepEqual({ updated: r.updated, from: r.from, to: r.to }, { updated: true, from: '1.0.0', to: '1.0.1' });
+});
+
 test('a checkout with local edits is left alone, even when upstream moved', async (t) => {
   const fx = fixture(t);
   fx.release('1.0.1');
@@ -116,6 +124,14 @@ test('an npm install on the latest version runs no install', async (t) => {
   assert.deepEqual(calls, []);
 });
 
+test('an npm install that a running gateway has not loaded yet restarts into it, with no install', async (t) => {
+  const root = npmInstall(t, '1.0.1');
+  const calls = [];
+  const r = await applyUpdate({ root, running: '1.0.0', registryUrl: await registry(t, '1.0.1'), run: async (...a) => { calls.push(a); return ''; } });
+  assert.deepEqual({ updated: r.updated, from: r.from, to: r.to }, { updated: true, from: '1.0.0', to: '1.0.1' });
+  assert.deepEqual(calls, []);
+});
+
 test('an npm install behind the registry installs that exact version globally', async (t) => {
   const root = npmInstall(t, '1.0.0');
   const calls = [];

package/update.mjs

@@ -6,7 +6,7 @@ import path from 'node:path';
 import { promisify } from 'node:util';
 import { execFile } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
-import { isNewer } from './version.mjs';
+import { isNewer, CURRENT_VERSION } from './version.mjs';
 
 const ROOT = path.dirname(fileURLToPath(import.meta.url));
 const REGISTRY_URL = 'https://registry.npmjs.org/llm-switcher/latest';
@@ -90,9 +90,17 @@ export async function applyUpdate({
   root = ROOT,
   run = runCommand,
   logger = () => {},
-  registryUrl = process.env.LLM_SWITCHER_REGISTRY_URL || REGISTRY_URL
+  registryUrl = process.env.LLM_SWITCHER_REGISTRY_URL || REGISTRY_URL,
+  running = CURRENT_VERSION
 } = {}) {
-  return fs.existsSync(path.join(root, '.git'))
-    ? updateCheckout(root, run, logger)
-    : updateNpmInstall(root, run, logger, registryUrl);
+  const r = fs.existsSync(path.join(root, '.git'))
+    ? await updateCheckout(root, run, logger)
+    : await updateNpmInstall(root, run, logger, registryUrl);
+  // Newer code already on disk (a pull or an install outside the gateway) is an update for the
+  // running process: without the restart it keeps the old code and the old version forever.
+  const onDisk = readVersion(root);
+  if (!r.updated && isNewer(onDisk, running)) {
+    return { updated: true, from: running, to: onDisk, reason: `v${onDisk} is on disk, but the gateway ran v${running}.` };
+  }
+  return r;
 }