@kolatts/pncli 1.15.0 → 1.17.0

package/dist/cli.js

@@ -8,7 +8,7 @@ import {
   setRepoConfigValue,
   writeGlobalConfig,
   writeRepoConfig
-} from "./chunk-CFUUOW7B.js";
+} from "./chunk-FFVQ4PA7.js";
 import {
   ExitCode,
   PncliError,
@@ -20,13 +20,13 @@ import {
   success,
   warn,
   writeRawOutput
-} from "./chunk-YHRFL7VX.js";
+} from "./chunk-XPPEXJBP.js";
 import {
   AdoCoreClient
 } from "./chunk-VDL32PSG.js";
 
 // src/cli.ts
-import { Command as Command2 } from "commander";
+import { Command as Command3 } from "commander";
 import { createRequire } from "module";
 
 // src/services/git/client.ts
@@ -455,6 +455,42 @@ function parseAdoRemote(remoteUrl, adoBaseUrl) {
   const collection = decodeURIComponent(parts[parts.length - 2]);
   return { collection, project, repo };
 }
+function parseGitHubRemote(remoteUrl, baseUrl) {
+  let targetHost;
+  if (baseUrl) {
+    try {
+      const normalizedBase = /^https?:\/\//i.test(baseUrl) ? baseUrl : `https://${baseUrl}`;
+      const hostname = new URL(normalizedBase).hostname.toLowerCase();
+      targetHost = hostname === "api.github.com" ? "github.com" : hostname;
+    } catch {
+      targetHost = baseUrl.replace(/\/$/, "").replace(/^https?:\/\//i, "").split(/[:/]/)[0].toLowerCase();
+    }
+  } else {
+    targetHost = "github.com";
+  }
+  const sshMatch = remoteUrl.match(/^git@([^:]+):([^/]+)\/([^/]+?)(?:\.git)?$/);
+  if (sshMatch) {
+    const [, host, owner, repo] = sshMatch;
+    if (host.toLowerCase() === targetHost) {
+      return { owner, repo };
+    }
+  }
+  const sshProtoMatch = remoteUrl.match(/^ssh:\/\/git@([^/:]+)(?::\d+)?\/([^/]+)\/([^/]+?)(?:\.git)?$/);
+  if (sshProtoMatch) {
+    const [, host, owner, repo] = sshProtoMatch;
+    if (host.toLowerCase() === targetHost) {
+      return { owner, repo };
+    }
+  }
+  const httpsMatch = remoteUrl.match(/^https?:\/\/([^/:]+)(?::\d+)?\/([^/]+)\/([^/]+?)(?:\.git)?$/);
+  if (httpsMatch) {
+    const [, host, owner, repo] = httpsMatch;
+    if (host.toLowerCase() === targetHost) {
+      return { owner, repo };
+    }
+  }
+  return null;
+}
 function getRemoteUrls(repoRoot) {
   try {
     const output = execSync2("git remote -v", { encoding: "utf8", cwd: repoRoot });
@@ -486,7 +522,15 @@ function getGitContext(config) {
       break;
     }
   }
-  return { root, branch, project, repo, ado: adoContext };
+  let githubContext = null;
+  for (const url of remoteUrls) {
+    const parsed = parseGitHubRemote(url, config.github.baseUrl);
+    if (parsed) {
+      githubContext = parsed;
+      break;
+    }
+  }
+  return { root, branch, project, repo, ado: adoContext, github: githubContext };
 }
 
 // src/services/bitbucket/client.ts
@@ -832,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;
@@ -1027,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;
@@ -1362,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 = {};
@@ -1675,6 +1788,466 @@ function registerBitbucketCommands(program2) {
   });
 }
 
