ccjk 13.6.4 → 13.6.5

package/dist/chunks/agents.mjs

@@ -5,7 +5,7 @@ import { c as contextLoader, S as SessionIntelligence, g as getGlobalConvoyManag
 import { EventEmitter } from 'node:events';
 import { c as resolve } from '../shared/ccjk.bQ7Dh1g4.mjs';
 import { e as executionTracer } from '../shared/ccjk.DlTXS9rP.mjs';
-import { t as taskPersistence } from '../shared/ccjk.DwSebGy0.mjs';
+import { t as taskPersistence } from '../shared/ccjk.BOO14f66.mjs';
 import '../shared/ccjk.BAGoDD49.mjs';
 import 'node:crypto';
 import 'node:process';

package/dist/chunks/ccr.mjs

@@ -47,7 +47,7 @@ import '../shared/ccjk.DScm_NnL.mjs';
 import '../shared/ccjk.BFQ7yr5S.mjs';
 import './prompts.mjs';
 import '../shared/ccjk.DZ2LLOa-.mjs';
-import '../shared/ccjk.CiKtBUW_.mjs';
+import '../shared/ccjk.yYQMbHH3.mjs';
 import './smart-defaults.mjs';
 import '../shared/ccjk.DJuyfrlL.mjs';
 import './features.mjs';

package/dist/chunks/check-updates.mjs

@@ -1,46 +1,46 @@
 import process__default from 'node:process';
 import a from './index5.mjs';
 import { ensureI18nInitialized, i18n } from './index2.mjs';
-import { r as resolveCodeType } from '../shared/ccjk.CiKtBUW_.mjs';
+import { r as resolveCodeType } from '../shared/ccjk.yYQMbHH3.mjs';
 import { checkAndUpdateTools } from './auto-updater.mjs';
 import { c as runCodexUpdate } from './codex.mjs';
 import '../shared/ccjk.BAGoDD49.mjs';
 import 'node:fs';
 import 'node:url';
 import '../shared/ccjk.bQ7Dh1g4.mjs';
+import './index6.mjs';
+import 'node:readline';
+import 'stream';
+import 'node:tty';
+import 'node:async_hooks';
+import '../shared/ccjk.Cjgrln_h.mjs';
+import 'node:util';
+import 'tty';
+import 'fs';
+import 'child_process';
+import 'node:path';
+import 'node:os';
+import 'node:crypto';
+import 'buffer';
+import 'string_decoder';
 import './smart-defaults.mjs';
 import 'node:child_process';
-import 'node:os';
 import './constants.mjs';
 import './json-config.mjs';
 import '../shared/ccjk.RyizuzOI.mjs';
 import './fs-operations.mjs';
-import 'node:crypto';
 import 'node:fs/promises';
 import './platform.mjs';
 import './main.mjs';
 import 'module';
-import 'node:path';
 import 'node:stream';
-import 'node:readline';
 import '../shared/ccjk.DJuyfrlL.mjs';
 import './ccjk-config.mjs';
 import '../shared/ccjk.BBtCGd_g.mjs';
 import './index3.mjs';
 import './index8.mjs';
-import '../shared/ccjk.Cjgrln_h.mjs';
 import '../shared/ccjk.DeWpAShp.mjs';
 import '../shared/ccjk.DZ2LLOa-.mjs';
-import 'node:async_hooks';
-import './index6.mjs';
-import 'stream';
-import 'node:tty';
-import 'node:util';
-import 'tty';
-import 'fs';
-import 'child_process';
-import 'buffer';
-import 'string_decoder';
 import './version-checker.mjs';
 import '../shared/ccjk.CxpGa6MC.mjs';
 import './config.mjs';

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

@@ -275,7 +275,7 @@ class ClaudeCodeConfigManager {
         opusModel: profile.defaultOpusModel
       }, modelMode);
       writeJsonConfig(SETTINGS_FILE, settings);
-      const { setPrimaryApiKey, addCompletedOnboarding } = await import('./claude-config.mjs').then(function (n) { return n.h; });
+      const { setPrimaryApiKey, addCompletedOnboarding } = await import('./claude-config.mjs').then(function (n) { return n.j; });
       setPrimaryApiKey();
       addCompletedOnboarding();
       let verifiedSettings = readJsonConfig2(SETTINGS_FILE) || {};

