zcf 3.1.1 → 3.1.3

package/dist/chunks/simple-config.mjs

@@ -16,7 +16,7 @@ import { rm, mkdir, copyFile as copyFile$1 } from 'node:fs/promises';
 import i18next from 'i18next';
 import Backend from 'i18next-fs-backend';
 
-const version = "3.1.1";
+const version = "3.1.3";
 const homepage = "https://github.com/UfoMiao/zcf";
 
 const i18n = i18next.createInstance();
@@ -542,6 +542,17 @@ function getMcpCommand() {
   }
   return ["npx"];
 }
+function getSystemRoot() {
+  if (!isWindows())
+    return null;
+  const env = process.env;
+  let systemRoot = "C:\\Windows";
+  if (Object.prototype.hasOwnProperty.call(env, "SYSTEMROOT") && env.SYSTEMROOT)
+    systemRoot = env.SYSTEMROOT;
+  else if (Object.prototype.hasOwnProperty.call(env, "SystemRoot") && env.SystemRoot)
+    systemRoot = env.SystemRoot;
+  return systemRoot.replace(/\\+/g, "/").replace(/\/+/g, "/");
+}
 async function commandExists(command) {
   try {
     const cmd = getPlatform() === "windows" ? "where" : "which";
@@ -2661,6 +2672,13 @@ function detectConfigManagementMode() {
   }
 }
 
+function applyCodexPlatformCommand(config) {
+  if (config.command === "npx" && isWindows()) {
+    const mcpCmd = getMcpCommand();
+    config.command = mcpCmd[0];
+    config.args = [...mcpCmd.slice(1), ...config.args || []];
+  }
+}
 const CODEX_DIR = join(homedir(), ".codex");
 const CODEX_CONFIG_FILE = join(CODEX_DIR, "config.toml");
 const CODEX_AUTH_FILE = join(CODEX_DIR, "auth.json");
@@ -2793,7 +2811,10 @@ function parseCodexConfig(content) {
     };
   }
   try {
-    const tomlData = parse(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 providers = [];
     if (tomlData.model_providers) {
       for (const [id, providerData] of Object.entries(tomlData.model_providers)) {
@@ -2862,21 +2883,30 @@ function parseCodexConfig(content) {
     const otherConfig = [];
     const lines = content.split("\n");
     let skipCurrentSection = false;
-    let currentSection = "";
     for (const line of lines) {
-      const trimmedLine = line.trim();
-      if (trimmedLine.includes("--- model provider added by ZCF ---") || trimmedLine.includes("--- MCP servers added by ZCF ---") || trimmedLine.includes("Managed by ZCF")) {
+      const trimmed = line.trim();
+      if (!trimmed)
         continue;
-      }
-      const sectionMatch = trimmedLine.match(/^\[([^\]]+)\]/);
-      if (sectionMatch) {
-        currentSection = sectionMatch[1];
-        skipCurrentSection = currentSection.startsWith("model_providers.") || currentSection.startsWith("mcp_servers.");
-      }
-      if (!skipCurrentSection && (trimmedLine.startsWith("model_provider") || trimmedLine.startsWith("# model_provider") || /^model\s*=/.test(trimmedLine))) {
+      if (/^#\s*---\s*model provider added by ZCF\s*---\s*$/i.test(trimmed))
+        continue;
+      if (/^#\s*---\s*MCP servers added by ZCF\s*---\s*$/i.test(trimmed))
+        continue;
+      if (/Managed by ZCF/i.test(trimmed))
+        continue;
+      const sec = trimmed.match(/^\[([^\]]+)\]/);
+      if (sec) {
+        const name = sec[1];
+        skipCurrentSection = name.startsWith("model_providers.") || name.startsWith("mcp_servers.");
+        if (skipCurrentSection)
+          continue;
+        otherConfig.push(line);
         continue;
       }
-      if (!skipCurrentSection && trimmedLine) {
+      if (/^#?\s*model_provider\s*=/.test(trimmed))
+        continue;
+      if (/^model\s*=/.test(trimmed))
+        continue;
+      if (!skipCurrentSection) {
         otherConfig.push(line);
       }
     }
@@ -2892,13 +2922,15 @@ function parseCodexConfig(content) {
     };
   } catch (error) {
     console.warn("TOML parsing failed, falling back to basic parsing:", error);
+    const cleaned = content.replace(/^\s*#\s*---\s*model provider added by ZCF\s*---\s*$/gim, "").replace(/^\s*#\s*---\s*MCP servers added by ZCF\s*---\s*$/gim, "").replace(/^\[model_providers\.[^\]]+\][\s\S]*?(?=^\[|$)/gim, "").replace(/^\[mcp_servers\.[^\]]+\][\s\S]*?(?=^\[|$)/gim, "").replace(/^\s*(?:#\s*)?model_provider\s*=.*$/gim, "").replace(/^\s*model\s*=.*$/gim, "").replace(/\n{3,}/g, "\n\n");
+    const otherConfig = cleaned.split("\n").map((l) => l.replace(/\s+$/g, "")).filter((l) => l.trim().length > 0);
     return {
       model: null,
       modelProvider: null,
       providers: [],
       mcpServices: [],
       managed: false,
-      otherConfig: content.split("\n"),
+      otherConfig,
       modelProviderCommented: void 0
     };
   }
@@ -2927,9 +2959,29 @@ function renderCodexConfig(data) {
     lines.push("");
   }
   if (data.otherConfig && data.otherConfig.length > 0) {
-    lines.push(...data.otherConfig);
-    if (data.providers.length > 0 || data.mcpServices.length > 0) {
-      lines.push("");
+    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))
+        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) {
@@ -3438,14 +3490,29 @@ async function configureCodexMcp() {
   const servicesMeta = await getMcpServices();
   const baseProviders = existingConfig?.providers || [];
   const selection = [];
-  const existingMap = new Map((existingConfig?.mcpServices || []).map((service) => [service.id, service]));
+  const existingServices = existingConfig?.mcpServices || [];
   if (selectedIds.length === 0) {
     console.log(ansis.yellow(i18n.t("codex:noMcpConfigured")));
+    const preserved = (existingServices || []).map((svc) => {
+      if (isWindows()) {
+        const systemRoot = getSystemRoot();
+        if (systemRoot) {
+          return {
+            ...svc,
+            env: {
+              ...svc.env || {},
+              SYSTEMROOT: systemRoot
+            }
+          };
+        }
+      }
+      return svc;
+    });
     writeCodexConfig({
       model: existingConfig?.model || null,
       modelProvider: existingConfig?.modelProvider || null,
       providers: baseProviders,
-      mcpServices: Array.from(existingMap.values()),
+      mcpServices: preserved,
       otherConfig: existingConfig?.otherConfig || []
     });
     updateZcfConfig({ codeToolType: "codex" });
@@ -3457,10 +3524,18 @@ async function configureCodexMcp() {
       continue;
     const serviceMeta = servicesMeta.find((service) => service.id === id);
     let command = configInfo.config.command || id;
-    const args = (configInfo.config.args || []).map((arg) => String(arg));
-    if (isWindows() && command === "npx")
-      command = "npx.cmd";
+    let args = (configInfo.config.args || []).map((arg) => String(arg));
+    const serviceConfig = { id: id.toLowerCase(), command, args };
+    applyCodexPlatformCommand(serviceConfig);
+    command = serviceConfig.command;
+    args = serviceConfig.args || [];
     const env = { ...configInfo.config.env || {} };
+    if (isWindows()) {
+      const systemRoot = getSystemRoot();
+      if (systemRoot) {
+        env.SYSTEMROOT = systemRoot;
+      }
+    }
     if (configInfo.requiresApiKey && configInfo.apiKeyEnvVar) {
       const promptMessage = serviceMeta?.apiKeyPrompt || i18n.t("mcp:apiKeyPrompt");
       const { apiKey } = await inquirer.prompt([{
@@ -3476,21 +3551,39 @@ async function configureCodexMcp() {
     selection.push({
       id: id.toLowerCase(),
       // Convert to lowercase for Codex compatibility
-      command,
-      args,
+      command: serviceConfig.command,
+      args: serviceConfig.args,
       env: Object.keys(env).length > 0 ? env : void 0,
       startup_timeout_ms: configInfo.config.startup_timeout_ms
     });
   }
-  const selectionMap = new Map(selection.map((service) => [service.id, service]));
-  const mergedMap = new Map(existingMap);
-  for (const service of selectionMap.values())
-    mergedMap.set(service.id, service);
+  const mergedMap = /* @__PURE__ */ new Map();
+  for (const svc of existingServices) {
+    mergedMap.set(svc.id.toLowerCase(), { ...svc });
+  }
+  for (const svc of selection) {
+    mergedMap.set(svc.id.toLowerCase(), { ...svc });
+  }
+  const finalServices = Array.from(mergedMap.values()).map((svc) => {
+    if (isWindows()) {
+      const systemRoot = getSystemRoot();
+      if (systemRoot) {
+        return {
+          ...svc,
+          env: {
+            ...svc.env || {},
+            SYSTEMROOT: systemRoot
+          }
+        };
+      }
+    }
+    return svc;
+  });
   writeCodexConfig({
     model: existingConfig?.model || null,
     modelProvider: existingConfig?.modelProvider || null,
     providers: baseProviders,
-    mcpServices: Array.from(mergedMap.values()),
+    mcpServices: finalServices,
     otherConfig: existingConfig?.otherConfig || []
   });
   updateZcfConfig({ codeToolType: "codex" });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zcf",
   "type": "module",
-  "version": "3.1.1",
+  "version": "3.1.3",
   "description": "Zero-Config Code Flow - One-click configuration tool for Claude Code",
   "author": {
     "name": "Miao Da",

package/templates/claude-code/common/settings.json

@@ -10,17 +10,19 @@
   "permissions": {
     "allow": [
       "Bash",
-      "Read",
-      "Write",
+      "BashOutput",
       "Edit",
-      "MultiEdit",
       "Glob",
       "Grep",
+      "KillShell",
+      "NotebookEdit",
+      "Read",
+      "SlashCommand",
+      "Task",
+      "TodoWrite",
       "WebFetch",
       "WebSearch",
-      "TodoWrite",
-      "NotebookRead",
-      "NotebookEdit",
+      "Write",
       "mcp__ide",
       "mcp__exa",
       "mcp__context7",