ccjk 14.1.9 → 14.1.10

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

@@ -70,7 +70,9 @@ async function configureIncrementalManagement() {
   const config = ClaudeCodeConfigManager.readConfig();
   if (!config || !config.profiles || Object.keys(config.profiles).length === 0) {
     await handleAddProfile();
-    await syncMyclaudeProfilesIfNeeded();
+    if (!isClavueRuntime()) {
+      await syncMyclaudeProfilesIfNeeded();
+    }
     return;
   }
   const profiles = Object.values(config.profiles);
@@ -122,13 +124,130 @@ async function promptContinueAdding() {
 async function addProfileDirect() {
   ensureI18nInitialized();
   await handleAddProfile();
-  await syncMyclaudeProfilesIfNeeded();
+  if (!isClavueRuntime()) {
+    await syncMyclaudeProfilesIfNeeded();
+  }
 }
 function getProviderDefaultModels(provider) {
   return resolveClaudeFamilyModelSlots({
     defaultModels: provider?.claudeCode?.defaultModels
   });
 }
+function isClavueRuntime() {
+  return readZcfConfig()?.codeToolType === "clavue";
+}
+function getDefaultModelsForRouteMode(mode, provider) {
+  if (mode === "official") {
+    return {
+      primaryModel: "claude-sonnet-4-6",
+      haikuModel: "claude-haiku-4-5-20251001",
+      sonnetModel: "claude-sonnet-4-6",
+      opusModel: "claude-opus-4-6"
+    };
+  }
+  if (mode === "openai-native") {
+    if (provider?.claudeCode?.defaultModels?.length) {
+      const defaults = getProviderDefaultModels(provider);
+      return {
+        primaryModel: defaults.primaryModel || "gpt-5-codex",
+        haikuModel: defaults.haikuModel || defaults.primaryModel || "gpt-5-codex",
+        sonnetModel: defaults.sonnetModel || defaults.primaryModel || "gpt-5-codex",
+        opusModel: defaults.opusModel || defaults.primaryModel || "gpt-5-codex"
+      };
+    }
+    return resolveClaudeFamilyModelSlots({ selectedModel: "gpt-5-codex" });
+  }
+  return {
+    primaryModel: "gpt-5-codex",
+    haikuModel: "claude-haiku-4-5-20251001",
+    sonnetModel: "gpt-5-codex",
+    opusModel: "claude-opus-4-6"
+  };
+}
+function toLegacyProviderMode(mode) {
+  return mode === "openai-native" ? "openai-native" : mode === "ccr-proxy" ? "ccr-proxy" : "official";
+}
+async function promptModelRouteSelection(provider) {
+  const isZh = i18n.language === "zh-CN";
+  const { mode } = await inquirer.prompt([{
+    type: "list",
+    name: "mode",
+    message: isZh ? "\u8BF7\u9009\u62E9\u6A21\u578B\u8DEF\u7531\u6A21\u5F0F:" : "Select model routing mode:",
+    choices: addNumbersToChoices([
+      {
+        name: isZh ? "OpenAI / GPT \u6A21\u578B\uFF08GPT-5.x\u3001Codex\uFF09" : "OpenAI / GPT models (GPT-5.x, Codex)",
+        value: "openai-native"
+      },
+      {
+        name: isZh ? "Claude \u6A21\u578B\uFF08Anthropic / Claude \u517C\u5BB9\uFF09" : "Claude models (Anthropic / Claude compatible)",
+        value: "official"
+      },
+      {
+        name: isZh ? "\u6DF7\u5408\u6A21\u578B\uFF08OpenAI + Claude \u5206\u69FD\uFF09" : "Hybrid models (OpenAI + Claude slots)",
+        value: "ccr-proxy"
+      }
+    ]),
+    default: "openai-native"
+  }]);
+  const defaults = getDefaultModelsForRouteMode(mode, provider);
+  const { promptCustomModels } = await import('./features.mjs');
+  const models = await promptCustomModels(
+    defaults.primaryModel,
+    defaults.haikuModel,
+    defaults.sonnetModel,
+    defaults.opusModel
+  );
+  return { mode: toLegacyProviderMode(mode), models };
+}
+function toMyclaudeProviderProfile(profile, routeSelection) {
+  return {
+    id: profile.id || ClaudeCodeConfigManager.generateProfileId(profile.name),
+    name: profile.name,
+    provider: profile.provider || "custom",
+    apiKey: profile.apiKey,
+    baseUrl: profile.baseUrl,
+    model: profile.primaryModel,
+    fastModel: profile.defaultHaikuModel,
+    authType: profile.authType,
+    primaryModel: profile.primaryModel,
+    defaultHaikuModel: profile.defaultHaikuModel,
+    defaultSonnetModel: profile.defaultSonnetModel,
+    defaultOpusModel: profile.defaultOpusModel,
+    mode: routeSelection.mode
+  };
+}
+function fromClavueProviderProfile(profile) {
+  const routing = profile.modelRouting;
+  return {
+    id: profile.provenance?.kind === "imported" && profile.provenance.sourceId === "ccjk" && typeof profile.provenance.externalProfileId === "string" ? profile.provenance.externalProfileId : profile.id,
+    name: profile.name,
+    provider: profile.providerId || "custom",
+    baseUrl: profile.baseUrl,
+    authType: profile.authType,
+    model: routing?.primaryModel,
+    fastModel: routing?.smallFastModel,
+    primaryModel: routing?.primaryModel,
+    defaultHaikuModel: routing?.smallFastModel,
+    defaultSonnetModel: routing?.generalModel || routing?.subagentModel,
+    defaultOpusModel: routing?.planModel,
+    mode: profile.modelMode === "openai_native" ? "openai-native" : profile.modelMode === "hybrid_compatible" ? "ccr-proxy" : "official"
+  };
+}
+async function saveClavueNativeProfile(profile, routeSelection, setAsDefault) {
+  const { readClavueConfig, setMyclaudeProviderProfiles } = await import('./config.mjs').then(function (n) { return n.P; });
+  const config = readClavueConfig();
+  const activeClavueProfileId = config?.clavueActiveProviderProfileId;
+  const existingManagedProfiles = (config?.clavueProviderProfiles || []).filter((existing) => existing.provenance?.kind === "imported" && existing.provenance.sourceId === "ccjk").map(fromClavueProviderProfile);
+  const activeManagedProfileId = existingManagedProfiles.find((existing) => {
+    return existing.id === activeClavueProfileId || `ccjk-${existing.id}` === activeClavueProfileId;
+  })?.id;
+  const nextProfile = toMyclaudeProviderProfile(profile, routeSelection);
+  const profiles = [
+    ...existingManagedProfiles.filter((existing) => existing.id !== nextProfile.id),
+    nextProfile
+  ];
+  setMyclaudeProviderProfiles(profiles, setAsDefault ? nextProfile.id : activeManagedProfileId || activeClavueProfileId);
+}
 async function handleAddProfile() {
   console.log(a.green(`
 ${i18n.t("multi-config:addingNewProfile")}`));
@@ -218,17 +337,8 @@ ${i18n.t("multi-config:addingNewProfile")}`));
       }
     }
   ]);
-  let modelConfig = null;
-  {
-    const { promptCustomModels } = await import('./features.mjs');
-    const defaults = getProviderDefaultModels(selectedProviderPreset);
-    modelConfig = await promptCustomModels(
-      defaults.primaryModel,
-      defaults.haikuModel,
-      defaults.sonnetModel,
-      defaults.opusModel
-    );
-  }
+  const routeSelection = await promptModelRouteSelection(selectedProviderPreset);
+  const modelConfig = routeSelection.models;
   const setAsDefault = await promptBoolean({
     message: i18n.t("multi-config:setAsDefaultPrompt"),
     defaultValue: true
@@ -256,66 +366,71 @@ ${i18n.t("multi-config:addingNewProfile")}`));
     if (modelConfig.opusModel.trim())
       profile.defaultOpusModel = modelConfig.opusModel.trim();
   }