package/dist/chunks/claude-config.mjs

@@ -197,6 +197,21 @@ function setPrimaryApiKey() {
     console.error(i18n.t("mcp:primaryApiKeySetFailed"), error);
   }
 }
+function setMyclaudeProviderProfiles(profiles, activeProfileId) {
+  const config = readMcpConfig() || { mcpServers: {} };
+  config.myclaudeProviderProfiles = profiles;
+  config.myclaudeActiveProviderProfileId = activeProfileId || profiles[0]?.id;
+  writeMcpConfig(config);
+}
+function clearMyclaudeProviderProfiles() {
+  const config = readMcpConfig();
+  if (!config) {
+    return;
+  }
+  delete config.myclaudeProviderProfiles;
+  delete config.myclaudeActiveProviderProfileId;
+  writeMcpConfig(config);
+}
 function syncMcpPermissions() {
   const mcpConfig = readMcpConfig();
   const mcpServerIds = Object.keys(mcpConfig?.mcpServers || {});
@@ -222,15 +237,17 @@ const claudeConfig = {
   addCompletedOnboarding: addCompletedOnboarding,
   backupMcpConfig: backupMcpConfig,
   buildMcpServerConfig: buildMcpServerConfig,
+  clearMyclaudeProviderProfiles: clearMyclaudeProviderProfiles,
   ensureApiKeyApproved: ensureApiKeyApproved,
   fixWindowsMcpConfig: fixWindowsMcpConfig,
   manageApiKeyApproval: manageApiKeyApproval,
   mergeMcpServers: mergeMcpServers,
   readMcpConfig: readMcpConfig,
   replaceMcpServers: replaceMcpServers,
+  setMyclaudeProviderProfiles: setMyclaudeProviderProfiles,
   setPrimaryApiKey: setPrimaryApiKey,
   syncMcpPermissions: syncMcpPermissions,
   writeMcpConfig: writeMcpConfig
 };
 
-export { addCompletedOnboarding as a, buildMcpServerConfig as b, backupMcpConfig as c, deepMerge as d, replaceMcpServers as e, fixWindowsMcpConfig as f, syncMcpPermissions as g, claudeConfig as h, mergeMcpServers as m, readMcpConfig as r, setPrimaryApiKey as s, writeMcpConfig as w };
+export { addCompletedOnboarding as a, buildMcpServerConfig as b, backupMcpConfig as c, deepMerge as d, setMyclaudeProviderProfiles as e, clearMyclaudeProviderProfiles as f, replaceMcpServers as g, fixWindowsMcpConfig as h, syncMcpPermissions as i, claudeConfig as j, mergeMcpServers as m, readMcpConfig as r, setPrimaryApiKey as s, writeMcpConfig as w };

package/dist/chunks/cli-hook.mjs

@@ -1,4 +1,6 @@
 import { EventEmitter } from 'node:events';
+import { DEFAULT_CODE_TOOL_TYPE, isCodeToolType, getCodeToolNativeSlashCommands } from './constants.mjs';
+import { readZcfConfig } from './ccjk-config.mjs';
 import { a as getGlobalStateManager, g as getGlobalConvoyManager, c as contextLoader, S as SessionIntelligence } from './session-manager.mjs';
 import { l as logger } from '../shared/ccjk.8oaxX4iR.mjs';
 import { h as hookRegistry } from '../shared/ccjk.KPLeMP-o.mjs';
@@ -9,6 +11,15 @@ import { d as dirname, j as join } from '../shared/ccjk.bQ7Dh1g4.mjs';
 import { n as nanoid } from '../shared/ccjk.BoApaI4j.mjs';
 import process__default from 'node:process';
 import 'node:os';
+import './index2.mjs';
+import 'node:url';
+import '../shared/ccjk.BBtCGd_g.mjs';
+import './index3.mjs';
+import './fs-operations.mjs';
+import 'node:fs/promises';
+import './json-config.mjs';
+import '../shared/ccjk.RyizuzOI.mjs';
+import '../shared/ccjk.BAGoDD49.mjs';
 import './main.mjs';
 import 'module';
 import 'node:child_process';
@@ -18,9 +29,7 @@ import 'node:readline';
 import 'tinyglobby';
 import '../shared/ccjk.DlTXS9rP.mjs';
 import './index5.mjs';
-import '../shared/ccjk.BAGoDD49.mjs';
 import '../shared/ccjk.wLJHO0Af.mjs';
-import 'node:fs/promises';
 
 async function emitCommandHookEvent(event, data, sessionId) {
   try {
@@ -3540,80 +3549,13 @@ class CliInterceptor extends EventEmitter {
     autoSelectMcp: true,
     verbose: false
   });
-  // Claude Code native commands that should bypass interception
-  // Reference: https://deepwiki.com/FlorianBruniaux/claude-code-ultimate-guide/16-command-reference
-  systemCommands = [
-    // Session Management
-    "/help",
-    "/clear",
-    "/exit",
-    "/quit",
-    "/resume",
-    // Context Management
-    "/compact",
-    "/context",
-    "/status",
-    // Mode Control
-    "/plan",
-    "/execute",
-    // History
-    "/rewind",
-    // Diagnostic
-    "/mcp",
-    "/doctor",
-    // Configuration
-    "/settings",
-    "/config",
-    "/version",
-    // Extension System
-    "/agents",
-    "/skills",
-    "/commands",
-    // Plugin/Marketplace - CCJK 接管，不在此列表
-    // '/plugin',
-    // '/plugins',
-    // Tasks
-    "/tasks",
-    // Memory
-    "/memory",
-    "/memories",
-    // Model
-    "/model",
-    // Cost
-    "/cost",
-    // Permissions
-    "/permissions",
-    // Hooks
-    "/hooks",
-    // Init
-    "/init",
-    // Login/Logout
-    "/login",
-    "/logout",
-    // Bug report
-    "/bug",
-    // Terminal
-    "/terminal",
-    // IDE
-    "/ide",
-    // Review
-    "/review",
-    // PR
-    "/pr",
-    // Vim mode
-    "/vim",
-    // Listen mode
-    "/listen",
-    // Add files
-    "/add",
-    // Install
-    "/install",
-    // Allowed tools
-    "/allowed-tools",
-    // Thinking
-    "/think",
-    "/thinking"
-  ];
+  getActiveCodeTool() {
+    const codeToolType = readZcfConfig()?.codeToolType;
+    return isCodeToolType(codeToolType) ? codeToolType : DEFAULT_CODE_TOOL_TYPE;
+  }
+  getSystemCommands() {
+    return getCodeToolNativeSlashCommands(this.getActiveCodeTool());
+  }
   // Simple queries that don't need interception
   simpleQueryPatterns = [
     /^what is/i,
@@ -3679,13 +3621,14 @@ class CliInterceptor extends EventEmitter {
    */
   shouldBypass(input) {
     const normalized = input.trim().toLowerCase();
+    const systemCommands = this.getSystemCommands();
     if (normalized.startsWith("/")) {
       const isCcjkOwned = this.config.ccjkOwnedSlashPrefixes.some((prefix) => normalized.startsWith(prefix));
-      if (!isCcjkOwned) {
+      if (!isCcjkOwned && systemCommands.some((cmd) => normalized.startsWith(cmd))) {
         return { bypass: true, reason: "Native slash command passthrough" };
       }
     }
-    if (this.systemCommands.some((cmd) => normalized.startsWith(cmd))) {
+    if (systemCommands.some((cmd) => normalized.startsWith(cmd))) {
       return { bypass: true, reason: "System command" };
     }
     if (this.config.bypassKeywords.some((kw) => normalized.includes(kw.toLowerCase()))) {

package/dist/chunks/config2.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.j; });
           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.j; });
       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 CODE_TOOL_TYPES = ["claude-code", "myclaude", "codex", "aider", "continue", "cline", "cursor"];
 const DEFAULT_CODE_TOOL_TYPE = "claude-code";
+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/index10.mjs

@@ -5,7 +5,7 @@ import { ensureI18nInitialized, i18n, resolveSupportedLanguage, changeLanguage }
 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 { 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';
@@ -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({
@@ -4061,7 +4068,7 @@ function attachHandlers(items, codeTool) {
               await runCodexFullInit();
               return;
             }
-            await init({ skipBanner: true });
+            await init({ skipBanner: true, codeType: codeTool });
           }
         };
       case "workflow-import":
@@ -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) {