@kolatts/pncli 1.11.1 → 1.13.0

package/dist/cli.js

@@ -18,8 +18,9 @@ import {
   setGlobalOptions,
   setGlobalUser,
   success,
-  warn
-} from "./chunk-VPUWMP2M.js";
+  warn,
+  writeRawOutput
+} from "./chunk-BNT4SEZD.js";
 import {
   AdoCoreClient
 } from "./chunk-VDL32PSG.js";
@@ -276,29 +277,44 @@ function parseBranchReportOutput(raw, branchName, opts) {
     }
   }
   if (current) commits.push(current);
-  const totalInsertions = commits.reduce((sum, c) => sum + c.insertions, 0);
-  const totalDeletions = commits.reduce((sum, c) => sum + c.deletions, 0);
+  const isAbsoluteDate = (s) => /^\d{4}-\d{2}-\d{2}/.test(s);
+  const sinceDate = opts.since && isAbsoluteDate(opts.since) ? opts.since.slice(0, 10) : null;
+  const untilDate = opts.until && isAbsoluteDate(opts.until) ? opts.until.slice(0, 10) : null;
+  const filteredCommits = sinceDate || untilDate ? commits.filter((c) => {
+    const d = c.date.slice(0, 10);
+    if (sinceDate && d < sinceDate) return false;
+    if (untilDate && d > untilDate) return false;
+    return true;
+  }) : commits;
+  const totalInsertions = filteredCommits.reduce((sum, c) => sum + c.insertions, 0);
+  const totalDeletions = filteredCommits.reduce((sum, c) => sum + c.deletions, 0);
   return {
     branch: branchName,
     since: opts.since ?? null,
     until: opts.until ?? null,
-    commits,
-    weeks: buildWeeklyBreakdown(commits),
-    byAuthor: buildByAuthor(commits),
+    commits: filteredCommits,
+    weeks: buildWeeklyBreakdown(filteredCommits),
+    byAuthor: buildByAuthor(filteredCommits),
     summary: {
-      commitCount: commits.length,
+      commitCount: filteredCommits.length,
       totalInsertions,
       totalDeletions,
       totalNetLines: totalInsertions - totalDeletions,
-      totalFilesChanged: commits.reduce((sum, c) => sum + c.filesChanged, 0)
+      totalFilesChanged: filteredCommits.reduce((sum, c) => sum + c.filesChanged, 0)
     }
   };
 }
+function normalizeGitDate(dateStr) {
+  if (/^\d{4}-\d{2}-\d{2}$/.test(dateStr)) {
+    return `${dateStr}T00:00:00`;
+  }
+  return dateStr;
+}
 function buildReportArgs(opts) {
   const fmt = `${COMMIT_PREFIX}%H	%an	%aI	%s`;
   const args = ["log", `--format=${fmt}`, "--numstat"];
-  if (opts.since) args.push(`--since=${opts.since}`);
-  if (opts.until) args.push(`--until=${opts.until}`);
+  if (opts.since) args.push(`--since=${normalizeGitDate(opts.since)}`);
+  if (opts.until) args.push(`--until=${normalizeGitDate(opts.until)}`);
   if (opts.base && opts.branch) {
     args.push(`${opts.base}..${opts.branch}`);
   } else if (opts.base) {
@@ -405,38 +421,38 @@ function parseAdoRemote(remoteUrl, adoBaseUrl) {
   } catch {
     baseHostname = adoBaseUrl.replace(/\/$/, "").replace(/^https?:\/\//, "").split(/[:/]/)[0].toLowerCase();
   }
-  let path6 = remoteUrl;
+  let path8 = remoteUrl;
   let remoteHostname = "";
-  const sshProtoMatch = path6.match(/^ssh:\/\/[^@]*@?([^/:]+)(?::\d+)?(.*)/);
+  const sshProtoMatch = path8.match(/^ssh:\/\/[^@]*@?([^/:]+)(?::\d+)?(.*)/);
   if (sshProtoMatch) {
     remoteHostname = sshProtoMatch[1].toLowerCase();
-    path6 = sshProtoMatch[2];
+    path8 = sshProtoMatch[2];
   } else {
-    const gitAtMatch = path6.match(/^git@([^:]+)(?::\d+)?:(.*)/);
+    const gitAtMatch = path8.match(/^git@([^:]+)(?::\d+)?:(.*)/);
     if (gitAtMatch) {
       remoteHostname = gitAtMatch[1].toLowerCase();
-      path6 = "/" + gitAtMatch[2];
+      path8 = "/" + gitAtMatch[2];
     } else {
-      const httpsMatch = path6.match(/^https?:\/\/([^/:]+)(?::\d+)?(.*)/);
+      const httpsMatch = path8.match(/^https?:\/\/([^/:]+)(?::\d+)?(.*)/);
       if (httpsMatch) {
         remoteHostname = httpsMatch[1].toLowerCase();
-        path6 = httpsMatch[2];
+        path8 = httpsMatch[2];
       }
     }
   }
   if (!remoteHostname || remoteHostname !== baseHostname) return null;
-  path6 = path6.replace(/\.git$/, "");
-  const gitIdx = path6.indexOf("/_git/");
-  const sshIdx = path6.indexOf("/_ssh/");
+  path8 = path8.replace(/\.git$/, "");
+  const gitIdx = path8.indexOf("/_git/");
+  const sshIdx = path8.indexOf("/_ssh/");
   const markerIdx = gitIdx !== -1 ? gitIdx : sshIdx;
   if (markerIdx === -1) return null;
-  const repo = path6.slice(markerIdx + 6);
+  const repo = decodeURIComponent(path8.slice(markerIdx + 6));
   if (!repo) return null;
-  const before = path6.slice(1, markerIdx);
+  const before = path8.slice(1, markerIdx);
   const parts = before.split("/").filter(Boolean);
   if (parts.length < 2) return null;
-  const project = parts[parts.length - 1];
-  const collection = parts[parts.length - 2];
+  const project = decodeURIComponent(parts[parts.length - 1]);
+  const collection = decodeURIComponent(parts[parts.length - 2]);
   return { collection, project, repo };
 }
 function getRemoteUrls(repoRoot) {
@@ -736,7 +752,7 @@ function registerGitCommands(program2) {
         until: opts.until
       });
       if (opts.csv) {
-        process.stdout.write(formatBranchReportCsv(report));
+        writeRawOutput(formatBranchReportCsv(report));
       } else {
         success(report, "git", "report", start);
       }
@@ -776,7 +792,13 @@ function registerGitCommands(program2) {
   });
 }
 
+// src/services/jira/commands.ts
+import { readFileSync as readFileSync2, existsSync, writeFileSync, mkdirSync } from "fs";
+import path from "path";
+
 // src/services/jira/client.ts
