zcf 3.4.3 → 3.5.1

package/dist/chunks/simple-config.mjs

@@ -13,12 +13,12 @@ import toggleModule from 'inquirer-toggle';
 import ora from 'ora';
 import { exec, x } from 'tinyexec';
 import semver from 'semver';
-import { stringify, parse } from 'smol-toml';
+import { edit, stringify, parse, initSync } from '@rainbowatcher/toml-edit-js';
 import { rm, mkdir, copyFile as copyFile$1 } from 'node:fs/promises';
 import i18next from 'i18next';
 import Backend from 'i18next-fs-backend';
 
-const version = "3.4.3";
+const version = "3.5.1";
 const homepage = "https://github.com/UfoMiao/zcf";
 
 const i18n = i18next.createInstance();
@@ -1852,6 +1852,7 @@ async function configureCcrProxy(ccrConfig) {
   if (!settings.env) {
     settings.env = {};
   }
+  delete settings.env.ANTHROPIC_AUTH_TOKEN;
   settings.env.ANTHROPIC_BASE_URL = `http://${host}:${port}`;
   settings.env.ANTHROPIC_API_KEY = apiKey;
   writeJsonConfig(SETTINGS_FILE, settings);
@@ -2849,6 +2850,34 @@ function addNumbersToChoices(choices, startFrom = 1, format = (n) => `${n}. `) {
   });
 }
 
+let initialized = false;
+function ensureTomlInitSync() {
+  if (!initialized) {
+    initSync();
+    initialized = true;
+  }
+}
+function parseToml(content) {
+  ensureTomlInitSync();
+  return parse(content);
+}
+function stringifyToml(data) {
+  ensureTomlInitSync();
+  return stringify(data);
+}
+function editToml(content, path, value) {
+  ensureTomlInitSync();
+  return edit(content, path, value);
+}
+function batchEditToml(content, edits) {
+  ensureTomlInitSync();
+  let result = content;
+  for (const [path, value] of edits) {
+    result = edit(result, path, value);
+  }
+  return result;
+}
+
 function isSupportedLang(value) {
   return SUPPORTED_LANGS.includes(value);
 }
@@ -2864,18 +2893,117 @@ function readTomlConfig(configPath) {
       return null;
     }
     const content = readFile(configPath);
-    const parsed = parse(content);
+    const parsed = parseToml(content);
     return parsed;
   } catch {
     return null;
   }
 }
