@linzumi/cli 0.0.56-beta → 0.0.57-beta

package/README.md

@@ -62,7 +62,7 @@ Install the CLI or run it with `npx`:
 ```bash
 npm install -g @linzumi/cli@latest
 npx -y @linzumi/cli@latest signup
-npx -y @linzumi/cli@0.0.56-beta --version
+npx -y @linzumi/cli@0.0.57-beta --version
 linzumi --version
 ```
 

package/dist/index.js

@@ -11028,7 +11028,6 @@ var require_lib3 = __commonJS({
 });
 
 // src/index.ts
-import { randomUUID as randomUUID5 } from "node:crypto";
 import { existsSync as existsSync12, readFileSync as readFileSync13, realpathSync as realpathSync6 } from "node:fs";
 import { homedir as homedir10 } from "node:os";
 import { resolve as resolve10 } from "node:path";
@@ -20800,6 +20799,37 @@ function ensureLocalMachineIdForLinzumiUrl(linzumiUrl, path2 = localConfigPath()
   writeLocalConfigSection({ ...latestConfig, machineId }, path2, linzumiUrl);
   return machineId;
 }
+function ensureLocalRunnerIdForLinzumiUrl(linzumiUrl, path2 = localConfigPath(), createRunnerId = defaultLocalRunnerId) {
+  if (localConfigScopeKey(linzumiUrl) === prodConfigScope) {
+    return ensureLocalRunnerId(path2, createRunnerId);
+  }
+  const config = readLocalConfigForLinzumiUrl(linzumiUrl, path2);
+  if (config.runnerId !== void 0) {
+    return config.runnerId;
+  }
+  const runnerId = ensureLocalRunnerIdSeed(path2, createRunnerId, linzumiUrl);
+  const latestConfig = readLocalConfigForLinzumiUrl(linzumiUrl, path2);
+  const latestRunnerId = latestConfig.runnerId;
+  if (latestRunnerId !== void 0) {
+    return latestRunnerId;
+  }
+  writeLocalConfigSection({ ...latestConfig, runnerId }, path2, linzumiUrl);
+  return runnerId;
+}
+function ensureLocalRunnerId(path2 = localConfigPath(), createRunnerId = defaultLocalRunnerId) {
+  const config = readLocalConfig(path2);
+  if (config.runnerId !== void 0) {
+    return config.runnerId;
+  }
+  const runnerId = ensureLocalRunnerIdSeed(path2, createRunnerId);
+  const latestConfig = readLocalConfig(path2);
+  const latestRunnerId = latestConfig.runnerId;
+  if (latestRunnerId !== void 0) {
+    return latestRunnerId;
+  }
+  writeLocalConfig({ ...latestConfig, runnerId }, path2);
+  return runnerId;
+}
 function localMachineIdSeedPath(configPath = localConfigPath(), linzumiUrl) {
   if (linzumiUrl !== void 0 && localConfigScopeKey(linzumiUrl) !== prodConfigScope) {
     return join6(
@@ -20809,6 +20839,15 @@ function localMachineIdSeedPath(configPath = localConfigPath(), linzumiUrl) {
   }
   return join6(dirname4(configPath), `${basename4(configPath)}.machine-id`);
 }
+function localRunnerIdSeedPath(configPath = localConfigPath(), linzumiUrl) {
+  if (linzumiUrl !== void 0 && localConfigScopeKey(linzumiUrl) !== prodConfigScope) {
+    return join6(
+      dirname4(configPath),
+      `${basename4(configPath)}.${localConfigScopeFileStem(linzumiUrl)}.runner-id`
+    );
+  }
+  return join6(dirname4(configPath), `${basename4(configPath)}.runner-id`);
+}
 function readConfiguredAllowedCwdDetailsForLinzumiUrl(linzumiUrl, path2 = localConfigPath()) {
   return readConfiguredAllowedCwdDetailsFromConfig(
     readLocalConfigForLinzumiUrl(linzumiUrl, path2)
@@ -20971,7 +21010,12 @@ function readLocalConfigSection(path2, linzumiUrl) {
     throw new Error(`invalid Linzumi config section ${scopeKey}: ${path2}`);
   }
   const allowedCwds = uniqueStrings(section.allowedCwds);
-  return section.machineId === void 0 ? { version: 1, allowedCwds } : { version: 1, machineId: section.machineId, allowedCwds };
+  return {
+    version: 1,
+    ...section.machineId === void 0 ? {} : { machineId: section.machineId },
+    ...section.runnerId === void 0 ? {} : { runnerId: section.runnerId },
+    allowedCwds
+  };
 }
 function writeLocalConfigSection(config, path2, linzumiUrl) {
   const scopeKey = linzumiUrl === void 0 ? prodConfigScope : localConfigScopeKey(linzumiUrl);
@@ -20988,7 +21032,7 @@ function isConfigPayload(value) {
   return typeof value === "object" && value !== null && value.version === 1 && isConfigSection(value);
 }
 function isConfigSection(value) {
-  return typeof value === "object" && value !== null && Array.isArray(value.allowedCwds) && machineIdValid(value.machineId) && value.allowedCwds.every(
+  return typeof value === "object" && value !== null && Array.isArray(value.allowedCwds) && machineIdValid(value.machineId) && runnerIdValid(value.runnerId) && value.allowedCwds.every(
     (cwd) => typeof cwd === "string" && cwd.trim() !== ""
   );
 }
@@ -21030,7 +21074,11 @@ function normalizedConfigSection(config) {
     throw new Error("invalid Linzumi config");
   }
   const allowedCwds = uniqueStrings(config.allowedCwds);
-  return config.machineId === void 0 ? { allowedCwds } : { machineId: config.machineId, allowedCwds };
+  return {
+    ...config.machineId === void 0 ? {} : { machineId: config.machineId },
+    ...config.runnerId === void 0 ? {} : { runnerId: config.runnerId },
+    allowedCwds
+  };
 }
 function emptySection() {
   return { allowedCwds: [] };
@@ -21040,6 +21088,9 @@ function machineIdValid(value) {
     value
   );
 }
+function runnerIdValid(value) {
+  return value === void 0 || typeof value === "string" && /^[a-zA-Z0-9_.-]+$/.test(value);
+}
 function ensureLocalMachineIdSeed(configPath, createMachineId, linzumiUrl) {
   const seedPath = localMachineIdSeedPath(configPath, linzumiUrl);
   if (existsSync4(seedPath)) {
@@ -21068,6 +21119,34 @@ function ensureLocalMachineIdSeed(configPath, createMachineId, linzumiUrl) {
     unlinkSync(tempPath);
   }
 }
+function ensureLocalRunnerIdSeed(configPath, createRunnerId, linzumiUrl) {
+  const seedPath = localRunnerIdSeedPath(configPath, linzumiUrl);
+  if (existsSync4(seedPath)) {
+    return readRunnerIdSeed(seedPath);
+  }
+  const runnerId = createRunnerId();
+  if (!runnerIdValid(runnerId)) {
+    throw new Error(`invalid generated Linzumi runner id: ${runnerId}`);
+  }
+  mkdirSync5(dirname4(seedPath), { recursive: true });
+  const tempPath = join6(
+    dirname4(seedPath),
+    `.${basename4(seedPath)}.${process.pid}.${randomUUID2()}.tmp`
+  );
+  writeFileSync4(tempPath, `${runnerId}
+`, { encoding: "utf8", flag: "wx" });
+  try {
+    linkSync(tempPath, seedPath);
+    return runnerId;
+  } catch (error) {
+    if (isNodeErrorCode(error, "EEXIST")) {
+      return readRunnerIdSeed(seedPath);
+    }
+    throw error;
+  } finally {
+    unlinkSync(tempPath);
+  }
+}
 function readMachineIdSeed(seedPath) {
   const machineId = readFileSync4(seedPath, "utf8").trim();
   if (!machineIdValid(machineId)) {
@@ -21075,6 +21154,16 @@ function readMachineIdSeed(seedPath) {
   }
   return machineId;
 }
+function readRunnerIdSeed(seedPath) {
+  const runnerId = readFileSync4(seedPath, "utf8").trim();
+  if (!runnerIdValid(runnerId)) {
+    throw new Error(`invalid Linzumi runner id seed: ${seedPath}`);
+  }
+  return runnerId;
+}
+function defaultLocalRunnerId() {
+  return `runner-${randomUUID2()}`;
+}
 function uniqueStrings(values) {
   return [
     ...new Set(
@@ -21097,7 +21186,7 @@ function realpathOrResolved(pathValue) {
 }
 
 // src/version.ts
-var linzumiCliVersion = "0.0.56-beta";
+var linzumiCliVersion = "0.0.57-beta";
 var linzumiCliVersionText = `linzumi ${linzumiCliVersion}`;
 
 // src/runnerLock.ts
@@ -28104,7 +28193,7 @@ async function launchSignupCommanderForCompletedSignup(commanderLauncher, args)
   } catch (error) {
     return {
       status: "failed",
-      runnerId: signupCommanderRunnerId(args.workspaceSlug),
+      runnerId: signupCommanderRunnerId(args.serviceUrl),
       restartCommand: signupConnectRestartCommand(args),
       error: error instanceof Error ? error.message : String(error)
     };
@@ -28713,7 +28802,7 @@ async function defaultSignupCommanderLauncher(args) {
     accessToken: args.localRunnerAccessToken,
     expiresInSeconds: args.localRunnerExpiresInSeconds
   });
-  const runnerId = signupCommanderRunnerId(args.workspaceSlug);
+  const runnerId = signupCommanderRunnerId(args.serviceUrl);
   const restartCommand = signupConnectRestartCommand(args);
   try {
     const handle = await runLocalCodexRunner(
@@ -28736,13 +28825,13 @@ async function defaultSignupCommanderLauncher(args) {
     };
   }
 }
-function signupCommanderRunnerId(workspaceSlug) {
-  return `signup-${workspaceSlug}-commander`;
+function signupCommanderRunnerId(serviceUrl) {
+  return ensureLocalRunnerIdForLinzumiUrl(serviceUrl);
 }
 function failedSignupCommanderLaunchForMissingCodex(args) {
   return {
     status: "failed",
-    runnerId: signupCommanderRunnerId(args.workspaceSlug),
+    runnerId: "commander-not-started",
     restartCommand: signupConnectRestartCommand(args),
     error: "Codex preflight did not resolve a verified Codex command. Install Codex or fix the Codex CLI on PATH, then rerun signup."
   };
@@ -30572,8 +30661,6 @@ function startCommanderDaemon(options) {
     "commander",
     ...options.cwd === void 0 ? [] : [options.cwd],
     ...options.args,
-    "--runner-id",
-    options.runnerId,
     "--log-file",
     logFile
   ];
@@ -30823,7 +30910,6 @@ var flagDefinitions = /* @__PURE__ */ new Map([
   ["api-url", { kind: "value" }],
   ["linzumi-url", { kind: "value" }],
   ["token", { kind: "value" }],
-  ["runner-id", { kind: "value" }],
   ["cwd", { kind: "value" }],
   ["codex-bin", { kind: "value" }],
   ["codex-url", { kind: "value" }],
@@ -31149,7 +31235,8 @@ async function runCommanderDaemonCommand(args) {
         process.stdout.write(commanderDaemonHelpText());
         return;
       }
-      const runnerId = required(values, "runner-id");
+      const kandanUrl = kandanUrlValue(values) ?? defaultLinzumiWebSocketUrl;
+      const runnerId = ensureLocalRunnerIdForLinzumiUrl(kandanUrl);
       const cwd = cwdArg === void 0 || cwdArg.trim() === "" ? void 0 : resolveUserPath(cwdArg);
       const record = startCommanderDaemon({
         runnerId,
@@ -31173,7 +31260,8 @@ async function runCommanderDaemonCommand(args) {
     }
     case "status": {
       const values = strictFlagValues(rest);
-      const runnerId = required(values, "runner-id");
+      const kandanUrl = kandanUrlValue(values) ?? defaultLinzumiWebSocketUrl;
+      const runnerId = ensureLocalRunnerIdForLinzumiUrl(kandanUrl);
       const status = commanderDaemonStatus(
         runnerId,
         stringValue4(values, "status-dir")
@@ -31184,7 +31272,8 @@ async function runCommanderDaemonCommand(args) {
     }
     case "wait": {
       const values = strictFlagValues(rest);
-      const runnerId = required(values, "runner-id");
+      const kandanUrl = kandanUrlValue(values) ?? defaultLinzumiWebSocketUrl;
+      const runnerId = ensureLocalRunnerIdForLinzumiUrl(kandanUrl);
       const timeoutMs = positiveIntegerValue2(values, "timeout-ms") ?? 3e4;
       const result = await waitForCommanderDaemon({
         runnerId,
@@ -31203,7 +31292,8 @@ async function runCommanderDaemonCommand(args) {
     }
     case "stop": {
       const values = strictFlagValues(rest);
-      const runnerId = required(values, "runner-id");
+      const kandanUrl = kandanUrlValue(values) ?? defaultLinzumiWebSocketUrl;
+      const runnerId = ensureLocalRunnerIdForLinzumiUrl(kandanUrl);
       const status = stopCommanderDaemon(
         runnerId,
         stringValue4(values, "status-dir")
@@ -31249,7 +31339,8 @@ async function parseStartRunnerArgs(args, deps = {
   fetchStartTarget: fetchLocalRunnerStartTarget,
   validateToken: validateLocalRunnerToken,
   buildDependencyStatus: buildRunnerDependencyStatus,
-  resolveEditorRuntime
+  resolveEditorRuntime,
+  ensureRunnerId: ensureLocalRunnerIdForLinzumiUrl
 }) {
   const { cwdArg, flagArgs } = splitStartArgs(args);
   const values = strictFlagValues(flagArgs);
@@ -31321,7 +31412,9 @@ async function parseStartRunnerArgs(args, deps = {
   return {
     kandanUrl,
     token: targetToken,
-    runnerId: stringValue4(values, "runner-id") ?? `runner-${randomUUID5()}`,
+    runnerId: (deps.ensureRunnerId ?? ensureLocalRunnerIdForLinzumiUrl)(
+      kandanUrl
+    ),
     workspaceSlug: target.workspaceSlug,
     cwd,
     codexBin,
@@ -31358,7 +31451,8 @@ async function parseStartRunnerArgs(args, deps = {
 async function parseAgentRunnerArgs(args, deps = {
   readTextFile: readAgentTokenTextFile,
   buildDependencyStatus: buildRunnerDependencyStatus,
-  resolveEditorRuntime
+  resolveEditorRuntime,
+  ensureRunnerId: ensureLocalRunnerIdForLinzumiUrl
 }) {
   const { cwdArg, flagArgs } = splitStartArgs(args);
   const values = strictFlagValues(flagArgs);
@@ -31423,7 +31517,9 @@ async function parseAgentRunnerArgs(args, deps = {
   return {
     kandanUrl,
     token: tokenFile.commanderToken,
-    runnerId: stringValue4(values, "runner-id") ?? `agent-runner-${randomUUID5()}`,
+    runnerId: (deps.ensureRunnerId ?? ensureLocalRunnerIdForLinzumiUrl)(
+      kandanUrl
+    ),
     workspaceSlug: tokenFile.workspaceId,
     cwd,
     codexBin,
@@ -31523,7 +31619,8 @@ async function resolveStartTargetToken(args) {
 async function parseRunnerArgs(args, deps = {
   resolveToken: resolveLocalRunnerToken,
   buildDependencyStatus: buildRunnerDependencyStatus,
-  resolveEditorRuntime
+  resolveEditorRuntime,
+  ensureRunnerId: ensureLocalRunnerIdForLinzumiUrl
 }) {
   const values = strictFlagValues(args);
   if (values.get("help") === true) {
@@ -31575,7 +31672,9 @@ async function parseRunnerArgs(args, deps = {
   return {
     kandanUrl,
     token,
-    runnerId: stringValue4(values, "runner-id") ?? `runner-${randomUUID5()}`,
+    runnerId: (deps.ensureRunnerId ?? ensureLocalRunnerIdForLinzumiUrl)(
+      kandanUrl
+    ),
     cwd,
     codexBin,
     codexUrl: stringValue4(values, "codex-url"),
@@ -31693,7 +31792,7 @@ function stripDaemonSupervisorFlags(args) {
     }
     const key = arg.startsWith("--") ? arg.slice(2) : void 0;
     const definition = key === void 0 ? void 0 : flagDefinitions.get(key);
-    if (key === "runner-id" || key === "log-file" || key === "status-dir") {
+    if (key === "log-file" || key === "status-dir") {
       if (definition?.kind === "value") {
         index += 1;
       }
@@ -31834,8 +31933,8 @@ Usage:
   linzumi done <thread_id> --message <message>
   linzumi init-hello-linzumi-demo-app
   linzumi codex start-new --title <title> --runner <runner_id> --cwd <path> --work-description <text>
-  linzumi commander daemon --runner-id <id>
-  linzumi commander wait --runner-id <id>
+  linzumi commander daemon
+  linzumi commander wait
   linzumi commander <folder> [options]
   linzumi start <folder> [options]
   linzumi paths list|add|remove [path]
@@ -31879,7 +31978,7 @@ Examples:
     linzumi done thr_abc123 --message "Done: https://github.com/example/repo/pull/1"
     linzumi init-hello-linzumi-demo-app
     linzumi paths add ~/code/my-app
-    linzumi commander daemon --runner-id launch-commander
+    linzumi commander daemon
     linzumi start ~/
     linzumi start ~/code/my-app
     linzumi connect --workspace <your-workspace> --launch-tui
@@ -31930,11 +32029,11 @@ function commanderDaemonHelpText() {
   return `Linzumi Commander daemon
 
 Usage:
-  linzumi commander daemon --runner-id <id> [options]
-  linzumi commander daemon <folder> --runner-id <id> [options]
-  linzumi commander status --runner-id <id>
-  linzumi commander wait --runner-id <id> [--timeout-ms <ms>]
-  linzumi commander stop --runner-id <id>
+  linzumi commander daemon [options]
+  linzumi commander daemon <folder> [options]
+  linzumi commander status [options]
+  linzumi commander wait [--timeout-ms <ms>] [options]
+  linzumi commander stop [options]
 
 What it does:
   Starts the workspace Commander as a detached process, writes a status file,
@@ -31944,7 +32043,7 @@ What it does:
   configured folder.
 
 Options:
-  --runner-id <id>            Stable Commander id, required
+  --api-url <url>             Linzumi API URL used to select the stored scoped runner id
   --status-dir <path>         Status directory, default ~/.linzumi/commanders
   --log-file <path>           Commander log path, default in the status dir
   --timeout-ms <ms>           Wait timeout, default 30000
@@ -32007,9 +32106,9 @@ Usage:
   linzumi commander <folder> [options]
   linzumi commander daemon [options]
   linzumi commander daemon <folder> [options]
-  linzumi commander status --runner-id <id>
-  linzumi commander wait --runner-id <id>
-  linzumi commander stop --runner-id <id>
+  linzumi commander status [options]
+  linzumi commander wait [options]
+  linzumi commander stop [options]
   linzumi agent runner <folder> [options]
 
 What it does:
@@ -32022,7 +32121,6 @@ What it does:
 Options:
   --agent-token-file <path>   Agent token cache, default ~/.linzumi/agent-token.json
   --api-url <url>             Linzumi API URL. Defaults deterministically from the stored apiUrl.
-  --runner-id <id>            Stable Commander id
   --codex-bin <path>          Codex executable, default codex
   --code-server-bin <path>    Custom development code-server executable. By default Linzumi installs the approved editor runtime.
   --listen-user <user>        Human whose replies Codex may accept, default owner from claim
@@ -32036,8 +32134,8 @@ Options:
 
 Examples:
   linzumi paths add "$PWD"
-  linzumi commander daemon --runner-id hello-world-commander
-  linzumi commander ~/code/my-app --api-url http://127.0.0.1:4162 --runner-id local-qa-commander
+  linzumi commander daemon
+  linzumi commander ~/code/my-app --api-url http://127.0.0.1:4162
 `;
 }
 function connectGuideText() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@linzumi/cli",
-  "version": "0.0.56-beta",
+  "version": "0.0.57-beta",
   "description": "Linzumi CLI — point a Codex agent at the real code on your laptop, with your team watching and steering from shared threads.",
   "type": "module",
   "bin": {