claude-use 2.5.3 → 2.6.0

package/dist/cli.cjs

@@ -221824,7 +221824,7 @@ var program = new Command();
 // package.json
 var package_default = {
   name: "claude-use",
-  version: "2.5.3",
+  version: "2.6.0",
   description: "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
   license: "Apache-2.0",
   author: "Joseph Mearman <joseph@mearman.co.uk>",
@@ -241675,8 +241675,10 @@ var ProviderSchema = external_exports.strictObject({
   $schema: external_exports.string().optional(),
   displayName: external_exports.string().min(1),
   baseUrl: external_exports.url(),
-  tokenEnv: external_exports.string().min(1),
+  tokenEnv: external_exports.string().min(1).optional(),
   env: external_exports.record(external_exports.string().min(1), external_exports.string()).optional()
+}).refine((provider) => provider.tokenEnv !== void 0 || (provider.env?.ANTHROPIC_AUTH_TOKEN ?? "") !== "", {
+  message: "a provider needs either tokenEnv (the name of the environment variable holding its token) or a non-empty env.ANTHROPIC_AUTH_TOKEN"
 });
 var ConfigProfileSchema = external_exports.strictObject({
   $schema: external_exports.string().optional(),
@@ -243749,6 +243751,7 @@ function resolveLayoutPaths() {
 var import_node_child_process2 = require("node:child_process");
 var import_node_crypto4 = require("node:crypto");
 var import_node_fs3 = __toESM(require("node:fs"), 1);
+var import_node_net = __toESM(require("node:net"), 1);
 var import_node_path13 = __toESM(require("node:path"), 1);
 var import_node_sea = require("node:sea");
 
@@ -243829,6 +243832,10 @@ var HeadroomStateSchema = external_exports.strictObject({
   headroomPid: external_exports.number().int().positive().optional(),
   /** The loopback port the proxy listens on. Absent until the proxy has passed its readiness check, so "port is set" is itself the ready signal a launcher polls for. */
   port: external_exports.number().int().positive().optional(),
+  /**
+   * The sticky port preference: the address the daemon last served on, kept across crashes, restarts, and idle shutdowns so the next start reuses it. Distinct from `port` on purpose: `port` is the ready signal (absent whenever nothing is serving), while `lastPort` survives every shutdown, because every live session's environment was frozen at launch pointing at this address and a restart that moves strands them.
+   */
+  lastPort: external_exports.number().int().positive().optional(),
   /** The `headroom --version` output of the running install. */
   version: external_exports.string().optional(),
   /** Hash of the allowlist the running proxy was started with, so a provider-file change is detected as drift. */
@@ -244153,6 +244160,21 @@ function spawnHeadroomSupervisor(paths) {
     import_node_fs3.default.closeSync(logFd);
   }
 }
+async function realIsPortFree(port) {
+  return await new Promise((resolve) => {
+    const server2 = import_node_net.default.createServer();
+    server2.unref();
+    server2.once("error", () => {
+      resolve(false);
+    });
+    server2.once("close", () => {
+      resolve(true);
+    });
+    server2.listen(port, "127.0.0.1", () => {
+      server2.close();
+    });
+  });
+}
 function realHeadroomPort(paths) {
   return {
     ensure: () => {
@@ -247421,7 +247443,7 @@ function registerDoctorCommand(program2, paths) {
 
 // src/headroom/commands.ts
 var import_node_fs9 = __toESM(require("node:fs"), 1);
-var import_node_net = __toESM(require("node:net"), 1);
+var import_node_net2 = __toESM(require("node:net"), 1);
 var import_node_child_process3 = require("node:child_process");
 
 // src/headroom/supervisor.ts
@@ -247523,14 +247545,18 @@ function compareVersions2(a2, b) {
 var HEADROOM_SUPERVISOR_STILL_RUNNING = -1;
 async function runSupervisor(config2, ports, options = {}) {
   const { fs: fs11, paths } = ports;
+  const previousState = readHeadroomState(fs11, paths.headroomStateFile);
+  let installedSource = previousState?.installedSource;
+  let lastPort = previousState?.lastPort;
   const fail = (message) => {
-    writeHeadroomState(fs11, paths.headroomStateFile, { lastError: message });
+    writeHeadroomState(fs11, paths.headroomStateFile, {
+      lastError: message,
+      ...lastPort === void 0 ? {} : { lastPort }
+    });
     fs11.removeRecursive(paths.headroomLockFile);
     ports.log(`claude-use headroom supervisor: ${message}`);
     return 1;
   };
-  const previousState = readHeadroomState(fs11, paths.headroomStateFile);
-  let installedSource = previousState?.installedSource;
   const ensureInstalled = () => {
     const version3 = ports.headroomVersion();
     const versionOk = version3 !== void 0 && versionSatisfies(version3, config2.source);
@@ -247550,7 +247576,7 @@ async function runSupervisor(config2, ports, options = {}) {
     return fail(`could not install headroom from ${config2.source}: install failed (is uv installed and on PATH?)`);
   }
   const version2 = ports.headroomVersion() ?? "unknown";
-  writeHeadroomState(fs11, paths.headroomStateFile, { supervisorPid: ports.ownPid, version: version2, installedSource });
+  writeHeadroomState(fs11, paths.headroomStateFile, { supervisorPid: ports.ownPid, version: version2, installedSource, ...lastPort === void 0 ? {} : { lastPort } });
   ports.log(`claude-use headroom supervisor ${String(ports.ownPid)}: managing headroom on allowlist [${allowlistOf(ports).join(", ")}]`);
   const orphanPid = previousState?.headroomPid;
   if (orphanPid !== void 0 && ports.isRunning(orphanPid)) {
@@ -247576,7 +247602,12 @@ async function runSupervisor(config2, ports, options = {}) {
         ports.log(`claude-use headroom supervisor: headroom pid ${String(headroomPid)} died`);
         headroomPid = void 0;
         runningHash = void 0;
-        writeHeadroomState(fs11, paths.headroomStateFile, { supervisorPid: ports.ownPid, version: version2, installedSource });
+        writeHeadroomState(fs11, paths.headroomStateFile, {
+          supervisorPid: ports.ownPid,
+          version: version2,
+          installedSource,
+          ...lastPort === void 0 ? {} : { lastPort }
+        });
       }
       if (consecutiveFailures >= HEADROOM_START_RETRY_BUDGET) {
         return fail(`headroom failed to become ready ${String(consecutiveFailures)} times in a row; giving up`);
@@ -247584,17 +247615,25 @@ async function runSupervisor(config2, ports, options = {}) {
       if (installedSource !== config2.source && !ensureInstalled()) {
         return fail(`could not install headroom from ${config2.source}: install failed (is uv installed and on PATH?)`);
       }
-      const port = await ports.freePort();
+      const previousSticky = lastPort;
+      const port = lastPort !== void 0 && await ports.isPortFree(lastPort) ? lastPort : await ports.freePort();
       const pid = ports.spawnHeadroom(port, allowlist);
       const ready = await waitUntilReady(ports, port);
       if (ready) {
         consecutiveFailures = 0;
         headroomPid = pid;
         runningHash = allowlistHash;
+        lastPort = port;
+        if (previousSticky !== void 0 && port !== previousSticky) {
+          ports.log(
+            `claude-use headroom supervisor: sticky port ${String(previousSticky)} was occupied; moving to ${String(port)} (sessions launched against the old port are stale until they relaunch)`
+          );
+        }
         writeHeadroomState(fs11, paths.headroomStateFile, {
           supervisorPid: ports.ownPid,
           headroomPid: pid,
           port,
+          lastPort: port,
           version: version2,
           allowlistHash,
           installedSource: config2.source
@@ -247630,7 +247669,10 @@ async function runSupervisor(config2, ports, options = {}) {
             `claude-use headroom supervisor: no sessions for ${String(config2.idleShutdownMinutes)} minute(s); stopping headroom and exiting`
           );
           ports.stopProcess(headroomPid);
-          writeHeadroomState(fs11, paths.headroomStateFile, { version: version2 });
+          writeHeadroomState(fs11, paths.headroomStateFile, {
+            version: version2,
+            ...lastPort === void 0 ? {} : { lastPort }
+          });
           return 0;
         }
       } else {
@@ -247706,7 +247748,7 @@ function formatHeadroomStatus(status) {
 }
 async function realFreePort() {
   return await new Promise((resolve, reject) => {
-    const server2 = import_node_net.default.createServer();
+    const server2 = import_node_net2.default.createServer();
     server2.unref();
     server2.on("error", reject);
     server2.listen(0, "127.0.0.1", () => {
@@ -247742,6 +247784,7 @@ function realSupervisorPorts(paths) {
     },
     isRunning: headroomPidRunning,
     freePort: realFreePort,
+    isPortFree: realIsPortFree,
     spawnHeadroom: (port, allowlist) => {
       import_node_fs9.default.mkdirSync(paths.logsDir, { recursive: true });
       const logFd = import_node_fs9.default.openSync(paths.headroomLogPath, "a");
@@ -247937,7 +247980,7 @@ function addProvider(paths, name, input2) {
   const parsed = ProviderSchema.safeParse({
     displayName: input2.displayName,
     baseUrl: input2.baseUrl,
-    tokenEnv: input2.tokenEnv,
+    ...input2.tokenEnv === void 0 ? {} : { tokenEnv: input2.tokenEnv },
     ...input2.env === void 0 || Object.keys(input2.env).length === 0 ? {} : { env: input2.env }
   });
   if (!parsed.success) {
@@ -247976,12 +248019,12 @@ function resolveProvider(params) {
       message: `claude-use: no provider named "${name}". ` + (known.length > 0 ? `Known providers: ${known.join(", ")}.` : "No providers are defined yet; run `claude-use provider add`.")
     };
   }
-  const token = params.env[definition.tokenEnv];
+  const token = definition.tokenEnv !== void 0 ? params.env[definition.tokenEnv] : definition.env?.ANTHROPIC_AUTH_TOKEN;
   if (token === void 0 || token === "") {
     return {
       ok: false,
       status: PROVIDER_MISSING_TOKEN_EXIT,
-      message: `claude-use: provider ${name} needs ${definition.tokenEnv} set in your environment`
+      message: definition.tokenEnv !== void 0 ? `claude-use: provider ${name} needs ${definition.tokenEnv} set in your environment` : `claude-use: provider ${name} has no usable credential: its env.ANTHROPIC_AUTH_TOKEN is empty`
     };
   }
   return { ok: true, provider: { name, definition, token } };
@@ -248000,14 +248043,16 @@ function collectEnvPairs(value, previous = {}) {
 }
 function registerProviderCommand(program2, paths) {
   const provider = program2.command("provider").description("Manage API providers the launcher can route a session through.");
-  provider.command("add <name>").description("Create a new API provider definition.").requiredOption("--display-name <name>", "Human-readable name, exported to the child as CLAUDE_USE_PROVIDER.").requiredOption("--base-url <url>", "Anthropic-compatible base URL the child's requests are sent to.").requiredOption("--token-env <var>", "NAME of the environment variable holding the provider's token (never the token itself).").option("--env <pair>", "Extra KEY=VALUE environment entry for the child (repeatable).", collectEnvPairs).action((name, options) => {
+  provider.command("add <name>").description("Create a new API provider definition.").requiredOption("--display-name <name>", "Human-readable name, exported to the child as CLAUDE_USE_PROVIDER.").requiredOption("--base-url <url>", "Anthropic-compatible base URL the child's requests are sent to.").option("--token-env <var>", "NAME of the environment variable holding the provider's token (never the token itself). Optional only when --env carries ANTHROPIC_AUTH_TOKEN (a local proxy's fixed dummy token).").option("--env <pair>", "Extra KEY=VALUE environment entry for the child (repeatable).", collectEnvPairs).action((name, options) => {
     addProvider(paths, name, {
       displayName: options.displayName,
       baseUrl: options.baseUrl,
-      tokenEnv: options.tokenEnv,
+      ...options.tokenEnv === void 0 ? {} : { tokenEnv: options.tokenEnv },
       ...options.env === void 0 ? {} : { env: options.env }
     });
-    console.log(`Created provider "${name}" (${options.baseUrl}, token from ${options.tokenEnv}).`);
+    console.log(
+      options.tokenEnv === void 0 ? `Created provider "${name}" (${options.baseUrl}, fixed env credential).` : `Created provider "${name}" (${options.baseUrl}, token from ${options.tokenEnv}).`
+    );
   });
   provider.command("list").description("List every API provider.").action(() => {
     const entries = listProviders(paths);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-use",
-  "version": "2.5.3",
+  "version": "2.6.0",
   "description": "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
   "license": "Apache-2.0",
   "author": "Joseph Mearman <joseph@mearman.co.uk>",