ccjk 14.1.6 → 14.1.7

package/dist/chunks/codex.mjs

@@ -1,5 +1,5 @@
-import process__default from 'node:process';
 import { readdirSync } from 'node:fs';
+import process__default from 'node:process';
 import { fileURLToPath } from 'node:url';
 import a from './index5.mjs';
 import { d as dayjs } from '../shared/ccjk.RyizuzOI.mjs';
@@ -11,7 +11,7 @@ import { x as K } from './main.mjs';
 import { CODEX_CONFIG_FILE, CODEX_AUTH_FILE, CODEX_DIR, SUPPORTED_LANGS, CODEX_AGENTS_FILE, CODEX_PROMPTS_DIR, ZCF_CONFIG_FILE, AI_OUTPUT_LANGUAGES } from './constants.mjs';
 import { ensureI18nInitialized, i18n, format } from './index2.mjs';
 import { updateZcfConfig, readZcfConfig, readDefaultTomlConfig, updateTomlConfig } from './ccjk-config.mjs';
-import { v as applyAiLanguageDirective } from './config.mjs';
+import { z as applyAiLanguageDirective } from './config.mjs';
 import { exists, readFile, ensureDir, writeFileAtomic, writeFile, copyDir, copyFile } from './fs-operations.mjs';
 import { readJsonConfig, writeJsonConfig } from './json-config.mjs';
 import { i as isWindows, m as getMcpCommand, k as getSystemRoot, w as wrapCommandWithSudo, n as normalizeTomlPath } from './platform.mjs';
@@ -173,6 +173,7 @@ async function configureCodexMcp(options) {
       modelProvider: existingConfig?.modelProvider || null,
       providers: baseProviders2,
       mcpServices: finalServices2,
+      features: existingConfig?.features,
       otherConfig: existingConfig?.otherConfig || []
     });
     updateZcfConfig({ codeToolType: "codex" });
@@ -194,6 +195,7 @@ async function configureCodexMcp(options) {
       modelProvider: existingConfig?.modelProvider || null,
       providers: baseProviders,
       mcpServices: preserved,
+      features: existingConfig?.features,
       otherConfig: existingConfig?.otherConfig || []
     });
     updateZcfConfig({ codeToolType: "codex" });
@@ -250,6 +252,7 @@ async function configureCodexMcp(options) {
     modelProvider: existingConfig?.modelProvider || null,
     providers: baseProviders,
     mcpServices: finalServices,
+    features: existingConfig?.features,
     otherConfig: existingConfig?.otherConfig || []
   });
   updateZcfConfig({ codeToolType: "codex" });
@@ -483,6 +486,87 @@ function migrateEnvKeyInContent(content) {
   }
   return result.join("\n");
 }
