zcf 2.4.0 → 2.4.1

package/dist/cli.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import ansis from 'ansis';
 import cac from 'cac';
-import { f as SUPPORTED_LANGS, I as I18N, L as LANG_LABELS, E as updateZcfConfig, Z as ZCF_CONFIG_FILE, o as openSettingsJson, b as importRecommendedPermissions, a as importRecommendedEnv, F as readZcfConfig, G as resolveAiOutputLanguage, s as applyAiLanguageDirective, H as configureAiPersonality, u as updateDefaultModel, J as isWindows, v as readMcpConfig, B as fixWindowsMcpConfig, w as writeMcpConfig, K as selectMcpServices, x as backupMcpConfig, M as MCP_SERVICES, z as buildMcpServerConfig, y as mergeMcpServers, r as getExistingApiConfig, N as formatApiKeyDisplay, O as modifyApiConfigPartially, P as validateApiKey, n as configureApi, Q as displayBanner, R as selectScriptLanguage, S as SETTINGS_FILE, T as updatePromptOnly, U as version, V as handleExitPromptError, W as handleGeneralError, X as displayBannerWithInfo, i as init } from './shared/zcf.BvmvOF3q.mjs';
+import { h as SUPPORTED_LANGS, I as I18N, L as LANG_LABELS, G as updateZcfConfig, Z as ZCF_CONFIG_FILE, o as openSettingsJson, b as importRecommendedPermissions, a as importRecommendedEnv, H as readZcfConfig, J as resolveAiOutputLanguage, v as applyAiLanguageDirective, K as configureAiPersonality, u as updateDefaultModel, N as isWindows, x as readMcpConfig, E as fixWindowsMcpConfig, y as writeMcpConfig, O as selectMcpServices, z as backupMcpConfig, M as MCP_SERVICES, D as buildMcpServerConfig, B as mergeMcpServers, t as getExistingApiConfig, P as formatApiKeyDisplay, Q as modifyApiConfigPartially, R as validateApiKey, q as configureApi, T as displayBanner, U as selectScriptLanguage, S as SETTINGS_FILE, V as updatePromptOnly, W as version, X as handleExitPromptError, Y as handleGeneralError, _ as displayBannerWithInfo, i as init } from './shared/zcf.CYdvtE_u.mjs';
 import inquirer from 'inquirer';
 import { existsSync, unlinkSync } from 'node:fs';
 import 'pathe';

package/dist/index.d.mts

@@ -224,6 +224,7 @@ declare const I18N: {
         permissionsImportSuccess: string;
         openingSettingsJson: string;
         spaceToSelectReturn: string;
+        windowsDetected: string;
     };
     en: {
         selectScriptLang: string;
@@ -394,6 +395,7 @@ declare const I18N: {
         permissionsImportSuccess: string;
         openingSettingsJson: string;
         spaceToSelectReturn: string;
+        windowsDetected: string;
     };
 };
 declare const MCP_SERVICES: McpService[];
@@ -452,5 +454,25 @@ declare function importRecommendedEnv(): Promise<void>;
 declare function importRecommendedPermissions(): Promise<void>;
 declare function openSettingsJson(): Promise<void>;
 
