codexuse-cli 5.3.0 → 5.4.1

package/dist/index.js

@@ -2031,9 +2031,10 @@ var import_node_path10 = __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"
+  "gpt-5.6-sol",
+  "gpt-5.6-terra",
+  "gpt-5.6-luna",
+  "gpt-5.5"
 ];
 var LEGACY_ACCOUNT_POOL_EXPOSED_MODELS_DEFAULT = [
   "gpt-5.5",
@@ -2046,7 +2047,8 @@ var DEFAULT_ACCOUNT_POOL_EXPOSED_REASONING_EFFORTS = [
   "low",
   "medium",
   "high",
-  "xhigh"
+  "xhigh",
+  "max"
 ];
 var LEGACY_ACCOUNT_POOL_EXPOSED_REASONING_EFFORTS_DEFAULT = [
   "none",
@@ -2056,13 +2058,22 @@ var LEGACY_ACCOUNT_POOL_EXPOSED_REASONING_EFFORTS_DEFAULT = [
   "high",
   "xhigh"
 ];
+var SUPERSEDED_ACCOUNT_POOL_EXPOSED_MODEL_DEFAULTS = [
+  LEGACY_ACCOUNT_POOL_EXPOSED_MODELS_DEFAULT,
+  ["gpt-5.5", "gpt-5.3-codex-spark", "gpt-5.4-mini"]
+];
+var SUPERSEDED_ACCOUNT_POOL_EXPOSED_REASONING_DEFAULTS = [
+  LEGACY_ACCOUNT_POOL_EXPOSED_REASONING_EFFORTS_DEFAULT,
+  ["none", "low", "medium", "high", "xhigh"]
+];
+function sequenceEquals(a, b) {
+  return a.length === b.length && a.every((value3, index2) => value3 === b[index2]);
+}
 function migrateLegacyAccountPoolExposedModelDefaults(models) {
-  return models.length === LEGACY_ACCOUNT_POOL_EXPOSED_MODELS_DEFAULT.length && models.every((model, index2) => model === LEGACY_ACCOUNT_POOL_EXPOSED_MODELS_DEFAULT[index2]) ? [...DEFAULT_ACCOUNT_POOL_EXPOSED_MODELS] : [...models];
+  return SUPERSEDED_ACCOUNT_POOL_EXPOSED_MODEL_DEFAULTS.some((legacy) => sequenceEquals(models, legacy)) ? [...DEFAULT_ACCOUNT_POOL_EXPOSED_MODELS] : [...models];
 }
 function migrateLegacyAccountPoolExposedReasoningDefaults(efforts) {
-  return efforts.length === LEGACY_ACCOUNT_POOL_EXPOSED_REASONING_EFFORTS_DEFAULT.length && efforts.every(
-    (effort, index2) => effort === LEGACY_ACCOUNT_POOL_EXPOSED_REASONING_EFFORTS_DEFAULT[index2]
-  ) ? [...DEFAULT_ACCOUNT_POOL_EXPOSED_REASONING_EFFORTS] : [...efforts];
+  return SUPERSEDED_ACCOUNT_POOL_EXPOSED_REASONING_DEFAULTS.some((legacy) => sequenceEquals(efforts, legacy)) ? [...DEFAULT_ACCOUNT_POOL_EXPOSED_REASONING_EFFORTS] : [...efforts];
 }
 
 // ../../packages/runtime-app-state/src/app/state.ts
@@ -2150,6 +2161,9 @@ function sanitizeAutoRollPriorityOrder(value3) {
   }
   return normalized;
 }
+function sanitizeAutoRollExcludedAccountKeys(value3) {
+  return sanitizeAutoRollPriorityOrder(value3);
+}
 function sanitizeLowRemainingNotificationThreshold(value3) {
   const numeric = resolveFiniteNumber(value3, DEFAULT_LOW_REMAINING_NOTIFICATION_THRESHOLD);
   return clampNumber(
@@ -2182,6 +2196,9 @@ function normalizeAutoRollSettings(raw) {
     launchOfficialCodexWhenClosedOnAutoRoll: raw?.launchOfficialCodexWhenClosedOnAutoRoll === true ? true : DEFAULT_LAUNCH_OFFICIAL_CODEX_WHEN_CLOSED_ON_AUTO_ROLL,
     handoffRunningThreadsOnAccountSwitch: raw?.handoffRunningThreadsOnAccountSwitch === true ? true : DEFAULT_HANDOFF_RUNNING_THREADS_ON_ACCOUNT_SWITCH,
     priorityOrder: sanitizeAutoRollPriorityOrder(raw?.priorityOrder),
+    excludedAccountKeys: sanitizeAutoRollExcludedAccountKeys(
+      raw?.excludedAccountKeys
+    ),
     lowRemainingNotificationEnabled: raw?.lowRemainingNotificationEnabled === true ? true : DEFAULT_LOW_REMAINING_NOTIFICATION_ENABLED,
     lowRemainingNotificationThreshold: sanitizeLowRemainingNotificationThreshold(
       typeof raw?.lowRemainingNotificationThreshold === "number" ? raw.lowRemainingNotificationThreshold : Number.NaN
@@ -2576,6 +2593,7 @@ function createDefaultAppState() {
       launchOfficialCodexWhenClosedOnAutoRoll: false,
       handoffRunningThreadsOnAccountSwitch: false,
       priorityOrder: [],
+      excludedAccountKeys: [],
       lowRemainingNotificationEnabled: false,
       lowRemainingNotificationThreshold: 1,
       autoActivateResetWindowEnabled: false
@@ -3714,6 +3732,7 @@ async function writeCodexSettingsJsonRaw(payload) {
       launchOfficialCodexWhenClosedOnAutoRoll: autoRoll.launchOfficialCodexWhenClosedOnAutoRoll,
       handoffRunningThreadsOnAccountSwitch: autoRoll.handoffRunningThreadsOnAccountSwitch,
       priorityOrder: autoRoll.priorityOrder,
+      excludedAccountKeys: autoRoll.excludedAccountKeys,
       lowRemainingNotificationEnabled: autoRoll.lowRemainingNotificationEnabled,
       lowRemainingNotificationThreshold: autoRoll.lowRemainingNotificationThreshold,
       autoActivateResetWindowEnabled: autoRoll.autoActivateResetWindowEnabled ?? false
@@ -27588,7 +27607,7 @@ var ProviderItemId = makeEntityId("ProviderItemId");
 var ApprovalRequestId = makeEntityId("ApprovalRequestId");
 
 // ../../packages/contracts/src/model.ts
-var CODEX_REASONING_EFFORT_OPTIONS = ["xhigh", "high", "medium", "low"];
+var CODEX_REASONING_EFFORT_OPTIONS = ["max", "xhigh", "high", "medium", "low"];
 var CodexModelOptions = Schema_exports.Struct({
   reasoningEffort: Schema_exports.optional(Schema_exports.Literals(CODEX_REASONING_EFFORT_OPTIONS)),
   fastMode: Schema_exports.optional(Schema_exports.Boolean)
@@ -27598,6 +27617,9 @@ var ProviderModelOptions = Schema_exports.Struct({
 });
 var MODEL_OPTIONS_BY_PROVIDER = {
   codex: [
+    { slug: "gpt-5.6-sol", name: "GPT-5.6 Sol" },
+    { slug: "gpt-5.6-terra", name: "GPT-5.6 Terra" },
+    { slug: "gpt-5.6-luna", name: "GPT-5.6 Luna" },
     { slug: "gpt-5.5", name: "GPT-5.5" },
     { slug: "gpt-5.4", name: "GPT-5.4" },
     { slug: "gpt-5.4-mini", name: "GPT-5.4 Mini" },
@@ -31325,6 +31347,10 @@ var DESKTOP_RPC_STATE_DIR = "desktop-rpc";
 var ACCOUNT_POOL_STORE_VERSION = 3;
 var MAX_RESPONSE_IDS_PER_SESSION = 64;
 var MODEL_SLUG_ALIASES = {
+  "gpt-5.6": "gpt-5.6-sol",
+  "5.6": "gpt-5.6-sol",
+  "5.6-terra": "gpt-5.6-terra",
+  "5.6-luna": "gpt-5.6-luna",
   "5.5": "gpt-5.5",
   "5.4": "gpt-5.4",
   "5.3": "gpt-5.3-codex",
@@ -33009,6 +33035,10 @@ 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 OFFICIAL_CODEX_APP_NAMES = [
+  "ChatGPT.app",
+  "Codex.app"
+];
 function sleep3(ms) {
   return new Promise((resolve2) => setTimeout(resolve2, ms));
 }
@@ -37537,12 +37567,19 @@ function isMainProcessRow(row, candidate) {
   return row.args.includes(getMainExecutablePath(candidate));
 }
 function findAppServerPid(rows, mainPid) {
+  const descendants = new Set(getDescendantPids(mainPid, rows));
   return rows.find(
-    (row) => row.ppid === mainPid && isAppServerProcessRow(row)
+    (row) => descendants.has(row.pid) && isAppServerProcessRow(row)
   )?.pid ?? null;
 }
 function isAppServerProcessRow(row) {
-  return row.args.includes("/Contents/Resources/codex app-server");
+  const executableMarker = "/Contents/Resources/codex";
+  const executableIndex = row.args.indexOf(executableMarker);
+  if (executableIndex < 0) {
+    return false;
+  }
+  const appServerArgs = row.args.slice(executableIndex + executableMarker.length);
+  return /(?:^|\s)app-server(?:\s|$)/.test(appServerArgs);
 }
 async function processMatchesProfileHome(pid, profileHome) {
   const result2 = await runCommand3(
@@ -37556,8 +37593,9 @@ async function processMatchesProfileHome(pid, profileHome) {
   return result2.stdout.includes(`CODEX_HOME=${profileHome}`) || result2.stdout.includes(profileHome);
 }
 async function findAppServerPidForProfile(rows, mainPid, profileHome) {
+  const descendants = new Set(getDescendantPids(mainPid, rows));
   const candidates = rows.filter(
-    (row) => row.ppid === mainPid && isAppServerProcessRow(row)
+    (row) => descendants.has(row.pid) && isAppServerProcessRow(row)
   );
   for (const row of candidates) {
     if (row.args.includes(profileHome) || await processMatchesProfileHome(row.pid, profileHome)) {
@@ -37700,8 +37738,9 @@ async function stopProcessTree(rootPid, rows) {
 }
 async function stopUnverifiedLaunch(rootPid) {
   try {
-    await stopProcessTree(rootPid, await readProcessRows());
+    return await stopProcessTree(rootPid, await readProcessRows());
   } catch {
+    return [rootPid];
   }
 }
 async function isCodexUseLaunchedProcess(pid) {
@@ -37947,10 +37986,20 @@ async function readBundleString(appPath, key) {
   const bundleId = result2.stdout.trim();
   return bundleId.length > 0 ? bundleId : null;
 }
+function addStandardOfficialCodexAppPaths(rawPaths) {
+  for (const appName of OFFICIAL_CODEX_APP_NAMES) {
+    rawPaths.add(import_node_path13.default.join("/Applications", appName));
+    rawPaths.add(import_node_path13.default.join((0, import_node_os4.homedir)(), "Applications", appName));
+  }
+}
+function officialCodexAppPriority(appPath) {
+  const priority = OFFICIAL_CODEX_APP_NAMES.indexOf(import_node_path13.default.basename(appPath));
+  return priority >= 0 ? priority : OFFICIAL_CODEX_APP_NAMES.length;
+}
 async function collectCodexAppCandidates(rawPaths) {
   const candidates = [];
   for (const appPath of rawPaths) {
-    if (!(0, import_node_fs7.existsSync)(appPath) || import_node_path13.default.basename(appPath) !== "Codex.app") {
+    if (!(0, import_node_fs7.existsSync)(appPath) || !OFFICIAL_CODEX_APP_NAMES.includes(import_node_path13.default.basename(appPath)) || !(0, import_node_fs7.existsSync)(import_node_path13.default.join(appPath, "Contents", "Resources", "codex"))) {
       continue;
     }
     const bundleId = await readBundleString(appPath, "CFBundleIdentifier");
@@ -37961,10 +38010,12 @@ async function collectCodexAppCandidates(rawPaths) {
       appPath,
       bundleId,
       version: await readBundleString(appPath, "CFBundleShortVersionString"),
-      executableName: await readBundleString(appPath, "CFBundleExecutable") ?? "Codex"
+      executableName: await readBundleString(appPath, "CFBundleExecutable") ?? import_node_path13.default.basename(appPath, ".app")
     });
   }
-  return candidates.sort((a, b) => a.appPath.localeCompare(b.appPath));
+  return candidates.sort(
+    (a, b) => officialCodexAppPriority(a.appPath) - officialCodexAppPriority(b.appPath) || a.appPath.localeCompare(b.appPath)
+  );
 }
 async function discoverCodexAppCandidates() {
   const now2 = Date.now();
@@ -37976,8 +38027,7 @@ async function discoverCodexAppCandidates() {
   if (envPath) {
     rawPaths.add(envPath);
   }
-  rawPaths.add("/Applications/Codex.app");
-  rawPaths.add(import_node_path13.default.join((0, import_node_os4.homedir)(), "Applications", "Codex.app"));
+  addStandardOfficialCodexAppPaths(rawPaths);
   const sorted = await collectCodexAppCandidates(rawPaths);
   appDiscoveryCache = {
     envPath,
@@ -38927,7 +38977,7 @@ function compareAutoRollCandidates(a, b, priorityRanks) {
   }
   return a.profile.name.localeCompare(b.profile.name);
 }
-function computeAutoRollCandidate(profiles, usageMap, currentProfileName, currentSummary, switchRemainingThreshold, priorityOrder = [], blockedProfileNames = /* @__PURE__ */ new Set()) {
+function computeAutoRollCandidate(profiles, usageMap, currentProfileName, currentSummary, switchRemainingThreshold, priorityOrder = [], excludedAccountKeys = /* @__PURE__ */ new Set(), blockedProfileNames = /* @__PURE__ */ new Set()) {
   const priorityRanks = /* @__PURE__ */ new Map();
   for (const [index2, key] of priorityOrder.entries()) {
     const normalized = key.trim();
@@ -38936,7 +38986,7 @@ function computeAutoRollCandidate(profiles, usageMap, currentProfileName, curren
     }
   }
   const candidates = profiles.filter(
-    (profile) => profile.name !== currentProfileName && !blockedProfileNames.has(profile.name) && profile.isValid && !profile.tokenStatus?.requiresUserAction
+    (profile) => profile.name !== currentProfileName && !excludedAccountKeys.has(resolveProfileIdentityKeyFromProfile(profile)) && !blockedProfileNames.has(profile.name) && profile.isValid && !profile.tokenStatus?.requiresUserAction
   ).map((profile) => ({
     profile,
     usageSummary: usageMap.get(profile.name)?.usageSummary ?? summarizeRateLimitSnapshot(null)
@@ -39335,6 +39385,26 @@ async function runAutoRollPass(manager, options) {
   if (!current.name) {
     return { switched: false, message: "No active profile.", source: null, target: null };
   }
+  const currentProfile = profiles.find((profile) => profile.name === current.name);
+  if (!currentProfile) {
+    return {
+      switched: false,
+      message: `Current profile '${current.name}' is missing from saved profiles.`,
+      source: current.name,
+      target: null
+    };
+  }
+  const excludedAccountKeys = new Set(options.excludedAccountKeys ?? []);
+  if (excludedAccountKeys.has(
+    resolveProfileIdentityKeyFromProfile(currentProfile)
+  )) {
+    return {
+      switched: false,
+      message: `'${current.name}' is excluded from auto-roll.`,
+      source: current.name,
+      target: null
+    };
+  }
   const codexPath = resolveCodexBinary();
   if (!codexPath) {
     throw new Error("Codex CLI binary not found on PATH. Auto-roll requires codex for live rate limits.");
@@ -39345,15 +39415,6 @@ async function runAutoRollPass(manager, options) {
     usageMap,
     options.rearmRemainingThreshold
   );
-  const currentProfile = profiles.find((profile) => profile.name === current.name);
-  if (!currentProfile) {
-    return {
-      switched: false,
-      message: `Current profile '${current.name}' is missing from saved profiles.`,
-      source: current.name,
-      target: null
-    };
-  }
   const currentUsage = usageMap.get(current.name)?.usageSummary ?? summarizeRateLimitSnapshot(null);
   if (!currentUsage.hasUsage) {
     return {
@@ -39399,6 +39460,7 @@ async function runAutoRollPass(manager, options) {
     currentUsage,
     options.switchRemainingThreshold,
     options.priorityOrder ?? [],
+    excludedAccountKeys,
     options.blockedProfiles
   );
   if (!candidate) {
@@ -39597,6 +39659,7 @@ async function handleProfileCommand(args2, version2) {
             rearmRemainingThreshold,
             dryRun,
             priorityOrder: settings?.priorityOrder ?? [],
+            excludedAccountKeys: settings?.excludedAccountKeys ?? [],
             activateOfficialCodex,
             launchOfficialCodexWhenClosed: settings?.launchOfficialCodexWhenClosedOnAutoRoll === true,
             blockedProfiles,
@@ -39617,6 +39680,7 @@ async function handleProfileCommand(args2, version2) {
         rearmRemainingThreshold,
         dryRun,
         priorityOrder: settings?.priorityOrder ?? [],
+        excludedAccountKeys: settings?.excludedAccountKeys ?? [],
         activateOfficialCodex,
         launchOfficialCodexWhenClosed: settings?.launchOfficialCodexWhenClosedOnAutoRoll === true
       });
@@ -40587,7 +40651,7 @@ async function ensureCliStorageReady() {
 }
 
 // src/app/main.ts
-var VERSION = true ? "5.3.0" : "0.0.0";
+var VERSION = true ? "5.4.1" : "0.0.0";
 async function runCli() {
   const args2 = process.argv.slice(2);
   if (args2.length === 0) {