@dotobokuri/fleet-cli 1.13.0 → 1.15.0

package/dist/index.js

@@ -24805,7 +24805,7 @@ async function validateAuthKeyForCli(cli, apiKey) {
   };
 }
 
-// ../../packages/fleet-infra/dist/chunk-EXVG4MVC.js
+// ../../packages/fleet-infra/dist/chunk-2AS5XT5Z.js
 init_chunk_UH3Q34DS();
 
 // ../../packages/fleet-infra/dist/chunk-24PI6O5Z.js
@@ -24895,13 +24895,15 @@ function ensureSafeDirectoryIfSensitive(dir, sensitivity) {
   }
 }
 
-// ../../packages/fleet-infra/dist/chunk-EXVG4MVC.js
+// ../../packages/fleet-infra/dist/chunk-2AS5XT5Z.js
 import * as path7 from "path";
 var GLOBAL_OPTIONS_VERSION = 1;
 var GLOBAL_OPTIONS_FILE_NAME = "settings.json";
 var LOCK_DIR_NAME = "settings.json.lock";
 var LOCK_OWNER_FILE_NAME = "owner";
 var TEMP_FILE_PREFIX = `.tmp-${GLOBAL_OPTIONS_FILE_NAME}-`;
+var MIN_CONSOLE_STATIC_PORT = 1024;
+var MAX_CONSOLE_STATIC_PORT = 65535;
 function createGlobalOptionsStore(deps = {}) {
   const dataDir = deps.dataDir ?? getFleetDataDir();
   const optionsPath = path7.join(dataDir, GLOBAL_OPTIONS_FILE_NAME);
@@ -24939,15 +24941,20 @@ function sanitizeGlobalOptionsData(value) {
   const data = {
     version: GLOBAL_OPTIONS_VERSION,
     ...typeof value.replaceSystemPrompt === "boolean" ? { replaceSystemPrompt: value.replaceSystemPrompt } : {},
-    ...typeof value.enableMetaphor === "boolean" ? { enableMetaphor: value.enableMetaphor } : {}
+    ...typeof value.enableMetaphor === "boolean" ? { enableMetaphor: value.enableMetaphor } : {},
+    ...value.consolePortMode === "dynamic" || value.consolePortMode === "static" ? { consolePortMode: value.consolePortMode } : {},
+    ...isValidConsoleStaticPort(value.consoleStaticPort) ? { consoleStaticPort: value.consoleStaticPort } : {}
   };
-  const allowedKeys = /* @__PURE__ */ new Set(["version", "replaceSystemPrompt", "enableMetaphor"]);
-  const changed = Object.keys(value).some((key) => !allowedKeys.has(key)) || "replaceSystemPrompt" in value && typeof value.replaceSystemPrompt !== "boolean" || "enableMetaphor" in value && typeof value.enableMetaphor !== "boolean";
+  const allowedKeys = /* @__PURE__ */ new Set(["version", "replaceSystemPrompt", "enableMetaphor", "consolePortMode", "consoleStaticPort"]);
+  const changed = Object.keys(value).some((key) => !allowedKeys.has(key)) || "replaceSystemPrompt" in value && typeof value.replaceSystemPrompt !== "boolean" || "enableMetaphor" in value && typeof value.enableMetaphor !== "boolean" || "consolePortMode" in value && value.consolePortMode !== "dynamic" && value.consolePortMode !== "static" || "consoleStaticPort" in value && !isValidConsoleStaticPort(value.consoleStaticPort);
   return { data, changed };
 }
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function isValidConsoleStaticPort(value) {
+  return typeof value === "number" && Number.isInteger(value) && value >= MIN_CONSOLE_STATIC_PORT && value <= MAX_CONSOLE_STATIC_PORT;
+}
 function createGlobalOptionsService(deps = {}) {
   const store3 = deps.store ?? createGlobalOptionsStore({ dataDir: deps.dataDir });
   return {
@@ -61320,6 +61327,8 @@ var GLOBAL_OPTIONS_FILE_NAME2 = "settings.json";
 var LOCK_DIR_NAME2 = "settings.json.lock";
 var LOCK_OWNER_FILE_NAME2 = "owner";
 var TEMP_FILE_PREFIX2 = `.tmp-${GLOBAL_OPTIONS_FILE_NAME2}-`;
+var MIN_CONSOLE_STATIC_PORT2 = 1024;
+var MAX_CONSOLE_STATIC_PORT2 = 65535;
 function createGlobalOptionsStore2(deps = {}) {
   const dataDir = deps.dataDir ?? getFleetDataDir2();
   const optionsPath = path92.join(dataDir, GLOBAL_OPTIONS_FILE_NAME2);
@@ -61357,15 +61366,20 @@ function sanitizeGlobalOptionsData2(value) {
   const data = {
     version: GLOBAL_OPTIONS_VERSION2,
     ...typeof value.replaceSystemPrompt === "boolean" ? { replaceSystemPrompt: value.replaceSystemPrompt } : {},
-    ...typeof value.enableMetaphor === "boolean" ? { enableMetaphor: value.enableMetaphor } : {}
+    ...typeof value.enableMetaphor === "boolean" ? { enableMetaphor: value.enableMetaphor } : {},
+    ...value.consolePortMode === "dynamic" || value.consolePortMode === "static" ? { consolePortMode: value.consolePortMode } : {},
+    ...isValidConsoleStaticPort2(value.consoleStaticPort) ? { consoleStaticPort: value.consoleStaticPort } : {}
   };
-  const allowedKeys = /* @__PURE__ */ new Set(["version", "replaceSystemPrompt", "enableMetaphor"]);
-  const changed = Object.keys(value).some((key) => !allowedKeys.has(key)) || "replaceSystemPrompt" in value && typeof value.replaceSystemPrompt !== "boolean" || "enableMetaphor" in value && typeof value.enableMetaphor !== "boolean";
+  const allowedKeys = /* @__PURE__ */ new Set(["version", "replaceSystemPrompt", "enableMetaphor", "consolePortMode", "consoleStaticPort"]);
+  const changed = Object.keys(value).some((key) => !allowedKeys.has(key)) || "replaceSystemPrompt" in value && typeof value.replaceSystemPrompt !== "boolean" || "enableMetaphor" in value && typeof value.enableMetaphor !== "boolean" || "consolePortMode" in value && value.consolePortMode !== "dynamic" && value.consolePortMode !== "static" || "consoleStaticPort" in value && !isValidConsoleStaticPort2(value.consoleStaticPort);
   return { data, changed };
 }
 function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function isValidConsoleStaticPort2(value) {
+  return typeof value === "number" && Number.isInteger(value) && value >= MIN_CONSOLE_STATIC_PORT2 && value <= MAX_CONSOLE_STATIC_PORT2;
+}
 function createGlobalOptionsService2(deps = {}) {
   const store22 = deps.store ?? createGlobalOptionsStore2({ dataDir: deps.dataDir });
   return {
@@ -79864,6 +79878,8 @@ function requireCarrierConfig(registry32, carrierId) {
   if (!config22) throw new Error(`Carrier not found: ${carrierId}`);
   return config22;
 }
+var MIN_CONSOLE_STATIC_PORT22 = 1024;
+var MAX_CONSOLE_STATIC_PORT22 = 65535;
 var GLOBAL_SETTINGS_API_CATALOG = [
   {
     method: "GET",
@@ -79927,10 +79943,20 @@ async function mutateGlobalSettings(req, res, deps) {
     deps.writeJson(res, 400, { error: "invalid_enable_metaphor" });
     return;
   }
+  if (body.consolePortMode !== void 0 && body.consolePortMode !== "dynamic" && body.consolePortMode !== "static") {
+    deps.writeJson(res, 400, { error: "invalid_console_port_mode" });
+    return;
+  }
+  if (body.consoleStaticPort !== void 0 && body.consoleStaticPort !== null && !isValidConsoleStaticPort22(body.consoleStaticPort)) {
+    deps.writeJson(res, 400, { error: "invalid_console_static_port" });
+    return;
+  }
   const updated = deps.globalOptionsService.update((current) => ({
     ...current,
     ...typeof body.replaceSystemPrompt === "boolean" ? { replaceSystemPrompt: body.replaceSystemPrompt } : {},
-    ...typeof body.enableMetaphor === "boolean" ? { enableMetaphor: body.enableMetaphor } : {}
+    ...typeof body.enableMetaphor === "boolean" ? { enableMetaphor: body.enableMetaphor } : {},
+    ...body.consolePortMode === "dynamic" || body.consolePortMode === "static" ? { consolePortMode: body.consolePortMode } : {},
+    ...isValidConsoleStaticPort22(body.consoleStaticPort) ? { consoleStaticPort: body.consoleStaticPort } : {}
   }));
   const response = { state: toGlobalSettingsState(updated) };
   deps.writeJson(res, 200, response);
@@ -79938,13 +79964,18 @@ async function mutateGlobalSettings(req, res, deps) {
 function toGlobalSettingsState(data) {
   return {
     replaceSystemPrompt: data.replaceSystemPrompt ?? false,
-    enableMetaphor: data.enableMetaphor ?? false
+    enableMetaphor: data.enableMetaphor ?? false,
+    consolePortMode: data.consolePortMode ?? "dynamic",
+    consoleStaticPort: data.consoleStaticPort ?? null
   };
 }
 function isJsonRequest2(req) {
   const contentType = req.headers["content-type"];
   return typeof contentType === "string" && contentType.toLowerCase().split(";")[0]?.trim() === "application/json";
 }
+function isValidConsoleStaticPort22(value) {
+  return typeof value === "number" && Number.isInteger(value) && value >= MIN_CONSOLE_STATIC_PORT22 && value <= MAX_CONSOLE_STATIC_PORT22;
+}
 var MODEL_AUTH_PROVIDERS = [
   { cli: "claude-kimi", displayName: "Moonshot Kimi" },
   { cli: "claude-glm", displayName: "ZhipuAI GLM" }
@@ -83702,6 +83733,8 @@ function createConsoleUpdateCheckService(deps = {}) {
 }
 var DEFAULT_HOST22 = "127.0.0.1";
 var DEFAULT_PORT22 = 0;
+var MIN_CONSOLE_STATIC_PORT3 = 1024;
+var MAX_CONSOLE_STATIC_PORT3 = 65535;
 var SHELL_TERMINAL_SESSION_ID = "shell";
 var THEATER_SHELL_SESSION_PREFIX2 = "shell:";
 var SERVER_TIMEOUT_MS = 30 * 60 * 1e3;
@@ -83872,7 +83905,7 @@ var SERVER_API_CATALOG = [
 ];
 function createConsoleServer(deps = {}) {
   const host = deps.host ?? DEFAULT_HOST22;
-  const port = deps.port ?? DEFAULT_PORT22;
+  const injectedPort = deps.port ?? DEFAULT_PORT22;
   const release2 = deps.release ?? readFleetConsoleRelease();
   const version22 = deps.version ?? release2.version;
   const channel = release2.channel;
@@ -83912,7 +83945,7 @@ function createConsoleServer(deps = {}) {
     cwd: deps.codexCwd ?? process.cwd(),
     host,
     version: version22,
-    getPort: () => lockHandle?.payload.port ?? port,
+    getPort: () => lockHandle?.payload.port ?? portState.effectivePort,
     getAdminToken: () => lockHandle?.payload.token ?? null
   });
   const pendingRuntimeSessions = /* @__PURE__ */ new Map();
@@ -83960,7 +83993,7 @@ function createConsoleServer(deps = {}) {
   });
   const terminalUpgrade = createTerminalUpgradeHandler({
     expectedHost: host,
-    getExpectedPort: () => lockHandle?.payload.port ?? port,
+    getExpectedPort: () => lockHandle?.payload.port ?? portState.effectivePort,
     tickets: terminalTickets,
     sessions: terminalSessions,
     validateHost
@@ -83970,6 +84003,12 @@ function createConsoleServer(deps = {}) {
   let lockHandle = null;
   let activeLockFile = null;
   let activeEndpoint = null;
+  let portState = {
+    requestedPort: null,
+    effectivePort: injectedPort,
+    portMode: "dynamic",
+    portHonored: true
+  };
   let agentRuntimeStopped = false;
   let consoleResourcesDisposed = false;
   let updateApplyInFlight = false;
@@ -84003,7 +84042,7 @@ function createConsoleServer(deps = {}) {
       runAsyncBooleanHandler(codex.handle(req, res), res, () => tryServeStaticConsole(req, res, pathname));
       return;
     }
-    if (!validateHost(req, lockHandle?.payload.port ?? port)) {
+    if (!validateHost(req, lockHandle?.payload.port ?? portState.effectivePort)) {
       writeJson(res, 403, { error: "host_mismatch" });
       return;
     }
@@ -84130,7 +84169,11 @@ function createConsoleServer(deps = {}) {
       endpoint: payload.endpoint,
       startedAt: payload.startedAt,
       version: payload.version,
-      workspaceCount: observability.workspaceCount()
+      workspaceCount: observability.workspaceCount(),
+      portMode: portState.portMode,
+      requestedPort: portState.requestedPort,
+      effectivePort: portState.effectivePort,
+      portHonored: portState.portHonored
     };
     writeJson(res, 200, body);
   }
@@ -84533,7 +84576,11 @@ function createConsoleServer(deps = {}) {
       version: version22,
       channel,
       ...updateCheck.getStatus(),
-      port: lockHandle?.payload.port ?? port,
+      port: lockHandle?.payload.port ?? portState.effectivePort,
+      portMode: portState.portMode,
+      requestedPort: portState.requestedPort,
+      effectivePort: portState.effectivePort,
+      portHonored: portState.portHonored,
       wikiServerStatus: resolveWikiServerStatus(theaterId)
     };
     writeJson(res, 200, payload);
@@ -84656,11 +84703,11 @@ function createConsoleServer(deps = {}) {
   }
   function isTerminalAuthorized(req) {
     if (!lockHandle) return false;
-    return isAllowedTerminalOrigin(req, lockHandle.payload.port ?? port);
+    return isAllowedTerminalOrigin(req, lockHandle.payload.port ?? portState.effectivePort);
   }
   function isExactConsoleOrigin(req) {
     if (!lockHandle) return false;
-    return req.headers.origin === `http://127.0.0.1:${lockHandle.payload.port ?? port}`;
+    return req.headers.origin === `http://127.0.0.1:${lockHandle.payload.port ?? portState.effectivePort}`;
   }
   function listVisibleWorkspaces(requestedTenantId) {
     if (requestedTenantId) {
@@ -84834,36 +84881,19 @@ function createConsoleServer(deps = {}) {
   }
   const returnedServer = {
     host,
-    port,
+    port: injectedPort,
     async start(lockPaths) {
       if (server && lockHandle) return lockHandle.payload.endpoint;
       try {
         await rehydrateDurableState();
-        await new Promise((resolve2, reject) => {
-          const srv = createHttpServer(handleRequest, terminalUpgrade);
-          srv.once("error", reject);
-          srv.listen(port, host, async () => {
-            srv.off("error", reject);
-            const address = srv.address();
-            const actualPort = typeof address === "object" && address ? address.port : port;
-            const endpoint = `http://${host}:${actualPort}/`;
-            try {
-              const localLoopbackServer = await maybeStartLoopbackServer(host, actualPort, handleRequest, terminalUpgrade);
-              server = srv;
-              loopbackServer = localLoopbackServer;
-              lockHandle = lock.writeLock({ dir: lockPaths.dir, lockFile: lockPaths.lockFile, pid: process.pid, port: actualPort, endpoint, version: version22 });
-              activeLockFile = lockPaths.lockFile;
-              activeEndpoint = endpoint;
-              resolve2();
-            } catch (err) {
-              await closeHttpServer(srv);
-              await closeHttpServer(loopbackServer);
-              server = null;
-              loopbackServer = null;
-              reject(err);
-            }
-          });
-        });
+        const listenPlan = resolveConsolePortListenPlan();
+        const result = await listenConsolePort(listenPlan);
+        server = result.srv;
+        loopbackServer = result.localLoopbackServer;
+        portState = result.portState;
+        lockHandle = lock.writeLock({ dir: lockPaths.dir, lockFile: lockPaths.lockFile, pid: process.pid, port: result.actualPort, endpoint: result.endpoint, version: version22 });
+        activeLockFile = lockPaths.lockFile;
+        activeEndpoint = result.endpoint;
       } catch (error512) {
         await cleanupAfterFailedStart();
         throw error512;
@@ -84876,6 +84906,78 @@ function createConsoleServer(deps = {}) {
       await stopServer();
     }
   };
+  function resolveConsolePortListenPlan() {
+    if (deps.port !== void 0) {
+      return {
+        port: injectedPort,
+        requestedPort: null,
+        portMode: "dynamic",
+        allowFallback: false
+      };
+    }
+    const options2 = infraServices.globalOptionsService.load();
+    if (options2.consolePortMode === "static" && isValidConsoleStaticPort3(options2.consoleStaticPort)) {
+      return {
+        port: options2.consoleStaticPort,
+        requestedPort: options2.consoleStaticPort,
+        portMode: "static",
+        allowFallback: true
+      };
+    }
+    return {
+      port: DEFAULT_PORT22,
+      requestedPort: null,
+      portMode: "dynamic",
+      allowFallback: false
+    };
+  }
+  async function listenConsolePort(plan) {
+    try {
+      return await listenOnce(plan.port, {
+        requestedPort: plan.requestedPort,
+        portMode: plan.portMode,
+        portHonored: true
+      });
+    } catch (error512) {
+      if (!plan.allowFallback || plan.requestedPort === null) throw error512;
+      return listenOnce(DEFAULT_PORT22, {
+        requestedPort: plan.requestedPort,
+        portMode: "static",
+        portHonored: false
+      });
+    }
+  }
+  function listenOnce(portToBind, statePatch) {
+    return new Promise((resolve2, reject) => {
+      const srv = createHttpServer(handleRequest, terminalUpgrade);
+      const onError = (error512) => {
+        reject(error512);
+      };
+      srv.once("error", onError);
+      srv.listen(portToBind, host, async () => {
+        srv.off("error", onError);
+        const address = srv.address();
+        const actualPort = typeof address === "object" && address ? address.port : portToBind;
+        const endpoint = `http://${host}:${actualPort}/`;
+        try {
+          const localLoopbackServer = await maybeStartLoopbackServer(host, actualPort, handleRequest, terminalUpgrade);
+          resolve2({
+            srv,
+            localLoopbackServer,
+            actualPort,
+            endpoint,
+            portState: {
+              ...statePatch,
+              effectivePort: actualPort
+            }
+          });
+        } catch (err) {
+          await closeHttpServer(srv);
+          reject(err);
+        }
+      });
+    });
+  }
   return returnedServer;
 }
 function resolveCarrierEventOrigin(event, jobOriginById) {
@@ -85028,6 +85130,9 @@ function validateHost(req, expectedPort) {
   if (!hostHeader) return false;
   return hostHeader === `127.0.0.1:${expectedPort}`;
 }
+function isValidConsoleStaticPort3(value) {
+  return typeof value === "number" && Number.isInteger(value) && value >= MIN_CONSOLE_STATIC_PORT3 && value <= MAX_CONSOLE_STATIC_PORT3;
+}
 function isAllowedTerminalOrigin(req, expectedPort) {
   const origin = req.headers.origin;
   if (origin === void 0) return true;