ccjk 16.0.1 → 16.0.3

package/dist/chunks/claude-code-config-manager.mjs

@@ -1,6 +1,6 @@
 import dayjs from 'dayjs';
 import { join } from 'pathe';
-import { c as CCJK_CONFIG_FILE, C as CCJK_CONFIG_DIR, as as ensureDir, at as readDefaultTomlConfig, au as createDefaultTomlConfig, av as exists, aw as readJsonConfig, ax as writeTomlConfig, S as SETTINGS_FILE, ay as clearModelEnv, az as copyFile } from './simple-config.mjs';
+import { c as CCJK_CONFIG_FILE, C as CCJK_CONFIG_DIR, ax as ensureDir, ay as readDefaultTomlConfig, az as createDefaultTomlConfig, aA as exists, aB as readJsonConfig, aC as writeTomlConfig, ar as getActiveCodeTool, v as activeSettingsFile, aD as clearModelEnv, aE as normalizeClaudeFamilySettings, aF as copyFile } from './simple-config.mjs';
 import 'node:fs';
 import 'node:process';
 import 'ansis';
@@ -9,7 +9,6 @@ import 'node:child_process';
 import 'node:os';
 import 'node:util';
 import 'node:url';
-import '@rainbowatcher/toml-edit-js';
 import 'inquirer-toggle';
 import 'ora';
 import 'tinyexec';
@@ -17,6 +16,7 @@ import 'semver';
 import 'node:fs/promises';
 import 'i18next';
 import 'i18next-fs-backend';
