ccjk 13.5.2 → 13.5.4

package/dist/chunks/init.mjs

@@ -2,7 +2,7 @@ import { existsSync } from 'node:fs';
 import process__default from 'node:process';
 import a from './index2.mjs';
 import { i as inquirer } from './index3.mjs';
-import { s as selectMcpServices, g as getMcpServices, M as MCP_SERVICE_CONFIGS } from '../shared/ccjk.0aJQmVxS.mjs';
+import { s as selectMcpServices, g as getMcpServices, M as MCP_SERVICE_CONFIGS } from '../shared/ccjk.miT0g_vA.mjs';
 import { s as selectAndInstallWorkflows, W as WORKFLOW_CONFIG_BASE } from '../shared/ccjk.C3o4BXvM.mjs';
 import { SETTINGS_FILE, DEFAULT_CODE_TOOL_TYPE, CODE_TOOL_BANNERS, API_DEFAULT_URL } from './constants.mjs';
 import { ensureI18nInitialized, i18n } from './index5.mjs';
@@ -44,9 +44,9 @@ import 'node:os';
 import 'node:crypto';
 import 'buffer';
 import 'string_decoder';
-import '../shared/ccjk.bQ7Dh1g4.mjs';
 import 'node:fs/promises';
 import 'node:url';
+import '../shared/ccjk.bQ7Dh1g4.mjs';
 import '../shared/ccjk.BBtCGd_g.mjs';
 import './index6.mjs';
 import '../shared/ccjk.RyizuzOI.mjs';

package/dist/chunks/mcp-cli.mjs

@@ -1,8 +1,8 @@
 import a from './index2.mjs';
-import { g as getMcpServices } from '../shared/ccjk.0aJQmVxS.mjs';
+import { g as getMcpServices } from '../shared/ccjk.miT0g_vA.mjs';
 import { i18n } from './index5.mjs';
 import { r as readMcpConfig } from './claude-config.mjs';
-import { i as installMcpService, u as uninstallMcpService } from '../shared/ccjk.LTONy3IS.mjs';
+import { i as installMcpService, u as uninstallMcpService } from '../shared/ccjk.BOfPON0N.mjs';
 import '../shared/ccjk.BAGoDD49.mjs';
 import './index3.mjs';
 import 'node:readline';
@@ -21,9 +21,9 @@ import 'node:crypto';
 import 'buffer';
 import 'string_decoder';
 import 'node:child_process';
-import '../shared/ccjk.bQ7Dh1g4.mjs';
 import 'node:fs';
 import 'node:url';
+import '../shared/ccjk.bQ7Dh1g4.mjs';
 import './constants.mjs';
 import './json-config.mjs';
 import '../shared/ccjk.RyizuzOI.mjs';

package/dist/chunks/mcp.mjs

@@ -1,28 +1,28 @@
 import a from './index2.mjs';
+import { CLOUD_ENDPOINTS, isCodeToolType } from './constants.mjs';
 import { i18n } from './index5.mjs';
+import { readZcfConfig } from './ccjk-config.mjs';
 import 'node:child_process';
 import 'node:process';
 import { M as MCP_SERVICE_TIERS, i as isCoreService, g as getServicesByTier, c as checkMcpPerformance, f as formatPerformanceWarning, a as calculateResourceUsage, b as getOptimizationSuggestions, d as getMcpTierConfig } from './mcp-performance.mjs';
 import { r as readMcpConfig, b as backupMcpConfig, w as writeMcpConfig } from './claude-config.mjs';
 import { i as inquirer } from './index3.mjs';
