codexuse-cli 2.4.19 → 2.5.1

package/dist/index.js

@@ -80,22 +80,6 @@ function normalizeAutoRollSettings(raw) {
   };
 }
 
-// ../../lib/codex-cli-channel.ts
-var KNOWN_CHANNELS = /* @__PURE__ */ new Set(["stable", "alpha"]);
-function parseCodexCliChannel(value) {
-  if (typeof value !== "string") {
-    return null;
-  }
-  const normalized = value.trim().toLowerCase();
-  if (!normalized) {
-    return null;
-  }
-  return KNOWN_CHANNELS.has(normalized) ? normalized : null;
-}
-function normalizeCodexCliChannel(value, fallback = "stable") {
-  return parseCodexCliChannel(value) ?? fallback;
-}
-
 // ../../lib/app-state.ts
 var import_node_fs = require("fs");
 var import_node_async_hooks = require("async_hooks");
@@ -129,6 +113,22 @@ function normalizeChatHistoryScrollbackItems(value) {
   return CHAT_SCROLLBACK_DEFAULT;
 }
 
+// ../../lib/commit-message-prompt.ts
+var DEFAULT_COMMIT_MESSAGE_PROMPT = `Generate a concise git commit message for the following changes. Follow conventional commit format (e.g., feat:, fix:, refactor:, docs:, etc.). Keep the summary line under 72 characters. Only output the commit message, nothing else.
+
+Changes:
+{diff}`;
+function normalizeLineEndings(value) {
+  return value.replace(/\r\n/g, "\n");
+}
+function normalizeCommitMessagePrompt(value) {
+  if (typeof value !== "string") {
+    return null;
+  }
+  const normalized = normalizeLineEndings(value).trim();
+  return normalized.length > 0 ? normalized : null;
+}
+
 // ../../lib/app-state.ts
 var APP_STATE_FILE = "app-state.json";
 var APP_NAME = "codexuse-desktop";
