devtronic 1.2.5 → 1.3.0

package/dist/index.js

@@ -4,6 +4,8 @@ import {
   BASE_AGENT_COUNT,
   BASE_SKILL_COUNT,
   DESIGN_SKILL_COUNT,
+  GITHUB_MARKETPLACE_NAME,
+  GITHUB_MARKETPLACE_REPO,
   MANIFEST_DIR,
   MARKETPLACE_NAME,
   PLUGIN_DIR,
@@ -24,7 +26,7 @@ import {
   readManifest,
   writeFile,
   writeManifest
-} from "./chunk-V4QEAL7Y.js";
+} from "./chunk-YBT2XOOQ.js";
 
 // src/index.ts
 import { Command } from "commander";
@@ -32,7 +34,7 @@ import * as p16 from "@clack/prompts";
 import chalk17 from "chalk";
 
 // src/commands/init.ts
-import { existsSync as existsSync5, chmodSync } from "fs";
+import { existsSync as existsSync5 } from "fs";
 import { resolve as resolve2, join as join7, dirname as dirname2 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import * as p3 from "@clack/prompts";
@@ -1127,8 +1129,22 @@ function writeClaudeSettings(targetDir, settings) {
   ensureDir(join6(targetDir, ".claude"));
   writeFile(settingsPath, JSON.stringify(settings, null, 2));
 }
+var LEGACY_PLUGIN_NAMES = ["dev-ai", "ai-agentic"];
+var LEGACY_MARKETPLACE_NAMES = ["dev-ai-local", "ai-agentic-local", "devtronic-local"];
 function registerPlugin(targetDir, pluginName, marketplaceName, marketplacePath) {
   const settings = readClaudeSettings(targetDir);
+  if (settings.extraKnownMarketplaces) {
+    for (const legacy of LEGACY_MARKETPLACE_NAMES) {
+      delete settings.extraKnownMarketplaces[legacy];
+    }
+  }
+  if (settings.enabledPlugins) {
+    for (const key of Object.keys(settings.enabledPlugins)) {
+      if (LEGACY_PLUGIN_NAMES.some((lp) => key.startsWith(`${lp}@`))) {
+        delete settings.enabledPlugins[key];
+      }
+    }
+  }
   if (!settings.extraKnownMarketplaces) {
     settings.extraKnownMarketplaces = {};
   }
@@ -1146,6 +1162,38 @@ function registerPlugin(targetDir, pluginName, marketplaceName, marketplacePath)
   }
   writeClaudeSettings(targetDir, settings);
 }