-export { AI_OUTPUT_LANGUAGES, CLAUDE_DIR, CLAUDE_MD_FILE, ClAUDE_CONFIG_FILE, I18N, LANG_LABELS, MCP_SERVICES, SETTINGS_FILE, SUPPORTED_LANGS, ZCF_CONFIG_FILE, addCompletedOnboarding, applyAiLanguageDirective, backupExistingConfig, backupMcpConfig, buildMcpServerConfig, commandExists, configureApi, copyConfigFiles, ensureClaudeDir, fixWindowsMcpConfig, getExistingApiConfig, getMcpConfigPath, getPlatform, importRecommendedEnv, importRecommendedPermissions, init, installClaudeCode, isClaudeCodeInstalled, mergeConfigs, mergeMcpServers, mergeSettingsFile, openSettingsJson, readMcpConfig, updateDefaultModel, writeMcpConfig };
+/**
+ * Clean up and deduplicate permissions array
+ * Removes invalid and redundant permissions based on template
+ */
+/**
+ * Clean up permissions array by removing invalid and redundant entries
+ * @param templatePermissions - Permissions from template (source of truth)
+ * @param userPermissions - User's existing permissions
+ * @returns Cleaned permissions array
+ */
+declare function cleanupPermissions(templatePermissions: string[], userPermissions: string[]): string[];
+/**
+ * Merge and clean permissions arrays
+ * Combines template and user permissions while removing invalid/redundant entries
+ * @param templatePermissions - Permissions from template
+ * @param userPermissions - User's existing permissions
+ * @returns Merged and cleaned permissions array
+ */
+declare function mergeAndCleanPermissions(templatePermissions: string[] | undefined, userPermissions: string[] | undefined): string[];
+
+export { AI_OUTPUT_LANGUAGES, CLAUDE_DIR, CLAUDE_MD_FILE, ClAUDE_CONFIG_FILE, I18N, LANG_LABELS, MCP_SERVICES, SETTINGS_FILE, SUPPORTED_LANGS, ZCF_CONFIG_FILE, addCompletedOnboarding, applyAiLanguageDirective, backupExistingConfig, backupMcpConfig, buildMcpServerConfig, cleanupPermissions, commandExists, configureApi, copyConfigFiles, ensureClaudeDir, fixWindowsMcpConfig, getExistingApiConfig, getMcpConfigPath, getPlatform, importRecommendedEnv, importRecommendedPermissions, init, installClaudeCode, isClaudeCodeInstalled, mergeAndCleanPermissions, mergeConfigs, mergeMcpServers, mergeSettingsFile, openSettingsJson, readMcpConfig, updateDefaultModel, writeMcpConfig };
 export type { AiOutputLanguage, ApiConfig, ClaudeConfiguration, McpServerConfig, McpService, SupportedLang };

package/dist/index.d.ts

@@ -224,6 +224,7 @@ declare const I18N: {
         permissionsImportSuccess: string;
         openingSettingsJson: string;
         spaceToSelectReturn: string;
+        windowsDetected: string;
     };
     en: {
         selectScriptLang: string;
@@ -394,6 +395,7 @@ declare const I18N: {
         permissionsImportSuccess: string;
         openingSettingsJson: string;
         spaceToSelectReturn: string;
+        windowsDetected: string;
     };
 };
 declare const MCP_SERVICES: McpService[];
@@ -452,5 +454,25 @@ declare function importRecommendedEnv(): Promise<void>;
 declare function importRecommendedPermissions(): Promise<void>;
 declare function openSettingsJson(): Promise<void>;
 
