ccjk 13.6.4 → 13.6.7

package/dist/chunks/config.mjs

@@ -4,7 +4,7 @@ import { i as inquirer } from './index6.mjs';
 import { fileURLToPath } from 'node:url';
 import { CLAUDE_DIR, SETTINGS_FILE, CLAUDE_VSC_CONFIG_FILE, AI_OUTPUT_LANGUAGES } from './constants.mjs';
 import { ensureI18nInitialized, i18n } from './index2.mjs';
-import { s as setPrimaryApiKey, a as addCompletedOnboarding, d as deepMerge } from './claude-config.mjs';
+import { d as setPrimaryApiKey, e as addCompletedOnboarding, g as deepMerge } from './claude-config.mjs';
 import { exists, ensureDir, copyDir, writeFileAtomic, copyFile } from './fs-operations.mjs';
 import { readJsonConfig, writeJsonConfig } from './json-config.mjs';
 import { m as mergeAndCleanPermissions } from '../shared/ccjk.DScm_NnL.mjs';

package/dist/chunks/config2.mjs

@@ -8,7 +8,7 @@ import { d as dayjs } from '../shared/ccjk.RyizuzOI.mjs';
 import { i as inquirer } from './index6.mjs';
 import { SETTINGS_FILE } from './constants.mjs';
 import { ensureI18nInitialized, i18n } from './index2.mjs';
-import { s as setPrimaryApiKey, a as addCompletedOnboarding } from './claude-config.mjs';
+import { d as setPrimaryApiKey, e as addCompletedOnboarding } from './claude-config.mjs';
 import { b as backupExistingConfig } from './config.mjs';
 import { readJsonConfig, writeJsonConfig } from './json-config.mjs';
 import { p as promptBoolean } from '../shared/ccjk.DZ2LLOa-.mjs';
