codexuse-cli 5.2.4 → 5.2.6

package/dist/index.js

@@ -5932,188 +5932,6 @@ async function buildSnapshot(content, exists, options) {
     diagnostics
   };
 }
-function sanitizeString(value) {
-  if (value === null || value === void 0) {
-    return null;
-  }
-  const trimmed = value.trim();
-  return trimmed.length > 0 ? trimmed : null;
-}
-function sanitizeNumber(value) {
-  if (value === void 0 || value === null) {
-    return null;
-  }
-  if (!Number.isFinite(value)) {
-    throw new Error("Numeric value must be finite.");
-  }
-  return value;
-}
-function normalizeStringRecordInput(record) {
-  if (!record) {
-    return null;
-  }
-  const normalized = {};
-  for (const [key, value] of Object.entries(record)) {
-    const normalizedKey = sanitizeString(key);
-    const normalizedValue = sanitizeString(value);
-    if (normalizedKey && normalizedValue) {
-      normalized[normalizedKey] = normalizedValue;
-    }
-  }
-  return Object.keys(normalized).length > 0 ? normalized : null;
-}
-function applySuggestedFixes(current, fixIds) {
-  if (!fixIds || fixIds.length === 0) {
-    return current;
-  }
-  let next = { ...current };
-  for (const fixId of fixIds) {
-    if (!fixId.startsWith("remove-feature:")) {
-      continue;
-    }
-    const featureKey = fixId.slice("remove-feature:".length).trim();
-    if (!featureKey) {
-      continue;
-    }
-    const rawFeatures = typeof next["features"] === "object" && next["features"] !== null && !Array.isArray(next["features"]) ? { ...next["features"] } : {};
-    if (!Object.prototype.hasOwnProperty.call(rawFeatures, featureKey)) {
-      continue;
-    }
-    delete rawFeatures[featureKey];
-    if (Object.keys(rawFeatures).length === 0) {
-      delete next["features"];
-    } else {
-      next["features"] = rawFeatures;
-    }
-  }
-  return next;
-}
-function applyUpdatesToConfig(current, updates) {
-  const next = { ...current };
-  const applyStringField = (key, candidate) => {
-    if (candidate === void 0) {
-      return;
-    }
-    const normalized = sanitizeString(candidate);
-    if (!normalized) {
-      delete next[key];
-    } else {
-      next[key] = normalized;
-    }
-  };
-  const applyNumberField = (key, candidate) => {
-    if (candidate === void 0) {
-      return;
-    }
-    const normalized = sanitizeNumber(candidate);
-    if (normalized === null) {
-      delete next[key];
-    } else {
-      next[key] = normalized;
-    }
-  };
-  applyStringField("model", updates.model);
-  applyStringField("review_model", updates.reviewModel);
-  applyStringField("model_reasoning_effort", updates.modelReasoningEffort);
-  applyStringField("model_reasoning_summary", updates.modelReasoningSummary);
-  applyStringField("model_verbosity", updates.modelVerbosity);
-  applyStringField("approval_policy", updates.approvalPolicy);
-  applyStringField("sandbox_mode", updates.sandboxMode);
-  applyStringField("web_search", updates.webSearch);
-  applyStringField("personality", updates.personality);
-  applyNumberField("tool_output_token_limit", updates.toolOutputTokenLimit);
-  applyNumberField("model_auto_compact_token_limit", updates.modelAutoCompactTokenLimit);
-  applyNumberField("model_context_window", updates.modelContextWindow);
-  if (updates.features) {
-    const rawFeatures = typeof next["features"] === "object" && next["features"] !== null && !Array.isArray(next["features"]) ? { ...next["features"] } : {};
-    const applyFeatureField = (key, candidate) => {
-      if (candidate === void 0) {
-        return;
-      }
-      if (candidate === null) {
-        delete rawFeatures[key];
-        return;
-      }
-      rawFeatures[key] = candidate;
-    };
-    for (const [rawKey, candidate] of Object.entries(updates.features)) {
-      const key = rawKey === "unifiedExec" ? "unified_exec" : rawKey === "shellSnapshot" ? "shell_snapshot" : rawKey;
-      applyFeatureField(key, candidate);
-    }
-    if (Object.keys(rawFeatures).length === 0) {
-      delete next["features"];
-    } else {
-      next["features"] = rawFeatures;
-    }
-  }
-  if (updates.tools) {
-    const rawTools = typeof next["tools"] === "object" && next["tools"] !== null && !Array.isArray(next["tools"]) ? { ...next["tools"] } : {};
-    const applyToolField = (key, candidate) => {
-      if (candidate === void 0) {
-        return;
-      }
-      if (candidate === null) {
-        delete rawTools[key];
-      } else {
-        rawTools[key] = candidate;
-      }
-    };
-    applyToolField("web_search", updates.tools.webSearch);
-    applyToolField("view_image", updates.tools.viewImage);
-    if (Object.keys(rawTools).length === 0) {
-      delete next["tools"];
-    } else {
-      next["tools"] = rawTools;
-    }
-  }
-  if (updates.notice) {
-    const rawNotice = next["notice"];
-    const currentNotice = rawNotice && typeof rawNotice === "object" && rawNotice !== null ? { ...rawNotice } : {};
-    const applyBooleanField = (key, candidate) => {
-      if (candidate === void 0) {
-        return;
-      }
-      if (candidate === null) {
-        delete currentNotice[key];
-      } else {
-        currentNotice[key] = candidate;
-      }
-    };
-    const applyRecordField = (key, candidate) => {
-      if (candidate === void 0) {
-        return;
-      }
-      const normalized = normalizeStringRecordInput(candidate);
-      if (!normalized) {
-        delete currentNotice[key];
-      } else {
-        currentNotice[key] = normalized;
-      }
-    };
-    applyBooleanField("hide_full_access_warning", updates.notice.hideFullAccessWarning);
-    applyBooleanField("hide_gpt5_1_migration_prompt", updates.notice.hideGpt51MigrationPrompt);
-    applyBooleanField(
-      "hide_gpt-5.1-codex-max_migration_prompt",
-      updates.notice.hideLegacyGpt51CodexMaxMigrationPrompt
-    );
-    applyBooleanField("hide_rate_limit_model_nudge", updates.notice.hideRateLimitModelNudge);
-    applyRecordField("model_migrations", updates.notice.modelMigrations);
-    if (Object.keys(currentNotice).length === 0) {
-      delete next["notice"];
-    } else {
-      next["notice"] = currentNotice;
-    }
-  }
-  return applySuggestedFixes(next, updates.applyFixes);
-}
-async function readParsedConfigOrThrow(options) {
-  const { content } = await readConfigContent(options);
-  const parsed = tryParseToml(content);
-  if (!parsed.data) {
-    throw new Error(parsed.error ?? "config.toml contains invalid TOML syntax.");
-  }
-  return parsed.data;
-}
 async function getCodexConfigSnapshot(options) {
   const { content, exists } = await readConfigContent(options);
   return buildSnapshot(content, exists, options);
@@ -6127,13 +5945,6 @@ async function saveCodexConfigContent(content, options) {
   await writeConfigContent(normalized, options);
   return buildSnapshot(normalized, true, options);
 }
-async function updateCodexConfigValues(updates, options) {
-  const parsed = await readParsedConfigOrThrow(options);
-  const updated = applyUpdatesToConfig(parsed, updates);
-  const serialized = ensureTrailingNewline((0, import_toml.stringify)(updated));
-  await writeConfigContent(serialized, options);
-  return buildSnapshot(serialized, true, options);
-}
 
 // ../../packages/shared/src/core/logger.ts
 var isTestEnv = process.env.NODE_ENV === "test" || process.env.VITEST === "true" || process.env.VITEST === "1";
@@ -6163,18 +5974,35 @@ function logInfo(...args) {
 var RPC_TIMEOUT_MS = 1e4;
 var ACTIVATION_TURN_TIMEOUT_MS = 9e4;
 var ACTIVATION_PROMPT = "Reply with exactly: ok.";
-var FALLBACK_ACTIVATION_MODEL = "gpt-5.5";
 function resolveActivationModel(configuredModel) {
   const model = configuredModel?.trim();
   if (!model) {
-    return FALLBACK_ACTIVATION_MODEL;
+    return null;
   }
   if (/-codex$/.test(model) || /-codex-mini$/.test(model)) {
-    return FALLBACK_ACTIVATION_MODEL;
+    return null;
   }
   return model;
 }
 var MAX_STDERR_CAPTURE_CHARS = 32768;
+function augmentActivationError(error, info) {
+  const base = error instanceof Error ? error : new Error(String(error));
+  const parts = [];
+  if (info.exitCode !== null) {
+    parts.push(`codex exited code=${info.exitCode}`);
+  }
+  if (info.exitSignal) {
+    parts.push(`signal=${info.exitSignal}`);
+  }
+  const stderrTail = info.stderr.replace(/\s+/g, " ").trim().slice(-400);
+  if (stderrTail) {
+    parts.push(`stderr: ${stderrTail}`);
+  }
+  if (parts.length > 0) {
+    base.message = `${base.message} (${parts.join("; ")})`;
+  }
+  return base;
+}
 var REFRESH_TOKEN_REDEEMED_SNIPPET = "refresh token was already used";
 var authFileCache = /* @__PURE__ */ new Map();
 function isRecord5(value) {
@@ -6733,30 +6561,23 @@ async function activateResetWindowViaRpc(envOverride, options = {}) {
     return { status: "skipped", reason: "auth-missing" };
   }
   let configuredModel = null;
-  let sourceConfigContent = null;
   try {
     const snapshot = await getCodexConfigSnapshot({
       codexHomePath: import_node_path8.default.dirname(sourceAuthPath)
     });
     configuredModel = snapshot.settings.model;
-    if (!snapshot.parseError) {
-      sourceConfigContent = snapshot.content;
-    }
   } catch {
   }
   const activationModel = resolveActivationModel(configuredModel);
-  const tempConfigPath = import_node_path8.default.join(tempHome, "config.toml");
-  await import_node_fs3.promises.writeFile(tempConfigPath, sourceConfigContent ?? "", "utf8").catch(() => {
-  });
-  await updateCodexConfigValues({ model: activationModel }, { codexHomePath: tempHome }).catch(
-    () => import_node_fs3.promises.writeFile(
-      tempConfigPath,
+  if (activationModel) {
+    await import_node_fs3.promises.writeFile(
+      import_node_path8.default.join(tempHome, "config.toml"),
       `model = ${JSON.stringify(activationModel)}
 `,
       "utf8"
-    )
-  ).catch(() => {
-  });
+    ).catch(() => {
+    });
+  }
   const childEnv = buildCodexChildEnv({
     ...envOverride ?? {},
     HOME: tempHome,
@@ -6789,6 +6610,12 @@ async function activateResetWindowViaRpc(envOverride, options = {}) {
     stderrOutput += text.slice(0, Math.max(0, remaining));
   };
   child.stderr?.on("data", onStderrData);
+  let exitCode = null;
+  let exitSignal = null;
+  child.on("exit", (code, signal) => {
+    exitCode = code;
+    exitSignal = signal;
+  });
   try {
     await sendPayload(child, {
       id: 1,
@@ -6860,6 +6687,12 @@ async function activateResetWindowViaRpc(envOverride, options = {}) {
       };
     }
     return { status: "completed", reason: null, threadId, turnId };
+  } catch (error) {
+    throw augmentActivationError(error, {
+      stderr: stderrOutput,
+      exitCode,
+      exitSignal
+    });
   } finally {
     child.stderr?.off("data", onStderrData);
     child.kill();
@@ -10794,7 +10627,6 @@ 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;
@@ -10808,7 +10640,6 @@ 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 = [];
@@ -15439,7 +15270,7 @@ function getDescendantPids(rootPid, rows) {
   return descendants;
 }
 async function waitForNewMainPid(candidate, previousPids) {
-  const deadline = Date.now() + LAUNCH_WAIT_MS;
+  const deadline = Date.now() + CODEX_BRIDGE_LAUNCH_WAIT_MS;
   while (Date.now() < deadline) {
     const rows = await readProcessRows();
     const pid = rows.find((row) => isMainProcessRow(row, candidate) && !previousPids.has(row.pid))?.pid ?? null;
@@ -15451,7 +15282,7 @@ async function waitForNewMainPid(candidate, previousPids) {
   return null;
 }
 async function waitForAppServerPid(mainPid, profileHome) {
-  const deadline = Date.now() + LAUNCH_WAIT_MS;
+  const deadline = Date.now() + CODEX_BRIDGE_LAUNCH_WAIT_MS;
   while (Date.now() < deadline) {
     const pid = await findAppServerPidForProfile(
       await readProcessRows(),
@@ -15531,8 +15362,6 @@ async function hasRecoverableOfficialCodexBridge(cdpPort) {
 }
 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)) {
@@ -15544,30 +15373,18 @@ async function reapStaleOfficialCodexManagedLaunchRows(candidate, rows) {
     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);
+    const appServerPid = findAppServerPid(rows, 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;
-      }
+      continue;
     }
-    break;
+    staleOfficialCodexBridgeMissesByPid.set(row.pid, now);
   }
-  return reaped;
+  return [];
 }
 async function focusOfficialCodexApp(candidate) {
   const result = await runCommand3("/usr/bin/open", [candidate.appPath], 5e3);
@@ -15883,7 +15700,6 @@ async function signalPids(pids, signal) {
   return signaled;
 }
 var SHARED_CODEX_HOME = import_node_path13.default.join((0, import_node_os4.homedir)(), ".codex");
-var sharedHomeCdpWindow = null;
 function toIso(value) {
   return typeof value === "number" && Number.isFinite(value) ? new Date(value).toISOString() : null;
 }
@@ -18411,7 +18227,7 @@ async function ensureCliStorageReady() {
 }
 
 // src/app/main.ts
-var VERSION = true ? "5.2.4" : "0.0.0";
+var VERSION = true ? "5.2.6" : "0.0.0";
 async function runCli() {
   const args = process.argv.slice(2);
   if (args.length === 0) {