-export { AI_OUTPUT_LANGUAGES, CLAUDE_DIR, CLAUDE_MD_FILE, ClAUDE_CONFIG_FILE, I18N, LANG_LABELS, MCP_SERVICES, SETTINGS_FILE, SUPPORTED_LANGS, ZCF_CONFIG_FILE, addCompletedOnboarding, applyAiLanguageDirective, backupExistingConfig, backupMcpConfig, buildMcpServerConfig, commandExists, configureApi, copyConfigFiles, ensureClaudeDir, fixWindowsMcpConfig, getExistingApiConfig, getMcpConfigPath, getPlatform, importRecommendedEnv, importRecommendedPermissions, init, installClaudeCode, isClaudeCodeInstalled, mergeConfigs, mergeMcpServers, mergeSettingsFile, openSettingsJson, readMcpConfig, updateDefaultModel, writeMcpConfig };
+/**
+ * Clean up and deduplicate permissions array
+ * Removes invalid and redundant permissions based on template
+ */
+/**
+ * Clean up permissions array by removing invalid and redundant entries
+ * @param templatePermissions - Permissions from template (source of truth)
+ * @param userPermissions - User's existing permissions
+ * @returns Cleaned permissions array
+ */
+declare function cleanupPermissions(templatePermissions: string[], userPermissions: string[]): string[];
+/**
+ * Merge and clean permissions arrays
+ * Combines template and user permissions while removing invalid/redundant entries
+ * @param templatePermissions - Permissions from template
+ * @param userPermissions - User's existing permissions
+ * @returns Merged and cleaned permissions array
+ */
+declare function mergeAndCleanPermissions(templatePermissions: string[] | undefined, userPermissions: string[] | undefined): string[];
+
+export { AI_OUTPUT_LANGUAGES, CLAUDE_DIR, CLAUDE_MD_FILE, ClAUDE_CONFIG_FILE, I18N, LANG_LABELS, MCP_SERVICES, SETTINGS_FILE, SUPPORTED_LANGS, ZCF_CONFIG_FILE, addCompletedOnboarding, applyAiLanguageDirective, backupExistingConfig, backupMcpConfig, buildMcpServerConfig, cleanupPermissions, commandExists, configureApi, copyConfigFiles, ensureClaudeDir, fixWindowsMcpConfig, getExistingApiConfig, getMcpConfigPath, getPlatform, importRecommendedEnv, importRecommendedPermissions, init, installClaudeCode, isClaudeCodeInstalled, mergeAndCleanPermissions, mergeConfigs, mergeMcpServers, mergeSettingsFile, openSettingsJson, readMcpConfig, updateDefaultModel, writeMcpConfig };
 export type { AiOutputLanguage, ApiConfig, ClaudeConfiguration, McpServerConfig, McpService, SupportedLang };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { A as AI_OUTPUT_LANGUAGES, C as CLAUDE_DIR, d as CLAUDE_MD_FILE, e as ClAUDE_CONFIG_FILE, I as I18N, L as LANG_LABELS, M as MCP_SERVICES, S as SETTINGS_FILE, f as SUPPORTED_LANGS, Z as ZCF_CONFIG_FILE, D as addCompletedOnboarding, s as applyAiLanguageDirective, l as backupExistingConfig, x as backupMcpConfig, z as buildMcpServerConfig, c as commandExists, n as configureApi, m as copyConfigFiles, k as ensureClaudeDir, B as fixWindowsMcpConfig, r as getExistingApiConfig, t as getMcpConfigPath, g as getPlatform, a as importRecommendedEnv, b as importRecommendedPermissions, i as init, j as installClaudeCode, h as isClaudeCodeInstalled, p as mergeConfigs, y as mergeMcpServers, q as mergeSettingsFile, o as openSettingsJson, v as readMcpConfig, u as updateDefaultModel, w as writeMcpConfig } from './shared/zcf.BvmvOF3q.mjs';
+export { A as AI_OUTPUT_LANGUAGES, C as CLAUDE_DIR, e as CLAUDE_MD_FILE, f as ClAUDE_CONFIG_FILE, I as I18N, L as LANG_LABELS, M as MCP_SERVICES, S as SETTINGS_FILE, h as SUPPORTED_LANGS, Z as ZCF_CONFIG_FILE, F as addCompletedOnboarding, v as applyAiLanguageDirective, n as backupExistingConfig, z as backupMcpConfig, D as buildMcpServerConfig, d as cleanupPermissions, c as commandExists, q as configureApi, p as copyConfigFiles, l as ensureClaudeDir, E as fixWindowsMcpConfig, t as getExistingApiConfig, w as getMcpConfigPath, g as getPlatform, a as importRecommendedEnv, b as importRecommendedPermissions, i as init, k as installClaudeCode, j as isClaudeCodeInstalled, m as mergeAndCleanPermissions, r as mergeConfigs, B as mergeMcpServers, s as mergeSettingsFile, o as openSettingsJson, x as readMcpConfig, u as updateDefaultModel, y as writeMcpConfig } from './shared/zcf.CYdvtE_u.mjs';
 import 'inquirer';
 import 'ansis';
 import 'node:fs';

package/dist/shared/{zcf.BvmvOF3q.mjs → zcf.CYdvtE_u.mjs}

@@ -7,7 +7,7 @@ import { fileURLToPath } from 'node:url';
 import { exec } from 'tinyexec';
 import { homedir, platform } from 'node:os';
 
