ccjk 8.1.3 → 8.1.5

package/dist/chunks/ccjk-agents.mjs

@@ -1,7 +1,8 @@
 import consola from 'consola';
 import process__default, { cwd } from 'node:process';
 import { P as ProjectAnalyzer } from '../shared/ccjk.CsujU3aC.mjs';
-import { join } from 'pathe';
+import { join, dirname } from 'pathe';
+import { fileURLToPath } from 'node:url';
 import { existsSync, readdirSync, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { c as createCloudClient } from '../shared/ccjk.DR7dAWAm.mjs';
@@ -13,27 +14,27 @@ import 'url';
 import 'module';
 import 'smol-toml';
 import 'ofetch';
-import 'node:url';
 import 'i18next';
 import 'i18next-fs-backend';
 
 async function getCloudRecommendations(analysis) {
   try {
     const client = createCloudClient();
-    const response = await client.getRecommendations({
+    const response = await client.analyzeProject({
+      projectRoot: analysis.projectRoot || process.cwd(),
       projectType: analysis.projectType,
       frameworks: analysis.frameworks.map((f) => f.name),
       languages: analysis.languages.map((l) => l.language),
       dependencies: analysis.dependencies?.direct.map((d) => d.name) || []
     });
-    return response.recommendations.map((rec) => ({
-      name: rec.name,
-      description: rec.description,
+    return (response.recommendations || []).map((rec) => ({
+      name: rec.name || rec.id || "Unknown Agent",
+      description: rec.description || "No description available",
       skills: rec.skills || [],
       mcpServers: rec.mcpServers || [],
       persona: rec.persona,
       capabilities: rec.capabilities || [],
-      confidence: rec.confidence || 0.8,
+      confidence: rec.confidence || rec.relevanceScore || 0.8,
       reason: rec.reason || "Recommended by CCJK Cloud"
     }));
   } catch (error) {
@@ -42,18 +43,27 @@ async function getCloudRecommendations(analysis) {
   }
 }
 
-const AGENT_TEMPLATES_DIR = join(process.cwd(), "templates", "agents");
+const _dirname = dirname(fileURLToPath(import.meta.url));
+const AGENT_TEMPLATES_DIR = join(_dirname, "..", "templates", "agents");
+const AGENT_TEMPLATES_DIR_FALLBACK = join(process.cwd(), "templates", "agents");
+function getAgentTemplatesDir() {
+  if (existsSync(AGENT_TEMPLATES_DIR)) {
+    return AGENT_TEMPLATES_DIR;
+  }
+  return AGENT_TEMPLATES_DIR_FALLBACK;
+}
 async function loadAgentTemplates() {
-  if (!existsSync(AGENT_TEMPLATES_DIR)) {
-    console.warn("Agent templates directory not found:", AGENT_TEMPLATES_DIR);
+  const templatesDir = getAgentTemplatesDir();
+  if (!existsSync(templatesDir)) {
+    console.warn("Agent templates directory not found:", templatesDir);
     return [];
   }
   const templates = [];
-  const files = readdirSync(AGENT_TEMPLATES_DIR);
+  const files = readdirSync(templatesDir);
   for (const file of files) {
     if (!file.endsWith(".json")) continue;
     try {
-      const filePath = join(AGENT_TEMPLATES_DIR, file);
+      const filePath = join(templatesDir, file);
       const content = readFileSync(filePath, "utf-8");
       const template = JSON.parse(content);
       const recommendation = {

package/dist/chunks/config2.mjs

@@ -200,10 +200,18 @@ function mergeSettingsFile(templatePath, targetPath) {
       ...existingSettings.env || {}
       // User's env vars override (preserving API keys, etc.)
     };
-    const mergedSettings = deepMerge(templateSettings, existingSettings, {
-      mergeArrays: true,
-      arrayMergeStrategy: "unique"
-    });
+    const mergedSettings = { ...templateSettings };
+    const schemaCriticalFields = [
+      "$schema",
+      "attribution",
+      "fileSuggestion",
+      "permissions"
+    ];
+    for (const [key, value] of Object.entries(existingSettings)) {
+      if (!schemaCriticalFields.includes(key)) {
+        mergedSettings[key] = value;
+      }
+    }
     mergedSettings.env = mergedEnv;
     if (mergedSettings.permissions && mergedSettings.permissions.allow) {
       mergedSettings.permissions.allow = mergeAndCleanPermissions(

package/dist/chunks/doctor.mjs

@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, statSync, writeFileSync, readFileSync, readdirSync } from 'node:fs';
+import { existsSync, mkdirSync, statSync, writeFileSync, readFileSync, copyFileSync, readdirSync } from 'node:fs';
 import process__default from 'node:process';
 import ansis from 'ansis';
 import inquirer from 'inquirer';
@@ -552,15 +552,57 @@ async function checkClaudeDir() {
   };
 }
 async function checkSettings() {
-  if (existsSync(SETTINGS_FILE)) {
-    return { name: "settings.json", status: "ok", message: "Configured" };
+  if (!existsSync(SETTINGS_FILE)) {
+    return {
+      name: "settings.json",
+      status: "warning",
+      message: "Not found",
+      fix: "Run: npx ccjk init"
+    };
+  }
+  try {
+    const { readFileSync: readFileSync2 } = await import('node:fs');
+    const content = readFileSync2(SETTINGS_FILE, "utf-8");
+    const settings = JSON.parse(content);
+    const issues = [];
+    if (settings.$schema && settings.$schema !== "https://json.schemastore.org/claude-code-settings.json") {
+      issues.push("Invalid $schema URL");
+    }
+    if (typeof settings.attribution === "string") {
+      issues.push("attribution should be an object, not a string");
+    }
+    if (settings.fileSuggestion && settings.fileSuggestion.type !== "command") {
+      issues.push('fileSuggestion.type must be "command"');
+    }
+    if (settings.permissions?.allow) {
+      const lowerCaseTools = settings.permissions.allow.filter(
+        (t) => /^[a-z]/.test(t) && !t.startsWith("Allow")
+      );
+      if (lowerCaseTools.length > 0) {
+        issues.push(`${lowerCaseTools.length} permission(s) with lowercase names`);
+      }
+    }
+    if (settings.plansDirectory === null) {
+      issues.push("plansDirectory should not be null");
+    }
+    if (issues.length > 0) {
+      return {
+        name: "settings.json",
+        status: "error",
+        message: `Validation issues: ${issues.length} problem(s)`,
+        fix: "Run: npx ccjk doctor --fix-settings",
+        details: issues
+      };
+    }
+    return { name: "settings.json", status: "ok", message: "Valid configuration" };
+  } catch (error) {
+    return {
+      name: "settings.json",
+      status: "error",
+      message: "Invalid JSON",
+      fix: "Run: npx ccjk init"
+    };
   }
-  return {
-    name: "settings.json",
-    status: "warning",
-    message: "Not found",
-    fix: "Run: npx ccjk init"
-  };
 }
 async function checkWorkflows() {
   const commandsDir = join(CLAUDE_DIR, "commands");
@@ -589,8 +631,8 @@ async function checkMcp() {
   const settingsPath = SETTINGS_FILE;
   if (existsSync(settingsPath)) {
     try {
-      const { readFileSync } = await import('node:fs');
-      const settings = JSON.parse(readFileSync(settingsPath, "utf-8"));
+      const { readFileSync: readFileSync2 } = await import('node:fs');
+      const settings = JSON.parse(readFileSync2(settingsPath, "utf-8"));
       if (settings.mcpServers && Object.keys(settings.mcpServers).length > 0) {
         const count = Object.keys(settings.mcpServers).length;
         return { name: "MCP Services", status: "ok", message: `${count} services configured` };
@@ -755,8 +797,48 @@ async function checkPermissionRules() {
     };
   }
 }
+async function fixSettingsFile() {
+  const isZh = i18n.language === "zh-CN";
+  const { copyConfigFiles } = await import('./config2.mjs').then(function (n) { return n.j; });
+  console.log("");
+  console.log(ansis.bold.cyan("\u{1F527} Fixing settings.json"));
+  console.log(ansis.dim("\u2500".repeat(50)));
+  console.log("");
+  const backupPath = join(CLAUDE_DIR, "backup", `settings.backup.${Date.now()}.json`);
+  try {
+    if (existsSync(SETTINGS_FILE)) {
+      mkdirSync(join(CLAUDE_DIR, "backup"), { recursive: true });
+      copyFileSync(SETTINGS_FILE, backupPath);
+      console.log(ansis.green(`\u2714 ${isZh ? "\u5DF2\u5907\u4EFD\u65E7\u8BBE\u7F6E" : "Backed up settings"}: ${backupPath}`));
+    }
+  } catch (error) {
+    console.log(ansis.yellow(`\u26A0\uFE0F ${isZh ? "\u5907\u4EFD\u5931\u8D25\uFF0C\u7EE7\u7EED..." : "Backup failed, continuing..."}`));
+  }
+  console.log("");
+  console.log(ansis.dim(isZh ? "\u6B63\u5728\u5408\u5E76\u6A21\u677F\u8BBE\u7F6E..." : "Merging template settings..."));
+  copyConfigFiles(false);
+  const checkResult = await checkSettings();
+  console.log("");
+  if (checkResult.status === "ok") {
+    console.log(ansis.green(`\u2705 ${isZh ? "\u8BBE\u7F6E\u5DF2\u4FEE\u590D\uFF01" : "Settings fixed successfully!"}`));
+  } else {
+    console.log(ansis.yellow(`\u26A0\uFE0F ${isZh ? "\u4ECD\u6709\u4E00\u4E9B\u95EE\u9898" : "Some issues remain"}:`));
+    if (checkResult.details) {
+      for (const detail of checkResult.details) {
+        console.log(ansis.dim(`   \u2022 ${detail}`));
+      }
+    }
+  }
+  console.log("");
+  console.log(ansis.dim(isZh ? "\u63D0\u793A: \u8BF7\u91CD\u542F Claude Code \u4EE5\u5E94\u7528\u66F4\u6539" : "Tip: Restart Claude Code to apply changes"));
+  console.log("");
+}
 async function doctor(options = {}) {
   const isZh = i18n.language === "zh-CN";
+  if (options.fixSettings) {
+    await fixSettingsFile();
+    return;
+  }
   console.log("");
   console.log(ansis.bold.cyan("\u{1F50D} CCJK Health Check"));
   console.log(ansis.dim("\u2500".repeat(50)));

package/dist/chunks/package.mjs

@@ -1,4 +1,4 @@
-const version = "8.1.3";
+const version = "8.1.5";
 const homepage = "https://github.com/miounet11/ccjk";
 
 export { homepage, version };

package/dist/cli.mjs

@@ -65,14 +65,16 @@ const COMMANDS = [
     tier: "core",
     options: [
       { flags: "--check-providers", description: "Check API provider health" },
-      { flags: "--code-type, -T <type>", description: "Code tool type" }
+      { flags: "--code-type, -T <type>", description: "Code tool type" },
+      { flags: "--fix-settings", description: "Fix settings.json validation issues" }
     ],
     loader: async () => {
       const { doctor } = await import('./chunks/doctor.mjs');
       return async (options) => {
         await doctor({
           checkProviders: options.checkProviders,
-          codeType: options.codeType
+          codeType: options.codeType,
+          fixSettings: options.fixSettings
         });
       };
     }

package/dist/index.d.mts

@@ -1090,6 +1090,7 @@ declare function updateDefaultModel(model: 'opus' | 'sonnet' | 'sonnet[1m]' | 'd
 /**
  * Merge settings.json intelligently
  * Preserves user's environment variables and custom configurations
+ * BUT ensures schema-critical fields use template values for validation
  */
 declare function mergeSettingsFile(templatePath: string, targetPath: string): void;
 /**

package/dist/index.d.ts

@@ -1090,6 +1090,7 @@ declare function updateDefaultModel(model: 'opus' | 'sonnet' | 'sonnet[1m]' | 'd
 /**
  * Merge settings.json intelligently
  * Preserves user's environment variables and custom configurations
+ * BUT ensures schema-critical fields use template values for validation
  */
 declare function mergeSettingsFile(templatePath: string, targetPath: string): void;
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ccjk",
   "type": "module",
-  "version": "8.1.3",
+  "version": "8.1.5",
   "packageManager": "pnpm@10.17.1",
   "description": "Ultimate AI Development Tool - Code Tool Abstraction Layer with 83% Token Savings - Now with Cloud Sync, Hot-Reload Skills, Multi-Agent Orchestration, and Full Claude Code CLI 2.1+ Compatibility",
   "author": {
@@ -174,4 +174,4 @@
     "unbuild": "^3.6.1",
     "vitest": "^3.2.4"
   }
-}
+}