@cannbot-ai/install-helper 1.1.13 → 1.1.14

package/dist/index.js

@@ -64,64 +64,20 @@ var init_embedded_plugins = __esm({
           "direct",
           "kernel"
         ],
-        skills: 21,
-        agents: 4,
-        description: "Ascend C \u76F4\u8C03\u5168\u6D41\u7A0B\uFF1A\u73AF\u5883\u2192\u8BBE\u8BA1\u2192\u5F00\u53D1\u2192\u5BA1\u67E5\u2192\u6027\u80FD\u9A8C\u6536",
-        version: "1.2.5",
+        skills: 0,
+        agents: 6,
+        description: "skill \u9A71\u52A8\u591A\u89D2\u8272\u76F4\u8C03\u7B97\u5B50\u5F00\u53D1\u5DE5\u4F5C\u6D41\uFF1APM \u8C03\u5EA6 architect/developer/qa \u56E2\u961F\uFF0C8 \u9636\u6BB5 7 CP \u5168\u6D41\u7A0B\uFF0C\u652F\u6301\u9759\u9ED8\u6A21\u5F0F\u4E0E\u7B97\u5B50\u4ED3\u7EE7\u627F\u5B9A\u5236",
+        version: "2.0.0",
         configFile: "AGENTS.md",
         configRootConfigLink: false,
-        installSkills: [
-          {
-            dir: "ops",
-            skills: [
-              "ascendc-tiling-design",
-              "npu-arch",
-              "ascendc-api-best-practices",
-              "ascendc-regbase-best-practice",
-              "ascendc-blaze-best-practice",
-              "ascendc-blaze-migration",
-              "ascendc-mc2-best-practice",
-              "ops-precision-standard",
-              "ascendc-docs-search",
-              "ascendc-env-check",
-              "ascendc-precision-debug",
-              "ops-profiling",
-              "ascendc-direct-invoke-template",
-              "torch-ascendc-op-extension",
-              "ascendc-runtime-debug",
-              "ascendc-crash-debug",
-              "ascendc-code-review"
-            ]
-          },
-          {
-            dir: "infra",
-            skills: [
-              "gitcode-toolkit",
-              "gitcode-pr-handler",
-              "gitcode-issue-gen",
-              "gitcode-issue-handler"
-            ]
-          }
-        ],
+        installSkills: [],
         installAgents: [
-          "ascendc-kernel-architect",
-          "ascendc-kernel-design-reviewer",
-          "ascendc-kernel-developer",
-          "ascendc-kernel-reviewer"
-        ],
-        externalRepos: [
-          {
-            url: "https://gitcode.com/cann/asc-devkit.git",
-            dir: "plugins-official/ops-direct-invoke/asc-devkit",
-            configRootLink: false
-          },
-          {
-            url: "https://gitcode.com/cann/ops-tensor.git",
-            dir: "plugins-official/ops-direct-invoke/ops-tensor",
-            depth: 1,
-            recursive: true,
-            configRootLink: false
-          }
+          "architect",
+          "developer",
+          "developer-code",
+          "developer-doc",
+          "developer-test",
+          "qa"
         ]
       },
       {
@@ -803,6 +759,8 @@ var init_zh_CN = __esm({
       install_skill_not_found: "Skill \u672A\u627E\u5230: {name} (\u5728 {dir})",
       install_skill_failed: "Skill \u5B89\u88C5\u5931\u8D25: {name}",
       install_agent_not_found: "Agent \u672A\u627E\u5230: {name}",
+      install_agent_codex_toml_missing: "\u63D2\u4EF6\u672A\u63D0\u4F9B Codex \u9002\u914D\u6587\u4EF6 {path}\uFF0C\u5DF2\u8DF3\u8FC7 agent: {name}",
+      error_tool_not_supported: "\u63D2\u4EF6 {plugin} \u7684\u5B89\u88C5\u811A\u672C\u6682\u4E0D\u652F\u6301\u5DE5\u5177 {tool}\uFF08\u4E3A\u907F\u514D\u8BEF\u88C5\u5230\u9ED8\u8BA4\u76EE\u5F55\u5DF2\u4E2D\u6B62\uFF09\uFF0C\u8BF7\u67E5\u770B\u8BE5\u63D2\u4EF6 quickstart.md \u786E\u8BA4\u652F\u6301\u7684\u5DE5\u5177\u5217\u8868",
       install_agent_failed: "Agent \u5B89\u88C5\u5931\u8D25: {name}",
       install_no_skill_selected: "\u672A\u9009\u62E9\u4EFB\u4F55 Skill",
       install_to: "\u5B89\u88C5\u5230",
@@ -1026,6 +984,8 @@ var init_en_US = __esm({
       install_skill_not_found: "Skill not found: {name} in {dir}",
       install_skill_failed: "Failed to install skill: {name}",
       install_agent_not_found: "Agent not found: {name}",
+      install_agent_codex_toml_missing: "Codex adapter file {path} not found in plugin, agent skipped: {name}",
+      error_tool_not_supported: "Plugin {plugin} does not support tool {tool} yet (aborted to avoid mis-installing into default directories); see the plugin quickstart.md for supported tools",
       install_agent_failed: "Failed to install agent: {name}",
       install_no_skill_selected: "No Skill selected",
       install_to: "Install to",
@@ -1196,6 +1156,8 @@ function getConfigRoot(tool, level, base) {
       }
       case "cursor":
         return join3(home, ".cursor");
+      case "codex":
+        return join3(home, ".codex");
       case "copilot":
         return join3(home, ".copilot");
       case "codearts":
@@ -1225,6 +1187,8 @@ function getConfigRoot(tool, level, base) {
     }
     case "cursor":
       return join3(baseDir, ".cursor");
+    case "codex":
+      return join3(baseDir, ".codex");
     case "copilot":
       return join3(baseDir, ".github");
     case "codearts":
@@ -1238,12 +1202,18 @@ function getConfigRoot(tool, level, base) {
 function getConfigFileName(tool) {
   return tool === "claude" ? "CLAUDE.md" : "AGENTS.md";
 }
+function getSkillsRoot(tool, level, base) {
+  if (tool === "codex") {
+    if (level === "global") {
+      return join3(homedir(), ".agents", "skills");
+    }
+    return join3(base || process.cwd(), ".agents", "skills");
+  }
+  return join3(getConfigRoot(tool, level, base), "skills");
+}
 function getAgentsFileName(tool) {
   return getConfigFileName(tool);
 }
-function getSkillsDir(configRoot) {
-  return join3(configRoot, "skills");
-}
 function getAgentsDir(configRoot) {
   return join3(configRoot, "agents");
 }
@@ -1261,7 +1231,7 @@ var init_paths = __esm({
   "src/utils/paths.ts"() {
     "use strict";
     init_i18n();
-    VALID_TOOLS = ["opencode", "claude", "trae", "cursor", "copilot", "codearts"];
+    VALID_TOOLS = ["opencode", "claude", "trae", "cursor", "codex", "copilot", "codearts"];
     VALID_LEVELS = ["project", "global"];
   }
 });
@@ -1333,6 +1303,19 @@ async function detectCursor() {
   }
   return void 0;
 }
+async function detectCodex() {
+  const cmdPath = await getCommandPath("codex");
+  if (cmdPath) {
+    const version = await getCommandVersion("codex");
+    return { name: "codex", version, path: cmdPath };
+  }
+  const home = homedir2();
+  const configDir = join4(home, ".codex");
+  if (existsSync4(configDir)) {
+    return { name: "codex", path: configDir };
+  }
+  return void 0;
+}
 async function detectCopilot() {
   const path = await getCommandPath("gh");
   if (!path) return void 0;
@@ -1357,6 +1340,7 @@ async function detectTools() {
     detectClaude,
     detectTrae,
     detectCursor,
+    detectCodex,
     detectCopilot,
     detectCodeArts
   ];
@@ -1375,6 +1359,7 @@ function getToolDisplayName(tool) {
     claude: "Claude Code",
     trae: "Trae",
     cursor: "Cursor",
+    codex: "Codex",
     copilot: "GitHub Copilot",
     codearts: "CodeArts"
   };
@@ -1462,7 +1447,7 @@ function scanInstalled() {
   return installed;
 }
 function verifyPluginFilesExist(configRoot, manifest, tool, level) {
-  const skillsDir = join5(configRoot, "skills");
+  const skillsDir = getSkillsRoot(tool, level);
   const agentsDir = join5(configRoot, "agents");
   let hasAnyComponent = false;
   if (manifest.installed_skills && manifest.installed_skills.length > 0) {
@@ -2323,7 +2308,7 @@ var STATIC_SKILL_CATEGORIES = [
       { id: "ascendc-blaze-migration", description: "AscendC Matmul \u5BB6\u65CF\u7B49\u4EF7\u8FC1\u79FB\u5230 Blaze", source: "ops" },
       { id: "ascendc-simt-best-practices", description: "SIMT \u6700\u4F73\u5B9E\u8DF5\u4E0E API \u5BFC\u822A", source: "ops" },
       { id: "ascendc-simt-tiling-design", description: "SIMT \u7B97\u5B50\u5207\u5206\u8BBE\u8BA1", source: "ops" },
-      { id: "torch-ascendc-op-extension", description: "Ascend C \u5BF9\u63A5 PyTorch", source: "ops" },
+      { id: "torch-ascendc-op-extension", description: "\u7B97\u5B50\u5BF9\u63A5 PyTorch\uFF08kernel \u76F4\u8C03 / aclnn \u6CE8\u518C\u53CC\u8DEF\u7EBF\uFF09", source: "ops" },
       { id: "catlass-op-design", description: "Catlass \u7B97\u5B50\u8BBE\u8BA1", source: "ops" },
       { id: "catlass-op-develop", description: "Catlass \u7B97\u5B50\u5F00\u53D1", source: "ops" },
       { id: "catlass-op-perf-tune", description: "Catlass \u6027\u80FD\u8C03\u4F18", source: "ops" },
@@ -2772,7 +2757,7 @@ function createRepositoryManager(customPath) {
 init_registry();
 init_manifest();
 init_paths();
-import { existsSync as existsSync14 } from "fs";
+import { existsSync as existsSync14, readFileSync as readFileSync9 } from "fs";
 import { join as join13, basename as basename2 } from "path";
 import { execa as execa4, execaSync } from "execa";
 
@@ -2821,7 +2806,7 @@ function scanInstalledFiles(pluginId, displayName, tool, level, installPath, con
   const files = [];
   const directories = [];
   if (manifest) {
-    const skillsDir = join10(configRoot, "skills");
+    const skillsDir = getSkillsRoot(tool, level, installPath);
     if (existsSync11(skillsDir)) {
       directories.push(skillsDir);
       for (const skillName of manifest.installed_skills || []) {
@@ -2970,8 +2955,7 @@ function removeSkillsFromRecord(skillIds, tool, level, installPath) {
 function getInstalledSkills(tool, level, installPath, allowFsScan = true) {
   const record = readSkillRecord();
   const recordedSkills = record[tool]?.[level]?.[installPath]?.skills || [];
-  const configRoot = getConfigRoot(tool, level);
-  const skillsDir = join10(configRoot, "skills");
+  const skillsDir = getSkillsRoot(tool, level);
   const fromRecord = recordedSkills.filter((skillId) => {
     const skillPath = join10(skillsDir, skillId);
     return existsSync11(skillPath) || isSymlink(skillPath);
@@ -3002,8 +2986,7 @@ function getLastBatchSkills(tool, level, installPath) {
     return null;
   }
   const lastBatch = entry.batches[entry.batches.length - 1];
-  const configRoot = level === "project" ? getConfigRoot(tool, level, installPath) : getConfigRoot(tool, level);
-  const skillsDir = join10(configRoot, "skills");
+  const skillsDir = getSkillsRoot(tool, level, installPath);
   return lastBatch.skills.filter((skillId) => {
     const skillPath = join10(skillsDir, skillId);
     return existsSync11(skillPath) || isSymlink(skillPath);
@@ -3186,7 +3169,7 @@ init_paths();
 init_fs_helpers();
 init_logger();
 init_i18n();
-import { existsSync as existsSync13, mkdirSync as mkdirSync5, symlinkSync, realpathSync, readlinkSync, copyFileSync as copyFileSync2, cpSync, writeFileSync as writeFileSync2, rmSync as rmSync3 } from "fs";
+import { existsSync as existsSync13, mkdirSync as mkdirSync5, symlinkSync, realpathSync, readlinkSync, copyFileSync as copyFileSync2, cpSync, writeFileSync as writeFileSync2, rmSync as rmSync3, readFileSync as readFileSync8 } from "fs";
 import { join as join12, basename } from "path";
 import { execa as execa3 } from "execa";
 function installLink(source, target) {
@@ -3375,7 +3358,7 @@ async function installViaManifest(plugin, repoPath, tool, level, installPath) {
   const configRoot = getConfigRoot(tool, level, installPath);
   const pluginDir = join12(repoPath, plugin.dir);
   try {
-    const skillsDir = join12(configRoot, "skills");
+    const skillsDir = getSkillsRoot(tool, level, cwd);
     const agentsDir = join12(configRoot, "agents");
     mkdirSync5(skillsDir, { recursive: true });
     mkdirSync5(agentsDir, { recursive: true });
@@ -3405,6 +3388,28 @@ async function installViaManifest(plugin, repoPath, tool, level, installPath) {
       }
     }
     for (const agentName of plugin.installAgents || []) {
+      if (tool === "codex") {
+        const baseName = agentName.replace(/\.md$/, "");
+        const tomlSource = join12(pluginDir, "agents", "codex", `${baseName}.toml`);
+        if (!existsSync13(tomlSource)) {
+          logger.warn(t("install_agent_codex_toml_missing").replace("{name}", baseName).replace("{path}", tomlSource));
+          continue;
+        }
+        const canonicalMd = join12(pluginDir, "agents", `${baseName}.md`);
+        const canonicalPath = existsSync13(canonicalMd) ? realpathSync(canonicalMd) : canonicalMd;
+        const targetPath2 = join12(agentsDir, `${baseName}.toml`);
+        try {
+          const content = readFileSync8(tomlSource, "utf-8").split("__CANNBOT_AGENT_SOURCE__").join(canonicalPath);
+          if (existsSync13(targetPath2) || isSymlink(targetPath2)) {
+            removePath(targetPath2);
+          }
+          writeFileSync2(targetPath2, content, "utf-8");
+          installedAgents.push(`${baseName}.toml`);
+        } catch {
+          logger.warn(t("install_agent_failed").replace("{name}", `${baseName}.toml`));
+        }
+        continue;
+      }
       const agentFile = agentName.endsWith(".md") ? agentName : `${agentName}.md`;
       const agentPath = join12(pluginDir, "agents", agentFile);
       if (!existsSync13(agentPath)) {
@@ -3464,6 +3469,14 @@ function findShell() {
   }
   return null;
 }
+function scriptSupportsTool(scriptPath, tool) {
+  try {
+    const scriptContent = readFileSync9(scriptPath, "utf-8");
+    return new RegExp(`\\b${tool}\\b`).test(scriptContent);
+  } catch {
+    return true;
+  }
+}
 async function installPlugin(opts) {
   const plugin = getPluginById(opts.pluginId);
   if (!plugin) {
@@ -3587,6 +3600,16 @@ async function installPlugin(opts) {
       warnings: []
     };
   }
+  if (!scriptSupportsTool(scriptPath, opts.tool)) {
+    return {
+      success: false,
+      pluginId: opts.pluginId,
+      skillsCount: 0,
+      agentsCount: 0,
+      errors: [t("error_tool_not_supported").replace("{plugin}", plugin.displayName).replace("{tool}", opts.tool)],
+      warnings: []
+    };
+  }
   const args = [opts.level, opts.tool];
   if (opts.installPath) {
     args.push(opts.installPath);
@@ -3675,7 +3698,7 @@ init_constants();
 init_logger();
 init_i18n();
 import { existsSync as existsSync15, mkdirSync as mkdirSync6, symlinkSync as symlinkSync2, readdirSync as readdirSync6, rmSync as rmSync4, realpathSync as realpathSync2, readlinkSync as readlinkSync2, cpSync as cpSync2 } from "fs";
-import { join as join14, dirname as dirname5, isAbsolute } from "path";
+import { join as join14, dirname as dirname5, basename as basename3, isAbsolute } from "path";
 import { select as select3, checkbox, Separator as Separator2 } from "@inquirer/prompts";
 import chalk5 from "chalk";
 import Table from "cli-table3";
@@ -3683,7 +3706,7 @@ init_theme();
 import { confirm } from "@inquirer/prompts";
 async function installSkills(skillIds, tool, level, repoPath) {
   const configRoot = getConfigRoot(tool, level);
-  const skillsDir = join14(configRoot, "skills");
+  const skillsDir = getSkillsRoot(tool, level);
   const installPath = level === "project" ? process.cwd() : configRoot;
   if (!existsSync15(skillsDir)) {
     mkdirSync6(skillsDir, { recursive: true });
@@ -3749,7 +3772,7 @@ async function installSkills(skillIds, tool, level, repoPath) {
 }
 async function uninstallSkills(skillIds, tool, level) {
   const configRoot = getConfigRoot(tool, level);
-  const skillsDir = join14(configRoot, "skills");
+  const skillsDir = getSkillsRoot(tool, level);
   const installPath = level === "project" ? process.cwd() : configRoot;
   const results = [];
   const removedIds = [];
@@ -3778,6 +3801,16 @@ async function uninstallSkills(skillIds, tool, level) {
       if (entries.length === 0) {
         rmSync4(skillsDir, { recursive: true });
         logger.step(`  ${t("uninstall_clean_empty_dir")}: skills/`);
+        if (tool === "codex") {
+          const agentsRoot = dirname5(skillsDir);
+          try {
+            if (existsSync15(agentsRoot) && readdirSync6(agentsRoot).length === 0) {
+              rmSync4(agentsRoot, { recursive: true });
+              logger.step(`  ${t("uninstall_clean_empty_dir")}: ${basename3(agentsRoot)}/`);
+            }
+          } catch {
+          }
+        }
       }
     } catch {
     }
@@ -4287,13 +4320,13 @@ init_config();
 init_paths();
 init_theme();
 init_constants();
-import { existsSync as existsSync16, readFileSync as readFileSync8 } from "fs";
+import { existsSync as existsSync16, readFileSync as readFileSync10 } from "fs";
 import { join as join15 } from "path";
 async function initCommand() {
   const cwd = process.cwd();
   if (existsSync16(join15(cwd, "package.json")) && (() => {
     try {
-      const pkg = JSON.parse(readFileSync8(join15(cwd, "package.json"), "utf-8"));
+      const pkg = JSON.parse(readFileSync10(join15(cwd, "package.json"), "utf-8"));
       return pkg.name === "@cannbot-ai/install-helper";
     } catch {
       return false;
@@ -4502,11 +4535,10 @@ async function skillInstallFlow() {
             failCount++;
           }
         }
-        const configRoot = getConfigRoot(tool, level);
         logger.blank();
         logger.success(`${t("skill_install_done")}: ${chalk7.green(t("result_success_format").replace("{count}", String(successCount)))}, ${failCount > 0 ? chalk7.red(t("result_failed_format").replace("{count}", String(failCount))) : chalk7.dim(t("result_failed_format").replace("{count}", String(failCount)))}`);
         logger.blank();
-        logger.info(`${t("install_to")}: ${chalk7.cyan(join15(configRoot, "skills"))}`);
+        logger.info(`${t("install_to")}: ${chalk7.cyan(getSkillsRoot(tool, level))}`);
         logger.info(`${t("start_to_use").replace("{tool}", chalk7.green(tool))}`);
         logger.blank();
         return "done";
@@ -4590,8 +4622,8 @@ async function doctorCommand(options = {}) {
     const configRoot = getConfigRoot(primaryTool, "project");
     configRootsToCheck.push({ configRoot, tool: primaryTool, level: "project" });
   }
-  for (const { configRoot } of configRootsToCheck) {
-    const skillsDir = getSkillsDir(configRoot);
+  for (const { configRoot, tool, level } of configRootsToCheck) {
+    const skillsDir = getSkillsRoot(tool, level);
     const agentsDir = getAgentsDir(configRoot);
     if (existsSync17(skillsDir)) {
       const brokenLinks = checkBrokenLinks(skillsDir);
@@ -4742,7 +4774,6 @@ init_logger();
 init_i18n();
 init_config();
 init_paths();
-import { join as join17 } from "path";
 import { confirm as confirm2 } from "@inquirer/prompts";
 import chalk10 from "chalk";
 async function installCommand(names, options) {
@@ -4810,11 +4841,10 @@ async function installCommand(names, options) {
         failCount++;
       }
     }
-    const configRoot = getConfigRoot(tool2, level2);
     logger.blank();
     logger.success(`${t("skill_install_done")}: ${chalk10.green(t("result_success_format").replace("{count}", String(successCount)))}, ${failCount > 0 ? chalk10.red(t("result_failed_format").replace("{count}", String(failCount))) : chalk10.dim(t("result_failed_format").replace("{count}", String(failCount)))}`);
     logger.blank();
-    logger.info(`${t("install_to")}: ${chalk10.cyan(join17(configRoot, "skills"))}`);
+    logger.info(`${t("install_to")}: ${chalk10.cyan(getSkillsRoot(tool2, level2))}`);
     logger.info(`${t("start_to_use").replace("{tool}", chalk10.green(tool2))}`);
     logger.blank();
     return;
@@ -4891,11 +4921,10 @@ async function installCommand(names, options) {
               failCount++;
             }
           }
-          const configRoot = getConfigRoot(tool2, level2);
           logger.blank();
           logger.success(`${t("skill_install_done")}: ${chalk10.green(t("result_success_format").replace("{count}", String(successCount)))}, ${failCount > 0 ? chalk10.red(t("result_failed_format").replace("{count}", String(failCount))) : chalk10.dim(t("result_failed_format").replace("{count}", String(failCount)))}`);
           logger.blank();
-          logger.info(`${t("install_to")}: ${chalk10.cyan(join17(configRoot, "skills"))}`);
+          logger.info(`${t("install_to")}: ${chalk10.cyan(getSkillsRoot(tool2, level2))}`);
           logger.info(`${t("start_to_use").replace("{tool}", chalk10.green(tool2))}`);
           logger.blank();
           return;
@@ -5037,7 +5066,7 @@ async function installCommand(names, options) {
     logger.blank();
     logger.success(`${t("skill_install_done")}: ${chalk10.green(t("result_success_format").replace("{count}", String(successCount)))}, ${failCount > 0 ? chalk10.red(t("result_failed_format").replace("{count}", String(failCount))) : chalk10.dim(t("result_failed_format").replace("{count}", String(failCount)))}`);
     logger.blank();
-    logger.info(`${t("install_to")}: ${chalk10.cyan(join17(getConfigRoot(tool, level), "skills"))}`);
+    logger.info(`${t("install_to")}: ${chalk10.cyan(getSkillsRoot(tool, level))}`);
     logger.info(`${t("start_to_use").replace("{tool}", chalk10.green(tool))}`);
     logger.blank();
   }
@@ -5073,8 +5102,8 @@ async function installPlugins(pluginIds, tool, level, repoPath, installPath, yes
 
 // src/commands/uninstall.ts
 init_registry();
-import { existsSync as existsSync18, unlinkSync as unlinkSync6, rmdirSync, readdirSync as readdirSync8, readFileSync as readFileSync9 } from "fs";
-import { resolve, basename as basename3, sep as sep2, join as join18 } from "path";
+import { existsSync as existsSync18, unlinkSync as unlinkSync6, rmdirSync, readdirSync as readdirSync8, readFileSync as readFileSync11 } from "fs";
+import { resolve, basename as basename4, sep as sep2, join as join17 } from "path";
 import chalk11 from "chalk";
 import { select as select5, checkbox as checkbox2, Separator as Separator4, confirm as confirm3 } from "@inquirer/prompts";
 init_config();
@@ -5115,6 +5144,10 @@ async function uninstallCommand(names, options) {
       skills.push(skill.id);
       continue;
     }
+    if (readRecord(name)) {
+      plugins.push(name);
+      continue;
+    }
     logger.error(`${t("uninstall_not_found")}: ${name}`);
   }
   await uninstallPlugins(plugins, options.yes || false);
@@ -5197,7 +5230,7 @@ async function uninstallInteractive(defaultTool, defaultLevel, userSpecifiedTool
   const allInstalledPlugins = scanInstalled();
   const toolsWithPlugins = new Set(allInstalledPlugins.map((p) => `${p.tool}:${p.level}`));
   const toolsWithSkills = /* @__PURE__ */ new Set();
-  for (const toolName of ["opencode", "claude", "trae", "cursor", "copilot", "codearts"]) {
+  for (const toolName of VALID_TOOLS) {
     for (const lvl of ["project", "global"]) {
       const ip = lvl === "project" ? process.cwd() : getConfigRoot(toolName, lvl);
       const skills = getInstalledSkills(toolName, lvl, ip);
@@ -5353,18 +5386,33 @@ async function uninstallPlugins(pluginIds, batchMode) {
   }
 }
 async function uninstallPluginById(pluginId, batchMode) {
-  const plugin = findPlugin(pluginId);
+  let plugin = findPlugin(pluginId);
+  if (!plugin) {
+    const record2 = readRecord(pluginId);
+    if (record2) {
+      plugin = {
+        id: pluginId,
+        dir: "",
+        displayName: record2.displayName,
+        script: "init.sh",
+        aliases: [],
+        skills: 0,
+        agents: 0,
+        description: ""
+      };
+    }
+  }
   if (!plugin) return;
   let record = readRecord(plugin.id);
   if (!record) {
     for (const toolName of VALID_TOOLS) {
       for (const lvl of ["project", "global"]) {
         const configRoot2 = getConfigRoot(toolName, lvl);
-        const manifestPath = join18(configRoot2, `${pluginId}-manifest.json`);
+        const manifestPath = join17(configRoot2, `${pluginId}-manifest.json`);
         if (!existsSync18(manifestPath)) continue;
         let manifest = null;
         try {
-          manifest = JSON.parse(readFileSync9(manifestPath, "utf-8"));
+          manifest = JSON.parse(readFileSync11(manifestPath, "utf-8"));
         } catch {
           continue;
         }
@@ -5377,7 +5425,7 @@ async function uninstallPluginById(pluginId, batchMode) {
           installPath,
           configRoot2,
           manifest,
-          plugin.externalRepos?.map((r) => basename3(r.dir)),
+          plugin.externalRepos?.map((r) => basename4(r.dir)),
           plugin.configRootConfigLink
         );
         break;
@@ -5393,6 +5441,9 @@ async function uninstallPluginById(pluginId, batchMode) {
   logger.info(`${t("uninstall_in_progress")} ${plugin.displayName}...`);
   const configRoot = getConfigRoot(record.tool, record.level);
   const allowedBases = [resolve(configRoot), resolve(record.installPath)];
+  if (record.tool === "codex") {
+    allowedBases.push(resolve(getSkillsRoot(record.tool, record.level, record.installPath)));
+  }
   const isSafePath = (p) => {
     const resolved = resolve(p);
     return allowedBases.some((base) => resolved === base || resolved.startsWith(base + sep2));
@@ -5400,8 +5451,8 @@ async function uninstallPluginById(pluginId, batchMode) {
   let removedFiles = 0;
   let removedDirs = 0;
   const configFileName = record.tool === "claude" ? "CLAUDE.md" : "AGENTS.md";
-  const configRootConfigPath = join18(configRoot, configFileName);
-  const installPathConfigPath = join18(record.installPath, configFileName);
+  const configRootConfigPath = join17(configRoot, configFileName);
+  const installPathConfigPath = join17(record.installPath, configFileName);
   const extraFiles = [];
   if (record.level === "project" && configRootConfigPath !== installPathConfigPath && !record.files.includes(configRootConfigPath) && (existsSync18(configRootConfigPath) || isSymlink(configRootConfigPath))) {
     extraFiles.push(configRootConfigPath);
@@ -5412,7 +5463,7 @@ async function uninstallPluginById(pluginId, batchMode) {
     try {
       if (existsSync18(filePath) || isSymlink(filePath)) {
         unlinkSync6(filePath);
-        const name = basename3(filePath);
+        const name = basename4(filePath);
         logger.step(`  ${t("uninstall_remove_label")}: ${name}`);
         removedFiles++;
       }
@@ -5429,7 +5480,7 @@ async function uninstallPluginById(pluginId, batchMode) {
         const entries = readdirSync8(dirPath);
         if (entries.length === 0) {
           rmdirSync(dirPath);
-          const name = basename3(dirPath);
+          const name = basename4(dirPath);
           logger.step(`  ${t("uninstall_clean_empty_dir")}: ${name}/`);
           removedDirs++;
         }
@@ -5437,6 +5488,17 @@ async function uninstallPluginById(pluginId, batchMode) {
     } catch {
     }
   }
+  if (record.tool === "codex") {
+    try {
+      const agentsRoot = resolve(getSkillsRoot(record.tool, record.level, record.installPath), "..");
+      if (existsSync18(agentsRoot) && readdirSync8(agentsRoot).length === 0) {
+        rmdirSync(agentsRoot);
+        logger.step(`  ${t("uninstall_clean_empty_dir")}: ${basename4(agentsRoot)}/`);
+        removedDirs++;
+      }
+    } catch {
+    }
+  }
   deleteRecord(plugin.id);
   removeInstalledPlugin(plugin.id);
   const backups = findBackups(configRoot);
@@ -5588,7 +5650,7 @@ async function updateCommand(pluginNames, options) {
 init_registry();
 import chalk13 from "chalk";
 import { existsSync as existsSync19, readdirSync as readdirSync9 } from "fs";
-import { join as join19 } from "path";
+import { join as join18 } from "path";
 init_manifest();
 init_i18n();
 async function infoCommand(pluginName) {
@@ -5615,11 +5677,11 @@ async function infoCommand(pluginName) {
   try {
     const repoManager = createRepositoryManager();
     const repoPath = await repoManager.ensureRepo();
-    const quickstartPath = join19(repoPath, plugin.dir, "quickstart.md");
+    const quickstartPath = join18(repoPath, plugin.dir, "quickstart.md");
     if (existsSync19(quickstartPath)) {
       console.log(`  ${chalk13.dim(t("info_quickstart") + ":")} ${quickstartPath}`);
     }
-    const agentsDir = join19(repoPath, plugin.dir, "agents");
+    const agentsDir = join18(repoPath, plugin.dir, "agents");
     if (existsSync19(agentsDir)) {
       const agentFiles = readdirSync9(agentsDir).filter((f) => f.endsWith(".md"));
       if (agentFiles.length > 0) {
@@ -5676,9 +5738,9 @@ async function langCommand(action, value) {
 // src/cli.ts
 init_config();
 init_i18n();
-import { readFileSync as readFileSync10, existsSync as existsSync20 } from "fs";
+import { readFileSync as readFileSync12, existsSync as existsSync20 } from "fs";
 import { fileURLToPath as fileURLToPath4 } from "url";
-import { dirname as dirname6, join as join20 } from "path";
+import { dirname as dirname6, join as join19 } from "path";
 function readVersion() {
   try {
     if (typeof INSTALL_HELPER_VERSION !== "undefined" && INSTALL_HELPER_VERSION) {
@@ -5690,13 +5752,13 @@ function readVersion() {
     const __filename4 = fileURLToPath4(import.meta.url);
     const __dirname4 = dirname6(__filename4);
     const candidates = [
-      join20(__dirname4, "..", "package.json"),
-      join20(__dirname4, "package.json"),
-      join20(process.cwd(), "package.json")
+      join19(__dirname4, "..", "package.json"),
+      join19(__dirname4, "package.json"),
+      join19(process.cwd(), "package.json")
     ];
     for (const pkgPath of candidates) {
       if (existsSync20(pkgPath)) {
-        const pkg = JSON.parse(readFileSync10(pkgPath, "utf-8"));
+        const pkg = JSON.parse(readFileSync12(pkgPath, "utf-8"));
         if (pkg.version && (pkg.name === "@cannbot-ai/install-helper" || pkg.name?.startsWith("@cannbot-ai/install-helper-"))) {
           return pkg.version;
         }
@@ -5726,13 +5788,13 @@ function createCLI() {
   program2.command("status").description("Show installed plugins").action(async () => {
     await statusCommand();
   });
-  program2.command("install [names...]").description("Install plugins or skills (auto-detects type)").option("-t, --tool <tool>", "AI tool (opencode, claude, trae, cursor, copilot, codearts)").option("-l, --level <level>", "Install level (project, global)", "project").option("-y, --yes", "Skip confirmation prompts").option("-a, --all", "Install ALL available skills").option("--list", "List all available skills by category").action(async (names, options) => {
+  program2.command("install [names...]").description("Install plugins or skills (auto-detects type)").option("-t, --tool <tool>", "AI tool (opencode, claude, trae, cursor, codex, copilot, codearts)").option("-l, --level <level>", "Install level (project, global)", "project").option("-y, --yes", "Skip confirmation prompts").option("-a, --all", "Install ALL available skills").option("--list", "List all available skills by category").action(async (names, options) => {
     await installCommand(names, options);
   });
-  program2.command("uninstall [names...]").description("Uninstall plugins or skills (auto-detects type)").option("-t, --tool <tool>", "AI tool (opencode, claude, trae, cursor, copilot, codearts)").option("-l, --level <level>", "Install level (project, global)", "project").option("-y, --yes", "Skip confirmation prompts").option("-a, --all", "Uninstall ALL installed skills and plugins").option("--recent", "Uninstall the most recently installed skill batch").action(async (names, options) => {
+  program2.command("uninstall [names...]").description("Uninstall plugins or skills (auto-detects type)").option("-t, --tool <tool>", "AI tool (opencode, claude, trae, cursor, codex, copilot, codearts)").option("-l, --level <level>", "Install level (project, global)", "project").option("-y, --yes", "Skip confirmation prompts").option("-a, --all", "Uninstall ALL installed skills and plugins").option("--recent", "Uninstall the most recently installed skill batch").action(async (names, options) => {
     await uninstallCommand(names, options);
   });
-  program2.command("update [plugins...]").description("Update installed plugins (git pull + reinstall)").option("-t, --tool <tool>", "AI tool (opencode, claude, trae, cursor, copilot, codearts)").option("-l, --level <level>", "Install level (project, global)").option("-y, --yes", "Skip confirmation prompts").action(async (plugins, options) => {
+  program2.command("update [plugins...]").description("Update installed plugins (git pull + reinstall)").option("-t, --tool <tool>", "AI tool (opencode, claude, trae, cursor, codex, copilot, codearts)").option("-l, --level <level>", "Install level (project, global)").option("-y, --yes", "Skip confirmation prompts").action(async (plugins, options) => {
     await updateCommand(plugins, options);
   });
   program2.command("info <plugin>").description("Show plugin details").action(async (plugin) => {