aico-cli 2.0.37 → 2.0.38

package/dist/chunks/simple-config.mjs

@@ -14,7 +14,7 @@ import { join, dirname, basename } from 'pathe';
 import { fileURLToPath } from 'node:url';
 import { EventEmitter } from 'node:events';
 
-const version = "2.0.37";
+const version = "2.0.38";
 
 function displayBanner(subtitle) {
   const defaultSubtitle = "\u4E00\u952E\u914D\u7F6E\u4F60\u7684\u5F00\u53D1\u73AF\u5883";
@@ -4703,7 +4703,7 @@ const DEFAULT_FILE_COPY_CONFIGS = [
     destination: join(CLAUDE_DIR, "personality.md"),
     type: "file",
     options: {
-      mergeStrategy: "merge",
+      mergeStrategy: "copy",
       backupBeforeCopy: true,
       deleteBeforeCopy: true
     }
@@ -4713,7 +4713,7 @@ const DEFAULT_FILE_COPY_CONFIGS = [
     destination: join(CLAUDE_DIR, "language.md"),
     type: "file",
     options: {
-      mergeStrategy: "merge",
+      mergeStrategy: "copy",
       backupBeforeCopy: true,
       deleteBeforeCopy: true
     }
@@ -4723,7 +4723,7 @@ const DEFAULT_FILE_COPY_CONFIGS = [
     destination: join(CLAUDE_DIR, "CLAUDE.md"),
     type: "file",
     options: {
-      mergeStrategy: "merge",
+      mergeStrategy: "copy",
       backupBeforeCopy: true,
       deleteBeforeCopy: true
     }
@@ -4733,7 +4733,7 @@ const DEFAULT_FILE_COPY_CONFIGS = [
     destination: join(CLAUDE_DIR, "settings.json"),
     type: "file",
     options: {
-      mergeStrategy: "merge",
+      mergeStrategy: "copy",
       backupBeforeCopy: true,
       deleteBeforeCopy: true
     }
@@ -4742,10 +4742,7 @@ const DEFAULT_FILE_COPY_CONFIGS = [
 function getFileCopyConfigsForTarget(target = "claude") {
   const targetDir = getTargetDir(target);
   const targetConfig = TARGET_CONFIGS[target];
-  const fileRenames = targetConfig.fileRenames || {};
-  const getDestFileName = (sourceFileName) => {
-    return fileRenames[sourceFileName] || sourceFileName;
-  };
+  const templateSubDir = target;
   return [
     {
       source: "templates/agents",
@@ -4792,7 +4789,7 @@ function getFileCopyConfigsForTarget(target = "claude") {
       destination: join(targetDir, "personality.md"),
       type: "file",
       options: {
-        mergeStrategy: "merge",
+        mergeStrategy: "copy",
         backupBeforeCopy: true,
         deleteBeforeCopy: true
       }
@@ -4802,27 +4799,29 @@ function getFileCopyConfigsForTarget(target = "claude") {
       destination: join(targetDir, "language.md"),
       type: "file",
       options: {
-        mergeStrategy: "merge",
+        mergeStrategy: "copy",
         backupBeforeCopy: true,
         deleteBeforeCopy: true
       }
     },
+    // 使用目标特定的主配置文件 (CLAUDE.md 或 CODEBUDDY.md)
     {
-      source: "templates/CLAUDE.md",
-      destination: join(targetDir, getDestFileName("CLAUDE.md")),
+      source: `templates/${templateSubDir}/${targetConfig.mainConfigFile}`,
+      destination: join(targetDir, targetConfig.mainConfigFile),
       type: "file",
       options: {
-        mergeStrategy: "merge",
+        mergeStrategy: "copy",
         backupBeforeCopy: true,
         deleteBeforeCopy: true
       }
     },
+    // 使用目标特定的 settings.json，直接替换而不是合并
     {
-      source: "templates/settings.json",
+      source: `templates/${templateSubDir}/settings.json`,
       destination: join(targetDir, "settings.json"),
       type: "file",
       options: {
-        mergeStrategy: "merge",
+        mergeStrategy: "copy",
         backupBeforeCopy: true,
         deleteBeforeCopy: true
       }
@@ -5004,6 +5003,12 @@ function mergeSettingsFile(templatePath, targetPath) {
         existingSettings.permissions?.allow
       );
     }
+    if (templateSettings.hooks) {
+      mergedSettings.hooks = templateSettings.hooks;
+    }
+    if (templateSettings.statusLine) {
+      mergedSettings.statusLine = templateSettings.statusLine;
+    }
     writeJsonConfig(targetPath, mergedSettings);
   } catch (error) {
     console.error("\u5408\u5E76\u8BBE\u7F6E\u5931\u8D25", error);
@@ -5099,7 +5104,7 @@ class ConfigInstaller extends AbstractInstaller {
       }
       this.copyConfigFilesWithOptions(options);
       const apiConfig = options.configData?.apiConfig;
-      if (apiConfig) {
+      if (apiConfig && target !== "codebuddy") {
         configureApi(apiConfig, target);
       }
       const targetName = TARGET_CONFIGS[target].dirName;
@@ -5113,29 +5118,19 @@ class ConfigInstaller extends AbstractInstaller {
   }
   /**
    * 使用可配置的文件复制机制
+   * 注意：目标特定的文件（如 settings.json, CODEBUDDY.md）已经在 getFileCopyConfigs 中配置
+   * 不再复制整个 templates 目录，避免覆盖目标特定文件
    */
   copyConfigFilesWithOptions(options) {
     const target = this.getTarget();
-    const targetDir = this.getTargetDirectory();
-    const customConfigs = [
-      ...this.getFileCopyConfigs(),
-      {
-        source: "templates",
-        destination: targetDir,
-        type: "directory",
-        options: {
-          filter: (path) => !path.includes("/backup"),
-          mergeStrategy: "copy"
-        }
-      }
-    ];
+    const configs = this.getFileCopyConfigs();
     if (options.onlyMdFiles) {
-      const filteredConfigs = customConfigs.filter(
+      const filteredConfigs = configs.filter(
         (config) => config.source.endsWith(".md") || config.type === "directory"
       );
       copyConfigFilesWithConfig(filteredConfigs, target);
     } else {
-      copyConfigFilesWithConfig(customConfigs, target);
+      copyConfigFilesWithConfig(configs, target);
     }
   }
   /**
@@ -6040,7 +6035,7 @@ class InstallationComposer {
       });
       this.installCodebuddyCodeSilently();
       this.updateGlobalConfig(true);
-      spinner.succeed("\u516C\u53F8\u914D\u7F6E\u5B89\u88C5\u5B8C\u6210 (claude + codebuddy)");
+      spinner.succeed("\u516C\u53F8\u914D\u7F6E\u5B89\u88C5\u5B8C\u6210");
     } catch (error) {
       spinner.fail("\u516C\u53F8\u914D\u7F6E\u5B89\u88C5\u5931\u8D25");
       throw error;
@@ -6088,7 +6083,7 @@ class InstallationComposer {
       });
       this.installCodebuddyCodeSilently();
       this.updateGlobalConfig(true);
-      spinner.succeed("\u4E2A\u4EBA\u914D\u7F6E\u5B89\u88C5\u5B8C\u6210 (claude + codebuddy)");
+      spinner.succeed("\u4E2A\u4EBA\u914D\u7F6E\u5B89\u88C5\u5B8C\u6210");
     } catch (error) {
       spinner.fail("\u4E2A\u4EBA\u914D\u7F6E\u5B89\u88C5\u5931\u8D25");
       throw error;
@@ -6136,7 +6131,9 @@ class InstallationComposer {
       () => new MCPInstaller(targetContext)
     );
     await targetExecutor.executeBatch(steps, options);
-    updateClaudeConfigEnv(envVars, target);
+    if (target !== "codebuddy") {
+      updateClaudeConfigEnv(envVars, target);
+    }
   }
   /**
    * 配置 CCR 用于个人设置

package/dist/index.d.mts

@@ -113,7 +113,7 @@ interface FileCopyConfig {
 declare const DEFAULT_FILE_COPY_CONFIGS: FileCopyConfig[];
 /**
  * 根据目标生成文件复制配置
- * 支持文件重命名（如 CLAUDE.md -> CODEBUDDY.md）
+ * 使用目标特定的模板目录 (templates/claude 或 templates/codebuddy)
  */
 declare function getFileCopyConfigsForTarget(target?: InstallationTarget): FileCopyConfig[];
 declare function copyConfigFilesWithConfig(configs?: FileCopyConfig[], target?: InstallationTarget): void;
@@ -123,6 +123,7 @@ declare function updateDefaultModel(model: 'opus' | 'sonnet'): void;
 /**
  * Merge settings.json intelligently
  * Preserves user's environment variables and custom configurations
+ * Always uses template's hooks and statusLine to ensure correct paths
  */
 declare function mergeSettingsFile(templatePath: string, targetPath: string): void;
 /**

package/dist/index.d.ts

@@ -113,7 +113,7 @@ interface FileCopyConfig {
 declare const DEFAULT_FILE_COPY_CONFIGS: FileCopyConfig[];
 /**
  * 根据目标生成文件复制配置
- * 支持文件重命名（如 CLAUDE.md -> CODEBUDDY.md）
+ * 使用目标特定的模板目录 (templates/claude 或 templates/codebuddy)
  */
 declare function getFileCopyConfigsForTarget(target?: InstallationTarget): FileCopyConfig[];
 declare function copyConfigFilesWithConfig(configs?: FileCopyConfig[], target?: InstallationTarget): void;
@@ -123,6 +123,7 @@ declare function updateDefaultModel(model: 'opus' | 'sonnet'): void;
 /**
  * Merge settings.json intelligently
  * Preserves user's environment variables and custom configurations
+ * Always uses template's hooks and statusLine to ensure correct paths
  */
 declare function mergeSettingsFile(templatePath: string, targetPath: string): void;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aico-cli",
-  "version": "2.0.37",
+  "version": "2.0.38",
   "packageManager": "pnpm@9.15.9",
   "description": "AI CLI",
   "repository": {

package/templates/claude/CLAUDE.md

@@ -0,0 +1,2 @@
+@language.md
+@personality.md

package/templates/claude/settings.json

@@ -0,0 +1,98 @@
+{
+  "$schema": "https://json.schemastore.org/claude-code-settings.json",
+  "env": {
+    "DISABLE_TELEMETRY": "1",
+    "DISABLE_ERROR_REPORTING": "1",
+    "CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC": "1",
+    "ANTHROPIC_BASE_URL": "http://127.0.0.1:3456",
+    "ANTHROPIC_AUTH_TOKEN": "sk-aico-x-ccr"
+  },
+  "includeCoAuthoredBy": false,
+  "permissions": {
+    "allow": [
+      "Bash",
+      "LS",
+      "Read",
+      "Agent",
+      "Write",
+      "Edit",
+      "MultiEdit",
+      "Glob",
+      "Grep",
+      "WebFetch",
+      "WebSearch",
+      "TodoWrite",
+      "NotebookRead",
+      "NotebookEdit",
+      "mcp__intention-coding",
+      "mcp__context7",
+      "mcp__open-websearch",
+      "mcp__chrome-devtools"
+    ],
+    "deny": []
+  },
+  "hooks": {
+    "PreToolUse": [
+      {
+        "matcher": "Edit|Write",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "npx tsx ~/.claude/hooks/scripts/PreToolUse/pre-tool-use.ts",
+            "timeout": 10
+          }
+        ]
+      }
+    ],
+    "PostToolUse": [
+      {
+        "matcher": "Edit|Write",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "npx tsx ~/.claude/hooks/scripts/PostToolUse/post-tool-use.ts",
+            "timeout": 10
+          }
+        ]
+      }
+    ],
+    "UserPromptSubmit": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "npx tsx ~/.claude/hooks/scripts/UserPromptSubmit/user-prompt-submit.ts",
+            "timeout": 10
+          }
+        ]
+      }
+    ],
+    "Notification": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "npx tsx ~/.claude/hooks/scripts/Notification/notification.ts",
+            "timeout": 10
+          }
+        ]
+      }
+    ],
+    "Stop": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "npx tsx ~/.claude/hooks/scripts/Stop/stop.ts",
+            "timeout": 10
+          }
+        ]
+      }
+    ]
+  },
+  "statusLine": {
+    "type": "command",
+    "command": "~/.claude/ccline/ccline",
+    "padding": 0
+  }
+}