@@ -415,7 +415,7 @@ async function setupCcrConfiguration() {
         console.log(a.yellow(`${i18n.t("ccr:keepingExistingConfig")}`));
         await configureCcrProxy(existingConfig);
         try {
-          const { manageApiKeyApproval } = await import('./claude-config.mjs').then(function (n) { return n.h; });
+          const { manageApiKeyApproval } = await import('./claude-config.mjs').then(function (n) { return n.l; });
           const apiKey = existingConfig.APIKEY || "sk-ccjk-x-ccr";
           manageApiKeyApproval(apiKey);
           console.log(a.green(`\u2714 ${i18n.t("ccr:apiKeyApprovalSuccess")}`));
@@ -449,7 +449,7 @@ async function setupCcrConfiguration() {
       console.error(a.red(i18n.t("errors:failedToSetOnboarding")), error);
     }
     try {
-      const { manageApiKeyApproval } = await import('./claude-config.mjs').then(function (n) { return n.h; });
+      const { manageApiKeyApproval } = await import('./claude-config.mjs').then(function (n) { return n.l; });
       const apiKey = config.APIKEY || "sk-ccjk-x-ccr";
       manageApiKeyApproval(apiKey);
       console.log(a.green(`\u2714 ${i18n.t("ccr:apiKeyApprovalSuccess")}`));

package/dist/chunks/constants.mjs

@@ -79,10 +79,12 @@ const LEGACY_ZCF_CONFIG_FILES = [
 ];
 const ZCF_CONFIG_DIR = CCJK_CONFIG_DIR;
 const ZCF_CONFIG_FILE = CCJK_CONFIG_FILE;
-const CODE_TOOL_TYPES = ["claude-code", "codex", "aider", "continue", "cline", "cursor"];
-const DEFAULT_CODE_TOOL_TYPE = "claude-code";
+const CODE_TOOL_TYPES = ["claude-code", "myclaude", "codex", "aider", "continue", "cline", "cursor"];
+const DEFAULT_CODE_TOOL_TYPE = "myclaude";
+const CLAUDE_FAMILY_CODE_TOOL_TYPES = ["claude-code", "myclaude"];
 const CODE_TOOL_BANNERS = {
   "claude-code": "for Claude Code",
+  "myclaude": "for myclaude",
   "codex": "for Codex",
   "aider": "for Aider",
   "continue": "for Continue",
@@ -91,15 +93,189 @@ const CODE_TOOL_BANNERS = {
 };
 const CODE_TOOL_ALIASES = {
   cc: "claude-code",
+  mc: "myclaude",
+  mycode: "myclaude",
   cx: "codex",
   ad: "aider",
   ct: "continue",
   cl: "cline",
   cu: "cursor"
 };
+const CODE_TOOL_INFO = {
+  "claude-code": {
+    name: "Claude Code",
+    description: "Anthropic official CLI for Claude",
+    website: "https://claude.ai/code",
+    installCmd: "npm install -g @anthropic-ai/claude-code",
+    configFormat: "json",
+    category: "cli",
+    runtimeCommand: "claude",
+    configBackend: "claude-family",
+    nativeSlashCommands: [
+      "/help",
+      "/clear",
+      "/exit",
+      "/quit",
+      "/resume",
+      "/compact",
+      "/context",
+      "/status",
+      "/plan",
+      "/execute",
+      "/rewind",
+      "/mcp",
+      "/doctor",
+      "/settings",
+      "/config",
+      "/version",
+      "/agents",
+      "/skills",
+      "/commands",
+      "/tasks",
+      "/memory",
+      "/memories",
+      "/model",
+      "/cost",
+      "/permissions",
+      "/hooks",
+      "/init",
+      "/login",
+      "/logout",
+      "/bug",
+      "/terminal",
+      "/ide",
+      "/review",
+      "/pr",
+      "/vim",
+      "/listen",
+      "/add",
+      "/install",
+      "/allowed-tools",
+      "/think",
+      "/thinking"
+    ],
+    managesProviderProfiles: false
+  },
+  "myclaude": {
+    name: "myclaude",
+    description: "Provider-first Claude-family coding CLI",
+    website: "https://github.com/mycode699/myclaude-code",
+    installCmd: "npm install -g myclaude-code && myclaude install --force",
+    configFormat: "json",
+    category: "cli",
+    runtimeCommand: "myclaude",
+    configBackend: "claude-family",
+    nativeSlashCommands: [
+      "/help",
+      "/clear",
+      "/exit",
+      "/quit",
+      "/resume",
+      "/compact",
+      "/context",
+      "/status",
+      "/plan",
+      "/execute",
+      "/rewind",
+      "/mcp",
+      "/doctor",
+      "/settings",
+      "/config",
+      "/version",
+      "/agents",
+      "/skills",
+      "/commands",
+      "/tasks",
+      "/memory",
+      "/memories",
+      "/model",
+      "/cost",
+      "/permissions",
+      "/hooks",
+      "/init",
+      "/login",
+      "/logout",
+      "/bug",
+      "/terminal",
+      "/ide",
+      "/review",
+      "/pr",
+      "/vim",
+      "/listen",
+      "/add",
+      "/install",
+      "/allowed-tools",
+      "/think",
+      "/thinking",
+      "/provider",
+      "/team",
+      "/mao"
+    ],
+    managesProviderProfiles: true
+  },
+  "codex": {
+    name: "Codex",
+    description: "OpenAI Codex CLI",
+    website: "https://openai.com/codex",
+    installCmd: "npm install -g @openai/codex",
+    configFormat: "toml",
+    category: "cli",
+    runtimeCommand: "codex",
+    configBackend: "tool-specific"
+  },
+  "aider": {
+    name: "Aider",
+    description: "AI pair programming in terminal",
+    website: "https://aider.chat",
+    installCmd: "pip install aider-chat",
+    configFormat: "yaml",
+    category: "cli",
+    runtimeCommand: "aider",
+    configBackend: "tool-specific"
+  },
+  "continue": {
+    name: "Continue",
+    description: "Open-source AI code assistant",
+    website: "https://continue.dev",
+    installCmd: "pip install continuedev",
+    configFormat: "json",
+    category: "extension",
+    runtimeCommand: "continue",
+    configBackend: "tool-specific"
+  },
+  "cline": {
+    name: "Cline",
+    description: "Autonomous coding agent for VS Code",
+    website: "https://cline.bot",
+    installCmd: "code --install-extension saoudrizwan.claude-dev",
+    configFormat: "json",
+    category: "extension",
+    runtimeCommand: "cline",
+    configBackend: "tool-specific"
+  },
+  "cursor": {
+    name: "Cursor CLI",
+    description: "AI-first code editor CLI",
+    website: "https://cursor.com/cli",
+    installCmd: "curl https://cursor.com/install -fsSL | bash",
+    configFormat: "json",
+    category: "editor",
+    runtimeCommand: "cursor",
+    configBackend: "tool-specific"
+  }
+};
 function isCodeToolType(value) {
   return CODE_TOOL_TYPES.includes(value);
 }
+function isClaudeFamilyCodeTool(value) {
+  return CLAUDE_FAMILY_CODE_TOOL_TYPES.includes(value);
+}
+function getCodeToolRuntimeCommand(codeTool) {
+  return CODE_TOOL_INFO[codeTool].runtimeCommand;
+}
+function getCodeToolNativeSlashCommands(codeTool) {
+  return CODE_TOOL_INFO[codeTool].nativeSlashCommands || [];
+}
 const API_DEFAULT_URL = "https://api.anthropic.com";
 function resolveCodeToolType(value) {
   if (isCodeToolType(value)) {
@@ -133,4 +309,4 @@ function getAiOutputLanguageLabel(lang) {
   return lang;
 }
 
-export { AIDER_DIR, AI_OUTPUT_LANGUAGES, API_DEFAULT_URL, CCJK_CLOUD_API_URL, CCJK_CLOUD_PLUGINS_CACHE_DIR, CCJK_CLOUD_PLUGINS_DIR, CCJK_CLOUD_PLUGINS_INSTALLED_DIR, CCJK_CONFIG_DIR, CCJK_CONFIG_FILE, CCJK_PLUGINS_DIR, CCJK_SKILLS_DIR, CLAUDE_AGENTS_DIR, CLAUDE_DIR, CLAUDE_VSC_CONFIG_FILE, CLINE_DIR, CLOUD_ENDPOINTS, CODEX_AGENTS_FILE, CODEX_AUTH_FILE, CODEX_CONFIG_FILE, CODEX_DIR, CODEX_PROMPTS_DIR, CODE_TOOL_ALIASES, CODE_TOOL_BANNERS, CODE_TOOL_TYPES, CONTINUE_DIR, CURSOR_DIR, ClAUDE_CONFIG_FILE, DEFAULT_CODE_TOOL_TYPE, LANG_LABELS, LEGACY_ZCF_CONFIG_DIR, LEGACY_ZCF_CONFIG_FILE, LEGACY_ZCF_CONFIG_FILES, SETTINGS_FILE, SUPPORTED_LANGS, ZCF_CONFIG_DIR, ZCF_CONFIG_FILE, getAiOutputLanguageLabel, getCloudApiUrl, getCloudBaseUrl, isCodeToolType, resolveCodeToolType };
+export { AIDER_DIR, AI_OUTPUT_LANGUAGES, API_DEFAULT_URL, CCJK_CLOUD_API_URL, CCJK_CLOUD_PLUGINS_CACHE_DIR, CCJK_CLOUD_PLUGINS_DIR, CCJK_CLOUD_PLUGINS_INSTALLED_DIR, CCJK_CONFIG_DIR, CCJK_CONFIG_FILE, CCJK_PLUGINS_DIR, CCJK_SKILLS_DIR, CLAUDE_AGENTS_DIR, CLAUDE_DIR, CLAUDE_FAMILY_CODE_TOOL_TYPES, CLAUDE_VSC_CONFIG_FILE, CLINE_DIR, CLOUD_ENDPOINTS, CODEX_AGENTS_FILE, CODEX_AUTH_FILE, CODEX_CONFIG_FILE, CODEX_DIR, CODEX_PROMPTS_DIR, CODE_TOOL_ALIASES, CODE_TOOL_BANNERS, CODE_TOOL_INFO, CODE_TOOL_TYPES, CONTINUE_DIR, CURSOR_DIR, ClAUDE_CONFIG_FILE, DEFAULT_CODE_TOOL_TYPE, LANG_LABELS, LEGACY_ZCF_CONFIG_DIR, LEGACY_ZCF_CONFIG_FILE, LEGACY_ZCF_CONFIG_FILES, SETTINGS_FILE, SUPPORTED_LANGS, ZCF_CONFIG_DIR, ZCF_CONFIG_FILE, getAiOutputLanguageLabel, getCloudApiUrl, getCloudBaseUrl, getCodeToolNativeSlashCommands, getCodeToolRuntimeCommand, isClaudeFamilyCodeTool, isCodeToolType, resolveCodeToolType };

package/dist/chunks/doctor.mjs

@@ -6,7 +6,7 @@ import { getApiProviderPresets } from './api-providers.mjs';
 import { SETTINGS_FILE, CLAUDE_DIR } from './constants.mjs';
 import { i18n } from './index2.mjs';
 import { g as getPermissionManager } from '../shared/ccjk.SPoXMvZD.mjs';
-import { e as commandExists } from './platform.mjs';
+import { h as commandExists } from './platform.mjs';
 import { P as ProviderHealthMonitor } from '../shared/ccjk.J8YiPsOw.mjs';
 import { platform, userInfo, homedir } from 'node:os';
 import ora from './index8.mjs';

package/dist/chunks/features.mjs

@@ -3,11 +3,15 @@ import { homedir } from 'node:os';
 import process__default from 'node:process';
 import a from './index5.mjs';
 import { i as inquirer } from './index6.mjs';
+import { g as getMcpServices } from '../shared/ccjk.DKXs7Fbm.mjs';
 import { SUPPORTED_LANGS, LANG_LABELS } from './constants.mjs';
 import { ensureI18nInitialized, i18n, changeLanguage } from './index2.mjs';
 import { updateZcfConfig, readZcfConfig } from './ccjk-config.mjs';
+import { r as readMcpConfig, f as fixWindowsMcpConfig, w as writeMcpConfig, b as backupMcpConfig, a as buildMcpServerConfig, m as mergeMcpServers } from './claude-config.mjs';
 import { g as getExistingModelConfig, a as getExistingCustomModelConfig, u as updateCustomModel, c as updateDefaultModel, d as getExistingApiConfig, p as promptApiConfigurationAction, e as configureApi } from './config.mjs';
-import { m as modifyApiConfigPartially, v as validateApiKey, f as formatApiKeyDisplay } from '../shared/ccjk.BP5hsTZQ.mjs';
+import { c as configureOutputStyle, m as modifyApiConfigPartially, v as validateApiKey, f as formatApiKeyDisplay } from '../shared/ccjk.Dz0ssUQx.mjs';
+import { s as selectMcpServices } from '../shared/ccjk.BI-hdI7P.mjs';
+import { i as isWindows } from './platform.mjs';
 import { a as addNumbersToChoices } from '../shared/ccjk.BFQ7yr5S.mjs';
 import { p as promptBoolean } from '../shared/ccjk.DZ2LLOa-.mjs';
 import { j as join } from '../shared/ccjk.bQ7Dh1g4.mjs';
@@ -25,6 +29,7 @@ import 'node:path';
 import 'node:crypto';
 import 'buffer';
 import 'string_decoder';
+import 'node:child_process';
 import 'node:url';
 import '../shared/ccjk.BBtCGd_g.mjs';
 import './index3.mjs';
@@ -32,13 +37,10 @@ import './fs-operations.mjs';
 import 'node:fs/promises';
 import './json-config.mjs';
 import '../shared/ccjk.RyizuzOI.mjs';
-import './claude-config.mjs';
-import './platform.mjs';
+import '../shared/ccjk.DScm_NnL.mjs';
 import './main.mjs';
 import 'module';
-import 'node:child_process';
 import 'node:stream';
-import '../shared/ccjk.DScm_NnL.mjs';
 import '../shared/ccjk.DeWpAShp.mjs';
 
 const DEFAULT_MODEL_CHOICES = [
@@ -105,7 +107,7 @@ async function handleCustomApiMode() {
   ensureI18nInitialized();
   const zcfConfig = readZcfConfig();
   const codeToolType = zcfConfig?.codeToolType || "claude-code";
-  if (codeToolType === "claude-code") {
+  if (codeToolType === "claude-code" || codeToolType === "myclaude") {
     const { configureIncrementalManagement } = await import('./claude-code-incremental-manager.mjs');
     await configureIncrementalManagement();
     return;
@@ -191,6 +193,57 @@ async function handleCustomApiMode() {
     console.log(a.gray(`  Key: ${formatApiKeyDisplay(configuredApi.key)}`));
   }
 }
+async function configureMcpFeature() {
+  ensureI18nInitialized();
+  if (isWindows()) {
+    const fixWindows = await promptBoolean({
+      message: i18n.t("configuration:fixWindowsMcp") || "Fix Windows MCP configuration?",
+      defaultValue: true
+    });
+    if (fixWindows) {
+      const existingConfig = readMcpConfig() || { mcpServers: {} };
+      const fixedConfig = fixWindowsMcpConfig(existingConfig);
+      writeMcpConfig(fixedConfig);
+      console.log(a.green(`\u2714 ${i18n.t("configuration:windowsMcpConfigFixed")}`));
+    }
+  }
+  const selectedServices = await selectMcpServices();
+  if (!selectedServices) {
+    return;
+  }
+  if (selectedServices.length > 0) {
+    const mcpBackupPath = backupMcpConfig();
+    if (mcpBackupPath) {
+      console.log(a.gray(`\u2714 ${i18n.t("mcp:mcpBackupSuccess")}: ${mcpBackupPath}`));
+    }
+    const newServers = {};
+    for (const serviceId of selectedServices) {
+      const service = (await getMcpServices()).find((s) => s.id === serviceId);
+      if (!service)
+        continue;
+      let config = service.config;
+      if (service.requiresApiKey) {
+        const { apiKey } = await inquirer.prompt({
+          type: "input",
+          name: "apiKey",
+          message: service.apiKeyPrompt,
+          validate: async (value) => !!value || i18n.t("api:keyRequired")
+        });
+        if (apiKey) {
+          config = buildMcpServerConfig(service.config, apiKey, service.apiKeyPlaceholder, service.apiKeyEnvVar);
+        } else {
+          continue;
+        }
+      }
+      newServers[service.id] = config;
+    }
+    const existingConfig = readMcpConfig();
+    let mergedConfig = mergeMcpServers(existingConfig, newServers);
+    mergedConfig = fixWindowsMcpConfig(mergedConfig);
+    writeMcpConfig(mergedConfig);
+    console.log(a.green(`\u2714 ${i18n.t("mcp:mcpConfigSuccess")}`));
+  }
+}
 async function configureDefaultModelFeature() {
   ensureI18nInitialized();
   const existingModel = getExistingModelConfig();
@@ -293,7 +346,7 @@ async function changeScriptLanguageFeature(currentLang) {
 }
 async function configureCodexDefaultModelFeature() {
   ensureI18nInitialized();
-  const { readCodexConfig } = await import('./codex.mjs').then(function (n) { return n.v; });
+  const { readCodexConfig } = await import('./codex.mjs').then(function (n) { return n.q; });
   const existingConfig = readCodexConfig();
   const currentModel = existingConfig?.model;
   if (currentModel) {
@@ -393,14 +446,14 @@ ${a.green(`\u2139 ${i18n.t("configuration:existingLanguageConfig") || "Existing
   } else if (option === "systemPrompt") {
     const zcfConfig = readZcfConfig();
     const currentLang = zcfConfig?.aiOutputLang || "English";
-    const { runCodexSystemPromptSelection } = await import('./codex.mjs').then(function (n) { return n.v; });
+    const { runCodexSystemPromptSelection } = await import('./codex.mjs').then(function (n) { return n.q; });
     await runCodexSystemPromptSelection();
     await ensureLanguageDirectiveInAgents(currentLang);
     console.log(a.green(`\u2714 ${i18n.t("configuration:systemPromptConfigured")}`));
   }
 }
 async function updateCodexModelProvider(modelProvider) {
-  const { readCodexConfig, writeCodexConfig, backupCodexConfig, getBackupMessage } = await import('./codex.mjs').then(function (n) { return n.v; });
+  const { readCodexConfig, writeCodexConfig, backupCodexConfig, getBackupMessage } = await import('./codex.mjs').then(function (n) { return n.q; });
   const backupPath = backupCodexConfig();
   if (backupPath) {
     console.log(a.gray(getBackupMessage(backupPath)));
@@ -430,7 +483,7 @@ const codexLanguageLabels = {
 };
 async function setCodexLanguageDirective(aiOutputLang, mode) {
   const { readFile, writeFileAtomic, exists } = await import('./fs-operations.mjs');
-  const { backupCodexAgents, getBackupMessage } = await import('./codex.mjs').then(function (n) { return n.v; });
+  const { backupCodexAgents, getBackupMessage } = await import('./codex.mjs').then(function (n) { return n.q; });
   const CODEX_AGENTS_FILE = join(homedir(), ".codex", "AGENTS.md");
   if (!exists(CODEX_AGENTS_FILE)) {
     console.log(a.yellow(i18n.t("codex:agentsFileNotFound")));
@@ -460,6 +513,8 @@ async function updateCodexLanguageDirective(aiOutputLang) {
   return setCodexLanguageDirective(aiOutputLang, "update");
 }
 async function configureMemoryFeature() {
+  ensureI18nInitialized();
+  const isZh = i18n.language === "zh-CN";
   const inquirer2 = (await import('./index6.mjs').then(function (n) { return n.c; })).default;
   const ansis2 = (await import('./index5.mjs')).default;
   const { execSync } = await import('node:child_process');
@@ -502,6 +557,8 @@ ${ansis2.bold(i18n.t("memory:currentStatus"))}`);
         { name: i18n.t("memory:editMemory"), value: "edit" },
         { name: i18n.t("memory:syncNow"), value: "sync" },
         { name: i18n.t("memory:configureRules"), value: "rules" },
+        { name: isZh ? "\u{1F310} \u914D\u7F6E AI \u8F93\u51FA\u8BED\u8A00" : "\u{1F310} Configure AI output language", value: "language" },
+        { name: isZh ? "\u{1F3A8} \u914D\u7F6E\u8F93\u51FA\u98CE\u683C" : "\u{1F3A8} Configure output style", value: "outputStyle" },
         { name: i18n.t("memory:back"), value: "back" }
       ]
     }
@@ -573,7 +630,15 @@ ${ansis2.bold(i18n.t("memory:memoryContent"))}`);
       console.log(i18n.t("memory:rulesDescription"));
       break;
     }
+    case "language": {
+      await changeScriptLanguageFeature(i18n.language);
+      break;
+    }
+    case "outputStyle": {
+      await configureOutputStyle();
+      break;
+    }
   }
 }
 
-export { CODEX_MODEL_CHOICES, DEFAULT_MODEL_CHOICES, changeScriptLanguageFeature, configureCodexAiMemoryFeature, configureCodexDefaultModelFeature, configureDefaultModelFeature, configureMemoryFeature, formatCodexModelLabel, handleCustomApiMode, promptCustomModels };
+export { CODEX_MODEL_CHOICES, DEFAULT_MODEL_CHOICES, changeScriptLanguageFeature, configureCodexAiMemoryFeature, configureCodexDefaultModelFeature, configureDefaultModelFeature, configureMcpFeature, configureMemoryFeature, formatCodexModelLabel, handleCustomApiMode, promptCustomModels };

package/dist/chunks/index10.mjs

@@ -4,8 +4,8 @@ import { CLOUD_ENDPOINTS, CCJK_CONFIG_DIR, SUPPORTED_LANGS, LANG_LABELS, CODE_TO
 import { ensureI18nInitialized, i18n, resolveSupportedLanguage, changeLanguage } from './index2.mjs';
 import { displayBannerWithInfo } from './banner.mjs';
 import { readZcfConfig, updateZcfConfig } from './ccjk-config.mjs';
-import { c as runCodexUpdate, m as runCodexUninstall, n as configureCodexAiMemoryFeature, o as configureCodexDefaultModelFeature, p as configureCodexMcp, q as configureCodexApi, t as configureCodexPresetFeature, u as runCodexWorkflowImportWithLanguageSelection, k as runCodexFullInit } from './codex.mjs';
-import { r as resolveCodeType } from '../shared/ccjk.CiKtBUW_.mjs';
+import { c as runCodexUpdate, i as runCodexUninstall, j as configureCodexAiMemoryFeature, k as configureCodexDefaultModelFeature, m as configureCodexMcp, n as configureCodexApi, o as configureCodexPresetFeature, p as runCodexWorkflowImportWithLanguageSelection, h as runCodexFullInit } from './codex.mjs';
+import { S as STARTUP_CODE_TOOL_CHOICES, a as resolveStartupCodeType } from '../shared/ccjk.yYQMbHH3.mjs';
 import { a as handleExitPromptError, h as handleGeneralError } from '../shared/ccjk.DGllfVCZ.mjs';
 import { changeScriptLanguageFeature } from './features.mjs';
 import { c as checkForUpdates, a as getInstalledPackages, s as searchPackages } from '../shared/ccjk.DbigonEQ.mjs';
@@ -26,7 +26,7 @@ import { configSwitchCommand } from './config-switch.mjs';
 import process__default from 'node:process';
 import { readFile, writeFileAtomic, ensureDir, exists, readJsonFile } from './fs-operations.mjs';
 import { workspaceDiagnostics, doctor } from './doctor.mjs';
-import { a as mcpList, c as mcpUninstall, m as mcpInstall, d as mcpTrending, b as mcpSearch } from '../shared/ccjk.DvAP4XfP.mjs';
+import { a as mcpList, c as mcpUninstall, m as mcpInstall, d as mcpTrending, b as mcpSearch } from '../shared/ccjk.B4aXNclK.mjs';
 import { notificationCommand } from './notification.mjs';
 import { g as getRuntimeVersion } from '../shared/ccjk.gDEDGD_t.mjs';
 import { uninstall } from './uninstall.mjs';
@@ -3001,11 +3001,14 @@ async function saveLocalHooks(hooks, lastSyncedAt) {
 }
 
 const ONBOARDING_STATE_FILE = join(CCJK_CONFIG_DIR, "onboarding.json");
-const PRIMARY_ONBOARDING_TOOLS = ["claude-code", "codex"];
 const LANGUAGE_SELECTION_MESSAGES = {
   selectLanguage: "Select CCJK display language / \u9009\u62E9 CCJK \u663E\u793A\u8BED\u8A00"
 };
 const TOOL_LABELS = {
+  "myclaude": {
+    en: "myclaude",
+    zh: "myclaude"
+  },
   "claude-code": {
     en: "Claude Code",
     zh: "Claude Code"
@@ -3019,13 +3022,13 @@ function isSupportedLang(value) {
   return SUPPORTED_LANGS.includes(value);
 }
 function isPrimaryOnboardingTool(value) {
-  return PRIMARY_ONBOARDING_TOOLS.includes(value);
+  return STARTUP_CODE_TOOL_CHOICES.includes(value);
 }
 function resolveOnboardingCodeTool(value) {
   if (isPrimaryOnboardingTool(value)) {
     return value;
   }
-  return "claude-code";
+  return "myclaude";
 }
 function getToolLabel(tool, lang) {
   return lang === "zh-CN" ? TOOL_LABELS[tool].zh : TOOL_LABELS[tool].en;
@@ -3082,7 +3085,11 @@ async function selectOnboardingCodeTool(lang, options = {}) {
     message: isZh ? "\u9009\u62E9\u4EE3\u7801\u5DE5\u5177" : "Choose your code tool",
     choices: addNumbersToChoices([
       {
-        name: `${getToolLabel("claude-code", lang)} - ${isZh ? "\u5B8C\u6574 CCJK \u63A7\u5236\u4E2D\u5FC3\uFF0C\u9ED8\u8BA4\u63A8\u8350" : "Full CCJK control center, default choice"}`,
+        name: `${getToolLabel("myclaude", lang)} - ${isZh ? "Provider-first \u63A7\u5236\u4E2D\u5FC3\uFF08\u9ED8\u8BA4\u63A8\u8350\uFF09" : "Provider-first control center (recommended default)"}`,
+        value: "myclaude"
+      },
+      {
+        name: `${getToolLabel("claude-code", lang)} - ${isZh ? "Claude \u5BB6\u65CF\u7ECF\u5178\u63A7\u5236\u4E2D\u5FC3" : "Classic Claude-family control center"}`,
         value: "claude-code"
       },
       {
@@ -3090,7 +3097,7 @@ async function selectOnboardingCodeTool(lang, options = {}) {
         value: "codex"
       }
     ]),
-    default: PRIMARY_ONBOARDING_TOOLS.indexOf(defaultTool)
+    default: STARTUP_CODE_TOOL_CHOICES.indexOf(defaultTool)
   });
   const selectedTool = resolveOnboardingCodeTool(tool);
   updateZcfConfig({
@@ -3155,7 +3162,7 @@ async function runOnboardingWizard(options = {}) {
   console.log("");
 }
 
-const NON_CODEX_TOOLS = ["claude-code", "aider", "continue", "cline", "cursor"];
+const NON_CODEX_TOOLS = ["claude-code", "myclaude", "aider", "continue", "cline", "cursor"];
 const quickActionsItems = [
   {
     id: "init",
@@ -3231,6 +3238,17 @@ const quickActionsItems = [
     icon: "\u{1F4F1}",
     shortcut: "5",
     supportedTools: NON_CODEX_TOOLS
+  },
+  {
+    id: "switch-code-tool",
+    label: "menuOptions.switchCodeTool",
+    description: "menuDescriptions.switchCodeTool",
+    category: "quick",
+    level: "basic",
+    action: "command",
+    icon: "\u{1F504}",
+    shortcut: "s",
+    supportedTools: NON_CODEX_TOOLS
   }
 ];
 const configItems = [
@@ -3461,17 +3479,6 @@ const systemItems = [
     shortcut: "z",
     supportedTools: NON_CODEX_TOOLS
   },
-  {
-    id: "switch-code-tool",
-    label: "menuOptions.switchCodeTool",
-    description: "menuDescriptions.switchCodeTool",
-    category: "system",
-    level: "expert",
-    action: "command",
-    icon: "\u{1F504}",
-    shortcut: "t",
-    supportedTools: NON_CODEX_TOOLS
-  },
   {
     id: "uninstall",
     label: "menuOptions.uninstall",
@@ -4061,7 +4068,7 @@ function attachHandlers(items, codeTool) {
               await runCodexFullInit();
               return;
             }
-            await init({ skipBanner: true });
+            await init({ skipBanner: true, codeType: codeTool });
           }
         };
       case "workflow-import":
@@ -4119,7 +4126,7 @@ function attachHandlers(items, codeTool) {
               await configureCodexMcp();
               return;
             }
-            await (await import('./mcp.mjs')).mcpStatus({});
+            await (await import('./features.mjs')).configureMcpFeature();
           }
         };
       case "model-config":
@@ -4150,7 +4157,7 @@ function attachHandlers(items, codeTool) {
         return {
           ...item,
           handler: async () => {
-            await configSwitchCommand({ codeType: codeTool === "codex" ? "codex" : "claude-code" });
+            await configSwitchCommand({ codeType: codeTool });
           }
         };
       case "context-config":
@@ -4298,6 +4305,14 @@ function flattenSections(itemsBySection) {
   return itemsBySection.flatMap((section) => section.items);
 }
 function getProgressiveFooterCommands(codeTool) {
+  if (codeTool === "myclaude") {
+    return [
+      {
+        key: "s",
+        label: i18n.t("menu:menuOptions.switchCodeTool")
+      }
+    ];
+  }
   if (codeTool !== "codex") {
     return [];
   }
@@ -4318,9 +4333,9 @@ function getProgressiveFooterCommands(codeTool) {
   ];
 }
 function getMenuShellConfig(codeTool) {
-  if (codeTool === "codex") {
+  if (codeTool === "codex" || codeTool === "myclaude") {
     return {
-      allowMore: false,
+      allowMore: codeTool !== "myclaude",
       footerCommands: getProgressiveFooterCommands(codeTool),
       menuTitle: getToolModeMenuTitle(codeTool),
       showHero: true
@@ -4334,7 +4349,7 @@ function getMenuShellConfig(codeTool) {
   };
 }
 async function showProgressiveMenu(codeTool) {
-  if (codeTool !== "codex") {
+  if (codeTool !== "codex" && codeTool !== "myclaude") {
     const rawItems2 = getItemsForLevel(menuState.level, "claude-code");
     const items2 = attachHandlers(rawItems2, "claude-code");
     const sections2 = createAllSections(menuState.level, "claude-code");
@@ -4598,7 +4613,7 @@ async function showMoreFeaturesMenu() {
         await (await import('./permissions.mjs')).listPermissions({});
         break;
       case "9":
-        await configSwitchCommand({ codeType: "claude-code" });
+        await configSwitchCommand({ codeType: codeTool });
         break;
       case "10":
         await showContextMenu();
@@ -5154,6 +5169,7 @@ async function showOutputStylesMenu() {
 async function handleCodeToolSwitch(current) {
   const CODE_TOOL_LABELS = {
     "claude-code": "Claude Code",
+    "myclaude": "myclaude",
     "codex": "Codex",
     "aider": "Aider",
     "continue": "Continue",
@@ -5198,18 +5214,21 @@ async function showMainMenu(options = {}) {
     if (await isFirstTimeUser()) {
       await runOnboardingWizard({ preferredCodeTool: options.codeType });
     }
-    if (options.codeType) {
-      try {
-        const resolvedType = await resolveCodeType(options.codeType);
-        const currentType = getCurrentCodeTool();
-        if (resolvedType !== currentType) {
-          updateZcfConfig({ codeToolType: resolvedType });
+    try {
+      const previousType = getCurrentCodeTool();
+      const resolvedType = await resolveStartupCodeType({
+        codeTypeParam: options.codeType,
+        interactive: true
+      });
+      if (resolvedType !== previousType || options.codeType) {
+        updateZcfConfig({ codeToolType: resolvedType });
+        if (resolvedType !== previousType) {
           console.log(a.green(`\u2714 Switched to ${resolvedType}`));
         }
-      } catch (err) {
-        const errorMessage = err instanceof Error ? err.message : String(err);
-        console.error(a.yellow(errorMessage));
       }
+    } catch (err) {
+      const errorMessage = err instanceof Error ? err.message : String(err);
+      console.error(a.yellow(errorMessage));
     }
     let exitMenu = false;
     while (!exitMenu) {