+function registerGitHubPlugin(targetDir, pluginName, marketplaceName, githubRepo) {
+  const settings = readClaudeSettings(targetDir);
+  if (settings.extraKnownMarketplaces) {
+    for (const legacy of LEGACY_MARKETPLACE_NAMES) {
+      delete settings.extraKnownMarketplaces[legacy];
+    }
+  }
+  if (settings.enabledPlugins) {
+    for (const key of Object.keys(settings.enabledPlugins)) {
+      if (LEGACY_PLUGIN_NAMES.some((lp) => key.startsWith(`${lp}@`))) {
+        delete settings.enabledPlugins[key];
+      }
+      if (key === `${pluginName}@devtronic-local`) {
+        delete settings.enabledPlugins[key];
+      }
+    }
+  }
+  if (!settings.extraKnownMarketplaces) {
+    settings.extraKnownMarketplaces = {};
+  }
+  settings.extraKnownMarketplaces[marketplaceName] = {
+    source: { source: "github", repo: githubRepo }
+  };
+  if (!settings.enabledPlugins) {
+    settings.enabledPlugins = {};
+  }
+  const pluginKey = `${pluginName}@${marketplaceName}`;
+  if (settings.enabledPlugins[pluginKey] === void 0) {
+    settings.enabledPlugins[pluginKey] = true;
+  }
+  writeClaudeSettings(targetDir, settings);
+}
 function unregisterPlugin(targetDir, pluginName, marketplaceName) {
   const settings = readClaudeSettings(targetDir);
   const pluginKey = `${pluginName}@${marketplaceName}`;
@@ -1440,27 +1488,17 @@ Valid addons: ${validAddons.join(", ")}`);
     const generatedFiles = [];
     const usePluginMode = selectedIDEs.includes("claude-code");
     if (usePluginMode) {
-      const pluginResult = generatePlugin(
+      registerGitHubPlugin(
         targetDir,
-        TEMPLATES_DIR,
-        getCliVersion(),
-        projectConfig,
-        analysis.packageManager
+        PLUGIN_NAME,
+        GITHUB_MARKETPLACE_NAME,
+        GITHUB_MARKETPLACE_REPO
       );
-      for (const script of ["checkpoint.sh", "stop-guard.sh"]) {
-        const scriptPath = join7(targetDir, pluginResult.pluginPath, "scripts", script);
-        if (existsSync5(scriptPath)) {
-          chmodSync(scriptPath, 493);
-        }
-      }
-      registerPlugin(targetDir, PLUGIN_NAME, MARKETPLACE_NAME, PLUGIN_DIR);
-      Object.assign(manifest.files, pluginResult.files);
-      manifest.installMode = "plugin";
-      manifest.pluginPath = pluginResult.pluginPath;
+      manifest.installMode = "marketplace";
       const addonSkillCount = (projectConfig.enabledAddons || []).reduce((sum, a) => sum + (ADDONS[a]?.skills.length ?? 0), 0);
       const baseTotal = BASE_SKILL_COUNT + DESIGN_SKILL_COUNT;
       const skillLabel = addonSkillCount > 0 ? `${baseTotal} + ${addonSkillCount} addon skills` : `${baseTotal} skills`;
-      generatedFiles.push(`Plugin ${PLUGIN_NAME} (${skillLabel}, ${BASE_AGENT_COUNT} agents, 5 hooks)`);
+      generatedFiles.push(`Plugin ${PLUGIN_NAME} (${skillLabel}, ${BASE_AGENT_COUNT} agents) via GitHub marketplace`);
     }
     for (const ide of selectedIDEs) {
       const templateName = IDE_TEMPLATE_MAP[ide];
@@ -1587,11 +1625,14 @@ Valid addons: ${validAddons.join(", ")}`);
     if (usePluginMode) {
       p3.note(
         [
-          `  Name:   ${chalk4.cyan(PLUGIN_NAME)} at ${PLUGIN_DIR}/${PLUGIN_NAME}/`,
-          `  Skills: /devtronic:brief, /devtronic:spec, /devtronic:research, ...`,
-          `  Hooks:  SessionStart, PostToolUse, Stop, SubagentStop, PreCompact`
+          `  Marketplace: ${chalk4.cyan(GITHUB_MARKETPLACE_REPO)}`,
+          `  Plugin:      ${chalk4.cyan(PLUGIN_NAME)}`,
+          `  Skills:      /devtronic:brief, /devtronic:spec, ... (auto-namespaced)`,
+          `  Hooks:       SessionStart, PostToolUse, Stop, SubagentStop, PreCompact`,
+          ``,
+          `  ${chalk4.dim("Restart Claude Code or run /reload-plugins to activate.")}`
         ].join("\n"),
-        "Plugin Installed"
+        "GitHub Marketplace Registered"
       );
     }
     p3.note(
@@ -1615,6 +1656,13 @@ Valid addons: ${validAddons.join(", ")}`);
       ].join("\n"),
       "Autonomous Mode"
     );
+    p3.note(
+      [
+        `${chalk4.dim("In Claude Code:")}  ${chalk4.cyan("/devtronic-help")} ${chalk4.dim("\u2014 discover skills, agents, and workflows")}`,
+        `${chalk4.dim("From terminal:")}   ${chalk4.cyan("npx devtronic list")} ${chalk4.dim("\u2014 list installed skills and agents")}`
+      ].join("\n"),
+      "Need Help?"
+    );
     p3.outro(chalk4.green("Setup complete!"));
   } catch (err) {
     spinner8.stop("Configuration failed");
@@ -1718,7 +1766,7 @@ function buildProjectConfigFromPreset(presetConfig, analysis) {
 
 // src/commands/update.ts
 import { resolve as resolve4, join as join11, dirname as dirname6 } from "path";
-import { existsSync as existsSync9, unlinkSync as unlinkSync2, lstatSync, readdirSync as readdirSync2, rmdirSync as rmdirSync2, chmodSync as chmodSync2 } from "fs";
+import { existsSync as existsSync9, unlinkSync as unlinkSync2, lstatSync as lstatSync2, readdirSync as readdirSync2, rmdirSync as rmdirSync2, rmSync as rmSync2, chmodSync } from "fs";
 import * as p4 from "@clack/prompts";
 import chalk5 from "chalk";
 
@@ -1861,6 +1909,7 @@ function registerAddonInConfig(targetDir, addonName) {
 // src/generators/addonFiles.ts
 import {
   existsSync as existsSync8,
+  lstatSync,
   readFileSync as readFileSync4,
   writeFileSync as writeFileSync2,
   mkdirSync as mkdirSync2,
@@ -1870,7 +1919,6 @@ import {
   rmdirSync
 } from "fs";
 import { join as join10, dirname as dirname5 } from "path";
-import { createHash } from "crypto";
 var AGENT_PATHS = {
   claude: ".claude",
   cursor: ".cursor",
@@ -1922,11 +1970,14 @@ var RUNTIME_SPECS = {
     })
   }
 };
-function checksum(content) {
-  return createHash("sha256").update(content).digest("hex").slice(0, 16);
-}
 function ensureDir2(dir) {
-  if (!existsSync8(dir)) mkdirSync2(dir, { recursive: true });
+  if (!existsSync8(dir)) {
+    try {
+      if (lstatSync(dir).isSymbolicLink()) unlinkSync(dir);
+    } catch {
+    }
+    mkdirSync2(dir, { recursive: true });
+  }
 }
 function readManifest2(addonSourceDir) {
   const manifestPath = join10(addonSourceDir, "manifest.json");
@@ -1980,7 +2031,7 @@ function generateAddonFiles(projectDir, addonSourceDir, agents) {
         ensureDir2(dirname5(destPath));
         writeFileSync2(destPath, content);
         result.written++;
-        result.checksums[relPath] = checksum(content);
+        result.checksums[relPath] = calculateChecksum(content);
       }
       continue;
     }
@@ -2002,7 +2053,7 @@ function generateAddonFiles(projectDir, addonSourceDir, agents) {
       ensureDir2(dirname5(destPath));
       writeFileSync2(destPath, content);
       result.written++;
-      result.checksums[relPath] = checksum(content);
+      result.checksums[relPath] = calculateChecksum(content);
     }
     for (const agentName of manifest.files.agents ?? []) {
       const agentFile = join10(addonSourceDir, "agents", `${agentName}.md`);
@@ -2013,7 +2064,7 @@ function generateAddonFiles(projectDir, addonSourceDir, agents) {
         ensureDir2(dirname5(destPath));
         writeFileSync2(destPath, content);
         result.written++;
-        result.checksums[`agents/${agentName}.md`] = checksum(content);
+        result.checksums[`agents/${agentName}.md`] = calculateChecksum(content);
       } else {
         result.skipped++;
       }
@@ -2028,7 +2079,7 @@ function generateAddonFiles(projectDir, addonSourceDir, agents) {
           ensureDir2(dirname5(destPath));
           writeFileSync2(destPath, content);
           result.written++;
-          result.checksums[`rules/${rule}`] = checksum(content);
+          result.checksums[`rules/${rule}`] = calculateChecksum(content);
         } else {
           result.skipped++;
         }
@@ -2044,7 +2095,7 @@ function generateAddonFiles(projectDir, addonSourceDir, agents) {
         ensureDir2(dirname5(destPath));
         writeFileSync2(destPath, content);
         result.written++;
-        result.checksums[relPath] = checksum(content);
+        result.checksums[relPath] = calculateChecksum(content);
       } else {
         result.skipped++;
       }
@@ -2156,7 +2207,7 @@ function syncAddonFiles(projectDir, addonSourceDir, agents) {
           continue;
         }
         const existing = readFileSync4(destPath, "utf-8");
-        const existingChecksum = checksum(existing);
+        const existingChecksum = calculateChecksum(existing);
         const originalChecksum = installedChecksums[relPath];
         if (existing === newContent) {
           result.skipped++;
@@ -2184,7 +2235,7 @@ function syncAddonFiles(projectDir, addonSourceDir, agents) {
         continue;
       }
       const existing = readFileSync4(destPath, "utf-8");
-      const existingChecksum = checksum(existing);
+      const existingChecksum = calculateChecksum(existing);
       const originalChecksum = installedChecksums[relPath];
       if (existing === newContent) {
         result.skipped++;
@@ -2210,7 +2261,7 @@ function syncAddonFiles(projectDir, addonSourceDir, agents) {
         continue;
       }
       const existing = readFileSync4(destPath, "utf-8");
-      const existingChecksum = checksum(existing);
+      const existingChecksum = calculateChecksum(existing);
       const originalChecksum = installedChecksums[relPath];
       if (existing === newContent) {
         result.skipped++;
@@ -2237,7 +2288,7 @@ function syncAddonFiles(projectDir, addonSourceDir, agents) {
           continue;
         }
         const existing = readFileSync4(destPath, "utf-8");
-        const existingChecksum = checksum(existing);
+        const existingChecksum = calculateChecksum(existing);
         const originalChecksum = installedChecksums[relPath];
         if (existing === newContent) {
           result.skipped++;
@@ -2264,7 +2315,7 @@ function syncAddonFiles(projectDir, addonSourceDir, agents) {
         continue;
       }
       const existing = readFileSync4(destPath, "utf-8");
-      const existingChecksum = checksum(existing);
+      const existingChecksum = calculateChecksum(existing);
       const originalChecksum = installedChecksums[relPath];
       if (existing === newContent) {
         result.skipped++;
@@ -2299,7 +2350,7 @@ function detectModifiedAddonFiles(projectDir, addonName) {
     for (const [relPath, originalHash] of Object.entries(installedChecksums)) {
       const absPath = join10(projectDir, baseDir, relPath);
       if (!existsSync8(absPath)) continue;
-      const current = checksum(readFileSync4(absPath, "utf-8"));
+      const current = calculateChecksum(readFileSync4(absPath, "utf-8"));
       if (current !== originalHash) {
         modified.push(relPath);
       }
@@ -2345,23 +2396,42 @@ async function updateCommand(options) {
   const shouldMigrate = manifest.selectedIDEs.includes("claude-code") && !manifest.installMode && hasStandaloneSkills(manifest);
   if (shouldMigrate) {
     p4.note(
-      "Claude Code skills/agents detected as standalone.\nThe new version uses plugin mode (namespace devtronic:).",
+      "Claude Code skills/agents detected as standalone.\nThe new version uses plugin mode. Skills are auto-namespaced in plugin mode.",
       "Migration Available"
     );
     if (!options.check) {
       const migrate = await p4.confirm({
-        message: "Migrate to plugin mode? (standalone \u2192 devtronic plugin)",
+        message: "Migrate to GitHub marketplace? (standalone \u2192 devtronic marketplace plugin)",
+        initialValue: true
+      });
+      if (!p4.isCancel(migrate) && migrate) {
+        await migrateStandaloneToMarketplace(targetDir, manifest, analysis, options.dryRun);
+        return;
+      }
+    }
+  }
+  const shouldMigrateToMarketplace = manifest.installMode === "plugin" && manifest.pluginPath;
+  if (shouldMigrateToMarketplace) {
+    p4.note(
+      "Claude Code plugin detected as local directory.\nThe new version uses a GitHub marketplace for reliable plugin distribution.\nThis fixes cache issues and enables proper skill namespacing.",
+      "Marketplace Migration Available"
+    );
+    if (!options.check) {
+      const migrate = await p4.confirm({
+        message: "Migrate to GitHub marketplace? (recommended)",
         initialValue: true
       });
       if (!p4.isCancel(migrate) && migrate) {
-        await migrateToPlugin(targetDir, manifest, analysis, options.dryRun);
+        await migrateToMarketplace(targetDir, manifest, options.dryRun);
         return;
       }
     }
   }
   if (options.check) {
-    if (installedVersion === currentVersion && stackChanges.length === 0 && !shouldMigrate) {
+    if (installedVersion === currentVersion && stackChanges.length === 0 && !shouldMigrate && !shouldMigrateToMarketplace) {
       p4.log.success("Already up to date!");
+    } else if (shouldMigrateToMarketplace) {
+      p4.log.info("Marketplace migration available: local plugin \u2192 GitHub marketplace");
     } else if (shouldMigrate) {
       p4.log.info("Plugin migration available: standalone \u2192 devtronic plugin");
     } else if (installedVersion !== currentVersion) {
@@ -2545,7 +2615,7 @@ async function updateCommand(options) {
   for (const ide of manifest.selectedIDEs) {
     const templateDir = join11(TEMPLATES_DIR, IDE_TEMPLATE_MAP[ide]);
     if (!existsSync9(templateDir)) continue;
-    const isPluginMode = ide === "claude-code" && manifest.installMode === "plugin";
+    const isPluginMode = ide === "claude-code" && (manifest.installMode === "plugin" || manifest.installMode === "marketplace");
     const files = getAllFilesRecursive(templateDir);
     for (const file of files) {
       if (modifiedFiles.includes(file)) {
@@ -2562,6 +2632,9 @@ async function updateCommand(options) {
       updatedManifest.files[file] = createManifestEntry(templateContent);
     }
   }
+  if (manifest.installMode === "marketplace") {
+    registerGitHubPlugin(targetDir, PLUGIN_NAME, GITHUB_MARKETPLACE_NAME, GITHUB_MARKETPLACE_REPO);
+  }
   if (manifest.installMode === "plugin" && manifest.pluginPath) {
     const userModifiedPluginFiles = /* @__PURE__ */ new Map();
     for (const [relPath, fileInfo] of Object.entries(updatedManifest.files)) {
@@ -2584,7 +2657,7 @@ async function updateCommand(options) {
     for (const script of ["checkpoint.sh", "stop-guard.sh"]) {
       const scriptPath = join11(targetDir, pluginResult.pluginPath, "scripts", script);
       if (existsSync9(scriptPath)) {
-        chmodSync2(scriptPath, 493);
+        chmodSync(scriptPath, 493);
       }
     }
     for (const [relPath, content] of userModifiedPluginFiles) {
@@ -2612,7 +2685,7 @@ async function updateCommand(options) {
   }
   const claudeMdPath = join11(targetDir, "CLAUDE.md");
   if (fileExists(claudeMdPath)) {
-    const stat = lstatSync(claudeMdPath);
+    const stat = lstatSync2(claudeMdPath);
     if (stat.isSymbolicLink()) {
       const content = readFile(claudeMdPath);
       unlinkSync2(claudeMdPath);
@@ -2765,7 +2838,7 @@ async function regenerateWithNewStack(targetDir, manifest, analysis, dryRun) {
   }
   const claudeMdPath = join11(targetDir, "CLAUDE.md");
   if (fileExists(claudeMdPath)) {
-    const stat = lstatSync(claudeMdPath);
+    const stat = lstatSync2(claudeMdPath);
     if (stat.isSymbolicLink()) {
       const content = readFile(claudeMdPath);
       unlinkSync2(claudeMdPath);
@@ -2788,6 +2861,10 @@ async function regenerateWithNewStack(targetDir, manifest, analysis, dryRun) {
       }
     }
   }
+  if (manifest.installMode === "marketplace") {
+    registerGitHubPlugin(targetDir, PLUGIN_NAME, GITHUB_MARKETPLACE_NAME, GITHUB_MARKETPLACE_REPO);
+    regeneratedFiles.push("GitHub marketplace registration");
+  }
   if (manifest.installMode === "plugin" && manifest.pluginPath) {
     const userModifiedPluginFiles = /* @__PURE__ */ new Map();
     for (const [relPath, fileInfo] of Object.entries(manifest.files)) {
@@ -2809,7 +2886,7 @@ async function regenerateWithNewStack(targetDir, manifest, analysis, dryRun) {
     for (const script of ["checkpoint.sh", "stop-guard.sh"]) {
       const scriptPath = join11(targetDir, pluginResult.pluginPath, "scripts", script);
       if (existsSync9(scriptPath)) {
-        chmodSync2(scriptPath, 493);
+        chmodSync(scriptPath, 493);
       }
     }
     for (const [relPath, content] of userModifiedPluginFiles) {
@@ -2839,29 +2916,15 @@ function hasStandaloneSkills(manifest) {
     (f) => f.startsWith(".claude/skills/") || f.startsWith(".claude/agents/")
   );
 }
-async function migrateToPlugin(targetDir, manifest, analysis, dryRun) {
+async function migrateStandaloneToMarketplace(targetDir, manifest, analysis, dryRun) {
   if (dryRun) {
     p4.log.info("Would migrate standalone skills/agents to devtronic plugin.");
     p4.outro("Dry run complete \u2014 no changes made");
     return;
   }
   const spinner8 = p4.spinner();
-  spinner8.start("Migrating to plugin mode...");
-  const config = manifest.projectConfig || buildDefaultConfig(analysis);
-  const pluginResult = generatePlugin(
-    targetDir,
-    TEMPLATES_DIR,
-    getCliVersion(),
-    config,
-    analysis.packageManager
-  );
-  for (const script of ["checkpoint.sh", "stop-guard.sh"]) {
-    const scriptPath = join11(targetDir, pluginResult.pluginPath, "scripts", script);
-    if (existsSync9(scriptPath)) {
-      chmodSync2(scriptPath, 493);
-    }
-  }
-  registerPlugin(targetDir, PLUGIN_NAME, MARKETPLACE_NAME, PLUGIN_DIR);
+  spinner8.start("Migrating to GitHub marketplace...");
+  registerGitHubPlugin(targetDir, PLUGIN_NAME, GITHUB_MARKETPLACE_NAME, GITHUB_MARKETPLACE_REPO);
   const removed = [];
   const preserved = [];
   for (const [path, fileInfo] of Object.entries(manifest.files)) {
@@ -2879,9 +2942,7 @@ async function migrateToPlugin(targetDir, manifest, analysis, dryRun) {
   }
   cleanEmptyDirs(join11(targetDir, ".claude", "skills"));
   cleanEmptyDirs(join11(targetDir, ".claude", "agents"));
-  Object.assign(manifest.files, pluginResult.files);
-  manifest.installMode = "plugin";
-  manifest.pluginPath = pluginResult.pluginPath;
+  manifest.installMode = "marketplace";
   manifest.version = getCliVersion();
   manifest.implantedAt = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
   writeManifest(targetDir, manifest);
@@ -2899,12 +2960,59 @@ async function migrateToPlugin(targetDir, manifest, analysis, dryRun) {
     );
   }
   p4.note(
-    `  Plugin: ${chalk5.cyan("devtronic")} at .claude-plugins/devtronic/
-  Skills: /devtronic:brief, /devtronic:spec, ...
-  Hooks: 5 workflow hooks enabled`,
-    "Plugin Generated"
+    `  Marketplace: ${chalk5.cyan(GITHUB_MARKETPLACE_REPO)}
+  Plugin: ${chalk5.cyan(PLUGIN_NAME)}
+  Skills: /devtronic:brief, /devtronic:spec, ... (auto-namespaced)
+
+  ${chalk5.dim("Restart Claude Code or run /reload-plugins to activate.")}`,
+    "GitHub Marketplace Registered"
+  );
+  p4.outro(chalk5.green("Migrated to GitHub marketplace!"));
+}
+async function migrateToMarketplace(targetDir, manifest, dryRun) {
+  if (dryRun) {
+    p4.log.info("Would migrate local plugin to GitHub marketplace.");
+    p4.outro("Dry run complete \u2014 no changes made");
+    return;
+  }
+  const spinner8 = p4.spinner();
+  spinner8.start("Migrating to GitHub marketplace...");
+  registerGitHubPlugin(targetDir, PLUGIN_NAME, GITHUB_MARKETPLACE_NAME, GITHUB_MARKETPLACE_REPO);
+  const pluginDir = join11(targetDir, PLUGIN_DIR, PLUGIN_NAME);
+  if (existsSync9(pluginDir)) {
+    rmSync2(pluginDir, { recursive: true, force: true });
+  }
+  const marketplaceDescDir = join11(targetDir, PLUGIN_DIR, ".claude-plugin");
+  if (existsSync9(marketplaceDescDir)) {
+    rmSync2(marketplaceDescDir, { recursive: true, force: true });
+  }
+  const pluginsDir = join11(targetDir, PLUGIN_DIR);
+  if (existsSync9(pluginsDir)) {
+    const remaining = readdirSync2(pluginsDir);
+    if (remaining.length === 0) {
+      rmSync2(pluginsDir, { recursive: true, force: true });
+    }
+  }
+  for (const key of Object.keys(manifest.files)) {
+    if (key.startsWith(PLUGIN_DIR + "/")) {
+      delete manifest.files[key];
+    }
+  }
+  manifest.installMode = "marketplace";
+  delete manifest.pluginPath;
+  manifest.version = getCliVersion();
+  manifest.implantedAt = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
+  writeManifest(targetDir, manifest);
+  spinner8.stop("Migration complete");
+  p4.note(
+    `  Marketplace: ${chalk5.cyan(GITHUB_MARKETPLACE_REPO)}
+  Plugin: ${chalk5.cyan(PLUGIN_NAME)}
+  Skills: /devtronic:brief, /devtronic:spec, ... (auto-namespaced)
+
+  ${chalk5.dim("Restart Claude Code or run /reload-plugins to activate.")}`,
+    "GitHub Marketplace Registered"
   );
-  p4.outro(chalk5.green("Migrated to plugin mode!"));
+  p4.outro(chalk5.green("Migrated to GitHub marketplace!"));
 }
 function buildDefaultConfig(analysis) {
   const pm = analysis.packageManager || "npm";
@@ -2931,7 +3039,7 @@ function cleanEmptyDirs(dirPath) {
   const entries = readdirSync2(dirPath);
   for (const entry of entries) {
     const fullPath = join11(dirPath, entry);
-    if (existsSync9(fullPath) && lstatSync(fullPath).isDirectory()) {
+    if (existsSync9(fullPath) && lstatSync2(fullPath).isDirectory()) {
       cleanEmptyDirs(fullPath);
     }
   }
@@ -3449,10 +3557,14 @@ Valid options:
     }
   }
   if (regeneratePlugin) {
-    if (!manifest.selectedIDEs.includes("claude-code") || manifest.installMode !== "plugin") {
+    if (manifest.installMode === "marketplace") {
+      p8.log.info("Plugin content is managed by the GitHub marketplace.");
+      p8.log.info("Skills, agents, and hooks update automatically when a new CLI version is released.");
+      p8.log.info(`Use ${chalk9.cyan("--rules")} or ${chalk9.cyan("--all")} (without --plugin) to regenerate local files.`);
+    } else if (!manifest.selectedIDEs.includes("claude-code") || manifest.installMode !== "plugin") {
       p8.log.warn("Plugin regeneration only applies to Claude Code in plugin mode. Skipping.");
     } else {
-      const { generatePlugin: generatePlugin2 } = await import("./plugin-SGSFVXPA.js");
+      const { generatePlugin: generatePlugin2 } = await import("./plugin-XSNKI5VI.js");
       const pluginResult = generatePlugin2(
         targetDir,
         TEMPLATES_DIR2,
@@ -3487,10 +3599,14 @@ Valid options:
 }
 
 // src/commands/info.ts
-import { resolve as resolve9, join as join16 } from "path";
+import { resolve as resolve9, join as join16, dirname as dirname9 } from "path";
 import { existsSync as existsSync13, readdirSync as readdirSync3 } from "fs";
+import { fileURLToPath as fileURLToPath5 } from "url";
 import * as p9 from "@clack/prompts";
 import chalk10 from "chalk";
+var __info_filename = fileURLToPath5(import.meta.url);
+var __info_dirname = dirname9(__info_filename);
+var INFO_TEMPLATES_DIR = existsSync13(resolve9(__info_dirname, "../templates")) ? resolve9(__info_dirname, "../templates") : resolve9(__info_dirname, "../../templates");
 async function infoCommand() {
   const targetDir = resolve9(".");
   p9.intro(introTitle("Info"));
@@ -3516,22 +3632,42 @@ async function infoCommand() {
         ).length;
       }
     }
-    if (skillCount === 0) {
-      const claudeSkills = join16(targetDir, ".claude", "skills");
-      if (existsSync13(claudeSkills)) {
-        skillCount = readdirSync3(claudeSkills, { withFileTypes: true }).filter(
-          (e) => e.isDirectory() || e.isFile() && e.name.endsWith(".md")
+    if (manifest.installMode === "marketplace" && skillCount === 0) {
+      const templateSkills = join16(INFO_TEMPLATES_DIR, "claude-code", ".claude", "skills");
+      if (existsSync13(templateSkills)) {
+        skillCount = readdirSync3(templateSkills, { withFileTypes: true }).filter(
+          (e) => e.isDirectory()
         ).length;
       }
-    }
-    if (agentCount === 0) {
-      const claudeAgents = join16(targetDir, ".claude", "agents");
-      if (existsSync13(claudeAgents)) {
-        agentCount = readdirSync3(claudeAgents, { withFileTypes: true }).filter(
+      const templateAgents = join16(INFO_TEMPLATES_DIR, "claude-code", ".claude", "agents");
+      if (existsSync13(templateAgents)) {
+        agentCount = readdirSync3(templateAgents, { withFileTypes: true }).filter(
           (e) => e.isFile() && e.name.endsWith(".md")
         ).length;
       }
     }
+    const claudeSkills = join16(targetDir, ".claude", "skills");
+    if (existsSync13(claudeSkills)) {
+      const localSkillCount = readdirSync3(claudeSkills, { withFileTypes: true }).filter(
+        (e) => e.isDirectory() || e.isFile() && e.name.endsWith(".md")
+      ).length;
+      if (skillCount === 0) {
+        skillCount = localSkillCount;
+      } else if (localSkillCount > 0) {
+        skillCount += localSkillCount;
+      }
+    }
+    const claudeAgents = join16(targetDir, ".claude", "agents");
+    if (existsSync13(claudeAgents)) {
+      const localAgentCount = readdirSync3(claudeAgents, { withFileTypes: true }).filter(
+        (e) => e.isFile() && e.name.endsWith(".md")
+      ).length;
+      if (agentCount === 0) {
+        agentCount = localAgentCount;
+      } else if (localAgentCount > 0) {
+        agentCount += localAgentCount;
+      }
+    }
   }
   const latest = await latestPromise;
   if (latest) {
@@ -3570,10 +3706,14 @@ async function infoCommand() {
 }
 
 // src/commands/list.ts
-import { resolve as resolve10, join as join17 } from "path";
+import { resolve as resolve10, join as join17, dirname as dirname10 } from "path";
 import { existsSync as existsSync14, readdirSync as readdirSync4, readFileSync as readFileSync5 } from "fs";
+import { fileURLToPath as fileURLToPath6 } from "url";
 import * as p10 from "@clack/prompts";
 import chalk11 from "chalk";
+var __list_filename = fileURLToPath6(import.meta.url);
+var __list_dirname = dirname10(__list_filename);
+var LIST_TEMPLATES_DIR = existsSync14(resolve10(__list_dirname, "../templates")) ? resolve10(__list_dirname, "../templates") : resolve10(__list_dirname, "../../templates");
 async function listCommand(filter, options) {
   const targetDir = resolve10(options.path || ".");
   p10.intro(introTitle("List"));
@@ -3603,6 +3743,20 @@ Valid options: skills, agents`);
       }
     }
   }