package/templates/codebuddy/CODEBUDDY.md

@@ -0,0 +1,2 @@
+@language.md
+@personality.md

package/templates/codebuddy/settings.json

@@ -0,0 +1,128 @@
+{
+  "sandbox": {
+    "enabled": true,
+    "autoAllowBashIfSandboxed": true,
+    "network": {
+      "allowedDomains": [],
+      "deniedDomains": [],
+      "allowLocalBinding": false,
+      "allowUnixSockets": [],
+      "allowAllUnixSockets": false
+    },
+    "filesystem": {
+      "denyRead": [
+        "~/.ssh",
+        "~/.aws",
+        "~/.gcp"
+      ],
+      "allowWrite": [
+        ".",
+        "/dev/stdout",
+        "/dev/stderr",
+        "/dev/null",
+        "/dev/tty",
+        "/dev/dtracehelper",
+        "/dev/autofs_nowait",
+        "/tmp/codebuddy",
+        "/private/tmp/codebuddy",
+        "~/.npm/_logs",
+        "~/.codebuddy/debug",
+        "~/.codebuddy/statsig"
+      ],
+      "denyWrite": []
+    },
+    "excludedCommands": [],
+    "allowUnsandboxedCommands": true,
+    "enableWeakerNestedSandbox": false
+  },
+  "$schema": "https://json.schemastore.org/claude-code-settings.json",
+  "includeCoAuthoredBy": false,
+  "permissions": {
+    "allow": [
+      "Bash",
+      "LS",
+      "Read",
+      "Agent",
+      "Write",
+      "Edit",
+      "MultiEdit",
+      "Glob",
+      "Grep",
+      "WebFetch",
+      "WebSearch",
+      "TodoWrite",
+      "NotebookRead",
+      "NotebookEdit",
+      "mcp__intention-coding",
+      "mcp__context7",
+      "mcp__open-websearch",
+      "mcp__chrome-devtools"
+    ],
+    "deny": []
+  },
+  "hooks": {
+    "PreToolUse": [
+      {
+        "matcher": "Edit|Write",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "npx tsx ~/.codebuddy/hooks/scripts/PreToolUse/pre-tool-use.ts",
+            "timeout": 10
+          }
+        ]
+      }
+    ],
+    "PostToolUse": [
+      {
+        "matcher": "Edit|Write",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "npx tsx ~/.codebuddy/hooks/scripts/PostToolUse/post-tool-use.ts",
+            "timeout": 10
+          }
+        ]
+      }
+    ],
+    "UserPromptSubmit": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "npx tsx ~/.codebuddy/hooks/scripts/UserPromptSubmit/user-prompt-submit.ts",
+            "timeout": 10
+          }
+        ]
+      }
+    ],
+    "Notification": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "npx tsx ~/.codebuddy/hooks/scripts/Notification/notification.ts",
+            "timeout": 10
+          }
+        ]
+      }
+    ],
+    "Stop": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "npx tsx ~/.codebuddy/hooks/scripts/Stop/stop.ts",
+            "timeout": 10
+          }
+        ]
+      }
+    ]
+  },
+  "statusLine": {
+    "type": "command",
+    "command": "~/.codebuddy/ccline/ccline",
+    "padding": 0
+  },
+  "enterpriseEndpoint": "https://e.cnpc.com.cn/"
+}