+import '@rainbowatcher/toml-edit-js';
 
 class ClaudeCodeConfigManager {
   static CONFIG_FILE = CCJK_CONFIG_FILE;
@@ -182,17 +182,19 @@ class ClaudeCodeConfigManager {
   /**
    * Apply profile settings to Claude Code runtime
    */
-  static async applyProfileSettings(profile) {
-    const { ensureI18nInitialized, i18n } = await import('./simple-config.mjs').then(function (n) { return n.bi; });
+  static async applyProfileSettings(profile, codeTool) {
+    const { ensureI18nInitialized, i18n } = await import('./simple-config.mjs').then(function (n) { return n.bq; });
     ensureI18nInitialized();
+    const targetTool = codeTool ?? getActiveCodeTool();
+    const settingsFile = activeSettingsFile(targetTool === "codex" || targetTool === "grok" ? "claude-code" : targetTool);
     try {
       if (!profile) {
-        const { switchToOfficialLogin } = await import('./simple-config.mjs').then(function (n) { return n.bm; });
-        switchToOfficialLogin();
+        const { switchToOfficialLogin } = await import('./simple-config.mjs').then(function (n) { return n.bu; });
+        switchToOfficialLogin(targetTool === "clavue" ? "clavue" : "claude-code");
         return;
       }
-      const { readJsonConfig: readJsonConfig2, writeJsonConfig } = await import('./simple-config.mjs').then(function (n) { return n.bk; });
-      const settings = readJsonConfig2(SETTINGS_FILE) || {};
+      const { readJsonConfig: readJsonConfig2, writeJsonConfig } = await import('./simple-config.mjs').then(function (n) { return n.bs; });
+      const settings = readJsonConfig2(settingsFile) || {};
       if (!settings.env)
         settings.env = {};
       clearModelEnv(settings.env);
@@ -204,7 +206,7 @@ class ClaudeCodeConfigManager {
         settings.env.ANTHROPIC_AUTH_TOKEN = profile.apiKey;
         delete settings.env.ANTHROPIC_API_KEY;
       } else if (profile.authType === "ccr_proxy") {
-        const { readCcrConfig } = await import('./simple-config.mjs').then(function (n) { return n.bn; });
+        const { readCcrConfig } = await import('./simple-config.mjs').then(function (n) { return n.bv; });
         const ccrConfig = readCcrConfig();
         if (!ccrConfig) {
           throw new Error(i18n.t("ccr:ccrNotConfigured") || "CCR proxy configuration not found");
@@ -238,10 +240,12 @@ class ClaudeCodeConfigManager {
       } else {
         clearModelEnv(settings.env);
       }
-      writeJsonConfig(SETTINGS_FILE, settings);
-      const { setPrimaryApiKey, addCompletedOnboarding } = await import('./simple-config.mjs').then(function (n) { return n.bl; });
-      setPrimaryApiKey();
-      addCompletedOnboarding();
+      const normalizedTool = targetTool === "clavue" ? "clavue" : "claude-code";
+      normalizeClaudeFamilySettings(settings, { codeTool: normalizedTool });
+      writeJsonConfig(settingsFile, settings);
+      const { setPrimaryApiKey, addCompletedOnboarding } = await import('./simple-config.mjs').then(function (n) { return n.bt; });
+      setPrimaryApiKey(normalizedTool);
+      addCompletedOnboarding(normalizedTool);
       if (shouldRestartCcr) {
         const { runCcrRestart } = await import('./commands.mjs');
         await runCcrRestart();
@@ -600,7 +604,7 @@ class ClaudeCodeConfigManager {
    */
   static async syncCcrProfile() {
     try {
-      const { readCcrConfig } = await import('./simple-config.mjs').then(function (n) { return n.bn; });
+      const { readCcrConfig } = await import('./simple-config.mjs').then(function (n) { return n.bv; });
       const ccrConfig = readCcrConfig();
       if (!ccrConfig) {
         await this.ensureCcrProfileExists(ccrConfig);

package/dist/chunks/claude-code-incremental-manager.mjs

@@ -1,7 +1,8 @@
 import ansis from 'ansis';
 import inquirer from 'inquirer';
-import { an as ensureI18nInitialized, ao as i18n, ap as addNumbersToChoices, aq as validateApiKey, ar as promptBoolean } from './simple-config.mjs';
+import { aq as ensureI18nInitialized, ar as getActiveCodeTool, as as i18n, at as addNumbersToChoices, au as validateApiKey, av as promptBoolean } from './simple-config.mjs';
 import { ClaudeCodeConfigManager } from './claude-code-config-manager.mjs';
+import { g as getClaudeFamilyRuntimeLabel } from '../shared/ccjk.BSLlI-JL.mjs';
 import 'node:fs';
 import 'node:process';
 import 'node:child_process';
@@ -10,7 +11,6 @@ import 'node:util';
 import 'dayjs';
 import 'pathe';
 import 'node:url';
-import '@rainbowatcher/toml-edit-js';
 import 'inquirer-toggle';
 import 'ora';
 import 'tinyexec';
@@ -18,6 +18,7 @@ import 'semver';
 import 'node:fs/promises';
 import 'i18next';
 import 'i18next-fs-backend';
+import '@rainbowatcher/toml-edit-js';
 
 function getAuthTypeLabel(authType) {
   ensureI18nInitialized();
@@ -41,7 +42,8 @@ async function configureIncrementalManagement() {
   }
   const profiles = Object.values(config.profiles);
   const currentProfile = config.currentProfileId ? config.profiles[config.currentProfileId] : null;
-  console.log(ansis.cyan(i18n.t("multi-config:incrementalManagementTitle")));
+  const runtimeLabel = getClaudeFamilyRuntimeLabel(getActiveCodeTool());
+  console.log(ansis.cyan(i18n.t("multi-config:incrementalManagementTitle", { runtime: runtimeLabel })));
   console.log(ansis.gray(i18n.t("multi-config:currentProfileCount", { count: profiles.length })));
   if (currentProfile) {
     console.log(ansis.gray(i18n.t("multi-config:currentDefaultProfile", { profile: currentProfile.name })));

package/dist/chunks/codex-config-switch.mjs

@@ -1,6 +1,6 @@
 import ansis from 'ansis';
 import inquirer from 'inquirer';
-import { an as ensureI18nInitialized, aA as detectConfigManagementMode, ao as i18n, ap as addNumbersToChoices, ar as promptBoolean, aw as readJsonConfig, j as CODEX_AUTH_FILE } from './simple-config.mjs';
+import { aq as ensureI18nInitialized, aG as detectConfigManagementMode, as as i18n, at as addNumbersToChoices, av as promptBoolean, aB as readJsonConfig, l as CODEX_AUTH_FILE } from './simple-config.mjs';
 import { deleteProviders, addProviderToExisting, editExistingProvider } from './codex-provider-manager.mjs';
 import 'node:fs';
 import 'node:process';
@@ -10,7 +10,6 @@ import 'node:util';
 import 'dayjs';
 import 'pathe';
 import 'node:url';
-import '@rainbowatcher/toml-edit-js';
 import 'inquirer-toggle';
 import 'ora';
 import 'tinyexec';
@@ -18,6 +17,7 @@ import 'semver';
 import 'node:fs/promises';
 import 'i18next';
 import 'i18next-fs-backend';
+import '@rainbowatcher/toml-edit-js';
 
 async function configureIncrementalManagement() {
   ensureI18nInitialized();
@@ -155,7 +155,7 @@ async function handleAddProvider() {
       defaultValue: true
     });
     if (setAsDefault) {
-      const { switchToProvider } = await import('./simple-config.mjs').then(function (n) { return n.br; });
+      const { switchToProvider } = await import('./simple-config.mjs').then(function (n) { return n.bz; });
       const switched = await switchToProvider(provider.id);
       if (switched) {
         console.log(ansis.green(i18n.t("multi-config:profileSetAsDefault", { name: provider.name })));
@@ -330,7 +330,7 @@ ${i18n.t("codex:copyingProvider", { name: provider.name })}`));
       defaultValue: false
     });
     if (setAsDefault) {
-      const { switchToProvider } = await import('./simple-config.mjs').then(function (n) { return n.br; });
+      const { switchToProvider } = await import('./simple-config.mjs').then(function (n) { return n.bz; });
       const switched = await switchToProvider(copiedProvider.id);
       if (switched) {
         console.log(ansis.green(i18n.t("multi-config:profileSetAsDefault", { name: copiedProvider.name })));

package/dist/chunks/codex-provider-manager.mjs

@@ -1,4 +1,4 @@
-import { an as ensureI18nInitialized, aB as readCodexConfig, ao as i18n, aC as backupCodexComplete, aD as writeAuthFile } from './simple-config.mjs';
+import { aq as ensureI18nInitialized, aH as readCodexConfig, as as i18n, aI as backupCodexComplete, aJ as writeAuthFile } from './simple-config.mjs';
 import 'node:fs';
 import 'node:process';
 import 'ansis';
@@ -9,7 +9,6 @@ import 'node:util';
 import 'dayjs';
 import 'pathe';
 import 'node:url';
-import '@rainbowatcher/toml-edit-js';
 import 'inquirer-toggle';
 import 'ora';
 import 'tinyexec';
@@ -17,6 +16,7 @@ import 'semver';
 import 'node:fs/promises';
 import 'i18next';
 import 'i18next-fs-backend';
+import '@rainbowatcher/toml-edit-js';
 
 async function addProviderToExisting(provider, apiKey, allowOverwrite = false) {
   ensureI18nInitialized();
@@ -40,7 +40,7 @@ async function addProviderToExisting(provider, apiKey, allowOverwrite = false) {
       }
       backupPath = backup || void 0;
     }
-    const { updateCodexApiFields, upsertCodexProvider } = await import('./simple-config.mjs').then(function (n) { return n.bq; });
+    const { updateCodexApiFields, upsertCodexProvider } = await import('./simple-config.mjs').then(function (n) { return n.by; });
     if (!existingConfig) {
       updateCodexApiFields({
         model: provider.model,
@@ -100,7 +100,7 @@ async function editExistingProvider(providerId, updates) {
       ...updates.wireApi && { wireApi: updates.wireApi },
       ...updates.model && { model: updates.model }
     };
-    const { upsertCodexProvider } = await import('./simple-config.mjs').then(function (n) { return n.bq; });
+    const { upsertCodexProvider } = await import('./simple-config.mjs').then(function (n) { return n.by; });
     upsertCodexProvider(providerId, updatedProvider);
     if (updates.apiKey) {
       const authEntries = {};
@@ -166,7 +166,7 @@ async function deleteProviders(providerIds) {
     if (providerIds.includes(existingConfig.modelProvider || "")) {
       newDefaultProvider = remainingProviders[0].id;
     }
-    const { deleteCodexProvider, updateCodexApiFields } = await import('./simple-config.mjs').then(function (n) { return n.bq; });
+    const { deleteCodexProvider, updateCodexApiFields } = await import('./simple-config.mjs').then(function (n) { return n.by; });
     if (newDefaultProvider !== existingConfig.modelProvider) {
       updateCodexApiFields({
         modelProvider: newDefaultProvider,

package/dist/chunks/codex-uninstaller.mjs

@@ -1,6 +1,6 @@
 import { pathExists } from 'fs-extra';
 import { join } from 'pathe';
-import { l as CODEX_DIR, k as CODEX_CONFIG_FILE, ao as i18n, j as CODEX_AUTH_FILE, i as CODEX_AGENTS_FILE, m as CODEX_PROMPTS_DIR } from './simple-config.mjs';
+import { n as CODEX_DIR, m as CODEX_CONFIG_FILE, as as i18n, l as CODEX_AUTH_FILE, k as CODEX_AGENTS_FILE, o as CODEX_PROMPTS_DIR } from './simple-config.mjs';
 import { m as moveToTrash } from '../shared/ccjk.DGjQxTq_.mjs';
 import 'node:fs';
 import 'node:process';
@@ -11,7 +11,6 @@ import 'node:os';
 import 'node:util';
 import 'dayjs';
 import 'node:url';
-import '@rainbowatcher/toml-edit-js';
 import 'inquirer-toggle';
 import 'ora';
 import 'tinyexec';
@@ -19,6 +18,7 @@ import 'semver';
 import 'node:fs/promises';
 import 'i18next';
 import 'i18next-fs-backend';
+import '@rainbowatcher/toml-edit-js';
 import 'trash';
 
 class CodexUninstaller {
@@ -155,7 +155,7 @@ class CodexUninstaller {
       warnings: []
     };
     try {
-      const { uninstallCodeTool } = await import('./simple-config.mjs').then(function (n) { return n.bs; });
+      const { uninstallCodeTool } = await import('./simple-config.mjs').then(function (n) { return n.bA; });
       const success = await uninstallCodeTool("codex");
       if (success) {
         result.removed.push("@openai/codex");

package/dist/chunks/commands.mjs

@@ -1,7 +1,7 @@
 import { exec } from 'node:child_process';
 import { promisify } from 'node:util';
 import ansis from 'ansis';
-import { an as ensureI18nInitialized, ao as i18n } from './simple-config.mjs';
+import { aq as ensureI18nInitialized, as as i18n } from './simple-config.mjs';
 import 'node:fs';
 import 'node:process';
 import 'inquirer';
@@ -9,7 +9,6 @@ import 'node:os';
 import 'dayjs';
 import 'pathe';
 import 'node:url';
-import '@rainbowatcher/toml-edit-js';
 import 'inquirer-toggle';
 import 'ora';
 import 'tinyexec';
@@ -17,6 +16,7 @@ import 'semver';
 import 'node:fs/promises';
 import 'i18next';
 import 'i18next-fs-backend';
+import '@rainbowatcher/toml-edit-js';
 
 const execAsync = promisify(exec);
 async function runCcrUi(apiKey) {

package/dist/chunks/features.mjs

@@ -1,6 +1,7 @@
 import ansis from 'ansis';
 import inquirer from 'inquirer';
-import { ao as i18n, an as ensureI18nInitialized, s as SUPPORTED_LANGS, ap as addNumbersToChoices, L as LANG_LABELS, aE as updateCcjkConfig, aF as changeLanguage, aG as readCcjkConfig, ar as promptBoolean, a7 as openSettingsJson, W as importRecommendedPermissions, V as importRecommendedEnv, u as applyAiLanguageDirective, aH as configureOutputStyle, P as getExistingModelConfig, aj as updateCustomModel, ak as updateDefaultModel, aI as isWindows, a9 as readMcpConfig, M as fixWindowsMcpConfig, am as writeMcpConfig, aJ as selectMcpServices, w as backupMcpConfig, aK as getMcpServices, x as buildMcpServerConfig, a5 as mergeMcpServers, aL as isCcrInstalled, aM as installCcr, aN as setupCcrConfiguration, O as getExistingApiConfig, a8 as promptApiConfigurationAction, aO as modifyApiConfigPartially, aq as validateApiKey, B as configureApi, aP as formatApiKeyDisplay, ah as switchToOfficialLogin } from './simple-config.mjs';
+import { as as i18n, aq as ensureI18nInitialized, u as SUPPORTED_LANGS, at as addNumbersToChoices, L as LANG_LABELS, aK as updateCcjkConfig, aL as changeLanguage, ar as getActiveCodeTool, aa as openSettingsJson, Z as importRecommendedPermissions, Y as importRecommendedEnv, aM as readCcjkConfig, av as promptBoolean, x as applyAiLanguageDirective, aN as configureOutputStyle, aO as isClaudeFamilyCodeTool, T as getExistingModelConfig, am as updateCustomModel, an as updateDefaultModel, aP as isWindows, ac as readMcpConfig, P as fixWindowsMcpConfig, ap as writeMcpConfig, aQ as selectMcpServices, z as backupMcpConfig, aR as getMcpServices, B as buildMcpServerConfig, a8 as mergeMcpServers, aS as isCcrInstalled, aT as installCcr, aU as setupCcrConfiguration, R as getExistingApiConfig, ab as promptApiConfigurationAction, aV as modifyApiConfigPartially, au as validateApiKey, G as configureApi, aW as formatApiKeyDisplay, ak as switchToOfficialLogin } from './simple-config.mjs';
+import { g as getClaudeFamilyRuntimeLabel } from '../shared/ccjk.BSLlI-JL.mjs';
 import 'node:fs';
 import 'node:process';
 import 'node:child_process';
@@ -9,7 +10,6 @@ import 'node:util';
 import 'dayjs';
 import 'pathe';
 import 'node:url';
-import '@rainbowatcher/toml-edit-js';
 import 'inquirer-toggle';
 import 'ora';
 import 'tinyexec';
@@ -17,6 +17,7 @@ import 'semver';
 import 'node:fs/promises';
 import 'i18next';
 import 'i18next-fs-backend';
+import '@rainbowatcher/toml-edit-js';
 
 async function handleCancellation() {
   ensureI18nInitialized();
@@ -33,9 +34,8 @@ async function handleOfficialLoginMode() {
 }
 async function handleCustomApiMode() {
   ensureI18nInitialized();
-  const ccjkConfig = readCcjkConfig();
-  const codeToolType = ccjkConfig?.codeToolType || "claude-code";
-  if (codeToolType === "claude-code") {
+  const codeToolType = getActiveCodeTool();
+  if (isClaudeFamilyCodeTool(codeToolType)) {
     const { configureIncrementalManagement } = await import('./claude-code-incremental-manager.mjs');
     await configureIncrementalManagement();
     return;
@@ -137,7 +137,10 @@ async function handleCcrProxyMode() {
 async function handleSwitchConfigMode() {
   ensureI18nInitialized();
   const { configSwitchCommand } = await import('../cli.mjs').then(function (n) { return n.c; });
-  await configSwitchCommand({ codeType: "claude-code" });
+  const activeTool = getActiveCodeTool();
+  await configSwitchCommand({
+    codeType: isClaudeFamilyCodeTool(activeTool) ? activeTool : "claude-code"
+  });
 }
 async function configureApiFeature() {
   ensureI18nInitialized();
@@ -177,15 +180,17 @@ async function configureApiFeature() {
 }
 async function configureMcpFeature() {
   ensureI18nInitialized();
+  const codeToolType = getActiveCodeTool();
+  const mcpTool = isClaudeFamilyCodeTool(codeToolType) ? codeToolType : "claude-code";
   if (isWindows()) {
     const fixWindows = await promptBoolean({
       message: i18n.t("configuration:fixWindowsMcp") || "Fix Windows MCP configuration?",
       defaultValue: true
     });
     if (fixWindows) {
-      const existingConfig = readMcpConfig() || { mcpServers: {} };
+      const existingConfig = readMcpConfig(mcpTool) || { mcpServers: {} };
       const fixedConfig = fixWindowsMcpConfig(existingConfig);
-      writeMcpConfig(fixedConfig);
+      writeMcpConfig(fixedConfig, mcpTool);
       console.log(ansis.green(`\u2714 ${i18n.t("configuration:windowsMcpConfigFixed")}`));
     }
   }
@@ -194,7 +199,7 @@ async function configureMcpFeature() {
     return;
   }
   if (selectedServices.length > 0) {
-    const mcpBackupPath = backupMcpConfig();
+    const mcpBackupPath = backupMcpConfig(mcpTool);
     if (mcpBackupPath) {
       console.log(ansis.gray(`\u2714 ${i18n.t("mcp:mcpBackupSuccess")}: ${mcpBackupPath}`));
     }
@@ -219,20 +224,22 @@ async function configureMcpFeature() {
       }
       newServers[service.id] = config;
     }
-    const existingConfig = readMcpConfig();
+    const existingConfig = readMcpConfig(mcpTool);
     let mergedConfig = mergeMcpServers(existingConfig, newServers);
     mergedConfig = fixWindowsMcpConfig(mergedConfig);
-    writeMcpConfig(mergedConfig);
+    writeMcpConfig(mergedConfig, mcpTool);
     console.log(ansis.green(`\u2714 ${i18n.t("mcp:mcpConfigSuccess")}`));
   }
 }
 async function configureDefaultModelFeature() {
   ensureI18nInitialized();
-  const existingModel = getExistingModelConfig();
+  const codeToolType = getActiveCodeTool();
+  const runtimeLabel = getClaudeFamilyRuntimeLabel(isClaudeFamilyCodeTool(codeToolType) ? codeToolType : "claude-code");
+  const existingModel = getExistingModelConfig(isClaudeFamilyCodeTool(codeToolType) ? codeToolType : "claude-code");
   if (existingModel) {
     console.log(`
 ${ansis.blue(`\u2139 ${i18n.t("configuration:existingModelConfig") || "Existing model configuration"}`)}`);
-    const modelDisplay = existingModel === "default" ? i18n.t("configuration:defaultModelOption") || "Default (Let Claude Code choose)" : existingModel.charAt(0).toUpperCase() + existingModel.slice(1);
+    const modelDisplay = existingModel === "default" ? i18n.t("configuration:defaultModelOption", { runtime: runtimeLabel }) : existingModel.charAt(0).toUpperCase() + existingModel.slice(1);
     console.log(ansis.gray(`  ${i18n.t("configuration:currentModel") || "Current model"}: ${modelDisplay}
 `));
     const modify = await promptBoolean({
@@ -250,7 +257,7 @@ ${ansis.blue(`\u2139 ${i18n.t("configuration:existingModelConfig") || "Existing
     message: i18n.t("configuration:selectDefaultModel") || "Select default model",
     choices: addNumbersToChoices([
       {
-        name: i18n.t("configuration:defaultModelOption") || "Default - Let Claude Code choose",
+        name: i18n.t("configuration:defaultModelOption", { runtime: runtimeLabel }),
         value: "default"
       },
       {
@@ -278,11 +285,12 @@ ${ansis.blue(`\u2139 ${i18n.t("configuration:existingModelConfig") || "Existing
       console.log(ansis.yellow(`\u26A0 ${i18n.t("configuration:customModelSkipped") || "Custom model configuration skipped"}`));
       return;
     }
-    updateCustomModel(primaryModel, haikuModel, sonnetModel, opusModel);
+    const modelTool = isClaudeFamilyCodeTool(codeToolType) ? codeToolType : "claude-code";
+    updateCustomModel(primaryModel, haikuModel, sonnetModel, opusModel, modelTool);
     console.log(ansis.green(`\u2714 ${i18n.t("configuration:customModelConfigured") || "Custom model configuration completed"}`));
     return;
   }
-  updateDefaultModel(model);
+  updateDefaultModel(model, isClaudeFamilyCodeTool(codeToolType) ? codeToolType : "claude-code");
   console.log(ansis.green(`\u2714 ${i18n.t("configuration:modelConfigured") || "Default model configured"}`));
 }
 async function promptCustomModels(defaultPrimaryModel, defaultHaikuModel, defaultSonnetModel, defaultOpusModel) {
@@ -314,6 +322,8 @@ async function promptCustomModels(defaultPrimaryModel, defaultHaikuModel, defaul
 }
 async function configureAiMemoryFeature() {
   ensureI18nInitialized();
+  const codeToolType = getActiveCodeTool();
+  const memoryTool = isClaudeFamilyCodeTool(codeToolType) ? codeToolType : "claude-code";
   const { option } = await inquirer.prompt({
     type: "list",
     name: "option",
@@ -351,13 +361,13 @@ ${ansis.blue(`\u2139 ${i18n.t("configuration:existingLanguageConfig") || "Existi
         return;
       }
     }
-    const { selectAiOutputLanguage } = await import('./simple-config.mjs').then(function (n) { return n.bo; });
+    const { selectAiOutputLanguage } = await import('./simple-config.mjs').then(function (n) { return n.bw; });
     const aiOutputLang = await selectAiOutputLanguage();
-    applyAiLanguageDirective(aiOutputLang);
+    applyAiLanguageDirective(aiOutputLang, memoryTool);
     updateCcjkConfig({ aiOutputLang });
     console.log(ansis.green(`\u2714 ${i18n.t("configuration:aiLanguageConfigured") || "AI output language configured"}`));
   } else if (option === "outputStyle") {
-    await configureOutputStyle();
+    await configureOutputStyle(void 0, void 0, memoryTool);
   }
 }
 async function changeScriptLanguageFeature(currentLang) {
@@ -384,7 +394,7 @@ async function changeScriptLanguageFeature(currentLang) {
 }
 async function configureCodexDefaultModelFeature() {
   ensureI18nInitialized();
-  const { readCodexConfig } = await import('./simple-config.mjs').then(function (n) { return n.br; });
+  const { readCodexConfig } = await import('./simple-config.mjs').then(function (n) { return n.bz; });
   const existingConfig = readCodexConfig();
   const currentModel = existingConfig?.model;
   if (currentModel) {
@@ -489,7 +499,7 @@ ${ansis.blue(`\u2139 ${i18n.t("configuration:existingLanguageConfig") || "Existi
         return;
       }
     }
-    const { selectAiOutputLanguage } = await import('./simple-config.mjs').then(function (n) { return n.bo; });
+    const { selectAiOutputLanguage } = await import('./simple-config.mjs').then(function (n) { return n.bw; });
     const aiOutputLang = await selectAiOutputLanguage();
     await updateCodexLanguageDirective(aiOutputLang);
     updateCcjkConfig({ aiOutputLang });
@@ -497,15 +507,15 @@ ${ansis.blue(`\u2139 ${i18n.t("configuration:existingLanguageConfig") || "Existi
   } else if (option === "systemPrompt") {
     const ccjkConfig = readCcjkConfig();
     const currentLang = ccjkConfig?.aiOutputLang || "English";
-    const { runCodexSystemPromptSelection } = await import('./simple-config.mjs').then(function (n) { return n.br; });
+    const { runCodexSystemPromptSelection } = await import('./simple-config.mjs').then(function (n) { return n.bz; });
     await runCodexSystemPromptSelection();
     await ensureLanguageDirectiveInAgents(currentLang);
     console.log(ansis.green(`\u2714 ${i18n.t("configuration:systemPromptConfigured")}`));
   }
 }
 async function updateCodexModelProvider(modelProvider) {
-  const { backupCodexConfig, getBackupMessage } = await import('./simple-config.mjs').then(function (n) { return n.br; });
-  const { updateCodexApiFields } = await import('./simple-config.mjs').then(function (n) { return n.bq; });
+  const { backupCodexConfig, getBackupMessage } = await import('./simple-config.mjs').then(function (n) { return n.bz; });
+  const { updateCodexApiFields } = await import('./simple-config.mjs').then(function (n) { return n.by; });
   const backupPath = backupCodexConfig();
   if (backupPath) {
     console.log(ansis.gray(getBackupMessage(backupPath)));
@@ -513,7 +523,7 @@ async function updateCodexModelProvider(modelProvider) {
   updateCodexApiFields({ model: modelProvider });
 }
 async function ensureLanguageDirectiveInAgents(aiOutputLang) {
-  const { readFile, writeFile, exists } = await import('./simple-config.mjs').then(function (n) { return n.bj; });
+  const { readFile, writeFile, exists } = await import('./simple-config.mjs').then(function (n) { return n.br; });
   const { homedir } = await import('node:os');
   const { join } = await import('pathe');
   const CODEX_AGENTS_FILE = join(homedir(), ".codex", "AGENTS.md");
@@ -531,7 +541,7 @@ async function ensureLanguageDirectiveInAgents(aiOutputLang) {
   const langLabel = languageLabels[aiOutputLang] || aiOutputLang;
   const hasLanguageDirective = /\*\*Most Important:\s*Always respond in [^*]+\*\*/i.test(content);
   if (!hasLanguageDirective) {
-    const { backupCodexAgents, getBackupMessage } = await import('./simple-config.mjs').then(function (n) { return n.br; });
+    const { backupCodexAgents, getBackupMessage } = await import('./simple-config.mjs').then(function (n) { return n.bz; });
     const backupPath = backupCodexAgents();
     if (backupPath) {
       console.log(ansis.gray(getBackupMessage(backupPath)));
@@ -548,8 +558,8 @@ async function ensureLanguageDirectiveInAgents(aiOutputLang) {
   }
 }
 async function updateCodexLanguageDirective(aiOutputLang) {
-  const { readFile, writeFile, exists } = await import('./simple-config.mjs').then(function (n) { return n.bj; });
-  const { backupCodexAgents, getBackupMessage } = await import('./simple-config.mjs').then(function (n) { return n.br; });
+  const { readFile, writeFile, exists } = await import('./simple-config.mjs').then(function (n) { return n.br; });
+  const { backupCodexAgents, getBackupMessage } = await import('./simple-config.mjs').then(function (n) { return n.bz; });
   const { homedir } = await import('node:os');
   const { join } = await import('pathe');
   const CODEX_AGENTS_FILE = join(homedir(), ".codex", "AGENTS.md");
@@ -580,6 +590,8 @@ async function updateCodexLanguageDirective(aiOutputLang) {
 }
 async function configureEnvPermissionFeature() {
   ensureI18nInitialized();
+  const codeToolType = getActiveCodeTool();
+  const settingsTool = isClaudeFamilyCodeTool(codeToolType) ? codeToolType : "claude-code";
   const { choice } = await inquirer.prompt({
     type: "list",
     name: "choice",
@@ -612,16 +624,16 @@ async function configureEnvPermissionFeature() {
   try {
     switch (choice) {
       case "env":
-        await importRecommendedEnv();
+        await importRecommendedEnv(settingsTool);
         console.log(ansis.green(`\u2705 ${i18n.t("configuration:envImportSuccess")}`));
         break;
       case "permissions":
-        await importRecommendedPermissions();
+        await importRecommendedPermissions(settingsTool);
         console.log(ansis.green(`\u2705 ${i18n.t("configuration:permissionsImportSuccess") || "Permissions imported"}`));
         break;
       case "open":
         console.log(ansis.cyan(i18n.t("configuration:openingSettingsJson") || "Opening settings.json..."));
-        await openSettingsJson();
+        await openSettingsJson(settingsTool);
         break;
     }
   } catch (error) {