codexuse-cli 5.1.8 → 5.2.0

package/README.md

@@ -8,13 +8,10 @@ npm install -g codexuse-cli
 Commands:
 ```bash
 codexuse account-pool status [--runtime=desktop] [--state-dir=/abs/path]
-codexuse account-pool enable
-codexuse account-pool disable
 codexuse account-pool routing <least-used|round-robin>
 codexuse account-pool profiles <list|set|add|remove|reset> [names...]
 codexuse account-pool models <list|add|remove|reset> [model-ids...]
 codexuse account-pool reasoning <list|add|remove|reset> [values...]
-codexuse account-pool fast-mode <list|add|remove|reset> [values...]
 codexuse account-pool keys <list|create|revoke> [id]
 codexuse account-pool sessions list [--runtime=desktop] [--state-dir=/abs/path]
 

package/dist/index.js

@@ -2027,6 +2027,11 @@ var import_node_path7 = __toESM(require("path"));
 
 // ../../packages/contracts/src/settings/types.ts
 var DEFAULT_ACCOUNT_POOL_EXPOSED_MODELS = [
+  "gpt-5.5",
+  "gpt-5.3-codex-spark",
+  "gpt-5.4-mini"
+];
+var LEGACY_ACCOUNT_POOL_EXPOSED_MODELS_DEFAULT = [
   "gpt-5.5",
   "gpt-5.4",
   "gpt-5.4-mini",
@@ -2034,15 +2039,27 @@ var DEFAULT_ACCOUNT_POOL_EXPOSED_MODELS = [
 ];
 var DEFAULT_ACCOUNT_POOL_EXPOSED_REASONING_EFFORTS = [
   "none",
-  "minimal",
   "low",
   "medium",
   "high",
   "xhigh"
 ];
-var DEFAULT_ACCOUNT_POOL_EXPOSED_FAST_MODE_REASONING_EFFORTS = [
+var LEGACY_ACCOUNT_POOL_EXPOSED_REASONING_EFFORTS_DEFAULT = [
+  "none",
+  "minimal",
+  "low",
+  "medium",
+  "high",
   "xhigh"
 ];
+function migrateLegacyAccountPoolExposedModelDefaults(models) {
+  return models.length === LEGACY_ACCOUNT_POOL_EXPOSED_MODELS_DEFAULT.length && models.every((model, index) => model === LEGACY_ACCOUNT_POOL_EXPOSED_MODELS_DEFAULT[index]) ? [...DEFAULT_ACCOUNT_POOL_EXPOSED_MODELS] : [...models];
+}
+function migrateLegacyAccountPoolExposedReasoningDefaults(efforts) {
+  return efforts.length === LEGACY_ACCOUNT_POOL_EXPOSED_REASONING_EFFORTS_DEFAULT.length && efforts.every(
+    (effort, index) => effort === LEGACY_ACCOUNT_POOL_EXPOSED_REASONING_EFFORTS_DEFAULT[index]
+  ) ? [...DEFAULT_ACCOUNT_POOL_EXPOSED_REASONING_EFFORTS] : [...efforts];
+}
 
 // ../../packages/runtime-app-state/src/app/state.ts
 var import_node_async_hooks = require("async_hooks");
@@ -3526,6 +3543,53 @@ function parseStoredTrial(raw) {
   );
   return hasValue ? trial : null;
 }
+var CLOUD_SYNC_RUNTIME_SETTING_KEYS = /* @__PURE__ */ new Set([
+  "keepAppRunningAfterWindowClose",
+  "rateLimitPercentMode",
+  "officialCodexWideViewEnabled",
+  "officialCodexWideViewMaxWidth",
+  "officialCodexScrollRestoreEnabled",
+  "officialCodexConversationTimelineEnabled",
+  "officialCodexInCodexStatusEnabled",
+  "officialCodexHandoffChipEnabled",
+  "officialCodexAutoControlEnabled",
+  "officialCodexRelayMode",
+  "officialCodexRelayProfileId",
+  "officialCodexModelWhitelistUnlockEnabled",
+  "officialCodexPluginMarketplaceUnlockEnabled",
+  "officialCodexForcePluginInstallEnabled",
+  "accountPoolEnabled",
+  "accountPoolRoutingStrategy",
+  "accountPoolProfilePool",
+  "accountPoolExposedModels",
+  "accountPoolExposedReasoningEfforts"
+]);
+function cloneJsonValue(value) {
+  if (value === void 0) {
+    return void 0;
+  }
+  try {
+    return JSON.parse(JSON.stringify(value));
+  } catch {
+    return void 0;
+  }
+}
+function pickCloudSyncRuntimeSettings(raw) {
+  if (!isRecord3(raw)) {
+    return void 0;
+  }
+  const picked = {};
+  for (const key of CLOUD_SYNC_RUNTIME_SETTING_KEYS) {
+    if (!(key in raw)) {
+      continue;
+    }
+    const value = cloneJsonValue(raw[key]);
+    if (value !== void 0) {
+      picked[key] = value;
+    }
+  }
+  return Object.keys(picked).length > 0 ? picked : void 0;
+}
 async function getStoredTrial() {
   const state = await getAppState();
   return parseStoredTrial(state.trial);
@@ -3599,7 +3663,7 @@ async function readCodexSettingsJsonRaw() {
     subagentSystemNotificationsEnabled: state.preferences.subagentSystemNotificationsEnabled,
     folderHistory: state.preferences.folderHistory,
     pinnedPaths: state.preferences.pinnedPaths,
-    sync: state.sync
+    runtimeSettings: pickCloudSyncRuntimeSettings(state.runtimeSettings) ?? {}
   };
 }
 async function writeCodexSettingsJsonRaw(payload) {
@@ -3608,6 +3672,7 @@ async function writeCodexSettingsJsonRaw(payload) {
   }
   const autoRoll = parseAutoRoll(payload.autoRoll ?? payload.auto_roll);
   const license = parseStoredLicense(payload.license);
+  const runtimeSettings = pickCloudSyncRuntimeSettings(payload.runtimeSettings);
   await patchAppState({
     app: {
       lastProfileName: asString2(payload.lastProfileName ?? payload.last_profile_name),
@@ -3642,7 +3707,7 @@ async function writeCodexSettingsJsonRaw(payload) {
       folderHistory: Array.isArray(payload.folderHistory) ? payload.folderHistory : void 0,
       pinnedPaths: Array.isArray(payload.pinnedPaths) ? payload.pinnedPaths : void 0
     },
-    sync: isRecord3(payload.sync) ? payload.sync : void 0
+    runtimeSettings
   });
 }
 
@@ -7759,8 +7824,6 @@ Usage:
 
   codexuse account-pool status [--runtime=desktop] [--state-dir=/abs/path]
   codexuse account-pool quickstart
-  codexuse account-pool enable
-  codexuse account-pool disable
   codexuse account-pool routing <least-used|round-robin>
   codexuse account-pool profiles list
   codexuse account-pool profiles set <name> [more...]
@@ -7945,7 +8008,7 @@ function normalizeAccountPoolExposedModels(value, fallbackToDefault) {
     result.push(normalized);
   }
   if (result.length > 0) {
-    return result;
+    return migrateLegacyAccountPoolExposedModelDefaults(result);
   }
   return fallbackToDefault ? [...DEFAULT_ACCOUNT_POOL_EXPOSED_MODELS] : [];
 }
@@ -7962,7 +8025,7 @@ function normalizeAccountPoolReasoningEfforts(value, fallback) {
     result.push(normalized);
   }
   if (result.length > 0 || Array.isArray(value)) {
-    return result;
+    return migrateLegacyAccountPoolExposedReasoningDefaults(result);
   }
   return fallback ? [...fallback] : [];
 }
@@ -7979,10 +8042,7 @@ function normalizeAccountPoolSettings(settings) {
       settings.accountPoolExposedReasoningEfforts,
       DEFAULT_ACCOUNT_POOL_EXPOSED_REASONING_EFFORTS
     ),
-    accountPoolExposedFastModeReasoningEfforts: normalizeAccountPoolReasoningEfforts(
-      settings.accountPoolExposedFastModeReasoningEfforts,
-      DEFAULT_ACCOUNT_POOL_EXPOSED_FAST_MODE_REASONING_EFFORTS
-    )
+    accountPoolExposedFastModeReasoningEfforts: []
   };
 }
 function applyAccountPoolSettings(settings, nextAccountPoolSettings) {
@@ -8003,8 +8063,6 @@ function printAccountPoolHelp(version) {
 Usage:
   codexuse account-pool status [--runtime=desktop] [--state-dir=/abs/path]
   codexuse account-pool quickstart [--runtime=desktop] [--state-dir=/abs/path]
-  codexuse account-pool enable
-  codexuse account-pool disable
   codexuse account-pool routing <least-used|round-robin>
 
   codexuse account-pool profiles list
@@ -8023,11 +8081,6 @@ Usage:
   codexuse account-pool reasoning remove <effort> [more...]
   codexuse account-pool reasoning reset
 
-  codexuse account-pool fast-mode list
-  codexuse account-pool fast-mode add <effort> [more...]
-  codexuse account-pool fast-mode remove <effort> [more...]
-  codexuse account-pool fast-mode reset
-
   codexuse account-pool keys list [--runtime=desktop] [--state-dir=/abs/path]
   codexuse account-pool keys create [--runtime=desktop] [--state-dir=/abs/path]
   codexuse account-pool keys revoke <id> [--runtime=desktop] [--state-dir=/abs/path]
@@ -8056,6 +8109,7 @@ function normalizeApiKeyRecord(id, value) {
     id,
     tokenHash,
     tokenPreview,
+    plaintextToken: asString4(record.plaintextToken),
     createdAt,
     lastUsedAt: normalizeIsoString(record.lastUsedAt),
     revokedAt: normalizeIsoString(record.revokedAt)
@@ -8232,6 +8286,7 @@ function accountPoolApiKeyView(record) {
   return {
     id: record.id,
     tokenPreview: record.tokenPreview,
+    plaintextToken: record.plaintextToken,
     createdAt: record.createdAt,
     lastUsedAt: record.lastUsedAt,
     revokedAt: record.revokedAt
@@ -8251,6 +8306,7 @@ async function createApiKey(stateDir) {
     id: (0, import_node_crypto7.randomUUID)(),
     tokenHash: hashToken(plaintextToken),
     tokenPreview: `${plaintextToken.slice(0, 8)}...${plaintextToken.slice(-6)}`,
+    plaintextToken,
     createdAt: now,
     lastUsedAt: null,
     revokedAt: null
@@ -8341,7 +8397,7 @@ async function readAccountPoolRuntimeSummary(input = {}) {
     runtime,
     stateDir,
     baseUrl: resolveBaseUrlFromPort(runtime, input.port ?? null),
-    enabled: normalized.accountPoolEnabled,
+    enabled: true,
     hasAccountPoolAccess: license?.capabilities.accountPool === true,
     routingStrategy: normalized.accountPoolRoutingStrategy,
     activeApiKeyCount: apiKeys.length,
@@ -8373,10 +8429,7 @@ async function updateSettings(transform) {
       nextSettings.accountPoolExposedReasoningEfforts,
       null
     ),
-    accountPoolExposedFastModeReasoningEfforts: normalizeAccountPoolReasoningEfforts(
-      nextSettings.accountPoolExposedFastModeReasoningEfforts,
-      null
-    )
+    accountPoolExposedFastModeReasoningEfforts: []
   };
   await writeAppSettings(applyAccountPoolSettings(raw, sanitizedSettings));
   return {
@@ -8444,11 +8497,11 @@ async function handleStatus(flags) {
     (profileName) => !profiles.some((profile) => profile.name === profileName)
   );
   console.log(`License: ${license ? `${license.tier} (${license.state})` : "unknown"}`);
-  console.log(`Enabled: ${normalized.accountPoolEnabled ? "yes" : "no"}`);
+  console.log("Enabled: yes");
   console.log(`Runtime: ${runtime}`);
   console.log(`State dir: ${stateDir}`);
   console.log(`Routing: ${formatRoutingStrategy(normalized.accountPoolRoutingStrategy)}`);
-  console.log(`Public API ready: ${normalized.accountPoolEnabled && license?.capabilities.accountPool === true && apiKeys.length > 0 ? "yes" : "no"}`);
+  console.log(`Public API ready: ${license?.capabilities.accountPool === true && apiKeys.length > 0 ? "yes" : "no"}`);
   console.log(`API keys: ${apiKeys.length}`);
   console.log(`Sessions: ${sessions.length}`);
   console.log(`Selection mode: ${explicitSelection.length > 0 ? "explicit" : "all saved profiles"}`);
@@ -8463,25 +8516,16 @@ async function handleStatus(flags) {
   }
   printStringList("Published models", normalized.accountPoolExposedModels);
   printStringList("Reasoning aliases", normalized.accountPoolExposedReasoningEfforts);
-  printStringList("Fast-mode aliases", normalized.accountPoolExposedFastModeReasoningEfforts);
-  if (normalized.accountPoolEnabled && license?.capabilities.accountPool !== true) {
+  if (license?.capabilities.accountPool !== true) {
     console.log(ACCOUNT_POOL_PRO_REQUIRED_MESSAGE);
   }
 }
 async function handleEnable() {
   await requireProAccess();
-  const result = await updateSettings((current) => ({
-    ...current,
-    accountPoolEnabled: true
-  }));
-  console.log(result.settings.accountPoolEnabled ? "Accounts Pool enabled." : "Accounts Pool is disabled.");
+  console.log("Accounts Pool is always on while CodexUse is running.");
 }
 async function handleDisable() {
-  const result = await updateSettings((current) => ({
-    ...current,
-    accountPoolEnabled: false
-  }));
-  console.log(result.settings.accountPoolEnabled ? "Accounts Pool is enabled." : "Accounts Pool disabled.");
+  console.log("Accounts Pool is always on while CodexUse is running.");
 }
 async function handleRouting(params) {
   const value = parseRoutingStrategy(params[1]);
@@ -8673,15 +8717,14 @@ async function handleQuickstart(flags) {
   console.log(`API keys: ${summary.activeApiKeyCount}`);
   console.log(`Base URL: ${baseUrl}`);
   console.log("");
-  console.log("1. Enable pool:");
-  console.log("   codexuse account-pool enable");
-  console.log("2. Create key:");
+  console.log("1. Create key:");
   console.log(`   codexuse account-pool keys create --runtime=${summary.runtime}`);
-  console.log("3. Use OpenAI-compatible settings:");
+  console.log("2. Use OpenAI-compatible settings:");
   console.log(`   Base URL: ${baseUrl}/v1`);
   console.log("   API key: cux_pool_...");
-  console.log("4. Verify:");
+  console.log("3. Verify:");
   console.log(`   curl ${baseUrl}/v1/models -H 'Authorization: Bearer cux_pool_...'`);
+  console.log(`   curl ${baseUrl}/v1/chat/completions -H 'Authorization: Bearer cux_pool_...'`);
 }
 async function handleAccountPoolCommand(args, version) {
   const flags = args.filter((arg) => arg.startsWith("-"));
@@ -8730,16 +8773,6 @@ async function handleAccountPoolCommand(args, version) {
         normalizeValue: (value) => normalizeReasoningEffort(value)
       });
       return;
-    case "fast-mode":
-      await handleArraySetting({
-        label: "Fast-mode aliases",
-        actionName: "fast-mode",
-        params,
-        key: "accountPoolExposedFastModeReasoningEfforts",
-        defaultValues: DEFAULT_ACCOUNT_POOL_EXPOSED_FAST_MODE_REASONING_EFFORTS,
-        normalizeValue: (value) => normalizeReasoningEffort(value)
-      });
-      return;
     case "keys":
       await handleKeys(params, flags);
       return;
@@ -9539,8 +9572,10 @@ async function findOfficialCodexThreadRecord(profileHome, threadId) {
 
 // ../../packages/runtime-codex/src/codex/officialAppRestart.ts
 var COMMAND_TIMEOUT_MS = 3e3;
+var EXIT_WAIT_MS = 1e4;
 var LAUNCH_WAIT_MS = 15e3;
 var POLL_INTERVAL_MS = 250;
+var PROCESS_EXIT_GRACE_MS = 15e3;
 var APP_DISCOVERY_CACHE_TTL_MS = 6e4;
 var APP_DISCOVERY_MISS_CACHE_TTL_MS = 5e3;
 var OFFICIAL_CODEX_ACTIVITY_LIMIT = 50;
@@ -9551,6 +9586,8 @@ var CODEX_BRIDGE_LAUNCH_WAIT_MS = 3e4;
 var CODEXUSE_BRIDGE_BINDING_NAME = "__codexuseBridgeBinding";
 var CODEXUSE_BRIDGE_INSTALL_TTL_MS = 5e3;
 var CODEXUSE_BRIDGE_VERSION = "0.2.0";
+var CODEXUSE_STALE_LAUNCH_GRACE_MS = 45e3;
+var CODEXUSE_STALE_BRIDGE_MISS_TTL_MS = 2 * 6e4;
 var officialCodexBridgeActionHandler = null;
 var bridgeActionListeners = /* @__PURE__ */ new Map();
 var handledBridgeActionIds = [];
@@ -9609,6 +9646,7 @@ function sanitizeBridgeActionRoute(value) {
 var profileActionLock = Promise.resolve();
 var appDiscoveryCache = null;
 var bridgeInstallCache = /* @__PURE__ */ new Map();
+var staleOfficialCodexBridgeMissesByPid = /* @__PURE__ */ new Map();
 function hashProfileKey(profileKey) {
   if (!profileKey) {
     return null;
@@ -14159,6 +14197,26 @@ async function describeUnmanagedProfileHint(appServerPid) {
   }
   return {};
 }
+function getDescendantPids(rootPid, rows) {
+  const descendants = [];
+  const queue = [rootPid];
+  const seen = /* @__PURE__ */ new Set();
+  while (queue.length > 0) {
+    const current = queue.shift();
+    if (seen.has(current)) {
+      continue;
+    }
+    seen.add(current);
+    for (const row of rows) {
+      if (row.ppid !== current || seen.has(row.pid)) {
+        continue;
+      }
+      descendants.push(row.pid);
+      queue.push(row.pid);
+    }
+  }
+  return descendants;
+}
 async function waitForNewMainPid(candidate, previousPids) {
   const deadline = Date.now() + LAUNCH_WAIT_MS;
   while (Date.now() < deadline) {
@@ -14186,6 +14244,110 @@ async function waitForAppServerPid(mainPid, profileHome) {
   }
   return null;
 }
+async function waitForPidsExit(pids, timeoutMs) {
+  const remaining = new Set(pids);
+  if (remaining.size === 0) {
+    return [];
+  }
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    const rows = await readProcessRows();
+    for (const pid of Array.from(remaining)) {
+      if (!rows.some((row) => row.pid === pid)) {
+        remaining.delete(pid);
+      }
+    }
+    if (remaining.size === 0) {
+      return [];
+    }
+    await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));
+  }
+  return Array.from(remaining);
+}
+async function stopProcessTree(rootPid, rows) {
+  const tree = [rootPid, ...getDescendantPids(rootPid, rows)].filter((pid, index, all) => all.indexOf(pid) === index).sort((a, b) => b - a);
+  await signalPids(tree, "SIGTERM");
+  let remaining = await waitForPidsExit(tree, PROCESS_EXIT_GRACE_MS);
+  if (remaining.length > 0) {
+    await signalPids(remaining.sort((a, b) => b - a), "SIGKILL");
+    remaining = await waitForPidsExit(remaining, EXIT_WAIT_MS);
+  }
+  return remaining;
+}
+async function stopUnverifiedLaunch(rootPid) {
+  try {
+    await stopProcessTree(rootPid, await readProcessRows());
+  } catch {
+  }
+}
+async function isCodexUseLaunchedProcess(pid) {
+  const result = await runCommand2(
+    "/bin/ps",
+    ["eww", "-p", String(pid), "-o", "command="],
+    2e3
+  );
+  return result.code === 0 && result.stdout.includes("CODEX_TELEMETRY_LABEL=codexuse-profile-");
+}
+async function hasRecoverableOfficialCodexBridge(cdpPort) {
+  try {
+    const target = pickCodexCdpTarget(await readCdpTargets(cdpPort), {
+      allowAnyPage: true
+    });
+    if (!target?.webSocketDebuggerUrl) {
+      return false;
+    }
+    await ensureOfficialCodexBridgeInstalled(target.webSocketDebuggerUrl, false);
+    const health = normalizeBridgeHealth(
+      await evaluateCdpExpression(
+        target.webSocketDebuggerUrl,
+        createBridgeHealthExpression()
+      )
+    );
+    return health.ok;
+  } catch {
+    return false;
+  }
+}
+async function reapStaleOfficialCodexManagedLaunchRows(candidate, rows) {
+  const now = Date.now();
+  const reaped = [];
+  let currentRows = rows;
+  const livePids = new Set(rows.map((row) => row.pid));
+  for (const pid of staleOfficialCodexBridgeMissesByPid.keys()) {
+    if (!livePids.has(pid)) {
+      staleOfficialCodexBridgeMissesByPid.delete(pid);
+    }
+  }
+  for (const row of rows) {
+    const cdpPort = parseRemoteDebuggingPort(row.args);
+    if (!isMainProcessRow(row, candidate) || cdpPort === null || row.startedAt === null || now - row.startedAt < CODEXUSE_STALE_LAUNCH_GRACE_MS || !await isCodexUseLaunchedProcess(row.pid)) {
+      continue;
+    }
+    const appServerPid = findAppServerPid(currentRows, row.pid);
+    if (appServerPid !== null) {
+      if (await hasRecoverableOfficialCodexBridge(cdpPort)) {
+        staleOfficialCodexBridgeMissesByPid.delete(row.pid);
+        continue;
+      }
+      const previousMissAt = staleOfficialCodexBridgeMissesByPid.get(row.pid);
+      staleOfficialCodexBridgeMissesByPid.set(row.pid, now);
+      if (previousMissAt === void 0 || now - previousMissAt > CODEXUSE_STALE_BRIDGE_MISS_TTL_MS) {
+        continue;
+      }
+    }
+    await stopProcessTree(row.pid, currentRows);
+    currentRows = await readProcessRows();
+    if (!currentRows.some((entry) => entry.pid === row.pid)) {
+      staleOfficialCodexBridgeMissesByPid.delete(row.pid);
+      reaped.push(row.pid);
+      if (sharedHomeCdpWindow?.pid === row.pid) {
+        sharedHomeCdpWindow = null;
+      }
+    }
+    break;
+  }
+  return reaped;
+}
 async function focusOfficialCodexApp(candidate) {
   const result = await runCommand2("/usr/bin/open", [candidate.appPath], 5e3);
   return result.code === 0;
@@ -14488,7 +14650,19 @@ async function resolveCodexAppTarget() {
   const mainPids = getRunningCodexMainPidsFromRows(fallback, rows);
   return { candidate: fallback, runningPids, mainPids };
 }
+async function signalPids(pids, signal) {
+  const signaled = [];
+  for (const pid of pids) {
+    try {
+      process.kill(pid, signal);
+      signaled.push(pid);
+    } catch {
+    }
+  }
+  return signaled;
+}
 var SHARED_CODEX_HOME = import_node_path10.default.join((0, import_node_os3.homedir)(), ".codex");
+var sharedHomeCdpWindow = null;
 function toIso(value) {
   return typeof value === "number" && Number.isFinite(value) ? new Date(value).toISOString() : null;
 }
@@ -14560,7 +14734,13 @@ async function getOfficialCodexProfileInstances(options = {}) {
       unmanaged: []
     };
   }
-  const [state, rows] = await Promise.all([getAppState(), readProcessRows()]);
+  const [state, initialRows] = await Promise.all([getAppState(), readProcessRows()]);
+  let rows = initialRows;
+  let visibleMainPids = mainPids;
+  if ((await reapStaleOfficialCodexManagedLaunchRows(candidate, rows)).length > 0) {
+    rows = await readProcessRows();
+    visibleMainPids = rows.filter((row) => isMainProcessRow(row, candidate)).map((row) => row.pid);
+  }
   const allowedProfileNames = options.profileNames ? new Set(options.profileNames.map((name) => name.trim()).filter(Boolean)) : null;
   const managed = [];
   const managedPids = /* @__PURE__ */ new Set();
@@ -14622,7 +14802,7 @@ async function getOfficialCodexProfileInstances(options = {}) {
   }
   managed.sort((a, b) => a.profileName.localeCompare(b.profileName));
   const unmanaged = [];
-  const unmanagedPids = mainPids.filter((entry) => !managedPids.has(entry));
+  const unmanagedPids = visibleMainPids.filter((entry) => !managedPids.has(entry));
   const allowedFallbackProfileName = allowedProfileNames?.size === 1 ? Array.from(allowedProfileNames)[0] : null;
   for (const pid of unmanagedPids) {
     const mainRow = rows.find((row) => row.pid === pid) ?? null;
@@ -14711,6 +14891,14 @@ async function launchOfficialCodexProfileInstanceOnce(options) {
       reason: "official-codex-app-not-found"
     };
   }
+  let launchBaselineMainPids = mainPids;
+  const staleLaunchPids = await reapStaleOfficialCodexManagedLaunchRows(
+    candidate,
+    await readProcessRows()
+  );
+  if (staleLaunchPids.length > 0) {
+    launchBaselineMainPids = (await readProcessRows()).filter((row) => isMainProcessRow(row, candidate)).map((row) => row.pid);
+  }
   const existing = await readManagedInstance(options.profileName);
   const desiredQolSettings = resolveDesiredQolSettings({
     requested: options.desiredQolSettings,
@@ -14795,7 +14983,7 @@ async function launchOfficialCodexProfileInstanceOnce(options) {
     options.profileHome,
     options.profileName,
     cdpPort,
-    new Set(mainPids)
+    new Set(launchBaselineMainPids)
   );
   if (!launch.opened) {
     const reason = launch.reason ?? "open-failed";
@@ -14854,6 +15042,7 @@ async function launchOfficialCodexProfileInstanceOnce(options) {
     options.profileHome
   );
   if (appServerPid === null) {
+    await stopUnverifiedLaunch(launchedPid);
     const failed = {
       profileName: options.profileName,
       profileKey: options.profileKey,
@@ -16107,6 +16296,24 @@ function buildSyncUrl(pathname) {
   const normalizedPath = pathname.startsWith("/") ? pathname : `/${pathname}`;
   return `${baseUrl}${normalizedPath}`;
 }
+function formatErrorResponse(raw, status) {
+  const trimmed = raw.trim();
+  if (trimmed) {
+    try {
+      const parsed = JSON.parse(trimmed);
+      if (isRecord6(parsed)) {
+        const message = parsed.error ?? parsed.message;
+        if (typeof message === "string" && message.trim().length > 0) {
+          return message.trim();
+        }
+      }
+    } catch {
+      return trimmed;
+    }
+    return trimmed;
+  }
+  return `Cloud sync request failed (${status}).`;
+}
 function normalizeSnapshotKind(value) {
   if (value === "encrypted" || value === "legacy-plaintext") {
     return value;
@@ -16202,7 +16409,7 @@ async function requestJson(method, pathname, access, body, rawBody) {
     if (!response.ok) {
       const message = await response.text().catch(() => "");
       throw new CloudSyncClientError(
-        message || `Cloud sync request failed (${response.status}).`,
+        formatErrorResponse(message, response.status),
         response.status
       );
     }
@@ -17752,13 +17959,12 @@ async function pushCloudSync(options = {}) {
       serializedSnapshot
     });
     const remoteKind = getSnapshotKind(remote.snapshot);
-    await writeState({
-      lastPushAt: (/* @__PURE__ */ new Date()).toISOString(),
-      remoteUpdatedAt: remote.snapshot.updatedAt,
-      remoteKind,
-      lastError: void 0
-    });
     if (remote.status === "stale") {
+      await writeState({
+        remoteUpdatedAt: remote.snapshot.updatedAt,
+        remoteKind,
+        lastError: void 0
+      });
       return {
         mode: "push",
         status: "stale",
@@ -17768,6 +17974,12 @@ async function pushCloudSync(options = {}) {
       };
     }
     await rememberPassphraseIfRequested(eligibility.access.syncKey, options, passphrase);
+    await writeState({
+      lastPushAt: (/* @__PURE__ */ new Date()).toISOString(),
+      remoteUpdatedAt: remote.snapshot.updatedAt,
+      remoteKind,
+      lastError: void 0
+    });
     return {
       mode: "push",
       status: "applied",
@@ -17937,7 +18149,7 @@ async function ensureCliStorageReady() {
 }
 
 // src/app/main.ts
-var VERSION = true ? "5.1.8" : "0.0.0";
+var VERSION = true ? "5.2.0" : "0.0.0";
 async function runCli() {
   const args = process.argv.slice(2);
   if (args.length === 0) {