+function isCodexGoalsFeatureEnabled(content) {
+  try {
+    const parsed = parse(content);
+    return parsed.features?.goals === true;
+  } catch {
+    return false;
+  }
+}
+function escapeRegExp(input) {
+  return input.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function setCodexFeatureFlagInContent(content, key, enabled) {
+  const normalized = content.trimEnd();
+  const lines = normalized ? normalized.split("\n") : [];
+  const featuresHeaderIndex = lines.findIndex((line) => line.trim() === "[features]");
+  if (featuresHeaderIndex === -1) {
+    const prefix = normalized ? `${normalized}
+
+` : "";
+    return `${prefix}[features]
+${key} = ${enabled}
+`;
+  }
+  let insertIndex = lines.length;
+  let featureIndex = -1;
+  const keyPattern = new RegExp(`^${escapeRegExp(key)}\\s*=`);
+  for (let index = featuresHeaderIndex + 1; index < lines.length; index += 1) {
+    const trimmed = lines[index].trim();
+    if (/^\[[^\]]+\]\s*$/.test(trimmed)) {
+      insertIndex = index;
+      break;
+    }
+    if (keyPattern.test(trimmed)) {
+      featureIndex = index;
+      break;
+    }
+  }
+  if (featureIndex !== -1) {
+    const replacePattern = new RegExp(`^(\\s*)${escapeRegExp(key)}\\s*=.*$`);
+    lines[featureIndex] = lines[featureIndex].replace(replacePattern, `$1${key} = ${enabled}`);
+  } else {
+    lines.splice(insertIndex, 0, `${key} = ${enabled}`);
+  }
+  return `${lines.join("\n")}
+`;
+}
+function normalizeCodexFeatureFlags(input) {
+  if (!input || typeof input !== "object" || Array.isArray(input)) {
+    return void 0;
+  }
+  const flags = {};
+  for (const [key, value] of Object.entries(input)) {
+    if (/^\w+$/.test(key) && typeof value === "boolean") {
+      flags[key] = value;
+    }
+  }
+  return Object.keys(flags).length > 0 ? flags : void 0;
+}
+function applyCodexFeatureFlagsToContent(content, features) {
+  let nextContent = content;
+  for (const [key, enabled] of Object.entries(features).sort(([a], [b]) => a.localeCompare(b))) {
+    nextContent = setCodexFeatureFlagInContent(nextContent, key, enabled);
+  }
+  return nextContent;
+}
+function setCodexGoalsFeatureInContent(content, enabled = true) {
+  return setCodexFeatureFlagInContent(content, "goals", enabled);
+}
+function readCodexGoalsFeatureEnabled() {
+  if (!exists(CODEX_CONFIG_FILE)) {
+    return false;
+  }
+  try {
+    return isCodexGoalsFeatureEnabled(readFile(CODEX_CONFIG_FILE));
+  } catch {
+    return false;
+  }
+}
+function buildCodexGoalsFeatureConfigContent(existingContent = "") {
+  return setCodexGoalsFeatureInContent(existingContent, true);
+}
 function ensureEnvKeyMigration() {
   const tomlConfig = readDefaultTomlConfig();
   if (tomlConfig?.codex?.envKeyMigrated)
@@ -505,6 +589,7 @@ function parseCodexConfig(content) {
       providers: [],
       mcpServices: [],
       managed: false,
+      features: void 0,
       otherConfig: [],
       modelProviderCommented: void 0
     };
@@ -514,6 +599,7 @@ function parseCodexConfig(content) {
       return match.replace(/\\\\/g, "/").replace(/\\/g, "/").replace('C:/Windows"?', 'C:/Windows"');
     });
     const tomlData = parse(normalizedContent);
