@kolatts/pncli 1.16.0 → 1.17.0

package/dist/cli.js

@@ -8,7 +8,7 @@ import {
   setRepoConfigValue,
   writeGlobalConfig,
   writeRepoConfig
-} from "./chunk-P5NWDQ2B.js";
+} from "./chunk-FFVQ4PA7.js";
 import {
   ExitCode,
   PncliError,
@@ -876,6 +876,7 @@ function guessMimeType(filePath) {
 
 // src/services/jira/client.ts
 var API2 = "/rest/api/2";
+var AGILE_API = "/rest/agile/1.0";
 var JiraClient = class {
   constructor(http) {
     this.http = http;
@@ -1071,6 +1072,42 @@ var JiraClient = class {
       }
     });
   }
+  async listBoards(project) {
+    return this.http.jiraPaginate(async (startAt, maxResults) => {
+      return this.http.jira(
+        `${AGILE_API}/board`,
+        { params: { projectKeyOrId: project, startAt, maxResults } }
+      );
+    });
+  }
+  async listSprintsForBoard(boardId, states) {
+    return this.http.jiraPaginate(async (startAt, maxResults) => {
+      return this.http.jira(
+        `${AGILE_API}/board/${boardId}/sprint`,
+        { params: { startAt, maxResults, ...states?.length ? { state: states.join(",") } : {} } }
+      );
+    });
+  }
+  async listSprintsForProject(project, states) {
+    const boards = await this.listBoards(project);
+    const sprints = [];
+    const seen = /* @__PURE__ */ new Set();
+    for (const board of boards) {
+      if (board.type !== "scrum") continue;
+      for (const sprint of await this.listSprintsForBoard(board.id, states)) {
+        if (seen.has(sprint.id)) continue;
+        seen.add(sprint.id);
+        sprints.push(sprint);
+      }
+    }
+    return sprints;
+  }
+  async setSprint(sprintId, issueKeys) {
+    await this.http.jira(`${AGILE_API}/sprint/${sprintId}/issue`, {
+      method: "POST",
+      body: { issues: issueKeys }
+    });
+  }
 };
 function schemaToPncliType(schema) {
   if (!schema) return void 0;
@@ -1406,6 +1443,38 @@ function registerJiraCommands(program2) {
       fail(err, "jira", "fields", start);
     }
   });
