@kolatts/pncli 1.11.1 → 1.12.0

package/dist/cli.js

@@ -19,7 +19,7 @@ import {
   setGlobalUser,
   success,
   warn
-} from "./chunk-VPUWMP2M.js";
+} from "./chunk-SLQOSGZJ.js";
 import {
   AdoCoreClient
 } from "./chunk-VDL32PSG.js";
@@ -294,11 +294,17 @@ function parseBranchReportOutput(raw, branchName, opts) {
     }
   };
 }
+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) {
@@ -430,13 +436,13 @@ function parseAdoRemote(remoteUrl, adoBaseUrl) {
   const sshIdx = path6.indexOf("/_ssh/");
   const markerIdx = gitIdx !== -1 ? gitIdx : sshIdx;
   if (markerIdx === -1) return null;
-  const repo = path6.slice(markerIdx + 6);
+  const repo = decodeURIComponent(path6.slice(markerIdx + 6));
   if (!repo) return null;
   const before = path6.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) {
@@ -776,6 +782,9 @@ function registerGitCommands(program2) {
   });
 }
 
+// src/services/jira/commands.ts
+import { readFileSync } from "fs";
+
 // src/services/jira/client.ts
 var API2 = "/rest/api/2";
 var JiraClient = class {
@@ -796,6 +805,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 +874,56 @@ 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 assignIssue(key, accountId) {
     await this.http.jira(`${API2}/issue/${key}/assignee`, {
@@ -894,6 +953,43 @@ var JiraClient = class {
     });
   }
 };
+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 +1033,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 +1091,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) => {
@@ -1106,12 +1211,12 @@ 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("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 +1235,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 = readFileSync(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 = readFileSync(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 +1335,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()) : [];
@@ -5452,15 +5611,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 }
@@ -6076,7 +6242,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-5GDQYH62.js");
         const http = createHttpClient2(config, Boolean(globalOpts.dryRun));
         const coreClient = new AdoCoreClient2(http);
         const me = await coreClient.getConnectionData(collection);
@@ -6169,12 +6335,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 +6390,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 +6448,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 +6531,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 +6551,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 +6587,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 +6599,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 +6611,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);
@@ -6493,8 +6682,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)}`);
@@ -6595,11 +6794,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);
@@ -7193,10 +7395,22 @@ 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 path5.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") }
@@ -7346,10 +7560,10 @@ 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 resolvedPath = path5.resolve(localPath ?? defaultMarketplacePath(url));
       const hasGit = fs3.existsSync(path5.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}`);
@@ -7357,25 +7571,29 @@ function registerSkillsCommands(program2) {
       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();
@@ -7392,16 +7610,58 @@ 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 ? path5.join(os.homedir(), ".claude", "skills") : path5.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 (!fs3.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;
+          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)) {
@@ -7421,7 +7681,6 @@ function registerSkillsCommands(program2) {
       if (!fs3.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);
       if (failed.length > 0) {
         warn(`Skipped ${failed.length} skill(s) with invalid names: ${failed.join(", ")}`);
@@ -7431,7 +7690,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);