+function insertAtTopLevelStart(topLevel, content) {
+  const lines = topLevel.split("\n");
+  let insertLineIndex = 0;
+  for (let i = 0; i < lines.length; i++) {
+    const trimmed = lines[i].trim();
+    if (trimmed === "" || trimmed.startsWith("#")) {
+      insertLineIndex = i + 1;
+    } else {
+      insertLineIndex = i;
+      break;
+    }
+  }
+  lines.splice(insertLineIndex, 0, content.replace(/\n$/, ""));
+  return lines.join("\n");
+}
+function insertAfterVersionField(topLevel, content) {
+  const versionRegex = /^version\s*=\s*["'][^"']*["'][ \t]*(?:#.*)?$/m;
+  const match = topLevel.match(versionRegex);
+  if (match && match.index !== void 0) {
+    const versionEnd = match.index + match[0].length;
+    const before = topLevel.slice(0, versionEnd);
+    const after = topLevel.slice(versionEnd);
+    return `${before}
+${content.replace(/\n$/, "")}${after}`;
+  }
+  return insertAtTopLevelStart(topLevel, content);
+}
+function updateTopLevelTomlFields(content, version, lastUpdated) {
+  const firstSectionMatch = content.match(/^\[/m);
+  const topLevelEnd = firstSectionMatch?.index ?? content.length;
+  let topLevel = content.slice(0, topLevelEnd);
+  const rest = content.slice(topLevelEnd);
+  const versionRegex = /^version\s*=\s*["'][^"']*["'][ \t]*(?:#.*)?$/m;
+  const versionMatch = topLevel.match(versionRegex);
+  if (versionMatch) {
+    topLevel = topLevel.replace(versionRegex, `version = "${version}"`);
+  } else {
+    topLevel = insertAtTopLevelStart(topLevel, `version = "${version}"`);
+  }
+  const lastUpdatedRegex = /^lastUpdated\s*=\s*["'][^"']*["'][ \t]*(?:#.*)?$/m;
+  const lastUpdatedMatch = topLevel.match(lastUpdatedRegex);
+  if (lastUpdatedMatch) {
+    topLevel = topLevel.replace(lastUpdatedRegex, `lastUpdated = "${lastUpdated}"`);
+  } else {
+    topLevel = insertAfterVersionField(topLevel, `lastUpdated = "${lastUpdated}"`);
+  }
+  if (rest.length > 0 && !topLevel.endsWith("\n\n") && !topLevel.endsWith("\n")) {
+    topLevel += "\n";
+  }
+  return topLevel + rest;
+}
 function writeTomlConfig(configPath, config) {
   try {
     const configDir = dirname(configPath);
     ensureDir(configDir);
-    const tomlContent = stringify(config);
-    writeFile(configPath, tomlContent);
+    if (exists(configPath)) {
+      const existingContent = readFile(configPath);
+      const edits = [
+        // General section
+        ["general.preferredLang", config.general.preferredLang],
+        ["general.currentTool", config.general.currentTool]
+      ];
+      if (config.general.templateLang !== void 0) {
+        edits.push(["general.templateLang", config.general.templateLang]);
+      }
+      if (config.general.aiOutputLang !== void 0) {
+        edits.push(["general.aiOutputLang", config.general.aiOutputLang]);
+      }
+      edits.push(
+        ["claudeCode.enabled", config.claudeCode.enabled],
+        ["claudeCode.outputStyles", config.claudeCode.outputStyles],
+        ["claudeCode.installType", config.claudeCode.installType]
+      );
+      if (config.claudeCode.defaultOutputStyle !== void 0) {
+        edits.push(["claudeCode.defaultOutputStyle", config.claudeCode.defaultOutputStyle]);
+      }
+      if (config.claudeCode.currentProfile !== void 0) {
+        edits.push(["claudeCode.currentProfile", config.claudeCode.currentProfile]);
+      }
+      if (config.claudeCode.profiles !== void 0) {
+        edits.push(["claudeCode.profiles", config.claudeCode.profiles]);
+      }
+      if (config.claudeCode.version !== void 0) {
+        edits.push(["claudeCode.version", config.claudeCode.version]);
+      }
+      edits.push(
+        ["codex.enabled", config.codex.enabled],
+        ["codex.systemPromptStyle", config.codex.systemPromptStyle]
+      );
+      try {
+        let updatedContent = batchEditToml(existingContent, edits);
+        updatedContent = updateTopLevelTomlFields(
+          updatedContent,
+          config.version,
+          config.lastUpdated
+        );
+        writeFile(configPath, updatedContent);
+      } catch {
+        const tomlContent = stringifyToml(config);
+        writeFile(configPath, tomlContent);
+      }
+    } else {
+      const tomlContent = stringifyToml(config);
+      writeFile(configPath, tomlContent);
+    }
   } catch {
   }
 }
@@ -3379,6 +3507,147 @@ function applyCodexPlatformCommand(config) {
   }
 }
 
+function updateTopLevelTomlField(content, field, value, options = {}) {
+  if (!content) {
+    if (value === null) {
+      return "";
+    }
+    const commentPrefix = options.commented ? "# " : "";
+    return `${commentPrefix}${field} = "${value}"
+`;
+  }
+  const firstSectionMatch = content.match(/^\[/m);
+  const topLevelEnd = firstSectionMatch?.index ?? content.length;
+  let topLevel = content.slice(0, topLevelEnd);
+  const rest = content.slice(topLevelEnd);
+  const fieldRegex = new RegExp(`^(#\\s*)?${field}\\s*=\\s*["'][^"']*["'][ \\t]*(?:#.*)?$`, "m");
+  const existingMatch = topLevel.match(fieldRegex);
+  if (value === null) {
+    if (existingMatch) {
+      topLevel = topLevel.replace(fieldRegex, "").replace(/\n{2,}/g, "\n\n");
+    }
+  } else {
+    const commentPrefix = options.commented ? "# " : "";
+    const newLine = `${commentPrefix}${field} = "${value}"`;
+    if (existingMatch) {
+      topLevel = topLevel.replace(fieldRegex, newLine);
+    } else {
+      topLevel = `${topLevel.trimEnd()}
+${newLine}
+`;
+    }
+  }
+  if (rest.length > 0 && !topLevel.endsWith("\n\n")) {
+    topLevel = `${topLevel.trimEnd()}
+
+`;
+  }
+  return topLevel + rest;
+}
+function updateCodexApiFields(fields) {
+  if (!exists(CODEX_CONFIG_FILE)) {
+    ensureDir(CODEX_DIR);
+    writeFile(CODEX_CONFIG_FILE, "");
+  }
+  let content = readFile(CODEX_CONFIG_FILE) || "";
+  if (fields.model !== void 0) {
+    content = updateTopLevelTomlField(content, "model", fields.model);
+  }
+  if (fields.modelProvider !== void 0) {
+    content = updateTopLevelTomlField(
+      content,
+      "model_provider",
+      fields.modelProvider,
+      { commented: fields.modelProviderCommented }
+    );
+  }
+  writeFile(CODEX_CONFIG_FILE, content);
+}
+function upsertCodexProvider(providerId, provider) {
+  if (!exists(CODEX_CONFIG_FILE)) {
+    ensureDir(CODEX_DIR);
+    writeFile(CODEX_CONFIG_FILE, "");
+  }
+  let content = readFile(CODEX_CONFIG_FILE) || "";
+  const basePath = `model_providers.${providerId}`;
+  content = editToml(content, `${basePath}.name`, provider.name);
+  content = editToml(content, `${basePath}.base_url`, provider.baseUrl);
+  content = editToml(content, `${basePath}.wire_api`, provider.wireApi);
+  content = editToml(content, `${basePath}.temp_env_key`, provider.tempEnvKey);
+  content = editToml(content, `${basePath}.requires_openai_auth`, provider.requiresOpenaiAuth);
+  if (provider.model) {
+    content = editToml(content, `${basePath}.model`, provider.model);
+  }
+  writeFile(CODEX_CONFIG_FILE, content);
+}
+function deleteCodexProvider(providerId) {
+  if (!exists(CODEX_CONFIG_FILE)) {
+    return;
+  }
+  const content = readFile(CODEX_CONFIG_FILE) || "";
+  const sectionRegex = new RegExp(
+    `\\n?\\[model_providers\\.${escapeRegex(providerId)}\\][\\s\\S]*?(?=\\n\\[|$)`,
+    "g"
+  );
+  const updatedContent = content.replace(sectionRegex, "");
+  writeFile(CODEX_CONFIG_FILE, updatedContent);
+}
+function upsertCodexMcpService(serviceId, service) {
+  if (!exists(CODEX_CONFIG_FILE)) {
+    ensureDir(CODEX_DIR);
+    writeFile(CODEX_CONFIG_FILE, "");
+  }
+  let content = readFile(CODEX_CONFIG_FILE) || "";
+  const basePath = `mcp_servers.${serviceId}`;
+  const parsed = content ? parseToml(content) : {};
+  const existingService = parsed.mcp_servers?.[serviceId];
+  if (existingService?.url && !existingService?.command) {
+    if (service.env && Object.keys(service.env).length > 0) {
+      content = editToml(content, `${basePath}.env`, service.env);
+    }
+    if (service.startup_timeout_sec) {
+      content = editToml(content, `${basePath}.startup_timeout_sec`, service.startup_timeout_sec);
+    }
+  } else {
+    const normalizedCommand = normalizeTomlPath(service.command);
+    content = editToml(content, `${basePath}.command`, normalizedCommand);
+    content = editToml(content, `${basePath}.args`, service.args || []);
+    if (service.env && Object.keys(service.env).length > 0) {
+      content = editToml(content, `${basePath}.env`, service.env);
+    }
+    if (service.startup_timeout_sec) {
+      content = editToml(content, `${basePath}.startup_timeout_sec`, service.startup_timeout_sec);
+    }
+  }
+  writeFile(CODEX_CONFIG_FILE, content);
+}
+function batchUpdateCodexMcpServices(services, options = {}) {
+  if (options.replaceAll) {
+    if (exists(CODEX_CONFIG_FILE)) {
+      let content = readFile(CODEX_CONFIG_FILE) || "";
+      content = content.replace(/\n?\[mcp_servers\.[^\]]+\][\s\S]*?(?=\n\[|$)/g, "");
+      content = content.replace(/\n?#\s*---\s*MCP servers added by ZCF\s*---\s*/gi, "");
+      writeFile(CODEX_CONFIG_FILE, content);
+    }
+  }
+  for (const service of services) {
+    upsertCodexMcpService(service.id, service);
+  }
+}
+function escapeRegex(str) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
+const codexTomlUpdater = {
+  __proto__: null,
+  batchUpdateCodexMcpServices: batchUpdateCodexMcpServices,
+  deleteCodexProvider: deleteCodexProvider,
+  updateCodexApiFields: updateCodexApiFields,
+  updateTopLevelTomlField: updateTopLevelTomlField,
+  upsertCodexMcpService: upsertCodexMcpService,
+  upsertCodexProvider: upsertCodexProvider
+};
+
 async function configureCodexMcp(options) {
   ensureI18nInitialized();
   const { skipPrompt = false } = options ?? {};
@@ -3395,7 +3664,6 @@ async function configureCodexMcp(options) {
       return;
     }
     const defaultServiceIds = Array.isArray(options?.mcpServices) ? options.mcpServices : MCP_SERVICE_CONFIGS.filter((service) => !service.requiresApiKey).map((service) => service.id);
-    const baseProviders2 = existingConfig?.providers || [];
     const existingServices2 = existingConfig?.mcpServices || [];
     const selection2 = [];
     for (const id of defaultServiceIds) {
@@ -3449,13 +3717,7 @@ async function configureCodexMcp(options) {
       }
       return svc;
     });
-    writeCodexConfig({
-      model: existingConfig?.model || null,
-      modelProvider: existingConfig?.modelProvider || null,
-      providers: baseProviders2,
-      mcpServices: finalServices2,
-      otherConfig: existingConfig?.otherConfig || []
-    });
+    batchUpdateCodexMcpServices(finalServices2);
     updateZcfConfig({ codeToolType: "codex" });
     console.log(ansis.green(i18n.t("codex:mcpConfigured")));
     return;
@@ -3464,7 +3726,6 @@ async function configureCodexMcp(options) {
   if (!selectedIds)
     return;
   const servicesMeta = await getMcpServices();
-  const baseProviders = existingConfig?.providers || [];
   const selection = [];
   const existingServices = existingConfig?.mcpServices || [];
   if (selectedIds.length === 0) {
@@ -3484,13 +3745,7 @@ async function configureCodexMcp(options) {
       }
       return svc;
     });
-    writeCodexConfig({
-      model: existingConfig?.model || null,
-      modelProvider: existingConfig?.modelProvider || null,
-      providers: baseProviders,
-      mcpServices: preserved,
-      otherConfig: existingConfig?.otherConfig || []
-    });
+    batchUpdateCodexMcpServices(preserved);
     updateZcfConfig({ codeToolType: "codex" });
     return;
   }
@@ -3559,13 +3814,7 @@ async function configureCodexMcp(options) {
     }
     return svc;
   });
-  writeCodexConfig({
-    model: existingConfig?.model || null,
-    modelProvider: existingConfig?.modelProvider || null,
-    providers: baseProviders,
-    mcpServices: finalServices,
-    otherConfig: existingConfig?.otherConfig || []
-  });
+  batchUpdateCodexMcpServices(finalServices);
   updateZcfConfig({ codeToolType: "codex" });
   console.log(ansis.green(i18n.t("codex:mcpConfigured")));
 }
@@ -3827,7 +4076,7 @@ function parseCodexConfig(content) {
     const normalizedContent = content.replace(/(SYSTEMROOT\s*=\s*")[^"\n]+("?)/g, (match) => {
       return match.replace(/\\\\/g, "/").replace(/\\/g, "/").replace('C:/Windows"?', 'C:/Windows"');
     });
-    const tomlData = parse(normalizedContent);
+    const tomlData = parseToml(normalizedContent);
     const providers = [];
     if (tomlData.model_providers) {
       for (const [id, providerData] of Object.entries(tomlData.model_providers)) {
@@ -3961,70 +4210,6 @@ function parseCodexConfig(content) {
     };
   }
 }
-function formatInlineTableValue(value) {
-  if (value === null || value === void 0) {
-    return "";
-  }
-  if (typeof value === "string") {
-    const normalized = normalizeTomlPath(value);
-    return `'${normalized}'`;
-  }
-  if (typeof value === "number" || typeof value === "boolean") {
-    return String(value);
-  }
-  if (Array.isArray(value)) {
-    const items = value.map((item) => {
-      if (typeof item === "string") {
-        const normalized = normalizeTomlPath(item);
-        return `'${normalized}'`;
-      }
-      if (typeof item === "object" && item !== null && !Array.isArray(item)) {
-        return formatInlineTable(item);
-      }
-      return String(item);
-    }).join(", ");
-    return `[${items}]`;
-  }
-  if (typeof value === "object") {
-    return formatInlineTable(value);
-  }
-  return String(value);
-}
-function formatInlineTable(obj) {
-  const entries = Object.entries(obj).filter(([_, v]) => v !== null && v !== void 0).map(([k, v]) => `${k} = ${formatInlineTableValue(v)}`).join(", ");
-  return `{${entries}}`;
-}
-function formatTomlField(key, value) {
-  if (value === null || value === void 0) {
-    return "";
-  }
-  if (typeof value === "string") {
-    const normalized = normalizeTomlPath(value);
-    const escaped = normalized.replace(/"/g, '\\"');
-    return `${key} = "${escaped}"`;
-  }
-  if (typeof value === "number" || typeof value === "boolean") {
-    return `${key} = ${value}`;
-  }
-  if (Array.isArray(value)) {
-    const items = value.map((item) => {
-      if (typeof item === "string") {
-        const normalized = normalizeTomlPath(item);
-        const escaped = normalized.replace(/"/g, '\\"');
-        return `"${escaped}"`;
-      }
-      if (typeof item === "object" && item !== null && !Array.isArray(item)) {
-        return formatInlineTable(item);
-      }
-      return String(item);
-    }).join(", ");
-    return `${key} = [${items}]`;
-  }
-  if (typeof value === "object") {
-    return `${key} = ${formatInlineTable(value)}`;
-  }
-  return "";
-}
 function readCodexConfig() {
   if (!exists(CODEX_CONFIG_FILE))
     return null;
@@ -4036,100 +4221,6 @@ function readCodexConfig() {
     return null;
   }
 }
-function renderCodexConfig(data) {
-  const lines = [];
-  if (data.model || data.modelProvider || data.providers.length > 0 || data.modelProviderCommented) {
-    lines.push("# --- model provider added by ZCF ---");
-    if (data.model) {
-      lines.push(`model = "${data.model}"`);
-    }
-    if (data.modelProvider) {
-      const commentPrefix = data.modelProviderCommented ? "# " : "";
-      lines.push(`${commentPrefix}model_provider = "${data.modelProvider}"`);
-    }
-    lines.push("");
-  }
-  if (data.otherConfig && data.otherConfig.length > 0) {
-    const preserved = data.otherConfig.filter((raw) => {
-      const l = String(raw).trim();
-      if (!l)
-        return false;
-      if (/^#\s*---\s*model provider added by ZCF\s*---\s*$/i.test(l))
-        return false;
-      if (/^#\s*---\s*MCP servers added by ZCF\s*---\s*$/i.test(l))
-        return false;
-      if (/^\[\s*mcp_servers\./i.test(l))
-        return false;
-      if (/^\[\s*model_providers\./i.test(l))
-        return false;
-      if (/^#?\s*model_provider\s*=/.test(l))
-        return false;
-      if (/^\s*model\s*=/.test(l) && !l.includes("["))
-        return false;
-      return true;
-    });
-    if (preserved.length > 0) {
-      lines.push(...preserved);
-      if (data.providers.length > 0 || data.mcpServices.length > 0) {
-        lines.push("");
-      }
-    }
-  }
-  if (data.providers.length > 0) {
-    for (const provider of data.providers) {
-      lines.push("");
-      lines.push(`[model_providers.${provider.id}]`);
-      lines.push(`name = "${provider.name}"`);
-      lines.push(`base_url = "${provider.baseUrl}"`);
-      lines.push(`wire_api = "${provider.wireApi}"`);
-      lines.push(`temp_env_key = "${provider.tempEnvKey}"`);
-      lines.push(`requires_openai_auth = ${provider.requiresOpenaiAuth}`);
-      if (provider.model) {
-        lines.push(`model = "${provider.model}"`);
-      }
-    }
-  }
-  if (data.mcpServices.length > 0) {
-    lines.push("");
-    lines.push("# --- MCP servers added by ZCF ---");
-    for (const service of data.mcpServices) {
-      lines.push(`[mcp_servers.${service.id}]`);
-      const normalizedCommand = normalizeTomlPath(service.command);
-      lines.push(`command = "${normalizedCommand}"`);
-      const argsString = service.args.length > 0 ? service.args.map((arg) => `"${arg}"`).join(", ") : "";
-      lines.push(`args = [${argsString}]`);
-      if (service.env && Object.keys(service.env).length > 0) {
-        const envEntries = Object.entries(service.env).map(([key, value]) => `${key} = '${value}'`).join(", ");
-        lines.push(`env = {${envEntries}}`);
-      }
-      if (service.startup_timeout_sec) {
-        lines.push(`startup_timeout_sec = ${service.startup_timeout_sec}`);
-      }
-      if (service.extraFields) {
-        for (const [key, value] of Object.entries(service.extraFields)) {
-          const formatted = formatTomlField(key, value);
-          if (formatted) {
-            lines.push(formatted);
-          }
-        }
-      }
-      lines.push("");
-    }
-    if (lines[lines.length - 1] === "") {
-      lines.pop();
-    }
-  }
-  let result = lines.join("\n");
-  if (result && !result.endsWith("\n")) {
-    result += "\n";
-  }
-  return result;
-}
-function writeCodexConfig(data) {
-  ensureEnvKeyMigration();
-  ensureDir(CODEX_DIR);
-  writeFile(CODEX_CONFIG_FILE, renderCodexConfig(data));
-}
 function writeAuthFile(newEntries) {
   ensureDir(CODEX_DIR);
   const existing = readJsonConfig(CODEX_AUTH_FILE, { defaultValue: {} }) || {};
@@ -4260,7 +4351,6 @@ async function runCodexWorkflowImportWithLanguageSelection(options) {
 async function runCodexSystemPromptSelection(skipPrompt = false) {
   ensureI18nInitialized();
   const rootDir = getRootDir$1();
-  const templateRoot = join(rootDir, "templates", "codex");
   const zcfConfig$1 = readZcfConfig();
   const { readDefaultTomlConfig: readDefaultTomlConfig2 } = await Promise.resolve().then(function () { return zcfConfig; });
   const tomlConfig = readDefaultTomlConfig2();
@@ -4273,10 +4363,9 @@ async function runCodexSystemPromptSelection(skipPrompt = false) {
     // Pass skipPrompt flag
   );
   updateZcfConfig({ templateLang: preferredLang });
-  let langDir = join(templateRoot, preferredLang);
-  if (!exists(langDir))
-    langDir = join(templateRoot, "zh-CN");
-  const systemPromptSrc = join(langDir, "system-prompt");
+  let systemPromptSrc = join(rootDir, "templates", "common", "output-styles", preferredLang);
+  if (!exists(systemPromptSrc))
+    systemPromptSrc = join(rootDir, "templates", "common", "output-styles", "zh-CN");
   if (!exists(systemPromptSrc))
     return;
   const availablePrompts = [
@@ -4338,17 +4427,17 @@ async function runCodexWorkflowSelection(options) {
   ensureI18nInitialized();
   const { skipPrompt = false, workflows: presetWorkflows = [] } = options ?? {};
   const rootDir = getRootDir$1();
-  const templateRoot = join(rootDir, "templates", "codex");
   const zcfConfig = readZcfConfig();
   const templateLang = zcfConfig?.templateLang || zcfConfig?.preferredLang || "en";
-  const preferredLang = templateLang === "en" ? "en" : "zh-CN";
-  let langDir = join(templateRoot, preferredLang);
-  if (!exists(langDir))
-    langDir = join(templateRoot, "zh-CN");
-  const workflowSrc = join(langDir, "workflow");
+  let preferredLang = templateLang === "en" ? "en" : "zh-CN";
+  const workflowSrc = join(rootDir, "templates", "common", "workflow");
   if (!exists(workflowSrc))
     return;
-  const allWorkflows = getAllWorkflowFiles(workflowSrc);
+  let allWorkflows = getAllWorkflowFiles(workflowSrc, preferredLang);
+  if (allWorkflows.length === 0 && preferredLang === "en") {
+    preferredLang = "zh-CN";
+    allWorkflows = getAllWorkflowFiles(workflowSrc, preferredLang);
+  }
   if (allWorkflows.length === 0)
     return;
   if (skipPrompt) {
@@ -4362,9 +4451,9 @@ async function runCodexWorkflowSelection(options) {
       const selectedWorkflows = allWorkflows.filter(
         (workflow) => presetWorkflows.includes(workflow.name)
       );
-      workflowsToInstall = expandSelectedWorkflowPaths(selectedWorkflows.map((w) => w.path), workflowSrc);
+      workflowsToInstall = expandSelectedWorkflowPaths(selectedWorkflows.map((w) => w.path), workflowSrc, preferredLang);
     } else {
-      workflowsToInstall = expandSelectedWorkflowPaths(allWorkflows.map((w) => w.path), workflowSrc);
+      workflowsToInstall = expandSelectedWorkflowPaths(allWorkflows.map((w) => w.path), workflowSrc, preferredLang);
     }
     for (const workflowPath of workflowsToInstall) {
       const content = readFile(workflowPath);
@@ -4392,7 +4481,7 @@ async function runCodexWorkflowSelection(options) {
   if (backupPath) {
     console.log(ansis.gray(getBackupMessage(backupPath)));
   }
-  const finalWorkflowPaths = expandSelectedWorkflowPaths(workflows, workflowSrc);
+  const finalWorkflowPaths = expandSelectedWorkflowPaths(workflows, workflowSrc, preferredLang);
   for (const workflowPath of finalWorkflowPaths) {
     const content = readFile(workflowPath);
     const filename = workflowPath.split("/").pop() || "workflow.md";
@@ -4401,19 +4490,16 @@ async function runCodexWorkflowSelection(options) {
   }
 }
 const GIT_GROUP_SENTINEL = "::gitGroup";
-function getAllWorkflowFiles(dirPath) {
+function getAllWorkflowFiles(workflowSrc, preferredLang) {
   const workflows = [];
-  const sixStepDir = join(dirPath, "sixStep", "prompts");
-  if (exists(sixStepDir)) {
-    const workflowFile = join(sixStepDir, "workflow.md");
-    if (exists(workflowFile)) {
-      workflows.push({
-        name: i18n.t("workflow:workflowOption.sixStepsWorkflow"),
-        path: workflowFile
-      });
-    }
+  const sixStepFile = join(workflowSrc, "sixStep", preferredLang, "workflow.md");
+  if (exists(sixStepFile)) {
+    workflows.push({
+      name: i18n.t("workflow:workflowOption.sixStepsWorkflow"),
+      path: sixStepFile
+    });
   }
-  const gitPromptsDir = join(dirPath, "git", "prompts");
+  const gitPromptsDir = join(workflowSrc, "git", preferredLang);
   if (exists(gitPromptsDir)) {
     workflows.push({
       name: i18n.t("workflow:workflowOption.gitWorkflow"),
@@ -4423,19 +4509,19 @@ function getAllWorkflowFiles(dirPath) {
   }
   return workflows;
 }
-function expandSelectedWorkflowPaths(paths, workflowSrc) {
+function expandSelectedWorkflowPaths(paths, workflowSrc, preferredLang) {
   const expanded = [];
   for (const p of paths) {
     if (p === GIT_GROUP_SENTINEL) {
-      expanded.push(...getGitPromptFiles(workflowSrc));
+      expanded.push(...getGitPromptFiles(workflowSrc, preferredLang));
     } else {
       expanded.push(p);
     }
   }
   return expanded;
 }
-function getGitPromptFiles(workflowSrc) {
-  const gitDir = join(workflowSrc, "git", "prompts");
+function getGitPromptFiles(workflowSrc, preferredLang) {
+  const gitPromptsDir = join(workflowSrc, "git", preferredLang);
   const files = [
     "git-commit.md",
     "git-rollback.md",
@@ -4444,7 +4530,7 @@ function getGitPromptFiles(workflowSrc) {
   ];
   const resolved = [];
   for (const f of files) {
-    const full = join(gitDir, f);
+    const full = join(gitPromptsDir, f);
     if (exists(full))
       resolved.push(full);
   }
@@ -4477,12 +4563,11 @@ async function applyCustomApiConfig(customApiConfig) {
   }
   const existingConfig = readCodexConfig();
   const existingAuth = readJsonConfig(CODEX_AUTH_FILE, { defaultValue: {} }) || {};
-  const providers = [];
   const authEntries = { ...existingAuth };
   const providerId = type === "auth_token" ? "official-auth-token" : "custom-api-key";
   const providerName = type === "auth_token" ? "Official Auth Token" : "Custom API Key";
   const existingProvider = existingConfig?.providers.find((p) => p.id === providerId);
-  providers.push({
+  const newProvider = {
     id: providerId,
     name: providerName,
     baseUrl: baseUrl || existingProvider?.baseUrl || "https://api.anthropic.com",
@@ -4490,24 +4575,18 @@ async function applyCustomApiConfig(customApiConfig) {
     tempEnvKey: existingProvider?.tempEnvKey || `${providerId.toUpperCase()}_API_KEY`,
     requiresOpenaiAuth: existingProvider?.requiresOpenaiAuth ?? false,
     model: model || existingProvider?.model
-  });
-  if (existingConfig?.providers) {
-    providers.push(...existingConfig.providers.filter((p) => p.id !== providerId));
-  }
+  };
   if (token) {
     authEntries[providerId] = token;
     authEntries.OPENAI_API_KEY = token;
   }
-  const configData = {
+  const { updateCodexApiFields, upsertCodexProvider } = await Promise.resolve().then(function () { return codexTomlUpdater; });
+  updateCodexApiFields({
     model: model || existingConfig?.model || "claude-3-5-sonnet-20241022",
-    // Prefer provided model, then existing, fallback default
     modelProvider: providerId,
-    modelProviderCommented: false,
-    providers,
-    mcpServices: existingConfig?.mcpServices || [],
-    otherConfig: existingConfig?.otherConfig || []
-  };
-  writeCodexConfig(configData);
+    modelProviderCommented: false
+  });
+  upsertCodexProvider(providerId, newProvider);
   writeJsonConfig(CODEX_AUTH_FILE, authEntries);
   updateZcfConfig({ codeToolType: "codex" });
   console.log(ansis.green(`\u2714 ${i18n.t("codex:apiConfigured")}`));
@@ -4678,7 +4757,7 @@ async function configureCodexApi(options) {
         type: "input",
         name: "model",
         message: `${i18n.t("configuration:enterCustomModel")}${i18n.t("common:emptyToSkip")}`,
-        default: "gpt-5-codex"
+        default: "gpt-5.2"
       }]);
       if (model.trim()) {
         customModel = model.trim();
@@ -4717,7 +4796,7 @@ async function configureCodexApi(options) {
       wireApi: selectedProvider2 === "custom" ? answers.wireApi || "responses" : prefilledWireApi,
       tempEnvKey,
       requiresOpenaiAuth: true,
-      model: customModel || prefilledModel || "gpt-5-codex"
+      model: customModel || prefilledModel || "gpt-5.2"
       // Use custom model, provider's default model, or fallback
     };
     providers.push(newProvider);
@@ -4747,13 +4826,15 @@ async function configureCodexApi(options) {
     if (defaultApiKey)
       authEntries.OPENAI_API_KEY = defaultApiKey;
   }
-  writeCodexConfig({
-    model: existingConfig?.model || null,
+  const { updateCodexApiFields, upsertCodexProvider } = await Promise.resolve().then(function () { return codexTomlUpdater; });
+  updateCodexApiFields({
+    model: existingConfig?.model,
     modelProvider: defaultProvider,
-    providers,
-    mcpServices: existingConfig?.mcpServices || [],
-    otherConfig: existingConfig?.otherConfig || []
+    modelProviderCommented: false
   });
+  for (const provider of providers) {
+    upsertCodexProvider(provider.id, provider);
+  }
   writeAuthFile(authEntries);
   updateZcfConfig({ codeToolType: "codex" });
   console.log(ansis.green(i18n.t("codex:apiConfigured")));
@@ -4941,12 +5022,12 @@ async function switchCodexProvider(providerId) {
   if (backupPath) {
     console.log(ansis.gray(getBackupMessage(backupPath)));
   }
-  const updatedConfig = {
-    ...existingConfig,
-    modelProvider: providerId
-  };
   try {
-    writeCodexConfig(updatedConfig);
+    const { updateCodexApiFields } = await Promise.resolve().then(function () { return codexTomlUpdater; });
+    updateCodexApiFields({
+      modelProvider: providerId,
+      modelProviderCommented: false
+    });
     console.log(ansis.green(i18n.t("codex:providerSwitchSuccess", { provider: providerId })));
     return true;
   } catch (error) {
@@ -4970,19 +5051,18 @@ async function switchToOfficialLogin() {
     if (!preservedModelProvider) {
       try {
         const rawContent = readFile(CODEX_CONFIG_FILE);
-        const parsedToml = parse(rawContent);
+        const parsedToml = parseToml(rawContent);
         if (typeof parsedToml.model_provider === "string" && parsedToml.model_provider.trim().length > 0)
           preservedModelProvider = parsedToml.model_provider.trim();
       } catch {
       }
     }
     const shouldCommentModelProvider = typeof preservedModelProvider === "string" && preservedModelProvider.length > 0;
-    const updatedConfig = {
-      ...existingConfig,
+    const { updateCodexApiFields } = await Promise.resolve().then(function () { return codexTomlUpdater; });
+    updateCodexApiFields({
       modelProvider: shouldCommentModelProvider ? preservedModelProvider : existingConfig.modelProvider,
-      modelProviderCommented: shouldCommentModelProvider ? true : existingConfig.modelProviderCommented
-    };
-    writeCodexConfig(updatedConfig);
+      modelProviderCommented: shouldCommentModelProvider || existingConfig.modelProviderCommented
+    });
     const auth = readJsonConfig(CODEX_AUTH_FILE, { defaultValue: {} }) || {};
     auth.OPENAI_API_KEY = null;
     writeJsonConfig(CODEX_AUTH_FILE, auth, { pretty: true });
@@ -5015,18 +5095,18 @@ async function switchToProvider(providerId) {
       targetModel = provider.model;
     } else {
       const currentModel = existingConfig.model;
-      if (currentModel !== "gpt-5" && currentModel !== "gpt-5-codex") {
-        targetModel = "gpt-5-codex";
+      const knownModels = ["gpt-5.1-codex-max", "gpt-5.1-codex-mini", "gpt-5.2"];
+      if (!currentModel || !knownModels.includes(currentModel)) {
+        targetModel = "gpt-5.2";
       }
     }
-    const updatedConfig = {
-      ...existingConfig,
+    const { updateCodexApiFields } = await Promise.resolve().then(function () { return codexTomlUpdater; });
+    updateCodexApiFields({
       model: targetModel,
       modelProvider: providerId,
       modelProviderCommented: false
       // Ensure it's not commented
-    };
-    writeCodexConfig(updatedConfig);
+    });
     const auth = readJsonConfig(CODEX_AUTH_FILE, { defaultValue: {} }) || {};
     const envValue = auth[provider.tempEnvKey] || null;
     auth.OPENAI_API_KEY = envValue;
@@ -5063,7 +5143,6 @@ const codex = {
   needsEnvKeyMigration: needsEnvKeyMigration,
   parseCodexConfig: parseCodexConfig,
   readCodexConfig: readCodexConfig,
-  renderCodexConfig: renderCodexConfig,
   runCodexFullInit: runCodexFullInit,
   runCodexSystemPromptSelection: runCodexSystemPromptSelection,
   runCodexUninstall: runCodexUninstall,
@@ -5073,8 +5152,7 @@ const codex = {
   switchCodexProvider: switchCodexProvider,
   switchToOfficialLogin: switchToOfficialLogin,
   switchToProvider: switchToProvider,
-  writeAuthFile: writeAuthFile,
-  writeCodexConfig: writeCodexConfig
+  writeAuthFile: writeAuthFile
 };
 
 const CODE_TYPE_ABBREVIATIONS = {
@@ -5267,7 +5345,7 @@ async function copyOutputStyles(selectedStyles, lang) {
   const currentFilePath = fileURLToPath(import.meta.url);
   const distDir = dirname(dirname(currentFilePath));
   const rootDir = dirname(distDir);
-  const templateDir = join(rootDir, "templates", "claude-code", lang, "output-styles");
+  const templateDir = join(rootDir, "templates", "common", "output-styles", lang);
   for (const styleId of selectedStyles) {
     const style = OUTPUT_STYLES.find((s) => s.id === styleId);
     if (!style || !style.isCustom || !style.filePath) {
@@ -6415,6 +6493,7 @@ function getRootDir() {
   return dirname(distDir);
 }
 const DEFAULT_CODE_TOOL_TEMPLATE = "claude-code";
+const COMMON_TEMPLATE_CATEGORIES = ["git", "sixStep"];
 async function selectAndInstallWorkflows(configLang, preselectedWorkflows) {
   ensureI18nInitialized();
   const workflows = getOrderedWorkflows();
@@ -6474,7 +6553,16 @@ async function installWorkflowWithDependencies(config, configLang) {
     await mkdir(commandsDir, { recursive: true });
   }
   for (const commandFile of config.commands) {
-    const commandSource = join(
+    const isCommonTemplate = COMMON_TEMPLATE_CATEGORIES.includes(config.category);
+    const commandSource = isCommonTemplate ? join(
+      rootDir,
+      "templates",
+      "common",
+      "workflow",
+      config.category,
+      configLang,
+      commandFile
+    ) : join(
       rootDir,
       "templates",
       DEFAULT_CODE_TOOL_TEMPLATE,
@@ -7482,7 +7570,7 @@ async function convertToCodexProvider(config) {
   const displayName = config.name || config.provider || "custom";
   const providerId = displayName.toLowerCase().replace(/[^a-z0-9]/g, "-");
   let baseUrl = config.url || API_DEFAULT_URL;
-  let model = config.primaryModel || "gpt-5-codex";
+  let model = config.primaryModel || "gpt-5.2";
   let wireApi = "responses";
   if (config.provider && config.provider !== "custom") {
     const { getProviderPreset } = await import('./api-providers.mjs');
@@ -7582,4 +7670,4 @@ async function openSettingsJson() {
   }
 }
 
-export { getExistingModelConfig as $, API_DEFAULT_URL as A, getAiOutputLanguageLabel as B, CLAUDE_DIR as C, DEFAULT_CODE_TOOL_TYPE as D, getMcpConfigPath as E, readMcpConfig as F, writeMcpConfig as G, backupMcpConfig as H, mergeMcpServers as I, buildMcpServerConfig as J, fixWindowsMcpConfig as K, LEGACY_ZCF_CONFIG_FILES as L, addCompletedOnboarding as M, ensureApiKeyApproved as N, removeApiKeyFromRejected as O, manageApiKeyApproval as P, setPrimaryApiKey as Q, ensureClaudeDir as R, SETTINGS_FILE as S, backupExistingConfig as T, copyConfigFiles as U, configureApi as V, mergeConfigs as W, updateCustomModel as X, updateDefaultModel as Y, ZCF_CONFIG_DIR as Z, mergeSettingsFile as _, commandExists as a, resolveAiOutputLanguage as a$, getExistingApiConfig as a0, applyAiLanguageDirective as a1, switchToOfficialLogin$1 as a2, promptApiConfigurationAction as a3, isClaudeCodeInstalled as a4, installClaudeCode as a5, isCodexInstalled as a6, installCodex as a7, isLocalClaudeCodeInstalled as a8, getInstallationStatus as a9, writeCodexConfig as aA, writeAuthFile as aB, updateZcfConfig as aC, changeLanguage as aD, readZcfConfig as aE, configureOutputStyle as aF, isWindows as aG, selectMcpServices as aH, getMcpServices as aI, isCcrInstalled as aJ, installCcr as aK, setupCcrConfiguration as aL, modifyApiConfigPartially as aM, formatApiKeyDisplay as aN, readCcrConfig as aO, configureCcrFeature as aP, handleExitPromptError as aQ, handleGeneralError as aR, COMETIX_COMMAND_NAME as aS, COMETIX_COMMANDS as aT, installCometixLine as aU, checkAndUpdateTools as aV, runCodexUpdate as aW, resolveCodeType as aX, writeJsonConfig as aY, displayBanner as aZ, version as a_, removeLocalClaudeCode as aa, uninstallCodeTool as ab, setInstallMethod as ac, detectInstalledVersion as ad, selectInstallMethod as ae, executeInstallMethod as af, handleInstallFailure as ag, verifyInstallation as ah, createHomebrewSymlink as ai, displayVerificationResult as aj, ensureI18nInitialized as ak, i18n as al, addNumbersToChoices as am, validateApiKey as an, promptBoolean as ao, ensureDir as ap, readDefaultTomlConfig as aq, createDefaultTomlConfig as ar, exists as as, readJsonConfig as at, writeTomlConfig as au, clearModelEnv as av, copyFile as aw, detectConfigManagementMode as ax, readCodexConfig as ay, backupCodexComplete as az, importRecommendedEnv as b, updatePromptOnly as b0, selectAndInstallWorkflows as b1, checkClaudeCodeVersionAndPrompt as b2, displayBannerWithInfo as b3, runCodexUninstall as b4, configureCodexMcp as b5, configureCodexApi as b6, runCodexWorkflowImportWithLanguageSelection as b7, runCodexFullInit as b8, switchCodexProvider as b9, listCodexProviders as ba, switchToOfficialLogin as bb, switchToProvider as bc, readZcfConfigAsync as bd, initI18n as be, selectScriptLanguage as bf, index as bg, fsOperations as bh, jsonConfig as bi, claudeConfig as bj, config$1 as bk, config as bl, prompts as bm, codex as bn, installer as bo, cleanupPermissions as c, importRecommendedPermissions as d, CLAUDE_MD_FILE as e, ClAUDE_CONFIG_FILE as f, getPlatform as g, CLAUDE_VSC_CONFIG_FILE as h, init as i, CODEX_DIR as j, CODEX_CONFIG_FILE as k, CODEX_AUTH_FILE as l, mergeAndCleanPermissions as m, CODEX_AGENTS_FILE as n, openSettingsJson as o, CODEX_PROMPTS_DIR as p, ZCF_CONFIG_FILE as q, CODE_TOOL_TYPES as r, CODE_TOOL_BANNERS as s, CODE_TOOL_ALIASES as t, isCodeToolType as u, API_ENV_KEY as v, resolveCodeToolType as w, SUPPORTED_LANGS as x, LANG_LABELS as y, AI_OUTPUT_LANGUAGES as z };
+export { getExistingModelConfig as $, API_DEFAULT_URL as A, getAiOutputLanguageLabel as B, CLAUDE_DIR as C, DEFAULT_CODE_TOOL_TYPE as D, getMcpConfigPath as E, readMcpConfig as F, writeMcpConfig as G, backupMcpConfig as H, mergeMcpServers as I, buildMcpServerConfig as J, fixWindowsMcpConfig as K, LEGACY_ZCF_CONFIG_FILES as L, addCompletedOnboarding as M, ensureApiKeyApproved as N, removeApiKeyFromRejected as O, manageApiKeyApproval as P, setPrimaryApiKey as Q, ensureClaudeDir as R, SETTINGS_FILE as S, backupExistingConfig as T, copyConfigFiles as U, configureApi as V, mergeConfigs as W, updateCustomModel as X, updateDefaultModel as Y, ZCF_CONFIG_DIR as Z, mergeSettingsFile as _, commandExists as a, updatePromptOnly as a$, getExistingApiConfig as a0, applyAiLanguageDirective as a1, switchToOfficialLogin$1 as a2, promptApiConfigurationAction as a3, isClaudeCodeInstalled as a4, installClaudeCode as a5, isCodexInstalled as a6, installCodex as a7, isLocalClaudeCodeInstalled as a8, getInstallationStatus as a9, writeAuthFile as aA, updateZcfConfig as aB, changeLanguage as aC, readZcfConfig as aD, configureOutputStyle as aE, isWindows as aF, selectMcpServices as aG, getMcpServices as aH, isCcrInstalled as aI, installCcr as aJ, setupCcrConfiguration as aK, modifyApiConfigPartially as aL, formatApiKeyDisplay as aM, readCcrConfig as aN, configureCcrFeature as aO, handleExitPromptError as aP, handleGeneralError as aQ, COMETIX_COMMAND_NAME as aR, COMETIX_COMMANDS as aS, installCometixLine as aT, checkAndUpdateTools as aU, runCodexUpdate as aV, resolveCodeType as aW, writeJsonConfig as aX, displayBanner as aY, version as aZ, resolveAiOutputLanguage as a_, removeLocalClaudeCode as aa, uninstallCodeTool as ab, setInstallMethod as ac, detectInstalledVersion as ad, selectInstallMethod as ae, executeInstallMethod as af, handleInstallFailure as ag, verifyInstallation as ah, createHomebrewSymlink as ai, displayVerificationResult as aj, ensureI18nInitialized as ak, i18n as al, addNumbersToChoices as am, validateApiKey as an, promptBoolean as ao, ensureDir as ap, readDefaultTomlConfig as aq, createDefaultTomlConfig as ar, exists as as, readJsonConfig as at, writeTomlConfig as au, clearModelEnv as av, copyFile as aw, detectConfigManagementMode as ax, readCodexConfig as ay, backupCodexComplete as az, importRecommendedEnv as b, selectAndInstallWorkflows as b0, checkClaudeCodeVersionAndPrompt as b1, displayBannerWithInfo as b2, runCodexUninstall as b3, configureCodexMcp as b4, configureCodexApi as b5, runCodexWorkflowImportWithLanguageSelection as b6, runCodexFullInit as b7, switchCodexProvider as b8, listCodexProviders as b9, switchToOfficialLogin as ba, switchToProvider as bb, readZcfConfigAsync as bc, initI18n as bd, selectScriptLanguage as be, index as bf, fsOperations as bg, jsonConfig as bh, claudeConfig as bi, config$1 as bj, config as bk, prompts as bl, codexTomlUpdater as bm, codex as bn, installer as bo, cleanupPermissions as c, importRecommendedPermissions as d, CLAUDE_MD_FILE as e, ClAUDE_CONFIG_FILE as f, getPlatform as g, CLAUDE_VSC_CONFIG_FILE as h, init as i, CODEX_DIR as j, CODEX_CONFIG_FILE as k, CODEX_AUTH_FILE as l, mergeAndCleanPermissions as m, CODEX_AGENTS_FILE as n, openSettingsJson as o, CODEX_PROMPTS_DIR as p, ZCF_CONFIG_FILE as q, CODE_TOOL_TYPES as r, CODE_TOOL_BANNERS as s, CODE_TOOL_ALIASES as t, isCodeToolType as u, API_ENV_KEY as v, resolveCodeToolType as w, SUPPORTED_LANGS as x, LANG_LABELS as y, AI_OUTPUT_LANGUAGES as z };