-  const existingProfile = ClaudeCodeConfigManager.getProfileByName(profile.name);
-  if (existingProfile) {
-    const overwrite = await promptBoolean({
-      message: i18n.t("multi-config:profileDuplicatePrompt", {
-        name: profile.name,
-        source: i18n.t("multi-config:existingConfig")
-      }),
-      defaultValue: false
-    });
-    if (!overwrite) {
-      console.log(a.yellow(i18n.t("multi-config:profileDuplicateSkipped", { name: profile.name })));
-      const shouldContinue2 = await promptContinueAdding();
-      if (shouldContinue2) {
-        await handleAddProfile();
-      }
-      return;
-    }
-    const updateResult = await ClaudeCodeConfigManager.updateProfile(existingProfile.id, {
-      name: profile.name,
-      authType: profile.authType,
-      provider: profile.provider,
-      apiKey: profile.apiKey,
-      baseUrl: profile.baseUrl,
-      primaryModel: profile.primaryModel,
-      defaultHaikuModel: profile.defaultHaikuModel,
-      defaultSonnetModel: profile.defaultSonnetModel,
-      defaultOpusModel: profile.defaultOpusModel
-    });
-    if (updateResult.success) {
-      console.log(a.green(i18n.t("multi-config:profileUpdated", { name: profile.name })));
-      if (updateResult.backupPath) {
-        console.log(a.gray(i18n.t("common:backupCreated", { path: updateResult.backupPath })));
+  if (isClavueRuntime()) {
+    await saveClavueNativeProfile(profile, routeSelection, setAsDefault);
+    console.log(a.green(i18n.t("multi-config:profileAdded", { name: profile.name })));
+  } else {
+    const existingProfile = ClaudeCodeConfigManager.getProfileByName(profile.name);
+    if (existingProfile) {
+      const overwrite = await promptBoolean({
+        message: i18n.t("multi-config:profileDuplicatePrompt", {
+          name: profile.name,
+          source: i18n.t("multi-config:existingConfig")
+        }),
+        defaultValue: false
+      });
+      if (!overwrite) {
+        console.log(a.yellow(i18n.t("multi-config:profileDuplicateSkipped", { name: profile.name })));
+        const shouldContinue2 = await promptContinueAdding();
+        if (shouldContinue2) {
+          await handleAddProfile();
+        }
+        return;
       }
-      if (setAsDefault) {
-        const switchResult = await ClaudeCodeConfigManager.switchProfile(existingProfile.id);
-        if (switchResult.success) {
-          console.log(a.green(i18n.t("multi-config:profileSetAsDefault", { name: profile.name })));
-          await ClaudeCodeConfigManager.applyProfileSettings({ ...profile, id: existingProfile.id });
+      const updateResult = await ClaudeCodeConfigManager.updateProfile(existingProfile.id, {
+        name: profile.name,
+        authType: profile.authType,
+        provider: profile.provider,
+        apiKey: profile.apiKey,
+        baseUrl: profile.baseUrl,
+        primaryModel: profile.primaryModel,
+        defaultHaikuModel: profile.defaultHaikuModel,
+        defaultSonnetModel: profile.defaultSonnetModel,
+        defaultOpusModel: profile.defaultOpusModel
+      });
+      if (updateResult.success) {
+        console.log(a.green(i18n.t("multi-config:profileUpdated", { name: profile.name })));
+        if (updateResult.backupPath) {
+          console.log(a.gray(i18n.t("common:backupCreated", { path: updateResult.backupPath })));
         }
+        if (setAsDefault) {
+          const switchResult = await ClaudeCodeConfigManager.switchProfile(existingProfile.id);
+          if (switchResult.success) {
+            console.log(a.green(i18n.t("multi-config:profileSetAsDefault", { name: profile.name })));
+            await ClaudeCodeConfigManager.applyProfileSettings({ ...profile, id: existingProfile.id });
+          }
+        }
+      } else {
+        console.log(a.red(i18n.t("multi-config:profileUpdateFailed", { error: updateResult.error || "" })));
       }
     } else {
-      console.log(a.red(i18n.t("multi-config:profileUpdateFailed", { error: updateResult.error || "" })));
-    }
-  } else {
-    const result = await ClaudeCodeConfigManager.addProfile(profile);
-    if (result.success) {
-      const runtimeProfile = result.addedProfile || { ...profile, id: profileId };
-      console.log(a.green(i18n.t("multi-config:profileAdded", { name: runtimeProfile.name })));
-      if (result.backupPath) {
-        console.log(a.gray(i18n.t("common:backupCreated", { path: result.backupPath })));
-      }
-      if (setAsDefault) {
-        const switchResult = await ClaudeCodeConfigManager.switchProfile(runtimeProfile.id);
-        if (switchResult.success) {
-          console.log(a.green(i18n.t("multi-config:profileSetAsDefault", { name: runtimeProfile.name })));
-          await ClaudeCodeConfigManager.applyProfileSettings(runtimeProfile);
+      const result = await ClaudeCodeConfigManager.addProfile(profile);
+      if (result.success) {
+        const runtimeProfile = result.addedProfile || { ...profile, id: profileId };
+        console.log(a.green(i18n.t("multi-config:profileAdded", { name: runtimeProfile.name })));
+        if (result.backupPath) {
+          console.log(a.gray(i18n.t("common:backupCreated", { path: result.backupPath })));
         }
+        if (setAsDefault) {
+          const switchResult = await ClaudeCodeConfigManager.switchProfile(runtimeProfile.id);
+          if (switchResult.success) {
+            console.log(a.green(i18n.t("multi-config:profileSetAsDefault", { name: runtimeProfile.name })));
+            await ClaudeCodeConfigManager.applyProfileSettings(runtimeProfile);
+          }
+        }
+      } else {
+        console.log(a.red(i18n.t("multi-config:profileAddFailed", { error: result.error })));
       }
-    } else {
-      console.log(a.red(i18n.t("multi-config:profileAddFailed", { error: result.error })));
     }
   }
   const shouldContinue = await promptContinueAdding();

package/dist/chunks/package.mjs

@@ -1,3 +1,3 @@
-const version = "14.1.9";
+const version = "14.1.10";
 
 export { version };

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "ccjk",
   "type": "module",
-  "version": "14.1.9",
+  "version": "14.1.10",
+  "packageManager": "pnpm@10.17.1",
   "description": "Production-ready AI dev environment for Claude Code, Codex, and modern coding workflows with 30-second onboarding, persistent memory, Agent Teams, remote control, and capability discovery.",
   "author": {
     "name": "CCJK Team",
@@ -80,6 +81,46 @@
   "engines": {
     "node": ">=20"
   },
+  "scripts": {
+    "dev": "tsx ./src/cli.ts",
+    "build": "pnpm build:release:deps && pnpm build:root",
+    "build:root": "unbuild",
+    "build:release:deps": "pnpm --filter @ccjk/wire build && pnpm --filter @ccjk/evolution build",
+    "start": "node bin/ccjk.mjs",
+    "typecheck": "pnpm build:release:deps && pnpm typecheck:root",
+    "typecheck:root": "tsc --noEmit",
+    "release:verify": "node scripts/release-verify.mjs",
+    "release:verify:full": "node scripts/release-verify.mjs --with-tests",
+    "prepublishOnly": "node scripts/validate-prepublish.mjs && pnpm contract:check && pnpm build",
+    "lint": "eslint",
+    "lint:fix": "eslint --fix",
+    "test": "vitest",
+    "test:ui": "vitest --ui",
+    "test:coverage": "vitest run --coverage",
+    "test:run": "vitest run",
+    "test:release": "vitest run src/commands/menu/index.test.ts src/commands/menu/main-menu.test.ts src/utils/tool-update-scheduler.test.ts tests/commands/api-config-selector.test.ts tests/commands/init.silent.test.ts tests/commands/onboarding-wizard.test.ts tests/commands/research.test.ts tests/utils/banner.test.ts tests/utils/code-type-resolver.test.ts tests/utils/memory-feature.test.ts",
+    "test:watch": "vitest watch",
+    "test:e2e": "NODE_ENV=test vitest --config vitest.e2e.config.ts",
+    "test:e2e:run": "NODE_ENV=test vitest run --config vitest.e2e.config.ts",
+    "test:e2e:ui": "NODE_ENV=test vitest --config vitest.e2e.config.ts --ui",
+    "test:e2e:coverage": "NODE_ENV=test vitest run --config vitest.e2e.config.ts --coverage",
+    "test:e2e:debug": "NODE_ENV=test CCJK_E2E_DEBUG=true vitest --config vitest.e2e.config.ts",
+    "test:integration": "NODE_ENV=test vitest --config vitest.integration.config.ts",
+    "test:integration:run": "NODE_ENV=test vitest run --config vitest.integration.config.ts",
+    "test:integration:ui": "NODE_ENV=test vitest --config vitest.integration.config.ts --ui",
+    "test:integration:coverage": "NODE_ENV=test vitest run --config vitest.integration.config.ts --coverage",
+    "prepare": "husky",
+    "format": "prettier --write src/**/*.ts",
+    "prepublish:fix": "node scripts/fix-package-catalog.mjs",
+    "cleanup": "node scripts/cleanup.js",
+    "cleanup:auto": "node scripts/cleanup.js --auto",
+    "cleanup:dry": "node scripts/cleanup.js --dry-run",
+    "clean": "rm -rf dist coverage .turbo *.tsbuildinfo",
+    "benchmark:compression": "tsx scripts/benchmark-compression.ts",
+    "i18n:check": "tsx scripts/check-i18n.ts",
+    "i18n:report": "tsx scripts/check-i18n.ts --report",
+    "contract:check": "node scripts/check-remote-contract.mjs"
+  },
   "dependencies": {
     "better-sqlite3": "^12.9.0",
     "fdir": "^6.5.0",
@@ -142,43 +183,5 @@
     "unbuild": "^3.6.1",
     "uuid": "^11.1.0",
     "vitest": "^3.2.4"
-  },
-  "scripts": {
-    "dev": "tsx ./src/cli.ts",
-    "build": "pnpm build:release:deps && pnpm build:root",
-    "build:root": "unbuild",
-    "build:release:deps": "pnpm --filter @ccjk/wire build && pnpm --filter @ccjk/evolution build",
-    "start": "node bin/ccjk.mjs",
-    "typecheck": "pnpm build:release:deps && pnpm typecheck:root",
-    "typecheck:root": "tsc --noEmit",
-    "release:verify": "node scripts/release-verify.mjs",
-    "release:verify:full": "node scripts/release-verify.mjs --with-tests",
-    "lint": "eslint",
-    "lint:fix": "eslint --fix",
-    "test": "vitest",
-    "test:ui": "vitest --ui",
-    "test:coverage": "vitest run --coverage",
-    "test:run": "vitest run",
-    "test:release": "vitest run src/commands/menu/index.test.ts src/commands/menu/main-menu.test.ts src/utils/tool-update-scheduler.test.ts tests/commands/api-config-selector.test.ts tests/commands/init.silent.test.ts tests/commands/onboarding-wizard.test.ts tests/commands/research.test.ts tests/utils/banner.test.ts tests/utils/code-type-resolver.test.ts tests/utils/memory-feature.test.ts",
-    "test:watch": "vitest watch",
-    "test:e2e": "NODE_ENV=test vitest --config vitest.e2e.config.ts",
-    "test:e2e:run": "NODE_ENV=test vitest run --config vitest.e2e.config.ts",
-    "test:e2e:ui": "NODE_ENV=test vitest --config vitest.e2e.config.ts --ui",
-    "test:e2e:coverage": "NODE_ENV=test vitest run --config vitest.e2e.config.ts --coverage",
-    "test:e2e:debug": "NODE_ENV=test CCJK_E2E_DEBUG=true vitest --config vitest.e2e.config.ts",
-    "test:integration": "NODE_ENV=test vitest --config vitest.integration.config.ts",
-    "test:integration:run": "NODE_ENV=test vitest run --config vitest.integration.config.ts",
-    "test:integration:ui": "NODE_ENV=test vitest --config vitest.integration.config.ts --ui",
-    "test:integration:coverage": "NODE_ENV=test vitest run --config vitest.integration.config.ts --coverage",
-    "format": "prettier --write src/**/*.ts",
-    "prepublish:fix": "node scripts/fix-package-catalog.mjs",
-    "cleanup": "node scripts/cleanup.js",
-    "cleanup:auto": "node scripts/cleanup.js --auto",
-    "cleanup:dry": "node scripts/cleanup.js --dry-run",
-    "clean": "rm -rf dist coverage .turbo *.tsbuildinfo",
-    "benchmark:compression": "tsx scripts/benchmark-compression.ts",
-    "i18n:check": "tsx scripts/check-i18n.ts",
-    "i18n:report": "tsx scripts/check-i18n.ts --report",
-    "contract:check": "node scripts/check-remote-contract.mjs"
   }
-}
+}