+  jira.command("list-boards").description("List Agile boards for a project").requiredOption("--project <key>", "Project key").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const client = getClient(program2);
+      const data = await client.listBoards(opts.project);
+      success(data, "jira", "list-boards", start);
+    } catch (err) {
+      fail(err, "jira", "list-boards", start);
+    }
+  });
+  jira.command("list-sprints").description("List sprints for a board or project, including start/end dates").option("--board <id>", "Board ID").option("--project <key>", "Project key \u2014 resolves to that project's board(s)").option("--state <states>", "Comma-separated states to filter (active,future,closed)").action(async (opts) => {
+    const start = Date.now();
+    try {
+      if (!opts.board && !opts.project) throw new PncliError("Either --board or --project is required", 1);
+      const client = getClient(program2);
+      const states = opts.state ? opts.state.split(",").map((s) => s.trim()) : void 0;
+      const data = opts.board ? await client.listSprintsForBoard(parseInt(opts.board, 10), states) : await client.listSprintsForProject(opts.project, states);
+      success(data, "jira", "list-sprints", start);
+    } catch (err) {
+      fail(err, "jira", "list-sprints", start);
+    }
+  });
+  jira.command("set-sprint").description("Move a Jira issue into a sprint").requiredOption("--key <issue-key>", "Issue key").requiredOption("--sprint <id>", "Sprint ID (from list-sprints)").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const client = getClient(program2);
+      await client.setSprint(parseInt(opts.sprint, 10), [opts.key]);
+      success({ updated: opts.key, sprint: opts.sprint }, "jira", "set-sprint", start);
+    } catch (err) {
+      fail(err, "jira", "set-sprint", start);
+    }
+  });
 }
 function parseFieldArgs(fieldArgs, fieldMap) {
   const result = {};
@@ -4945,6 +5014,16 @@ var AdoWorkClient = class {
   async downloadAttachment(absoluteUrl) {
     return this.http.adoBuffer(absoluteUrl);
   }
+  async listAreas(collection, project, depth = 10) {
+    return this.http.ado(
+      `/${encodeURIComponent(collection)}/${encodeURIComponent(project)}/_apis/wit/classificationnodes/areas?$depth=${depth}&api-version=${API6}`
+    );
+  }
+  async listIterations(collection, project, depth = 10) {
+    return this.http.ado(
+      `/${encodeURIComponent(collection)}/${encodeURIComponent(project)}/_apis/wit/classificationnodes/iterations?$depth=${depth}&api-version=${API6}`
+    );
+  }
   async uploadAttachment(collection, workItemId, filePath, comment) {
     const fileContent = readFileSync3(filePath);
     const fileName = basename2(filePath);
@@ -6799,6 +6878,26 @@ function registerAdoWorkCommands(ado) {
       fail(err, "ado", "work-download-attachment", start);
     }
   });
+  work.command("list-areas").description("List classification areas for the team project (tree)").option("--depth <n>", "Depth of the area tree to retrieve", "10").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { collection, project, workClient } = getAdoContext(ado);
+      const data = await workClient.listAreas(collection, project, parseInt(opts.depth, 10));
+      success(data, "ado", "work-list-areas", start);
+    } catch (err) {
+      fail(err, "ado", "work-list-areas", start);
+    }
+  });
+  work.command("list-iterations").description("List classification iterations for the team project (tree), including start/finish dates").option("--depth <n>", "Depth of the iteration tree to retrieve", "10").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { collection, project, workClient } = getAdoContext(ado);
+      const data = await workClient.listIterations(collection, project, parseInt(opts.depth, 10));
+      success(data, "ado", "work-list-iterations", start);
+    } catch (err) {
+      fail(err, "ado", "work-list-iterations", start);
+    }
+  });
   work.command("types").description("List work item types in the project").option("--discover", "Fetch from server (always true for this command)").option("--save", "Save discovered types to ~/.pncli/config.json").action(async (opts) => {
     const start = Date.now();
     try {
@@ -7120,7 +7219,7 @@ function registerAdoRepoCommands(ado) {
       const start = Date.now();
       try {
         const globalOpts = ado.optsWithGlobals();
-        const { loadConfig: lc } = await import("./config-3QD5Y2O5.js");
+        const { loadConfig: lc } = await import("./config-S56LADVF.js");
         const config = lc({ configPath: globalOpts.config });
         const { collection, project, repo: repo2, gitClient } = getAdoContext(ado, true);
         const { AdoCoreClient: AdoCoreClient2 } = await import("./core-SWYVXOQ4.js");
@@ -8270,6 +8369,8 @@ import os from "os";
 import { fileURLToPath } from "url";
 import { execFileSync as execFileSync3 } from "child_process";
 import select from "@inquirer/select";
+var BACK = "__back__";
+var ALL_MARKETPLACES = "__all_marketplaces__";
 function injectTokenIntoUrl(url, token) {
   let parsed;
   try {
@@ -8293,10 +8394,31 @@ function repoNameFromUrl(url) {
 function defaultMarketplacePath(url) {
   return path7.join(os.homedir(), ".agents", "marketplaces", repoNameFromUrl(url));
 }
+function marketplaceLabel(m) {
+  return m.name ?? repoNameFromUrl(m.repoUrl ?? "");
+}
+function scrubToken(msg) {
+  return msg.replace(/x-(?:token-auth|access-token):[^@]+@/g, "x-token-auth:***@");
+}
+function assertInteractive(hint) {
+  if (!process.stdin.isTTY) {
+    throw new Error(`This selection requires an interactive terminal. ${hint}`);
+  }
+}
 var AGENT_PATHS = {
   "github-copilot": { project: ".agents/skills", user: path7.join(os.homedir(), ".copilot/skills") },
   "claude-code": { project: ".claude/skills", user: path7.join(os.homedir(), ".claude/skills") }
 };
+function resolveAgentName(opts) {
+  return opts.claude ? "claude-code" : opts.agent ?? "github-copilot";
+}
+function resolveAgentPaths(agentName) {
+  const agentConfig = AGENT_PATHS[agentName];
+  if (!agentConfig) {
+    throw new Error(`Unknown agent: "${agentName}". Use: ${Object.keys(AGENT_PATHS).join(" | ")}`);
+  }
+  return agentConfig;
+}
 function getBundledSkillsDir() {
   try {
     const thisFile = fileURLToPath(import.meta.url);
@@ -8305,6 +8427,233 @@ function getBundledSkillsDir() {
     return "";
   }
 }
+function getInstalledMetaPath(targetDir) {
+  return path7.join(targetDir, ".pncli-installed.json");
+}
+function readInstalledMeta(targetDir) {
+  const metaPath = getInstalledMetaPath(targetDir);
+  const raw = loadJsonFile(metaPath);
+  if (raw && raw.version === 1 && raw.skills) return raw;
+  return { version: 1, skills: {} };
+}
+function recordInstalledSkills(targetDir, skillNames, record) {
+  if (skillNames.length === 0) return;
+  const meta = readInstalledMeta(targetDir);
+  const now = (/* @__PURE__ */ new Date()).toISOString();
+  for (const skillName of skillNames) {
+    meta.skills[skillName] = { ...record, installedAt: now };
+  }
+  fs4.writeFileSync(getInstalledMetaPath(targetDir), JSON.stringify(meta, null, 2), "utf8");
+}
+function getAllMarketplaces(globalConfig) {
+  const result = [];
+  if (Array.isArray(globalConfig.marketplaces)) {
+    result.push(...globalConfig.marketplaces);
+  }
+  if (globalConfig.marketplace?.repoUrl) {
+    const legacyUrl = globalConfig.marketplace.repoUrl;
+    const alreadyPresent = result.some((m) => m.repoUrl === legacyUrl);
+    if (!alreadyPresent) {
+      const existingNames = new Set(result.map((m) => m.name).filter((n) => !!n));
+      let legacyName = globalConfig.marketplace.name ?? repoNameFromUrl(legacyUrl);
+      if (existingNames.has(legacyName)) {
+        let suffix = 2;
+        while (existingNames.has(`${legacyName}-${suffix}`)) suffix++;
+        legacyName = `${legacyName}-${suffix}`;
+      }
+      result.push({
+        name: legacyName,
+        repoUrl: globalConfig.marketplace.repoUrl,
+        localPath: globalConfig.marketplace.localPath,
+        token: globalConfig.marketplace.token
+      });
+    }
+  }
+  return result;
+}
+function saveMarketplaces(configPath, existing, marketplaces) {
+  const updated = { ...existing, marketplaces };
+  delete updated.marketplace;
+  writeGlobalConfig(updated, configPath);
+}
+function loadMarketplacesConfig(configPath) {
+  const existing = loadJsonFile(configPath) ?? {};
+  const all = getAllMarketplaces(existing);
+  if (existing.marketplace?.repoUrl) {
+    saveMarketplaces(configPath, existing, all);
+    warn("Migrated legacy single-marketplace config to the multi-marketplace format.");
+    delete existing.marketplace;
+  }
+  return { existing, all };
+}
+function loadMarketplaces(configPath) {
+  return loadMarketplacesConfig(configPath).all;
+}
+function upsertMarketplace(all, entry) {
+  const idxByUrl = all.findIndex((m) => m.repoUrl === entry.repoUrl);
+  const idxByName = all.findIndex((m) => m.name === entry.name);
+  if (idxByUrl !== -1) {
+    if (idxByName !== -1 && idxByName !== idxByUrl) {
+      throw new Error(`Marketplace name "${entry.name}" is already used by a different marketplace (${all[idxByName].repoUrl}). Choose a different --name.`);
+    }
+    all[idxByUrl] = { ...entry, token: entry.token ?? all[idxByUrl].token };
+  } else if (idxByName !== -1) {
+    throw new Error(`Marketplace name "${entry.name}" is already registered for a different repo (${all[idxByName].repoUrl}). Choose a different --name, or remove the existing marketplace first.`);
+  } else {
+    all.push(entry);
+  }
+}
+function cloneOrReuseMarketplace(url, resolvedPath, opts) {
+  const hasGit = fs4.existsSync(path7.join(resolvedPath, ".git"));
+  if (fs4.existsSync(resolvedPath) && !hasGit && fs4.readdirSync(resolvedPath).length > 0) {
+    throw new Error(`Directory already exists and is not a git repo: ${resolvedPath}`);
+  }
+  if (hasGit) {
+    warn(`Directory already contains a git repo at ${resolvedPath} \u2014 skipping clone, updating config and re-installing plugins.`);
+    return;
+  }
+  const branchLabel = opts.branch ?? "remote default";
+  warn(`Cloning ${url} (branch: ${branchLabel}) \u2192 ${resolvedPath}...`);
+  const cloneUrl = opts.token ? injectTokenIntoUrl(url, opts.token) : url;
+  const cloneArgs = ["clone"];
+  if (opts.branch) cloneArgs.push("--branch", opts.branch);
+  cloneArgs.push(cloneUrl, resolvedPath);
+  try {
+    execFileSync3("git", cloneArgs, { stdio: ["inherit", "inherit", "pipe"] });
+  } catch (e) {
+    let cloneActuallySucceeded = false;
+    try {
+      execFileSync3("git", ["-C", resolvedPath, "rev-parse", "HEAD"], { stdio: "pipe" });
+      cloneActuallySucceeded = true;
+    } catch {
+    }
+    if (!cloneActuallySucceeded) {
+      const msg = e instanceof Error ? e.message : String(e);
+      throw new Error(scrubToken(msg));
+    }
+  }
+}
+function pullMarketplace(marketplacePath, repoUrl, token, marketplaceName) {
+  warn(`Pulling latest content for "${marketplaceName}"...`);
+  const gitArgs = ["-C", marketplacePath];
+  if (repoUrl && token) {
+    gitArgs.push("-c", `remote.origin.url=${injectTokenIntoUrl(repoUrl, token)}`);
+  }
+  gitArgs.push("pull");
+  let pullOutput;
+  try {
+    pullOutput = execFileSync3("git", gitArgs, { encoding: "utf8", stdio: ["inherit", "pipe", "pipe"], env: { ...process.env, LANG: "C", LC_ALL: "C" } });
+  } catch (e) {
+    const msg = e instanceof Error ? e.message : String(e);
+    throw new Error(scrubToken(msg));
+  }
+  const updated = !pullOutput.includes("Already up to date");
+  if (pullOutput.trim() && updated) warn(pullOutput.trim());
+  warn(updated ? `"${marketplaceName}" updated.` : `"${marketplaceName}" already up to date \u2014 no changes to sync.`);
+  return { updated };
+}
+function installPluginsForMarketplace(marketplacePath, marketplaceName, repoUrl, pluginNames, targetDir) {
+  const results = {};
+  let totalInstalled = 0;
+  for (const pluginName of pluginNames) {
+    const skillsSrc = resolveSkillsSrc(marketplacePath, pluginName);
+    if (!fs4.existsSync(skillsSrc)) {
+      results[pluginName] = { installed: [], failed: [] };
+      warn(`No skills directory found for plugin "${pluginName}" in "${marketplaceName}" \u2014 skipping.`);
+      continue;
+    }
+    const { installed, failed } = copyPluginSkills(skillsSrc, targetDir, {
+      marketplace: marketplaceName,
+      plugin: pluginName,
+      installedFrom: repoUrl ?? ""
+    });
+    results[pluginName] = { installed, failed };
+    totalInstalled += installed.length;
+    for (const skill of installed) {
+      warn(`  ${skill}: ${path7.join(skillsSrc, skill)} \u2192 ${path7.join(targetDir, skill)}`);
+    }
+    if (failed.length > 0) {
+      warn(`Skipped ${failed.length} skill(s) with invalid names in "${pluginName}": ${failed.join(", ")}`);
+    }
+  }
+  return { results, totalInstalled };
+}
+function installAllPlugins(resolvedPath, marketplaceName, url, targetDir) {
+  const pluginChoices = resolvePluginChoices(resolvedPath);
+  if (pluginChoices.length === 0) {
+    warn("No plugins found in marketplace. Check the marketplace repository structure.");
+    return { pluginResults: {}, totalInstalled: 0 };
+  }
+  warn(`Installing ${pluginChoices.length} plugin(s) to ${targetDir}...`);
+  const { results, totalInstalled } = installPluginsForMarketplace(resolvedPath, marketplaceName, url, pluginChoices.map((p) => p.name), targetDir);
+  return { pluginResults: results, totalInstalled };
+}
+function syncMarketplacePlugins(m, targetDir, force, pluginFilter) {
+  const marketplaceName = marketplaceLabel(m);
+  try {
+    const marketplacePath = m.localPath;
+    if (!marketplacePath || !fs4.existsSync(marketplacePath)) {
+      warn(`Marketplace "${marketplaceName}" local path not found \u2014 skipping.`);
+      return { marketplace: marketplaceName, skipped: true, message: "Local path not found." };
+    }
+    const { updated } = pullMarketplace(marketplacePath, m.repoUrl, m.token, marketplaceName);
+    if (!updated && !force) {
+      return { marketplace: marketplaceName, marketplaceUpdated: false, skipped: true, message: "No changes detected \u2014 skipping install. Use --force to reinstall anyway." };
+    }
+    const pluginChoices = resolvePluginChoices(marketplacePath);
+    if (pluginChoices.length === 0) {
+      warn(`No plugins found in marketplace "${marketplaceName}" \u2014 skipping.`);
+      return { marketplace: marketplaceName, skipped: true, message: "No plugins found." };
+    }
+    let pluginNames;
+    if (pluginFilter === "all") {
+      pluginNames = pluginChoices.map((p) => p.name);
+    } else if (pluginChoices.some((p) => p.name === pluginFilter)) {
+      pluginNames = [pluginFilter];
+    } else {
+      warn(`Plugin "${pluginFilter}" not found in "${marketplaceName}" \u2014 skipping.`);
+      return { marketplace: marketplaceName, skipped: true, message: `Plugin "${pluginFilter}" not found.` };
+    }
+    const { results, totalInstalled } = installPluginsForMarketplace(marketplacePath, marketplaceName, m.repoUrl, pluginNames, targetDir);
+    return { marketplace: marketplaceName, plugins: results, total: totalInstalled, marketplaceUpdated: updated };
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    warn(`Marketplace "${marketplaceName}" failed \u2014 skipping. ${message}`);
+    return { marketplace: marketplaceName, skipped: true, error: message };
+  }
+}
+async function marketplaceAddAction(url, localPath, opts, commandName) {
+  const start = Date.now();
+  try {
+    const resolvedPath = path7.resolve(localPath ?? defaultMarketplacePath(url));
+    const marketplaceName = opts.name ?? repoNameFromUrl(url);
+    cloneOrReuseMarketplace(url, resolvedPath, opts);
+    const configPath = getGlobalConfigPath();
+    const { existing, all } = loadMarketplacesConfig(configPath);
+    const entry = {
+      name: marketplaceName,
+      repoUrl: url,
+      localPath: resolvedPath,
+      ...opts.token ? { token: opts.token } : {}
+    };
+    upsertMarketplace(all, entry);
+    saveMarketplaces(configPath, existing, all);
+    const targetDir = resolveAgentPaths(resolveAgentName(opts)).user;
+    const { pluginResults, totalInstalled } = installAllPlugins(resolvedPath, marketplaceName, url, targetDir);
+    success({
+      name: marketplaceName,
+      repoUrl: url,
+      localPath: resolvedPath,
+      branch: opts.branch ?? null,
+      tokenConfigured: !!opts.token,
+      plugins: pluginResults,
+      total: totalInstalled,
+      target: targetDir
+    }, "skills", commandName, start);
+  } catch (err) {
+    fail(err, "skills", commandName, start);
+  }
+}
 function registerSkillsCommands(program2) {
   const skills = program2.command("skills").description("Manage pncli Claude Code skills");
   skills.command("install").description("Install pncli skills into the current repo").option("--agent <agent>", "Target agent host: github-copilot | claude-code", "github-copilot").option("--scope <scope>", "Installation scope: project | user", "project").option("--target <dir>", "Override install directory (ignores --agent and --scope)").action((opts) => {
@@ -8314,10 +8663,7 @@ function registerSkillsCommands(program2) {
       if (opts.target) {
         targetDir = path7.resolve(opts.target);
       } else {
-        const agentConfig = AGENT_PATHS[opts.agent];
-        if (!agentConfig) {
-          throw new Error(`Unknown agent: "${opts.agent}". Use: ${Object.keys(AGENT_PATHS).join(" | ")}`);
-        }
+        const agentConfig = resolveAgentPaths(opts.agent);
         const scopePath = opts.scope === "user" ? agentConfig.user : agentConfig.project;
         targetDir = path7.resolve(scopePath);
       }
@@ -8367,6 +8713,7 @@ function registerSkillsCommands(program2) {
       if (failed.length > 0) {
         warn(`Failed to install: ${failed.join(", ")}`);
       }
+      recordInstalledSkills(targetDir, installed, { source: "bundled" });
       success({
         installed,
         failed,
@@ -8387,10 +8734,7 @@ function registerSkillsCommands(program2) {
       if (opts.target) {
         targetDir = path7.resolve(opts.target);
       } else {
-        const agentConfig = AGENT_PATHS[opts.agent];
-        if (!agentConfig) {
-          throw new Error(`Unknown agent: "${opts.agent}". Use: ${Object.keys(AGENT_PATHS).join(" | ")}`);
-        }
+        const agentConfig = resolveAgentPaths(opts.agent);
         const scopePath = opts.scope === "user" ? agentConfig.user : agentConfig.project;
         targetDir = path7.resolve(scopePath);
       }
@@ -8398,7 +8742,9 @@ function registerSkillsCommands(program2) {
         success({ skills: [], message: `No skills directory found at ${targetDir}. Run: pncli skills install` }, "skills", "list", start);
         return;
       }
+      const meta = readInstalledMeta(targetDir);
       const skillDirs = fs4.readdirSync(targetDir).filter((name) => {
+        if (name.startsWith(".")) return false;
         const skillPath = path7.join(targetDir, name, "SKILL.md");
         return fs4.existsSync(skillPath);
       });
@@ -8433,7 +8779,8 @@ function registerSkillsCommands(program2) {
           category: metadata.category || data.category || "other",
           services: metadata.services || data.services || "",
           providers: metadata.providers || data.providers || "none",
-          userInvocable: data["user-invocable"] === "true"
+          userInvocable: data["user-invocable"] === "true",
+          installed: meta.skills[name] ?? null
         };
       });
       success({ skills: skillsList, total: skillsList.length }, "skills", "list", start);
@@ -8441,193 +8788,217 @@ function registerSkillsCommands(program2) {
       fail(err, "skills", "list", start);
     }
   });
-  const marketplace = skills.command("marketplace").description("Manage a git-hosted skills marketplace");
-  marketplace.command("setup").description("Clone a skills marketplace repo, register it in global config, and install all plugins").argument("<url>", "Git clone URL of the marketplace repository").argument("[localPath]", "Local directory to clone into (default: ~/.agents/marketplaces/<repo-name>)").option("--branch <branch>", "Branch to clone (default: remote HEAD)").option("--token <token>", "HTTP access token for authenticated clone and pull (GitHub PAT or Bitbucket token)").option("--agent <agent>", "Target agent host for plugin install: github-copilot | claude-code (default: github-copilot)").option("--claude", "Shorthand for --agent claude-code").action(async (url, localPath, opts) => {
+  skills.command("uninstall").description("Uninstall a skill (defaults to user scope, matching the marketplace install target; pass --scope project for skills installed via `skills install`)").argument("<name>", "Skill name to uninstall (the directory name under your skills folder)").option("--agent <agent>", "Target agent host: github-copilot | claude-code", "github-copilot").option("--scope <scope>", "Installation scope to uninstall from: project | user", "user").option("--claude", "Shorthand for --agent claude-code").option("--target <dir>", "Override skills directory").action((name, opts) => {
     const start = Date.now();
     try {
-      const resolvedPath = path7.resolve(localPath ?? defaultMarketplacePath(url));
-      const hasGit = fs4.existsSync(path7.join(resolvedPath, ".git"));
-      if (fs4.existsSync(resolvedPath) && !hasGit && fs4.readdirSync(resolvedPath).length > 0) {
-        throw new Error(`Directory already exists and is not a git repo: ${resolvedPath}`);
-      }
-      if (hasGit) {
-        warn(`Directory already contains a git repo at ${resolvedPath} \u2014 skipping clone, updating config and re-installing plugins.`);
+      let targetDir;
+      if (opts.target) {
+        targetDir = path7.resolve(opts.target);
       } else {
-        const branchLabel = opts.branch ?? "remote default";
-        warn(`Cloning ${url} (branch: ${branchLabel}) \u2192 ${resolvedPath}...`);
-        const cloneUrl = opts.token ? injectTokenIntoUrl(url, opts.token) : url;
-        const cloneArgs = ["clone"];
-        if (opts.branch) cloneArgs.push("--branch", opts.branch);
-        cloneArgs.push(cloneUrl, resolvedPath);
-        try {
-          execFileSync3("git", cloneArgs, { stdio: ["inherit", "inherit", "pipe"] });
-        } catch (e) {
-          const msg = e instanceof Error ? e.message : String(e);
-          throw new Error(msg.replace(/x-(?:token-auth|access-token):[^@]+@/g, "x-token-auth:***@"));
-        }
+        const agentConfig = resolveAgentPaths(resolveAgentName(opts));
+        const scopePath = opts.scope === "project" ? agentConfig.project : agentConfig.user;
+        targetDir = path7.resolve(scopePath);
       }
+      const resolvedTarget = path7.resolve(targetDir);
+      const skillDir = path7.resolve(targetDir, name);
+      if (!skillDir.startsWith(resolvedTarget + path7.sep)) {
+        throw new Error(`Invalid skill name: "${name}"`);
+      }
+      if (!fs4.existsSync(skillDir)) {
+        throw new Error(`Skill "${name}" not found at ${skillDir}`);
+      }
+      const meta = readInstalledMeta(targetDir);
+      const record = meta.skills[name];
+      fs4.rmSync(skillDir, { recursive: true, force: true });
+      delete meta.skills[name];
+      fs4.writeFileSync(getInstalledMetaPath(targetDir), JSON.stringify(meta, null, 2), "utf8");
+      success({
+        uninstalled: name,
+        target: targetDir,
+        wasTracked: !!record,
+        ...record ? { installedFrom: record } : {}
+      }, "skills", "uninstall", start);
+    } catch (err) {
+      fail(err, "skills", "uninstall", start);
+    }
+  });
+  const marketplace = skills.command("marketplace").description("Manage git-hosted skills marketplaces");
+  function withMarketplaceAddOptions(cmd) {
+    return cmd.argument("<url>", "Git clone URL of the marketplace repository").argument("[localPath]", "Local directory to clone into (default: ~/.agents/marketplaces/<repo-name>)").option("--name <name>", "Human-readable name for this marketplace (default: derived from URL)").option("--branch <branch>", "Branch to clone (default: remote HEAD)").option("--token <token>", "HTTP access token for authenticated clone and pull (GitHub PAT or Bitbucket token)").option("--agent <agent>", "Target agent host for plugin install: github-copilot | claude-code (default: github-copilot)").option("--claude", "Shorthand for --agent claude-code");
+  }
+  withMarketplaceAddOptions(
+    marketplace.command("add").description("Register a new marketplace, clone it, and install all its plugins")
+  ).action((url, localPath, opts) => marketplaceAddAction(url, localPath, opts, "marketplace-add"));
+  withMarketplaceAddOptions(
+    marketplace.command("setup").description("Alias for `marketplace add` \u2014 clone a marketplace and install all its plugins")
+  ).action((url, localPath, opts) => marketplaceAddAction(url, localPath, opts, "marketplace-setup"));
+  marketplace.command("list").description("List all registered marketplaces").action(() => {
+    const start = Date.now();
+    try {
       const configPath = getGlobalConfigPath();
-      const existing = loadJsonFile(configPath) ?? {};
-      existing.marketplace = { repoUrl: url, localPath: resolvedPath, ...opts.token ? { token: opts.token } : {} };
-      writeGlobalConfig(existing, configPath);
-      const agentName = opts.claude ? "claude-code" : opts.agent ?? "github-copilot";
-      const agentConfig = AGENT_PATHS[agentName];
-      if (!agentConfig) {
-        throw new Error(`Unknown agent: "${agentName}". Use: ${Object.keys(AGENT_PATHS).join(" | ")}`);
-      }
-      const targetDir = agentConfig.user;
-      const pluginChoices = resolvePluginChoices(resolvedPath);
-      const pluginResults = {};
-      let totalInstalled = 0;
-      if (pluginChoices.length === 0) {
-        warn("No plugins found in marketplace. Check the marketplace repository structure.");
-      } else {
-        warn(`Installing ${pluginChoices.length} plugin(s) to ${targetDir}...`);
-        for (const pluginChoice of pluginChoices) {
-          const skillsSrc = resolveSkillsSrc(resolvedPath, pluginChoice.name);
-          if (!fs4.existsSync(skillsSrc)) {
-            pluginResults[pluginChoice.name] = { installed: [], failed: [] };
-            warn(`No skills directory found for plugin "${pluginChoice.name}" \u2014 skipping.`);
-            continue;
-          }
-          const { installed, failed } = copyPluginSkills(skillsSrc, targetDir);
-          pluginResults[pluginChoice.name] = { installed, failed };
-          totalInstalled += installed.length;
-          for (const skill of installed) {
-            warn(`  ${skill}: ${path7.join(skillsSrc, skill)} \u2192 ${path7.join(targetDir, skill)}`);
-          }
-          if (failed.length > 0) {
-            warn(`Skipped ${failed.length} skill(s) with invalid names in "${pluginChoice.name}": ${failed.join(", ")}`);
-          }
-        }
+      const all = loadMarketplaces(configPath);
+      success({
+        marketplaces: all.map((m) => ({
+          name: marketplaceLabel(m),
+          repoUrl: m.repoUrl,
+          localPath: m.localPath,
+          tokenConfigured: !!m.token
+        })),
+        total: all.length
+      }, "skills", "marketplace-list", start);
+    } catch (err) {
+      fail(err, "skills", "marketplace-list", start);
+    }
+  });
+  marketplace.command("plugins").description("List the plugins available in a registered marketplace").argument("<name>", "Marketplace name (or repo URL) to inspect").action((name) => {
+    const start = Date.now();
+    try {
+      const configPath = getGlobalConfigPath();
+      const all = loadMarketplaces(configPath);
+      const found = all.find((m) => m.name === name || m.repoUrl === name);
+      if (!found) {
+        throw new Error(`Marketplace "${name}" not found. Run: pncli skills marketplace list`);
+      }
+      if (!found.localPath || !fs4.existsSync(found.localPath)) {
+        throw new Error(`Marketplace "${marketplaceLabel(found)}" local path not found at ${found.localPath ?? "(not set)"}. Run: pncli skills marketplace add <url>`);
       }
+      const plugins = resolvePluginChoices(found.localPath);
       success({
-        repoUrl: url,
-        localPath: resolvedPath,
-        branch: opts.branch ?? null,
-        tokenConfigured: !!opts.token,
-        plugins: pluginResults,
-        total: totalInstalled,
-        target: targetDir
-      }, "skills", "marketplace-setup", start);
+        marketplace: marketplaceLabel(found),
+        plugins,
+        total: plugins.length
+      }, "skills", "marketplace-plugins", start);
     } catch (err) {
-      fail(err, "skills", "marketplace-setup", start);
+      fail(err, "skills", "marketplace-plugins", start);
     }
   });
-  marketplace.command("sync").description("Pull latest marketplace content and install a plugin's skills").argument("[plugin]", 'Plugin name to install, or "all" to install every plugin (skips interactive selection)').option("--agent <agent>", "Target agent host: github-copilot | claude-code (default: github-copilot)").option("--claude", "Shorthand for --agent claude-code").option("--force", "Force reinstall even if the marketplace repo has no new changes").action(async (plugin, opts) => {
+  marketplace.command("remove").description("Remove a registered marketplace from the config (does not delete the local clone)").argument("<name>", "Name of the marketplace to remove").action((name) => {
     const start = Date.now();
     try {
       const configPath = getGlobalConfigPath();
-      const globalConfig = loadJsonFile(configPath) ?? {};
-      const marketplacePath = globalConfig.marketplace?.localPath;
-      if (!marketplacePath || !fs4.existsSync(marketplacePath)) {
-        throw new Error("Marketplace not configured. Run: pncli skills marketplace setup <url> <localPath>");
-      }
-      warn("Pulling latest marketplace content...");
-      const repoUrl = globalConfig.marketplace?.repoUrl;
-      const token = globalConfig.marketplace?.token;
-      const gitArgs = ["-C", marketplacePath];
-      if (repoUrl && token) {
-        gitArgs.push("-c", `remote.origin.url=${injectTokenIntoUrl(repoUrl, token)}`);
-      }
-      gitArgs.push("pull");
-      let pullOutput;
-      try {
-        pullOutput = execFileSync3("git", gitArgs, { encoding: "utf8", stdio: ["inherit", "pipe", "pipe"], env: { ...process.env, LANG: "C", LC_ALL: "C" } });
-      } catch (e) {
-        const msg = e instanceof Error ? e.message : String(e);
-        throw new Error(msg.replace(/x-(?:token-auth|access-token):[^@]+@/g, "x-token-auth:***@"));
-      }
-      const marketplaceUpdated = !pullOutput.includes("Already up to date");
-      if (pullOutput.trim() && marketplaceUpdated) {
-        warn(pullOutput.trim());
-      }
-      warn(marketplaceUpdated ? "Marketplace updated." : "Marketplace already up to date \u2014 no changes to sync.");
-      const pluginChoices = resolvePluginChoices(marketplacePath);
-      if (pluginChoices.length === 0) {
-        throw new Error("No plugins found in marketplace. Check the marketplace repository structure.");
-      }
-      const agentName = opts.claude ? "claude-code" : opts.agent ?? "github-copilot";
-      const agentConfig = AGENT_PATHS[agentName];
-      if (!agentConfig) {
-        throw new Error(`Unknown agent: "${agentName}". Use: ${Object.keys(AGENT_PATHS).join(" | ")}`);
-      }
-      const targetDir = agentConfig.user;
-      let selectedPlugin;
-      if (plugin) {
-        if (plugin !== "all" && !pluginChoices.some((p) => p.name === plugin)) {
-          throw new Error(`Plugin "${plugin}" not found. Available: ${pluginChoices.map((p) => p.name).join(", ")}`);
+      const { existing, all } = loadMarketplacesConfig(configPath);
+      const idx = all.findIndex((m) => m.name === name || m.repoUrl === name);
+      if (idx === -1) {
+        throw new Error(`Marketplace "${name}" not found. Run: pncli skills marketplace list`);
+      }
+      const removed = all.splice(idx, 1)[0];
+      saveMarketplaces(configPath, existing, all);
+      success({
+        removed: {
+          name: marketplaceLabel(removed),
+          repoUrl: removed.repoUrl,
+          localPath: removed.localPath
+        },
+        remaining: all.length
+      }, "skills", "marketplace-remove", start);
+    } catch (err) {
+      fail(err, "skills", "marketplace-remove", start);
+    }
+  });
+  marketplace.command("sync").description("Pull latest marketplace content and install plugin skills").argument("[plugin]", 'Plugin name to install, or "all" to install every plugin (skips interactive selection)').option("--marketplace <name>", 'Marketplace name to sync, or "all" to sync every registered marketplace (skips interactive selection)').option("--agent <agent>", "Target agent host: github-copilot | claude-code (default: github-copilot)").option("--claude", "Shorthand for --agent claude-code").option("--force", 'Reinstall even if a marketplace has no new changes (applies to single-plugin and "all" installs alike)').action(async (plugin, opts) => {
+    const start = Date.now();
+    try {
+      const configPath = getGlobalConfigPath();
+      const allMarketplaces = loadMarketplaces(configPath);
+      if (allMarketplaces.length === 0) {
+        throw new Error("No marketplaces configured. Run: pncli skills marketplace add <url>");
+      }
+      const targetDir = resolveAgentPaths(resolveAgentName(opts)).user;
+      const force = opts.force ?? false;
+      if (opts.marketplace === "all") {
+        const results = allMarketplaces.map((m) => syncMarketplacePlugins(m, targetDir, force, plugin ?? "all"));
+        success({ allMarketplaces: true, marketplaces: results, target: targetDir }, "skills", "marketplace-sync", start);
+        return;
+      }
+      let selectedMarketplace;
+      let selectedPlugin = plugin;
+      const canGoBack = !opts.marketplace && allMarketplaces.length > 1;
+      if (opts.marketplace) {
+        const found = allMarketplaces.find((m) => m.name === opts.marketplace || m.repoUrl === opts.marketplace);
+        if (!found) {
+          throw new Error(`Marketplace "${opts.marketplace}" not found. Run: pncli skills marketplace list`);
         }
-        selectedPlugin = plugin;
-      } else {
-        selectedPlugin = await select({
-          message: "Select a plugin to install:",
-          choices: [
+        selectedMarketplace = found;
+      } else if (allMarketplaces.length === 1) {
+        selectedMarketplace = allMarketplaces[0];
+      }
+      for (; ; ) {
+        if (!selectedMarketplace) {
+          assertInteractive(`Multiple marketplaces are registered (${allMarketplaces.map(marketplaceLabel).join(", ")}). Pass --marketplace <name> (or --marketplace all) to run this non-interactively.`);
+          const chosen = await select({
+            message: "Select a marketplace to sync:",
+            choices: [
+              { value: ALL_MARKETPLACES, name: "All marketplaces \u2014 sync every plugin from every marketplace" },
+              // Index-based values: labels alone aren't guaranteed unique (two marketplaces can share a derived name).
+              ...allMarketplaces.map((m, i) => ({ value: String(i), name: `${marketplaceLabel(m)} \u2014 ${m.repoUrl ?? ""}` }))
+            ]
+          });
+          if (chosen === ALL_MARKETPLACES) {
+            const results2 = allMarketplaces.map((m) => syncMarketplacePlugins(m, targetDir, force, selectedPlugin ?? "all"));
+            success({ allMarketplaces: true, marketplaces: results2, target: targetDir }, "skills", "marketplace-sync", start);
+            return;
+          }
+          selectedMarketplace = allMarketplaces[Number(chosen)];
+          if (!selectedMarketplace) {
+            throw new Error(`Marketplace "${chosen}" not found.`);
+          }
+        }
+        const marketplaceName = marketplaceLabel(selectedMarketplace);
+        const marketplacePath = selectedMarketplace.localPath;
+        if (!marketplacePath || !fs4.existsSync(marketplacePath)) {
+          throw new Error(`Marketplace "${marketplaceName}" local path not found at ${marketplacePath ?? "(not set)"}. Run: pncli skills marketplace add <url>`);
+        }
+        const { updated } = pullMarketplace(marketplacePath, selectedMarketplace.repoUrl, selectedMarketplace.token, marketplaceName);
+        const pluginChoices = resolvePluginChoices(marketplacePath);
+        if (pluginChoices.length === 0) {
+          throw new Error(`No plugins found in marketplace "${marketplaceName}". Check the marketplace repository structure.`);
+        }
+        if (!selectedPlugin) {
+          assertInteractive(`Pass a plugin name (or "all") to run this non-interactively.`);
+          const choices = [
             { value: "all", name: "All \u2014 install every plugin" },
-            ...pluginChoices.map((p) => ({
-              value: p.name,
-              name: p.description ? `${p.name} \u2014 ${p.description}` : p.name
-            }))
-          ]
-        });
-      }
-      if (selectedPlugin === "all") {
-        if (!marketplaceUpdated && !opts.force) {
+            ...pluginChoices.map((p) => ({ value: p.name, name: p.description ? `${p.name} \u2014 ${p.description}` : p.name }))
+          ];
+          if (canGoBack) {
+            choices.push({ value: BACK, name: "\u2190 Back to marketplace selection" });
+          }
+          const chosen = await select({ message: `Select a plugin from "${marketplaceName}" to install:`, choices });
+          if (chosen === BACK) {
+            selectedMarketplace = void 0;
+            continue;
+          }
+          selectedPlugin = chosen;
+        } else if (selectedPlugin !== "all" && !pluginChoices.some((p) => p.name === selectedPlugin)) {
+          throw new Error(`Plugin "${selectedPlugin}" not found in "${marketplaceName}". Available: ${pluginChoices.map((p) => p.name).join(", ")}`);
+        }
+        if (!updated && !force) {
           success({
-            marketplace: marketplacePath,
+            marketplace: marketplaceName,
             marketplaceUpdated: false,
             updated: false,
             skipped: true,
-            message: "No marketplace changes detected \u2014 skipping install."
+            message: `No changes detected in "${marketplaceName}" \u2014 skipping install. Use --force to reinstall anyway.`
           }, "skills", "marketplace-sync", start);
           return;
         }
-        const results = {};
-        let totalInstalled = 0;
-        for (const pluginChoice of pluginChoices) {
-          const skillsSrc2 = resolveSkillsSrc(marketplacePath, pluginChoice.name);
-          if (!fs4.existsSync(skillsSrc2)) {
-            results[pluginChoice.name] = { installed: [], failed: [] };
-            warn(`No skills directory found for plugin "${pluginChoice.name}" \u2014 skipping.`);
-            continue;
-          }
-          const { installed: installed2, failed: failed2 } = copyPluginSkills(skillsSrc2, targetDir);
-          results[pluginChoice.name] = { installed: installed2, failed: failed2 };
-          totalInstalled += installed2.length;
-          for (const skill of installed2) {
-            warn(`  ${skill}: ${path7.join(skillsSrc2, skill)} \u2192 ${path7.join(targetDir, skill)}`);
-          }
-          if (failed2.length > 0) {
-            warn(`Skipped ${failed2.length} skill(s) with invalid names in "${pluginChoice.name}": ${failed2.join(", ")}`);
-          }
+        const pluginNames = selectedPlugin === "all" ? pluginChoices.map((p) => p.name) : [selectedPlugin];
+        const { results, totalInstalled } = installPluginsForMarketplace(marketplacePath, marketplaceName, selectedMarketplace.repoUrl, pluginNames, targetDir);
+        if (selectedPlugin === "all") {
+          success({ marketplace: marketplaceName, plugins: results, total: totalInstalled, target: targetDir, marketplaceUpdated: updated }, "skills", "marketplace-sync", start);
+        } else {
+          const single = results[selectedPlugin] ?? { installed: [], failed: [] };
+          success({
+            marketplace: marketplaceName,
+            plugin: selectedPlugin,
+            installed: single.installed,
+            failed: single.failed,
+            total: single.installed.length,
+            target: targetDir,
+            marketplaceUpdated: updated
+          }, "skills", "marketplace-sync", start);
         }
-        success({
-          plugins: results,
-          total: totalInstalled,
-          target: targetDir,
-          marketplaceUpdated
-        }, "skills", "marketplace-sync", start);
         return;
       }
-      const skillsSrc = resolveSkillsSrc(marketplacePath, selectedPlugin);
-      if (!fs4.existsSync(skillsSrc)) {
-        throw new Error(`No skills directory found at ${skillsSrc}`);
-      }
-      const { installed, failed } = copyPluginSkills(skillsSrc, targetDir);
-      for (const skill of installed) {
-        warn(`  ${skill}: ${path7.join(skillsSrc, skill)} \u2192 ${path7.join(targetDir, skill)}`);
-      }
-      if (failed.length > 0) {
-        warn(`Skipped ${failed.length} skill(s) with invalid names: ${failed.join(", ")}`);
-      }
-      success({
-        plugin: selectedPlugin,
-        installed,
-        failed,
-        total: installed.length,
-        target: targetDir,
-        marketplaceUpdated
-      }, "skills", "marketplace-sync", start);
     } catch (err) {
       fail(err, "skills", "marketplace-sync", start);
     }
@@ -8658,7 +9029,7 @@ function resolveSkillsSrc(marketplacePath, selectedPlugin) {
   }
   return skillsSrc;
 }
-function copyPluginSkills(skillsSrc, targetDir) {
+function copyPluginSkills(skillsSrc, targetDir, meta) {
   fs4.mkdirSync(targetDir, { recursive: true });
   const resolvedTarget = path7.resolve(targetDir);
   const skillNames = fs4.readdirSync(skillsSrc).filter(
@@ -8676,6 +9047,14 @@ function copyPluginSkills(skillsSrc, targetDir) {
     fs4.cpSync(path7.join(skillsSrc, skillName), dest, { recursive: true });
     installed.push(skillName);
   }
+  if (meta) {
+    recordInstalledSkills(targetDir, installed, {
+      source: "marketplace",
+      marketplace: meta.marketplace,
+      plugin: meta.plugin,
+      installedFrom: meta.installedFrom
+    });
+  }
   return { installed, failed };
 }