package/templates/settings.json

@@ -38,19 +38,19 @@
         "hooks": [
           {
             "type": "command",
-            "command":  "node -e \"require('child_process').execSync('npx tsx ' + require('path').join(require('os').homedir(), '.claude/hooks/scripts/PreToolUse/pre-tool-use.ts'), {stdio: 'inherit'})\"",
+            "command": "npx tsx ~/.claude/hooks/scripts/PreToolUse/pre-tool-use.ts",
             "timeout": 10
           }
         ]
       }
     ],
-    "PostToolUse":[
+    "PostToolUse": [
       {
         "matcher": "Edit|Write",
         "hooks": [
           {
             "type": "command",
-            "command":  "node -e \"require('child_process').execSync('npx tsx ' + require('path').join(require('os').homedir(), '.claude/hooks/scripts/PostToolUse/post-tool-use.ts'), {stdio: 'inherit'})\"",
+            "command": "npx tsx ~/.claude/hooks/scripts/PostToolUse/post-tool-use.ts",
             "timeout": 10
           }
         ]
@@ -61,7 +61,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "node -e \"require('child_process').execSync('npx tsx ' + require('path').join(require('os').homedir(), '.claude/hooks/scripts/UserPromptSubmit/user-prompt-submit.ts'), {stdio: 'inherit'})\"",
+            "command": "npx tsx ~/.claude/hooks/scripts/UserPromptSubmit/user-prompt-submit.ts",
             "timeout": 10
           }
         ]
@@ -72,7 +72,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "node -e \"require('child_process').execSync('npx tsx ' + require('path').join(require('os').homedir(), '.claude/hooks/scripts/Notification/notification.ts'), {stdio: 'inherit'})\"",
+            "command": "npx tsx ~/.claude/hooks/scripts/Notification/notification.ts",
             "timeout": 10
           }
         ]
@@ -83,7 +83,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "node -e \"require('child_process').execSync('npx tsx ' + require('path').join(require('os').homedir(), '.claude/hooks/scripts/Stop/stop.ts'), {stdio: 'inherit'})\"",
+            "command": "npx tsx ~/.claude/hooks/scripts/Stop/stop.ts",
             "timeout": 10
           }
         ]
@@ -95,4 +95,4 @@
     "command": "~/.claude/ccline/ccline",
     "padding": 0
   }
-}
+}