+import { readFileSync } from "fs";
+import { basename, extname } from "path";
 var API2 = "/rest/api/2";
 var JiraClient = class {
   constructor(http) {
@@ -796,6 +818,7 @@ var JiraClient = class {
         ...opts.priority ? { priority: { name: opts.priority } } : {},
         ...opts.assignee ? { assignee: { name: opts.assignee } } : {},
         ...opts.labels?.length ? { labels: opts.labels } : {},
+        ...opts.parent ? { parent: { key: opts.parent } } : {},
         ...opts.customFieldValues ?? {}
       }
     };
@@ -864,7 +887,86 @@ var JiraClient = class {
     return { issues: allIssues, total: allIssues.length, startAt: 0, maxResults: allIssues.length };
   }
   async fetchFields() {
-    return this.http.jira(`${API2}/field`);
+    const fields = await this.http.jira(`${API2}/field`);
+    return fields.map((f) => ({ ...f, pncliType: schemaToPncliType(f.schema) }));
+  }
+  async fetchFieldsWithAllowedValues(project, issueType) {
+    const fields = await this.fetchFields();
+    let metaFields = {};
+    try {
+      const meta = await this.http.jira(`${API2}/issue/createmeta`, {
+        params: { projectKeys: project, expand: "projects.issuetypes.fields" }
+      });
+      metaFields = collectMetaFields(meta.projects, issueType);
+    } catch {
+      try {
+        metaFields = await this.fetchCreateMetaViaIssuetypes(project, issueType);
+      } catch {
+      }
+    }
+    return fields.map((f) => {
+      const av = metaFields[f.id]?.allowedValues;
+      return av?.length ? { ...f, allowedValues: av } : f;
+    });
+  }
+  /**
+   * Fallback for instances where the classic createmeta endpoint returns 404.
+   * Uses the paginated endpoint available in Jira Datacenter 8.4+.
+   */
+  async fetchCreateMetaViaIssuetypes(project, issueType) {
+    const itList = await this.http.jira(
+      `${API2}/issue/createmeta/${encodeURIComponent(project)}/issuetypes`
+    );
+    const matchingTypes = issueType ? itList.values.filter((it) => it.name.toLowerCase() === issueType.toLowerCase()) : itList.values;
+    const result = {};
+    for (const it of matchingTypes) {
+      const fieldList = await this.http.jira(
+        `${API2}/issue/createmeta/${encodeURIComponent(project)}/issuetypes/${it.id}`
+      );
+      for (const field of fieldList.values) {
+        if (!field.allowedValues?.length) continue;
+        const existing = result[field.fieldId]?.allowedValues ?? [];
+        const seen = new Set(existing.map((v) => v.id));
+        for (const av of field.allowedValues) {
+          if (!seen.has(av.id)) {
+            existing.push(av);
+            seen.add(av.id);
+          }
+        }
+        result[field.fieldId] = { allowedValues: existing };
+      }
+    }
+    return result;
+  }
+  async addLabels(key, labels) {
+    await this.http.jira(`${API2}/issue/${key}`, {
+      method: "PUT",
+      body: { update: { labels: labels.map((l) => ({ add: l })) } }
+    });
+  }
+  async removeLabels(key, labels) {
+    await this.http.jira(`${API2}/issue/${key}`, {
+      method: "PUT",
+      body: { update: { labels: labels.map((l) => ({ remove: l })) } }
+    });
+  }
+  async uploadAttachment(key, filePath) {
+    const fileContent = readFileSync(filePath);
+    const fileName = basename(filePath);
+    const mimeType = guessMimeType(filePath);
+    const formData = new FormData();
+    formData.append("file", new Blob([fileContent], { type: mimeType }), fileName);
+    return this.http.jiraUpload(`${API2}/issue/${key}/attachments`, formData);
+  }
+  async listAttachments(key) {
+    const result = await this.http.jira(
+      `${API2}/issue/${key}`,
+      { params: { fields: "attachment" } }
+    );
+    return result.fields.attachment ?? [];
+  }
+  async downloadAttachment(contentUrl) {
+    return this.http.jiraBuffer(contentUrl);
   }
   async assignIssue(key, accountId) {
     await this.http.jira(`${API2}/issue/${key}/assignee`, {
@@ -894,6 +996,70 @@ var JiraClient = class {
     });
   }
 };
+function guessMimeType(filePath) {
+  const ext = extname(filePath).toLowerCase();
+  const map = {
+    ".jpg": "image/jpeg",
+    ".jpeg": "image/jpeg",
+    ".png": "image/png",
+    ".gif": "image/gif",
+    ".svg": "image/svg+xml",
+    ".pdf": "application/pdf",
+    ".txt": "text/plain",
+    ".log": "text/plain",
+    ".csv": "text/csv",
+    ".json": "application/json",
+    ".xml": "application/xml",
+    ".zip": "application/zip",
+    ".tar": "application/x-tar",
+    ".gz": "application/gzip",
+    ".md": "text/markdown",
+    ".html": "text/html",
+    ".htm": "text/html",
+    ".doc": "application/msword",
+    ".docx": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+    ".xls": "application/vnd.ms-excel",
+    ".xlsx": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+  };
+  return map[ext] ?? "application/octet-stream";
+}
+function schemaToPncliType(schema) {
+  if (!schema) return void 0;
+  const custom = schema.custom ?? "";
+  if (custom.includes("cascadingselect")) return "cascading-select";
+  if (custom.includes("multicheckboxes") || custom.includes("multiselect")) return "multi-select";
+  if (custom.includes("select") || custom.includes("radiobuttons")) return "select";
+  if (custom.includes("userpicker") || custom.includes("multiuserpicker")) return "user";
+  if (custom.includes("labels")) return "labels";
+  if (custom.includes("url")) return "url";
+  if (custom.includes("textarea") || custom.includes("textfield")) return "textarea";
+  if (schema.type === "number") return "number";
+  if (schema.type === "date") return "date";
+  if (schema.type === "datetime") return "datetime";
+  if (schema.type === "string") return "string";
+  return void 0;
+}
+function collectMetaFields(projects, issueType) {
+  const result = {};
+  for (const proj of projects) {
+    for (const it of proj.issuetypes) {
+      if (issueType && it.name.toLowerCase() !== issueType.toLowerCase()) continue;
+      for (const [fieldId, fieldMeta] of Object.entries(it.fields)) {
+        if (!fieldMeta.allowedValues?.length) continue;
+        const existing = result[fieldId]?.allowedValues ?? [];
+        const seen = new Set(existing.map((v) => v.id));
+        for (const av of fieldMeta.allowedValues) {
+          if (!seen.has(av.id)) {
+            existing.push(av);
+            seen.add(av.id);
+          }
+        }
+        result[fieldId] = { allowedValues: existing };
+      }
+    }
+  }
+  return result;
+}
 
 // src/services/jira/custom-fields.ts
 function buildFieldMap(fields) {
@@ -937,6 +1103,15 @@ function formatFieldValue(value, type) {
       return { value };
     case "multi-select":
       return value.split(",").map((v) => ({ value: v.trim() }));
+    case "option-id":
+      return { id: value };
+    case "cascading-select": {
+      const colon = value.indexOf(":");
+      if (colon !== -1) {
+        return { id: value.slice(0, colon).trim(), child: { id: value.slice(colon + 1).trim() } };
+      }
+      return { id: value.trim() };
+    }
     case "labels":
       return value.split(",").map((v) => v.trim());
     case "user":
@@ -986,41 +1161,41 @@ function registerJiraCommands(program2) {
       fail(err, "jira", "get-issue", start);
     }
   });
-  jira.command("create-issue").description("Create a Jira issue").option("--project <key>", "Project key").option("--type <type>", "Issue type (Bug, Story, Task, ...)").requiredOption("--summary <text>", "Issue summary").option("--description <text>", "Issue description").option("--priority <name>", "Priority name").option("--assignee <accountId>", "Assignee account ID").option("--labels <labels>", "Comma-separated labels").option("--parent <key>", 'Parent issue key \u2014 creates an "is child of" link after creation').option("--field <Name=value>", "Custom field value (repeatable)", (val, acc) => [...acc, val], []).action(async (opts) => {
+  jira.command("create-issue").description("Create a Jira issue").option("--project <key>", "Project key").option("--type <type>", "Issue type (Bug, Story, Task, ...)").requiredOption("--summary <text>", "Issue summary").option("--description <text>", "Issue description").option("--priority <name>", "Priority name").option("--assignee <accountId>", "Assignee account ID").option("--labels <labels>", "Comma-separated labels").option("--parent <key>", "Parent issue key \u2014 sets fields.parent in the create payload").option("--field <Name=value>", "Custom field value; use Name=@file.json to read value from file (repeatable)", (val, acc) => [...acc, val], []).option("--fields-file <path>", "Path to a JSON file mapping field names/IDs to their Jira API values").action(async (opts) => {
     const start = Date.now();
+    let fieldMap = buildFieldMap([]);
     try {
-      const { client, fieldMap } = getClientAndFields(program2);
+      const resolved = getClientAndFields(program2);
+      const client = resolved.client;
+      fieldMap = resolved.fieldMap;
       const defaults = getDefaults(program2);
       const project = opts.project ?? defaults.project;
       const issueType = opts.type ?? defaults.issueType ?? "Task";
       const priority = opts.priority ?? defaults.priority;
       if (!project) throw new PncliError("--project required (or set defaults.jira.project in config)", 1);
       const labels = opts.labels ? opts.labels.split(",").map((s) => s.trim()) : void 0;
-      const customFieldValues = parseFieldArgs(opts.field, fieldMap);
-      const data = await client.createIssue({ project, issueType, summary: opts.summary, description: opts.description, priority, assignee: opts.assignee, labels, customFieldValues });
+      const fileFields = opts.fieldsFile ? parseFieldsFile(opts.fieldsFile, fieldMap) : {};
+      const customFieldValues = { ...fileFields, ...parseFieldArgs(opts.field, fieldMap) };
+      const data = await client.createIssue({ project, issueType, summary: opts.summary, description: opts.description, priority, assignee: opts.assignee, labels, parent: opts.parent, customFieldValues });
       success(data, "jira", "create-issue", start);
-      if (opts.parent) {
-        try {
-          await client.linkIssue({ key: data.key, linkType: "is child of", target: opts.parent });
-        } catch (linkErr) {
-          warn(`Created ${data.key} but failed to link to parent ${opts.parent}: ${linkErr instanceof Error ? linkErr.message : linkErr}`);
-        }
-      }
-      return;
     } catch (err) {
-      fail(err, "jira", "create-issue", start);
+      fail(translateFieldErrors(err, fieldMap), "jira", "create-issue", start);
     }
   });
-  jira.command("update-issue").description("Update a Jira issue").requiredOption("--key <issue-key>", "Issue key").option("--summary <text>", "New summary").option("--description <text>", "New description").option("--priority <name>", "New priority").option("--assignee <accountId>", "New assignee account ID").option("--labels <labels>", "Comma-separated labels").option("--field <Name=value>", "Custom field value (repeatable)", (val, acc) => [...acc, val], []).action(async (opts) => {
+  jira.command("update-issue").description("Update a Jira issue").requiredOption("--key <issue-key>", "Issue key").option("--summary <text>", "New summary").option("--description <text>", "New description").option("--priority <name>", "New priority").option("--assignee <accountId>", "New assignee account ID").option("--labels <labels>", "Comma-separated labels").option("--field <Name=value>", "Custom field value; use Name=@file.json to read value from file (repeatable)", (val, acc) => [...acc, val], []).option("--fields-file <path>", "Path to a JSON file mapping field names/IDs to their Jira API values").action(async (opts) => {
     const start = Date.now();
+    let fieldMap = buildFieldMap([]);
     try {
-      const { client, fieldMap } = getClientAndFields(program2);
+      const resolved = getClientAndFields(program2);
+      const client = resolved.client;
+      fieldMap = resolved.fieldMap;
       const labels = opts.labels ? opts.labels.split(",").map((s) => s.trim()) : void 0;
-      const customFieldValues = parseFieldArgs(opts.field, fieldMap);
+      const fileFields = opts.fieldsFile ? parseFieldsFile(opts.fieldsFile, fieldMap) : {};
+      const customFieldValues = { ...fileFields, ...parseFieldArgs(opts.field, fieldMap) };
       await client.updateIssue(opts.key, { summary: opts.summary, description: opts.description, priority: opts.priority, assignee: opts.assignee, labels, customFieldValues });
       success({ updated: opts.key }, "jira", "update-issue", start);
     } catch (err) {
-      fail(err, "jira", "update-issue", start);
+      fail(translateFieldErrors(err, fieldMap), "jira", "update-issue", start);
     }
   });
   jira.command("transition-issue").description("Transition a Jira issue to a new status").requiredOption("--key <issue-key>", "Issue key").requiredOption("--transition <name-or-id>", "Transition name or ID").action(async (opts) => {
@@ -1086,6 +1261,28 @@ function registerJiraCommands(program2) {
       fail(err, "jira", "search", start);
     }
   });
+  jira.command("add-label").description("Add one or more labels to a Jira issue (non-destructive)").requiredOption("--key <issue-key>", "Issue key").requiredOption("--labels <labels>", "Comma-separated labels to add").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const client = getClient(program2);
+      const labels = opts.labels.split(",").map((s) => s.trim()).filter(Boolean);
+      await client.addLabels(opts.key, labels);
+      success({ updated: opts.key, labelsAdded: labels }, "jira", "add-label", start);
+    } catch (err) {
+      fail(err, "jira", "add-label", start);
+    }
+  });
+  jira.command("remove-label").description("Remove one or more labels from a Jira issue (non-destructive)").requiredOption("--key <issue-key>", "Issue key").requiredOption("--labels <labels>", "Comma-separated labels to remove").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const client = getClient(program2);
+      const labels = opts.labels.split(",").map((s) => s.trim()).filter(Boolean);
+      await client.removeLabels(opts.key, labels);
+      success({ updated: opts.key, labelsRemoved: labels }, "jira", "remove-label", start);
+    } catch (err) {
+      fail(err, "jira", "remove-label", start);
+    }
+  });
   jira.command("assign").description("Assign a Jira issue to a user").requiredOption("--key <issue-key>", "Issue key").requiredOption("--assignee <accountId>", "Assignee account ID").action(async (opts) => {
     const start = Date.now();
     try {
@@ -1106,12 +1303,50 @@ function registerJiraCommands(program2) {
       fail(err, "jira", "link-issue", start);
     }
   });
-  jira.command("fields").description("List custom fields (configured or discovered from Jira API) (consider --output-file for large results)").option("--discover", "Fetch field metadata from Jira API").option("--custom-only", "Show only custom fields (requires --discover)").action(async (opts) => {
+  jira.command("add-attachment").description("Upload a file as an attachment to a Jira issue").requiredOption("--key <issue-key>", "Issue key (e.g. PROJ-123)").requiredOption("--file <path>", "Path to the file to upload").action(async (opts) => {
+    const start = Date.now();
+    try {
+      if (!existsSync(opts.file)) throw new PncliError(`File not found: ${opts.file}`, 1);
+      const client = getClient(program2);
+      const data = await client.uploadAttachment(opts.key, opts.file);
+      success(data, "jira", "add-attachment", start);
+    } catch (err) {
+      fail(err, "jira", "add-attachment", start);
+    }
+  });
+  jira.command("list-attachments").description("List attachments on a Jira issue").requiredOption("--key <issue-key>", "Issue key (e.g. PROJ-123)").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const client = getClient(program2);
+      const data = await client.listAttachments(opts.key);
+      success(data, "jira", "list-attachments", start);
+    } catch (err) {
+      fail(err, "jira", "list-attachments", start);
+    }
+  });
+  jira.command("download-attachment").description("Download a Jira issue attachment to .pncli/ (or --dir)").requiredOption("--key <issue-key>", "Issue key (e.g. PROJ-123)").requiredOption("--attachment-id <id>", "Attachment ID from list-attachments output").option("--dir <path>", "Output directory (default: .pncli relative to cwd)").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const client = getClient(program2);
+      const attachments = await client.listAttachments(opts.key);
+      const attachment = attachments.find((a) => a.id === opts.attachmentId);
+      if (!attachment) throw new PncliError(`Attachment not found: ${opts.attachmentId}`, 1);
+      const outDir = opts.dir ?? path.join(process.cwd(), ".pncli");
+      mkdirSync(outDir, { recursive: true });
+      const outPath = path.join(outDir, path.basename(attachment.filename));
+      const buffer = await client.downloadAttachment(attachment.content);
+      writeFileSync(outPath, buffer);
+      success({ saved: outPath, filename: attachment.filename, size: buffer.length }, "jira", "download-attachment", start);
+    } catch (err) {
+      fail(err, "jira", "download-attachment", start);
+    }
+  });
+  jira.command("fields").description("List custom fields (configured or discovered from Jira API) (consider --output-file for large results)").option("--discover", "Fetch field metadata from Jira API").option("--custom-only", "Show only custom fields (requires --discover)").option("--project <key>", "Project key \u2014 fetches allowedValues for select fields via createmeta (requires --discover)").option("--issue-type <type>", "Filter allowedValues to a specific issue type (requires --project)").action(async (opts) => {
     const start = Date.now();
     try {
       if (opts.discover) {
         const client = getClient(program2);
-        const fields = await client.fetchFields();
+        const fields = opts.project ? await client.fetchFieldsWithAllowedValues(opts.project, opts.issueType) : await client.fetchFields();
         const result = opts.customOnly ? fields.filter((f) => f.custom) : fields;
         success(result, "jira", "fields", start);
       } else {
@@ -1130,22 +1365,76 @@ function parseFieldArgs(fieldArgs, fieldMap) {
     if (eq === -1) throw new PncliError(`Invalid --field format (expected Name=value): ${arg}`, 1);
     const name = arg.slice(0, eq).trim();
     const value = arg.slice(eq + 1);
-    const def = fieldMap.byName.get(name.toLowerCase());
-    if (!def) throw new PncliError(`Unknown custom field: "${name}". Run: pncli jira fields`, 1);
-    result[def.id] = formatFieldValue(value, def.type);
+    const def = fieldMap.byName.get(name.toLowerCase()) ?? fieldMap.byId.get(name);
+    if (!def) throw new PncliError(
+      `Unknown custom field: "${name}". Fields must be registered in config by friendly name or ID. Run: pncli jira fields`,
+      1
+    );
+    if (value.startsWith("@")) {
+      const filePath = value.slice(1);
+      let raw;
+      try {
+        raw = readFileSync2(filePath, "utf8").trim();
+      } catch (e) {
+        throw new PncliError(`Cannot read file "${filePath}": ${e.message}`, 1);
+      }
+      try {
+        result[def.id] = JSON.parse(raw);
+      } catch {
+        result[def.id] = raw;
+      }
+    } else {
+      result[def.id] = formatFieldValue(value, def.type);
+    }
   }
   return result;
 }
+function parseFieldsFile(filePath, fieldMap) {
+  let raw;
+  try {
+    raw = readFileSync2(filePath, "utf8");
+  } catch (e) {
+    throw new PncliError(`Cannot read fields file "${filePath}": ${e.message}`, 1);
+  }
+  let data;
+  try {
+    data = JSON.parse(raw);
+  } catch {
+    throw new PncliError(`Fields file "${filePath}" must be a valid JSON object`, 1);
+  }
+  if (typeof data !== "object" || data === null || Array.isArray(data)) {
+    throw new PncliError(`Fields file "${filePath}" must be a JSON object`, 1);
+  }
+  const result = {};
+  for (const [key, val] of Object.entries(data)) {
+    const def = fieldMap.byName.get(key.toLowerCase()) ?? fieldMap.byId.get(key);
+    if (!def) throw new PncliError(
+      `Unknown field in "${filePath}": "${key}". Fields must be registered in config by friendly name or ID. Run: pncli jira fields`,
+      1
+    );
+    result[def.id] = val;
+  }
+  return result;
+}
+function translateFieldErrors(err, fieldMap) {
+  if (!(err instanceof PncliError) || fieldMap.byId.size === 0) return err;
+  const translated = err.message.replace(/\bcustomfield_\d+\b/g, (id) => {
+    const def = fieldMap.byId.get(id);
+    return def ? `${def.name} (${id})` : id;
+  });
+  if (translated === err.message) return err;
+  return new PncliError(translated, err.status, err.url);
+}
 
 // src/services/bitbucket/commands.ts
-function getClient2(program2) {
+function getClient2(program2, overrides) {
   const opts = program2.optsWithGlobals();
   const config = loadConfig({ configPath: opts.config });
   const http = createHttpClient(config, Boolean(opts.dryRun));
   const client = new BitbucketClient(http);
   const ctx = getGitContext(config);
-  const project = opts.project ?? ctx?.project ?? config.defaults.bitbucket?.project ?? "";
-  const repo = opts.repo ?? ctx?.repo ?? config.defaults.bitbucket?.repo ?? "";
+  const project = overrides?.project ?? opts.project ?? ctx?.project ?? config.defaults.bitbucket?.project ?? "";
+  const repo = overrides?.repo ?? opts.repo ?? ctx?.repo ?? config.defaults.bitbucket?.repo ?? "";
   if (!project || !repo) {
     throw new PncliError(
       "Could not determine Bitbucket project/repo. Pass --project and --repo, or run pncli config init.",
@@ -1176,10 +1465,10 @@ function registerBitbucketCommands(program2) {
       fail(err, "bitbucket", "get-pr", start);
     }
   });
-  bb.command("create-pr").description("Create a pull request").requiredOption("--title <title>", "PR title").requiredOption("--source <branch>", "Source branch").option("--target <branch>", "Target branch (defaults to config)").option("--description <desc>", "PR description").option("--reviewers <users>", "Comma-separated reviewer usernames").action(async (opts) => {
+  bb.command("create-pr").description("Create a pull request").requiredOption("--title <title>", "PR title").requiredOption("--source <branch>", "Source branch").option("--target <branch>", "Target branch (defaults to config)").option("--description <desc>", "PR description").option("--reviewers <users>", "Comma-separated reviewer usernames").option("--project <key>", "Bitbucket project key (overrides parent --project; use ~username for personal repos)").option("--repo <slug>", "Bitbucket repository slug (overrides parent --repo)").action(async (opts) => {
     const start = Date.now();
     try {
-      const { client, project, repo } = getClient2(bb);
+      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()) : [];
@@ -1403,9 +1692,9 @@ var ConfluenceClient = class {
     const initialStart = opts.start ?? 0;
     return this.http.confluencePaginate(async (start, limit) => {
       return this.http.confluence(`${API3}/content`, {
-        params: { spaceKey, type: "page", expand: "version", start: initialStart + start, limit: opts.limit ?? limit }
+        params: { spaceKey, type: "page", expand: "version", start: initialStart + start, limit }
       });
-    });
+    }, opts.limit);
   }
   async getPageChildren(id) {
     return this.http.confluencePaginate(async (start, limit) => {
@@ -1508,11 +1797,11 @@ var ConfluenceClient = class {
       return this.http.confluence(`${API3}/space`, {
         params: {
           start: initialStart + start,
-          limit: opts.limit ?? limit,
+          limit,
           ...opts.type ? { type: opts.type } : {}
         }
       });
-    });
+    }, opts.limit);
   }
   async getSpace(key) {
     return this.http.confluence(`${API3}/space/${key}`, {
@@ -1559,7 +1848,7 @@ function registerConfluenceCommands(program2) {
       fail(err, "confluence", "get-page-by-title", start);
     }
   });
-  confluence.command("list-pages").description("List pages in a Confluence space (consider --output-file for large results)").requiredOption("--space <key>", "Space key").option("--limit <n>", "Max results per page (default: all)").option("--start <n>", "Offset for first result").action(async (opts) => {
+  confluence.command("list-pages").description("List pages in a Confluence space (consider --output-file for large results)").requiredOption("--space <key>", "Space key").option("--limit <n>", "Max total pages to return (default: all)").option("--start <n>", "Offset for first result").action(async (opts) => {
     const start = Date.now();
     try {
       const client = getClient3(program2);
@@ -1691,7 +1980,7 @@ function registerConfluenceCommands(program2) {
       fail(err, "confluence", "remove-label", start);
     }
   });
-  confluence.command("list-spaces").description("List Confluence spaces").option("--type <type>", "Space type: global or personal").option("--limit <n>", "Max results (default: all)").action(async (opts) => {
+  confluence.command("list-spaces").description("List Confluence spaces").option("--type <type>", "Space type: global or personal").option("--limit <n>", "Max total spaces to return (default: all)").action(async (opts) => {
     const start = Date.now();
     try {
       const client = getClient3(program2);
@@ -2267,23 +2556,23 @@ import { Option } from "commander";
 
 // src/services/deps/parsers/index.ts
 import fs from "fs";
-import path4 from "path";
+import path5 from "path";
 import { execSync as execSync3, execFileSync as execFileSync2 } from "child_process";
 
 // src/services/deps/parsers/npm.ts
-import path from "path";
+import path2 from "path";
 function findNpmManifests(files) {
   const lockFiles = new Set(
     files.filter((f) => {
-      const base = path.basename(f);
+      const base = path2.basename(f);
       return base === "package-lock.json" || base === "yarn.lock" || base === "pnpm-lock.yaml";
     })
   );
   const manifests = [];
   for (const file of files) {
-    if (path.basename(file) !== "package.json") continue;
+    if (path2.basename(file) !== "package.json") continue;
     if (file.split("/").includes("node_modules")) continue;
-    const dir = path.dirname(file);
+    const dir = path2.dirname(file);
     let lockFile;
     for (const lf of ["package-lock.json", "yarn.lock", "pnpm-lock.yaml"]) {
       const candidate = dir === "." ? lf : `${dir}/${lf}`;
@@ -2298,7 +2587,7 @@ function findNpmManifests(files) {
 }
 function parseNpmPackages(content, manifest, opts, lockContent) {
   if (lockContent && manifest.lockFile) {
-    const base = path.basename(manifest.lockFile);
+    const base = path2.basename(manifest.lockFile);
     if (base === "package-lock.json") {
       const pkgs = parsePackageLock(lockContent, manifest.lockFile, opts);
       if (pkgs.length > 0) return pkgs;
@@ -2446,26 +2735,26 @@ function parsePnpmLock(content, lockFilePath, opts, packageJsonContent) {
 }
 
 // src/services/deps/parsers/nuget.ts
-import path2 from "path";
+import path3 from "path";
 var PROJ_EXTENSIONS = /* @__PURE__ */ new Set([".csproj", ".fsproj", ".vbproj"]);
 function findNugetManifests(files) {
   const lockFiles = /* @__PURE__ */ new Map();
   for (const f of files) {
-    if (path2.basename(f) === "packages.lock.json") {
-      lockFiles.set(path2.dirname(f), f);
+    if (path3.basename(f) === "packages.lock.json") {
+      lockFiles.set(path3.dirname(f), f);
     }
   }
   const manifests = [];
   for (const file of files) {
-    const base = path2.basename(file);
-    const ext = path2.extname(file);
+    const base = path3.basename(file);
+    const ext = path3.extname(file);
     if (PROJ_EXTENSIONS.has(ext) || base === "packages.config") {
-      const dir = path2.dirname(file);
+      const dir = path3.dirname(file);
       const lockFile = lockFiles.get(dir);
       manifests.push({ file, ecosystem: "nuget", lockFile });
     }
     if (base === "Directory.Packages.props") {
-      const dir = path2.dirname(file);
+      const dir = path3.dirname(file);
       manifests.push({ file, ecosystem: "nuget", lockFile: lockFiles.get(dir) });
     }
   }
@@ -2484,7 +2773,7 @@ function findNugetManifests(files) {
   return deduped;
 }
 function parseNugetPackages(content, manifest, opts, lockContent, propsContent) {
-  const base = path2.basename(manifest.file);
+  const base = path3.basename(manifest.file);
   if (lockContent) {
     return parsePackagesLock(lockContent, manifest.lockFile ?? manifest.file, opts);
   }
@@ -2605,14 +2894,14 @@ function parsePackagesLock(content, filePath, opts) {
 }
 
 // src/services/deps/parsers/maven.ts
-import path3 from "path";
+import path4 from "path";
 function findMavenManifests(files) {
-  const lockFiles = new Set(files.filter((f) => path3.basename(f) === "gradle.lockfile"));
+  const lockFiles = new Set(files.filter((f) => path4.basename(f) === "gradle.lockfile"));
   const manifests = [];
   for (const file of files) {
-    const base = path3.basename(file);
+    const base = path4.basename(file);
     if (base === "pom.xml" || base === "build.gradle" || base === "build.gradle.kts") {
-      const dir = path3.dirname(file);
+      const dir = path4.dirname(file);
       const lockCandidate = dir === "." ? "gradle.lockfile" : `${dir}/gradle.lockfile`;
       const lockFile = lockFiles.has(lockCandidate) ? lockCandidate : void 0;
       manifests.push({ file, ecosystem: "maven", lockFile });
@@ -2621,7 +2910,7 @@ function findMavenManifests(files) {
   return manifests;
 }
 function parseMavenPackages(content, manifest, opts, lockContent) {
-  const base = path3.basename(manifest.file);
+  const base = path4.basename(manifest.file);
   if (lockContent && manifest.lockFile) {
     return parseGradleLock(lockContent, manifest.lockFile, opts);
   }
@@ -2782,7 +3071,7 @@ function getRepoFiles(repoRoot) {
 }
 function readFile(repoRoot, relPath) {
   try {
-    return fs.readFileSync(path4.join(repoRoot, relPath), "utf8");
+    return fs.readFileSync(path5.join(repoRoot, relPath), "utf8");
   } catch {
     return null;
   }
@@ -2800,13 +3089,13 @@ function readFileAtRef(repoRoot, ref, relPath) {
   }
 }
 function findPropsContent(manifestFile, readFn) {
-  let dir = path4.dirname(manifestFile);
+  let dir = path5.dirname(manifestFile);
   for (let depth = 0; depth < 10; depth++) {
     const candidate = dir === "." ? "Directory.Packages.props" : `${dir}/Directory.Packages.props`;
     const content = readFn(candidate);
     if (content) return content;
     if (dir === ".") break;
-    dir = path4.dirname(dir);
+    dir = path5.dirname(dir);
   }
   return null;
 }
@@ -4084,6 +4373,24 @@ var AdoWorkClient = class {
       { method: "POST", body: { text } }
     );
   }
+  async addTags(collection, id, tags) {
+    const item = await this.getWorkItem(collection, id);
+    const existing = item.fields["System.Tags"] ?? "";
+    const current = existing.split(";").map((t) => t.trim()).filter(Boolean);
+    const lowerSet = new Set(current.map((t) => t.toLowerCase()));
+    const toAdd = tags.filter((t) => !lowerSet.has(t.toLowerCase()));
+    const merged = [...current, ...toAdd];
+    const patch = [{ op: "add", path: "/fields/System.Tags", value: merged.join("; ") }];
+    return this.updateWorkItem(collection, id, patch);
+  }
+  async removeTags(collection, id, tags) {
+    const item = await this.getWorkItem(collection, id);
+    const existing = item.fields["System.Tags"] ?? "";
+    const lower = new Set(tags.map((t) => t.toLowerCase()));
+    const remaining = existing.split(";").map((t) => t.trim()).filter((t) => t && !lower.has(t.toLowerCase()));
+    const patch = [{ op: "add", path: "/fields/System.Tags", value: remaining.join("; ") }];
+    return this.updateWorkItem(collection, id, patch);
+  }
   async listWorkItemTypes(collection, project) {
     const result = await this.http.ado(
       `/${encodeURIComponent(collection)}/${encodeURIComponent(project)}/_apis/wit/workitemtypes?api-version=${API6}`
@@ -4109,6 +4416,24 @@ var AdoWorkClient = class {
     );
     return result.value ?? [];
   }
+  async listAttachments(collection, workItemId) {
+    const item = await this.getWorkItem(collection, workItemId);
+    return (item.relations ?? []).filter((r) => r.rel === "AttachedFile").map((r) => {
+      const attrs = r.attributes ?? {};
+      return {
+        id: new URL(r.url).pathname.split("/").pop() ?? "",
+        name: String(attrs["name"] ?? ""),
+        url: r.url,
+        comment: attrs["comment"] !== void 0 ? String(attrs["comment"]) : void 0,
+        resourceSize: typeof attrs["resourceSize"] === "number" ? attrs["resourceSize"] : void 0,
+        resourceCreatedDate: attrs["resourceCreatedDate"] !== void 0 ? String(attrs["resourceCreatedDate"]) : void 0,
+        resourceModifiedDate: attrs["resourceModifiedDate"] !== void 0 ? String(attrs["resourceModifiedDate"]) : void 0
+      };
+    });
+  }
+  async downloadAttachment(absoluteUrl) {
+    return this.http.adoBuffer(absoluteUrl);
+  }
 };
 
 // src/services/ado/discovery.ts
@@ -4282,8 +4607,8 @@ function registerConfigCommands(program2) {
       if (cfg.ado.baseUrl) {
         try {
           const collection = cfg.defaults.ado?.collection;
-          const path6 = collection ? `/${encodeURIComponent(collection)}/_apis/connectionData?api-version=7.1-preview.1` : "/_apis/projectCollections?api-version=7.1";
-          await http.ado(path6);
+          const path8 = collection ? `/${encodeURIComponent(collection)}/_apis/connectionData?api-version=7.1-preview.1` : "/_apis/projectCollections?api-version=7.1";
+          await http.ado(path8);
           results.ado = { ok: true, message: "connected" };
         } catch (err) {
           results.ado = { ok: false, message: err instanceof Error ? err.message : String(err) };
@@ -4455,8 +4780,8 @@ function registerConfigCommands(program2) {
       } else {
         try {
           const collection = cfg.defaults.ado?.collection;
-          const path6 = collection ? `/${encodeURIComponent(collection)}/_apis/connectionData?api-version=7.1-preview.1` : "/_apis/projectCollections?api-version=7.1";
-          await http.ado(path6, { timeoutMs: 1e4 });
+          const path8 = collection ? `/${encodeURIComponent(collection)}/_apis/connectionData?api-version=7.1-preview.1` : "/_apis/projectCollections?api-version=7.1";
+          await http.ado(path8, { timeoutMs: 1e4 });
           results.ado = { status: "valid", message: "ok" };
         } catch (err) {
           results.ado = categorize2(err);
@@ -5452,15 +5777,22 @@ var AdoBuildClient = class {
     );
   }
   async listBuilds(collection, project, opts = {}) {
+    const baseParams = {
+      "api-version": API8,
+      ...opts.definitionIds?.length ? { definitions: opts.definitionIds.join(",") } : {},
+      ...opts.branchName ? { branchName: opts.branchName } : {},
+      ...opts.statusFilter ? { statusFilter: opts.statusFilter } : {},
+      ...opts.top ? { "$top": opts.top } : {}
+    };
+    if (opts.top) {
+      const { data } = await this.http.adoRaw(
+        `/${encodeURIComponent(collection)}/${encodeURIComponent(project)}/_apis/build/builds`,
+        { params: baseParams }
+      );
+      return (data.value ?? []).slice(0, opts.top);
+    }
     return this.http.adoPaginate(async (token) => {
-      const params = {
-        "api-version": API8,
-        ...opts.definitionIds?.length ? { definitionIds: opts.definitionIds.join(",") } : {},
-        ...opts.branchName ? { branchName: opts.branchName } : {},
-        ...opts.statusFilter ? { statusFilter: opts.statusFilter } : {},
-        ...opts.top ? { "$top": opts.top } : {},
-        ...token ? { continuationToken: token } : {}
-      };
+      const params = { ...baseParams, ...token ? { continuationToken: token } : {} };
       return this.http.adoRaw(
         `/${encodeURIComponent(collection)}/${encodeURIComponent(project)}/_apis/build/builds`,
         { params }
@@ -5611,6 +5943,8 @@ function registerAdoProjectCommands(ado) {
 }
 
 // src/services/ado/commands/work.ts
+import fs3 from "fs";
+import path6 from "path";
 function registerAdoWorkCommands(ado) {
   const work = ado.command("work").description("Azure DevOps work item operations");
   work.command("get").description("Get a work item by ID").requiredOption("--id <n>", "Work item ID").action(async (opts) => {
@@ -5751,6 +6085,55 @@ function registerAdoWorkCommands(ado) {
       fail(err, "ado", "work-add-comment", start);
     }
   });
+  work.command("add-tag").description("Add one or more tags to a work item (non-destructive)").requiredOption("--id <n>", "Work item ID").requiredOption("--tags <tags>", "Semicolon- or comma-separated tags to add").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { collection, workClient } = getAdoContext(ado);
+      const tags = opts.tags.split(/[;,]/).map((t) => t.trim()).filter(Boolean);
+      const data = await workClient.addTags(collection, parseInt(opts.id, 10), tags);
+      success(data, "ado", "work-add-tag", start);
+    } catch (err) {
+      fail(err, "ado", "work-add-tag", start);
+    }
+  });
+  work.command("remove-tag").description("Remove one or more tags from a work item (non-destructive)").requiredOption("--id <n>", "Work item ID").requiredOption("--tags <tags>", "Semicolon- or comma-separated tags to remove").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { collection, workClient } = getAdoContext(ado);
+      const tags = opts.tags.split(/[;,]/).map((t) => t.trim()).filter(Boolean);
+      const data = await workClient.removeTags(collection, parseInt(opts.id, 10), tags);
+      success(data, "ado", "work-remove-tag", start);
+    } catch (err) {
+      fail(err, "ado", "work-remove-tag", start);
+    }
+  });
+  work.command("list-attachments").description("List attachments on a work item").requiredOption("--id <n>", "Work item ID").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { collection, workClient } = getAdoContext(ado);
+      const data = await workClient.listAttachments(collection, parseInt(opts.id, 10));
+      success(data, "ado", "work-list-attachments", start);
+    } catch (err) {
+      fail(err, "ado", "work-list-attachments", start);
+    }
+  });
+  work.command("download-attachment").description("Download a work item attachment to .pncli/ (or --dir)").requiredOption("--id <n>", "Work item ID").requiredOption("--attachment-id <guid>", "Attachment ID from work list-attachments output").option("--dir <path>", "Output directory (default: .pncli relative to cwd)").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { collection, workClient } = getAdoContext(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 ?? path6.join(process.cwd(), ".pncli");
+      fs3.mkdirSync(outDir, { recursive: true });
+      const outPath = path6.join(outDir, path6.basename(attachment.name));
+      const buffer = await workClient.downloadAttachment(attachment.url);
+      fs3.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);
+    }
+  });
   work.command("types").description("List work item types in the project").option("--discover", "Fetch from server (always true for this command)").option("--save", "Save discovered types to ~/.pncli/config.json").action(async (opts) => {
     const start = Date.now();
     try {
@@ -5759,10 +6142,10 @@ function registerAdoWorkCommands(ado) {
       const types = await discoverTypes(workClient, collection, project);
       if (opts.save) {
         const globalConfigPath = getGlobalConfigPath(globalOpts.config);
-        const fs4 = await import("fs");
-        const existing = JSON.parse(fs4.readFileSync(globalConfigPath, "utf8") || "{}");
+        const fs5 = await import("fs");
+        const existing = JSON.parse(fs5.readFileSync(globalConfigPath, "utf8") || "{}");
         existing.ado = { ...existing.ado ?? {}, discoveredTypes: types };
-        fs4.writeFileSync(globalConfigPath, JSON.stringify(existing, null, 2) + "\n", "utf8");
+        fs5.writeFileSync(globalConfigPath, JSON.stringify(existing, null, 2) + "\n", "utf8");
         warn(`Saved ${types.length} types to ${globalConfigPath}`);
       }
       success(types, "ado", "work-types", start);
@@ -5791,11 +6174,11 @@ function registerAdoWorkCommands(ado) {
       ) : allFields;
       if (opts.save) {
         const globalConfigPath = getGlobalConfigPath(globalOpts.config);
-        const fs4 = await import("fs");
-        const existing = JSON.parse(fs4.readFileSync(globalConfigPath, "utf8") || "{}");
+        const fs5 = await import("fs");
+        const existing = JSON.parse(fs5.readFileSync(globalConfigPath, "utf8") || "{}");
         const aliases = buildDefaultAliases(allFields);
         existing.ado = { ...existing.ado ?? {}, discoveredFields: allFields, fieldAliases: aliases };
-        fs4.writeFileSync(globalConfigPath, JSON.stringify(existing, null, 2) + "\n", "utf8");
+        fs5.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);
@@ -6076,7 +6459,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-LNDRNPP7.js");
+        const { createHttpClient: createHttpClient2 } = await import("./http-BNCZJQTD.js");
         const http = createHttpClient2(config, Boolean(globalOpts.dryRun));
         const coreClient = new AdoCoreClient2(http);
         const me = await coreClient.getConnectionData(collection);
@@ -6169,12 +6552,32 @@ function registerAdoPipelineCommands(ado) {
       fail(err, "ado", "pipeline-run", start);
     }
   });
-  pipeline.command("list-runs").description("List pipeline runs").option("--definition <id>", "Filter by definition ID").option("--branch <ref>", "Filter by branch name").option("--status <filter>", "Filter by status (inProgress|completed|cancelling|...)").option("--top <n>", "Maximum results", "50").action(async (opts) => {
+  pipeline.command("list-runs").description("List pipeline runs").option("--definition <id>", "Filter by definition ID").option("--name <name>", "Filter by pipeline name (resolved to definition ID; use pipeline list to see names)").option("--branch <ref>", "Filter by branch name").option("--status <filter>", "Filter by status (inProgress|completed|cancelling|...)").option("--top <n>", "Maximum results", "50").action(async (opts) => {
     const start = Date.now();
     try {
       const { collection, project, buildClient } = getAdoContext(ado);
+      let definitionId;
+      if (opts.definition && opts.name) {
+        throw new PncliError("Cannot specify both --definition and --name. Use one or the other.", 1);
+      }
+      if (opts.definition) {
+        definitionId = parseInt(opts.definition, 10);
+        if (isNaN(definitionId)) {
+          throw new PncliError(`--definition must be a numeric ID. Got "${opts.definition}". Use --name to filter by pipeline name instead.`, 1);
+        }
+      } else if (opts.name) {
+        const defs = await buildClient.listDefinitions(collection, project);
+        const match = defs.find((d) => d.name.toLowerCase() === opts.name.toLowerCase());
+        if (!match) {
+          throw new PncliError(
+            `Pipeline "${opts.name}" not found. Run 'pncli ado pipeline list' to see available pipelines.`,
+            1
+          );
+        }
+        definitionId = match.id;
+      }
       const data = await buildClient.listBuilds(collection, project, {
-        definitionIds: opts.definition ? [parseInt(opts.definition, 10)] : void 0,
+        definitionIds: definitionId !== void 0 ? [definitionId] : void 0,
         branchName: opts.branch,
         statusFilter: opts.status,
         top: parseInt(opts.top, 10)
@@ -6204,11 +6607,13 @@ function registerAdoPipelineCommands(ado) {
       fail(err, "ado", "pipeline-cancel-run", start);
     }
   });
-  pipeline.command("logs").description("List or retrieve build logs (consider --output-file for large logs)").requiredOption("--id <n>", "Build ID").option("--log-id <n>", "Specific log ID (omit to list all logs)").action(async (opts) => {
+  pipeline.command("logs").description("List or retrieve build logs (consider --output-file for large logs)").option("--build-id <n>", "Build (run) ID \u2014 from pipeline list-runs or get-run").option("--id <n>", "Build (run) ID \u2014 alias for --build-id (kept for backwards compatibility)").option("--log-id <n>", "Specific log ID (omit to list all logs)").action(async (opts) => {
     const start = Date.now();
     try {
+      const rawId = opts.buildId ?? opts.id;
+      if (!rawId) throw new PncliError("--build-id is required (build run ID from pipeline list-runs or get-run)", 1);
       const { collection, project, buildClient } = getAdoContext(ado);
-      const buildId = parseInt(opts.id, 10);
+      const buildId = parseInt(rawId, 10);
       if (opts.logId) {
         const data = await buildClient.getLog(collection, project, buildId, parseInt(opts.logId, 10));
         success({ log: data }, "ado", "pipeline-logs", start);
@@ -6260,9 +6665,10 @@ var JenkinsClient = class {
     this.http = http;
   }
   http;
-  async listJobs() {
+  async listJobs(folder) {
+    const endpoint = folder ? `/job/${jobPath(folder)}/api/json` : "/api/json";
     const data = await this.http.jenkins(
-      "/api/json",
+      endpoint,
       { params: { tree: "jobs[name,url,color,description,buildable,lastBuild[number,url,result]]" } }
     );
     return data.jobs;
@@ -6342,17 +6748,17 @@ async function pollBuildComplete(client, jobName, buildNumber, pollMs, timeoutMs
 function registerJenkinsCommands(program2) {
   const jenkins = program2.command("jenkins").description("Jenkins Data Center operations");
   const pipeline = jenkins.command("pipeline").description("Pipeline (job/build) operations");
-  pipeline.command("list").description("List all jobs on the Jenkins instance").action(async () => {
+  pipeline.command("list").description("List all jobs on the Jenkins instance (or within a folder)").option("--folder <name>", "Folder name to enumerate (supports nested folders: parentFolder/childFolder)").action(async (opts) => {
     const start = Date.now();
     try {
       const client = getClient6(program2);
-      const data = await client.listJobs();
+      const data = await client.listJobs(opts.folder);
       success(data, "jenkins", "pipeline-list", start);
     } catch (err) {
       fail(err, "jenkins", "pipeline-list", start);
     }
   });
-  pipeline.command("get").description("Get details for a specific job").requiredOption("--name <job>", "Job name").action(async (opts) => {
+  pipeline.command("get").description("Get details for a specific job").requiredOption("--name <job>", "Job name (use folder/job for folder-scoped jobs)").action(async (opts) => {
     const start = Date.now();
     try {
       const client = getClient6(program2);
@@ -6362,7 +6768,7 @@ function registerJenkinsCommands(program2) {
       fail(err, "jenkins", "pipeline-get", start);
     }
   });
-  pipeline.command("run").description("Trigger a build").requiredOption("--name <job>", "Job name").option("--parameter <k=v>", "Build parameter (repeatable)", (v, acc) => {
+  pipeline.command("run").description("Trigger a build").requiredOption("--name <job>", "Job name (use folder/job for folder-scoped jobs)").option("--parameter <k=v>", "Build parameter (repeatable)", (v, acc) => {
     acc.push(v);
     return acc;
   }, []).option("--wait", "Wait for the build to complete before returning").option("--timeout <s>", "Max wait time in seconds per phase (queue-wait and build-wait each get this budget; default 600)", "600").option("--poll <s>", "Poll interval in seconds (default 10)", "10").action(async (opts) => {
@@ -6398,7 +6804,7 @@ function registerJenkinsCommands(program2) {
       fail(err, "jenkins", "pipeline-run", start);
     }
   });
-  pipeline.command("list-runs").description("List recent builds for a job").requiredOption("--name <job>", "Job name").option("--top <n>", "Maximum number of builds to return (default 25)", "25").action(async (opts) => {
+  pipeline.command("list-runs").description("List recent builds for a job").requiredOption("--name <job>", "Job name (use folder/job for folder-scoped jobs)").option("--top <n>", "Maximum number of builds to return (default 25)", "25").action(async (opts) => {
     const start = Date.now();
     try {
       const client = getClient6(program2);
@@ -6410,7 +6816,7 @@ function registerJenkinsCommands(program2) {
       fail(err, "jenkins", "pipeline-list-runs", start);
     }
   });
-  pipeline.command("get-run").description("Get details for a specific build").requiredOption("--name <job>", "Job name").requiredOption("--number <n>", "Build number").action(async (opts) => {
+  pipeline.command("get-run").description("Get details for a specific build").requiredOption("--name <job>", "Job name (use folder/job for folder-scoped jobs)").requiredOption("--number <n>", "Build number").action(async (opts) => {
     const start = Date.now();
     try {
       const client = getClient6(program2);
@@ -6422,7 +6828,7 @@ function registerJenkinsCommands(program2) {
       fail(err, "jenkins", "pipeline-get-run", start);
     }
   });
-  pipeline.command("logs").description("Fetch console log for a build (consider --output-file for large logs)").requiredOption("--name <job>", "Job name").requiredOption("--number <n>", "Build number").action(async (opts) => {
+  pipeline.command("logs").description("Fetch console log for a build (consider --output-file for large logs)").requiredOption("--name <job>", "Job name (use folder/job for folder-scoped jobs)").requiredOption("--number <n>", "Build number").action(async (opts) => {
     const start = Date.now();
     try {
       const client = getClient6(program2);
@@ -6454,18 +6860,18 @@ var ArtifactoryClient = class {
       }
     });
   }
-  async getStorageInfo(repo, path6) {
-    const cleanPath = path6.startsWith("/") ? path6.slice(1) : path6;
+  async getStorageInfo(repo, path8) {
+    const cleanPath = path8.startsWith("/") ? path8.slice(1) : path8;
     return this.http.artifactory(`${API9}/storage/${repo}/${cleanPath}`);
   }
-  async getProperties(repo, path6) {
-    const cleanPath = path6.startsWith("/") ? path6.slice(1) : path6;
+  async getProperties(repo, path8) {
+    const cleanPath = path8.startsWith("/") ? path8.slice(1) : path8;
     return this.http.artifactory(`${API9}/storage/${repo}/${cleanPath}`, {
       params: { properties: "" }
     });
   }
-  async setProperties(repo, path6, properties, opts = {}) {
-    const cleanPath = path6.startsWith("/") ? path6.slice(1) : path6;
+  async setProperties(repo, path8, properties, opts = {}) {
+    const cleanPath = path8.startsWith("/") ? path8.slice(1) : path8;
     const propString = Object.entries(properties).map(([k, v]) => `${k}=${v}`).join(";");
     await this.http.artifactory(`${API9}/storage/${repo}/${cleanPath}`, {
       method: "PUT",
@@ -6493,8 +6899,18 @@ var ArtifactoryClient = class {
       headers: { "Content-Type": "text/plain" }
     });
   }
-  async listBuilds() {
-    return this.http.artifactory(`${API9}/build`);
+  async listBuilds(opts = {}) {
+    const raw = await this.http.artifactory(`${API9}/build`, { timeoutMs: opts.timeoutMs });
+    const builds = (raw.builds ?? []).map((b) => ({
+      name: b.uri.replace(/^\/|\/$/g, ""),
+      uri: b.uri,
+      lastStarted: b.lastStarted
+    }));
+    const result = { builds, uri: raw.uri };
+    if (builds.length === 0) {
+      result.hint = 'No builds are registered in Artifactory Build Integration. Build names may differ from ADO pipeline or uDeploy component names. Use "artifactory repos" to list repositories, then "artifactory search --repo <repo>" to locate artifacts directly.';
+    }
+    return result;
   }
   async listBuildRuns(buildName) {
     return this.http.artifactory(`${API9}/build/${encodeURIComponent(buildName)}`);
@@ -6537,27 +6953,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, path6) => {
+  art.command("artifact-info <repo> <path>").description("Get metadata for an artifact or folder (checksums, size, timestamps)").action(async (repo, path8) => {
     const start = Date.now();
     try {
       const client = getClient7(program2);
-      const data = await client.getStorageInfo(repo, path6);
+      const data = await client.getStorageInfo(repo, path8);
       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, path6) => {
+  art.command("properties-get <repo> <path>").description("Read custom properties on an artifact").action(async (repo, path8) => {
     const start = Date.now();
     try {
       const client = getClient7(program2);
-      const data = await client.getProperties(repo, path6);
+      const data = await client.getProperties(repo, path8);
       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, path6, 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, path8, keyvals, opts) => {
     const start = Date.now();
     try {
       if (!keyvals.length) throw new PncliError("Provide at least one key=value pair");
@@ -6568,8 +6984,8 @@ function registerArtifactoryCommands(program2) {
         properties[kv.slice(0, eq)] = kv.slice(eq + 1);
       }
       const client = getClient7(program2);
-      await client.setProperties(repo, path6, properties, { recursive: opts.recursive });
-      success({ repo, path: path6, properties }, "artifactory", "properties-set", start);
+      await client.setProperties(repo, path8, properties, { recursive: opts.recursive });
+      success({ repo, path: path8, properties }, "artifactory", "properties-set", start);
     } catch (err) {
       fail(err, "artifactory", "properties-set", start);
     }
@@ -6595,11 +7011,14 @@ function registerArtifactoryCommands(program2) {
       fail(err, "artifactory", "search", start);
     }
   });
-  art.command("builds").description("List all build names in Artifactory").action(async () => {
+  art.command("builds").description('List builds registered in Artifactory Build Integration (names may differ from ADO pipeline or uDeploy component names; use "search --repo" when empty)').option("--timeout <s>", "Request timeout in seconds (default 60; increase for large Artifactory instances)", "60").action(async (opts) => {
     const start = Date.now();
     try {
       const client = getClient7(program2);
-      const data = await client.listBuilds();
+      const timeoutSecs = parseInt(opts.timeout, 10);
+      if (isNaN(timeoutSecs) || timeoutSecs <= 0) throw new PncliError("--timeout must be a positive integer (seconds)", 1);
+      const timeoutMs = timeoutSecs * 1e3;
+      const data = await client.listBuilds({ timeoutMs });
       success(data, "artifactory", "builds", start);
     } catch (err) {
       fail(err, "artifactory", "builds", start);
@@ -7170,8 +7589,8 @@ function registerSonatypeIqCommands(program2) {
     const startTime = Date.now();
     try {
       const http = getHttpClient(program2);
-      const path6 = opts.organizationId ? `/api/v2/policies/organization/${encodeURIComponent(opts.organizationId)}` : "/api/v2/policies";
-      const data = await http.sonatypeiq(path6);
+      const path8 = opts.organizationId ? `/api/v2/policies/organization/${encodeURIComponent(opts.organizationId)}` : "/api/v2/policies";
+      const data = await http.sonatypeiq(path8);
       success(data, "sonatypeiq", "policies list", startTime);
     } catch (err) {
       fail(err, "sonatypeiq", "policies list", startTime);
@@ -7180,8 +7599,8 @@ function registerSonatypeIqCommands(program2) {
 }
 
 // src/services/skills/commands.ts
-import fs3 from "fs";
-import path5 from "path";
+import fs4 from "fs";
+import path7 from "path";
 import os from "os";
 import { fileURLToPath } from "url";
 import { execFileSync as execFileSync3 } from "child_process";
@@ -7193,18 +7612,30 @@ function injectTokenIntoUrl(url, token) {
   } catch {
     throw new Error(`--token requires an HTTPS clone URL; got: ${url}`);
   }
-  parsed.username = "x-token-auth";
+  parsed.username = parsed.hostname === "github.com" ? "x-access-token" : "x-token-auth";
   parsed.password = token;
   return parsed.toString();
 }
+function repoNameFromUrl(url) {
+  try {
+    const parsed = new URL(url);
+    const segment = parsed.pathname.split("/").filter(Boolean).pop() ?? "marketplace";
+    return segment.replace(/\.git$/i, "") || "marketplace";
+  } catch {
+    return "marketplace";
+  }
+}
+function defaultMarketplacePath(url) {
+  return path7.join(os.homedir(), ".agents", "marketplaces", repoNameFromUrl(url));
+}
 var AGENT_PATHS = {
-  "github-copilot": { project: ".agents/skills", user: path5.join(os.homedir(), ".copilot/skills") },
-  "claude-code": { project: ".claude/skills", user: path5.join(os.homedir(), ".claude/skills") }
+  "github-copilot": { project: ".agents/skills", user: path7.join(os.homedir(), ".copilot/skills") },
+  "claude-code": { project: ".claude/skills", user: path7.join(os.homedir(), ".claude/skills") }
 };
 function getBundledSkillsDir() {
   try {
     const thisFile = fileURLToPath(import.meta.url);
-    return path5.resolve(path5.dirname(thisFile), "..", "skills");
+    return path7.resolve(path7.dirname(thisFile), "..", "skills");
   } catch {
     return "";
   }
@@ -7216,22 +7647,22 @@ function registerSkillsCommands(program2) {
     try {
       let targetDir;
       if (opts.target) {
-        targetDir = path5.resolve(opts.target);
+        targetDir = path7.resolve(opts.target);
       } else {
         const agentConfig = AGENT_PATHS[opts.agent];
         if (!agentConfig) {
           throw new Error(`Unknown agent: "${opts.agent}". Use: ${Object.keys(AGENT_PATHS).join(" | ")}`);
         }
         const scopePath = opts.scope === "user" ? agentConfig.user : agentConfig.project;
-        targetDir = path5.resolve(scopePath);
+        targetDir = path7.resolve(scopePath);
       }
-      const resolvedTarget = path5.resolve(targetDir);
+      const resolvedTarget = path7.resolve(targetDir);
       const bundledDir = getBundledSkillsDir();
       let skillDirs = [];
       if (bundledDir !== "") {
         try {
-          skillDirs = fs3.readdirSync(bundledDir).filter(
-            (name) => fs3.existsSync(path5.join(bundledDir, name, "SKILL.md"))
+          skillDirs = fs4.readdirSync(bundledDir).filter(
+            (name) => fs4.existsSync(path7.join(bundledDir, name, "SKILL.md"))
           );
         } catch {
         }
@@ -7242,25 +7673,25 @@ function registerSkillsCommands(program2) {
       const installed = [];
       const failed = [];
       for (const skillName of skillDirs) {
-        const existingDir = path5.resolve(targetDir, skillName);
-        if (!existingDir.startsWith(resolvedTarget + path5.sep)) continue;
-        if (fs3.existsSync(existingDir)) {
-          fs3.rmSync(existingDir, { recursive: true, force: true });
+        const existingDir = path7.resolve(targetDir, skillName);
+        if (!existingDir.startsWith(resolvedTarget + path7.sep)) continue;
+        if (fs4.existsSync(existingDir)) {
+          fs4.rmSync(existingDir, { recursive: true, force: true });
         }
       }
       warn(`Installing ${skillDirs.length} bundled skill(s) to ${targetDir}...`);
       for (const skillName of skillDirs) {
-        const skillDir = path5.resolve(targetDir, skillName);
-        if (!skillDir.startsWith(resolvedTarget + path5.sep)) {
+        const skillDir = path7.resolve(targetDir, skillName);
+        if (!skillDir.startsWith(resolvedTarget + path7.sep)) {
           failed.push(skillName);
           continue;
         }
         try {
-          const mdFiles = fs3.readdirSync(path5.join(bundledDir, skillName)).filter((f) => f.endsWith(".md"));
-          fs3.mkdirSync(skillDir, { recursive: true });
+          const mdFiles = fs4.readdirSync(path7.join(bundledDir, skillName)).filter((f) => f.endsWith(".md"));
+          fs4.mkdirSync(skillDir, { recursive: true });
           for (const mdFile of mdFiles) {
-            const content = fs3.readFileSync(path5.join(bundledDir, skillName, mdFile), "utf8");
-            fs3.writeFileSync(path5.join(skillDir, mdFile), content, "utf8");
+            const content = fs4.readFileSync(path7.join(bundledDir, skillName, mdFile), "utf8");
+            fs4.writeFileSync(path7.join(skillDir, mdFile), content, "utf8");
           }
           installed.push(skillName);
         } catch {
@@ -7289,25 +7720,25 @@ function registerSkillsCommands(program2) {
     try {
       let targetDir;
       if (opts.target) {
-        targetDir = path5.resolve(opts.target);
+        targetDir = path7.resolve(opts.target);
       } else {
         const agentConfig = AGENT_PATHS[opts.agent];
         if (!agentConfig) {
           throw new Error(`Unknown agent: "${opts.agent}". Use: ${Object.keys(AGENT_PATHS).join(" | ")}`);
         }
         const scopePath = opts.scope === "user" ? agentConfig.user : agentConfig.project;
-        targetDir = path5.resolve(scopePath);
+        targetDir = path7.resolve(scopePath);
       }
-      if (!fs3.existsSync(targetDir)) {
+      if (!fs4.existsSync(targetDir)) {
         success({ skills: [], message: `No skills directory found at ${targetDir}. Run: pncli skills install` }, "skills", "list", start);
         return;
       }
-      const skillDirs = fs3.readdirSync(targetDir).filter((name) => {
-        const skillPath = path5.join(targetDir, name, "SKILL.md");
-        return fs3.existsSync(skillPath);
+      const skillDirs = fs4.readdirSync(targetDir).filter((name) => {
+        const skillPath = path7.join(targetDir, name, "SKILL.md");
+        return fs4.existsSync(skillPath);
       });
       const skillsList = skillDirs.map((name) => {
-        const content = fs3.readFileSync(path5.join(targetDir, name, "SKILL.md"), "utf8");
+        const content = fs4.readFileSync(path7.join(targetDir, name, "SKILL.md"), "utf8");
         const frontmatter = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
         const data = {};
         const metadata = {};
@@ -7346,42 +7777,46 @@ function registerSkillsCommands(program2) {
     }
   });
   const marketplace = skills.command("marketplace").description("Manage a git-hosted skills marketplace");
-  marketplace.command("setup").description("Clone a skills marketplace repo and register it in global config").argument("<url>", "Git clone URL of the marketplace repository").argument("<localPath>", "Local directory to clone the marketplace into").option("--branch <branch>", "Branch to clone", "master").option("--token <token>", "Bitbucket HTTP access token for authenticated clone and pull").action(async (url, localPath, opts) => {
+  marketplace.command("setup").description("Clone a skills marketplace repo and register it in global config").argument("<url>", "Git clone URL of the marketplace repository").argument("[localPath]", "Local directory to clone into (default: ~/.agents/marketplaces/<repo-name>)").option("--branch <branch>", "Branch to clone (default: remote HEAD)").option("--token <token>", "HTTP access token for authenticated clone and pull (GitHub PAT or Bitbucket token)").action(async (url, localPath, opts) => {
     const start = Date.now();
     try {
-      const resolvedPath = path5.resolve(localPath);
-      const hasGit = fs3.existsSync(path5.join(resolvedPath, ".git"));
-      if (fs3.existsSync(resolvedPath) && !hasGit && fs3.readdirSync(resolvedPath).length > 0) {
+      const resolvedPath = path7.resolve(localPath ?? defaultMarketplacePath(url));
+      const hasGit = fs4.existsSync(path7.join(resolvedPath, ".git"));
+      if (fs4.existsSync(resolvedPath) && !hasGit && fs4.readdirSync(resolvedPath).length > 0) {
         throw new Error(`Directory already exists and is not a git repo: ${resolvedPath}`);
       }
       if (hasGit) {
         warn(`Directory already contains a git repo at ${resolvedPath} \u2014 skipping clone, updating config only.`);
       } else {
-        warn(`Cloning ${url} (branch: ${opts.branch}) \u2192 ${resolvedPath}...`);
+        const branchLabel = opts.branch ?? "remote default";
+        warn(`Cloning ${url} (branch: ${branchLabel}) \u2192 ${resolvedPath}...`);
         const cloneUrl = opts.token ? injectTokenIntoUrl(url, opts.token) : url;
+        const cloneArgs = ["clone"];
+        if (opts.branch) cloneArgs.push("--branch", opts.branch);
+        cloneArgs.push(cloneUrl, resolvedPath);
         try {
-          execFileSync3("git", ["clone", "--branch", opts.branch, cloneUrl, resolvedPath], { stdio: ["inherit", "inherit", "pipe"] });
+          execFileSync3("git", cloneArgs, { stdio: ["inherit", "inherit", "pipe"] });
         } catch (e) {
           const msg = e instanceof Error ? e.message : String(e);
-          throw new Error(msg.replace(/x-token-auth:[^@]+@/g, "x-token-auth:***@"));
+          throw new Error(msg.replace(/x-(?:token-auth|access-token):[^@]+@/g, "x-token-auth:***@"));
         }
       }
       const configPath = getGlobalConfigPath();
       const existing = loadJsonFile(configPath) ?? {};
       existing.marketplace = { repoUrl: url, localPath: resolvedPath, ...opts.token ? { token: opts.token } : {} };
       writeGlobalConfig(existing, configPath);
-      success({ repoUrl: url, localPath: resolvedPath, branch: opts.branch, tokenConfigured: !!opts.token }, "skills", "marketplace-setup", start);
+      success({ repoUrl: url, localPath: resolvedPath, branch: opts.branch ?? null, tokenConfigured: !!opts.token }, "skills", "marketplace-setup", start);
     } catch (err) {
       fail(err, "skills", "marketplace-setup", start);
     }
   });
-  marketplace.command("sync").description("Pull latest marketplace content and install a plugin's skills").argument("[plugin]", "Plugin name to install (skips interactive selection)").option("--claude", "Install to ~/.claude/skills instead of ~/.agents/skills").action(async (plugin, opts) => {
+  marketplace.command("sync").description("Pull latest marketplace content and install a plugin's skills").argument("[plugin]", 'Plugin name to install, or "all" to install every plugin (skips interactive selection)').option("--claude", "Install to ~/.claude/skills instead of ~/.agents/skills").option("--force", "Force reinstall even if the marketplace repo has no new changes").action(async (plugin, opts) => {
     const start = Date.now();
     try {
       const configPath = getGlobalConfigPath();
       const globalConfig = loadJsonFile(configPath) ?? {};
       const marketplacePath = globalConfig.marketplace?.localPath;
-      if (!marketplacePath || !fs3.existsSync(marketplacePath)) {
+      if (!marketplacePath || !fs4.existsSync(marketplacePath)) {
         throw new Error("Marketplace not configured. Run: pncli skills marketplace setup <url> <localPath>");
       }
       warn("Pulling latest marketplace content...");
@@ -7392,16 +7827,61 @@ function registerSkillsCommands(program2) {
         gitArgs.push("-c", `remote.origin.url=${injectTokenIntoUrl(repoUrl, token)}`);
       }
       gitArgs.push("pull");
+      let pullOutput;
       try {
-        execFileSync3("git", gitArgs, { stdio: ["inherit", "inherit", "pipe"] });
+        pullOutput = execFileSync3("git", gitArgs, { encoding: "utf8", stdio: ["inherit", "pipe", "pipe"], env: { ...process.env, LANG: "C", LC_ALL: "C" } });
       } catch (e) {
         const msg = e instanceof Error ? e.message : String(e);
-        throw new Error(msg.replace(/x-token-auth:[^@]+@/g, "x-token-auth:***@"));
+        throw new Error(msg.replace(/x-(?:token-auth|access-token):[^@]+@/g, "x-token-auth:***@"));
+      }
+      const marketplaceUpdated = !pullOutput.includes("Already up to date");
+      if (pullOutput.trim() && marketplaceUpdated) {
+        warn(pullOutput.trim());
+      }
+      warn(marketplaceUpdated ? "Marketplace updated." : "Marketplace already up to date \u2014 no changes to sync.");
+      if (!marketplaceUpdated && !plugin && !opts.force) {
+        success({
+          marketplace: marketplacePath,
+          marketplaceUpdated: false,
+          updated: false,
+          skipped: true,
+          message: "No marketplace changes detected \u2014 skipping plugin selection and install."
+        }, "skills", "marketplace-sync", start);
+        return;
       }
       const pluginChoices = resolvePluginChoices(marketplacePath);
       if (pluginChoices.length === 0) {
         throw new Error("No plugins found in marketplace. Check the marketplace repository structure.");
       }
+      const targetDir = opts.claude ? path7.join(os.homedir(), ".claude", "skills") : path7.join(os.homedir(), ".agents", "skills");
+      if (plugin === "all") {
+        const results = {};
+        let totalInstalled = 0;
+        for (const pluginChoice of pluginChoices) {
+          const skillsSrc2 = resolveSkillsSrc(marketplacePath, pluginChoice.name);
+          if (!fs4.existsSync(skillsSrc2)) {
+            results[pluginChoice.name] = { installed: [], failed: [] };
+            warn(`No skills directory found for plugin "${pluginChoice.name}" \u2014 skipping.`);
+            continue;
+          }
+          const { installed: installed2, failed: failed2 } = copyPluginSkills(skillsSrc2, targetDir);
+          results[pluginChoice.name] = { installed: installed2, failed: failed2 };
+          totalInstalled += installed2.length;
+          for (const skill of installed2) {
+            warn(`  ${skill}: ${path7.join(skillsSrc2, skill)} \u2192 ${path7.join(targetDir, skill)}`);
+          }
+          if (failed2.length > 0) {
+            warn(`Skipped ${failed2.length} skill(s) with invalid names in "${pluginChoice.name}": ${failed2.join(", ")}`);
+          }
+        }
+        success({
+          plugins: results,
+          total: totalInstalled,
+          target: targetDir,
+          marketplaceUpdated
+        }, "skills", "marketplace-sync", start);
+        return;
+      }
       let selectedPlugin;
       if (plugin) {
         if (!pluginChoices.some((p) => p.name === plugin)) {
@@ -7418,11 +7898,13 @@ function registerSkillsCommands(program2) {
         });
       }
       const skillsSrc = resolveSkillsSrc(marketplacePath, selectedPlugin);
-      if (!fs3.existsSync(skillsSrc)) {
+      if (!fs4.existsSync(skillsSrc)) {
         throw new Error(`No skills directory found at ${skillsSrc}`);
       }
-      const targetDir = opts.claude ? path5.join(os.homedir(), ".claude", "skills") : path5.join(os.homedir(), ".agents", "skills");
       const { installed, failed } = copyPluginSkills(skillsSrc, targetDir);
+      for (const skill of installed) {
+        warn(`  ${skill}: ${path7.join(skillsSrc, skill)} \u2192 ${path7.join(targetDir, skill)}`);
+      }
       if (failed.length > 0) {
         warn(`Skipped ${failed.length} skill(s) with invalid names: ${failed.join(", ")}`);
       }
@@ -7431,7 +7913,8 @@ function registerSkillsCommands(program2) {
         installed,
         failed,
         total: installed.length,
-        target: targetDir
+        target: targetDir,
+        marketplaceUpdated
       }, "skills", "marketplace-sync", start);
     } catch (err) {
       fail(err, "skills", "marketplace-sync", start);
@@ -7439,46 +7922,46 @@ function registerSkillsCommands(program2) {
   });
 }
 function resolvePluginChoices(marketplacePath) {
-  const marketplaceJsonPath = path5.join(marketplacePath, ".claude-plugin", "marketplace.json");
-  if (fs3.existsSync(marketplaceJsonPath)) {
+  const marketplaceJsonPath = path7.join(marketplacePath, ".claude-plugin", "marketplace.json");
+  if (fs4.existsSync(marketplaceJsonPath)) {
     try {
-      const meta = JSON.parse(fs3.readFileSync(marketplaceJsonPath, "utf8"));
+      const meta = JSON.parse(fs4.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 = path5.join(marketplacePath, "plugins");
-  if (fs3.existsSync(pluginsDir)) {
-    return fs3.readdirSync(pluginsDir).filter((name) => fs3.statSync(path5.join(pluginsDir, name)).isDirectory()).map((name) => ({ name, description: "" }));
+  const pluginsDir = path7.join(marketplacePath, "plugins");
+  if (fs4.existsSync(pluginsDir)) {
+    return fs4.readdirSync(pluginsDir).filter((name) => fs4.statSync(path7.join(pluginsDir, name)).isDirectory()).map((name) => ({ name, description: "" }));
   }
   return [];
 }
 function resolveSkillsSrc(marketplacePath, selectedPlugin) {
-  const pluginsBase = path5.resolve(marketplacePath, "plugins");
-  const skillsSrc = path5.resolve(pluginsBase, selectedPlugin, "skills");
-  if (!skillsSrc.startsWith(pluginsBase + path5.sep)) {
+  const pluginsBase = path7.resolve(marketplacePath, "plugins");
+  const skillsSrc = path7.resolve(pluginsBase, selectedPlugin, "skills");
+  if (!skillsSrc.startsWith(pluginsBase + path7.sep)) {
     throw new Error(`Invalid plugin name: "${selectedPlugin}"`);
   }
   return skillsSrc;
 }
 function copyPluginSkills(skillsSrc, targetDir) {
-  fs3.mkdirSync(targetDir, { recursive: true });
-  const resolvedTarget = path5.resolve(targetDir);
-  const skillNames = fs3.readdirSync(skillsSrc).filter(
-    (name) => fs3.statSync(path5.join(skillsSrc, name)).isDirectory()
+  fs4.mkdirSync(targetDir, { recursive: true });
+  const resolvedTarget = path7.resolve(targetDir);
+  const skillNames = fs4.readdirSync(skillsSrc).filter(
+    (name) => fs4.statSync(path7.join(skillsSrc, name)).isDirectory()
   );
   const installed = [];
   const failed = [];
   for (const skillName of skillNames) {
-    const dest = path5.resolve(targetDir, skillName);
-    if (!dest.startsWith(resolvedTarget + path5.sep)) {
+    const dest = path7.resolve(targetDir, skillName);
+    if (!dest.startsWith(resolvedTarget + path7.sep)) {
       failed.push(skillName);
       continue;
     }
-    fs3.rmSync(dest, { recursive: true, force: true });
-    fs3.cpSync(path5.join(skillsSrc, skillName), dest, { recursive: true });
+    fs4.rmSync(dest, { recursive: true, force: true });
+    fs4.cpSync(path7.join(skillsSrc, skillName), dest, { recursive: true });
     installed.push(skillName);
   }
   return { installed, failed };