@cannbot-ai/install-helper 1.2.1-beta.2 → 1.2.2-beta.0

package/dist/index.js

@@ -177,6 +177,15 @@ var init_zh_CN = __esm({
       backup_restore_success: "\u5DF2\u6062\u590D\u914D\u7F6E",
       backup_created: "\u5DF2\u521B\u5EFA\u5907\u4EFD",
       backup_failed: "\u5907\u4EFD\u521B\u5EFA\u5931\u8D25\uFF0C\u5B89\u88C5\u5DF2\u4E2D\u6B62\u4EE5\u4FDD\u62A4\u73B0\u6709\u914D\u7F6E",
+      unowned_file_detected: "\u68C0\u6D4B\u5230\u975E CANNBot \u5B89\u88C5\u7684\u914D\u7F6E\u6587\u4EF6",
+      unowned_file_path: "\u6587\u4EF6",
+      unowned_file_warning: "\u8BE5\u6587\u4EF6\u4E0D\u662F\u7531 CANNBot \u5B89\u88C5\u7684\u3002\u66FF\u6362\u5C06\u8986\u76D6\u5176\u73B0\u6709\u5185\u5BB9\uFF08\u4F1A\u5728\u6587\u4EF6\u65C1\u521B\u5EFA\u5907\u4EFD\uFF09\u3002",
+      unowned_file_keep: "\u4FDD\u7559\u6211\u7684\u6587\u4EF6\uFF08\u8DF3\u8FC7\u66FF\u6362\uFF09",
+      unowned_file_replace: "\u66FF\u6362\uFF08\u81EA\u52A8\u5907\u4EFD\uFF09",
+      unowned_preserved: "\u5DF2\u4FDD\u7559\u73B0\u6709\u6587\u4EF6\uFF08\u672A\u66FF\u6362\uFF09: {file}",
+      unowned_preserved_yes: "\u975E\u4EA4\u4E92\u6A21\u5F0F\uFF1A\u5DF2\u4FDD\u7559\u975E CANNBot \u5B89\u88C5\u7684\u73B0\u6709\u6587\u4EF6: {file}",
+      unowned_backup_label: "\u7528\u6237\u6587\u4EF6",
+      backup_restore_user_file: "\u6062\u590D\u7528\u6237\u6587\u4EF6",
       loading_skills_list: "\u6B63\u5728\u52A0\u8F7D Skills \u5217\u8868...",
       loading_skills_list_complete: "Skills \u5217\u8868\u52A0\u8F7D\u5B8C\u6210",
       loading_plugin_data: "\u6B63\u5728\u52A0\u8F7D\u63D2\u4EF6\u6570\u636E...",
@@ -191,6 +200,7 @@ var init_zh_CN = __esm({
       skill_record_corrupted: "Skill \u5B89\u88C5\u8BB0\u5F55\u5DF2\u635F\u574F",
       record_write_failed: "\u5B89\u88C5\u8BB0\u5F55\u5199\u5165\u5931\u8D25\uFF0C\u5378\u8F7D\u65F6\u53EF\u80FD\u65E0\u6CD5\u81EA\u52A8\u6E05\u7406",
       install_config_failed: "\u914D\u7F6E\u6587\u4EF6\u5B89\u88C5\u5931\u8D25: {error}",
+      install_config_preserved: "\u5DF2\u8DF3\u8FC7\u914D\u7F6E\u6587\u4EF6\uFF08\u4FDD\u7559\u73B0\u6709\u6587\u4EF6\uFF09: {file}",
       install_clone_failed: "git clone \u5931\u8D25: {url}\uFF0C\u8BF7\u624B\u52A8\u514B\u9686: git clone {url} {dir}",
       install_link_config_failed: "\u94FE\u63A5 {name} \u5230\u914D\u7F6E\u76EE\u5F55\u5931\u8D25",
       install_link_project_failed: "\u94FE\u63A5 {name} \u5230\u9879\u76EE\u76EE\u5F55\u5931\u8D25",
@@ -429,6 +439,15 @@ var init_en_US = __esm({
       backup_restore_success: "Configuration restored",
       backup_created: "Backup created",
       backup_failed: "Backup creation failed, installation aborted to protect existing config",
+      unowned_file_detected: "Configuration file not created by CANNBot detected",
+      unowned_file_path: "File",
+      unowned_file_warning: "This file was not installed by CANNBot. Replacing it overwrites its current content (a backup is created beside it).",
+      unowned_file_keep: "Keep my file (skip replacing it)",
+      unowned_file_replace: "Replace (auto backup)",
+      unowned_preserved: "Kept existing file (not replaced): {file}",
+      unowned_preserved_yes: "Non-interactive mode: kept existing file not created by CANNBot: {file}",
+      unowned_backup_label: "User file",
+      backup_restore_user_file: "Restore user file",
       loading_skills_list: "Loading Skills list...",
       loading_skills_list_complete: "Skills list loaded",
       loading_plugin_data: "Loading plugin data...",
@@ -443,6 +462,7 @@ var init_en_US = __esm({
       skill_record_corrupted: "Skill install record corrupted",
       record_write_failed: "Install record write failed, uninstall may not work properly",
       install_config_failed: "Failed to install config file: {error}",
+      install_config_preserved: "Skipped config file (kept existing file): {file}",
       install_clone_failed: "git clone failed: {url}, clone manually: git clone {url} {dir}",
       install_link_config_failed: "Failed to link {name} to config directory",
       install_link_project_failed: "Failed to link {name} to project directory",
@@ -1356,10 +1376,10 @@ var init_embedded_plugins = __esm({
         aliases: [
           "tilelang"
         ],
-        skills: 9,
-        agents: 3,
+        skills: 13,
+        agents: 6,
         description: "TileLang Python DSL + @tilelang.jit \u7B97\u5B50\u5F00\u53D1\uFF08\u652F\u6301 Developer/Expert \u53CC\u6A21\u5F0F\uFF09",
-        version: "1.1.0",
+        version: "1.2.0",
         configFile: "AGENTS.md",
         configRootConfigLink: false,
         installSkills: [
@@ -1374,14 +1394,21 @@ var init_embedded_plugins = __esm({
               "tilelang-perf-optimization",
               "tilelang-programming-model-guide",
               "tilelang-review",
-              "tilelang-submodule-pull"
+              "tilelang-submodule-pull",
+              "tilelang-performance-best-practices",
+              "ascendc-env-check",
+              "npu-arch",
+              "tilelang-op-profiling"
             ]
           }
         ],
         installAgents: [
           "tilelang-op-analyst",
           "tilelang-op-developer",
-          "tilelang-op-perf-tuner"
+          "tilelang-op-perf-tuner",
+          "tilelang-tuning",
+          "tilelang-perf-analysis-expert",
+          "tilelang-perf-impl-expert"
         ],
         externalRepos: [
           {
@@ -2913,7 +2940,7 @@ function createRepositoryManager(customPath) {
 
 // src/core/cannbot-delegate.ts
 import { existsSync as existsSync17, readFileSync as readFileSync12, writeFileSync as writeFileSync5, copyFileSync as copyFileSync3, unlinkSync as unlinkSync6, readdirSync as readdirSync8 } from "fs";
-import { join as join16, resolve as resolve3 } from "path";
+import { join as join16, resolve as resolve4 } from "path";
 import { execa as execa6 } from "execa";
 
 // src/core/cannbot-installer.ts
@@ -3247,7 +3274,7 @@ function deleteRecord(pluginId, where) {
     writeStore(pluginId, store);
   }
 }
-function scanInstalledFiles(pluginId, displayName, tool, level, installPath, configRoot, manifest, externalRepoNames, configRootConfigLink) {
+function scanInstalledFiles(pluginId, displayName, tool, level, installPath, configRoot, manifest, externalRepoNames, configRootConfigLink, preservedTargets) {
   const files = [];
   const directories = [];
   if (manifest) {
@@ -3289,12 +3316,12 @@ function scanInstalledFiles(pluginId, displayName, tool, level, installPath, con
   }
   const configFileName = tool === "claude" ? "CLAUDE.md" : "AGENTS.md";
   const configFilePath = level === "project" ? join11(installPath, configFileName) : join11(configRoot, configFileName);
-  if (existsSync12(configFilePath) || isSymlink(configFilePath)) {
+  if (!preservedTargets?.includes(configFilePath) && (existsSync12(configFilePath) || isSymlink(configFilePath))) {
     files.push(configFilePath);
   }
   if (level === "project" && configRootConfigLink !== false) {
     const configRootConfigPath = join11(configRoot, configFileName);
-    if (configRootConfigPath !== configFilePath && (existsSync12(configRootConfigPath) || isSymlink(configRootConfigPath))) {
+    if (configRootConfigPath !== configFilePath && !preservedTargets?.includes(configRootConfigPath) && (existsSync12(configRootConfigPath) || isSymlink(configRootConfigPath))) {
       files.push(configRootConfigPath);
     }
   }
@@ -3813,16 +3840,17 @@ function findOrphanedDelegatedRecords(target) {
 init_registry();
 init_manifest();
 init_paths();
-import { existsSync as existsSync16, readFileSync as readFileSync11 } from "fs";
-import { join as join15, basename as basename2, isAbsolute } from "path";
+import { existsSync as existsSync16, readFileSync as readFileSync11, realpathSync as realpathSync2 } from "fs";
+import { join as join15, basename as basename3, isAbsolute } from "path";
 import { execa as execa5, execaSync as execaSync2 } from "execa";
 
 // src/core/backup.ts
 init_manifest();
 import { existsSync as existsSync14, copyFileSync, readdirSync as readdirSync7, unlinkSync as unlinkSync5 } from "fs";
-import { join as join13 } from "path";
+import { join as join13, dirname as dirname7, basename, resolve as resolve3 } from "path";
 init_registry();
 init_paths();
+var UNOWNED_PLUGIN_ID = "unowned";
 function detectCurrentPlugin(configRoot, tool, installPath) {
   const manifests = readAllManifests(configRoot);
   if (manifests.length > 0) {
@@ -3860,18 +3888,18 @@ function detectCurrentPlugin(configRoot, tool, installPath) {
   }
   return null;
 }
-function createBackup(configRoot, tool, fromPluginId, fromPluginName) {
-  const agentsFile = join13(configRoot, getAgentsFileName(tool));
-  if (!existsSync14(agentsFile)) {
+function createBackup(targetPath, fromPluginId, fromPluginName) {
+  if (!existsSync14(targetPath)) {
     return null;
   }
   const timestamp = formatTimestamp(/* @__PURE__ */ new Date());
-  const backupFileName = `${getAgentsFileName(tool)}.cannbot-backup.${fromPluginId}.${timestamp}`;
-  const backupPath = join13(configRoot, backupFileName);
+  const backupFileName = `${basename(targetPath)}.cannbot-backup.${fromPluginId}.${timestamp}`;
+  const backupPath = join13(dirname7(targetPath), backupFileName);
   try {
-    copyFileSync(agentsFile, backupPath);
+    copyFileSync(targetPath, backupPath);
     return {
       filePath: backupPath,
+      originalPath: targetPath,
       pluginId: fromPluginId,
       pluginName: fromPluginName,
       backupTime: timestamp
@@ -3880,38 +3908,54 @@ function createBackup(configRoot, tool, fromPluginId, fromPluginName) {
     return null;
   }
 }
-function findBackups(configRoot) {
-  if (!existsSync14(configRoot)) {
-    return [];
+function findRecordOwner(targetPath) {
+  const resolved = resolve3(targetPath);
+  for (const record of readAllRecords()) {
+    if ((record.files || []).some((f) => resolve3(f) === resolved)) {
+      const plugin = findPlugin(record.pluginId);
+      return {
+        pluginId: record.pluginId,
+        pluginName: plugin?.displayName || record.displayName || record.pluginId
+      };
+    }
   }
-  const files = readdirSync7(configRoot);
+  return null;
+}
+function findBackups(configRoot) {
+  const dirs = Array.isArray(configRoot) ? configRoot : [configRoot];
   const backups = [];
-  for (const file of files) {
-    if (file.includes(".cannbot-backup.")) {
-      const parts = file.split(".cannbot-backup.");
-      if (parts.length === 2) {
-        const pluginIdAndTime = parts[1];
-        const lastDotIndex = pluginIdAndTime.lastIndexOf(".");
-        if (lastDotIndex > 0) {
-          const pluginId = pluginIdAndTime.substring(0, lastDotIndex);
-          const timestamp = pluginIdAndTime.substring(lastDotIndex + 1);
-          const plugin = findPlugin(pluginId);
-          backups.push({
-            filePath: join13(configRoot, file),
-            pluginId,
-            pluginName: plugin?.displayName || pluginId,
-            backupTime: timestamp
-          });
+  for (const dir of dirs) {
+    if (!existsSync14(dir)) {
+      continue;
+    }
+    const files = readdirSync7(dir);
+    for (const file of files) {
+      if (file.includes(".cannbot-backup.")) {
+        const parts = file.split(".cannbot-backup.");
+        if (parts.length === 2) {
+          const pluginIdAndTime = parts[1];
+          const lastDotIndex = pluginIdAndTime.lastIndexOf(".");
+          if (lastDotIndex > 0) {
+            const pluginId = pluginIdAndTime.substring(0, lastDotIndex);
+            const timestamp = pluginIdAndTime.substring(lastDotIndex + 1);
+            const plugin = findPlugin(pluginId);
+            backups.push({
+              filePath: join13(dir, file),
+              originalPath: join13(dir, parts[0]),
+              pluginId,
+              pluginName: plugin?.displayName || pluginId,
+              backupTime: timestamp
+            });
+          }
         }
       }
     }
   }
   return backups.sort((a, b) => b.backupTime.localeCompare(a.backupTime));
 }
-function restoreBackup(backupPath, configRoot, tool) {
+function restoreBackup(backupPath, targetPath) {
   try {
-    const agentsFile = join13(configRoot, getAgentsFileName(tool));
-    copyFileSync(backupPath, agentsFile);
+    copyFileSync(backupPath, targetPath);
     return true;
   } catch {
     return false;
@@ -3939,13 +3983,21 @@ function formatTimestamp(date) {
 }
 function readAllRecords() {
   const records = [];
-  const plugins = getAllPlugins();
-  for (const plugin of plugins) {
-    records.push(...readRecords(plugin.id));
+  const installsDir = join13(getCannbotConfigDir(), "installs");
+  if (!existsSync14(installsDir)) {
+    return records;
+  }
+  for (const file of readdirSync7(installsDir)) {
+    if (!file.endsWith(".json") || file === "skills.json") continue;
+    const pluginId = file.replace(/\.json$/, "");
+    records.push(...readRecords(pluginId));
   }
   return records;
 }
 
+// src/core/installer.ts
+init_fs_helpers();
+
 // src/ui/backup-prompts.ts
 init_i18n();
 import { select as select2 } from "@inquirer/prompts";
@@ -3969,12 +4021,31 @@ async function showOverwriteWarning(currentPluginName, newPluginName) {
   });
   return choice;
 }
+async function showUnownedFileWarning(filePath, newPluginName) {
+  console.log();
+  console.log(chalk4.yellow(`  \u26A0\uFE0F  ${t("unowned_file_detected")}`));
+  console.log();
+  console.log(`    ${t("unowned_file_path")}: ${chalk4.cyan(filePath)}`);
+  console.log(`    ${t("backup_installing")}: ${chalk4.cyan(newPluginName)}`);
+  console.log();
+  console.log(`    ${t("unowned_file_warning")}`);
+  console.log();
+  const choice = await select2({
+    message: t("backup_select_action"),
+    choices: [
+      { name: t("unowned_file_keep"), value: "keep" },
+      { name: t("unowned_file_replace"), value: "replace" },
+      { name: t("backup_cancel"), value: "cancel" }
+    ]
+  });
+  return choice;
+}
 async function showRestorePrompt(backups) {
   console.log();
   console.log(chalk4.cyan(`  ${t("backup_restore_prompt")}`));
   console.log();
   const choices = backups.map((b) => ({
-    name: `${t("backup_restore")} ${b.pluginName} (${b.backupTime})`,
+    name: b.pluginId === "unowned" ? `${t("backup_restore_user_file")} ${b.originalPath} (${b.backupTime})` : `${t("backup_restore")} ${b.pluginName} (${b.backupTime})`,
     value: b.filePath
   }));
   choices.push({ name: t("backup_only_uninstall"), value: "none" });
@@ -3991,7 +4062,7 @@ init_fs_helpers();
 init_logger();
 init_i18n();
 import { existsSync as existsSync15, mkdirSync as mkdirSync6, symlinkSync, realpathSync, readlinkSync, copyFileSync as copyFileSync2, cpSync, writeFileSync as writeFileSync4, rmSync as rmSync4, readFileSync as readFileSync10, constants as fsConstants } from "fs";
-import { join as join14, basename } from "path";
+import { join as join14, basename as basename2 } from "path";
 import { execa as execa4 } from "execa";
 var ISSUE_HANDLER_ID = "gitcode-issue-handler";
 var ISSUE_HANDLER_CONFIG_FILES = ["classify_config.yaml", "operator_owners.yaml"];
@@ -4058,7 +4129,25 @@ function installLink(source, target) {
     return "failed";
   }
 }
-function installConfigFile(pluginDir, configFile, tool, level, configRoot, installPath, configRootConfigLink) {
+function configFileTargets(pluginDir, configFile, tool, level, configRoot, installPath, configRootConfigLink) {
+  const sourcePath = join14(pluginDir, configFile);
+  if (!existsSync15(sourcePath)) return [];
+  const agentsFileName = getAgentsFileName(tool);
+  const targets = [];
+  if (level === "project") {
+    targets.push(join14(installPath, agentsFileName));
+    if (configRootConfigLink !== false) {
+      const configRootTarget = join14(configRoot, agentsFileName);
+      if (!targets.includes(configRootTarget)) {
+        targets.push(configRootTarget);
+      }
+    }
+  } else {
+    targets.push(join14(configRoot, agentsFileName));
+  }
+  return targets;
+}
+function installConfigFile(pluginDir, configFile, tool, level, configRoot, installPath, configRootConfigLink, preservedTargets) {
   const sourcePath = join14(pluginDir, configFile);
   if (!existsSync15(sourcePath)) return;
   const agentsFileName = getAgentsFileName(tool);
@@ -4069,26 +4158,34 @@ function installConfigFile(pluginDir, configFile, tool, level, configRoot, insta
   } else {
     primaryTarget = join14(configRoot, agentsFileName);
   }
-  try {
-    const resolvedSource = realpathSync(sourcePath);
-    if (existsSync15(primaryTarget) || isSymlink(primaryTarget)) {
-      removePath(primaryTarget);
-    }
+  if (preservedTargets?.includes(primaryTarget)) {
+    logger.info(t("install_config_preserved").replace("{file}", primaryTarget));
+  } else {
     try {
-      symlinkSync(resolvedSource, primaryTarget);
-    } catch (e) {
-      if (e.code === "EPERM") {
-        copyFileSync2(sourcePath, primaryTarget);
-      } else {
-        throw e;
+      const resolvedSource = realpathSync(sourcePath);
+      if (existsSync15(primaryTarget) || isSymlink(primaryTarget)) {
+        removePath(primaryTarget);
       }
+      try {
+        symlinkSync(resolvedSource, primaryTarget);
+      } catch (e) {
+        if (e.code === "EPERM") {
+          copyFileSync2(sourcePath, primaryTarget);
+        } else {
+          throw e;
+        }
+      }
+    } catch (e) {
+      logger.warn(t("install_config_failed").replace("{error}", e.message));
     }
-  } catch (e) {
-    logger.warn(t("install_config_failed").replace("{error}", e.message));
   }
   if (isProjectLevel && primaryTarget !== join14(configRoot, agentsFileName)) {
     if (configRootConfigLink === false) return;
     const configRootTarget = join14(configRoot, agentsFileName);
+    if (preservedTargets?.includes(configRootTarget)) {
+      logger.info(t("install_config_preserved").replace("{file}", configRootTarget));
+      return;
+    }
     if (existsSync15(configRootTarget) || isSymlink(configRootTarget)) {
       removePath(configRootTarget);
     }
@@ -4132,7 +4229,7 @@ async function installExternalRepos(repos, repoPath, configRoot, installPath, le
         continue;
       }
     }
-    const linkName = basename(repo.dir);
+    const linkName = basename2(repo.dir);
     const resolved = realpathSync(targetDir);
     const shouldConfigRootLink = repo.configRootLink !== false && (level === "global" || repo.configRootLink === true);
     if (shouldConfigRootLink) {
@@ -4207,7 +4304,7 @@ function writeCannbotManifest(configRoot, pluginId, version, level, tool, skills
   writeFileSync4(manifestPath, JSON.stringify(manifest, null, 2), "utf-8");
   return manifest;
 }
-async function installViaManifest(plugin, repoPath, tool, level, installPath) {
+async function installViaManifest(plugin, repoPath, tool, level, installPath, preservedTargets) {
   const cwd = installPath || process.cwd();
   const configRoot = getConfigRoot(tool, level, installPath);
   const pluginDir = join14(repoPath, plugin.dir);
@@ -4278,7 +4375,7 @@ async function installViaManifest(plugin, repoPath, tool, level, installPath) {
         logger.warn(t("install_agent_failed").replace("{name}", agentFile));
       }
     }
-    installConfigFile(pluginDir, plugin.configFile || "AGENTS.md", tool, level, configRoot, cwd, plugin.configRootConfigLink);
+    installConfigFile(pluginDir, plugin.configFile || "AGENTS.md", tool, level, configRoot, cwd, plugin.configRootConfigLink, preservedTargets);
     installWorkflows(pluginDir, configRoot);
     await installExternalRepos(plugin.externalRepos, repoPath, configRoot, cwd, level);
     const cannbotManifest = writeCannbotManifest(
@@ -4334,6 +4431,25 @@ function scriptSupportsTool(scriptPath, tool) {
     return true;
   }
 }
+function classifyConfigTarget(targetPath, pluginConfigSource, pluginId, pluginName, configRoot, tool, installPath) {
+  if (isSymlink(targetPath)) {
+    try {
+      if (realpathSync2(targetPath) === realpathSync2(pluginConfigSource)) {
+        return { kind: "same-plugin", pluginId, pluginName };
+      }
+    } catch {
+    }
+  }
+  const recordOwner = findRecordOwner(targetPath);
+  if (recordOwner) {
+    return recordOwner.pluginId === pluginId ? { kind: "same-plugin", pluginId, pluginName } : { kind: "other-plugin", ...recordOwner };
+  }
+  const currentPlugin = detectCurrentPlugin(configRoot, tool, installPath);
+  if (currentPlugin) {
+    return currentPlugin.pluginId === pluginId ? { kind: "same-plugin", pluginId, pluginName } : { kind: "other-plugin", ...currentPlugin };
+  }
+  return { kind: "unowned", pluginId: UNOWNED_PLUGIN_ID, pluginName: UNOWNED_PLUGIN_ID };
+}
 async function installPlugin(opts) {
   const plugin = opts.plugin ?? getPluginById(opts.pluginId);
   if (!plugin) {
@@ -4359,38 +4475,55 @@ async function installPlugin(opts) {
   const pluginDir = isAbsolute(plugin.dir) ? plugin.dir : join15(opts.repoPath, plugin.dir);
   const cwd = opts.installPath || process.cwd();
   const configRoot = getConfigRoot(opts.tool, opts.level, opts.installPath);
-  const agentsFile = join15(configRoot, getAgentsFileName(opts.tool));
-  let backupInfo = null;
-  if (existsSync16(agentsFile)) {
-    const currentPlugin = detectCurrentPlugin(configRoot, opts.tool, opts.installPath);
-    if (currentPlugin && currentPlugin.pluginId !== opts.pluginId) {
-      let choice = "overwrite";
-      if (!opts.yes) {
-        choice = await showOverwriteWarning(
-          currentPlugin.pluginName,
-          plugin.displayName
-        );
-      }
-      if (choice === "cancel") {
-        logger.info(t("backup_cancel"));
-        return {
-          success: false,
-          pluginId: opts.pluginId,
-          skillsCount: 0,
-          agentsCount: 0,
-          errors: [t("backup_cancel")],
-          warnings: []
-        };
-      }
+  const pluginConfigSource = join15(pluginDir, plugin.configFile || "AGENTS.md");
+  const existingTargets = configFileTargets(
+    pluginDir,
+    plugin.configFile || "AGENTS.md",
+    opts.tool,
+    opts.level,
+    configRoot,
+    cwd,
+    plugin.configRootConfigLink
+  ).filter((p) => existsSync16(p) || isSymlink(p));
+  const backups = [];
+  const preservedTargets = [];
+  const promptedPlugins = /* @__PURE__ */ new Set();
+  for (const target of existingTargets) {
+    const owner = classifyConfigTarget(
+      target,
+      pluginConfigSource,
+      opts.pluginId,
+      plugin.displayName,
+      configRoot,
+      opts.tool,
+      cwd
+    );
+    if (owner.kind === "same-plugin") {
+      const backup2 = createBackup(target, owner.pluginId, owner.pluginName);
+      if (backup2) backups.push(backup2);
+      continue;
     }
-    if (currentPlugin) {
-      backupInfo = createBackup(
-        configRoot,
-        opts.tool,
-        currentPlugin.pluginId,
-        currentPlugin.pluginName
-      );
-      if (!backupInfo) {
+    if (owner.kind === "other-plugin") {
+      if (!promptedPlugins.has(owner.pluginId)) {
+        promptedPlugins.add(owner.pluginId);
+        let choice2 = "overwrite";
+        if (!opts.yes) {
+          choice2 = await showOverwriteWarning(owner.pluginName, plugin.displayName);
+        }
+        if (choice2 === "cancel") {
+          logger.info(t("backup_cancel"));
+          return {
+            success: false,
+            pluginId: opts.pluginId,
+            skillsCount: 0,
+            agentsCount: 0,
+            errors: [t("backup_cancel")],
+            warnings: []
+          };
+        }
+      }
+      const backup2 = createBackup(target, owner.pluginId, owner.pluginName);
+      if (!backup2) {
         logger.error(t("backup_failed"));
         return {
           success: false,
@@ -4401,8 +4534,46 @@ async function installPlugin(opts) {
           warnings: []
         };
       }
-      logger.success(`${t("backup_created")}: ${backupInfo.filePath}`);
+      backups.push(backup2);
+      logger.success(`${t("backup_created")}: ${backup2.filePath}`);
+      continue;
+    }
+    if (opts.yes) {
+      preservedTargets.push(target);
+      logger.warn(t("unowned_preserved_yes").replace("{file}", target));
+      continue;
+    }
+    const choice = await showUnownedFileWarning(target, plugin.displayName);
+    if (choice === "cancel") {
+      logger.info(t("backup_cancel"));
+      return {
+        success: false,
+        pluginId: opts.pluginId,
+        skillsCount: 0,
+        agentsCount: 0,
+        errors: [t("backup_cancel")],
+        warnings: []
+      };
     }
+    if (choice === "keep") {
+      preservedTargets.push(target);
+      logger.info(t("unowned_preserved").replace("{file}", target));
+      continue;
+    }
+    const backup = createBackup(target, UNOWNED_PLUGIN_ID, t("unowned_backup_label"));
+    if (!backup) {
+      logger.error(t("backup_failed"));
+      return {
+        success: false,
+        pluginId: opts.pluginId,
+        skillsCount: 0,
+        agentsCount: 0,
+        errors: [t("backup_failed")],
+        warnings: []
+      };
+    }
+    backups.push(backup);
+    logger.success(`${t("backup_created")}: ${backup.filePath}`);
   }
   if (plugin.installSkills && plugin.installSkills.length > 0) {
     const result = await installViaManifest(
@@ -4410,7 +4581,8 @@ async function installPlugin(opts) {
       opts.repoPath,
       opts.tool,
       opts.level,
-      opts.installPath
+      opts.installPath,
+      preservedTargets
     );
     if (result.success) {
       try {
@@ -4422,16 +4594,21 @@ async function installPlugin(opts) {
           cwd,
           configRoot,
           result.manifest,
-          plugin.externalRepos?.map((r) => basename2(r.dir)),
-          plugin.configRootConfigLink
+          plugin.externalRepos?.map((r) => basename3(r.dir)),
+          plugin.configRootConfigLink,
+          preservedTargets
         );
-        if (backupInfo) {
-          record.backup = {
-            filePath: backupInfo.filePath,
-            fromPluginId: backupInfo.pluginId,
-            fromPluginName: backupInfo.pluginName,
-            backupTime: backupInfo.backupTime
-          };
+        if (backups.length > 0) {
+          record.backups = backups.map((b) => ({
+            filePath: b.filePath,
+            originalPath: b.originalPath,
+            fromPluginId: b.pluginId,
+            fromPluginName: b.pluginName,
+            backupTime: b.backupTime
+          }));
+        }
+        if (preservedTargets.length > 0) {
+          record.preservedTargets = [...preservedTargets];
         }
         writeRecord(record);
       } catch {
@@ -4519,16 +4696,21 @@ async function installPlugin(opts) {
         cwd,
         configRoot,
         manifest,
-        plugin.externalRepos?.map((r) => basename2(r.dir)),
-        plugin.configRootConfigLink
+        plugin.externalRepos?.map((r) => basename3(r.dir)),
+        plugin.configRootConfigLink,
+        preservedTargets
       );
-      if (backupInfo) {
-        record.backup = {
-          filePath: backupInfo.filePath,
-          fromPluginId: backupInfo.pluginId,
-          fromPluginName: backupInfo.pluginName,
-          backupTime: backupInfo.backupTime
-        };
+      if (backups.length > 0) {
+        record.backups = backups.map((b) => ({
+          filePath: b.filePath,
+          originalPath: b.originalPath,
+          fromPluginId: b.pluginId,
+          fromPluginName: b.pluginName,
+          backupTime: b.backupTime
+        }));
+      }
+      if (preservedTargets.length > 0) {
+        record.preservedTargets = [...preservedTargets];
       }
       writeRecord(record);
     } catch {
@@ -4650,7 +4832,7 @@ function installerSupportsBundledFlag() {
 }
 async function delegateInstall(options) {
   const { pluginId, tool, level } = options;
-  const target = resolve3(options.target || process.cwd());
+  const target = resolve4(options.target || process.cwd());
   const displayName = options.displayName || pluginId;
   const result = {
     success: false,
@@ -4776,8 +4958,8 @@ init_fs_helpers();
 init_constants();
 init_logger();
 init_i18n();
-import { existsSync as existsSync18, mkdirSync as mkdirSync7, symlinkSync as symlinkSync2, readdirSync as readdirSync9, rmSync as rmSync5, realpathSync as realpathSync2, readlinkSync as readlinkSync2, cpSync as cpSync2 } from "fs";
-import { join as join17, dirname as dirname7, basename as basename3, isAbsolute as isAbsolute2 } from "path";
+import { existsSync as existsSync18, mkdirSync as mkdirSync7, symlinkSync as symlinkSync2, readdirSync as readdirSync9, rmSync as rmSync5, realpathSync as realpathSync3, readlinkSync as readlinkSync2, cpSync as cpSync2 } from "fs";
+import { join as join17, dirname as dirname8, basename as basename4, isAbsolute as isAbsolute2 } from "path";
 import { select as select3, checkbox, Separator as Separator2 } from "@inquirer/prompts";
 import chalk5 from "chalk";
 import Table from "cli-table3";
@@ -4805,7 +4987,7 @@ async function installSkills(skillIds, tool, level, repoPath) {
       continue;
     }
     try {
-      const resolvedSource = realpathSync2(sourcePath);
+      const resolvedSource = realpathSync3(sourcePath);
       if (isSymlink(targetPath)) {
         try {
           const currentTarget = readlinkSync2(targetPath);
@@ -4884,11 +5066,11 @@ async function uninstallSkills(skillIds, tool, level) {
         rmSync5(skillsDir, { recursive: true });
         logger.step(`  ${t("uninstall_clean_empty_dir")}: skills/`);
         if (tool === "codex") {
-          const agentsRoot = dirname7(skillsDir);
+          const agentsRoot = dirname8(skillsDir);
           try {
             if (existsSync18(agentsRoot) && readdirSync9(agentsRoot).length === 0) {
               rmSync5(agentsRoot, { recursive: true });
-              logger.step(`  ${t("uninstall_clean_empty_dir")}: ${basename3(agentsRoot)}/`);
+              logger.step(`  ${t("uninstall_clean_empty_dir")}: ${basename4(agentsRoot)}/`);
             }
           } catch {
           }
@@ -5298,7 +5480,7 @@ function resolveSkillSourcePath(skill, repoPath) {
   if (skill.filePath) {
     const absPath = isAbsolute2(skill.filePath) ? skill.filePath : join17(repoPath, skill.filePath);
     if (existsSync18(absPath)) {
-      return dirname7(absPath);
+      return dirname8(absPath);
     }
   }
   return join17(repoPath, skill.source, skill.id);
@@ -6354,7 +6536,7 @@ async function installPlugins(pluginIds, tool, level, repoPath, installPath, yes
 // src/commands/uninstall.ts
 init_registry();
 import { existsSync as existsSync21, unlinkSync as unlinkSync8, rmdirSync as rmdirSync2, readdirSync as readdirSync11, readFileSync as readFileSync15 } from "fs";
-import { resolve as resolve4, basename as basename4, sep as sep3, join as join20 } from "path";
+import { resolve as resolve5, basename as basename5, sep as sep3, join as join20 } from "path";
 import chalk11 from "chalk";
 import { select as select5, checkbox as checkbox2, Separator as Separator4, confirm as confirm3 } from "@inquirer/prompts";
 init_config();
@@ -6740,7 +6922,7 @@ async function uninstallPluginById(pluginId, batchMode) {
           installPath,
           configRoot2,
           manifest,
-          plugin.externalRepos?.map((r) => basename4(r.dir)),
+          plugin.externalRepos?.map((r) => basename5(r.dir)),
           plugin.configRootConfigLink
         );
         break;
@@ -6755,14 +6937,15 @@ async function uninstallPluginById(pluginId, batchMode) {
   }
   logger.info(`${t("uninstall_in_progress")} ${plugin.displayName}...`);
   const configRoot = record.configRoot;
-  const allowedBases = [resolve4(configRoot), resolve4(record.installPath)];
+  const allowedBases = [resolve5(configRoot), resolve5(record.installPath)];
   if (record.tool === "codex") {
-    allowedBases.push(resolve4(getSkillsRoot(record.tool, record.level, record.installPath)));
+    allowedBases.push(resolve5(getSkillsRoot(record.tool, record.level, record.installPath)));
   }
   const isSafePath = (p) => {
-    const resolved = resolve4(p);
+    const resolved = resolve5(p);
     return allowedBases.some((base) => resolved === base || resolved.startsWith(base + sep3));
   };
+  const preservedPaths = new Set((record.preservedTargets || []).map((p) => resolve5(p)));
   let removedFiles = 0;
   let removedDirs = 0;
   const configFileName = record.tool === "claude" ? "CLAUDE.md" : "AGENTS.md";
@@ -6772,13 +6955,15 @@ async function uninstallPluginById(pluginId, batchMode) {
   if (record.level === "project" && configRootConfigPath !== installPathConfigPath && !record.files.includes(configRootConfigPath) && (existsSync21(configRootConfigPath) || isSymlink(configRootConfigPath))) {
     extraFiles.push(configRootConfigPath);
   }
-  const allFiles = [...record.files, ...extraFiles];
+  const allFiles = [...record.files, ...extraFiles].filter(
+    (filePath) => !preservedPaths.has(resolve5(filePath))
+  );
   for (const filePath of allFiles) {
     if (!isSafePath(filePath)) continue;
     try {
       if (existsSync21(filePath) || isSymlink(filePath)) {
         unlinkSync8(filePath);
-        const name = basename4(filePath);
+        const name = basename5(filePath);
         logger.step(`  ${t("uninstall_remove_label")}: ${name}`);
         removedFiles++;
       }
@@ -6788,14 +6973,14 @@ async function uninstallPluginById(pluginId, batchMode) {
   const sortedDirs = [...record.directories].filter(isSafePath).sort((a, b) => b.length - a.length);
   for (const dirPath of sortedDirs) {
     try {
-      if (resolve4(dirPath) === resolve4(configRoot)) {
+      if (resolve5(dirPath) === resolve5(configRoot)) {
         continue;
       }
       if (existsSync21(dirPath)) {
         const entries = readdirSync11(dirPath);
         if (entries.length === 0) {
           rmdirSync2(dirPath);
-          const name = basename4(dirPath);
+          const name = basename5(dirPath);
           logger.step(`  ${t("uninstall_clean_empty_dir")}: ${name}/`);
           removedDirs++;
         }
@@ -6805,10 +6990,10 @@ async function uninstallPluginById(pluginId, batchMode) {
   }
   if (record.tool === "codex") {
     try {
-      const agentsRoot = resolve4(getSkillsRoot(record.tool, record.level, record.installPath), "..");
+      const agentsRoot = resolve5(getSkillsRoot(record.tool, record.level, record.installPath), "..");
       if (existsSync21(agentsRoot) && readdirSync11(agentsRoot).length === 0) {
         rmdirSync2(agentsRoot);
-        logger.step(`  ${t("uninstall_clean_empty_dir")}: ${basename4(agentsRoot)}/`);
+        logger.step(`  ${t("uninstall_clean_empty_dir")}: ${basename5(agentsRoot)}/`);
         removedDirs++;
       }
     } catch {
@@ -6820,16 +7005,27 @@ async function uninstallPluginById(pluginId, batchMode) {
     installPath: record.installPath
   });
   removeInstalledPlugin(plugin.id);
-  const backups = findBackups(configRoot);
+  const backupDirs = resolve5(record.installPath) === resolve5(configRoot) ? [configRoot] : [configRoot, record.installPath];
+  const recordBackups = [
+    ...record.backups || [],
+    ...record.backup ? [{ ...record.backup, originalPath: join20(configRoot, configFileName) }] : []
+  ];
+  const backups = findBackups(backupDirs).map((b) => {
+    const recorded = recordBackups.find((rb) => resolve5(rb.filePath) === resolve5(b.filePath));
+    return recorded ? { ...b, originalPath: recorded.originalPath } : b;
+  });
   const otherBackups = backups.filter((b) => b.pluginId !== pluginId);
   if (!batchMode && otherBackups.length > 0) {
     const choice = await showRestorePrompt(otherBackups);
     if (choice !== "none") {
-      const restored = restoreBackup(choice, configRoot, record.tool);
-      if (restored) {
-        const backupInfo = otherBackups.find((b) => b.filePath === choice);
-        logger.success(`${t("backup_restore_success")}: ${backupInfo?.pluginName || ""}`);
-        deleteBackup(choice);
+      const backupInfo = otherBackups.find((b) => b.filePath === choice);
+      const restoreTarget = backupInfo?.originalPath || join20(configRoot, configFileName);
+      if (isSafePath(restoreTarget)) {
+        const restored = restoreBackup(choice, restoreTarget);
+        if (restored) {
+          logger.success(`${t("backup_restore_success")}: ${backupInfo?.pluginName || ""} -> ${restoreTarget}`);
+          deleteBackup(choice);
+        }
       }
     }
   } else if (batchMode && otherBackups.length > 0) {
@@ -7101,7 +7297,7 @@ init_config();
 init_i18n();
 import { readFileSync as readFileSync16, existsSync as existsSync23 } from "fs";
 import { fileURLToPath as fileURLToPath5 } from "url";
-import { dirname as dirname8, join as join22 } from "path";
+import { dirname as dirname9, join as join22 } from "path";
 function readVersion() {
   try {
     if (typeof INSTALL_HELPER_VERSION !== "undefined" && INSTALL_HELPER_VERSION) {
@@ -7111,7 +7307,7 @@ function readVersion() {
   }
   try {
     const __filename5 = fileURLToPath5(import.meta.url);
-    const __dirname5 = dirname8(__filename5);
+    const __dirname5 = dirname9(__filename5);
     const candidates = [
       join22(__dirname5, "..", "package.json"),
       join22(__dirname5, "package.json"),