fix(codebuddy): resolve installer path issues, unused vars, and uninstall safety

Author: Qingzhou-Joshua

.codebuddy/README.zh-CN.md

@@ -72,7 +72,7 @@ cd /path/to/your/project
 ├── ecc-install-state.json  # 安装状态跟踪
 ├── install.sh          # 旧版安装脚本
 ├── uninstall.sh        # 旧版卸载脚本
-└── README.md           # 此文件
+└── README.zh-CN.md     # 此文件
 ```
 
 ## Target Adapter 安装的优势

.codebuddy/install.js

@@ -192,7 +192,6 @@ function doInstall() {
   let agents = 0;
   let skills = 0;
   let rules = 0;
-  let other = 0;
 
   // Copy commands
   const commandsDir = path.join(repoRoot, 'commands');
@@ -268,27 +267,14 @@ function doInstall() {
     }
   }
 
-  // Copy README files
+  // Copy README files (skip install/uninstall scripts to avoid broken
+  // path references when the copied script runs from the target directory)
   const readmeFiles = ['README.md', 'README.zh-CN.md'];
   for (const readmeFile of readmeFiles) {
     const sourcePath = path.join(scriptDir, readmeFile);
     if (fs.existsSync(sourcePath)) {
       const targetPath = path.join(codebuddyFullPath, readmeFile);
-      if (copyManagedFile(sourcePath, targetPath, manifest, readmeFile)) {
-        other += 1;
-      }
-    }
-  }
-
-  // Copy install and uninstall scripts
-  const scriptFiles = ['install.sh', 'uninstall.sh', 'install.js', 'uninstall.js'];
-  for (const scriptFile of scriptFiles) {
-    const sourcePath = path.join(scriptDir, scriptFile);
-    if (fs.existsSync(sourcePath)) {
-      const targetPath = path.join(codebuddyFullPath, scriptFile);
-      if (copyManagedFile(sourcePath, targetPath, manifest, scriptFile, true)) {
-        other += 1;
-      }
+      copyManagedFile(sourcePath, targetPath, manifest, readmeFile);
     }
   }
 

.codebuddy/install.sh

@@ -13,9 +13,29 @@ set -euo pipefail
 # When globs match nothing, expand to empty list instead of the literal pattern
 shopt -s nullglob
 
-# Resolve the directory where this script lives (the repo root)
+# Resolve the directory where this script lives
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-REPO_ROOT="$(dirname "$SCRIPT_DIR")"
+
+# Locate the ECC repo root by walking up from SCRIPT_DIR to find the marker
+# file (VERSION). This keeps the script working even when it has been copied
+# into a target project's .codebuddy/ directory.
+find_repo_root() {
+    local dir="$(dirname "$SCRIPT_DIR")"
+    # First try the parent of SCRIPT_DIR (original layout: .codebuddy/ lives in repo root)
+    if [ -f "$dir/VERSION" ] && [ -d "$dir/commands" ] && [ -d "$dir/agents" ]; then
+        echo "$dir"
+        return 0
+    fi
+    echo ""
+    return 1
+}
+
+REPO_ROOT="$(find_repo_root)"
+if [ -z "$REPO_ROOT" ]; then
+    echo "Error: Cannot locate the ECC repository root."
+    echo "This script must be run from within the ECC repository's .codebuddy/ directory."
+    exit 1
+fi
 
 # CodeBuddy directory name
 CODEBUDDY_DIR=".codebuddy"
@@ -111,7 +131,6 @@ do_install() {
     agents=0
     skills=0
     rules=0
-    other=0
 
     # Copy commands from repo root
     if [ -d "$REPO_ROOT/commands" ]; then
@@ -174,25 +193,13 @@ do_install() {
         done < <(find "$REPO_ROOT/rules" -type f | sort)
     fi
 
-    # Copy README files from this directory
+    # Copy README files (skip install/uninstall scripts to avoid broken
+    # path references when the copied script runs from the target directory)
     for readme_file in "$SCRIPT_DIR/README.md" "$SCRIPT_DIR/README.zh-CN.md"; do
         if [ -f "$readme_file" ]; then
             local_name=$(basename "$readme_file")
             target_path="$codebuddy_full_path/$local_name"
-            if copy_managed_file "$readme_file" "$target_path" "$MANIFEST" "$local_name"; then
-                other=$((other + 1))
-            fi
-        fi
-    done
-
-    # Copy install and uninstall scripts
-    for script_file in "$SCRIPT_DIR/install.sh" "$SCRIPT_DIR/uninstall.sh"; do
-        if [ -f "$script_file" ]; then
-            local_name=$(basename "$script_file")
-            target_path="$codebuddy_full_path/$local_name"
-            if copy_managed_file "$script_file" "$target_path" "$MANIFEST" "$local_name" 1; then
-                other=$((other + 1))
-            fi
+            copy_managed_file "$readme_file" "$target_path" "$MANIFEST" "$local_name" || true
         fi
     done
 

.codebuddy/uninstall.js

@@ -13,9 +13,6 @@ const path = require('path');
 const os = require('os');
 const readline = require('readline');
 
-// Platform detection
-const isWindows = process.platform === 'win32';
-
 /**
  * Get home directory cross-platform
  */
@@ -120,8 +117,6 @@ async function promptConfirm(question) {
  * Main uninstall function
  */
 async function doUninstall() {
-  // Resolve script directory
-  const scriptDir = path.dirname(path.resolve(__filename));
   const codebuddyDirName = '.codebuddy';
 
   // Parse arguments
@@ -211,27 +206,29 @@ async function doUninstall() {
     }
 
     const fullPath = path.join(codebuddyFullPath, filePath);
-    const resolvedFull = resolvePath(fullPath);
 
-    // Security check: ensure resolved path is within codebuddy directory
-    if (!resolvedFull.startsWith(codebuddyRootResolved)) {
-      console.log(`Skipped: ${filePath} (invalid manifest entry)`);
+    // Security check: use path.relative() to ensure the manifest entry
+    // resolves inside the codebuddy directory. This is stricter than
+    // startsWith and correctly handles edge-cases with symlinks.
+    const relative = path.relative(codebuddyRootResolved, path.resolve(fullPath));
+    if (relative.startsWith('..') || path.isAbsolute(relative)) {
+      console.log(`Skipped: ${filePath} (outside target directory)`);
       skipped += 1;
       continue;
     }
 
     try {
-      const stats = fs.statSync(resolvedFull);
+      const stats = fs.lstatSync(fullPath);
 
-      if (stats.isFile()) {
-        fs.unlinkSync(resolvedFull);
+      if (stats.isFile() || stats.isSymbolicLink()) {
+        fs.unlinkSync(fullPath);
         console.log(`Removed: ${filePath}`);
         removed += 1;
       } else if (stats.isDirectory()) {
         try {
-          const files = fs.readdirSync(resolvedFull);
+          const files = fs.readdirSync(fullPath);
           if (files.length === 0) {
-            fs.rmdirSync(resolvedFull);
+            fs.rmdirSync(fullPath);
             console.log(`Removed: ${filePath}/`);
             removed += 1;
           } else {

.codebuddy/uninstall.sh

@@ -115,27 +115,28 @@ do_uninstall() {
         fi
 
         full_path="$codebuddy_full_path/$file_path"
-        resolved_full="$(resolve_path "$full_path")"
 
-        case "$resolved_full" in
-            "$codebuddy_root_resolved"|"$codebuddy_root_resolved"/*)
-                ;;
-            *)
-                echo "Skipped: $file_path (invalid manifest entry)"
+        # Security check: ensure the path resolves inside the target directory.
+        # Use Python to compute a reliable relative path so symlinks cannot
+        # escape the boundary.
+        relative="$(python3 -c 'import os,sys; print(os.path.relpath(os.path.abspath(sys.argv[1]), sys.argv[2]))' "$full_path" "$codebuddy_root_resolved")"
+        case "$relative" in
+            ../*|..)
+                echo "Skipped: $file_path (outside target directory)"
                 skipped=$((skipped + 1))
                 continue
                 ;;
         esac
 
-        if [ -f "$resolved_full" ]; then
-            rm -f "$resolved_full"
+        if [ -L "$full_path" ] || [ -f "$full_path" ]; then
+            rm -f "$full_path"
             echo "Removed: $file_path"
             removed=$((removed + 1))
-        elif [ -d "$resolved_full" ]; then
+        elif [ -d "$full_path" ]; then
             # Only remove directory if it's empty
-            if [ -z "$(ls -A "$resolved_full" 2>/dev/null)" ]; then
-                rmdir "$resolved_full" 2>/dev/null || true
-                if [ ! -d "$resolved_full" ]; then
+            if [ -z "$(ls -A "$full_path" 2>/dev/null)" ]; then
+                rmdir "$full_path" 2>/dev/null || true
+                if [ ! -d "$full_path" ]; then
                     echo "Removed: $file_path/"
                     removed=$((removed + 1))
                 fi

tests/lib/install-targets.test.js

@@ -286,6 +286,50 @@ function runTests() {
     );
   })) passed++; else failed++;
 
+  if (test('every schema target enum value has a matching adapter (regression guard)', () => {
+    const schemaPath = path.join(__dirname, '..', '..', 'schemas', 'ecc-install-config.schema.json');
+    const schema = JSON.parse(require('fs').readFileSync(schemaPath, 'utf8'));
+    const schemaTargets = schema.properties.target.enum;
+    const adapters = listInstallTargetAdapters();
+    const adapterTargets = adapters.map(a => a.target);
+
+    for (const target of schemaTargets) {
+      assert.ok(
+        adapterTargets.includes(target),
+        `Schema target "${target}" has no matching adapter. ` +
+        `Available adapter targets: ${adapterTargets.join(', ')}`
+      );
+    }
+  })) passed++; else failed++;
+
+  if (test('every adapter target is listed in the schema enum (regression guard)', () => {
+    const schemaPath = path.join(__dirname, '..', '..', 'schemas', 'ecc-install-config.schema.json');
+    const schema = JSON.parse(require('fs').readFileSync(schemaPath, 'utf8'));
+    const schemaTargets = schema.properties.target.enum;
+    const adapters = listInstallTargetAdapters();
+
+    for (const adapter of adapters) {
+      assert.ok(
+        schemaTargets.includes(adapter.target),
+        `Adapter target "${adapter.target}" is not in schema enum. ` +
+        `Schema targets: ${schemaTargets.join(', ')}`
+      );
+    }
+  })) passed++; else failed++;
+
+  if (test('every adapter target is in SUPPORTED_INSTALL_TARGETS (regression guard)', () => {
+    const { SUPPORTED_INSTALL_TARGETS } = require('../../scripts/lib/install-manifests');
+    const adapters = listInstallTargetAdapters();
+
+    for (const adapter of adapters) {
+      assert.ok(
+        SUPPORTED_INSTALL_TARGETS.includes(adapter.target),
+        `Adapter target "${adapter.target}" is not in SUPPORTED_INSTALL_TARGETS. ` +
+        `Supported: ${SUPPORTED_INSTALL_TARGETS.join(', ')}`
+      );
+    }
+  })) passed++; else failed++;
+
   console.log(`\nResults: Passed: ${passed}, Failed: ${failed}`);
   process.exit(failed > 0 ? 1 : 0);
 }