+  if (manifest?.installMode === "marketplace") {
+    if (showSkills && skills.length === 0) {
+      const templateSkills = join17(LIST_TEMPLATES_DIR, "claude-code", ".claude", "skills");
+      if (existsSync14(templateSkills)) {
+        skills.push(...discoverSkills(templateSkills));
+      }
+    }
+    if (showAgents && agents.length === 0) {
+      const templateAgents = join17(LIST_TEMPLATES_DIR, "claude-code", ".claude", "agents");
+      if (existsSync14(templateAgents)) {
+        agents.push(...discoverAgents(templateAgents));
+      }
+    }
+  }
   if (showSkills && skills.length === 0) {
     const claudeSkills = join17(targetDir, ".claude", "skills");
     if (existsSync14(claudeSkills)) {
@@ -3619,6 +3773,9 @@ Valid options: skills, agents`);
     if (skills.length > 0) {
       const skillLines = skills.sort((a, b) => a.name.localeCompare(b.name)).map((s) => `  ${symbols.bullet} ${chalk11.bold(s.name.padEnd(18))}${chalk11.dim(s.description)}`);
       p10.note(skillLines.join("\n"), `Skills (${skills.length})`);
+      if (manifest?.installMode === "marketplace") {
+        p10.log.info(chalk11.dim("Plugin skills loaded from GitHub marketplace"));
+      }
     } else {
       p10.log.info("No skills found.");
     }
@@ -3627,6 +3784,9 @@ Valid options: skills, agents`);
     if (agents.length > 0) {
       const agentLines = agents.sort((a, b) => a.name.localeCompare(b.name)).map((a) => `  ${symbols.bullet} ${chalk11.bold(a.name.padEnd(18))}${chalk11.dim(a.description)}`);
       p10.note(agentLines.join("\n"), `Agents (${agents.length})`);
+      if (manifest?.installMode === "marketplace") {
+        p10.log.info(chalk11.dim("Plugin skills loaded from GitHub marketplace"));
+      }
     } else {
       p10.log.info("No agents found.");
     }
@@ -3843,7 +4003,7 @@ async function configResetCommand(options) {
 
 // src/commands/doctor.ts
 import { resolve as resolve12, join as join18 } from "path";
-import { existsSync as existsSync15, readdirSync as readdirSync5, statSync, chmodSync as chmodSync3, mkdirSync as mkdirSync3 } from "fs";
+import { existsSync as existsSync15, readdirSync as readdirSync5, statSync, chmodSync as chmodSync2, mkdirSync as mkdirSync3 } from "fs";
 import { execSync } from "child_process";
 import * as p12 from "@clack/prompts";
 import chalk13 from "chalk";
@@ -3859,8 +4019,8 @@ async function doctorCommand(options) {
   checks.push(checkManifestValid(manifest));
   checks.push(checkManifestFiles(targetDir, manifest));
   checks.push(checkScriptPermissions(targetDir, manifest));
-  if (manifest.installMode === "plugin") {
-    checks.push(checkPluginRegistered(targetDir));
+  if (manifest.installMode === "plugin" || manifest.installMode === "marketplace") {
+    checks.push(checkPluginRegistered(targetDir, manifest.installMode));
   }
   checks.push(checkHookScripts(targetDir, manifest));
   checks.push(checkQualityScripts(targetDir));
@@ -4008,13 +4168,29 @@ function checkScriptPermissions(targetDir, manifest) {
     fixable: true,
     fix: () => {
       for (const file of nonExecutable) {
-        chmodSync3(file, 493);
+        chmodSync2(file, 493);
       }
     }
   };
 }
-function checkPluginRegistered(targetDir) {
+function checkPluginRegistered(targetDir, installMode) {
   const settings = readClaudeSettings(targetDir);
+  if (installMode === "marketplace") {
+    const pluginKey2 = `${PLUGIN_NAME}@${GITHUB_MARKETPLACE_NAME}`;
+    const isRegistered2 = settings.enabledPlugins?.[pluginKey2] === true;
+    if (isRegistered2) {
+      return { name: "plugin", status: "pass", message: "Marketplace plugin registered in .claude/settings.json" };
+    }
+    return {
+      name: "plugin",
+      status: "warn",
+      message: "Marketplace plugin not registered in .claude/settings.json",
+      fixable: true,
+      fix: () => {
+        registerGitHubPlugin(targetDir, PLUGIN_NAME, GITHUB_MARKETPLACE_NAME, GITHUB_MARKETPLACE_REPO);
+      }
+    };
+  }
   const pluginKey = `${PLUGIN_NAME}@${MARKETPLACE_NAME}`;
   const isRegistered = settings.enabledPlugins?.[pluginKey] === true;
   if (isRegistered) {
@@ -4169,8 +4345,8 @@ function checkEslint(targetDir) {
 }
 
 // src/commands/uninstall.ts
-import { existsSync as existsSync16, rmSync as rmSync2, readdirSync as readdirSync6 } from "fs";
-import { resolve as resolve13, join as join19, dirname as dirname9 } from "path";
+import { existsSync as existsSync16, rmSync as rmSync3, readdirSync as readdirSync6 } from "fs";
+import { resolve as resolve13, join as join19, dirname as dirname11 } from "path";
 import * as p13 from "@clack/prompts";
 import chalk14 from "chalk";
 var DEVTRONIC_FILES = ["CLAUDE.md", "AGENTS.md"];
@@ -4191,6 +4367,7 @@ async function uninstallCommand(options) {
   const existingFiles = managedFiles.filter((f) => fileExists(join19(targetDir, f)));
   const missingFiles = managedFiles.filter((f) => !fileExists(join19(targetDir, f)));
   const hasPlugin = manifest.installMode === "plugin" && existsSync16(join19(targetDir, PLUGIN_DIR, PLUGIN_NAME));
+  const hasMarketplace = manifest.installMode === "marketplace";
   const hasThoughts = existsSync16(join19(targetDir, "thoughts"));
   const hasClaudeMd = fileExists(join19(targetDir, "CLAUDE.md"));
   const hasAgentsMd = fileExists(join19(targetDir, "AGENTS.md"));
@@ -4198,6 +4375,9 @@ async function uninstallCommand(options) {
   p13.log.info(`IDEs: ${manifest.selectedIDEs.join(", ")}`);
   p13.log.info(`Mode: ${manifest.installMode || "standalone"}`);
   const removalLines = [];
+  if (hasMarketplace) {
+    removalLines.push(`  ${symbols.fail} GitHub marketplace registration (${chalk14.cyan(GITHUB_MARKETPLACE_NAME)})`);
+  }
   if (hasPlugin) {
     removalLines.push(`  ${symbols.fail} Plugin ${chalk14.cyan(PLUGIN_NAME)} (${PLUGIN_DIR}/${PLUGIN_NAME}/)`);
   }
@@ -4261,6 +4441,27 @@ async function uninstallCommand(options) {
   const removed = [];
   const kept = [];
   const errors = [];
+  if (hasMarketplace) {
+    try {
+      const settings = readClaudeSettings(targetDir);
+      if (settings.extraKnownMarketplaces?.[GITHUB_MARKETPLACE_NAME]) {
+        delete settings.extraKnownMarketplaces[GITHUB_MARKETPLACE_NAME];
+        if (Object.keys(settings.extraKnownMarketplaces).length === 0) {
+          delete settings.extraKnownMarketplaces;
+        }
+      }
+      if (settings.enabledPlugins) {
+        delete settings.enabledPlugins[`${PLUGIN_NAME}@${GITHUB_MARKETPLACE_NAME}`];
+        if (Object.keys(settings.enabledPlugins).length === 0) {
+          delete settings.enabledPlugins;
+        }
+      }
+      writeClaudeSettings(targetDir, settings);
+      removed.push("GitHub marketplace unregistered from .claude/settings.json");
+    } catch (err) {
+      errors.push(`Failed to unregister marketplace: ${err instanceof Error ? err.message : String(err)}`);
+    }
+  }
   if (hasPlugin) {
     try {
       unregisterPlugin(targetDir, PLUGIN_NAME, MARKETPLACE_NAME);
@@ -4279,18 +4480,18 @@ async function uninstallCommand(options) {
   }
   if (hasPlugin) {
     try {
-      rmSync2(join19(targetDir, PLUGIN_DIR, PLUGIN_NAME), { recursive: true, force: true });
+      rmSync3(join19(targetDir, PLUGIN_DIR, PLUGIN_NAME), { recursive: true, force: true });
       removed.push(`${PLUGIN_DIR}/${PLUGIN_NAME}/`);
       const marketplaceDescDir = join19(targetDir, PLUGIN_DIR, ".claude-plugin");
       if (existsSync16(marketplaceDescDir)) {
-        rmSync2(marketplaceDescDir, { recursive: true, force: true });
+        rmSync3(marketplaceDescDir, { recursive: true, force: true });
         removed.push(`${PLUGIN_DIR}/.claude-plugin/`);
       }
       const pluginsDir = join19(targetDir, PLUGIN_DIR);
       if (existsSync16(pluginsDir)) {
         const remaining = readdirSafe(pluginsDir);
         if (remaining.length === 0) {
-          rmSync2(pluginsDir, { recursive: true, force: true });
+          rmSync3(pluginsDir, { recursive: true, force: true });
           removed.push(`${PLUGIN_DIR}/ (empty)`);
         }
       }
@@ -4305,9 +4506,9 @@ async function uninstallCommand(options) {
     try {
       const filePath = join19(targetDir, file);
       if (existsSync16(filePath)) {
-        rmSync2(filePath, { force: true });
+        rmSync3(filePath, { force: true });
         removed.push(file);
-        cleanEmptyParents(targetDir, dirname9(file));
+        cleanEmptyParents(targetDir, dirname11(file));
       }
     } catch (err) {
       errors.push(`Failed to remove ${file}: ${err instanceof Error ? err.message : String(err)}`);
@@ -4316,7 +4517,7 @@ async function uninstallCommand(options) {
   if (hasClaudeMd) {
     if (removeClaudeMd) {
       try {
-        rmSync2(join19(targetDir, "CLAUDE.md"), { force: true });
+        rmSync3(join19(targetDir, "CLAUDE.md"), { force: true });
         removed.push("CLAUDE.md");
       } catch (err) {
         errors.push(`Failed to remove CLAUDE.md: ${err instanceof Error ? err.message : String(err)}`);
@@ -4328,7 +4529,7 @@ async function uninstallCommand(options) {
   if (hasAgentsMd) {
     if (removeAgentsMd) {
       try {
-        rmSync2(join19(targetDir, "AGENTS.md"), { force: true });
+        rmSync3(join19(targetDir, "AGENTS.md"), { force: true });
         removed.push("AGENTS.md");
       } catch (err) {
         errors.push(`Failed to remove AGENTS.md: ${err instanceof Error ? err.message : String(err)}`);
@@ -4340,7 +4541,7 @@ async function uninstallCommand(options) {
   if (hasThoughts) {
     if (removeThoughts) {
       try {
-        rmSync2(join19(targetDir, "thoughts"), { recursive: true, force: true });
+        rmSync3(join19(targetDir, "thoughts"), { recursive: true, force: true });
         removed.push("thoughts/");
       } catch (err) {
         errors.push(`Failed to remove thoughts/: ${err instanceof Error ? err.message : String(err)}`);
@@ -4352,7 +4553,7 @@ async function uninstallCommand(options) {
   try {
     const manifestDir = join19(targetDir, MANIFEST_DIR);
     if (existsSync16(manifestDir)) {
-      rmSync2(manifestDir, { recursive: true, force: true });
+      rmSync3(manifestDir, { recursive: true, force: true });
       removed.push(`${MANIFEST_DIR}/`);
     }
   } catch (err) {
@@ -4402,8 +4603,8 @@ function cleanEmptyParents(targetDir, relDir) {
   const entries = readdirSafe(absDir);
   if (entries.length === 0) {
     try {
-      rmSync2(absDir, { recursive: true, force: true });
-      cleanEmptyParents(targetDir, dirname9(relDir));
+      rmSync3(absDir, { recursive: true, force: true });
+      cleanEmptyParents(targetDir, dirname11(relDir));
     } catch {
     }
   }
@@ -4417,8 +4618,8 @@ function readdirSafe(dir) {
 }
 
 // src/commands/addon.ts
-import { resolve as resolve14, join as join20, dirname as dirname10 } from "path";
-import { existsSync as existsSync17, unlinkSync as unlinkSync3, rmSync as rmSync3 } from "fs";
+import { resolve as resolve14, join as join20, dirname as dirname12 } from "path";
+import { existsSync as existsSync17, unlinkSync as unlinkSync3, rmSync as rmSync4 } from "fs";
 import * as p14 from "@clack/prompts";
 import chalk15 from "chalk";
 function isFileBasedAddon(addonName) {
@@ -4457,8 +4658,8 @@ Valid addons: ${validAddons.join(", ")}`);
     p14.outro("");
     return;
   }
-  if (manifest.installMode !== "plugin" || !manifest.pluginPath) {
-    p14.log.warn("Addons require Claude Code in plugin mode.");
+  if (manifest.installMode !== "plugin" && manifest.installMode !== "marketplace") {
+    p14.log.warn("The orchestration addon requires Claude Code in plugin or marketplace mode.");
     p14.log.info("Run `npx devtronic init` with Claude Code selected.");
     p14.outro("");
     return;
@@ -4477,6 +4678,29 @@ async function addAddon(targetDir, manifest, addonName, currentAddons) {
     p14.outro("");
     return;
   }
+  if (manifest.installMode === "marketplace") {
+    const addon2 = ADDONS[addonName];
+    p14.note(
+      [
+        `  ${chalk15.dim("Name:")}        ${addon2.label}`,
+        `  ${chalk15.dim("Description:")} ${addon2.description}`,
+        `  ${chalk15.dim("Skills:")}      ${addon2.skills.map((s) => chalk15.cyan(`/${s}`)).join(", ")}`
+      ].join("\n"),
+      "Enabling addon"
+    );
+    if (!manifest.projectConfig) {
+      manifest.projectConfig = { architecture: "flat", layers: [], stateManagement: [], dataFetching: [], orm: [], testing: [], ui: [], validation: [], framework: "unknown", qualityCommand: "" };
+    }
+    manifest.projectConfig.enabledAddons = [...currentAddons, addonName];
+    writeManifest(targetDir, manifest);
+    p14.log.success(`${addon2.label} enabled`);
+    p14.note(
+      "Orchestration skills are included in the marketplace plugin.\nAlready available as /devtronic:briefing, /devtronic:recap, /devtronic:handoff.",
+      "Info"
+    );
+    p14.outro("");
+    return;
+  }
   const addon = ADDONS[addonName];
   const pluginRoot = manifest.pluginPath;
   const skillsSourceDir = join20(TEMPLATES_DIR, "claude-code", ".claude", "skills");
@@ -4484,12 +4708,12 @@ async function addAddon(targetDir, manifest, addonName, currentAddons) {
     [
       `  ${chalk15.dim("Name:")}        ${addon.label}`,
       `  ${chalk15.dim("Description:")} ${addon.description}`,
-      `  ${chalk15.dim("Skills:")}      ${addon.skills.map((s) => chalk15.cyan(`/devtronic:${s}`)).join(", ")}`,
+      `  ${chalk15.dim("Skills:")}      ${addon.skills.map((s) => chalk15.cyan(`/${s}`)).join(", ")}`,
       `  ${chalk15.dim("Subagents:")}   ${addon.agents.length ? addon.agents.join(", ") : chalk15.dim("\u2014")}`
     ].join("\n"),
     "Adding addon"
   );
-  const confirmed = await p14.confirm({ message: "Add this addon?" });
+  const confirmed = await p14.confirm({ message: `Add ${addonName}?` });
   if (p14.isCancel(confirmed) || !confirmed) {
     p14.cancel("Addon installation cancelled.");
     process.exit(0);
@@ -4509,7 +4733,7 @@ async function addAddon(targetDir, manifest, addonName, currentAddons) {
       const content = readFile(join20(sourceDir, file));
       const destRelPath = join20(pluginRoot, "skills", skillDir, file);
       const destAbsPath = join20(targetDir, destRelPath);
-      ensureDir(dirname10(destAbsPath));
+      ensureDir(dirname12(destAbsPath));
       writeFile(destAbsPath, content);
       manifest.files[destRelPath] = createManifestEntry(content);
       addedFiles.push(destRelPath);
@@ -4525,7 +4749,7 @@ async function addAddon(targetDir, manifest, addonName, currentAddons) {
   writeManifest(targetDir, manifest);
   spinner8.stop(`${symbols.pass} ${addon.label} added`);
   p14.note(
-    addon.skills.map((s) => `  ${chalk15.cyan(`/devtronic:${s}`)}`).join("\n"),
+    addon.skills.map((s) => `  ${chalk15.cyan(`/${s}`)}`).join("\n"),
     "New skills available"
   );
   p14.outro("Done. Restart Claude Code to load the new skills.");
@@ -4536,18 +4760,26 @@ async function removeAddon(targetDir, manifest, addonName, currentAddons) {
     p14.outro("");
     return;
   }
+  if (manifest.installMode === "marketplace") {
+    const addon2 = ADDONS[addonName];
+    manifest.projectConfig.enabledAddons = currentAddons.filter((a) => a !== addonName);
+    writeManifest(targetDir, manifest);
+    p14.log.success(`${addon2.label} disabled`);
+    p14.outro("");
+    return;
+  }
   const addon = ADDONS[addonName];
   const pluginRoot = manifest.pluginPath;
   p14.note(
     [
       `  ${chalk15.dim("Name:")}        ${addon.label}`,
       `  ${chalk15.dim("Description:")} ${addon.description}`,
-      `  ${chalk15.dim("Skills:")}      ${addon.skills.map((s) => chalk15.dim(`/devtronic:${s}`)).join(", ")}`,
+      `  ${chalk15.dim("Skills:")}      ${addon.skills.map((s) => chalk15.dim(`/${s}`)).join(", ")}`,
       `  ${chalk15.dim("Subagents:")}   ${addon.agents.length ? addon.agents.join(", ") : chalk15.dim("\u2014")}`
     ].join("\n"),
     "Removing addon"
   );
-  const confirmed = await p14.confirm({ message: "Remove this addon?" });
+  const confirmed = await p14.confirm({ message: `Remove ${addonName}?` });
   if (p14.isCancel(confirmed) || !confirmed) {
     p14.cancel("Addon removal cancelled.");
     process.exit(0);
@@ -4592,7 +4824,7 @@ async function removeAddon(targetDir, manifest, addonName, currentAddons) {
     }
     if (existsSync17(skillAbsDir)) {
       try {
-        rmSync3(skillAbsDir, { recursive: true });
+        rmSync4(skillAbsDir, { recursive: true });
       } catch {
       }
     }
@@ -4604,7 +4836,7 @@ async function removeAddon(targetDir, manifest, addonName, currentAddons) {
   writeManifest(targetDir, manifest);
   spinner8.stop(`${symbols.pass} ${addon.label} removed`);
   p14.note(
-    addon.skills.map((s) => `  ${chalk15.dim(`/devtronic:${s}`)}`).join("\n"),
+    addon.skills.map((s) => `  ${chalk15.dim(`/${s}`)}`).join("\n"),
     "Skills removed"
   );
   p14.outro("Done. Restart Claude Code to apply the changes.");
@@ -4626,7 +4858,7 @@ async function addFileBasedAddon(targetDir, addonName, _options) {
     ].join("\n"),
     "Adding addon"
   );
-  const confirmed = await p14.confirm({ message: "Add this addon?" });
+  const confirmed = await p14.confirm({ message: `Add ${addonName}?` });
   if (p14.isCancel(confirmed) || !confirmed) {
     p14.cancel("Addon installation cancelled.");
     process.exit(0);
@@ -4877,7 +5109,7 @@ program.command("uninstall").description("Remove devtronic from your project").o
 });
 program.command("mode").description("Set or show the execution mode (hitl or afk)").argument("<mode>", "Mode: afk, hitl, or show").option("--path <path>", "Target directory (default: current directory)").action(async (mode, options) => {
   if (!["afk", "hitl", "show"].includes(mode)) {
-    console.error(`Invalid mode: "${mode}". Valid values: afk, hitl, show`);
+    p16.cancel(`Invalid mode: "${mode}". Valid values: afk, hitl, show`);
     process.exit(1);
   }
   await modeCommand(mode, { path: options.path });