-const version = "2.4.0";
+const version = "2.4.1";
 const homepage = "https://github.com/UfoMiao/zcf";
 
 const CLAUDE_DIR = join(homedir(), ".claude");
@@ -212,7 +212,9 @@ const I18N = {
     permissionsImportSuccess: "\u6743\u9650\u914D\u7F6E\u5DF2\u5BFC\u5165",
     openingSettingsJson: "\u6B63\u5728\u6253\u5F00 settings.json...",
     // Misc
-    spaceToSelectReturn: "- \u7A7A\u683C\u9009\u62E9\uFF0C\u56DE\u8F66\u63D0\u4EA4"
+    spaceToSelectReturn: "- \u7A7A\u683C\u9009\u62E9\uFF0C\u56DE\u8F66\u63D0\u4EA4",
+    // Windows detection
+    windowsDetected: "\u68C0\u6D4B\u5230 Windows \u7CFB\u7EDF\uFF0C\u5C06\u81EA\u52A8\u914D\u7F6E\u517C\u5BB9\u683C\u5F0F"
   },
   en: {
     selectScriptLang: "Select ZCF display language",
@@ -400,7 +402,9 @@ const I18N = {
     permissionsImportSuccess: "Permissions imported",
     openingSettingsJson: "Opening settings.json...",
     // Misc
-    spaceToSelectReturn: "- Space to select. Return to submit"
+    spaceToSelectReturn: "- Space to select. Return to submit",
+    // Windows detection
+    windowsDetected: "Windows detected, will configure compatible format"
   }
 };
 const MCP_SERVICES = [
@@ -868,6 +872,36 @@ function deepClone(obj) {
   return obj;
 }
 
+function cleanupPermissions(templatePermissions, userPermissions) {
+  const templateSet = new Set(templatePermissions);
+  const cleanedPermissions = userPermissions.filter((permission) => {
+    if (["mcp__.*", "mcp__*", "mcp__(*)"].includes(permission)) {
+      return false;
+    }
+    for (const templatePerm of templatePermissions) {
+      if (permission === templatePerm) {
+        continue;
+      }
+      if (permission.startsWith(templatePerm)) {
+        return false;
+      }
+    }
+    return true;
+  });
+  const merged = [...templateSet];
+  for (const permission of cleanedPermissions) {
+    if (!templateSet.has(permission)) {
+      merged.push(permission);
+    }
+  }
+  return merged;
+}
+function mergeAndCleanPermissions(templatePermissions, userPermissions) {
+  const template = templatePermissions || [];
+  const user = userPermissions || [];
+  return cleanupPermissions(template, user);
+}
+
 function ensureClaudeDir() {
   ensureDir(CLAUDE_DIR);
 }
@@ -991,9 +1025,9 @@ function mergeSettingsFile(templatePath, targetPath) {
     });
     mergedSettings.env = mergedEnv;
     if (mergedSettings.permissions && mergedSettings.permissions.allow) {
-      mergedSettings.permissions.allow = mergeArraysUnique(
-        templateSettings.permissions?.allow || [],
-        existingSettings.permissions?.allow || []
+      mergedSettings.permissions.allow = mergeAndCleanPermissions(
+        templateSettings.permissions?.allow,
+        existingSettings.permissions?.allow
       );
     }
     writeJsonConfig(targetPath, mergedSettings);
@@ -1680,11 +1714,7 @@ async function init(options = {}) {
       }
       if (shouldConfigureMcp) {
         if (isWindows()) {
-          console.log(
-            ansis.blue(
-              `\u2139 ${scriptLang === "zh-CN" ? "\u68C0\u6D4B\u5230 Windows \u7CFB\u7EDF\uFF0C\u5C06\u81EA\u52A8\u914D\u7F6E\u517C\u5BB9\u683C\u5F0F" : "Windows detected, will configure compatible format"}`
-            )
-          );
+          console.log(ansis.blue(`\u2139 ${I18N[scriptLang].windowsDetected}`));
         }
         const selectedServices = await selectMcpServices(scriptLang);
         if (selectedServices === void 0) {
@@ -1778,7 +1808,17 @@ async function importRecommendedEnv() {
 async function importRecommendedPermissions() {
   const templateSettings = getTemplateSettings();
   const currentSettings = loadCurrentSettings();
-  currentSettings.permissions = templateSettings.permissions;
+  if (templateSettings.permissions && templateSettings.permissions.allow) {
+    currentSettings.permissions = {
+      ...templateSettings.permissions,
+      allow: mergeAndCleanPermissions(
+        templateSettings.permissions.allow,
+        currentSettings.permissions?.allow
+      )
+    };
+  } else {
+    currentSettings.permissions = templateSettings.permissions;
+  }
   saveSettings(currentSettings);
 }
 async function openSettingsJson() {
@@ -1813,4 +1853,4 @@ async function openSettingsJson() {
   }
 }
 
-export { AI_OUTPUT_LANGUAGES as A, fixWindowsMcpConfig as B, CLAUDE_DIR as C, addCompletedOnboarding as D, updateZcfConfig as E, readZcfConfig as F, resolveAiOutputLanguage as G, configureAiPersonality as H, I18N as I, isWindows as J, selectMcpServices as K, LANG_LABELS as L, MCP_SERVICES as M, formatApiKeyDisplay as N, modifyApiConfigPartially as O, validateApiKey as P, displayBanner as Q, selectScriptLanguage as R, SETTINGS_FILE as S, updatePromptOnly as T, version as U, handleExitPromptError as V, handleGeneralError as W, displayBannerWithInfo as X, ZCF_CONFIG_FILE as Z, importRecommendedEnv as a, importRecommendedPermissions as b, commandExists as c, CLAUDE_MD_FILE as d, ClAUDE_CONFIG_FILE as e, SUPPORTED_LANGS as f, getPlatform as g, isClaudeCodeInstalled as h, init as i, installClaudeCode as j, ensureClaudeDir as k, backupExistingConfig as l, copyConfigFiles as m, configureApi as n, openSettingsJson as o, mergeConfigs as p, mergeSettingsFile as q, getExistingApiConfig as r, applyAiLanguageDirective as s, getMcpConfigPath as t, updateDefaultModel as u, readMcpConfig as v, writeMcpConfig as w, backupMcpConfig as x, mergeMcpServers as y, buildMcpServerConfig as z };
+export { AI_OUTPUT_LANGUAGES as A, mergeMcpServers as B, CLAUDE_DIR as C, buildMcpServerConfig as D, fixWindowsMcpConfig as E, addCompletedOnboarding as F, updateZcfConfig as G, readZcfConfig as H, I18N as I, resolveAiOutputLanguage as J, configureAiPersonality as K, LANG_LABELS as L, MCP_SERVICES as M, isWindows as N, selectMcpServices as O, formatApiKeyDisplay as P, modifyApiConfigPartially as Q, validateApiKey as R, SETTINGS_FILE as S, displayBanner as T, selectScriptLanguage as U, updatePromptOnly as V, version as W, handleExitPromptError as X, handleGeneralError as Y, ZCF_CONFIG_FILE as Z, displayBannerWithInfo as _, importRecommendedEnv as a, importRecommendedPermissions as b, commandExists as c, cleanupPermissions as d, CLAUDE_MD_FILE as e, ClAUDE_CONFIG_FILE as f, getPlatform as g, SUPPORTED_LANGS as h, init as i, isClaudeCodeInstalled as j, installClaudeCode as k, ensureClaudeDir as l, mergeAndCleanPermissions as m, backupExistingConfig as n, openSettingsJson as o, copyConfigFiles as p, configureApi as q, mergeConfigs as r, mergeSettingsFile as s, getExistingApiConfig as t, updateDefaultModel as u, applyAiLanguageDirective as v, getMcpConfigPath as w, readMcpConfig as x, writeMcpConfig as y, backupMcpConfig as z };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zcf",
   "type": "module",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Zero-Config Claude-Code Flow - One-click configuration tool for Claude Code",
   "license": "MIT",
   "homepage": "https://github.com/UfoMiao/zcf",