@@ -176,7 +176,6 @@ function createDefaultAppState() {
     app: {
       lastAppVersion: null,
       pendingUpdateVersion: null,
-      cliChannel: "stable",
       lastProfileName: null
     },
     license: {
@@ -207,16 +206,22 @@ function createDefaultAppState() {
       chatHistoryScrollbackItems: CHAT_SCROLLBACK_DEFAULT,
       systemNotificationsEnabled: true,
       subagentSystemNotificationsEnabled: true,
-      dictationEnabled: true,
-      dictationHoldKey: "",
-      dictationPreferredLanguage: null,
-      speakRepliesEnabled: false,
       folderHistory: [],
       pinnedPaths: []
     },
-    projectSettingsByPath: {},
+    runtimeSettings: {},
+    workspaceSettingsByPath: {},
     conversationCategoriesByCwd: {},
     conversationCategoryAssignmentsByCwd: {},
+    git: {
+      commitMessagePrompt: DEFAULT_COMMIT_MESSAGE_PROMPT,
+      commitMessageModelId: null
+    },
+    agents: {
+      multiAgentEnabled: false,
+      maxThreads: 6,
+      maxDepth: 1
+    },
     skills: {
       sources: [],
       installsBySlug: {}
@@ -273,10 +278,17 @@ function normalizeAppState(raw) {
   if (merged.autoRoll.switchThreshold <= merged.autoRoll.warningThreshold || merged.autoRoll.switchThreshold > 100) {
     merged.autoRoll.switchThreshold = Math.min(100, Math.max(merged.autoRoll.warningThreshold + 1, 95));
   }
-  merged.app.cliChannel = merged.app.cliChannel === "alpha" ? "alpha" : "stable";
   merged.app.lastAppVersion = asString(merged.app.lastAppVersion);
   merged.app.pendingUpdateVersion = asString(merged.app.pendingUpdateVersion);
   merged.app.lastProfileName = asString(merged.app.lastProfileName);
+  {
+    const allowedAppKeys = new Set(Object.keys(defaults.app));
+    for (const key of Object.keys(merged.app)) {
+      if (!allowedAppKeys.has(key)) {
+        delete merged.app[key];
+      }
+    }
+  }
   merged.license.licenseKey = asString(merged.license.licenseKey);
   merged.license.purchaseEmail = asString(merged.license.purchaseEmail);
   merged.license.lastVerifiedAt = asString(merged.license.lastVerifiedAt);
@@ -324,15 +336,55 @@ function normalizeAppState(raw) {
   if (!Array.isArray(merged.preferences.pinnedPaths)) {
     merged.preferences.pinnedPaths = [];
   }
-  if (!isRecord(merged.projectSettingsByPath)) {
-    merged.projectSettingsByPath = {};
+  {
+    const allowedPreferenceKeys = new Set(Object.keys(defaults.preferences));
+    for (const key of Object.keys(merged.preferences)) {
+      if (!allowedPreferenceKeys.has(key)) {
+        delete merged.preferences[key];
+      }
+    }
+  }
+  if (!isRecord(merged.runtimeSettings)) {
+    merged.runtimeSettings = {};
+  }
+  const legacyProjectSettingsByPath = isRecord(
+    raw.projectSettingsByPath
+  ) ? raw.projectSettingsByPath : null;
+  if (!isRecord(merged.workspaceSettingsByPath)) {
+    merged.workspaceSettingsByPath = {};
   }
+  if (legacyProjectSettingsByPath) {
+    merged.workspaceSettingsByPath = {
+      ...legacyProjectSettingsByPath,
+      ...merged.workspaceSettingsByPath
+    };
+  }
+  delete merged.projectSettingsByPath;
   if (!isRecord(merged.conversationCategoriesByCwd)) {
     merged.conversationCategoriesByCwd = {};
   }
   if (!isRecord(merged.conversationCategoryAssignmentsByCwd)) {
     merged.conversationCategoryAssignmentsByCwd = {};
   }
+  if (!isRecord(merged.git)) {
+    merged.git = clone(defaults.git);
+  }
+  merged.git.commitMessagePrompt = normalizeCommitMessagePrompt(merged.git.commitMessagePrompt) ?? DEFAULT_COMMIT_MESSAGE_PROMPT;
+  merged.git.commitMessageModelId = asString(merged.git.commitMessageModelId);
+  if (!isRecord(merged.agents)) {
+    merged.agents = clone(defaults.agents);
+  }
+  if (typeof merged.agents.multiAgentEnabled !== "boolean") {
+    merged.agents.multiAgentEnabled = defaults.agents.multiAgentEnabled;
+  }
+  if (!Number.isFinite(merged.agents.maxThreads)) {
+    merged.agents.maxThreads = defaults.agents.maxThreads;
+  }
+  merged.agents.maxThreads = Math.max(1, Math.min(12, Math.round(merged.agents.maxThreads)));
+  if (!Number.isFinite(merged.agents.maxDepth)) {
+    merged.agents.maxDepth = defaults.agents.maxDepth;
+  }
+  merged.agents.maxDepth = Math.max(1, Math.min(4, Math.round(merged.agents.maxDepth)));
   if (!isRecord(merged.skills)) {
     merged.skills = clone(defaults.skills);
   }
@@ -445,7 +497,7 @@ async function withWriteLock(task) {
     return task();
   }
   const previous = writeLock;
-  let release = null;
+  let release;
   writeLock = new Promise((resolve) => {
     release = resolve;
   });
@@ -453,7 +505,9 @@ async function withWriteLock(task) {
   try {
     return await writeLockContext.run(true, task);
   } finally {
-    release?.();
+    if (release) {
+      release();
+    }
   }
 }
 async function initializeAppState(userDataDir) {
@@ -570,17 +624,12 @@ async function getStoredAutoRollSettings() {
   const state = await getAppState();
   return normalizeAutoRollSettings(state.autoRoll);
 }
-async function getCodexCliChannel() {
-  const state = await getAppState();
-  return normalizeCodexCliChannel(state.app.cliChannel);
-}
 async function readCodexSettingsJsonRaw() {
   const state = await getAppState();
   return {
     lastProfileName: state.app.lastProfileName,
     lastAppVersion: state.app.lastAppVersion,
     pendingUpdateVersion: state.app.pendingUpdateVersion,
-    cliChannel: state.app.cliChannel,
     autoRoll: state.autoRoll,
     license: state.license,
     providers: state.providers.list,
@@ -598,9 +647,13 @@ async function readCodexSettingsJsonRaw() {
     subagentSystemNotificationsEnabled: state.preferences.subagentSystemNotificationsEnabled,
     folderHistory: state.preferences.folderHistory,
     pinnedPaths: state.preferences.pinnedPaths,
-    projectSettingsByPath: state.projectSettingsByPath,
+    workspaceSettingsByPath: state.workspaceSettingsByPath,
+    // Legacy compatibility for older consumers.
+    projectSettingsByPath: state.workspaceSettingsByPath,
     categoriesByCwd: state.conversationCategoriesByCwd,
     conversationCategoryByCwd: state.conversationCategoryAssignmentsByCwd,
+    git: state.git,
+    agents: state.agents,
     sync: state.sync
   };
 }
@@ -610,13 +663,11 @@ async function writeCodexSettingsJsonRaw(payload) {
   }
   const autoRoll = parseAutoRoll(payload.autoRoll ?? payload.auto_roll);
   const license = parseStoredLicense(payload.license);
-  const cliChannel = parseCodexCliChannel(payload.cliChannel ?? payload.cli_channel);
   await patchAppState({
     app: {
       lastProfileName: asString2(payload.lastProfileName ?? payload.last_profile_name),
       lastAppVersion: asString2(payload.lastAppVersion ?? payload.last_app_version),
-      pendingUpdateVersion: asString2(payload.pendingUpdateVersion ?? payload.pending_update_version),
-      cliChannel: cliChannel ?? void 0
+      pendingUpdateVersion: asString2(payload.pendingUpdateVersion ?? payload.pending_update_version)
     },
     autoRoll: autoRoll ? {
       enabled: autoRoll.enabled,
@@ -653,9 +704,11 @@ async function writeCodexSettingsJsonRaw(payload) {
       folderHistory: Array.isArray(payload.folderHistory) ? payload.folderHistory : void 0,
       pinnedPaths: Array.isArray(payload.pinnedPaths) ? payload.pinnedPaths : void 0
     },
-    projectSettingsByPath: isRecord2(payload.projectSettingsByPath) ? payload.projectSettingsByPath : void 0,
+    workspaceSettingsByPath: isRecord2(payload.workspaceSettingsByPath) ? payload.workspaceSettingsByPath : isRecord2(payload.projectSettingsByPath) ? payload.projectSettingsByPath : void 0,
     conversationCategoriesByCwd: isRecord2(payload.categoriesByCwd) ? payload.categoriesByCwd : void 0,
     conversationCategoryAssignmentsByCwd: isRecord2(payload.conversationCategoryByCwd) ? payload.conversationCategoryByCwd : void 0,
+    git: isRecord2(payload.git) ? payload.git : void 0,
+    agents: isRecord2(payload.agents) ? payload.agents : void 0,
     sync: isRecord2(payload.sync) ? payload.sync : void 0
   });
 }
@@ -2726,8 +2779,8 @@ var import_node_path4 = __toESM(require("path"));
 // ../../lib/codex-cli.ts
 var import_node_fs3 = require("fs");
 var import_node_path3 = __toESM(require("path"));
+var STABLE_CHANNEL = "stable";
 var cachedStatus = null;
-var cachedChannel = null;
 function fileExists(candidate) {
   if (!candidate) {
     return null;
@@ -2742,11 +2795,11 @@ function fileExists(candidate) {
   }
   return null;
 }
-function resolveBundledCodexBinary(channel) {
+function resolveBundledCodexBinary() {
   const candidates = [];
   const processWithResources = process;
   const resourcesPath = processWithResources.resourcesPath;
-  const packageSegments = channel === "alpha" ? ["@openai", "codex-alpha"] : ["@openai", "codex"];
+  const packageSegments = ["@openai", "codex"];
   if (resourcesPath) {
     candidates.push(
       import_node_path3.default.join(resourcesPath, "app.asar.unpacked", "node_modules", ...packageSegments, "bin", "codex.js")
@@ -2766,51 +2819,30 @@ function resolveBundledCodexBinary(channel) {
   }
   return null;
 }
-function resolveBundledCodexBinaryWithFallback(requestedChannel) {
-  const direct = resolveBundledCodexBinary(requestedChannel);
-  if (direct) {
-    return { path: direct, resolvedChannel: requestedChannel, fallbackUsed: false };
-  }
-  if (requestedChannel === "alpha") {
-    const stable = resolveBundledCodexBinary("stable");
-    if (stable) {
-      return { path: stable, resolvedChannel: "stable", fallbackUsed: true };
-    }
-  }
-  return { path: null, resolvedChannel: null, fallbackUsed: false };
-}
-function buildUnavailableStatus(channel) {
-  const channelLabel = channel === "alpha" ? "alpha " : "";
-  const channelSuffix = channel === "alpha" ? " Switch to Stable in Settings or reinstall CodexUse to restore the CLI." : " Reinstall CodexUse to restore the CLI.";
+function buildUnavailableStatus() {
   return {
     available: false,
     path: null,
-    reason: `Bundled ${channelLabel}Codex CLI is missing.${channelSuffix}`,
+    reason: "Bundled Codex CLI is missing. Reinstall CodexUse to restore the CLI.",
     source: null,
-    channel,
-    requestedChannel: channel,
-    fallbackUsed: false
+    channel: STABLE_CHANNEL
   };
 }
-function evaluateCodexCliStatus(requestedChannel) {
-  const resolved = resolveBundledCodexBinaryWithFallback(requestedChannel);
-  if (resolved.path && resolved.resolvedChannel) {
+function evaluateCodexCliStatus() {
+  const resolvedPath = resolveBundledCodexBinary();
+  if (resolvedPath) {
     return {
       available: true,
-      path: resolved.path,
+      path: resolvedPath,
       reason: null,
       source: "bundled",
-      channel: resolved.resolvedChannel,
-      requestedChannel,
-      fallbackUsed: resolved.fallbackUsed
+      channel: STABLE_CHANNEL
     };
   }
-  return buildUnavailableStatus(requestedChannel);
+  return buildUnavailableStatus();
 }
 async function refreshCodexStatus() {
-  const channel = await getCodexCliChannel();
-  cachedChannel = channel;
-  cachedStatus = evaluateCodexCliStatus(channel);
+  cachedStatus = evaluateCodexCliStatus();
   return { ...cachedStatus };
 }
 var CodexCliMissingError = class extends Error {
@@ -3016,8 +3048,7 @@ async function readSchemaFromLocal() {
   const candidates = [
     process.env.CODEX_CONFIG_SCHEMA_PATH,
     import_node_path4.default.join(process.cwd(), "codex-rs", "core", "config.schema.json"),
-    import_node_path4.default.join(process.cwd(), "node_modules", "@openai", "codex", "codex-rs", "core", "config.schema.json"),
-    import_node_path4.default.join(process.cwd(), "node_modules", "@openai", "codex-alpha", "codex-rs", "core", "config.schema.json")
+    import_node_path4.default.join(process.cwd(), "node_modules", "@openai", "codex", "codex-rs", "core", "config.schema.json")
   ].filter((candidate) => Boolean(candidate));
   for (const candidate of candidates) {
     try {
@@ -3223,7 +3254,7 @@ async function ensureConfigDirExists(filePath) {
   const dir = import_node_path5.default.dirname(filePath);
   await (0, import_promises2.mkdir)(dir, { recursive: true });
 }
-function normalizeLineEndings(content) {
+function normalizeLineEndings2(content) {
   return content.replace(/\r\n/g, "\n");
 }
 function ensureTrailingNewline(content) {
@@ -3520,7 +3551,7 @@ async function readConfigContent() {
     const content = await (0, import_promises2.readFile)(configPath, "utf8");
     return {
       exists: true,
-      content: normalizeLineEndings(content)
+      content: normalizeLineEndings2(content)
     };
   } catch (error) {
     const nodeError = error;
@@ -3536,7 +3567,7 @@ async function readConfigContent() {
 async function writeConfigContent(content) {
   const configPath = getConfigPath();
   await ensureConfigDirExists(configPath);
-  const normalized = ensureTrailingNewline(normalizeLineEndings(content));
+  const normalized = ensureTrailingNewline(normalizeLineEndings2(content));
   await (0, import_promises2.writeFile)(configPath, normalized, "utf8");
 }
 async function getUpdatedAt(configPath, exists) {
@@ -3582,7 +3613,7 @@ async function getCodexConfigSnapshot() {
   return buildSnapshot(content, exists);
 }
 async function saveCodexConfigContent(content) {
-  const normalized = ensureTrailingNewline(normalizeLineEndings(content));
+  const normalized = ensureTrailingNewline(normalizeLineEndings2(content));
   const parsed = tryParseToml(normalized);
   if (!parsed.data) {
     throw new Error(parsed.error ?? "config.toml contains invalid TOML syntax.");
@@ -3935,10 +3966,7 @@ var import_node_child_process2 = require("child_process");
 var import_node_fs5 = require("fs");
 var import_node_path7 = __toESM(require("path"));
 var ENV_HINTS = ["CODEX_BINARY", "CODEX_CLI_PATH", "CODEX_PATH"];
-var NODE_MODULE_CANDIDATES = [
-  ["@openai", "codex"],
-  ["@openai", "codex-alpha"]
-];
+var NODE_MODULE_CANDIDATES = [["@openai", "codex"]];
 function fileExists2(candidate) {
   if (!candidate) return null;
   const resolved = import_node_path7.default.resolve(candidate);
@@ -4507,14 +4535,12 @@ async function loadLegacySettingsPatch() {
   if (!isRecord5(raw)) {
     return {};
   }
-  const cliChannel = parseCodexCliChannel(raw.cliChannel ?? raw.cli_channel);
   const autoRoll = pickAutoRoll(raw.autoRoll ?? raw.auto_roll);
   const license = parseLegacyLicense(raw.license ?? raw.license_data ?? raw.license_state);
   return {
     app: {
       lastAppVersion: asString3(raw.lastAppVersion ?? raw.last_app_version),
       pendingUpdateVersion: asString3(raw.pendingUpdateVersion ?? raw.pending_update_version),
-      cliChannel: cliChannel ?? void 0,
       lastProfileName: asString3(raw.lastProfileName ?? raw.last_profile_name)
     },
     license,
@@ -4709,7 +4735,7 @@ function mergeLegacyLocalStoragePatch(payload) {
   }
   const projectSettings = payload["project-settings-storage"];
   if (isRecord5(projectSettings) && isRecord5(projectSettings.settingsByPath)) {
-    patch.projectSettingsByPath = projectSettings.settingsByPath;
+    patch.workspaceSettingsByPath = projectSettings.settingsByPath;
     markSkippedIfPresent("project-settings-storage", true);
   } else {
     markSkippedIfPresent("project-settings-storage", false);
@@ -4838,9 +4864,9 @@ async function runStorageMigrationV1() {
         preferences: { ...acc.preferences ?? {}, ...patch.preferences ?? {} },
         sync: { ...acc.sync ?? {}, ...patch.sync ?? {} },
         profilesByName: { ...acc.profilesByName ?? {}, ...patch.profilesByName ?? {} },
-        projectSettingsByPath: {
-          ...acc.projectSettingsByPath ?? {},
-          ...patch.projectSettingsByPath ?? {}
+        workspaceSettingsByPath: {
+          ...acc.workspaceSettingsByPath ?? {},
+          ...patch.workspaceSettingsByPath ?? {}
         },
         conversationCategoriesByCwd: {
           ...acc.conversationCategoriesByCwd ?? {},
@@ -4889,9 +4915,9 @@ async function runStorageMigrationV1() {
         ...state.profilesByName,
         ...mergedPatch.profilesByName ?? {}
       },
-      projectSettingsByPath: {
-        ...state.projectSettingsByPath,
-        ...mergedPatch.projectSettingsByPath ?? {}
+      workspaceSettingsByPath: {
+        ...state.workspaceSettingsByPath,
+        ...mergedPatch.workspaceSettingsByPath ?? {}
       },
       conversationCategoriesByCwd: {
         ...state.conversationCategoriesByCwd,
@@ -4978,9 +5004,9 @@ async function importLegacyLocalStorageOnce(payload) {
         }
       },
       preferences: { ...state.preferences, ...patch.preferences ?? {} },
-      projectSettingsByPath: {
-        ...state.projectSettingsByPath,
-        ...patch.projectSettingsByPath ?? {}
+      workspaceSettingsByPath: {
+        ...state.workspaceSettingsByPath,
+        ...patch.workspaceSettingsByPath ?? {}
       },
       conversationCategoriesByCwd: {
         ...state.conversationCategoriesByCwd,
@@ -5010,7 +5036,7 @@ async function importLegacyLocalStorageOnce(payload) {
 }
 
 // src/index.ts
-var VERSION = true ? "2.4.19" : "0.0.0";
+var VERSION = true ? "2.5.1" : "0.0.0";
 var cliStorageReadyPromise = null;
 async function ensureCliStorageReady() {
   if (cliStorageReadyPromise) {