+// src/services/github/commands.ts
+import { Option } from "commander";
+
+// src/services/github/client.ts
+var GitHubClient = class {
+  constructor(http) {
+    this.http = http;
+  }
+  http;
+  async listPRs(opts) {
+    return this.http.githubPaginate(
+      (page, perPage) => this.http.github(
+        `/repos/${opts.owner}/${opts.repo}/pulls`,
+        {
+          params: {
+            state: opts.state ?? "open",
+            ...opts.head ? { head: opts.head } : {},
+            ...opts.base ? { base: opts.base } : {},
+            per_page: perPage,
+            page
+          }
+        }
+      )
+    );
+  }
+  async getPR(owner, repo, pullNumber) {
+    return this.http.github(`/repos/${owner}/${repo}/pulls/${pullNumber}`);
+  }
+  async createPR(opts) {
+    return this.http.github(
+      `/repos/${opts.owner}/${opts.repo}/pulls`,
+      {
+        method: "POST",
+        body: {
+          title: opts.title,
+          head: opts.head,
+          base: opts.base,
+          ...opts.body !== void 0 ? { body: opts.body } : {},
+          ...opts.draft !== void 0 ? { draft: opts.draft } : {}
+        }
+      }
+    );
+  }
+  async updatePR(opts) {
+    const body = {};
+    if (opts.title !== void 0) body.title = opts.title;
+    if (opts.body !== void 0) body.body = opts.body;
+    if (opts.state !== void 0) body.state = opts.state;
+    if (opts.base !== void 0) body.base = opts.base;
+    return this.http.github(
+      `/repos/${opts.owner}/${opts.repo}/pulls/${opts.pullNumber}`,
+      { method: "PATCH", body }
+    );
+  }
+  async mergePR(opts) {
+    const body = {};
+    if (opts.commitTitle) body.commit_title = opts.commitTitle;
+    if (opts.commitMessage) body.commit_message = opts.commitMessage;
+    if (opts.mergeMethod) body.merge_method = opts.mergeMethod;
+    return this.http.github(
+      `/repos/${opts.owner}/${opts.repo}/pulls/${opts.pullNumber}/merge`,
+      { method: "PUT", body }
+    );
+  }
+  async closePR(owner, repo, pullNumber) {
+    return this.updatePR({ owner, repo, pullNumber, state: "closed" });
+  }
+  async listComments(owner, repo, pullNumber) {
+    return this.http.githubPaginate(
+      (page, perPage) => this.http.github(
+        `/repos/${owner}/${repo}/issues/${pullNumber}/comments`,
+        { params: { per_page: perPage, page } }
+      )
+    );
+  }
+  async addComment(owner, repo, pullNumber, body) {
+    return this.http.github(
+      `/repos/${owner}/${repo}/issues/${pullNumber}/comments`,
+      { method: "POST", body: { body } }
+    );
+  }
+  async listReviewComments(owner, repo, pullNumber) {
+    return this.http.githubPaginate(
+      (page, perPage) => this.http.github(
+        `/repos/${owner}/${repo}/pulls/${pullNumber}/comments`,
+        { params: { per_page: perPage, page } }
+      )
+    );
+  }
+  async addInlineComment(opts) {
+    return this.http.github(
+      `/repos/${opts.owner}/${opts.repo}/pulls/${opts.pullNumber}/comments`,
+      {
+        method: "POST",
+        body: {
+          body: opts.body,
+          commit_id: opts.commitId,
+          path: opts.path,
+          line: opts.line,
+          side: opts.side ?? "RIGHT"
+        }
+      }
+    );
+  }
+  async replyComment(owner, repo, pullNumber, commentId, body) {
+    return this.http.github(
+      `/repos/${owner}/${repo}/pulls/${pullNumber}/comments/${commentId}/replies`,
+      { method: "POST", body: { body } }
+    );
+  }
+  async deleteComment(owner, repo, commentId) {
+    await this.http.github(
+      `/repos/${owner}/${repo}/issues/comments/${commentId}`,
+      { method: "DELETE" }
+    );
+  }
+  async deleteReviewComment(owner, repo, commentId) {
+    await this.http.github(
+      `/repos/${owner}/${repo}/pulls/comments/${commentId}`,
+      { method: "DELETE" }
+    );
+  }
+  async getDiff(owner, repo, pullNumber) {
+    return this.http.githubText(`/repos/${owner}/${repo}/pulls/${pullNumber}`);
+  }
+  async listFiles(owner, repo, pullNumber) {
+    return this.http.githubPaginate(
+      (page, perPage) => this.http.github(
+        `/repos/${owner}/${repo}/pulls/${pullNumber}/files`,
+        { params: { per_page: perPage, page } }
+      )
+    );
+  }
+  async listReviews(owner, repo, pullNumber) {
+    return this.http.githubPaginate(
+      (page, perPage) => this.http.github(
+        `/repos/${owner}/${repo}/pulls/${pullNumber}/reviews`,
+        { params: { per_page: perPage, page } }
+      )
+    );
+  }
+  async submitReview(opts) {
+    return this.http.github(
+      `/repos/${opts.owner}/${opts.repo}/pulls/${opts.pullNumber}/reviews`,
+      {
+        method: "POST",
+        body: {
+          event: opts.event,
+          ...opts.body !== void 0 ? { body: opts.body } : {}
+        }
+      }
+    );
+  }
+  async listRequestedReviewers(owner, repo, pullNumber) {
+    return this.http.github(
+      `/repos/${owner}/${repo}/pulls/${pullNumber}/requested_reviewers`
+    );
+  }
+  async getCommitStatuses(owner, repo, ref) {
+    return this.http.github(`/repos/${owner}/${repo}/commits/${ref}/status`);
+  }
+  async listCheckRuns(owner, repo, ref) {
+    const results = [];
+    let page = 1;
+    const perPage = 100;
+    while (true) {
+      const result = await this.http.github(
+        `/repos/${owner}/${repo}/commits/${ref}/check-runs`,
+        { params: { per_page: perPage, page } }
+      );
+      const runs = result.check_runs ?? [];
+      results.push(...runs);
+      if (runs.length < perPage) break;
+      page++;
+    }
+    return results;
+  }
+};
+
+// src/services/github/commands.ts
+function getClient3(program2, overrides) {
+  const opts = program2.optsWithGlobals();
+  const config = loadConfig({ configPath: opts.config });
+  const http = createHttpClient(config, Boolean(opts.dryRun));
+  const client = new GitHubClient(http);
+  const ctx = getGitContext(config);
+  const owner = overrides?.owner ?? opts.owner ?? ctx?.github?.owner ?? config.defaults.github?.owner ?? "";
+  const repo = overrides?.repo ?? opts.repo ?? ctx?.github?.repo ?? config.defaults.github?.repo ?? "";
+  if (!owner || !repo) {
+    throw new PncliError(
+      "Could not determine GitHub owner/repo. Pass --owner and --repo, or run pncli config init.",
+      1
+    );
+  }
+  return { client, owner, repo, config };
+}
+function registerGitHubCommands(program2) {
+  const gh = program2.command("github").description("GitHub repository operations").option("--owner <owner>", "GitHub owner (user or org)").option("--repo <repo>", "GitHub repository name");
+  gh.command("list-prs").description("List pull requests").addOption(new Option("--state <state>", "PR state").choices(["open", "closed", "all"]).default("open")).option("--head <branch>", "Filter by head branch (user:branch)").option("--base <branch>", "Filter by base branch").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { client, owner, repo } = getClient3(gh);
+      const data = await client.listPRs({
+        owner,
+        repo,
+        state: opts.state,
+        head: opts.head,
+        base: opts.base
+      });
+      success(data, "github", "list-prs", start);
+    } catch (err) {
+      fail(err, "github", "list-prs", start);
+    }
+  });
+  gh.command("get-pr").description("Get a pull request by number").requiredOption("--number <n>", "Pull request number").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { client, owner, repo } = getClient3(gh);
+      const data = await client.getPR(owner, repo, parseInt(opts.number, 10));
+      success(data, "github", "get-pr", start);
+    } catch (err) {
+      fail(err, "github", "get-pr", start);
+    }
+  });
+  gh.command("create-pr").description("Create a pull request").requiredOption("--title <title>", "PR title").requiredOption("--head <branch>", "Source branch (or user:branch for forks)").option("--base <branch>", "Target branch (defaults to config or main)").option("--body <body>", "PR description").option("--draft", "Create as draft PR").option("--owner <owner>", "GitHub owner (overrides parent --owner)").option("--repo <repo>", "GitHub repository name (overrides parent --repo)").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { client, owner, repo, config } = getClient3(gh, { owner: opts.owner, repo: opts.repo });
+      const base = opts.base ?? config.defaults.github?.targetBranch ?? "main";
+      const data = await client.createPR({
+        owner,
+        repo,
+        title: opts.title,
+        head: opts.head,
+        base,
+        body: opts.body,
+        draft: opts.draft
+      });
+      success(data, "github", "create-pr", start);
+    } catch (err) {
+      fail(err, "github", "create-pr", start);
+    }
+  });
+  gh.command("update-pr").description("Update a pull request").requiredOption("--number <n>", "Pull request number").option("--title <title>", "New title").option("--body <body>", "New description").option("--base <branch>", "New base branch").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { client, owner, repo } = getClient3(gh);
+      const data = await client.updatePR({
+        owner,
+        repo,
+        pullNumber: parseInt(opts.number, 10),
+        title: opts.title,
+        body: opts.body,
+        base: opts.base
+      });
+      success(data, "github", "update-pr", start);
+    } catch (err) {
+      fail(err, "github", "update-pr", start);
+    }
+  });
+  gh.command("merge-pr").description("Merge a pull request").requiredOption("--number <n>", "Pull request number").addOption(new Option("--method <method>", "Merge method").choices(["merge", "squash", "rebase"]).default("merge")).option("--commit-title <title>", "Commit title for merge/squash").option("--commit-message <msg>", "Commit message for merge/squash").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { client, owner, repo } = getClient3(gh);
+      const data = await client.mergePR({
+        owner,
+        repo,
+        pullNumber: parseInt(opts.number, 10),
+        mergeMethod: opts.method,
+        commitTitle: opts.commitTitle,
+        commitMessage: opts.commitMessage
+      });
+      success(data, "github", "merge-pr", start);
+    } catch (err) {
+      fail(err, "github", "merge-pr", start);
+    }
+  });
+  gh.command("close-pr").description("Close a pull request").requiredOption("--number <n>", "Pull request number").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { client, owner, repo } = getClient3(gh);
+      const data = await client.closePR(owner, repo, parseInt(opts.number, 10));
+      success(data, "github", "close-pr", start);
+    } catch (err) {
+      fail(err, "github", "close-pr", start);
+    }
+  });
+  gh.command("list-comments").description("List general comments on a pull request").requiredOption("--number <n>", "Pull request number").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { client, owner, repo } = getClient3(gh);
+      const data = await client.listComments(owner, repo, parseInt(opts.number, 10));
+      success(data, "github", "list-comments", start);
+    } catch (err) {
+      fail(err, "github", "list-comments", start);
+    }
+  });
+  gh.command("add-comment").description("Add a general comment to a pull request").requiredOption("--number <n>", "Pull request number").requiredOption("--body <text>", "Comment text").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { client, owner, repo } = getClient3(gh);
+      const data = await client.addComment(owner, repo, parseInt(opts.number, 10), opts.body);
+      success(data, "github", "add-comment", start);
+    } catch (err) {
+      fail(err, "github", "add-comment", start);
+    }
+  });
+  gh.command("list-review-comments").description("List inline review comments on a pull request").requiredOption("--number <n>", "Pull request number").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { client, owner, repo } = getClient3(gh);
+      const data = await client.listReviewComments(owner, repo, parseInt(opts.number, 10));
+      success(data, "github", "list-review-comments", start);
+    } catch (err) {
+      fail(err, "github", "list-review-comments", start);
+    }
+  });
+  gh.command("add-inline-comment").description("Add an inline review comment to a file in a pull request").requiredOption("--number <n>", "Pull request number").requiredOption("--commit <sha>", "Commit SHA the comment is on").requiredOption("--file <path>", "File path").requiredOption("--line <n>", "Line number").requiredOption("--body <text>", "Comment text").addOption(new Option("--side <side>", "Comment side").choices(["LEFT", "RIGHT"]).default("RIGHT")).action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { client, owner, repo } = getClient3(gh);
+      const data = await client.addInlineComment({
+        owner,
+        repo,
+        pullNumber: parseInt(opts.number, 10),
+        body: opts.body,
+        commitId: opts.commit,
+        path: opts.file,
+        line: parseInt(opts.line, 10),
+        side: opts.side
+      });
+      success(data, "github", "add-inline-comment", start);
+    } catch (err) {
+      fail(err, "github", "add-inline-comment", start);
+    }
+  });
+  gh.command("reply-comment").description("Reply to a review comment on a pull request").requiredOption("--number <n>", "Pull request number").requiredOption("--comment-id <id>", "Review comment ID to reply to").requiredOption("--body <text>", "Reply text").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { client, owner, repo } = getClient3(gh);
+      const data = await client.replyComment(owner, repo, parseInt(opts.number, 10), parseInt(opts.commentId, 10), opts.body);
+      success(data, "github", "reply-comment", start);
+    } catch (err) {
+      fail(err, "github", "reply-comment", start);
+    }
+  });
+  gh.command("delete-comment").description("Delete a general issue comment").requiredOption("--comment-id <id>", "Comment ID").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { client, owner, repo } = getClient3(gh);
+      await client.deleteComment(owner, repo, parseInt(opts.commentId, 10));
+      success({ deleted: true }, "github", "delete-comment", start);
+    } catch (err) {
+      fail(err, "github", "delete-comment", start);
+    }
+  });
+  gh.command("delete-review-comment").description("Delete an inline review comment").requiredOption("--comment-id <id>", "Review comment ID").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { client, owner, repo } = getClient3(gh);
+      await client.deleteReviewComment(owner, repo, parseInt(opts.commentId, 10));
+      success({ deleted: true }, "github", "delete-review-comment", start);
+    } catch (err) {
+      fail(err, "github", "delete-review-comment", start);
+    }
+  });
+  gh.command("diff").description("Get unified diff for a pull request").requiredOption("--number <n>", "Pull request number").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { client, owner, repo } = getClient3(gh);
+      const diff = await client.getDiff(owner, repo, parseInt(opts.number, 10));
+      success({ diff }, "github", "diff", start);
+    } catch (err) {
+      fail(err, "github", "diff", start);
+    }
+  });
+  gh.command("list-files").description("List files changed in a pull request").requiredOption("--number <n>", "Pull request number").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { client, owner, repo } = getClient3(gh);
+      const data = await client.listFiles(owner, repo, parseInt(opts.number, 10));
+      success(data, "github", "list-files", start);
+    } catch (err) {
+      fail(err, "github", "list-files", start);
+    }
+  });
+  gh.command("list-reviews").description("List reviews on a pull request").requiredOption("--number <n>", "Pull request number").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { client, owner, repo } = getClient3(gh);
+      const data = await client.listReviews(owner, repo, parseInt(opts.number, 10));
+      success(data, "github", "list-reviews", start);
+    } catch (err) {
+      fail(err, "github", "list-reviews", start);
+    }
+  });
+  gh.command("approve").description("Approve a pull request").requiredOption("--number <n>", "Pull request number").option("--body <text>", "Review body text").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { client, owner, repo } = getClient3(gh);
+      const data = await client.submitReview({
+        owner,
+        repo,
+        pullNumber: parseInt(opts.number, 10),
+        event: "APPROVE",
+        body: opts.body
+      });
+      success(data, "github", "approve", start);
+    } catch (err) {
+      fail(err, "github", "approve", start);
+    }
+  });
+  gh.command("request-changes").description("Request changes on a pull request").requiredOption("--number <n>", "Pull request number").requiredOption("--body <text>", "Review feedback text").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { client, owner, repo } = getClient3(gh);
+      const data = await client.submitReview({
+        owner,
+        repo,
+        pullNumber: parseInt(opts.number, 10),
+        event: "REQUEST_CHANGES",
+        body: opts.body
+      });
+      success(data, "github", "request-changes", start);
+    } catch (err) {
+      fail(err, "github", "request-changes", start);
+    }
+  });
+  gh.command("list-reviewers").description("List requested reviewers for a pull request").requiredOption("--number <n>", "Pull request number").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { client, owner, repo } = getClient3(gh);
+      const data = await client.listRequestedReviewers(owner, repo, parseInt(opts.number, 10));
+      success(data, "github", "list-reviewers", start);
+    } catch (err) {
+      fail(err, "github", "list-reviewers", start);
+    }
+  });
+  gh.command("get-status").description("Get combined commit status for a ref (branch, tag, or SHA)").requiredOption("--ref <ref>", "Git ref (branch, tag, or commit SHA)").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { client, owner, repo } = getClient3(gh);
+      const data = await client.getCommitStatuses(owner, repo, opts.ref);
+      success(data, "github", "get-status", start);
+    } catch (err) {
+      fail(err, "github", "get-status", start);
+    }
+  });
+  gh.command("list-checks").description("List check runs for a ref (branch, tag, or SHA)").requiredOption("--ref <ref>", "Git ref (branch, tag, or commit SHA)").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { client, owner, repo } = getClient3(gh);
+      const data = await client.listCheckRuns(owner, repo, opts.ref);
+      success(data, "github", "list-checks", start);
+    } catch (err) {
+      fail(err, "github", "list-checks", start);
+    }
+  });
+}
+
 // src/services/confluence/client.ts
 var API3 = "/rest/api";
 var ConfluenceClient = class {
@@ -1823,7 +2396,7 @@ var ConfluenceClient = class {
 };
 
 // src/services/confluence/commands.ts
-function getClient3(program2) {
+function getClient4(program2) {
   const opts = program2.optsWithGlobals();
   const config = loadConfig({ configPath: opts.config });
   if (!config.confluence.baseUrl) throw new PncliError("Confluence not configured. Run: pncli config init");
@@ -1835,7 +2408,7 @@ function registerConfluenceCommands(program2) {
   confluence.command("get-page").description("Get a Confluence page by ID").requiredOption("--id <page-id>", "Page ID").option("--expand <fields>", "Comma-separated fields to expand", "body.storage,version,space,ancestors").action(async (opts) => {
     const start = Date.now();
     try {
-      const client = getClient3(program2);
+      const client = getClient4(program2);
       const data = await client.getPage(opts.id, opts.expand);
       success(data, "confluence", "get-page", start);
     } catch (err) {
@@ -1845,7 +2418,7 @@ function registerConfluenceCommands(program2) {
   confluence.command("get-page-by-title").description("Find a Confluence page by space key and title").requiredOption("--space <key>", "Space key").requiredOption("--title <title>", "Page title").action(async (opts) => {
     const start = Date.now();
     try {
-      const client = getClient3(program2);
+      const client = getClient4(program2);
       const data = await client.getPageByTitle(opts.space, opts.title);
       if (!data) throw new PncliError(`Page not found: "${opts.title}" in space ${opts.space}`, 1);
       success(data, "confluence", "get-page-by-title", start);
@@ -1856,7 +2429,7 @@ function registerConfluenceCommands(program2) {
   confluence.command("list-pages").description("List pages in a Confluence space (consider --output-file for large results)").requiredOption("--space <key>", "Space key").option("--limit <n>", "Max total pages to return (default: all)").option("--start <n>", "Offset for first result").action(async (opts) => {
     const start = Date.now();
     try {
-      const client = getClient3(program2);
+      const client = getClient4(program2);
       const data = await client.listPages(opts.space, {
         limit: opts.limit ? parseInt(opts.limit, 10) : void 0,
         start: opts.start ? parseInt(opts.start, 10) : void 0
@@ -1869,7 +2442,7 @@ function registerConfluenceCommands(program2) {
   confluence.command("get-page-children").description("Get child pages of a Confluence page").requiredOption("--id <page-id>", "Parent page ID").action(async (opts) => {
     const start = Date.now();
     try {
-      const client = getClient3(program2);
+      const client = getClient4(program2);
       const data = await client.getPageChildren(opts.id);
       success(data, "confluence", "get-page-children", start);
     } catch (err) {
@@ -1879,7 +2452,7 @@ function registerConfluenceCommands(program2) {
   confluence.command("get-labels").description("Get labels on a Confluence page").requiredOption("--id <page-id>", "Page ID").action(async (opts) => {
     const start = Date.now();
     try {
-      const client = getClient3(program2);
+      const client = getClient4(program2);
       const data = await client.getLabels(opts.id);
       success(data, "confluence", "get-labels", start);
     } catch (err) {
@@ -1889,7 +2462,7 @@ function registerConfluenceCommands(program2) {
   confluence.command("search").description("Search Confluence with CQL").requiredOption("--cql <query>", 'CQL query string (e.g. "space=PROJ AND type=page")').option("--limit <n>", "Maximum number of results", "25").option("--start <n>", "Offset for first result", "0").option("--expand <fields>", "Comma-separated fields to expand").action(async (opts) => {
     const start = Date.now();
     try {
-      const client = getClient3(program2);
+      const client = getClient4(program2);
       const data = await client.search(opts.cql, {
         limit: parseInt(opts.limit, 10),
         start: parseInt(opts.start, 10),
@@ -1903,7 +2476,7 @@ function registerConfluenceCommands(program2) {
   confluence.command("create-page").description("Create a new Confluence page").requiredOption("--space <key>", "Space key").requiredOption("--title <title>", "Page title").requiredOption("--body <html>", "Page body (storage format HTML)").option("--parent-id <id>", "Parent page ID (to nest under a page)").option("--representation <format>", "Body format: storage (default) or wiki", "storage").action(async (opts) => {
     const start = Date.now();
     try {
-      const client = getClient3(program2);
+      const client = getClient4(program2);
       const data = await client.createPage({
         spaceKey: opts.space,
         title: opts.title,
@@ -1919,7 +2492,7 @@ function registerConfluenceCommands(program2) {
   confluence.command("update-page").description("Update a Confluence page (fetches current version automatically)").requiredOption("--id <page-id>", "Page ID").option("--title <title>", "New page title").option("--body <html>", "New page body (storage format HTML)").option("--status <status>", "Page status: current (default) or draft", "current").option("--representation <format>", "Body format: storage (default) or wiki", "storage").action(async (opts) => {
     const start = Date.now();
     try {
-      const client = getClient3(program2);
+      const client = getClient4(program2);
       const current = await client.getPage(opts.id, "version");
       const nextVersion = current.version.number + 1;
       const data = await client.updatePage(opts.id, {
@@ -1937,7 +2510,7 @@ function registerConfluenceCommands(program2) {
   confluence.command("delete-page").description("Delete a Confluence page").requiredOption("--id <page-id>", "Page ID").action(async (opts) => {
     const start = Date.now();
     try {
-      const client = getClient3(program2);
+      const client = getClient4(program2);
       await client.deletePage(opts.id);
       success({ deleted: opts.id }, "confluence", "delete-page", start);
     } catch (err) {
@@ -1947,7 +2520,7 @@ function registerConfluenceCommands(program2) {
   confluence.command("list-comments").description("List comments on a Confluence page").requiredOption("--id <page-id>", "Page ID").action(async (opts) => {
     const start = Date.now();
     try {
-      const client = getClient3(program2);
+      const client = getClient4(program2);
       const data = await client.listComments(opts.id);
       success(data, "confluence", "list-comments", start);
     } catch (err) {
@@ -1957,7 +2530,7 @@ function registerConfluenceCommands(program2) {
   confluence.command("add-comment").description("Add a comment to a Confluence page").requiredOption("--id <page-id>", "Page ID").requiredOption("--body <text>", "Comment body (storage format HTML)").option("--representation <format>", "Body format: storage (default) or wiki", "storage").action(async (opts) => {
     const start = Date.now();
     try {
-      const client = getClient3(program2);
+      const client = getClient4(program2);
       const data = await client.addComment(opts.id, opts.body, opts.representation);
       success(data, "confluence", "add-comment", start);
     } catch (err) {
@@ -1967,7 +2540,7 @@ function registerConfluenceCommands(program2) {
   confluence.command("add-label").description("Add labels to a Confluence page").requiredOption("--id <page-id>", "Page ID").requiredOption("--labels <names>", "Comma-separated label names").action(async (opts) => {
     const start = Date.now();
     try {
-      const client = getClient3(program2);
+      const client = getClient4(program2);
       const labels = opts.labels.split(",").map((s) => s.trim()).filter(Boolean);
       const data = await client.addLabel(opts.id, labels);
       success(data, "confluence", "add-label", start);
@@ -1978,7 +2551,7 @@ function registerConfluenceCommands(program2) {
   confluence.command("remove-label").description("Remove a label from a Confluence page").requiredOption("--id <page-id>", "Page ID").requiredOption("--label <name>", "Label name to remove").action(async (opts) => {
     const start = Date.now();
     try {
-      const client = getClient3(program2);
+      const client = getClient4(program2);
       await client.removeLabel(opts.id, opts.label);
       success({ removed: opts.label, from: opts.id }, "confluence", "remove-label", start);
     } catch (err) {
@@ -1988,7 +2561,7 @@ function registerConfluenceCommands(program2) {
   confluence.command("list-spaces").description("List Confluence spaces").option("--type <type>", "Space type: global or personal").option("--limit <n>", "Max total spaces to return (default: all)").action(async (opts) => {
     const start = Date.now();
     try {
-      const client = getClient3(program2);
+      const client = getClient4(program2);
       const data = await client.listSpaces({
         type: opts.type,
         limit: opts.limit ? parseInt(opts.limit, 10) : void 0
@@ -2001,7 +2574,7 @@ function registerConfluenceCommands(program2) {
   confluence.command("get-space").description("Get a Confluence space by key").requiredOption("--key <space-key>", "Space key").action(async (opts) => {
     const start = Date.now();
     try {
-      const client = getClient3(program2);
+      const client = getClient4(program2);
       const data = await client.getSpace(opts.key);
       success(data, "confluence", "get-space", start);
     } catch (err) {
@@ -2011,7 +2584,7 @@ function registerConfluenceCommands(program2) {
   confluence.command("list-attachments").description("List attachments on a Confluence page").requiredOption("--id <page-id>", "Page ID").action(async (opts) => {
     const start = Date.now();
     try {
-      const client = getClient3(program2);
+      const client = getClient4(program2);
       const data = await client.listAttachments(opts.id);
       success(data, "confluence", "list-attachments", start);
     } catch (err) {
@@ -2123,7 +2696,7 @@ var SonarClient = class {
 
 // src/services/sonar/commands.ts
 var DEFAULT_METRICS = "coverage,duplicated_lines_density,bugs,vulnerabilities,code_smells,sqale_rating,reliability_rating,security_rating,ncloc";
-function getClient4(program2) {
+function getClient5(program2) {
   const opts = program2.optsWithGlobals();
   const config = loadConfig({ configPath: opts.config });
   if (!config.sonar.baseUrl) throw new PncliError("SonarQube not configured. Run: pncli config init");
@@ -2140,7 +2713,7 @@ function registerSonarCommands(program2) {
   sonar.command("quality-gate").description("Get quality gate status for a project").option("--project <key>", "SonarQube project key (or set defaults.sonar.project in config)").option("--branch <name>", "Branch name").action(async (opts) => {
     const start = Date.now();
     try {
-      const { client, config } = getClient4(program2);
+      const { client, config } = getClient5(program2);
       const projectKey = resolveProject(config, opts.project);
       const data = await client.getQualityGate(projectKey, opts.branch);
       success(data, "sonar", "quality-gate", start);
@@ -2151,7 +2724,7 @@ function registerSonarCommands(program2) {
   sonar.command("issues").description("Search/list issues for a project").option("--project <key>", "SonarQube project key (or set defaults.sonar.project in config)").option("--severities <list>", "Filter by severity: BLOCKER,CRITICAL,MAJOR,MINOR,INFO (comma-separated)").option("--types <list>", "Filter by type: BUG,VULNERABILITY,CODE_SMELL (comma-separated)").option("--statuses <list>", "Filter by status: OPEN,CONFIRMED,REOPENED,RESOLVED,CLOSED (comma-separated)").option("--branch <name>", "Branch name").option("--resolved <bool>", "Filter resolved issues: true or false").option("--page <n>", "Page number (1-based)", "1").option("--page-size <n>", "Results per page (max 500)", "100").option("--all", "Fetch all pages (consider --output-file for large results; ignores --page/--page-size)").action(async (opts) => {
     const start = Date.now();
     try {
-      const { client, config } = getClient4(program2);
+      const { client, config } = getClient5(program2);
       const projectKey = resolveProject(config, opts.project);
       const baseOpts = {
         projectKey,
@@ -2179,7 +2752,7 @@ function registerSonarCommands(program2) {
   sonar.command("measures").description("Get key metrics for a project").option("--project <key>", "SonarQube project key (or set defaults.sonar.project in config)").option("--metrics <list>", "Comma-separated metric keys", DEFAULT_METRICS).option("--branch <name>", "Branch name").action(async (opts) => {
     const start = Date.now();
     try {
-      const { client, config } = getClient4(program2);
+      const { client, config } = getClient5(program2);
       const projectKey = resolveProject(config, opts.project);
       const data = await client.getMeasures({
         projectKey,
@@ -2194,7 +2767,7 @@ function registerSonarCommands(program2) {
   sonar.command("projects").description("Search/list projects").option("--query <text>", "Search query").option("--page <n>", "Page number (1-based)", "1").option("--page-size <n>", "Results per page", "100").option("--all", "Fetch all pages (consider --output-file for large results)").action(async (opts) => {
     const start = Date.now();
     try {
-      const { client } = getClient4(program2);
+      const { client } = getClient5(program2);
       if (opts.all) {
         const data = await client.searchAllProjects(opts.query);
         success(data, "sonar", "projects", start);
@@ -2213,7 +2786,7 @@ function registerSonarCommands(program2) {
   sonar.command("hotspots").description("List security hotspots for a project").option("--project <key>", "SonarQube project key (or set defaults.sonar.project in config)").option("--status <status>", "Filter: TO_REVIEW or REVIEWED").option("--resolution <list>", "Filter: FIXED,SAFE,ACKNOWLEDGED (comma-separated)").option("--branch <name>", "Branch name").option("--page <n>", "Page number (1-based)", "1").option("--page-size <n>", "Results per page", "100").option("--all", "Fetch all pages (consider --output-file for large results)").action(async (opts) => {
     const start = Date.now();
     try {
-      const { client, config } = getClient4(program2);
+      const { client, config } = getClient5(program2);
       const projectKey = resolveProject(config, opts.project);
       const baseOpts = {
         projectKey,
@@ -2369,7 +2942,7 @@ var SdeClient = class {
 };
 
 // src/services/sde/commands.ts
-function getClient5(program2) {
+function getClient6(program2) {
   const opts = program2.optsWithGlobals();
   const config = loadConfig({ configPath: opts.config });
   if (!config.sde.baseUrl) throw new PncliError("SDElements not configured. Run: pncli config init");
@@ -2401,7 +2974,7 @@ function registerSdeCommands(program2) {
   sde.command("server-info").description("Get server version and platform info (requires super-user)").action(async () => {
     const start = Date.now();
     try {
-      const { client } = getClient5(program2);
+      const { client } = getClient6(program2);
       const data = await client.getServerInfo();
       success(data, "sde", "server-info", start);
     } catch (err) {
@@ -2411,7 +2984,7 @@ function registerSdeCommands(program2) {
   sde.command("whoami").description("Get current authenticated user").action(async () => {
     const start = Date.now();
     try {
-      const { client } = getClient5(program2);
+      const { client } = getClient6(program2);
       const data = await client.getMe();
       success(data, "sde", "whoami", start);
     } catch (err) {
@@ -2421,7 +2994,7 @@ function registerSdeCommands(program2) {
   sde.command("users").description("List users").option("--email <email>", "Filter by email address").option("--first-name <name>", "Filter by first name").option("--last-name <name>", "Filter by last name").option("--active <bool>", "Filter by active status: true or false").option("--page <n>", "Page number (1-based)", "1").option("--page-size <n>", "Results per page", "100").option("--all", "Fetch all pages (consider --output-file for large results)").action(async (opts) => {
     const start = Date.now();
     try {
-      const { client } = getClient5(program2);
+      const { client } = getClient6(program2);
       const baseOpts = {
         email: opts.email,
         firstName: opts.firstName,
@@ -2446,7 +3019,7 @@ function registerSdeCommands(program2) {
   sde.command("projects").description("List projects").option("--name <name>", "Filter by project name").option("--search <text>", "Text search on name and profile").option("--active <val>", "Filter by active status: true, false, or all").option("--ordering <field>", "Sort by: name, created, updated (prefix with - for descending)").option("--expand <fields>", "Expand nested fields (comma-separated): application,business_unit,creator").option("--include <fields>", "Include extra fields (comma-separated): task_counts,permissions").option("--page <n>", "Page number (1-based)", "1").option("--page-size <n>", "Results per page", "100").option("--all", "Fetch all pages (consider --output-file for large results)").action(async (opts) => {
     const start = Date.now();
     try {
-      const { client } = getClient5(program2);
+      const { client } = getClient6(program2);
       const baseOpts = {
         name: opts.name,
         search: opts.search,
@@ -2473,7 +3046,7 @@ function registerSdeCommands(program2) {
   sde.command("project").description("Get a single project by ID").option("--id <id>", "Project ID (or set defaults.sde.project in config)").option("--expand <fields>", "Expand nested fields (comma-separated): application,business_unit,creator").option("--include <fields>", "Include extra fields (comma-separated): task_counts,permissions").action(async (opts) => {
     const start = Date.now();
     try {
-      const { client, config } = getClient5(program2);
+      const { client, config } = getClient6(program2);
       const projectId = resolveProject2(config, opts.id);
       const data = await client.getProject(projectId, opts.expand, opts.include);
       success(data, "sde", "project", start);
@@ -2484,7 +3057,7 @@ function registerSdeCommands(program2) {
   sde.command("tasks").description("List countermeasures for a project").option("--project <id>", "Project ID (or set defaults.sde.project in config)").option("--phase <slug>", "Filter by phase slug (e.g. development, architecture-design)").option("--priority <n>", "Filter by priority (1-10)").option("--status <id>", "Filter by status ID (e.g. TS1, TS2)").option("--assigned-to <email>", "Filter by assignee email").option("--source <val>", "Filter by source: default, custom, manual, project").option("--verification <val>", "Filter by verification: pass, fail, partial, none").option("--tag <name>", "Filter by tag name").option("--accepted <bool>", "Filter by accepted status: true or false").option("--relevant <bool>", "Filter by relevant status: true or false").option("--expand <fields>", "Expand nested fields (comma-separated): status,phase,problem,text").option("--include <fields>", "Include extra fields (comma-separated): how_tos,last_note,references,regulation_sections").option("--page <n>", "Page number (1-based)", "1").option("--page-size <n>", "Results per page", "100").option("--all", "Fetch all pages (consider --output-file for large results)").action(async (opts) => {
     const start = Date.now();
     try {
-      const { client, config } = getClient5(program2);
+      const { client, config } = getClient6(program2);
       const projectId = resolveProject2(config, opts.project);
       const baseOpts = {
         projectId,
@@ -2518,7 +3091,7 @@ function registerSdeCommands(program2) {
   sde.command("task").description("Get a single countermeasure").option("--project <id>", "Project ID (or set defaults.sde.project in config)").requiredOption("--task <id>", "Task ID (e.g. T21)").option("--expand <fields>", "Expand nested fields (comma-separated): status,phase,problem,text").option("--include <fields>", "Include extra fields (comma-separated): how_tos,last_note,references").action(async (opts) => {
     const start = Date.now();
     try {
-      const { client, config } = getClient5(program2);
+      const { client, config } = getClient6(program2);
       const projectId = resolveProject2(config, opts.project);
       const data = await client.getTask(projectId, opts.task, opts.expand, opts.include);
       success(data, "sde", "task", start);
@@ -2529,7 +3102,7 @@ function registerSdeCommands(program2) {
   sde.command("threats").description("List threats for a project").option("--project <id>", "Project ID (or set defaults.sde.project in config)").option("--severity <n>", "Filter by severity (1-10)").option("--search <text>", "Full-text search on title and threat ID").option("--ordering <field>", "Sort by: threat__severity, threat_id, status (prefix - for descending)").option("--capec-id <id>", "Filter by CAPEC attack pattern ID").option("--component-id <id>", "Filter by component ID").option("--page <n>", "Page number (1-based)", "1").option("--page-size <n>", "Results per page", "100").option("--all", "Fetch all pages (consider --output-file for large results)").action(async (opts) => {
     const start = Date.now();
     try {
-      const { client, config } = getClient5(program2);
+      const { client, config } = getClient6(program2);
       const projectId = resolveProject2(config, opts.project);
       const baseOpts = {
         projectId,
@@ -2557,7 +3130,7 @@ function registerSdeCommands(program2) {
 }
 
 // src/services/deps/commands.ts
-import { Option } from "commander";
+import { Option as Option2 } from "commander";
 
 // src/services/deps/parsers/index.ts
 import fs from "fs";
@@ -4241,7 +4814,7 @@ async function runLicenseCheck(config, opts) {
 // src/services/deps/commands.ts
 function registerDepsCommands(program2) {
   const deps = program2.command("deps").description("Dependency scanning, CVE detection, and license auditing");
-  deps.command("frisk").description("Scan all dependencies for CVEs and output remediation paths (requires OSV.dev, Sonatype OSS Index, or Sonatype IQ Server)").option("--ecosystem <ecosystem>", "Filter to one ecosystem: npm, nuget, maven, all", "all").option("--direct-only", "Only scan direct dependencies (default: include transitive)", false).option("--include-dev", "Include dev/test dependencies", false).addOption(new Option("--source <source>", "Vulnerability source").choices(["osv", "sonatype", "sonatypeiq", "all"]).default("osv")).option("--application-id <id>", "Sonatype IQ Server application ID (required when --source sonatypeiq)").action(async (opts, cmd) => {
+  deps.command("frisk").description("Scan all dependencies for CVEs and output remediation paths (requires OSV.dev, Sonatype OSS Index, or Sonatype IQ Server)").option("--ecosystem <ecosystem>", "Filter to one ecosystem: npm, nuget, maven, all", "all").option("--direct-only", "Only scan direct dependencies (default: include transitive)", false).option("--include-dev", "Include dev/test dependencies", false).addOption(new Option2("--source <source>", "Vulnerability source").choices(["osv", "sonatype", "sonatypeiq", "all"]).default("osv")).option("--application-id <id>", "Sonatype IQ Server application ID (required when --source sonatypeiq)").action(async (opts, cmd) => {
     const startTime = Date.now();
     try {
       const globalOpts = cmd.optsWithGlobals();
@@ -4441,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);
@@ -4600,6 +5183,16 @@ function registerConfigCommands(program2) {
       } else {
         results.bitbucket = { ok: null, message: "not configured" };
       }
+      if (cfg.github.baseUrl) {
+        try {
+          await http.github("/user");
+          results.github = { ok: true, message: "connected" };
+        } catch (err) {
+          results.github = { ok: false, message: err instanceof Error ? err.message : String(err) };
+        }
+      } else {
+        results.github = { ok: null, message: "not configured" };
+      }
       if (cfg.confluence.baseUrl) {
         try {
           await http.confluence("/rest/api/space", { params: { limit: 1 } });
@@ -4770,6 +5363,18 @@ function registerConfigCommands(program2) {
           results.bitbucket = categorize2(err);
         }
       }
+      if (!cfg.github.token) {
+        results.github = { status: "blank", message: "not configured" };
+      } else if (!cfg.github.baseUrl) {
+        results.github = { status: "error", message: "baseUrl not configured" };
+      } else {
+        try {
+          await http.github("/user", { timeoutMs: 1e4 });
+          results.github = { status: "valid", message: "ok" };
+        } catch (err) {
+          results.github = categorize2(err);
+        }
+      }
       if (!cfg.confluence.apiTokenExplicit && !cfg.jira.apiToken) {
         results.confluence = { status: "blank", message: "not configured" };
       } else if (!cfg.confluence.apiToken) {
@@ -4922,7 +5527,7 @@ function registerConfigCommands(program2) {
       if (statuses.includes("invalid")) process.exitCode = ExitCode.AUTH_ERROR;
       else if (statuses.includes("error")) process.exitCode = ExitCode.NETWORK_ERROR;
       if (cmdOpts.output === "table") {
-        const services = ["jira", "bitbucket", "confluence", "sonar", "sde", "ado", "jenkins", "udeploy", "artifactory", "checkmarx", "servicenow", "contrast", "sonatypeiq", "openshift"];
+        const services = ["jira", "bitbucket", "github", "confluence", "sonar", "sde", "ado", "jenkins", "udeploy", "artifactory", "checkmarx", "servicenow", "contrast", "sonatypeiq", "openshift"];
         const labelWidth = 14;
         const statusWidth = 9;
         for (const svc of services) {
@@ -4936,7 +5541,7 @@ function registerConfigCommands(program2) {
         process.stdout.write("\n");
       } else {
         if (opts.pretty) {
-          const services = ["jira", "bitbucket", "confluence", "sonar", "sde", "ado", "jenkins", "udeploy", "artifactory", "checkmarx", "servicenow", "contrast", "sonatypeiq", "openshift"];
+          const services = ["jira", "bitbucket", "github", "confluence", "sonar", "sde", "ado", "jenkins", "udeploy", "artifactory", "checkmarx", "servicenow", "contrast", "sonatypeiq", "openshift"];
           const labelWidth = 14;
           const statusWidth = 9;
           for (const svc of services) {
@@ -4988,6 +5593,40 @@ async function initGlobalConfig(start) {
   const bitbucketPat = await password({
     message: "Bitbucket personal access token:"
   });
+  process.stderr.write("\n\u2500\u2500 GitHub \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n");
+  const useGitHub = await confirm({
+    message: "Configure GitHub for PR operations?",
+    default: false
+  });
+  let githubBaseUrl = "";
+  let githubToken = "";
+  if (useGitHub) {
+    githubBaseUrl = await input({
+      message: "GitHub API base URL\n  GitHub.com: api.github.com\n  GitHub Enterprise: <host>/api/v3\n  URL: ",
+      default: ""
+    });
+    githubToken = await password({
+      message: "GitHub personal access token (classic or fine-grained):"
+    });
+    if (githubBaseUrl && githubToken) {
+      process.stderr.write("\n  Verifying connection...\n");
+      try {
+        const tempConfig = {
+          ...loadConfig(),
+          github: {
+            baseUrl: normalizeBaseUrl(githubBaseUrl),
+            token: githubToken
+          }
+        };
+        const tempHttp = createHttpClient(tempConfig);
+        await tempHttp.github("/user");
+        process.stderr.write("  Connected.\n");
+      } catch (err) {
+        warn(`Could not connect to GitHub: ${err instanceof Error ? err.message : String(err)}`);
+        warn("Config will be saved anyway. Check your URL and token and re-run pncli config init or pncli config test.");
+      }
+    }
+  }
   process.stderr.write("\n\u2500\u2500 Confluence \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n");
   const confluenceBaseUrl = await input({
     message: "Confluence base URL (e.g. confluence.your-company.com):",
@@ -5495,6 +6134,12 @@ async function initGlobalConfig(start) {
       baseUrl: normalizeBaseUrl(bitbucketBaseUrl) || void 0,
       pat: bitbucketPat || void 0
     },
+    ...useGitHub && githubBaseUrl ? {
+      github: {
+        baseUrl: normalizeBaseUrl(githubBaseUrl),
+        token: githubToken || void 0
+      }
+    } : {},
     ...confluenceBaseUrl || confluenceApiToken ? {
       confluence: {
         baseUrl: normalizeBaseUrl(confluenceBaseUrl) || void 0,
@@ -6233,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 {
@@ -6554,11 +7219,11 @@ function registerAdoRepoCommands(ado) {
       const start = Date.now();
       try {
         const globalOpts = ado.optsWithGlobals();
-        const { loadConfig: lc } = await import("./config-TL5X47RY.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");
-        const { createHttpClient: createHttpClient2 } = await import("./http-OYI4NEKO.js");
+        const { createHttpClient: createHttpClient2 } = await import("./http-5WRBWEM6.js");
         const http = createHttpClient2(config, Boolean(globalOpts.dryRun));
         const coreClient = new AdoCoreClient2(http);
         const me = await coreClient.getConnectionData(collection);
@@ -6816,7 +7481,7 @@ var JenkinsClient = class {
 };
 
 // src/services/jenkins/commands.ts
-function getClient6(program2) {
+function getClient7(program2) {
   const opts = program2.optsWithGlobals();
   const config = loadConfig({ configPath: opts.config });
   if (!config.jenkins.baseUrl) throw new PncliError("Jenkins not configured. Run: pncli config init");
@@ -6850,7 +7515,7 @@ function registerJenkinsCommands(program2) {
   pipeline.command("list").description("List all jobs on the Jenkins instance (or within a folder)").option("--folder <name>", "Folder name to enumerate (supports nested folders: parentFolder/childFolder)").action(async (opts) => {
     const start = Date.now();
     try {
-      const client = getClient6(program2);
+      const client = getClient7(program2);
       const data = await client.listJobs(opts.folder);
       success(data, "jenkins", "pipeline-list", start);
     } catch (err) {
@@ -6860,7 +7525,7 @@ function registerJenkinsCommands(program2) {
   pipeline.command("get").description("Get details for a specific job").requiredOption("--name <job>", "Job name (use folder/job for folder-scoped jobs)").action(async (opts) => {
     const start = Date.now();
     try {
-      const client = getClient6(program2);
+      const client = getClient7(program2);
       const data = await client.getJob(opts.name);
       success(data, "jenkins", "pipeline-get", start);
     } catch (err) {
@@ -6873,7 +7538,7 @@ function registerJenkinsCommands(program2) {
   }, []).option("--wait", "Wait for the build to complete before returning").option("--timeout <s>", "Max wait time in seconds per phase (queue-wait and build-wait each get this budget; default 600)", "600").option("--poll <s>", "Poll interval in seconds (default 10)", "10").action(async (opts) => {
     const start = Date.now();
     try {
-      const client = getClient6(program2);
+      const client = getClient7(program2);
       for (const p of opts.parameter) {
         if (!p.includes("=")) throw new PncliError(`Invalid --parameter "${p}". Expected format: key=value`, 1);
       }
@@ -6906,7 +7571,7 @@ function registerJenkinsCommands(program2) {
   pipeline.command("list-runs").description("List recent builds for a job").requiredOption("--name <job>", "Job name (use folder/job for folder-scoped jobs)").option("--top <n>", "Maximum number of builds to return (default 25)", "25").action(async (opts) => {
     const start = Date.now();
     try {
-      const client = getClient6(program2);
+      const client = getClient7(program2);
       const top = parseInt(opts.top, 10);
       if (isNaN(top) || top <= 0) throw new PncliError(`Invalid --top "${opts.top}". Expected a positive integer.`, 1);
       const data = await client.listBuilds(opts.name, top);
@@ -6918,7 +7583,7 @@ function registerJenkinsCommands(program2) {
   pipeline.command("get-run").description("Get details for a specific build").requiredOption("--name <job>", "Job name (use folder/job for folder-scoped jobs)").requiredOption("--number <n>", "Build number").action(async (opts) => {
     const start = Date.now();
     try {
-      const client = getClient6(program2);
+      const client = getClient7(program2);
       const buildNumber = parseInt(opts.number, 10);
       if (isNaN(buildNumber)) throw new PncliError(`Invalid --number "${opts.number}". Expected an integer.`, 1);
       const data = await client.getBuild(opts.name, buildNumber);
@@ -6930,7 +7595,7 @@ function registerJenkinsCommands(program2) {
   pipeline.command("logs").description("Fetch console log for a build (consider --output-file for large logs)").requiredOption("--name <job>", "Job name (use folder/job for folder-scoped jobs)").requiredOption("--number <n>", "Build number").action(async (opts) => {
     const start = Date.now();
     try {
-      const client = getClient6(program2);
+      const client = getClient7(program2);
       const buildNumber = parseInt(opts.number, 10);
       if (isNaN(buildNumber)) throw new PncliError(`Invalid --number "${opts.number}". Expected an integer.`, 1);
       const text = await client.getConsoleLog(opts.name, buildNumber);
@@ -7022,7 +7687,7 @@ var ArtifactoryClient = class {
 };
 
 // src/services/artifactory/commands.ts
-function getClient7(program2) {
+function getClient8(program2) {
   const opts = program2.optsWithGlobals();
   const config = loadConfig({ configPath: opts.config });
   if (!config.artifactory.baseUrl) throw new PncliError("Artifactory not configured. Run: pncli config init");
@@ -7035,7 +7700,7 @@ function registerArtifactoryCommands(program2) {
   art.command("ping").description("Check Artifactory connectivity and authentication").action(async () => {
     const start = Date.now();
     try {
-      const client = getClient7(program2);
+      const client = getClient8(program2);
       const data = await client.ping();
       success(data, "artifactory", "ping", start);
     } catch (err) {
@@ -7045,7 +7710,7 @@ function registerArtifactoryCommands(program2) {
   art.command("repos").description("List repositories").option("--type <type>", "Filter by type: local, virtual, remote, federated").option("--package-type <type>", "Filter by package type: npm, maven, nuget, docker, pypi, etc.").action(async (opts) => {
     const start = Date.now();
     try {
-      const client = getClient7(program2);
+      const client = getClient8(program2);
       const data = await client.listRepos({ type: opts.type, packageType: opts.packageType });
       success(data, "artifactory", "repos", start);
     } catch (err) {
@@ -7055,7 +7720,7 @@ function registerArtifactoryCommands(program2) {
   art.command("artifact-info <repo> <path>").description("Get metadata for an artifact or folder (checksums, size, timestamps)").action(async (repo, path8) => {
     const start = Date.now();
     try {
-      const client = getClient7(program2);
+      const client = getClient8(program2);
       const data = await client.getStorageInfo(repo, path8);
       success(data, "artifactory", "artifact-info", start);
     } catch (err) {
@@ -7065,7 +7730,7 @@ function registerArtifactoryCommands(program2) {
   art.command("properties-get <repo> <path>").description("Read custom properties on an artifact").action(async (repo, path8) => {
     const start = Date.now();
     try {
-      const client = getClient7(program2);
+      const client = getClient8(program2);
       const data = await client.getProperties(repo, path8);
       success(data, "artifactory", "properties-get", start);
     } catch (err) {
@@ -7082,7 +7747,7 @@ function registerArtifactoryCommands(program2) {
         if (eq < 1) throw new PncliError(`Invalid property format: "${kv}" \u2014 expected key=value`);
         properties[kv.slice(0, eq)] = kv.slice(eq + 1);
       }
-      const client = getClient7(program2);
+      const client = getClient8(program2);
       await client.setProperties(repo, path8, properties, { recursive: opts.recursive });
       success({ repo, path: path8, properties }, "artifactory", "properties-set", start);
     } catch (err) {
@@ -7095,7 +7760,7 @@ function registerArtifactoryCommands(program2) {
       if (!opts.repo && !opts.name && !opts.path) {
         throw new PncliError("Provide at least one filter: --repo, --name, or --path");
       }
-      const client = getClient7(program2);
+      const client = getClient8(program2);
       const data = await client.searchAql({
         repo: opts.repo,
         name: opts.name,
@@ -7113,7 +7778,7 @@ function registerArtifactoryCommands(program2) {
   art.command("builds").description('List builds registered in Artifactory Build Integration (names may differ from ADO pipeline or uDeploy component names; use "search --repo" when empty)').option("--timeout <s>", "Request timeout in seconds (default 60; increase for large Artifactory instances)", "60").action(async (opts) => {
     const start = Date.now();
     try {
-      const client = getClient7(program2);
+      const client = getClient8(program2);
       const timeoutSecs = parseInt(opts.timeout, 10);
       if (isNaN(timeoutSecs) || timeoutSecs <= 0) throw new PncliError("--timeout must be a positive integer (seconds)", 1);
       const timeoutMs = timeoutSecs * 1e3;
@@ -7126,7 +7791,7 @@ function registerArtifactoryCommands(program2) {
   art.command("build-runs <name>").description("List all run numbers for a build").action(async (name) => {
     const start = Date.now();
     try {
-      const client = getClient7(program2);
+      const client = getClient8(program2);
       const data = await client.listBuildRuns(name);
       success(data, "artifactory", "build-runs", start);
     } catch (err) {
@@ -7136,7 +7801,7 @@ function registerArtifactoryCommands(program2) {
   art.command("build-info <name> <number>").description("Get build info (artifacts, dependencies, VCS revision) for a specific run").action(async (name, number) => {
     const start = Date.now();
     try {
-      const client = getClient7(program2);
+      const client = getClient8(program2);
       const data = await client.getBuildInfo(name, number);
       success(data, "artifactory", "build-info", start);
     } catch (err) {
@@ -7208,7 +7873,7 @@ var UdeployClient = class {
 // src/services/udeploy/commands.ts
 var POLL_INTERVAL_MS2 = 5e3;
 var DEFAULT_TIMEOUT_MS = 10 * 60 * 1e3;
-function getClient8(program2) {
+function getClient9(program2) {
   const opts = program2.optsWithGlobals();
   const config = loadConfig({ configPath: opts.config });
   if (!config.udeploy.baseUrl) {
@@ -7232,7 +7897,7 @@ function registerUdeployCommands(program2) {
   udeploy.command("apps").description("List all applications").action(async () => {
     const start = Date.now();
     try {
-      const { client } = getClient8(program2);
+      const { client } = getClient9(program2);
       const apps = await client.listApplications();
       success(apps, "udeploy", "apps", start);
     } catch (err) {
@@ -7242,7 +7907,7 @@ function registerUdeployCommands(program2) {
   udeploy.command("environments").description("List environments for an application").action(async () => {
     const start = Date.now();
     try {
-      const { client, config } = getClient8(program2);
+      const { client, config } = getClient9(program2);
       const parentOpts = udeploy.opts();
       const application = resolveApplication(config, parentOpts.application);
       const envs = await client.listEnvironments(application);
@@ -7254,7 +7919,7 @@ function registerUdeployCommands(program2) {
   udeploy.command("components").description("List all components").action(async () => {
     const start = Date.now();
     try {
-      const { client } = getClient8(program2);
+      const { client } = getClient9(program2);
       const components = await client.listComponents();
       success(components, "udeploy", "components", start);
     } catch (err) {
@@ -7264,7 +7929,7 @@ function registerUdeployCommands(program2) {
   udeploy.command("versions").description("List versions for a component").requiredOption("--component <name>", "Component name or ID").action(async (cmdOpts) => {
     const start = Date.now();
     try {
-      const { client } = getClient8(program2);
+      const { client } = getClient9(program2);
       const versions = await client.listVersions(cmdOpts.component);
       success(versions, "udeploy", "versions", start);
     } catch (err) {
@@ -7274,7 +7939,7 @@ function registerUdeployCommands(program2) {
   udeploy.command("import-version").description("Create a component version and mark it ready for deployment").requiredOption("--component <name>", "Component name or ID").requiredOption("--name <name>", "Version name").option("--no-finish", "Skip marking the version as finished importing").action(async (cmdOpts) => {
     const start = Date.now();
     try {
-      const { client } = getClient8(program2);
+      const { client } = getClient9(program2);
       const created = await client.createVersion(cmdOpts.component, cmdOpts.name);
       if (cmdOpts.finish) {
         await client.finishImporting(cmdOpts.component, cmdOpts.name);
@@ -7287,7 +7952,7 @@ function registerUdeployCommands(program2) {
   udeploy.command("run").description("Run an application deployment process").requiredOption("--process <name>", "Application process name or ID").option("--component <name>", "Component name (repeatable)", collect, []).option("--component-version <name>", "Component version (repeatable; positionally paired with --component)", collect, []).option("--snapshot <name>", "Snapshot name or ID (alternative to specifying versions)").option("--only-changed", "Deploy only changed components", false).option("--wait", "Poll until the process completes", false).option("--timeout <ms>", "Max wait time in milliseconds", String(DEFAULT_TIMEOUT_MS)).action(async (cmdOpts) => {
     const start = Date.now();
     try {
-      const { client, config } = getClient8(program2);
+      const { client, config } = getClient9(program2);
       const parentOpts = udeploy.opts();
       const application = resolveApplication(config, parentOpts.application);
       const environment = resolveEnvironment(config, parentOpts.environment);
@@ -7340,7 +8005,7 @@ function registerUdeployCommands(program2) {
   udeploy.command("request-status").description("Get the current status of a deployment process request").requiredOption("--request-id <id>", "Request ID returned by udeploy run").action(async (cmdOpts) => {
     const start = Date.now();
     try {
-      const { client } = getClient8(program2);
+      const { client } = getClient9(program2);
       const status = await client.getRequestStatus(cmdOpts.requestId);
       success(status, "udeploy", "request-status", start);
     } catch (err) {
@@ -7350,7 +8015,7 @@ function registerUdeployCommands(program2) {
   udeploy.command("request-info").description("Get full details of a deployment process request").requiredOption("--request-id <id>", "Request ID returned by udeploy run").action(async (cmdOpts) => {
     const start = Date.now();
     try {
-      const { client } = getClient8(program2);
+      const { client } = getClient9(program2);
       const info = await client.getRequestInfo(cmdOpts.requestId);
       success(info, "udeploy", "request-info", start);
     } catch (err) {
@@ -7394,7 +8059,7 @@ var CheckmarxClient = class {
 };
 
 // src/services/checkmarx/commands.ts
-function getClient9(program2) {
+function getClient10(program2) {
   const opts = program2.optsWithGlobals();
   const config = loadConfig({ configPath: opts.config });
   if (!config.checkmarx.baseUrl) throw new PncliError("Checkmarx not configured. Run: pncli config init");
@@ -7408,7 +8073,7 @@ function registerCheckmarxCommands(program2) {
   project.command("list").description("List all projects").action(async () => {
     const start = Date.now();
     try {
-      const data = await getClient9(program2).listProjects();
+      const data = await getClient10(program2).listProjects();
       success(data, "checkmarx", "project-list", start);
     } catch (err) {
       fail(err, "checkmarx", "project-list", start);
@@ -7419,7 +8084,7 @@ function registerCheckmarxCommands(program2) {
     try {
       const id = parseInt(opts.id, 10);
       if (isNaN(id)) throw new PncliError(`Invalid --id "${opts.id}". Expected an integer.`, 1);
-      const data = await getClient9(program2).getProject(id);
+      const data = await getClient10(program2).getProject(id);
       success(data, "checkmarx", "project-get", start);
     } catch (err) {
       fail(err, "checkmarx", "project-get", start);
@@ -7432,7 +8097,7 @@ function registerCheckmarxCommands(program2) {
       const last = opts.last ? parseInt(opts.last, 10) : void 0;
       if (opts.project && isNaN(projectId)) throw new PncliError(`Invalid --project "${opts.project}". Expected an integer.`, 1);
       if (opts.last && isNaN(last)) throw new PncliError(`Invalid --last "${opts.last}". Expected an integer.`, 1);
-      const data = await getClient9(program2).listScans({ projectId, last });
+      const data = await getClient10(program2).listScans({ projectId, last });
       success(data, "checkmarx", "scan-list", start);
     } catch (err) {
       fail(err, "checkmarx", "scan-list", start);
@@ -7443,7 +8108,7 @@ function registerCheckmarxCommands(program2) {
     try {
       const id = parseInt(opts.id, 10);
       if (isNaN(id)) throw new PncliError(`Invalid --id "${opts.id}". Expected an integer.`, 1);
-      const data = await getClient9(program2).getScan(id);
+      const data = await getClient10(program2).getScan(id);
       success(data, "checkmarx", "scan-get", start);
     } catch (err) {
       fail(err, "checkmarx", "scan-get", start);
@@ -7454,7 +8119,7 @@ function registerCheckmarxCommands(program2) {
     try {
       const id = parseInt(opts.id, 10);
       if (isNaN(id)) throw new PncliError(`Invalid --id "${opts.id}". Expected an integer.`, 1);
-      const data = await getClient9(program2).getScanResultsStatistics(id);
+      const data = await getClient10(program2).getScanResultsStatistics(id);
       success(data, "checkmarx", "scan-stats", start);
     } catch (err) {
       fail(err, "checkmarx", "scan-stats", start);
@@ -7704,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 {
@@ -7727,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);
@@ -7739,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) => {
@@ -7748,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);
       }
@@ -7801,6 +8713,7 @@ function registerSkillsCommands(program2) {
       if (failed.length > 0) {
         warn(`Failed to install: ${failed.join(", ")}`);
       }
+      recordInstalledSkills(targetDir, installed, { source: "bundled" });
       success({
         installed,
         failed,
@@ -7821,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);
       }
@@ -7832,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);
       });
@@ -7867,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);
@@ -7875,155 +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 and register it in global config").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)").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 only.`);
+      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);
-      warn("Marketplace ready. Run: pncli skills marketplace sync to install skills.");
-      success({ repoUrl: url, localPath: resolvedPath, branch: opts.branch ?? null, tokenConfigured: !!opts.token }, "skills", "marketplace-setup", start);
+      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-setup", start);
+      fail(err, "skills", "marketplace-list", 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("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 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 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({
+        marketplace: marketplaceLabel(found),
+        plugins,
+        total: plugins.length
+      }, "skills", "marketplace-plugins", start);
+    } catch (err) {
+      fail(err, "skills", "marketplace-plugins", start);
+    }
+  });
+  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 { 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);
     }
@@ -8054,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(
@@ -8072,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 };
 }
 
@@ -8338,7 +9321,7 @@ if (!process.env.PNCLI_VERIFY_TLS) {
 var require2 = createRequire(import.meta.url);
 var pkg = require2("../package.json");
 var TAGLINE = "One command does what three meetings couldn't.";
-var program = new Command2();
+var program = new Command3();
 program.name("pncli").description(`The Paperwork Nightmare CLI \u2014 ${TAGLINE}`).version(`${pkg.version} \u2014 ${TAGLINE}`, "-v, --version").option("--pretty", "Human-readable formatted output", false).option("--verbose", "Include full response metadata", false).option("--debug", "Print diagnostic traces (method, URL, status) for all API calls \u2014 does not log credentials", false).option("--dry-run", "Print API requests without executing", false).option("--config <path>", "Override global config file location").option("--output-file <path>", "Write JSON output to file instead of stdout");
 program.hook("preAction", (thisCommand) => {
   const opts = thisCommand.optsWithGlobals();
@@ -8357,6 +9340,7 @@ program.hook("preAction", (thisCommand) => {
 registerGitCommands(program);
 registerJiraCommands(program);
 registerBitbucketCommands(program);
+registerGitHubCommands(program);
 registerConfluenceCommands(program);
 registerSonarCommands(program);
 registerSdeCommands(program);
@@ -8379,6 +9363,7 @@ Services:
   deps         Dependency scanning, CVE detection, license auditing
   jira         Jira Data Cloud
   bitbucket    Bitbucket Server
+  github       GitHub (PRs, reviews, comments, checks)
   confluence   Confluence
   sonar        SonarQube Server (quality gates, issues, metrics, hotspots)
   sde          SDElements (threat modeling, countermeasures, compliance)