@kolatts/pncli 5.1.0 → 5.3.0

package/dist/cli.js

@@ -14,7 +14,7 @@ import {
 import {
   createHttpClient,
   validateAlationAccessToken
-} from "./chunk-FAMJPKO4.js";
+} from "./chunk-2J2HAFKO.js";
 import {
   ExitCode,
   fail,
@@ -447,34 +447,34 @@ function parseAdoRemote(remoteUrl, adoBaseUrl) {
   } catch {
     baseHostname = adoBaseUrl.replace(/\/$/, "").replace(/^https?:\/\//, "").split(/[:/]/)[0].toLowerCase();
   }
-  let path10 = remoteUrl;
+  let path11 = remoteUrl;
   let remoteHostname = "";
-  const sshProtoMatch = path10.match(/^ssh:\/\/[^@]*@?([^/:]+)(?::\d+)?(.*)/);
+  const sshProtoMatch = path11.match(/^ssh:\/\/[^@]*@?([^/:]+)(?::\d+)?(.*)/);
   if (sshProtoMatch) {
     remoteHostname = sshProtoMatch[1].toLowerCase();
-    path10 = sshProtoMatch[2];
+    path11 = sshProtoMatch[2];
   } else {
-    const gitAtMatch = path10.match(/^git@([^:]+)(?::\d+)?:(.*)/);
+    const gitAtMatch = path11.match(/^git@([^:]+)(?::\d+)?:(.*)/);
     if (gitAtMatch) {
       remoteHostname = gitAtMatch[1].toLowerCase();
-      path10 = "/" + gitAtMatch[2];
+      path11 = "/" + gitAtMatch[2];
     } else {
-      const httpsMatch = path10.match(/^https?:\/\/([^/:]+)(?::\d+)?(.*)/);
+      const httpsMatch = path11.match(/^https?:\/\/([^/:]+)(?::\d+)?(.*)/);
       if (httpsMatch) {
         remoteHostname = httpsMatch[1].toLowerCase();
-        path10 = httpsMatch[2];
+        path11 = httpsMatch[2];
       }
     }
   }
   if (!remoteHostname || remoteHostname !== baseHostname) return null;
-  path10 = path10.replace(/\.git$/, "");
-  const gitIdx = path10.indexOf("/_git/");
-  const sshIdx = path10.indexOf("/_ssh/");
+  path11 = path11.replace(/\.git$/, "");
+  const gitIdx = path11.indexOf("/_git/");
+  const sshIdx = path11.indexOf("/_ssh/");
   const markerIdx = gitIdx !== -1 ? gitIdx : sshIdx;
   if (markerIdx === -1) return null;
-  const repo = decodeURIComponent(path10.slice(markerIdx + 6));
+  const repo = decodeURIComponent(path11.slice(markerIdx + 6));
   if (!repo) return null;
-  const before = path10.slice(1, markerIdx);
+  const before = path11.slice(1, markerIdx);
   const parts = before.split("/").filter(Boolean);
   if (parts.length < 2) return null;
   const project = decodeURIComponent(parts[parts.length - 1]);
@@ -587,30 +587,30 @@ var BitbucketClient = class {
     );
   }
   async createPR(opts) {
-    return this.http.bitbucket(
-      `${API}/projects/${opts.project}/repos/${opts.repo}/pull-requests`,
-      {
-        method: "POST",
-        body: {
-          title: opts.title,
-          description: opts.description,
-          fromRef: {
-            id: `refs/heads/${opts.source}`,
-            repository: {
-              slug: opts.repo,
-              project: { key: opts.project }
-            }
-          },
-          toRef: {
-            id: `refs/heads/${opts.target}`,
-            repository: {
-              slug: opts.repo,
-              project: { key: opts.project }
-            }
-          },
-          reviewers: (opts.reviewers ?? []).map((name) => ({ user: { name } }))
+    const body = {
+      title: opts.title,
+      description: opts.description,
+      fromRef: {
+        id: `refs/heads/${opts.source}`,
+        repository: {
+          slug: opts.repo,
+          project: { key: opts.project }
+        }
+      },
+      toRef: {
+        id: `refs/heads/${opts.target}`,
+        repository: {
+          slug: opts.repo,
+          project: { key: opts.project }
         }
       }
+    };
+    if (opts.reviewers && opts.reviewers.length > 0) {
+      body.reviewers = opts.reviewers.map((name) => ({ user: { name } }));
+    }
+    return this.http.bitbucket(
+      `${API}/projects/${opts.project}/repos/${opts.repo}/pull-requests`,
+      { method: "POST", body }
     );
   }
   async updatePR(opts) {
@@ -1861,7 +1861,7 @@ function registerBitbucketCommands(program2) {
       const { client, project, repo } = getClient2(bb, { project: opts.project, repo: opts.repo });
       const config = loadConfig({ configPath: bb.optsWithGlobals().config });
       const target = opts.target ?? config.defaults.bitbucket?.targetBranch ?? "main";
-      const reviewers = opts.reviewers ? opts.reviewers.split(",").map((s) => s.trim()) : [];
+      const reviewers = opts.reviewers ? opts.reviewers.split(",").map((s) => s.trim()) : void 0;
       const data = await client.createPR({ project, repo, title: opts.title, source: opts.source, target, description: opts.description, reviewers });
       success(data, "bitbucket", "create-pr", start);
     } catch (err) {
@@ -1885,7 +1885,7 @@ function registerBitbucketCommands(program2) {
         throw new PncliError("--repos must contain at least one repository slug", 1);
       }
       const title = opts.title ?? `Promote ${opts.from} to ${opts.to}`;
-      const reviewers = opts.reviewers ? opts.reviewers.split(",").map((s) => s.trim()) : [];
+      const reviewers = opts.reviewers ? opts.reviewers.split(",").map((s) => s.trim()) : void 0;
       const results = [];
       let created = 0;
       let nothingToPromote = 0;
@@ -2001,21 +2001,21 @@ function registerBitbucketCommands(program2) {
       fail(err, "bitbucket", "reply-comment", start);
     }
   });
-  bb.command("resolve-comment").description("Resolve a comment on a pull request").requiredOption("--pr <pr-id>", "Pull request ID").requiredOption("--comment-id <id>", "Comment ID").option("--version <n>", "Comment version", "0").action(async (opts) => {
+  bb.command("resolve-comment").description("Resolve a comment on a pull request").requiredOption("--pr <pr-id>", "Pull request ID").requiredOption("--comment-id <id>", "Comment ID").option("--comment-version <n>", "Comment version, as reported by list-comments", "0").action(async (opts) => {
     const start = Date.now();
     try {
       const { client, project, repo } = getClient2(bb);
-      await client.resolveComment(project, repo, parseInt(opts.pr, 10), parseInt(opts.commentId, 10), parseInt(opts.version ?? "0", 10));
+      await client.resolveComment(project, repo, parseInt(opts.pr, 10), parseInt(opts.commentId, 10), parseInt(opts.commentVersion ?? "0", 10));
       success({ resolved: true }, "bitbucket", "resolve-comment", start);
     } catch (err) {
       fail(err, "bitbucket", "resolve-comment", start);
     }
   });
-  bb.command("delete-comment").description("Delete a comment on a pull request").requiredOption("--pr <pr-id>", "Pull request ID").requiredOption("--comment-id <id>", "Comment ID").option("--version <n>", "Comment version", "0").action(async (opts) => {
+  bb.command("delete-comment").description("Delete a comment on a pull request").requiredOption("--pr <pr-id>", "Pull request ID").requiredOption("--comment-id <id>", "Comment ID").option("--comment-version <n>", "Comment version, as reported by list-comments", "0").action(async (opts) => {
     const start = Date.now();
     try {
       const { client, project, repo } = getClient2(bb);
-      await client.deleteComment(project, repo, parseInt(opts.pr, 10), parseInt(opts.commentId, 10), parseInt(opts.version ?? "0", 10));
+      await client.deleteComment(project, repo, parseInt(opts.pr, 10), parseInt(opts.commentId, 10), parseInt(opts.commentVersion ?? "0", 10));
       success({ deleted: true }, "bitbucket", "delete-comment", start);
     } catch (err) {
       fail(err, "bitbucket", "delete-comment", start);
@@ -2306,8 +2306,8 @@ var GitHubClient = class {
     );
   }
   async createRepo(opts) {
-    const path10 = opts.org ? `/orgs/${opts.org}/repos` : "/user/repos";
-    return this.http.github(path10, {
+    const path11 = opts.org ? `/orgs/${opts.org}/repos` : "/user/repos";
+    return this.http.github(path11, {
       method: "POST",
       body: {
         name: opts.name,
@@ -6272,8 +6272,8 @@ async function runCredentialChecks(cfg, http) {
   } else {
     try {
       const collection = cfg.defaults.ado?.collection;
-      const path10 = collection ? `/${encodeURIComponent(collection)}/_apis/connectionData?api-version=7.1-preview.1` : "/_apis/projectCollections?api-version=7.1";
-      await http.ado(path10, { timeoutMs: 1e4 });
+      const path11 = collection ? `/${encodeURIComponent(collection)}/_apis/connectionData?api-version=7.1-preview.1` : "/_apis/projectCollections?api-version=7.1";
+      await http.ado(path11, { timeoutMs: 1e4 });
       results.ado = { status: "valid", message: "ok" };
     } catch (err) {
       results.ado = categorize(err);
@@ -6511,9 +6511,9 @@ async function runCredentialChecks(cfg, http) {
 }
 
 // src/services/skills/commands.ts
-import fs2 from "fs";
-import path7 from "path";
-import os from "os";
+import fs3 from "fs";
+import path8 from "path";
+import os2 from "os";
 import { fileURLToPath } from "url";
 import { execFileSync as execFileSync3 } from "child_process";
 import select from "@inquirer/select";
@@ -6540,6 +6540,170 @@ function getPncliVersion() {
   return cached;
 }
 
+// src/services/skills/instructions.ts
+import fs2 from "fs";
+import path7 from "path";
+import os from "os";
+var INSTRUCTIONS_SUBDIR = "instructions";
+var INSTRUCTION_SOURCE_FILES = ["AGENTS.md", "CLAUDE.md"];
+var AGENT_INSTRUCTION_SPECS = {
+  "codex": {
+    file: () => path7.join(process.env.CODEX_HOME || path7.join(os.homedir(), ".codex"), "AGENTS.md"),
+    sources: ["AGENTS.md", "CLAUDE.md"]
+  },
+  "github-copilot": {
+    file: () => path7.join(process.env.COPILOT_HOME || path7.join(os.homedir(), ".copilot"), "copilot-instructions.md"),
+    sources: ["AGENTS.md", "CLAUDE.md"]
+  },
+  "claude-code": {
+    file: () => path7.join(process.env.CLAUDE_CONFIG_DIR || path7.join(os.homedir(), ".claude"), "CLAUDE.md"),
+    sources: ["CLAUDE.md", "AGENTS.md"]
+  }
+};
+var INSTRUCTION_AGENTS = Object.keys(AGENT_INSTRUCTION_SPECS);
+function agentInstructionsFile(agent) {
+  const spec = AGENT_INSTRUCTION_SPECS[agent];
+  if (!spec) throw new Error(`Unknown agent: "${agent}". Use: ${INSTRUCTION_AGENTS.join(" | ")}`);
+  return path7.resolve(spec.file());
+}
+function findMarketplaceInstructions(marketplacePath) {
+  const dir = path7.join(marketplacePath, INSTRUCTIONS_SUBDIR);
+  return INSTRUCTION_SOURCE_FILES.map((file) => ({ file, path: path7.join(dir, file) })).filter((entry) => {
+    try {
+      return fs2.statSync(entry.path).isFile();
+    } catch {
+      return false;
+    }
+  });
+}
+function pickInstructionSource(agent, shipped) {
+  const spec = AGENT_INSTRUCTION_SPECS[agent];
+  if (!spec) throw new Error(`Unknown agent: "${agent}". Use: ${INSTRUCTION_AGENTS.join(" | ")}`);
+  for (const wanted of spec.sources) {
+    const match = shipped.find((s) => s.file === wanted);
+    if (match) return match;
+  }
+  return null;
+}
+var MARKER_PREFIX = "pncli:instructions";
+function escapeRegExp(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function assertSafeName(name) {
+  if (!name.trim() || name.includes("-->") || name.includes('"') || /[\r\n]/.test(name)) {
+    throw new Error(`Marketplace name "${name}" cannot be used as an instructions block marker.`);
+  }
+}
+function beginMarker(marketplaceName) {
+  assertSafeName(marketplaceName);
+  return `<!-- ${MARKER_PREFIX} marketplace="${marketplaceName}" begin -->`;
+}
+function endMarker(marketplaceName) {
+  assertSafeName(marketplaceName);
+  return `<!-- ${MARKER_PREFIX} marketplace="${marketplaceName}" end -->`;
+}
+function blockPattern(marketplaceName) {
+  const begin = escapeRegExp(beginMarker(marketplaceName));
+  const end = escapeRegExp(endMarker(marketplaceName));
+  return new RegExp(`${begin}\\r?\\n[\\s\\S]*?${end}`);
+}
+function renderManagedBlock(marketplaceName, body, sourceFile) {
+  const trimmed = body.replace(/\r\n/g, "\n").trim();
+  return [
+    beginMarker(marketplaceName),
+    `<!-- Managed by pncli from ${sourceFile} in marketplace "${marketplaceName}". Edits here are overwritten on the next sync; remove with: pncli skills marketplace instructions remove ${marketplaceName} -->`,
+    trimmed,
+    endMarker(marketplaceName)
+  ].join("\n");
+}
+function detectEol(content) {
+  return /\r\n/.test(content) ? "\r\n" : "\n";
+}
+function upsertManagedBlock(existing, marketplaceName, block) {
+  const eol = detectEol(existing);
+  const rendered = block.replace(/\n/g, eol);
+  const pattern = blockPattern(marketplaceName);
+  const match = pattern.exec(existing);
+  if (match) {
+    if (match[0] === rendered) return { content: existing, action: "unchanged" };
+    return { content: existing.slice(0, match.index) + rendered + existing.slice(match.index + match[0].length), action: "updated" };
+  }
+  const separator = existing.length === 0 ? "" : eol;
+  return { content: `${existing}${separator}${rendered}${eol}`, action: "added" };
+}
+function removeManagedBlock(existing, marketplaceName) {
+  const match = blockPattern(marketplaceName).exec(existing);
+  if (!match) return { content: existing, removed: false };
+  const eol = detectEol(existing);
+  let start = match.index;
+  let end = start + match[0].length;
+  if (existing.startsWith(eol, end)) end += eol.length;
+  if (start > 0 && existing.slice(0, start).endsWith(eol)) start -= eol.length;
+  else if (start === 0 && existing.startsWith(eol, end)) end += eol.length;
+  return { content: existing.slice(0, start) + existing.slice(end), removed: true };
+}
+function listManagedBlocks(content) {
+  const re = new RegExp(`<!-- ${escapeRegExp(MARKER_PREFIX)} marketplace="([^"]*)" begin -->`, "g");
+  return Array.from(content.matchAll(re)).map((m) => m[1]);
+}
+function readFileOrEmpty(file) {
+  try {
+    return fs2.readFileSync(file, "utf8");
+  } catch {
+    return "";
+  }
+}
+function applyMarketplaceInstructions(marketplacePath, marketplaceName, agents) {
+  const shipped = findMarketplaceInstructions(marketplacePath);
+  return agents.map((agent) => {
+    const file = agentInstructionsFile(agent);
+    const source = pickInstructionSource(agent, shipped);
+    if (!source) return { agent, file, source: null, action: "skipped" };
+    const body = fs2.readFileSync(source.path, "utf8");
+    const block = renderManagedBlock(marketplaceName, body, `${INSTRUCTIONS_SUBDIR}/${source.file}`);
+    const { content, action } = upsertManagedBlock(readFileOrEmpty(file), marketplaceName, block);
+    if (action !== "unchanged") {
+      fs2.mkdirSync(path7.dirname(file), { recursive: true });
+      fs2.writeFileSync(file, content, "utf8");
+    }
+    return { agent, file, source: `${INSTRUCTIONS_SUBDIR}/${source.file}`, action };
+  });
+}
+function removeMarketplaceInstructions(marketplaceName, agents) {
+  return agents.map((agent) => {
+    const file = agentInstructionsFile(agent);
+    const existing = readFileOrEmpty(file);
+    const { content, removed } = removeManagedBlock(existing, marketplaceName);
+    if (removed) fs2.writeFileSync(file, content, "utf8");
+    return { agent, file, removed };
+  });
+}
+function marketplaceInstructionsStatus(marketplacePath, marketplaceName, agents) {
+  const shipped = marketplacePath && fs2.existsSync(marketplacePath) ? findMarketplaceInstructions(marketplacePath) : [];
+  return agents.map((agent) => {
+    const file = agentInstructionsFile(agent);
+    const fileExists = fs2.existsSync(file);
+    const existing = fileExists ? readFileOrEmpty(file) : "";
+    const installed = listManagedBlocks(existing).includes(marketplaceName);
+    const source = pickInstructionSource(agent, shipped);
+    let upToDate = null;
+    if (installed && source) {
+      const block = renderManagedBlock(marketplaceName, fs2.readFileSync(source.path, "utf8"), `${INSTRUCTIONS_SUBDIR}/${source.file}`);
+      upToDate = upsertManagedBlock(existing, marketplaceName, block).action === "unchanged";
+    } else if (installed) {
+      upToDate = false;
+    }
+    return {
+      agent,
+      file,
+      fileExists,
+      source: source ? `${INSTRUCTIONS_SUBDIR}/${source.file}` : null,
+      installed,
+      upToDate
+    };
+  });
+}
+
 // src/services/skills/commands.ts
 var BACK = "__back__";
 var ALL_MARKETPLACES = "__all_marketplaces__";
@@ -6564,7 +6728,7 @@ function repoNameFromUrl(url) {
   }
 }
 function defaultMarketplacePath(url) {
-  return path7.join(os.homedir(), ".agents", "marketplaces", repoNameFromUrl(url));
+  return path8.join(os2.homedir(), ".agents", "marketplaces", repoNameFromUrl(url));
 }
 function marketplaceLabel(m) {
   return m.name ?? repoNameFromUrl(m.repoUrl ?? "");
@@ -6619,9 +6783,9 @@ function assertInteractive(hint) {
   }
 }
 var AGENT_PATHS = {
-  "codex": { project: ".agents/skills", user: path7.join(os.homedir(), ".agents/skills") },
-  "github-copilot": { project: ".github/skills", user: path7.join(os.homedir(), ".copilot/skills") },
-  "claude-code": { project: ".claude/skills", user: path7.join(os.homedir(), ".claude/skills") }
+  "codex": { project: ".agents/skills", user: path8.join(os2.homedir(), ".agents/skills") },
+  "github-copilot": { project: ".github/skills", user: path8.join(os2.homedir(), ".copilot/skills") },
+  "claude-code": { project: ".claude/skills", user: path8.join(os2.homedir(), ".claude/skills") }
 };
 var DEFAULT_AGENT = "codex";
 var AGENT_CHOICES = Object.keys(AGENT_PATHS).join(" | ");
@@ -6648,23 +6812,23 @@ function findGitRoot(from = process.cwd()) {
       encoding: "utf8",
       stdio: ["pipe", "pipe", "pipe"]
     }).trim();
-    return root ? path7.resolve(root) : null;
+    return root ? path8.resolve(root) : null;
   } catch {
     return null;
   }
 }
 function resolveProjectPath(relativePath) {
   const root = findGitRoot();
-  return root ? path7.resolve(root, relativePath) : path7.resolve(relativePath);
+  return root ? path8.resolve(root, relativePath) : path8.resolve(relativePath);
 }
 function resolveScopedPath(agentPaths, scope) {
-  return scope === "project" ? resolveProjectPath(agentPaths.project) : path7.resolve(agentPaths.user);
+  return scope === "project" ? resolveProjectPath(agentPaths.project) : path8.resolve(agentPaths.user);
 }
 function hasInstalledPncliSkill() {
   try {
     for (const agentPaths of Object.values(AGENT_PATHS)) {
       for (const scope of ["project", "user"]) {
-        if (fs2.existsSync(path7.join(resolveScopedPath(agentPaths, scope), "pncli", "SKILL.md"))) {
+        if (fs3.existsSync(path8.join(resolveScopedPath(agentPaths, scope), "pncli", "SKILL.md"))) {
           return true;
         }
       }
@@ -6674,20 +6838,30 @@ function hasInstalledPncliSkill() {
   return false;
 }
 function resolveTargetDir(opts) {
-  if (opts.target) return path7.resolve(opts.target);
+  if (opts.target) return path8.resolve(opts.target);
   const agentConfig = resolveAgentPaths(resolveAgentName(opts));
   return resolveScopedPath(agentConfig, opts.scope ?? "user");
 }
+function resolveInstallTargets(opts, scope = "user") {
+  if (opts.allAgents) {
+    if (opts.claude || opts.agent) {
+      throw new Error("--all-agents cannot be combined with --claude or --agent");
+    }
+    return Object.entries(AGENT_PATHS).map(([agent2, paths]) => ({ agent: agent2, target: resolveScopedPath(paths, scope) }));
+  }
+  const agent = resolveAgentName(opts);
+  return [{ agent, target: resolveScopedPath(resolveAgentPaths(agent), scope) }];
+}
 function getBundledSkillsDir() {
   try {
     const thisFile = fileURLToPath(import.meta.url);
-    return path7.resolve(path7.dirname(thisFile), "..", "skills");
+    return path8.resolve(path8.dirname(thisFile), "..", "skills");
   } catch {
     return "";
   }
 }
 function getInstalledMetaPath(targetDir) {
-  return path7.join(targetDir, ".pncli-installed.json");
+  return path8.join(targetDir, ".pncli-installed.json");
 }
 var SKILL_ORIGIN_FILENAME = "pncli-origin.json";
 var DISABLED_SUBDIR = ".pncli-disabled";
@@ -6698,13 +6872,13 @@ function readInstalledMeta(targetDir) {
   return { version: 1, skills: {} };
 }
 function getSkillOriginPath(skillDir) {
-  return path7.join(skillDir, SKILL_ORIGIN_FILENAME);
+  return path8.join(skillDir, SKILL_ORIGIN_FILENAME);
 }
 function readSkillOrigin(skillDir) {
   const originPath = getSkillOriginPath(skillDir);
-  if (!fs2.existsSync(originPath)) return null;
+  if (!fs3.existsSync(originPath)) return null;
   try {
-    const raw = JSON.parse(fs2.readFileSync(originPath, "utf8"));
+    const raw = JSON.parse(fs3.readFileSync(originPath, "utf8"));
     if (raw && raw.version === 1 && raw.source) return raw;
   } catch {
   }
@@ -6716,7 +6890,7 @@ function matchesMarketplaceFilter(record, filter) {
 function resolveSkillRecord(meta, targetDir, skillName) {
   const fromMeta = meta.skills[skillName];
   if (fromMeta) return fromMeta;
-  const perSkill = readSkillOrigin(path7.join(targetDir, skillName));
+  const perSkill = readSkillOrigin(path8.join(targetDir, skillName));
   if (!perSkill) return null;
   return {
     source: perSkill.source,
@@ -6729,28 +6903,28 @@ function resolveSkillRecord(meta, targetDir, skillName) {
   };
 }
 function listActiveSkillDirs(targetDir) {
-  if (!fs2.existsSync(targetDir)) return [];
-  return fs2.readdirSync(targetDir).filter((name) => {
+  if (!fs3.existsSync(targetDir)) return [];
+  return fs3.readdirSync(targetDir).filter((name) => {
     if (name.startsWith(".")) return false;
-    const dir = path7.join(targetDir, name);
+    const dir = path8.join(targetDir, name);
     try {
-      if (!fs2.statSync(dir).isDirectory()) return false;
+      if (!fs3.statSync(dir).isDirectory()) return false;
     } catch {
       return false;
     }
-    return fs2.existsSync(path7.join(dir, "SKILL.md"));
+    return fs3.existsSync(path8.join(dir, "SKILL.md"));
   });
 }
 function disablePluginSkills(targetDir, plugin, marketplaceFilter) {
-  const resolvedTarget = path7.resolve(targetDir);
-  const stashDir = path7.join(targetDir, DISABLED_SUBDIR);
+  const resolvedTarget = path8.resolve(targetDir);
+  const stashDir = path8.join(targetDir, DISABLED_SUBDIR);
   const meta = readInstalledMeta(targetDir);
   const disabled = [];
   const alreadyDisabled = [];
   const skipped = [];
   for (const skillName of listActiveSkillDirs(targetDir)) {
-    const skillDir = path7.resolve(targetDir, skillName);
-    if (!skillDir.startsWith(resolvedTarget + path7.sep)) continue;
+    const skillDir = path8.resolve(targetDir, skillName);
+    if (!skillDir.startsWith(resolvedTarget + path8.sep)) continue;
     const record = resolveSkillRecord(meta, targetDir, skillName);
     if (!record || record.source !== "marketplace") {
       skipped.push(skillName);
@@ -6760,10 +6934,10 @@ function disablePluginSkills(targetDir, plugin, marketplaceFilter) {
       skipped.push(skillName);
       continue;
     }
-    const stashDest = path7.join(stashDir, skillName);
-    fs2.mkdirSync(stashDir, { recursive: true });
-    if (fs2.existsSync(stashDest)) fs2.rmSync(stashDest, { recursive: true, force: true });
-    fs2.renameSync(skillDir, stashDest);
+    const stashDest = path8.join(stashDir, skillName);
+    fs3.mkdirSync(stashDir, { recursive: true });
+    if (fs3.existsSync(stashDest)) fs3.rmSync(stashDest, { recursive: true, force: true });
+    fs3.renameSync(skillDir, stashDest);
     delete meta.skills[skillName];
     meta.disabled = meta.disabled ?? {};
     meta.disabled[skillName] = record;
@@ -6775,13 +6949,13 @@ function disablePluginSkills(targetDir, plugin, marketplaceFilter) {
     }
   }
   if (disabled.length > 0) {
-    fs2.writeFileSync(getInstalledMetaPath(targetDir), JSON.stringify(meta, null, 2), "utf8");
+    fs3.writeFileSync(getInstalledMetaPath(targetDir), JSON.stringify(meta, null, 2), "utf8");
   }
   return { disabled, alreadyDisabled, skipped };
 }
 function enablePluginSkills(targetDir, plugin, marketplaceFilter) {
-  const resolvedTarget = path7.resolve(targetDir);
-  const stashDir = path7.join(targetDir, DISABLED_SUBDIR);
+  const resolvedTarget = path8.resolve(targetDir);
+  const stashDir = path8.join(targetDir, DISABLED_SUBDIR);
   const meta = readInstalledMeta(targetDir);
   const enabled = [];
   const stashMissing = [];
@@ -6792,27 +6966,27 @@ function enablePluginSkills(targetDir, plugin, marketplaceFilter) {
       skipped.push(skillName);
       continue;
     }
-    const dest = path7.resolve(targetDir, skillName);
-    if (!dest.startsWith(resolvedTarget + path7.sep)) {
+    const dest = path8.resolve(targetDir, skillName);
+    if (!dest.startsWith(resolvedTarget + path8.sep)) {
       skipped.push(skillName);
       continue;
     }
-    const stashSrc = path7.join(stashDir, skillName);
-    if (!fs2.existsSync(stashSrc)) {
+    const stashSrc = path8.join(stashDir, skillName);
+    if (!fs3.existsSync(stashSrc)) {
       stashMissing.push(skillName);
       continue;
     }
-    if (fs2.existsSync(dest)) fs2.rmSync(dest, { recursive: true, force: true });
-    fs2.renameSync(stashSrc, dest);
+    if (fs3.existsSync(dest)) fs3.rmSync(dest, { recursive: true, force: true });
+    fs3.renameSync(stashSrc, dest);
     meta.skills[skillName] = record;
     delete meta.disabled[skillName];
     enabled.push(skillName);
   }
-  if (fs2.existsSync(stashDir) && fs2.readdirSync(stashDir).length === 0) {
-    fs2.rmdirSync(stashDir);
+  if (fs3.existsSync(stashDir) && fs3.readdirSync(stashDir).length === 0) {
+    fs3.rmdirSync(stashDir);
   }
   if (enabled.length > 0) {
-    fs2.writeFileSync(getInstalledMetaPath(targetDir), JSON.stringify(meta, null, 2), "utf8");
+    fs3.writeFileSync(getInstalledMetaPath(targetDir), JSON.stringify(meta, null, 2), "utf8");
   }
   return { enabled, stashMissing, skipped, hadDisabled: disabledEntries.length > 0 };
 }
@@ -6878,11 +7052,11 @@ function getInstalledPluginsForMarketplace(targetDir, marketplaceName, repoUrl)
 function readCustomTargets(globalConfig) {
   const raw = globalConfig.skillsTargets;
   if (!Array.isArray(raw)) return [];
-  return [...new Set(raw.filter((t) => typeof t === "string" && t.length > 0).map((t) => path7.resolve(t)))];
+  return [...new Set(raw.filter((t) => typeof t === "string" && t.length > 0).map((t) => path8.resolve(t)))];
 }
 function rememberCustomTarget(configPath, targetDir) {
-  const resolved = path7.resolve(targetDir);
-  const builtIn = Object.values(AGENT_PATHS).flatMap((a) => [path7.resolve(a.user), resolveProjectPath(a.project)]);
+  const resolved = path8.resolve(targetDir);
+  const builtIn = Object.values(AGENT_PATHS).flatMap((a) => [path8.resolve(a.user), resolveProjectPath(a.project)]);
   if (builtIn.includes(resolved)) return false;
   const existing = loadJsonFile(configPath) ?? {};
   const targets = readCustomTargets(existing);
@@ -6891,7 +7065,7 @@ function rememberCustomTarget(configPath, targetDir) {
   return true;
 }
 function forgetCustomTarget(configPath, targetDir) {
-  const resolved = path7.resolve(targetDir);
+  const resolved = path8.resolve(targetDir);
   const existing = loadJsonFile(configPath) ?? {};
   const targets = readCustomTargets(existing);
   if (!targets.includes(resolved)) return false;
@@ -6899,12 +7073,12 @@ function forgetCustomTarget(configPath, targetDir) {
   return true;
 }
 function summarizeLocation(agent, scope, targetDir) {
-  const resolved = path7.resolve(targetDir);
+  const resolved = path8.resolve(targetDir);
   const base = {
     agent,
     scope,
     path: resolved,
-    exists: fs2.existsSync(resolved),
+    exists: fs3.existsSync(resolved),
     totalSkills: 0,
     marketplaceSkills: 0,
     bundledSkills: 0,
@@ -6923,8 +7097,8 @@ function summarizeLocation(agent, scope, targetDir) {
   }
   const disabledNames = Object.keys(meta.disabled ?? {});
   base.disabledSkills = disabledNames.length;
-  const stashDir = path7.join(resolved, DISABLED_SUBDIR);
-  base.disabledStashMissing = disabledNames.filter((name) => !fs2.existsSync(path7.join(stashDir, name)));
+  const stashDir = path8.join(resolved, DISABLED_SUBDIR);
+  base.disabledStashMissing = disabledNames.filter((name) => !fs3.existsSync(path8.join(stashDir, name)));
   return base;
 }
 function listKnownLocations(globalConfig) {
@@ -6949,7 +7123,7 @@ function collectSkillStatus(globalConfig, locations) {
   const { byName, byUrl } = buildMarketplaceIndex(getAllMarketplaces(globalConfig));
   const remoteCache = /* @__PURE__ */ new Map();
   const remoteFor = (localPath) => {
-    if (!localPath || !fs2.existsSync(localPath)) return null;
+    if (!localPath || !fs3.existsSync(localPath)) return null;
     if (!remoteCache.has(localPath)) remoteCache.set(localPath, getRepoRemoteUrl(localPath));
     return remoteCache.get(localPath) ?? null;
   };
@@ -6962,7 +7136,7 @@ function collectSkillStatus(globalConfig, locations) {
       const registered = (recordedName ? byName.get(recordedName) : void 0) ?? (record?.installedFrom ? byUrl.get(record.installedFrom) : void 0) ?? null;
       records.push({
         skill: skillName,
-        path: enabled ? path7.join(location.path, skillName) : path7.join(location.path, DISABLED_SUBDIR, skillName),
+        path: enabled ? path8.join(location.path, skillName) : path8.join(location.path, DISABLED_SUBDIR, skillName),
         agent: location.agent,
         scope: location.scope,
         location: location.path,
@@ -6995,16 +7169,16 @@ function recordInstalledSkills(targetDir, skillNames, record) {
   for (const skillName of skillNames) {
     const fullRecord = { pncliVersion: getPncliVersion(), ...record, installedAt: now };
     meta.skills[skillName] = fullRecord;
-    const skillDir = path7.join(targetDir, skillName);
-    if (fs2.existsSync(skillDir)) {
+    const skillDir = path8.join(targetDir, skillName);
+    if (fs3.existsSync(skillDir)) {
       const origin = { version: 1, ...fullRecord };
       try {
-        fs2.writeFileSync(getSkillOriginPath(skillDir), JSON.stringify(origin, null, 2), "utf8");
+        fs3.writeFileSync(getSkillOriginPath(skillDir), JSON.stringify(origin, null, 2), "utf8");
       } catch {
       }
     }
   }
-  fs2.writeFileSync(getInstalledMetaPath(targetDir), JSON.stringify(meta, null, 2), "utf8");
+  fs3.writeFileSync(getInstalledMetaPath(targetDir), JSON.stringify(meta, null, 2), "utf8");
 }
 function findStaleBundledSkills(targetDir) {
   const currentVersion = getPncliVersion();
@@ -7080,8 +7254,8 @@ function upsertMarketplace(all, entry) {
   }
 }
 function cloneOrReuseMarketplace(url, resolvedPath, opts, marketplaceName) {
-  const hasGit = fs2.existsSync(path7.join(resolvedPath, ".git"));
-  if (fs2.existsSync(resolvedPath) && !hasGit && fs2.readdirSync(resolvedPath).length > 0) {
+  const hasGit = fs3.existsSync(path8.join(resolvedPath, ".git"));
+  if (fs3.existsSync(resolvedPath) && !hasGit && fs3.readdirSync(resolvedPath).length > 0) {
     throw new Error(`Directory already exists and is not a git repo: ${resolvedPath}`);
   }
   if (hasGit) {
@@ -7138,7 +7312,7 @@ function installPluginsForMarketplace(marketplacePath, marketplaceName, repoUrl,
   const branch = detectRepoBranch(marketplacePath);
   for (const pluginName of pluginNames) {
     const skillsSrc = resolveSkillsSrc(marketplacePath, pluginName);
-    if (!fs2.existsSync(skillsSrc)) {
+    if (!fs3.existsSync(skillsSrc)) {
       results[pluginName] = { installed: [], failed: [] };
       warn(`No skills directory found for plugin "${pluginName}" in "${marketplaceName}" \u2014 skipping.`);
       continue;
@@ -7152,61 +7326,108 @@ function installPluginsForMarketplace(marketplacePath, marketplaceName, repoUrl,
     results[pluginName] = { installed, failed };
     totalInstalled += installed.length;
     for (const skill of installed) {
-      warn(`  ${skill}: ${path7.join(skillsSrc, skill)} \u2192 ${path7.join(targetDir, skill)}`);
+      log(`  ${skill}: ${path8.join(skillsSrc, skill)} \u2192 ${path8.join(targetDir, skill)}`);
     }
     if (failed.length > 0) {
       warn(`Skipped ${failed.length} skill(s) with invalid names in "${pluginName}": ${failed.join(", ")}`);
     }
   }
+  warn(`Installed ${totalInstalled} skill(s) from ${pluginNames.length} plugin(s) in "${marketplaceName}" to ${targetDir}`);
   return { results, totalInstalled };
 }
-function installAllPlugins(resolvedPath, marketplaceName, url, targetDir) {
+function installMarketplaceToTarget(m, marketplacePath, pluginChoices, pluginFilter, target, opts) {
+  const marketplaceName = marketplaceLabel(m);
+  const base = { agent: target.agent, target: target.target };
+  const installedHere = getInstalledPluginsForMarketplace(target.target, marketplaceName, m.repoUrl).filter((name) => pluginChoices.some((p) => p.name === name));
+  let requested;
+  if (pluginFilter === "all") {
+    if (opts.installedOnly) {
+      if (installedHere.length === 0) {
+        warn(`No installed plugins from "${marketplaceName}" in ${target.target} \u2014 skipping. Run marketplace sync without --installed-only to install plugins.`);
+        return { ...base, plugins: {}, total: 0, skipped: true, installedOnly: true, message: "No installed plugins found \u2014 nothing to sync." };
+      }
+      requested = installedHere;
+    } else {
+      requested = pluginChoices.map((p) => p.name);
+    }
+  } else {
+    requested = [pluginFilter];
+  }
+  const missing = requested.filter((name) => !installedHere.includes(name));
+  if (!opts.updated && !opts.force) {
+    if (missing.length === 0) {
+      return { ...base, plugins: {}, total: 0, skipped: true, message: "No changes detected \u2014 skipping install. Use --force to reinstall anyway." };
+    }
+    requested = missing;
+  }
+  const { results, totalInstalled } = installPluginsForMarketplace(marketplacePath, marketplaceName, m.repoUrl, requested, target.target);
+  return { ...base, plugins: results, total: totalInstalled };
+}
+function applyInstructionsForTargets(m, marketplacePath, targets, enabled) {
+  if (!enabled || findMarketplaceInstructions(marketplacePath).length === 0) return void 0;
+  const results = applyMarketplaceInstructions(marketplacePath, marketplaceLabel(m), targets.map((t) => t.agent));
+  for (const r of results) {
+    if (r.action === "added" || r.action === "updated") warn(`Instructions ${r.action} in ${r.file} (from ${r.source})`);
+  }
+  return results;
+}
+function shapeSyncResult(marketplaceName, updated, pluginFilter, targetResults, extras) {
+  const tail = {
+    marketplaceUpdated: updated,
+    ...extras.installedOnly ? { installedOnly: true } : {},
+    ...extras.instructions ? { instructions: extras.instructions } : {}
+  };
+  if (targetResults.length === 1) {
+    const r = targetResults[0];
+    if (r.skipped) {
+      return { marketplace: marketplaceName, updated: false, skipped: true, target: r.target, message: r.message, ...tail };
+    }
+    if (pluginFilter === "all") {
+      return { marketplace: marketplaceName, plugins: r.plugins, total: r.total, target: r.target, ...tail };
+    }
+    const single = r.plugins[pluginFilter] ?? { installed: [], failed: [] };
+    return { marketplace: marketplaceName, plugin: pluginFilter, installed: single.installed, failed: single.failed, total: single.installed.length, target: r.target, ...tail };
+  }
+  return {
+    marketplace: marketplaceName,
+    ...pluginFilter === "all" ? {} : { plugin: pluginFilter },
+    targets: targetResults,
+    total: targetResults.reduce((sum, r) => sum + r.total, 0),
+    ...tail
+  };
+}
+function installAllPlugins(m, resolvedPath, targets) {
   const pluginChoices = resolvePluginChoices(resolvedPath);
   if (pluginChoices.length === 0) {
     warn("No plugins found in marketplace. Check the marketplace repository structure.");
-    return { pluginResults: {}, totalInstalled: 0 };
+    return targets.map((t) => ({ ...t, plugins: {}, total: 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 };
+  return targets.map((t) => installMarketplaceToTarget(m, resolvedPath, pluginChoices, "all", t, { updated: true, force: true, installedOnly: false }));
+}
+function isBareMarketplaceSync(plugin, opts) {
+  return plugin === void 0 && !opts.marketplace && !opts.force;
 }
-function syncMarketplacePlugins(m, targetDir, force, pluginFilter, installedOnly = false) {
+function syncMarketplacePlugins(m, targets, pluginFilter, opts) {
   const marketplaceName = marketplaceLabel(m);
   try {
     const marketplacePath = m.localPath;
-    if (!marketplacePath || !fs2.existsSync(marketplacePath)) {
+    if (!marketplacePath || !fs3.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") {
-      if (installedOnly) {
-        const installed = getInstalledPluginsForMarketplace(targetDir, marketplaceName, m.repoUrl).filter((name) => pluginChoices.some((p) => p.name === name));
-        if (installed.length === 0) {
-          warn(`No installed plugins found for "${marketplaceName}" \u2014 skipping. Run marketplace sync without --installed-only to install plugins.`);
-          return { marketplace: marketplaceName, skipped: true, installedOnly: true, message: "No installed plugins found \u2014 nothing to sync." };
-        }
-        pluginNames = installed;
-      } else {
-        pluginNames = pluginChoices.map((p) => p.name);
-      }
-    } else if (pluginChoices.some((p) => p.name === pluginFilter)) {
-      pluginNames = [pluginFilter];
-    } else {
+    if (pluginFilter !== "all" && !pluginChoices.some((p) => p.name === pluginFilter)) {
       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 };
+    const targetResults = targets.map((t) => installMarketplaceToTarget(m, marketplacePath, pluginChoices, pluginFilter, t, { updated, ...opts }));
+    const instructions = applyInstructionsForTargets(m, marketplacePath, targets, opts.instructions);
+    return shapeSyncResult(marketplaceName, updated, pluginFilter, targetResults, { installedOnly: opts.installedOnly, instructions });
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
     warn(`Marketplace "${marketplaceName}" failed \u2014 skipping. ${message}`);
@@ -7214,7 +7435,7 @@ function syncMarketplacePlugins(m, targetDir, force, pluginFilter, installedOnly
   }
 }
 function performMarketplaceAdd(url, localPath, opts) {
-  const resolvedPath = path7.resolve(localPath ?? defaultMarketplacePath(url));
+  const resolvedPath = path8.resolve(localPath ?? defaultMarketplacePath(url));
   const marketplaceName = opts.name ?? repoNameFromUrl(url);
   cloneOrReuseMarketplace(url, resolvedPath, opts, marketplaceName);
   const configPath = getGlobalConfigPath();
@@ -7227,17 +7448,18 @@ function performMarketplaceAdd(url, localPath, opts) {
   };
   upsertMarketplace(all, entry);
   saveMarketplaces(configPath, existing, all);
-  const targetDir = resolveAgentPaths(resolveAgentName(opts)).user;
-  const { pluginResults, totalInstalled } = installAllPlugins(resolvedPath, marketplaceName, url, targetDir);
+  const targets = resolveInstallTargets(opts);
+  const targetResults = installAllPlugins(entry, resolvedPath, targets);
+  const instructions = applyInstructionsForTargets(entry, resolvedPath, targets, opts.instructions !== false);
   return {
     name: marketplaceName,
     repoUrl: url,
     localPath: resolvedPath,
     branch: opts.branch ?? null,
     tokenConfigured: !!opts.token,
-    plugins: pluginResults,
-    total: totalInstalled,
-    target: targetDir
+    // One target keeps the flat shape earlier versions emitted; several nest under `targets`.
+    ...targetResults.length === 1 ? { plugins: targetResults[0].plugins, total: targetResults[0].total, target: targetResults[0].target } : { targets: targetResults, total: targetResults.reduce((sum, r) => sum + r.total, 0) },
+    ...instructions ? { instructions } : {}
   };
 }
 function performMarketplaceRemove(name) {
@@ -7271,8 +7493,8 @@ function listBundledSkillDirs() {
   let skillDirs = [];
   if (bundledDir !== "") {
     try {
-      skillDirs = fs2.readdirSync(bundledDir).filter(
-        (name) => fs2.existsSync(path7.join(bundledDir, name, "SKILL.md"))
+      skillDirs = fs3.readdirSync(bundledDir).filter(
+        (name) => fs3.existsSync(path8.join(bundledDir, name, "SKILL.md"))
       );
     } catch {
     }
@@ -7283,37 +7505,37 @@ function listBundledSkillDirs() {
   return skillDirs;
 }
 function installBundledSkillsTo(targetDir, skillDirs) {
-  const resolvedTarget = path7.resolve(targetDir);
+  const resolvedTarget = path8.resolve(targetDir);
   const bundledDir = getBundledSkillsDir();
   const installed = [];
   const failed = [];
   for (const skillName of skillDirs) {
-    const existingDir = path7.resolve(targetDir, skillName);
-    if (!existingDir.startsWith(resolvedTarget + path7.sep)) continue;
-    if (fs2.existsSync(existingDir)) {
-      fs2.rmSync(existingDir, { recursive: true, force: true });
+    const existingDir = path8.resolve(targetDir, skillName);
+    if (!existingDir.startsWith(resolvedTarget + path8.sep)) continue;
+    if (fs3.existsSync(existingDir)) {
+      fs3.rmSync(existingDir, { recursive: true, force: true });
     }
   }
-  warn(`Installing ${skillDirs.length} bundled skill(s) to ${targetDir}...`);
+  log(`Installing ${skillDirs.length} bundled skill(s) to ${targetDir}...`);
   for (const skillName of skillDirs) {
-    const skillDir = path7.resolve(targetDir, skillName);
-    if (!skillDir.startsWith(resolvedTarget + path7.sep)) {
+    const skillDir = path8.resolve(targetDir, skillName);
+    if (!skillDir.startsWith(resolvedTarget + path8.sep)) {
       failed.push(skillName);
       continue;
     }
     try {
-      const mdFiles = fs2.readdirSync(path7.join(bundledDir, skillName)).filter((f) => f.endsWith(".md"));
-      fs2.mkdirSync(skillDir, { recursive: true });
+      const mdFiles = fs3.readdirSync(path8.join(bundledDir, skillName)).filter((f) => f.endsWith(".md"));
+      fs3.mkdirSync(skillDir, { recursive: true });
       for (const mdFile of mdFiles) {
-        const content = fs2.readFileSync(path7.join(bundledDir, skillName, mdFile), "utf8");
-        fs2.writeFileSync(path7.join(skillDir, mdFile), content, "utf8");
+        const content = fs3.readFileSync(path8.join(bundledDir, skillName, mdFile), "utf8");
+        fs3.writeFileSync(path8.join(skillDir, mdFile), content, "utf8");
       }
       installed.push(skillName);
     } catch {
       failed.push(skillName);
     }
   }
-  warn(`Installed ${installed.length} skill(s) to ${targetDir}`);
+  warn(`Installed ${installed.length} bundled skill(s) to ${targetDir}`);
   if (failed.length > 0) {
     warn(`Failed to install: ${failed.join(", ")}`);
   }
@@ -7321,8 +7543,28 @@ function installBundledSkillsTo(targetDir, skillDirs) {
   return { installed, failed };
 }
 function registerSkillsCommands(program2) {
-  const skills = program2.command("skills").description(`Manage agent skills (${AGENT_CHOICES})`);
-  skills.command("install").description("Install pncli skills into the current repo").option("--agent <agent>", `Target agent host: ${AGENT_CHOICES}`, DEFAULT_AGENT).option("--scope <scope>", "Installation scope: project | user", "project").option("--claude", "Shorthand for --agent claude-code").option("--all-agents", "Install to every supported agent host in one run").option("--target <dir>", "Override install directory (ignores --agent and --scope)").action((opts, cmd) => {
+  const skills = program2.command("skills").description(`Install bundled pncli skills and org plugins from git marketplaces (${AGENT_CHOICES})`);
+  skills.addHelpText("after", `
+Where skills go:
+  --agent codex (default) \u2192 .agents/skills (project) or ~/.agents/skills (user); read by Codex and GitHub Copilot
+  --agent github-copilot  \u2192 .github/skills or ~/.copilot/skills
+  --agent claude-code     \u2192 .claude/skills or ~/.claude/skills (--claude is a shorthand)
+  --all-agents            \u2192 every host above in one run
+
+Bundled skills (ship with pncli, refresh after upgrading):
+  pncli skills install --all-agents               # into this repo, every agent host
+  pncli skills install --all-agents --scope user  # for every repo on this machine
+
+Org plugins (skills and AGENTS.md/CLAUDE.md from a git-hosted marketplace):
+  pncli skills marketplace add <git-url> --all-agents   # register, clone, install everything
+  pncli skills marketplace sync --marketplace all --all-agents
+  pncli skills marketplace manage                        # interactive: toggle plugins, add/remove marketplaces
+  pncli skills marketplace --help                        # the full plugin workflow
+
+Check what is installed:
+  pncli skills status | pncli skills locations | pncli doctor
+`);
+  skills.command("install").description("Install the bundled pncli skills (project scope by default; --scope user for every repo)").option("--agent <agent>", `Target agent host: ${AGENT_CHOICES}`, DEFAULT_AGENT).option("--scope <scope>", "Installation scope: project | user", "project").option("--claude", "Shorthand for --agent claude-code").option("--all-agents", "Install to every supported agent host in one run").option("--target <dir>", "Override install directory (ignores --agent and --scope)").action((opts, cmd) => {
     const start = Date.now();
     try {
       const agentExplicit = cmd.getOptionValueSource("agent") === "cli";
@@ -7332,10 +7574,9 @@ function registerSkillsCommands(program2) {
       const scope = opts.scope === "user" ? "user" : "project";
       const skillDirs = listBundledSkillDirs();
       if (opts.allAgents) {
-        const targets = Object.entries(AGENT_PATHS).map(([agent, agentPaths]) => {
-          const targetDir2 = resolveScopedPath(agentPaths, scope);
-          const { installed: installed2, failed: failed2 } = installBundledSkillsTo(targetDir2, skillDirs);
-          return { agent, target: targetDir2, installed: installed2, failed: failed2, total: installed2.length };
+        const targets = resolveInstallTargets({ allAgents: true }, scope).map(({ agent, target }) => {
+          const { installed: installed2, failed: failed2 } = installBundledSkillsTo(target, skillDirs);
+          return { agent, target, installed: installed2, failed: failed2, total: installed2.length };
         });
         success({
           targets,
@@ -7346,7 +7587,7 @@ function registerSkillsCommands(program2) {
         return;
       }
       const agentName = resolveAgentName(opts);
-      const targetDir = opts.target ? path7.resolve(opts.target) : resolveScopedPath(resolveAgentPaths(agentName), scope);
+      const targetDir = opts.target ? path8.resolve(opts.target) : resolveScopedPath(resolveAgentPaths(agentName), scope);
       const { installed, failed } = installBundledSkillsTo(targetDir, skillDirs);
       let tracked = false;
       if (opts.target && installed.length > 0) {
@@ -7375,12 +7616,12 @@ function registerSkillsCommands(program2) {
     try {
       let targetDir;
       if (opts.target) {
-        targetDir = path7.resolve(opts.target);
+        targetDir = path8.resolve(opts.target);
       } else {
         const agentConfig = resolveAgentPaths(resolveAgentName(opts));
         targetDir = resolveScopedPath(agentConfig, opts.scope === "user" ? "user" : "project");
       }
-      if (!fs2.existsSync(targetDir)) {
+      if (!fs3.existsSync(targetDir)) {
         success({
           skills: [],
           total: 0,
@@ -7391,13 +7632,13 @@ function registerSkillsCommands(program2) {
         return;
       }
       const meta = readInstalledMeta(targetDir);
-      const skillDirs = fs2.readdirSync(targetDir).filter((name) => {
+      const skillDirs = fs3.readdirSync(targetDir).filter((name) => {
         if (name.startsWith(".")) return false;
-        const skillPath = path7.join(targetDir, name, "SKILL.md");
-        return fs2.existsSync(skillPath);
+        const skillPath = path8.join(targetDir, name, "SKILL.md");
+        return fs3.existsSync(skillPath);
       });
       const skillsList = skillDirs.map((name) => {
-        const content = fs2.readFileSync(path7.join(targetDir, name, "SKILL.md"), "utf8");
+        const content = fs3.readFileSync(path8.join(targetDir, name, "SKILL.md"), "utf8");
         const frontmatter = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
         const data = {};
         const metadata = {};
@@ -7450,24 +7691,24 @@ function registerSkillsCommands(program2) {
     try {
       let targetDir;
       if (opts.target) {
-        targetDir = path7.resolve(opts.target);
+        targetDir = path8.resolve(opts.target);
       } else {
         const agentConfig = resolveAgentPaths(resolveAgentName(opts));
         targetDir = resolveScopedPath(agentConfig, opts.scope === "project" ? "project" : "user");
       }
-      const resolvedTarget = path7.resolve(targetDir);
-      const skillDir = path7.resolve(targetDir, name);
-      if (!skillDir.startsWith(resolvedTarget + path7.sep)) {
+      const resolvedTarget = path8.resolve(targetDir);
+      const skillDir = path8.resolve(targetDir, name);
+      if (!skillDir.startsWith(resolvedTarget + path8.sep)) {
         throw new Error(`Invalid skill name: "${name}"`);
       }
-      if (!fs2.existsSync(skillDir)) {
+      if (!fs3.existsSync(skillDir)) {
         throw new Error(`Skill "${name}" not found at ${skillDir}`);
       }
       const meta = readInstalledMeta(targetDir);
       const record = meta.skills[name];
-      fs2.rmSync(skillDir, { recursive: true, force: true });
+      fs3.rmSync(skillDir, { recursive: true, force: true });
       delete meta.skills[name];
-      fs2.writeFileSync(getInstalledMetaPath(targetDir), JSON.stringify(meta, null, 2), "utf8");
+      fs3.writeFileSync(getInstalledMetaPath(targetDir), JSON.stringify(meta, null, 2), "utf8");
       success({
         uninstalled: name,
         target: targetDir,
@@ -7538,7 +7779,7 @@ function registerSkillsCommands(program2) {
     const start = Date.now();
     try {
       const configPath = getGlobalConfigPath();
-      const resolved = path7.resolve(dir);
+      const resolved = path8.resolve(dir);
       const forgotten = forgetCustomTarget(configPath, resolved);
       if (!forgotten) {
         warn(`${resolved} is not a tracked custom target \u2014 nothing to forget.`);
@@ -7552,16 +7793,28 @@ function registerSkillsCommands(program2) {
       fail(err, "skills", "forget-target", 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: ${AGENT_CHOICES} (default: ${DEFAULT_AGENT})`).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"));
+  const marketplace = skills.command("marketplace").description("Org plugins from git-hosted marketplaces: add, sync, enable/disable, and shipped AGENTS.md/CLAUDE.md");
+  marketplace.addHelpText("after", `
+Workflow:
+  pncli skills marketplace add <git-url> --all-agents         # register + clone + install every plugin
+  pncli skills marketplace sync --marketplace all --all-agents # pull and refresh everything installed
+  pncli skills marketplace plugins <name>                      # browse a marketplace without installing
+  pncli skills marketplace manage                              # interactive hub (toggle, add, remove)
+  pncli skills marketplace disable <plugin> / enable <plugin>  # switch a plugin off without deleting it
+
+Shipped instructions:
+  A marketplace may ship instructions/AGENTS.md and/or instructions/CLAUDE.md. add and sync merge
+  them into each agent's user-level file (~/.codex/AGENTS.md, ~/.copilot/copilot-instructions.md,
+  ~/.claude/CLAUDE.md) as a marked block that never touches your own content.
+  pncli skills marketplace instructions list | install | remove <name>
+
+Plugin skills always install at user scope. --agent picks the host (default: ${DEFAULT_AGENT}); --all-agents covers all of them.
+`);
+  marketplace.command("add").alias("setup").description("Register a new marketplace, clone it, install all its plugins, and apply its shipped AGENTS.md / CLAUDE.md (`setup` is an alias)").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: ${AGENT_CHOICES} (default: ${DEFAULT_AGENT})`).option("--claude", "Shorthand for --agent claude-code").option("--all-agents", "Install to every supported agent host in one run").option("--no-instructions", "Do not apply the shipped AGENTS.md / CLAUDE.md to user-level instructions files").action((url, localPath, opts) => {
+    const marketplaceIdx = process.argv.indexOf("marketplace");
+    const invokedAs = marketplaceIdx !== -1 && process.argv[marketplaceIdx + 1] === "setup" ? "marketplace-setup" : "marketplace-add";
+    return marketplaceAddAction(url, localPath, opts, invokedAs);
+  });
   marketplace.command("list").description("List all registered marketplaces").action(() => {
     const start = Date.now();
     try {
@@ -7573,7 +7826,7 @@ function registerSkillsCommands(program2) {
           repoUrl: m.repoUrl,
           localPath: m.localPath,
           tokenConfigured: !!m.token,
-          upstreamRemote: m.localPath && fs2.existsSync(m.localPath) ? getRepoRemoteUrl(m.localPath) : null
+          upstreamRemote: m.localPath && fs3.existsSync(m.localPath) ? getRepoRemoteUrl(m.localPath) : null
         })),
         total: all.length
       }, "skills", "marketplace-list", start);
@@ -7590,7 +7843,7 @@ function registerSkillsCommands(program2) {
       if (!found) {
         throw new Error(`Marketplace "${name}" not found. Run: pncli skills marketplace list`);
       }
-      if (!found.localPath || !fs2.existsSync(found.localPath)) {
+      if (!found.localPath || !fs3.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);
@@ -7611,7 +7864,7 @@ function registerSkillsCommands(program2) {
       fail(err, "skills", "marketplace-remove", start);
     }
   });
-  marketplace.command("sync").description("Pull latest marketplace content and install plugin skills (interactive picker when no plugin is given)").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: ${AGENT_CHOICES} (default: ${DEFAULT_AGENT})`).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)').option("--installed-only", "Only sync plugins that are already installed \u2014 skip plugins newly added to the marketplace").action(async (plugin, opts) => {
+  marketplace.command("sync").description("With no arguments, refreshes every already-installed plugin from every marketplace (same as --marketplace all --installed-only). Pass --force, a plugin, or --marketplace to get the interactive picker instead.").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: ${AGENT_CHOICES} (default: ${DEFAULT_AGENT})`).option("--claude", "Shorthand for --agent claude-code").option("--all-agents", "Install to every supported agent host in one run").option("--force", 'Reinstall even if a marketplace has no new changes (applies to single-plugin and "all" installs alike)').option("--installed-only", "Only sync plugins that are already installed \u2014 skip plugins newly added to the marketplace").option("--no-instructions", "Do not apply the shipped AGENTS.md / CLAUDE.md to user-level instructions files").action(async (plugin, opts) => {
     const start = Date.now();
     try {
       const configPath = getGlobalConfigPath();
@@ -7619,12 +7872,13 @@ function registerSkillsCommands(program2) {
       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;
-      const installedOnly = opts.installedOnly ?? false;
-      if (opts.marketplace === "all") {
-        const results = allMarketplaces.map((m) => syncMarketplacePlugins(m, targetDir, force, plugin ?? "all", installedOnly));
-        success({ allMarketplaces: true, marketplaces: results, target: targetDir }, "skills", "marketplace-sync", start);
+      const bareSync = isBareMarketplaceSync(plugin, opts);
+      const targets = resolveInstallTargets(opts);
+      const syncOpts = { force: opts.force ?? false, installedOnly: bareSync ? true : opts.installedOnly ?? false, instructions: opts.instructions !== false };
+      const targetSummary = targets.length === 1 ? { target: targets[0].target } : { targets: targets.map((t) => t.target) };
+      if (opts.marketplace === "all" || bareSync) {
+        const results = allMarketplaces.map((m) => syncMarketplacePlugins(m, targets, plugin ?? "all", syncOpts));
+        success({ allMarketplaces: true, marketplaces: results, ...targetSummary }, "skills", "marketplace-sync", start);
         return;
       }
       let selectedMarketplace;
@@ -7647,12 +7901,12 @@ function registerSkillsCommands(program2) {
             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 ?? ""}` }))
+              ...allMarketplaces.map((m2, i) => ({ value: String(i), name: `${marketplaceLabel(m2)} \u2014 ${m2.repoUrl ?? ""}` }))
             ]
           });
           if (chosen === ALL_MARKETPLACES) {
-            const results2 = allMarketplaces.map((m) => syncMarketplacePlugins(m, targetDir, force, selectedPlugin ?? "all", installedOnly));
-            success({ allMarketplaces: true, marketplaces: results2, target: targetDir }, "skills", "marketplace-sync", start);
+            const results = allMarketplaces.map((m2) => syncMarketplacePlugins(m2, targets, selectedPlugin ?? "all", syncOpts));
+            success({ allMarketplaces: true, marketplaces: results, ...targetSummary }, "skills", "marketplace-sync", start);
             return;
           }
           selectedMarketplace = allMarketplaces[Number(chosen)];
@@ -7662,7 +7916,7 @@ function registerSkillsCommands(program2) {
         }
         const marketplaceName = marketplaceLabel(selectedMarketplace);
         const marketplacePath = selectedMarketplace.localPath;
-        if (!marketplacePath || !fs2.existsSync(marketplacePath)) {
+        if (!marketplacePath || !fs3.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);
@@ -7688,55 +7942,94 @@ function registerSkillsCommands(program2) {
         } 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: marketplaceName,
-            marketplaceUpdated: false,
-            updated: false,
-            skipped: true,
-            message: `No changes detected in "${marketplaceName}" \u2014 skipping install. Use --force to reinstall anyway.`
-          }, "skills", "marketplace-sync", start);
-          return;
+        const m = selectedMarketplace;
+        const targetResults = targets.map((t) => installMarketplaceToTarget(m, marketplacePath, pluginChoices, selectedPlugin, t, { updated, force: syncOpts.force, installedOnly: syncOpts.installedOnly }));
+        const instructions2 = applyInstructionsForTargets(m, marketplacePath, targets, syncOpts.instructions);
+        success(
+          shapeSyncResult(marketplaceName, updated, selectedPlugin, targetResults, { installedOnly: syncOpts.installedOnly, instructions: instructions2 }),
+          "skills",
+          "marketplace-sync",
+          start
+        );
+        return;
+      }
+    } catch (err) {
+      fail(err, "skills", "marketplace-sync", start);
+    }
+  });
+  const instructions = marketplace.command("instructions").description("Manage the AGENTS.md / CLAUDE.md a marketplace ships (merged as a marked block into each agent's user-level instructions file)");
+  function resolveInstructionAgents(opts) {
+    return resolveInstallTargets(opts).map((t) => t.agent);
+  }
+  function findMarketplaceOrThrow(all, name) {
+    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`);
+    return found;
+  }
+  instructions.command("list").description("Show which marketplaces ship instructions and whether each agent's user-level file has them installed and current").option("--marketplace <name>", "Only report this marketplace (name or clone URL)").action((opts) => {
+    const start = Date.now();
+    try {
+      const all = loadMarketplaces(getGlobalConfigPath());
+      const selected = opts.marketplace ? [findMarketplaceOrThrow(all, opts.marketplace)] : all;
+      const agents = Object.keys(AGENT_PATHS);
+      const marketplaces = selected.map((m) => {
+        const shipped = m.localPath && fs3.existsSync(m.localPath) ? findMarketplaceInstructions(m.localPath).map((s) => s.file) : [];
+        return {
+          marketplace: marketplaceLabel(m),
+          localPath: m.localPath ?? null,
+          ships: shipped,
+          agents: marketplaceInstructionsStatus(m.localPath, marketplaceLabel(m), agents)
+        };
+      });
+      success({
+        files: Object.fromEntries(agents.map((a) => [a, agentInstructionsFile(a)])),
+        marketplaces,
+        hint: marketplaces.some((m) => m.ships.length > 0) ? "Apply with: pncli skills marketplace instructions install --all-agents" : "No registered marketplace ships an instructions/AGENTS.md or instructions/CLAUDE.md."
+      }, "skills", "marketplace-instructions-list", start);
+    } catch (err) {
+      fail(err, "skills", "marketplace-instructions-list", start);
+    }
+  });
+  instructions.command("install").description("Apply (or refresh) the shipped instructions of one or every marketplace into the agent's user-level file").option("--marketplace <name>", "Marketplace to apply (name or clone URL); default: every registered marketplace that ships instructions").option("--agent <agent>", `Target agent host: ${AGENT_CHOICES} (default: ${DEFAULT_AGENT})`).option("--claude", "Shorthand for --agent claude-code").option("--all-agents", "Apply to every supported agent host in one run").action((opts) => {
+    const start = Date.now();
+    try {
+      const all = loadMarketplaces(getGlobalConfigPath());
+      if (all.length === 0) throw new Error("No marketplaces configured. Run: pncli skills marketplace add <url>");
+      const agents = resolveInstructionAgents(opts);
+      const selected = opts.marketplace ? [findMarketplaceOrThrow(all, opts.marketplace)] : all;
+      const results = selected.map((m) => {
+        const name = marketplaceLabel(m);
+        if (!m.localPath || !fs3.existsSync(m.localPath)) {
+          return { marketplace: name, skipped: true, message: "Local path not found. Run: pncli skills marketplace add <url>" };
         }
-        let pluginNames;
-        if (selectedPlugin === "all") {
-          if (installedOnly) {
-            const installed = getInstalledPluginsForMarketplace(targetDir, marketplaceName, selectedMarketplace.repoUrl).filter((name) => pluginChoices.some((p) => p.name === name));
-            if (installed.length === 0) {
-              success({
-                marketplace: marketplaceName,
-                skipped: true,
-                installedOnly: true,
-                message: `No installed plugins found for "${marketplaceName}" \u2014 run marketplace sync without --installed-only to install plugins.`
-              }, "skills", "marketplace-sync", start);
-              return;
-            }
-            pluginNames = installed;
-          } else {
-            pluginNames = pluginChoices.map((p) => p.name);
-          }
-        } else {
-          pluginNames = [selectedPlugin];
+        if (findMarketplaceInstructions(m.localPath).length === 0) {
+          return { marketplace: name, skipped: true, message: `Ships no instructions/AGENTS.md or instructions/CLAUDE.md.` };
         }
-        const { results, totalInstalled } = installPluginsForMarketplace(marketplacePath, marketplaceName, selectedMarketplace.repoUrl, pluginNames, targetDir);
-        if (selectedPlugin === "all") {
-          success({ marketplace: marketplaceName, plugins: results, total: totalInstalled, target: targetDir, marketplaceUpdated: updated, ...installedOnly ? { installedOnly: true } : {} }, "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);
+        const applied = applyMarketplaceInstructions(m.localPath, name, agents);
+        for (const r of applied) {
+          if (r.action === "added" || r.action === "updated") warn(`Instructions ${r.action} in ${r.file} (from ${r.source})`);
         }
-        return;
+        return { marketplace: name, agents: applied };
+      });
+      if (opts.marketplace && "skipped" in results[0]) throw new Error(`Marketplace "${results[0].marketplace}": ${results[0].message}`);
+      success({ marketplaces: results, agents }, "skills", "marketplace-instructions-install", start);
+    } catch (err) {
+      fail(err, "skills", "marketplace-instructions-install", start);
+    }
+  });
+  instructions.command("remove").description("Strip a marketplace's instructions block from the agent's user-level file (everything else in the file is kept)").argument("<marketplace>", "Marketplace name (or clone URL). Works even after the marketplace has been removed from config.").option("--agent <agent>", `Target agent host: ${AGENT_CHOICES} (default: ${DEFAULT_AGENT})`).option("--claude", "Shorthand for --agent claude-code").option("--all-agents", "Remove from every supported agent host in one run").action((marketplaceName, opts) => {
+    const start = Date.now();
+    try {
+      const agents = resolveInstructionAgents(opts);
+      const registered = loadMarketplaces(getGlobalConfigPath()).find((m) => m.name === marketplaceName || m.repoUrl === marketplaceName);
+      const name = registered ? marketplaceLabel(registered) : marketplaceName;
+      const results = removeMarketplaceInstructions(name, agents);
+      for (const r of results) {
+        if (r.removed) warn(`Instructions block for "${name}" removed from ${r.file}`);
       }
+      success({ marketplace: name, agents: results, removed: results.filter((r) => r.removed).length }, "skills", "marketplace-instructions-remove", start);
     } catch (err) {
-      fail(err, "skills", "marketplace-sync", start);
+      fail(err, "skills", "marketplace-instructions-remove", start);
     }
   });
   marketplace.command("purge-plugin").description("Remove all skills installed from a specific plugin (or all plugins in a marketplace)").argument("<plugin>", 'Plugin name to purge, or "all" to remove every skill from the marketplace').option("--marketplace <name>", "Restrict purge to skills from this marketplace (by name or repo URL)").option("--agent <agent>", `Target agent host: ${AGENT_CHOICES} (default: ${DEFAULT_AGENT})`).option("--claude", "Shorthand for --agent claude-code").option("--scope <scope>", "Installation scope: project | user (default: user)").option("--target <dir>", "Override skills directory").action((plugin, opts) => {
@@ -7744,31 +8037,31 @@ function registerSkillsCommands(program2) {
     try {
       let targetDir;
       if (opts.target) {
-        targetDir = path7.resolve(opts.target);
+        targetDir = path8.resolve(opts.target);
       } else {
         const agentConfig = resolveAgentPaths(resolveAgentName(opts));
         targetDir = resolveScopedPath(agentConfig, opts.scope ?? "user");
       }
-      const resolvedTarget = path7.resolve(targetDir);
-      if (!fs2.existsSync(targetDir)) {
+      const resolvedTarget = path8.resolve(targetDir);
+      if (!fs3.existsSync(targetDir)) {
         success({ removed: [], total: 0, target: targetDir, message: "No skills directory found." }, "skills", "marketplace-purge-plugin", start);
         return;
       }
       const meta = readInstalledMeta(targetDir);
       const removed = [];
       const skipped = [];
-      const skillDirs = fs2.readdirSync(targetDir).filter((name) => {
+      const skillDirs = fs3.readdirSync(targetDir).filter((name) => {
         if (name.startsWith(".")) return false;
-        const p = path7.join(targetDir, name);
+        const p = path8.join(targetDir, name);
         try {
-          return fs2.statSync(p).isDirectory();
+          return fs3.statSync(p).isDirectory();
         } catch {
           return false;
         }
       });
       for (const skillName of skillDirs) {
-        const skillDir = path7.resolve(targetDir, skillName);
-        if (!skillDir.startsWith(resolvedTarget + path7.sep)) continue;
+        const skillDir = path8.resolve(targetDir, skillName);
+        if (!skillDir.startsWith(resolvedTarget + path8.sep)) continue;
         let record = meta.skills[skillName] ?? null;
         if (!record) {
           const perSkill = readSkillOrigin(skillDir);
@@ -7793,12 +8086,12 @@ function registerSkillsCommands(program2) {
           skipped.push(skillName);
           continue;
         }
-        fs2.rmSync(skillDir, { recursive: true, force: true });
+        fs3.rmSync(skillDir, { recursive: true, force: true });
         delete meta.skills[skillName];
         removed.push(skillName);
       }
       if (removed.length > 0) {
-        fs2.writeFileSync(getInstalledMetaPath(targetDir), JSON.stringify(meta, null, 2), "utf8");
+        fs3.writeFileSync(getInstalledMetaPath(targetDir), JSON.stringify(meta, null, 2), "utf8");
       }
       success({
         removed,
@@ -7816,7 +8109,7 @@ function registerSkillsCommands(program2) {
     const start = Date.now();
     try {
       const targetDir = resolveTargetDir(opts);
-      if (!fs2.existsSync(targetDir)) {
+      if (!fs3.existsSync(targetDir)) {
         success({ disabled: [], total: 0, target: targetDir, message: "No skills directory found." }, "skills", "marketplace-disable", start);
         return;
       }
@@ -7828,7 +8121,7 @@ function registerSkillsCommands(program2) {
         total: result.disabled.length,
         target: targetDir,
         plugin,
-        stash: path7.join(targetDir, DISABLED_SUBDIR),
+        stash: path8.join(targetDir, DISABLED_SUBDIR),
         ...opts.marketplace ? { marketplace: opts.marketplace } : {}
       }, "skills", "marketplace-disable", start);
     } catch (err) {
@@ -7839,7 +8132,7 @@ function registerSkillsCommands(program2) {
     const start = Date.now();
     try {
       const targetDir = resolveTargetDir(opts);
-      if (!fs2.existsSync(targetDir)) {
+      if (!fs3.existsSync(targetDir)) {
         success({ enabled: [], total: 0, target: targetDir, message: "No skills directory found." }, "skills", "marketplace-enable", start);
         return;
       }
@@ -7864,29 +8157,48 @@ function registerSkillsCommands(program2) {
       fail(err, "skills", "marketplace-enable", start);
     }
   });
-  marketplace.command("manage").description("Manage marketplaces and plugins: toggle plugins on/off, add or remove marketplaces (interactive)").option("--agent <agent>", `Target agent host: ${AGENT_CHOICES} (default: ${DEFAULT_AGENT})`).option("--claude", "Shorthand for --agent claude-code").option("--scope <scope>", "Installation scope: project | user (default: user)").option("--target <dir>", "Override skills directory").action(async (opts) => {
+  marketplace.command("manage").description("Manage marketplaces and plugins: toggle plugins on/off, sync every marketplace, apply shipped AGENTS.md / CLAUDE.md, add or remove marketplaces (interactive)").option("--agent <agent>", `Target agent host: ${AGENT_CHOICES} (default: ${DEFAULT_AGENT})`).option("--claude", "Shorthand for --agent claude-code").option("--scope <scope>", "Installation scope: project | user (default: user)").option("--target <dir>", "Override skills directory").action(async (opts) => {
     const start = Date.now();
     try {
-      assertInteractive("Use `pncli skills marketplace enable|disable <plugin>`, `add <url>`, and `remove <name>` to manage non-interactively.");
+      assertInteractive("Use `pncli skills marketplace enable|disable <plugin>`, `sync --marketplace all`, `instructions install`, `add <url>`, and `remove <name>` to manage non-interactively.");
       const targetDir = resolveTargetDir(opts);
       const enabledPlugins = [];
       const disabledPlugins = [];
       const stashMissing = [];
       const addedMarketplaces = [];
       const removedMarketplaces = [];
+      const syncedMarketplaces = /* @__PURE__ */ new Map();
+      const appliedInstructions = /* @__PURE__ */ new Map();
+      const instructionAgents = opts.target ? [] : [resolveAgentName(opts)];
       for (; ; ) {
-        const states = fs2.existsSync(targetDir) ? listPluginStates(targetDir) : [];
+        const states = fs3.existsSync(targetDir) ? listPluginStates(targetDir) : [];
         const registered = loadMarketplaces(getGlobalConfigPath());
+        const shipping = registered.filter((m) => m.localPath && fs3.existsSync(m.localPath) && findMarketplaceInstructions(m.localPath).length > 0);
         const action = await select({
           message: `Manage skills marketplaces (target: ${targetDir}):`,
           choices: [
             ...states.length > 0 ? [{ value: "toggle", name: `Toggle plugins on/off (${states.length} installed)` }] : [],
+            ...registered.length > 0 ? [{ value: "sync", name: `Sync every marketplace (${registered.length} registered)` }] : [],
+            ...shipping.length > 0 && instructionAgents.length > 0 ? [{ value: "instructions", name: `Apply shipped AGENTS.md / CLAUDE.md (${shipping.length} marketplace(s) ship them)` }] : [],
             { value: "add", name: "Add a marketplace" },
             ...registered.length > 0 ? [{ value: "remove", name: `Remove a marketplace (${registered.length} registered)` }] : [],
             { value: "done", name: "Done" }
           ]
         });
         if (action === "done") break;
+        if (action === "sync") {
+          const syncTargets = [{ agent: opts.target ? "custom" : resolveAgentName(opts), target: targetDir }];
+          for (const m of registered) {
+            syncedMarketplaces.set(marketplaceLabel(m), syncMarketplacePlugins(m, syncTargets, "all", { force: false, installedOnly: false, instructions: instructionAgents.length > 0 }));
+          }
+          continue;
+        }
+        if (action === "instructions") {
+          for (const m of shipping) {
+            appliedInstructions.set(marketplaceLabel(m), { marketplace: marketplaceLabel(m), agents: applyMarketplaceInstructions(m.localPath, marketplaceLabel(m), instructionAgents) });
+          }
+          continue;
+        }
         if (action === "toggle") {
           const sorted = [...states].sort((a, b) => (a.marketplace ?? "").localeCompare(b.marketplace ?? "") || a.plugin.localeCompare(b.plugin));
           const choices = [];
@@ -7936,7 +8248,9 @@ function registerSkillsCommands(program2) {
           addedMarketplaces.push(performMarketplaceAdd(url, void 0, {
             name: name || void 0,
             agent: opts.agent,
-            claude: opts.claude
+            claude: opts.claude,
+            // A custom --target has no agent host to map instructions onto.
+            instructions: instructionAgents.length > 0
           }));
         } else if (action === "remove") {
           const chosen = await select({
@@ -7957,6 +8271,8 @@ function registerSkillsCommands(program2) {
         disabled: disabledPlugins,
         addedMarketplaces,
         removedMarketplaces,
+        syncedMarketplaces: [...syncedMarketplaces.values()],
+        appliedInstructions: [...appliedInstructions.values()],
         target: targetDir,
         ...stashMissing.length > 0 ? {
           stashMissing,
@@ -7971,15 +8287,15 @@ function registerSkillsCommands(program2) {
     const start = Date.now();
     try {
       const userDir = resolveAgentPaths(resolveAgentName(opts)).user;
-      if (!fs2.existsSync(userDir)) {
+      if (!fs3.existsSync(userDir)) {
         success({ removed: 0, target: userDir, message: "No user-level skills directory found \u2014 nothing to purge." }, "skills", "purge-user", start);
         return;
       }
-      const skillDirs = fs2.readdirSync(userDir).filter((name) => {
+      const skillDirs = fs3.readdirSync(userDir).filter((name) => {
         if (name.startsWith(".")) return false;
-        const p = path7.join(userDir, name);
+        const p = path8.join(userDir, name);
         try {
-          return fs2.statSync(p).isDirectory();
+          return fs3.statSync(p).isDirectory();
         } catch {
           return false;
         }
@@ -7995,13 +8311,13 @@ Re-run with --force to confirm, or use \`pncli skills marketplace purge-plugin\`
         );
       }
       for (const name of skillDirs) {
-        const skillDir = path7.resolve(userDir, name);
-        if (!skillDir.startsWith(path7.resolve(userDir) + path7.sep)) continue;
-        fs2.rmSync(skillDir, { recursive: true, force: true });
+        const skillDir = path8.resolve(userDir, name);
+        if (!skillDir.startsWith(path8.resolve(userDir) + path8.sep)) continue;
+        fs3.rmSync(skillDir, { recursive: true, force: true });
       }
       const metaPath = getInstalledMetaPath(userDir);
-      if (fs2.existsSync(metaPath)) {
-        fs2.writeFileSync(metaPath, JSON.stringify({ version: 1, skills: {} }, null, 2), "utf8");
+      if (fs3.existsSync(metaPath)) {
+        fs3.writeFileSync(metaPath, JSON.stringify({ version: 1, skills: {} }, null, 2), "utf8");
       }
       success({ removed: skillDirs.length, skills: skillDirs, target: userDir }, "skills", "purge-user", start);
     } catch (err) {
@@ -8010,46 +8326,46 @@ Re-run with --force to confirm, or use \`pncli skills marketplace purge-plugin\`
   });
 }
 function resolvePluginChoices(marketplacePath) {
-  const marketplaceJsonPath = path7.join(marketplacePath, ".claude-plugin", "marketplace.json");
-  if (fs2.existsSync(marketplaceJsonPath)) {
+  const marketplaceJsonPath = path8.join(marketplacePath, ".claude-plugin", "marketplace.json");
+  if (fs3.existsSync(marketplaceJsonPath)) {
     try {
-      const meta = JSON.parse(fs2.readFileSync(marketplaceJsonPath, "utf8"));
+      const meta = JSON.parse(fs3.readFileSync(marketplaceJsonPath, "utf8"));
       if (Array.isArray(meta.plugins) && meta.plugins.length > 0) {
         return meta.plugins.map((p) => ({ name: p.name, description: p.description ?? "" }));
       }
     } catch {
     }
   }
-  const pluginsDir = path7.join(marketplacePath, "plugins");
-  if (fs2.existsSync(pluginsDir)) {
-    return fs2.readdirSync(pluginsDir).filter((name) => fs2.statSync(path7.join(pluginsDir, name)).isDirectory()).map((name) => ({ name, description: "" }));
+  const pluginsDir = path8.join(marketplacePath, "plugins");
+  if (fs3.existsSync(pluginsDir)) {
+    return fs3.readdirSync(pluginsDir).filter((name) => fs3.statSync(path8.join(pluginsDir, name)).isDirectory()).map((name) => ({ name, description: "" }));
   }
   return [];
 }
 function resolveSkillsSrc(marketplacePath, selectedPlugin) {
-  const pluginsBase = path7.resolve(marketplacePath, "plugins");
-  const skillsSrc = path7.resolve(pluginsBase, selectedPlugin, "skills");
-  if (!skillsSrc.startsWith(pluginsBase + path7.sep)) {
+  const pluginsBase = path8.resolve(marketplacePath, "plugins");
+  const skillsSrc = path8.resolve(pluginsBase, selectedPlugin, "skills");
+  if (!skillsSrc.startsWith(pluginsBase + path8.sep)) {
     throw new Error(`Invalid plugin name: "${selectedPlugin}"`);
   }
   return skillsSrc;
 }
 function copyPluginSkills(skillsSrc, targetDir, meta) {
-  fs2.mkdirSync(targetDir, { recursive: true });
-  const resolvedTarget = path7.resolve(targetDir);
-  const skillNames = fs2.readdirSync(skillsSrc).filter(
-    (name) => fs2.statSync(path7.join(skillsSrc, name)).isDirectory()
+  fs3.mkdirSync(targetDir, { recursive: true });
+  const resolvedTarget = path8.resolve(targetDir);
+  const skillNames = fs3.readdirSync(skillsSrc).filter(
+    (name) => fs3.statSync(path8.join(skillsSrc, name)).isDirectory()
   );
   const installed = [];
   const failed = [];
   for (const skillName of skillNames) {
-    const dest = path7.resolve(targetDir, skillName);
-    if (!dest.startsWith(resolvedTarget + path7.sep)) {
+    const dest = path8.resolve(targetDir, skillName);
+    if (!dest.startsWith(resolvedTarget + path8.sep)) {
       failed.push(skillName);
       continue;
     }
-    fs2.rmSync(dest, { recursive: true, force: true });
-    fs2.cpSync(path7.join(skillsSrc, skillName), dest, { recursive: true });
+    fs3.rmSync(dest, { recursive: true, force: true });
+    fs3.cpSync(path8.join(skillsSrc, skillName), dest, { recursive: true });
     installed.push(skillName);
   }
   if (meta) {
@@ -8066,7 +8382,7 @@ function copyPluginSkills(skillsSrc, targetDir, meta) {
 
 // src/services/config/commands.ts
 import chalk from "chalk";
-import fs3 from "fs";
+import fs4 from "fs";
 function registerConfigCommands(program2) {
   const config = program2.command("config").description("Manage pncli configuration");
   config.command("init").description("Setup wizard for service credentials (interactive)").option("--repo", "Write repo config (.pncli.json) instead of global config").action(async (opts) => {
@@ -8180,8 +8496,8 @@ function registerConfigCommands(program2) {
       if (cfg.ado.baseUrl) {
         try {
           const collection = cfg.defaults.ado?.collection;
-          const path10 = collection ? `/${encodeURIComponent(collection)}/_apis/connectionData?api-version=7.1-preview.1` : "/_apis/projectCollections?api-version=7.1";
-          await http.ado(path10);
+          const path11 = collection ? `/${encodeURIComponent(collection)}/_apis/connectionData?api-version=7.1-preview.1` : "/_apis/projectCollections?api-version=7.1";
+          await http.ado(path11);
           results.ado = { ok: true, message: "connected" };
         } catch (err) {
           results.ado = { ok: false, message: err instanceof Error ? err.message : String(err) };
@@ -9059,7 +9375,7 @@ async function initGlobalConfig(start) {
     });
     alationUserId = await input2({
       message: "Alation user ID (numeric):",
-      validate: (v) => /^\d+$/.test(v.trim()) || "Must be a positive integer"
+      validate: (v) => /^[1-9]\d*$/.test(v.trim()) || "Must be a positive integer"
     });
     if (alationBaseUrl && alationRefreshToken && alationUserId) {
       process.stderr.write("\n  Verifying connection...\n");
@@ -9312,7 +9628,7 @@ async function initRepoConfig(start) {
     process.exitCode = ExitCode.SUCCESS;
     return;
   }
-  if (fs3.existsSync(".pncli.json")) {
+  if (fs4.existsSync(".pncli.json")) {
     const overwrite = await confirm({
       message: ".pncli.json already exists. Overwrite?",
       default: false
@@ -9346,14 +9662,14 @@ async function initRepoConfig(start) {
 }
 
 // src/services/doctor/commands.ts
-import fs4 from "fs";
-import path8 from "path";
+import fs5 from "fs";
+import path9 from "path";
 function checkConfigFile(filePath) {
-  if (!fs4.existsSync(filePath)) {
+  if (!fs5.existsSync(filePath)) {
     return { path: filePath, exists: false, valid: false, message: "not present" };
   }
   try {
-    JSON.parse(fs4.readFileSync(filePath, "utf8"));
+    JSON.parse(fs5.readFileSync(filePath, "utf8"));
     return { path: filePath, exists: true, valid: true, message: "ok" };
   } catch (err) {
     return {
@@ -9364,7 +9680,7 @@ function checkConfigFile(filePath) {
     };
   }
 }
-function buildProblems(globalFile, repoFile, credentials, skillLocations) {
+function buildProblems(globalFile, repoFile, credentials, skillLocations, marketplaces = []) {
   const problems = [];
   for (const file of [globalFile, repoFile]) {
     if (file.exists && !file.valid) {
@@ -9415,16 +9731,32 @@ function buildProblems(globalFile, repoFile, credentials, skillLocations) {
       fix: "Refresh them with: pncli skills install"
     });
   }
+  for (const m of marketplaces.filter((m2) => !m2.cloneExists)) {
+    problems.push({
+      area: "marketplaces",
+      message: `Marketplace "${m.name}" is registered but its clone is missing (${m.localPath ?? "no local path"})`,
+      fix: `Re-clone it with: pncli skills marketplace add ${m.repoUrl ?? "<url>"}`
+    });
+  }
+  const marketplaceSkillTotal = skillLocations.reduce((sum, l) => sum + (l.marketplaceSkills ?? 0), 0);
+  const liveMarketplaces = marketplaces.filter((m) => m.cloneExists).length;
+  if (liveMarketplaces > 0 && marketplaceSkillTotal === 0) {
+    problems.push({
+      area: "marketplaces",
+      message: `${liveMarketplaces} marketplace(s) registered but no plugin skills are installed from any of them`,
+      fix: "Run: pncli skills marketplace sync --marketplace all --all-agents"
+    });
+  }
   return problems;
 }
 function registerDoctorCommands(program2) {
-  program2.command("doctor").description("Diagnose pncli setup: config files, credentials, and agent skills").option("--offline", "Skip credential checks (no network calls)").action(async (cmdOpts) => {
+  program2.command("doctor").description("Diagnose pncli setup: config files, credentials, agent skills, and skills marketplaces").option("--offline", "Skip credential checks (no network calls)").action(async (cmdOpts) => {
     const start = Date.now();
     try {
       const opts = program2.optsWithGlobals();
       const globalFile = checkConfigFile(opts.config ?? getGlobalConfigPath());
       const repoRoot = findGitRoot() ?? process.cwd();
-      const repoFile = checkConfigFile(path8.join(repoRoot, ".pncli.json"));
+      const repoFile = checkConfigFile(path9.join(repoRoot, ".pncli.json"));
       let credentials = null;
       let credentialsSkipped = cmdOpts.offline ? "--offline" : null;
       if (!cmdOpts.offline) {
@@ -9442,9 +9774,16 @@ function registerDoctorCommands(program2) {
         path: l.path,
         exists: l.exists,
         totalSkills: l.totalSkills,
+        marketplaceSkills: l.marketplaceSkills,
         staleSkills: l.exists ? findStaleBundledSkills(l.path) : []
       }));
-      const problems = buildProblems(globalFile, repoFile, credentials, skillLocations);
+      const marketplaces = getAllMarketplaces(globalConfig).map((m) => ({
+        name: m.name ?? m.repoUrl ?? "(unnamed)",
+        repoUrl: m.repoUrl ?? null,
+        localPath: m.localPath ?? null,
+        cloneExists: !!m.localPath && fs5.existsSync(m.localPath)
+      }));
+      const problems = buildProblems(globalFile, repoFile, credentials, skillLocations, marketplaces);
       if (credentials) {
         const statuses = Object.values(credentials).map((r) => r.status);
         if (statuses.includes("invalid")) process.exitCode = ExitCode.AUTH_ERROR;
@@ -9463,6 +9802,10 @@ function registerDoctorCommands(program2) {
           locations: skillLocations,
           staleTotal: skillLocations.reduce((sum, l) => sum + l.staleSkills.length, 0)
         },
+        marketplaces: {
+          registered: marketplaces,
+          hint: marketplaces.length === 0 ? "No org marketplaces registered. Add one with: pncli skills marketplace add <git-url> --all-agents" : "Refresh with: pncli skills marketplace sync --marketplace all --all-agents"
+        },
         problems
       }, "doctor", "check", start);
     } catch (err) {
@@ -9852,8 +10195,8 @@ function registerAdoProjectCommands(ado) {
 }
 
 // src/services/ado/commands/work.ts
-import fs5 from "fs";
-import path9 from "path";
+import fs6 from "fs";
+import path10 from "path";
 
 // src/services/ado/input-schema.ts
 var ADO_WORK_INPUT_FILE_SCHEMA = {
@@ -10094,11 +10437,11 @@ function registerAdoWorkCommands(ado) {
       const attachments = await workClient.listAttachments(collection, parseInt(opts.id, 10));
       const attachment = attachments.find((a) => a.id === opts.attachmentId);
       if (!attachment) throw new PncliError(`Attachment not found: ${opts.attachmentId}`, 1);
-      const outDir = opts.dir ?? path9.join(process.cwd(), ".pncli");
-      fs5.mkdirSync(outDir, { recursive: true });
-      const outPath = path9.join(outDir, path9.basename(attachment.name));
+      const outDir = opts.dir ?? path10.join(process.cwd(), ".pncli");
+      fs6.mkdirSync(outDir, { recursive: true });
+      const outPath = path10.join(outDir, path10.basename(attachment.name));
       const buffer = await workClient.downloadAttachment(attachment.url);
-      fs5.writeFileSync(outPath, buffer);
+      fs6.writeFileSync(outPath, buffer);
       success({ saved: outPath, name: attachment.name, size: buffer.length }, "ado", "work-download-attachment", start);
     } catch (err) {
       fail(err, "ado", "work-download-attachment", start);
@@ -10132,10 +10475,10 @@ function registerAdoWorkCommands(ado) {
       const types = await discoverTypes(workClient, collection, project);
       if (opts.save) {
         const globalConfigPath = getGlobalConfigPath(globalOpts.config);
-        const fs8 = await import("fs");
-        const existing = JSON.parse(fs8.readFileSync(globalConfigPath, "utf8") || "{}");
+        const fs9 = await import("fs");
+        const existing = JSON.parse(fs9.readFileSync(globalConfigPath, "utf8") || "{}");
         existing.ado = { ...existing.ado ?? {}, discoveredTypes: types };
-        fs8.writeFileSync(globalConfigPath, JSON.stringify(existing, null, 2) + "\n", "utf8");
+        fs9.writeFileSync(globalConfigPath, JSON.stringify(existing, null, 2) + "\n", "utf8");
         warn(`Saved ${types.length} types to ${globalConfigPath}`);
       }
       success(types, "ado", "work-types", start);
@@ -10164,11 +10507,11 @@ function registerAdoWorkCommands(ado) {
       ) : allFields;
       if (opts.save) {
         const globalConfigPath = getGlobalConfigPath(globalOpts.config);
-        const fs8 = await import("fs");
-        const existing = JSON.parse(fs8.readFileSync(globalConfigPath, "utf8") || "{}");
+        const fs9 = await import("fs");
+        const existing = JSON.parse(fs9.readFileSync(globalConfigPath, "utf8") || "{}");
         const aliases = buildDefaultAliases(allFields);
         existing.ado = { ...existing.ado ?? {}, discoveredFields: allFields, fieldAliases: aliases };
-        fs8.writeFileSync(globalConfigPath, JSON.stringify(existing, null, 2) + "\n", "utf8");
+        fs9.writeFileSync(globalConfigPath, JSON.stringify(existing, null, 2) + "\n", "utf8");
         warn(`Saved ${allFields.length} fields and ${Object.keys(aliases).length} aliases to ${globalConfigPath}`);
       }
       success(fields, "ado", "work-fields", start);
@@ -10469,7 +10812,7 @@ function registerAdoRepoCommands(ado) {
         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-TAINU2LF.js");
+        const { createHttpClient: createHttpClient2 } = await import("./http-V7PZD7LE.js");
         const http = createHttpClient2(config, Boolean(globalOpts.dryRun));
         const coreClient = new AdoCoreClient2(http);
         const me = await coreClient.getConnectionData(collection);
@@ -10939,18 +11282,18 @@ var ArtifactoryClient = class {
       }
     });
   }
-  async getStorageInfo(repo, path10) {
-    const cleanPath = path10.startsWith("/") ? path10.slice(1) : path10;
+  async getStorageInfo(repo, path11) {
+    const cleanPath = path11.startsWith("/") ? path11.slice(1) : path11;
     return this.http.artifactory(`${API9}/storage/${repo}/${cleanPath}`);
   }
-  async getProperties(repo, path10) {
-    const cleanPath = path10.startsWith("/") ? path10.slice(1) : path10;
+  async getProperties(repo, path11) {
+    const cleanPath = path11.startsWith("/") ? path11.slice(1) : path11;
     return this.http.artifactory(`${API9}/storage/${repo}/${cleanPath}`, {
       params: { properties: "" }
     });
   }
-  async setProperties(repo, path10, properties, opts = {}) {
-    const cleanPath = path10.startsWith("/") ? path10.slice(1) : path10;
+  async setProperties(repo, path11, properties, opts = {}) {
+    const cleanPath = path11.startsWith("/") ? path11.slice(1) : path11;
     const propString = Object.entries(properties).map(([k, v]) => `${k}=${v}`).join(";");
     await this.http.artifactory(`${API9}/storage/${repo}/${cleanPath}`, {
       method: "PUT",
@@ -11032,27 +11375,27 @@ function registerArtifactoryCommands(program2) {
       fail(err, "artifactory", "repos", start);
     }
   });
-  art.command("artifact-info <repo> <path>").description("Get metadata for an artifact or folder (checksums, size, timestamps)").action(async (repo, path10) => {
+  art.command("artifact-info <repo> <path>").description("Get metadata for an artifact or folder (checksums, size, timestamps)").action(async (repo, path11) => {
     const start = Date.now();
     try {
       const client = getClient8(program2);
-      const data = await client.getStorageInfo(repo, path10);
+      const data = await client.getStorageInfo(repo, path11);
       success(data, "artifactory", "artifact-info", start);
     } catch (err) {
       fail(err, "artifactory", "artifact-info", start);
     }
   });
-  art.command("properties-get <repo> <path>").description("Read custom properties on an artifact").action(async (repo, path10) => {
+  art.command("properties-get <repo> <path>").description("Read custom properties on an artifact").action(async (repo, path11) => {
     const start = Date.now();
     try {
       const client = getClient8(program2);
-      const data = await client.getProperties(repo, path10);
+      const data = await client.getProperties(repo, path11);
       success(data, "artifactory", "properties-get", start);
     } catch (err) {
       fail(err, "artifactory", "properties-get", start);
     }
   });
-  art.command("properties-set <repo> <path> [keyvals...]").description("Set custom properties on an artifact (format: key=value key=value...)").option("--recursive", "Apply recursively to folder contents", false).action(async (repo, path10, keyvals, opts) => {
+  art.command("properties-set <repo> <path> [keyvals...]").description("Set custom properties on an artifact (format: key=value key=value...)").option("--recursive", "Apply recursively to folder contents", false).action(async (repo, path11, keyvals, opts) => {
     const start = Date.now();
     try {
       if (!keyvals.length) throw new PncliError("Provide at least one key=value pair");
@@ -11063,8 +11406,8 @@ function registerArtifactoryCommands(program2) {
         properties[kv.slice(0, eq)] = kv.slice(eq + 1);
       }
       const client = getClient8(program2);
-      await client.setProperties(repo, path10, properties, { recursive: opts.recursive });
-      success({ repo, path: path10, properties }, "artifactory", "properties-set", start);
+      await client.setProperties(repo, path11, properties, { recursive: opts.recursive });
+      success({ repo, path: path11, properties }, "artifactory", "properties-set", start);
     } catch (err) {
       fail(err, "artifactory", "properties-set", start);
     }
@@ -11382,8 +11725,8 @@ function registerSonatypeIqCommands(program2) {
     const startTime = Date.now();
     try {
       const http = getHttpClient(program2);
-      const path10 = opts.organizationId ? `/api/v2/policies/organization/${encodeURIComponent(opts.organizationId)}` : "/api/v2/policies";
-      const data = await http.sonatypeiq(path10);
+      const path11 = opts.organizationId ? `/api/v2/policies/organization/${encodeURIComponent(opts.organizationId)}` : "/api/v2/policies";
+      const data = await http.sonatypeiq(path11);
       success(data, "sonatypeiq", "policies list", startTime);
     } catch (err) {
       fail(err, "sonatypeiq", "policies list", startTime);
@@ -12078,7 +12421,7 @@ function registerLogscaleCommands(program2) {
 }
 
 // src/services/splitio/commands.ts
-import fs6 from "fs";
+import fs7 from "fs";
 import confirm2 from "@inquirer/confirm";
 function getHttp4(program2) {
   const opts = program2.optsWithGlobals();
@@ -12090,9 +12433,9 @@ function getHttp4(program2) {
 function loadInputFile(filePath) {
   let raw;
   if (filePath === "-") {
-    raw = fs6.readFileSync(process.stdin.fd, "utf8");
+    raw = fs7.readFileSync(process.stdin.fd, "utf8");
   } else {
-    raw = fs6.readFileSync(filePath, "utf8");
+    raw = fs7.readFileSync(filePath, "utf8");
   }
   try {
     return JSON.parse(raw);
@@ -12143,7 +12486,7 @@ function registerSplitioCommands(program2) {
     try {
       const http = getHttp4(program2);
       const data = await http.splitio(
-        `/internal/api/v2/workspaces/${encodeURIComponent(opts.workspace)}/environments`
+        `/internal/api/v2/environments/ws/${encodeURIComponent(opts.workspace)}`
       );
       success(
         { count: data.objects.length, environments: data.objects },
@@ -12161,12 +12504,14 @@ function registerSplitioCommands(program2) {
     try {
       const http = getHttp4(program2);
       const params = {
-        wsId: opts.workspace,
         limit: parseInt(opts.limit, 10),
         offset: parseInt(opts.offset, 10)
       };
       if (opts.flagSet) params["flagSetName"] = opts.flagSet;
-      const data = await http.splitio("/internal/api/v2/splits", { params });
+      const data = await http.splitio(
+        `/internal/api/v2/splits/ws/${encodeURIComponent(opts.workspace)}`,
+        { params }
+      );
       success(
         { count: data.objects.length, totalCount: data.totalCount, flags: data.objects },
         "splitio",
@@ -12183,14 +12528,12 @@ function registerSplitioCommands(program2) {
       const http = getHttp4(program2);
       if (opts.environment) {
         const data = await http.splitio(
-          `/internal/api/v2/splits/${encodeURIComponent(opts.flag)}/environments/${encodeURIComponent(opts.environment)}`,
-          { params: { wsId: opts.workspace } }
+          `/internal/api/v2/splits/ws/${encodeURIComponent(opts.workspace)}/name/${encodeURIComponent(opts.flag)}/environment/${encodeURIComponent(opts.environment)}`
         );
         success(data, "splitio", "flags get", start);
       } else {
         const data = await http.splitio(
-          `/internal/api/v2/splits/${encodeURIComponent(opts.flag)}`,
-          { params: { wsId: opts.workspace } }
+          `/internal/api/v2/splits/ws/${encodeURIComponent(opts.workspace)}/name/${encodeURIComponent(opts.flag)}`
         );
         success(data, "splitio", "flags get", start);
       }
@@ -12215,7 +12558,7 @@ function registerSplitioCommands(program2) {
         },
         workspace: { id: opts.workspace }
       };
-      const data = await http.splitio("/internal/api/v2/changeRequests", {
+      const data = await http.splitio(`/internal/api/v2/changeRequests/ws/${encodeURIComponent(opts.workspace)}`, {
         method: "POST",
         body
       });
@@ -12232,8 +12575,7 @@ function registerSplitioCommands(program2) {
       }
       const http = getHttp4(program2);
       const current = await http.splitio(
-        `/internal/api/v2/splits/${encodeURIComponent(opts.flag)}/environments/${encodeURIComponent(opts.environment)}`,
-        { params: { wsId: opts.workspace } }
+        `/internal/api/v2/splits/ws/${encodeURIComponent(opts.workspace)}/name/${encodeURIComponent(opts.flag)}/environment/${encodeURIComponent(opts.environment)}`
       );
       const rules = current.rules ?? [];
       const idx = parseInt(opts.ruleIndex, 10);
@@ -12257,7 +12599,7 @@ function registerSplitioCommands(program2) {
         },
         workspace: { id: opts.workspace }
       };
-      const data = await http.splitio("/internal/api/v2/changeRequests", {
+      const data = await http.splitio(`/internal/api/v2/changeRequests/ws/${encodeURIComponent(opts.workspace)}`, {
         method: "POST",
         body
       });
@@ -12271,8 +12613,7 @@ function registerSplitioCommands(program2) {
     try {
       const http = getHttp4(program2);
       const current = await http.splitio(
-        `/internal/api/v2/splits/${encodeURIComponent(opts.flag)}/environments/${encodeURIComponent(opts.environment)}`,
-        { params: { wsId: opts.workspace } }
+        `/internal/api/v2/splits/ws/${encodeURIComponent(opts.workspace)}/name/${encodeURIComponent(opts.flag)}/environment/${encodeURIComponent(opts.environment)}`
       );
       await confirmWrite(opts, `SET_DEFAULT ${opts.treatment} on ${opts.flag} in ${opts.environment}`);
       const body = {
@@ -12288,7 +12629,7 @@ function registerSplitioCommands(program2) {
         },
         workspace: { id: opts.workspace }
       };
-      const data = await http.splitio("/internal/api/v2/changeRequests", {
+      const data = await http.splitio(`/internal/api/v2/changeRequests/ws/${encodeURIComponent(opts.workspace)}`, {
         method: "POST",
         body
       });
@@ -12310,7 +12651,7 @@ function registerSplitioCommands(program2) {
         split: { name: opts.flag, environment: { id: opts.environment } },
         workspace: { id: opts.workspace }
       };
-      const data = await http.splitio("/internal/api/v2/changeRequests", {
+      const data = await http.splitio(`/internal/api/v2/changeRequests/ws/${encodeURIComponent(opts.workspace)}`, {
         method: "POST",
         body
       });
@@ -12338,7 +12679,7 @@ function registerSplitioCommands(program2) {
             split: { name: entry.flag, environment: { id: opts.environment } },
             workspace: { id: opts.workspace }
           };
-          const cr = await http.splitio("/internal/api/v2/changeRequests", {
+          const cr = await http.splitio(`/internal/api/v2/changeRequests/ws/${encodeURIComponent(opts.workspace)}`, {
             method: "POST",
             body
           });
@@ -12367,7 +12708,7 @@ function registerSplitioCommands(program2) {
         split: { name: opts.flag, environment: { id: opts.environment } },
         workspace: { id: opts.workspace }
       };
-      const data = await http.splitio("/internal/api/v2/changeRequests", {
+      const data = await http.splitio(`/internal/api/v2/changeRequests/ws/${encodeURIComponent(opts.workspace)}`, {
         method: "POST",
         body
       });
@@ -12387,7 +12728,7 @@ function registerSplitioCommands(program2) {
         split: { name: opts.flag, environment: { id: opts.environment } },
         workspace: { id: opts.workspace }
       };
-      const data = await http.splitio("/internal/api/v2/changeRequests", {
+      const data = await http.splitio(`/internal/api/v2/changeRequests/ws/${encodeURIComponent(opts.workspace)}`, {
         method: "POST",
         body
       });
@@ -12407,7 +12748,7 @@ function registerSplitioCommands(program2) {
         split: { name: opts.flag },
         workspace: { id: opts.workspace }
       };
-      const data = await http.splitio("/internal/api/v2/changeRequests", {
+      const data = await http.splitio(`/internal/api/v2/changeRequests/ws/${encodeURIComponent(opts.workspace)}`, {
         method: "POST",
         body
       });
@@ -12422,14 +12763,13 @@ function registerSplitioCommands(program2) {
     try {
       const http = getHttp4(program2);
       const params = {
-        wsId: opts.workspace,
         limit: parseInt(opts.limit, 10),
         offset: parseInt(opts.offset, 10)
       };
       if (opts.environment) params["environmentId"] = opts.environment;
       if (opts.status) params["status"] = opts.status;
       const data = await http.splitio(
-        "/internal/api/v2/changeRequests",
+        `/internal/api/v2/changeRequests/ws/${encodeURIComponent(opts.workspace)}`,
         { params }
       );
       success(
@@ -12627,7 +12967,7 @@ function registerFigmaCommands(program2) {
 }
 
 // src/services/alation/commands.ts
-import fs7 from "fs";
+import fs8 from "fs";
 var MAX_PAGE = 1e3;
 function parseIntOption(value, flag) {
   if (value === void 0) return void 0;
@@ -12740,8 +13080,8 @@ function getHttp6(program2) {
     Boolean(opts.dryRun)
   );
 }
-async function getOne(http, path10, id, what) {
-  const rows = await http.alation(path10, { params: { id, limit: 1 } });
+async function getOne(http, path11, id, what) {
+  const rows = await http.alation(path11, { params: { id, limit: 1 } });
   const row = Array.isArray(rows) ? rows.find((r) => r.id === id) ?? rows[0] : void 0;
   if (!row) throw new PncliError(`${what} ${id} not found`, 404);
   return row;
@@ -12791,7 +13131,7 @@ function registerAlationCommands(program2) {
       const opts = program2.optsWithGlobals();
       const config = loadConfig({ configPath: opts.config });
       if (opts.dryRun) {
-        fs7.writeSync(process.stderr.fd, `DRY RUN: POST ${config.alation.baseUrl ?? "<alation.baseUrl>"}/integration/v1/createAPIAccessToken/ (token exchange skipped)
+        fs8.writeSync(process.stderr.fd, `DRY RUN: POST ${config.alation.baseUrl ?? "<alation.baseUrl>"}/integration/v1/createAPIAccessToken/ (token exchange skipped)
 `);
         process.exitCode = ExitCode.SUCCESS;
         throw new PncliError("dry-run", 0);
@@ -13035,7 +13375,7 @@ if (!process.env.PNCLI_VERIFY_TLS) {
   process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
 }
 await configureProxy();
-var TAGLINE = "One command does what three meetings couldn't.";
+var TAGLINE = "Connectivity without MCP.";
 var program = new Command3();
 program.name("pncli").description(`The Paperwork Nightmare CLI \u2014 ${TAGLINE}`).version(`${getPncliVersion()} \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) => {
@@ -13099,9 +13439,16 @@ Services:
   figma        Figma (files, comments, version history)
   alation      Alation (data sources, schemas, tables, columns, search, Document Hubs)
   config       Manage pncli configuration
-  doctor       Diagnose pncli setup (config files, credentials, agent skills)
+  doctor       Diagnose pncli setup (config files, credentials, agent skills, marketplaces)
   skills       Install and manage agent skills (Codex, GitHub Copilot, Claude Code)
   jwt          JWT token utilities (decode header and payload)
+
+Agent skills and org plugins:
+  pncli skills install --all-agents                     Bundled pncli skills into this repo, every agent host
+  pncli skills marketplace add <git-url> --all-agents   Org plugins (skills + AGENTS.md/CLAUDE.md) from a git marketplace
+  pncli skills marketplace sync                         Pull and refresh everything installed from marketplaces
+  pncli skills marketplace manage                       Interactive: toggle plugins, add/remove marketplaces
+  pncli skills --help                                   Every install location and command
 `);
 program.parseAsync(process.argv).catch((err) => {
   if (process.exitCode !== void 0) return;