+    const features = normalizeCodexFeatureFlags(tomlData.features);
     const providers = [];
     if (tomlData.model_providers) {
       for (const [id, providerData] of Object.entries(tomlData.model_providers)) {
@@ -627,6 +713,7 @@ function parseCodexConfig(content) {
       providers,
       mcpServices,
       managed,
+      features,
       otherConfig,
       modelProviderCommented
     };
@@ -642,6 +729,7 @@ function parseCodexConfig(content) {
       providers: [],
       mcpServices: [],
       managed: false,
+      features: void 0,
       otherConfig,
       modelProviderCommented: void 0
     };
@@ -809,6 +897,9 @@ function renderCodexConfig(data) {
   if (result && !result.endsWith("\n")) {
     result += "\n";
   }
+  if (data.features && Object.keys(data.features).length > 0) {
+    result = applyCodexFeatureFlagsToContent(result, data.features);
+  }
   return result;
 }
 function writeCodexConfig(data) {
@@ -1166,6 +1257,7 @@ function getEssentialPromptFiles(workflowSrc, preferredLang) {
   const essentialDir = join(workflowSrc, "essential", preferredLang);
   const files = [
     "feat.md",
+    "goal.md",
     "init-project.md"
   ];
   const resolved = [];
@@ -1253,6 +1345,7 @@ async function applyCustomApiConfig(customApiConfig) {
     modelProviderCommented: false,
     providers,
     mcpServices: existingConfig?.mcpServices || [],
+    features: existingConfig?.features,
     otherConfig: existingConfig?.otherConfig || []
   };
   writeCodexConfig(configData);
@@ -1501,6 +1594,7 @@ async function configureCodexApi(options) {
     modelProvider: defaultProvider,
     providers,
     mcpServices: existingConfig?.mcpServices || [],
+    features: existingConfig?.features,
     otherConfig: existingConfig?.otherConfig || []
   });
   writeAuthFile(authEntries, "apikey");
@@ -1682,6 +1776,7 @@ function ensureCodexRecommendedModel(defaultModel = "gpt-5-codex") {
     modelProvider: existingConfig?.modelProvider || null,
     providers: existingConfig?.providers || [],
     mcpServices: existingConfig?.mcpServices || [],
+    features: existingConfig?.features,
     otherConfig: existingConfig?.otherConfig || [],
     modelProviderCommented: existingConfig?.modelProviderCommented
   });
@@ -2036,6 +2131,7 @@ const codex = {
   backupCodexConfig: backupCodexConfig,
   backupCodexFiles: backupCodexFiles,
   backupCodexPrompts: backupCodexPrompts,
+  buildCodexGoalsFeatureConfigContent: buildCodexGoalsFeatureConfigContent,
   checkCodexUpdate: checkCodexUpdate,
   configureCodexAiMemoryFeature: configureCodexAiMemoryFeature,
   configureCodexApi: configureCodexApi,
@@ -2048,6 +2144,7 @@ const codex = {
   getCodexPresetDefinitions: getCodexPresetDefinitions,
   getCodexVersion: getCodexVersion,
   installCodexCli: installCodexCli,
+  isCodexGoalsFeatureEnabled: isCodexGoalsFeatureEnabled,
   isCodexInstalled: isCodexInstalled,
   listCodexProviders: listCodexProviders,
   migrateEnvKeyInContent: migrateEnvKeyInContent,
@@ -2055,6 +2152,7 @@ const codex = {
   needsEnvKeyMigration: needsEnvKeyMigration,
   parseCodexConfig: parseCodexConfig,
   readCodexConfig: readCodexConfig,
+  readCodexGoalsFeatureEnabled: readCodexGoalsFeatureEnabled,
   renderCodexConfig: renderCodexConfig,
   runCodexFullInit: runCodexFullInit,
   runCodexSystemPromptSelection: runCodexSystemPromptSelection,
@@ -2062,6 +2160,7 @@ const codex = {
   runCodexUpdate: runCodexUpdate,
   runCodexWorkflowImportWithLanguageSelection: runCodexWorkflowImportWithLanguageSelection,
   runCodexWorkflowSelection: runCodexWorkflowSelection,
+  setCodexGoalsFeatureInContent: setCodexGoalsFeatureInContent,
   switchCodexProvider: switchCodexProvider,
   switchToOfficialLogin: switchToOfficialLogin,
   switchToProvider: switchToProvider,
@@ -2069,4 +2168,4 @@ const codex = {
   writeCodexConfig: writeCodexConfig
 };
 
-export { switchToOfficialLogin as a, switchToProvider as b, runCodexUpdate as c, applyCodexPlatformCommand as d, detectConfigManagementMode as e, backupCodexComplete as f, writeAuthFile as g, runCodexFullInit as h, runCodexUninstall as i, configureCodexAiMemoryFeature as j, configureCodexDefaultModelFeature as k, listCodexProviders as l, configureCodexMcp as m, configureCodexApi as n, configureCodexPresetFeature as o, runCodexWorkflowImportWithLanguageSelection as p, codex as q, readCodexConfig as r, switchCodexProvider as s, writeCodexConfig as w };
+export { switchToOfficialLogin as a, switchToProvider as b, runCodexUpdate as c, applyCodexPlatformCommand as d, detectConfigManagementMode as e, backupCodexComplete as f, writeAuthFile as g, readCodexGoalsFeatureEnabled as h, buildCodexGoalsFeatureConfigContent as i, runCodexFullInit as j, runCodexUninstall as k, listCodexProviders as l, configureCodexAiMemoryFeature as m, configureCodexDefaultModelFeature as n, configureCodexMcp as o, configureCodexApi as p, configureCodexPresetFeature as q, readCodexConfig as r, switchCodexProvider as s, runCodexWorkflowImportWithLanguageSelection as t, codex as u, writeCodexConfig as w };

package/dist/chunks/completion.mjs

@@ -2,11 +2,12 @@ import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 import a from './index5.mjs';
+import { CODE_TOOL_TYPES } from './constants.mjs';
 import { i18n } from './index2.mjs';
 import '../shared/ccjk.BAGoDD49.mjs';
+import '../shared/ccjk.bQ7Dh1g4.mjs';
 import 'node:process';
 import 'node:url';
-import '../shared/ccjk.bQ7Dh1g4.mjs';
 
 const COMPLETION_COMMANDS = [
   // Core Commands
@@ -19,7 +20,7 @@ const COMPLETION_COMMANDS = [
       { flags: "--config-lang, -c", description: "Configuration language", values: ["zh-CN", "en"] },
       { flags: "--force, -f", description: "Force overwrite" },
       { flags: "--skip-prompt, -s", description: "Skip prompts" },
-      { flags: "--code-type, -T", description: "Code tool type", values: ["claude-code", "codex", "aider", "continue", "cline", "cursor"] }
+      { flags: "--code-type, -T", description: "Code tool type", values: [...CODE_TOOL_TYPES] }
     ]
   },
   {
@@ -36,7 +37,7 @@ const COMPLETION_COMMANDS = [
     description: "Run environment health check",
     options: [
       { flags: "--check-providers", description: "Check API provider health" },
-      { flags: "--code-type, -T", description: "Code tool type", values: ["claude-code", "codex"] },
+      { flags: "--code-type, -T", description: "Code tool type", values: ["claude-code", "clavue", "codex"] },
       { flags: "--fix-settings", description: "Fix settings.json validation issues" }
     ]
   },

package/dist/chunks/config-switch.mjs

@@ -4,7 +4,7 @@ import { i as inquirer } from './index6.mjs';
 import { resolveCodeToolType, isCodeToolType, DEFAULT_CODE_TOOL_TYPE } from './constants.mjs';
 import { ensureI18nInitialized, i18n } from './index2.mjs';
 import { readZcfConfig } from './ccjk-config.mjs';
-import { C as ClaudeCodeConfigManager, s as setMyclaudeActiveProviderProfile, j as syncMyclaudeProviderProfilesFromClaudeConfig } from './config.mjs';
+import { C as ClaudeCodeConfigManager, j as setMyclaudeActiveProviderProfile, k as syncMyclaudeProviderProfilesFromClaudeConfig } from './config.mjs';
 import { s as switchCodexProvider, l as listCodexProviders, r as readCodexConfig, a as switchToOfficialLogin, b as switchToProvider } from './codex.mjs';
 import { h as handleGeneralError } from '../shared/ccjk.DGllfVCZ.mjs';
 import { a as addNumbersToChoices } from '../shared/ccjk.BFQ7yr5S.mjs';
@@ -32,7 +32,7 @@ import './fs-operations.mjs';
 import 'node:fs/promises';
 import './json-config.mjs';
 import '../shared/ccjk.RyizuzOI.mjs';
-import '../shared/ccjk.Ccrqt7u2.mjs';
+import '../shared/ccjk.Di1IYU3u.mjs';
 import './platform.mjs';
 import './main.mjs';
 import 'module';

package/dist/chunks/config.mjs

@@ -6,9 +6,9 @@ import { ZCF_CONFIG_FILE, ZCF_CONFIG_DIR, CLAUDE_VSC_CONFIG_FILE, CLAVUE_CONFIG_
 import { ensureI18nInitialized, i18n } from './index2.mjs';
 import { existsSync, readFileSync, chmodSync } from 'node:fs';
 import { readDefaultTomlConfig, createDefaultTomlConfig, writeTomlConfig } from './ccjk-config.mjs';
+import { r as resolveClaudeFamilySettingsTarget, n as normalizeClaudeFamilySettings } from '../shared/ccjk.Di1IYU3u.mjs';
 import { ensureDir, exists, copyFile, copyDir, writeFileAtomic } from './fs-operations.mjs';
 import { readJsonConfig, writeJsonConfig, backupJsonConfig } from './json-config.mjs';
-import { r as resolveClaudeFamilySettingsTarget, m as mergeAndCleanPermissions } from '../shared/ccjk.Ccrqt7u2.mjs';
 import { j as join, d as dirname } from '../shared/ccjk.bQ7Dh1g4.mjs';
 import { i as isWindows, m as getMcpCommand } from './platform.mjs';
 
@@ -251,6 +251,7 @@ class ClaudeCodeConfigManager {
         sonnetModel: profile.defaultSonnetModel,
         opusModel: profile.defaultOpusModel
       }, modelMode);
+      normalizeClaudeFamilySettings(settings);
       writeJsonConfig(target.settingsFile, settings);
       const { setPrimaryApiKey, addCompletedOnboarding } = await Promise.resolve().then(function () { return claudeConfig; });
       setPrimaryApiKey(target.codeTool);
@@ -279,6 +280,7 @@ class ClaudeCodeConfigManager {
           sonnetModel: profile?.defaultSonnetModel,
           opusModel: profile?.defaultOpusModel
         }, profile ? modelMode : "reset");
+        normalizeClaudeFamilySettings(repairedSettings);
         writeJsonConfig(target.settingsFile, repairedSettings);
         verifiedSettings = readJsonConfig2(target.settingsFile) || {};
       }
@@ -1040,6 +1042,9 @@ function inferClavueModelMode(profile) {
   if (routedModels.length > 0 && !routedModels.some(isOpenAiFamilyModel)) {
     return "anthropic_native";
   }
+  if (routedModels.length > 0) {
+    return "hybrid_compatible";
+  }
   if (profile.mode === "openai-native") {
     return "openai_native";
   }
@@ -1048,6 +1053,16 @@ function inferClavueModelMode(profile) {
   }
   return routedModels.some(isOpenAiFamilyModel) ? "hybrid_compatible" : "anthropic_native";
 }
+function getClavueRoutingPresetId(profile) {
+  const mode = inferClavueModelMode(profile);
+  if (mode === "openai_native") {
+    return "gpt_5_4_codex";
+  }
+  if (mode === "anthropic_native") {
+    return "claude_code_heritage";
+  }
+  return "custom";
+}
 function isCcjkClavueProfile(profile) {
   return profile.provenance?.kind === "imported" && profile.provenance.sourceId === "ccjk";
 }
@@ -1148,7 +1163,7 @@ function createClavueModelRouting(profile) {
   const opusModel = (profile.defaultOpusModel || primaryModel).trim();
   const executionModel = sonnetModel || primaryModel;
   return {
-    presetId: "custom",
+    presetId: getClavueRoutingPresetId(profile),
     primaryModel,
     subagentModel: executionModel && executionModel !== primaryModel ? executionModel : "",
     smallFastModel: haikuModel,
@@ -1239,6 +1254,40 @@ function toLegacyProviderProfile(profile) {
     })
   };
 }
+function normalizeModelSlot(model) {
+  return typeof model === "string" && model.trim() ? model.trim() : void 0;
+}
+function resolveClavueModelSelectionSlots(options) {
+  if (options.reset) {
+    return {};
+  }
+  const selectedModel = normalizeModelSlot(options.selectedModel);
+  if (selectedModel) {
+    return {
+      primaryModel: selectedModel,
+      haikuModel: selectedModel,
+      sonnetModel: selectedModel,
+      opusModel: selectedModel
+    };
+  }
+  const primaryModel = normalizeModelSlot(options.primaryModel);
+  const haikuModel = normalizeModelSlot(options.haikuModel);
+  const sonnetModel = normalizeModelSlot(options.sonnetModel);
+  const opusModel = normalizeModelSlot(options.opusModel);
+  if (primaryModel) {
+    return {
+      primaryModel,
+      haikuModel: haikuModel || primaryModel,
+      sonnetModel: sonnetModel || primaryModel,
+      opusModel: opusModel || primaryModel
+    };
+  }
+  return {
+    haikuModel,
+    sonnetModel,
+    opusModel
+  };
+}
 function getClavueActiveProfile(config) {
   const activeId = config?.clavueActiveProviderProfileId || config?.myclaudeActiveProviderProfileId || "";
   const legacyProfiles = getLegacyMyclaudeProviderProfiles(config);
@@ -1253,6 +1302,66 @@ function getClavueActiveProfile(config) {
   }
   return nativeProfiles.map(toLegacyProviderProfile).find((profile) => profile.id === activeId) || null;
 }
+function syncClavueActiveProviderModelSelection(options) {
+  const config = readClavueConfig();
+  const activeId = config?.clavueActiveProviderProfileId || config?.myclaudeActiveProviderProfileId || "";
+  if (!config || !activeId) {
+    return false;
+  }
+  const slots = resolveClavueModelSelectionSlots(options);
+  const nativeProfiles = getClavueProviderProfiles(config);
+  const nativeProfileIndex = nativeProfiles.findIndex((profile) => profile.id === activeId);
+  if (nativeProfileIndex >= 0) {
+    const currentProfile = nativeProfiles[nativeProfileIndex];
+    const routingProfile = {
+      id: currentProfile.id,
+      name: currentProfile.name,
+      provider: currentProfile.providerId,
+      baseUrl: currentProfile.baseUrl,
+      authType: currentProfile.authType,
+      model: slots.primaryModel,
+      fastModel: slots.haikuModel,
+      primaryModel: slots.primaryModel,
+      defaultHaikuModel: slots.haikuModel,
+      defaultSonnetModel: slots.sonnetModel,
+      defaultOpusModel: slots.opusModel,
+      mode: currentProfile.modelMode === "openai_native" ? "openai-native" : currentProfile.modelMode === "hybrid_compatible" ? "ccr-proxy" : "official"
+    };
+    const nextProfile = {
+      ...currentProfile,
+      modelMode: options.reset ? currentProfile.modelMode : inferClavueModelMode(routingProfile),
+      modelRouting: createClavueModelRouting(routingProfile),
+      updatedAt: Date.now()
+    };
+    config.clavueProviderProfiles = nativeProfiles.map((profile, index) => index === nativeProfileIndex ? nextProfile : profile);
+    delete config.myclaudeProviderProfiles;
+    delete config.myclaudeActiveProviderProfileId;
+    writeClavueConfig(config);
+    syncMyclaudeActiveProfileToSettings(toLegacyProviderProfile(nextProfile));
+    return true;
+  }
+  const legacyProfiles = getLegacyMyclaudeProviderProfiles(config);
+  const legacyProfileIndex = legacyProfiles.findIndex((profile) => profile.id === activeId);
+  if (legacyProfileIndex < 0) {
+    return false;
+  }
+  const updatedProfiles = legacyProfiles.map((profile, index) => {
+    if (index !== legacyProfileIndex) {
+      return profile;
+    }
+    return {
+      ...profile,
+      model: slots.primaryModel,
+      fastModel: slots.haikuModel,
+      primaryModel: slots.primaryModel,
+      defaultHaikuModel: slots.haikuModel,
+      defaultSonnetModel: slots.sonnetModel,
+      defaultOpusModel: slots.opusModel
+    };
+  });
+  setMyclaudeProviderProfiles(updatedProfiles, activeId);
+  return true;
+}
 function setMyclaudeProviderProfiles(profiles, activeProfileId) {
   const config = readClavueConfig() || { mcpServers: {} };
   const normalizedProfiles = profiles.map(normalizeMyclaudeProviderProfile);
@@ -1388,6 +1497,7 @@ function syncMyclaudeActiveProfileToSettings(profile) {
   } else {
     delete settings.env.CLAUDE_CODE_SUBAGENT_MODEL;
   }
+  normalizeClaudeFamilySettings(settings);
   writeJsonConfig(CLAVUE_SETTINGS_FILE, settings);
 }
 function syncMyclaudeProviderProfilesFromClaudeConfig(configData) {
@@ -1469,8 +1579,9 @@ function syncMcpPermissions(codeTool) {
     const nonMcpPerms = settings.permissions.allow.filter(
       (p) => !p.startsWith("mcp__")
     );
-    const mcpPerms = mcpServerIds.map((id) => `mcp__${id}`);
+    const mcpPerms = mcpServerIds.map((id) => `mcp__${id.toLowerCase().replace(/-/g, "_")}__*`);
     settings.permissions.allow = [...nonMcpPerms, ...mcpPerms];
+    normalizeClaudeFamilySettings(settings);
     writeJsonConfig(settingsPath, settings);
   } catch {
   }
@@ -1494,6 +1605,7 @@ const claudeConfig = {
   setMyclaudeActiveProviderProfile: setMyclaudeActiveProviderProfile,
   setMyclaudeProviderProfiles: setMyclaudeProviderProfiles,
   setPrimaryApiKey: setPrimaryApiKey,
+  syncClavueActiveProviderModelSelection: syncClavueActiveProviderModelSelection,
   syncMcpPermissions: syncMcpPermissions,
   syncMyclaudeProviderProfilesFromClaudeConfig: syncMyclaudeProviderProfilesFromClaudeConfig,
   syncMyclaudeProviderProfilesFromCurrentClaudeConfig: syncMyclaudeProviderProfilesFromCurrentClaudeConfig,
@@ -1519,6 +1631,75 @@ function clearModelEnv(env, mode = "reset") {
   }
 }
 
+const INVALID_PERMISSION_NAMES = /* @__PURE__ */ new Set([
+  "AllowEdit",
+  "AllowWrite",
+  "AllowRead",
+  "AllowExec",
+  "AllowCreateProcess",
+  "AllowKillProcess",
+  "AllowNetworkAccess",
+  "AllowFileSystemAccess",
+  "AllowShellAccess",
+  "AllowHttpAccess"
+]);
+function isValidPermission(perm) {
+  if (INVALID_PERMISSION_NAMES.has(perm)) {
+    return false;
+  }
+  if (["mcp__.*", "mcp__*", "mcp__(*)"].includes(perm)) {
+    return false;
+  }
+  if (/^[a-z]/.test(perm) && !perm.startsWith("mcp__")) {
+    return false;
+  }
+  return true;
+}
+function isCoveredByWildcard(perm, wildcardPerm) {
+  const wildcardMatch = wildcardPerm.match(/^(\w+)\((.+)\)$/);
+  if (!wildcardMatch)
+    return false;
+  const [, tool, wildcardArg] = wildcardMatch;
+  if (!wildcardArg.includes("*"))
+    return false;
+  const permMatch = perm.match(/^(\w+)\((.+)\)$/);
+  if (!permMatch)
+    return false;
+  const [, permTool, permArg] = permMatch;
+  if (tool !== permTool)
+    return false;
+  const regexStr = wildcardArg.replace(/[.+?^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".+");
+  return new RegExp(`^${regexStr}$`).test(permArg);
+}
+function mergeAndCleanPermissions(templatePermissions, userPermissions) {
+  const template = templatePermissions || [];
+  const user = userPermissions || [];
+  const result = [...template];
+  for (const perm of user) {
+    if (result.includes(perm)) {
+      continue;
+    }
+    if (!isValidPermission(perm)) {
+      continue;
+    }
+    let isRedundant = false;
+    for (const templatePerm of template) {
+      if (perm.startsWith(`${templatePerm}(`)) {
+        isRedundant = true;
+        break;
+      }
+      if (isCoveredByWildcard(perm, templatePerm)) {
+        isRedundant = true;
+        break;
+      }
+    }
+    if (!isRedundant) {
+      result.push(perm);
+    }
+  }
+  return result;
+}
+
 const BUILTIN_MODEL_VALUES = ["opus", "sonnet", "sonnet[1m]"];
 function clearLegacyTopLevelRuntimeSettings(settings) {
   delete settings.baseUrl;
@@ -1603,6 +1784,7 @@ function configureApi(apiConfig, codeTool) {
   if (apiConfig.url) {
     settings.env.ANTHROPIC_BASE_URL = apiConfig.url;
   }
+  normalizeClaudeFamilySettings(settings);
   writeJsonConfig(target.settingsFile, settings);
   if (apiConfig.authType && target.codeTool === "claude-code") {
     try {
@@ -1636,6 +1818,7 @@ function configureApi(apiConfig, codeTool) {
       if (apiConfig.url) {
         freshSettings.env.ANTHROPIC_BASE_URL = apiConfig.url;
       }
+      normalizeClaudeFamilySettings(freshSettings);
       writeJsonConfig(target.settingsFile, freshSettings);
     }
   }
@@ -1651,6 +1834,7 @@ function configureHooks(hooks) {
     ...settings.hooks || {},
     ...hooks
   };
+  normalizeClaudeFamilySettings(settings);
   writeJsonConfig(SETTINGS_FILE, settings);
 }
 function mergeConfigs(sourceFile, targetFile) {
@@ -1659,6 +1843,7 @@ function mergeConfigs(sourceFile, targetFile) {
   const target = readJsonConfig(targetFile) || {};
   const source = readJsonConfig(sourceFile) || {};
   const merged = deepMerge(target, source);
+  normalizeClaudeFamilySettings(merged);
   writeJsonConfig(targetFile, merged);
 }
 function overwriteModelSettings(settings, {
@@ -1703,11 +1888,13 @@ function updateCustomModel(primaryModel, haikuModel, sonnetModel, opusModel, cod
     sonnetModel,
     opusModel
   }, "override");
+  normalizeClaudeFamilySettings(settings);
   writeJsonConfig(target.settingsFile, settings);
 }
-function updateDefaultModel(model) {
+function updateDefaultModel(model, codeTool) {
+  const target = resolveClaudeFamilySettingsTarget(codeTool);
   let settings = getDefaultSettings();
-  const existingSettings = readJsonConfig(SETTINGS_FILE);
+  const existingSettings = readJsonConfig(target.settingsFile);
   if (existingSettings) {
     settings = existingSettings;
   }
@@ -1723,7 +1910,8 @@ function updateDefaultModel(model) {
   } else {
     settings.model = model;
   }
-  writeJsonConfig(SETTINGS_FILE, settings);
+  normalizeClaudeFamilySettings(settings);
+  writeJsonConfig(target.settingsFile, settings);
 }
 function mergeSettingsFile(templatePath, targetPath) {
   try {
@@ -1778,6 +1966,7 @@ function mergeSettingsFile(templatePath, targetPath) {
     if (mergedSettings.plansDirectory === null) {
       delete mergedSettings.plansDirectory;
     }
+    normalizeClaudeFamilySettings(mergedSettings);
     writeJsonConfig(targetPath, mergedSettings);
   } catch (error) {
     console.error("Failed to merge settings", error);
@@ -1788,8 +1977,9 @@ function mergeSettingsFile(templatePath, targetPath) {
     }
   }
 }
-function getExistingModelConfig() {
-  const settings = readJsonConfig(SETTINGS_FILE);
+function getExistingModelConfig(codeTool) {
+  const target = resolveClaudeFamilySettingsTarget(codeTool);
+  const settings = readJsonConfig(target.settingsFile);
   if (!settings) {
     return null;
   }
@@ -1808,8 +1998,9 @@ function getExistingModelConfig() {
   }
   return "custom";
 }
-function getExistingCustomModelConfig() {
-  const settings = readJsonConfig(SETTINGS_FILE);
+function getExistingCustomModelConfig(codeTool) {
+  const target = resolveClaudeFamilySettingsTarget(codeTool);
+  const settings = readJsonConfig(target.settingsFile);
   if (!settings) {
     return null;
   }
@@ -1879,6 +2070,7 @@ function switchToOfficialLogin(codeTool) {
       delete settings.env.ANTHROPIC_AUTH_TOKEN;
       delete settings.env.ANTHROPIC_API_KEY;
     }
+    normalizeClaudeFamilySettings(settings);
     writeJsonConfig(target.settingsFile, settings);
     if (target.codeTool === "claude-code") {
       const vscConfig = readJsonConfig(CLAUDE_VSC_CONFIG_FILE);
@@ -1950,4 +2142,4 @@ const config = {
   updateDefaultModel: updateDefaultModel
 };
 
-export { clearMyclaudeProviderProfiles as A, replaceMcpServers as B, ClaudeCodeConfigManager as C, syncMcpPermissions as D, buildMyclaudeProviderPresentation as E, config as F, claudeCodeConfigManager as G, claudeConfig as H, getExistingCustomModelConfig as a, backupExistingConfig as b, updateDefaultModel as c, backupMcpConfig as d, buildMcpServerConfig as e, fixWindowsMcpConfig as f, getExistingModelConfig as g, getExistingApiConfig as h, configureApi as i, syncMyclaudeProviderProfilesFromClaudeConfig as j, copyConfigFiles as k, deepMerge as l, mergeMcpServers as m, clearLegacyTopLevelRuntimeSettings as n, setPrimaryApiKey as o, promptApiConfigurationAction as p, addCompletedOnboarding as q, readMcpConfig as r, setMyclaudeActiveProviderProfile as s, switchToOfficialLogin as t, updateCustomModel as u, applyAiLanguageDirective as v, writeMcpConfig as w, overwriteModelSettings as x, setMyclaudeProviderProfiles as y, ensureClaudeDir as z };
+export { setMyclaudeProviderProfiles as A, overwriteModelSettings as B, ClaudeCodeConfigManager as C, ensureClaudeDir as D, clearMyclaudeProviderProfiles as E, replaceMcpServers as F, buildMyclaudeProviderPresentation as G, config as H, claudeCodeConfigManager as I, claudeConfig as J, getExistingCustomModelConfig as a, backupExistingConfig as b, updateDefaultModel as c, backupMcpConfig as d, buildMcpServerConfig as e, fixWindowsMcpConfig as f, getExistingModelConfig as g, getExistingApiConfig as h, configureApi as i, setMyclaudeActiveProviderProfile as j, syncMyclaudeProviderProfilesFromClaudeConfig as k, copyConfigFiles as l, mergeMcpServers as m, mergeAndCleanPermissions as n, syncMcpPermissions as o, promptApiConfigurationAction as p, deepMerge as q, readMcpConfig as r, syncClavueActiveProviderModelSelection as s, clearLegacyTopLevelRuntimeSettings as t, updateCustomModel as u, setPrimaryApiKey as v, writeMcpConfig as w, addCompletedOnboarding as x, switchToOfficialLogin as y, applyAiLanguageDirective as z };