-import { M as MCP_SERVICE_CONFIGS } from '../shared/ccjk.0aJQmVxS.mjs';
-import { d as displayInstalledMcpServices, b as isMcpServiceInstalled, i as installMcpService, u as uninstallMcpService } from '../shared/ccjk.LTONy3IS.mjs';
+import { M as MCP_SERVICE_CONFIGS } from '../shared/ccjk.miT0g_vA.mjs';
+import { d as displayInstalledMcpServices, b as isMcpServiceInstalled, i as installMcpService, u as uninstallMcpService } from '../shared/ccjk.BOfPON0N.mjs';
 import { existsSync, unlinkSync, statSync, mkdirSync, readFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { writeFileAtomic } from './fs-operations.mjs';
-import { CLOUD_ENDPOINTS } from './constants.mjs';
 import { j as join } from '../shared/ccjk.bQ7Dh1g4.mjs';
+import { a as readCodexConfig, d as backupCodexComplete, w as writeCodexConfig, g as applyCodexPlatformCommand } from './codex.mjs';
+import { i as isWindows, l as getSystemRoot } from './platform.mjs';
 import '../shared/ccjk.BAGoDD49.mjs';
 import 'node:url';
+import '../shared/ccjk.BBtCGd_g.mjs';
+import './index6.mjs';
 import './json-config.mjs';
 import '../shared/ccjk.RyizuzOI.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 'stream';
 import 'node:tty';
@@ -32,15 +32,15 @@ import 'node:util';
 import 'tty';
 import 'fs';
 import 'child_process';
+import 'node:path';
 import 'buffer';
 import 'string_decoder';
-import './codex.mjs';
 import './index7.mjs';
 import '../shared/ccjk.DeWpAShp.mjs';
 import '../shared/ccjk.CxpGa6MC.mjs';
-import '../shared/ccjk.BBtCGd_g.mjs';
-import './ccjk-config.mjs';
-import './index6.mjs';
+import './main.mjs';
+import 'module';
+import 'node:stream';
 import './config2.mjs';
 import '../shared/ccjk.DScm_NnL.mjs';
 import '../shared/ccjk.BFQ7yr5S.mjs';
@@ -1082,6 +1082,97 @@ function getProfileDescription(profile, lang = "en") {
   return lang === "zh-CN" ? profile.descriptionZh : profile.description;
 }
 
+function resolveProfileTool(options = {}) {
+  if (options.tool === "codex" || options.tool === "claude-code") {
+    return options.tool;
+  }
+  const zcfConfig = readZcfConfig();
+  if (zcfConfig?.codeToolType && isCodeToolType(zcfConfig.codeToolType)) {
+    return zcfConfig.codeToolType === "codex" ? "codex" : "claude-code";
+  }
+  return "claude-code";
+}
+function getToolDisplayName(tool, isZh) {
+  if (tool === "codex") {
+    return "Codex";
+  }
+  return isZh ? "Claude Code" : "Claude Code";
+}
+function getConfiguredServiceIds(tool) {
+  if (tool === "codex") {
+    const config2 = readCodexConfig();
+    return (config2?.mcpServices || []).map((service) => service.id);
+  }
+  const config = readMcpConfig();
+  return config?.mcpServers ? Object.keys(config.mcpServers) : [];
+}
+function buildCodexProfileService(serviceId) {
+  const serviceConfig = MCP_SERVICE_CONFIGS.find((service) => service.id.toLowerCase() === serviceId.toLowerCase());
+  if (!serviceConfig) {
+    return null;
+  }
+  let command = serviceConfig.config.command || serviceId;
+  let args = (serviceConfig.config.args || []).map((arg) => String(arg));
+  if (serviceId === "serena") {
+    const idx = args.indexOf("--context");
+    if (idx >= 0 && idx + 1 < args.length) {
+      args[idx + 1] = "codex";
+    } else {
+      args.push("--context", "codex");
+    }
+  }
+  const normalizedService = {
+    id: serviceId.toLowerCase(),
+    command,
+    args
+  };
+  applyCodexPlatformCommand(normalizedService);
+  const env = { ...serviceConfig.config.env || {} };
+  if (isWindows()) {
+    const systemRoot = getSystemRoot();
+    if (systemRoot) {
+      env.SYSTEMROOT = systemRoot;
+    }
+  }
+  return {
+    id: normalizedService.id,
+    command: normalizedService.command,
+    args: normalizedService.args || [],
+    env: Object.keys(env).length > 0 ? env : void 0,
+    startup_timeout_sec: 30
+  };
+}
+function backupProfileConfig(tool) {
+  return tool === "codex" ? backupCodexComplete() : backupMcpConfig();
+}
+function writeProfileForTool(tool, servicesToEnable) {
+  if (tool === "codex") {
+    const existingConfig2 = readCodexConfig();
+    const mcpServices = servicesToEnable.map(buildCodexProfileService).filter((service) => service !== null);
+    const newConfig = {
+      model: existingConfig2?.model || null,
+      modelProvider: existingConfig2?.modelProvider || null,
+      providers: existingConfig2?.providers || [],
+      mcpServices,
+      otherConfig: existingConfig2?.otherConfig || [],
+      modelProviderCommented: existingConfig2?.modelProviderCommented
+    };
+    writeCodexConfig(newConfig);
+    return;
+  }
+  const newServers = {};
+  for (const serviceId of servicesToEnable) {
+    const serviceConfig = MCP_SERVICE_CONFIGS.find((s) => s.id.toLowerCase() === serviceId.toLowerCase());
+    if (serviceConfig) {
+      newServers[serviceId] = serviceConfig.config;
+    }
+  }
+  const existingConfig = readMcpConfig() || {};
+  writeMcpConfig({
+    ...existingConfig,
+    mcpServers: newServers
+  });
+}
 async function listProfiles(options = {}) {
   const lang = options.lang || i18n.language || "en";
   const isZh = lang === "zh-CN";
@@ -1106,16 +1197,54 @@ async function listProfiles(options = {}) {
   console.log(a.dim(isZh ? "\u4F7F\u7528 `ccjk mcp profile use <id>` \u5207\u6362\u914D\u7F6E" : "Use `ccjk mcp profile use <id>` to switch profile"));
   console.log("");
 }
+async function showCurrentProfile(options = {}) {
+  const lang = options.lang || i18n.language || "en";
+  const isZh = lang === "zh-CN";
+  const tool = resolveProfileTool(options);
+  const toolName = getToolDisplayName(tool, isZh);
+  const currentServices = getConfiguredServiceIds(tool);
+  const normalizedServices = currentServices.map((service) => service.toLowerCase());
+  console.log("");
+  console.log(a.bold.cyan(isZh ? `\u{1F4CA} \u5F53\u524D ${toolName} MCP \u914D\u7F6E\u72B6\u6001` : `\u{1F4CA} Current ${toolName} MCP Configuration`));
+  console.log(a.dim("\u2500".repeat(50)));
+  console.log("");
+  console.log(`${a.bold(isZh ? "\u5DF2\u914D\u7F6E\u670D\u52A1" : "Configured Services")}: ${currentServices.length}`);
+  if (currentServices.length > 0) {
+    console.log(a.dim(`  ${currentServices.join(", ")}`));
+  }
+  const warning = checkMcpPerformance(currentServices.length);
+  if (warning) {
+    console.log("");
+    console.log(formatPerformanceWarning(warning, lang));
+  }
+  const matchedProfile = MCP_PROFILES.find((profile) => {
+    if (profile.services.length === 0)
+      return false;
+    if (profile.services.length !== currentServices.length)
+      return false;
+    return profile.services.every((s) => normalizedServices.includes(s.toLowerCase()));
+  });
+  if (matchedProfile) {
+    console.log("");
+    console.log(`${a.bold(isZh ? "\u5339\u914D\u9884\u8BBE" : "Matched Profile")}: ${a.green(matchedProfile.id)}`);
+  } else {
+    console.log("");
+    console.log(a.dim(isZh ? "\u5F53\u524D\u914D\u7F6E\u4E0D\u5339\u914D\u4EFB\u4F55\u9884\u8BBE" : "Current config does not match any profile"));
+  }
+  console.log("");
+}
 async function useProfile(profileId, options = {}) {
   const lang = options.lang || i18n.language || "en";
   const isZh = lang === "zh-CN";
+  const tool = resolveProfileTool(options);
+  const toolName = getToolDisplayName(tool, isZh);
   const profile = getProfileById(profileId);
   if (!profile) {
     console.log(a.red(isZh ? `\u274C \u672A\u627E\u5230\u914D\u7F6E\u9884\u8BBE: ${profileId}` : `\u274C Profile not found: ${profileId}`));
     console.log(a.dim(isZh ? `\u53EF\u7528\u9884\u8BBE: ${getProfileIds().join(", ")}` : `Available profiles: ${getProfileIds().join(", ")}`));
     return;
   }
-  const backupPath = backupMcpConfig();
+  const backupPath = backupProfileConfig(tool);
   if (backupPath) {
     console.log(a.gray(`\u2714 ${isZh ? "\u5DF2\u5907\u4EFD\u5F53\u524D\u914D\u7F6E" : "Backed up current config"}: ${backupPath}`));
   }
@@ -1125,21 +1254,9 @@ async function useProfile(profileId, options = {}) {
   } else {
     servicesToEnable = profile.services;
   }
-  const newServers = {};
-  for (const serviceId of servicesToEnable) {
-    const serviceConfig = MCP_SERVICE_CONFIGS.find((s) => s.id === serviceId);
-    if (serviceConfig) {
-      newServers[serviceId] = serviceConfig.config;
-    }
-  }
-  const existingConfig = readMcpConfig() || {};
-  const newConfig = {
-    ...existingConfig,
-    mcpServers: newServers
-  };
-  writeMcpConfig(newConfig);
+  writeProfileForTool(tool, servicesToEnable);
   const profileName = getProfileName(profile, lang);
-  console.log(a.green(`\u2714 ${isZh ? "\u5DF2\u5207\u6362\u5230\u914D\u7F6E\u9884\u8BBE" : "Switched to profile"}: ${profileName}`));
+  console.log(a.green(`\u2714 ${isZh ? "\u5DF2\u4E3A" : "Switched"} ${toolName}${isZh ? " \u5207\u6362\u5230\u914D\u7F6E\u9884\u8BBE" : " profile"}: ${profileName}`));
   console.log(a.dim(`  ${isZh ? "\u5DF2\u542F\u7528\u670D\u52A1" : "Enabled services"}: ${servicesToEnable.length}`));
   const warning = checkMcpPerformance(servicesToEnable.length);
   if (warning) {
@@ -1147,25 +1264,46 @@ async function useProfile(profileId, options = {}) {
     console.log(formatPerformanceWarning(warning, lang));
   }
   console.log("");
-  console.log(a.yellow(isZh ? "\u26A0\uFE0F \u8BF7\u91CD\u542F Claude Code \u4EE5\u4F7F\u66F4\u6539\u751F\u6548" : "\u26A0\uFE0F Please restart Claude Code for changes to take effect"));
+  console.log(a.yellow(isZh ? `\u26A0\uFE0F \u8BF7\u91CD\u542F ${toolName} \u4EE5\u4F7F\u66F4\u6539\u751F\u6548` : `\u26A0\uFE0F Please restart ${toolName} for changes to take effect`));
 }
 
+function resolveMcpTool(options = {}) {
+  if (options.tool === "codex" || options.tool === "claude-code") {
+    return options.tool;
+  }
+  const zcfConfig = readZcfConfig();
+  if (zcfConfig?.codeToolType && isCodeToolType(zcfConfig.codeToolType)) {
+    return zcfConfig.codeToolType === "codex" ? "codex" : "claude-code";
+  }
+  return "claude-code";
+}
+function getServiceTier(serviceId, tiers) {
+  const directMatch = tiers[serviceId];
+  if (directMatch) {
+    return directMatch;
+  }
+  const caseInsensitiveMatch = Object.entries(tiers).find(
+    ([id]) => id.toLowerCase() === serviceId.toLowerCase()
+  );
+  return caseInsensitiveMatch?.[1] || "ondemand";
+}
 async function mcpStatus(options = {}) {
   const { readMcpConfig } = await import('./claude-config.mjs').then(function (n) { return n.h; });
+  const { readCodexConfig } = await import('./codex.mjs').then(function (n) { return n.i; });
   const { checkMcpPerformance, formatPerformanceWarning } = await import('./mcp-performance.mjs').then(function (n) { return n.e; });
   const { MCP_SERVICE_TIERS } = await import('./mcp-performance.mjs').then(function (n) { return n.m; });
   const lang = options.lang || i18n.language || "en";
   const isZh = lang === "zh-CN";
+  const targetTool = resolveMcpTool(options);
+  const services = targetTool === "codex" ? (readCodexConfig()?.mcpServices || []).map((service) => service.id) : Object.keys((await readMcpConfig())?.mcpServers || {});
   console.log("");
-  console.log(a.bold.cyan(isZh ? "\u26A1 MCP \u5FEB\u901F\u72B6\u6001" : "\u26A1 MCP Quick Status"));
+  console.log(a.bold.cyan(isZh ? `\u26A1 ${targetTool === "codex" ? "Codex" : "Claude Code"} MCP \u5FEB\u901F\u72B6\u6001` : `\u26A1 ${targetTool === "codex" ? "Codex" : "Claude Code"} MCP Quick Status`));
   console.log(a.dim("\u2500".repeat(40)));
-  const config = await readMcpConfig();
-  const services = Object.keys(config?.mcpServers || {});
   let coreCount = 0;
   let ondemandCount = 0;
   let scenarioCount = 0;
   for (const svc of services) {
-    const tier = MCP_SERVICE_TIERS[svc] || "ondemand";
+    const tier = getServiceTier(svc, MCP_SERVICE_TIERS);
     if (tier === "core")
       coreCount++;
     else if (tier === "ondemand")
@@ -1186,7 +1324,7 @@ async function mcpStatus(options = {}) {
     console.log(a.green(isZh ? "\u2713 \u6027\u80FD\u72B6\u6001\u826F\u597D" : "\u2713 Performance OK"));
   }
   console.log("");
-  console.log(a.dim(isZh ? "\u63D0\u793A: \u4F7F\u7528 ccjk mcp doctor \u67E5\u770B\u8BE6\u7EC6\u8BCA\u65AD" : "Tip: Use ccjk mcp doctor for detailed diagnostics"));
+  console.log(a.dim(isZh ? `\u63D0\u793A: \u4F7F\u7528 ccjk mcp doctor${targetTool === "codex" ? " -T codex" : ""} \u67E5\u770B\u8BE6\u7EC6\u8BCA\u65AD` : `Tip: Use ccjk mcp doctor${targetTool === "codex" ? " -T codex" : ""} for detailed diagnostics`));
 }
 function mcpHelp(options = {}) {
   const lang = options.lang || i18n.language || "en";
@@ -1206,7 +1344,11 @@ function mcpHelp(options = {}) {
     },
     {
       cmd: "ccjk mcp profile [name]",
-      desc: isZh ? "\u5207\u6362\u914D\u7F6E\u9884\u8BBE (minimal/dev/full)" : "Switch profile (minimal/dev/full)"
+      desc: isZh ? "\u5207\u6362\u914D\u7F6E\u9884\u8BBE (minimal/development/full)" : "Switch profile (minimal/development/full)"
+    },
+    {
+      cmd: "ccjk mcp profile use minimal -T codex",
+      desc: isZh ? "\u5207\u6362 Codex \u542F\u52A8\u65F6\u52A0\u8F7D\u7684 MCP \u7EC4\u5408" : "Switch the MCP set loaded on Codex startup"
     },
     {
       cmd: "ccjk mcp release",
@@ -1230,4 +1372,4 @@ function mcpHelp(options = {}) {
   console.log(a.dim(isZh ? "\u{1F4A1} \u63A8\u8350: \u4F7F\u7528 minimal \u9884\u8BBE\u53EF\u663E\u8457\u63D0\u5347\u6027\u80FD" : "\u{1F4A1} Tip: Use minimal profile for best performance"));
 }
 
-export { listProfiles, mcpDoctor, mcpHelp, mcpInstall, mcpList, mcpRelease, mcpSearch, mcpStatus, mcpUninstall, useProfile };
+export { listProfiles, mcpDoctor, mcpHelp, mcpInstall, mcpList, mcpRelease, mcpSearch, mcpStatus, mcpUninstall, showCurrentProfile, useProfile };