@kolatts/pncli 1.10.0 → 1.11.0

package/dist/cli.js

@@ -2,12 +2,13 @@
 import {
   getGlobalConfigPath,
   loadConfig,
+  loadJsonFile,
   maskConfig,
   setConfigValue,
   setRepoConfigValue,
   writeGlobalConfig,
   writeRepoConfig
-} from "./chunk-O3LWAWSN.js";
+} from "./chunk-AWSXVWRN.js";
 import {
   ExitCode,
   PncliError,
@@ -18,7 +19,7 @@ import {
   setGlobalUser,
   success,
   warn
-} from "./chunk-3XHTRFRX.js";
+} from "./chunk-VPUWMP2M.js";
 import {
   AdoCoreClient
 } from "./chunk-VDL32PSG.js";
@@ -161,6 +162,201 @@ function getBranches(root) {
   }
   return { current, local, remote };
 }
+var COMMIT_PREFIX = "__PNCLI_COMMIT__";
+function getWeekMonday(dateStr) {
+  const d = new Date(dateStr);
+  const day = d.getUTCDay();
+  const diff = day === 0 ? -6 : 1 - day;
+  const monday = new Date(Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate() + diff));
+  return monday.toISOString().slice(0, 10);
+}
+function getWeekSunday(mondayStr) {
+  const d = new Date(mondayStr);
+  const sunday = new Date(Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate() + 6));
+  return sunday.toISOString().slice(0, 10);
+}
+function getISOWeekLabel(mondayStr) {
+  const d = new Date(mondayStr);
+  const thursday = new Date(Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate() + 3));
+  const year = thursday.getUTCFullYear();
+  const jan4 = new Date(Date.UTC(year, 0, 4));
+  const jan4Monday = new Date(Date.UTC(year, 0, 4 - (jan4.getUTCDay() === 0 ? 6 : jan4.getUTCDay() - 1)));
+  const weekNum = Math.round((d.getTime() - jan4Monday.getTime()) / (7 * 864e5)) + 1;
+  return `${year}-W${String(weekNum).padStart(2, "0")}`;
+}
+function buildWeeklyBreakdown(commits) {
+  const weekMap = /* @__PURE__ */ new Map();
+  for (const commit of commits) {
+    const monday = getWeekMonday(commit.date);
+    if (!weekMap.has(monday)) weekMap.set(monday, /* @__PURE__ */ new Map());
+    const authorMap = weekMap.get(monday);
+    if (!authorMap.has(commit.author)) {
+      authorMap.set(commit.author, {
+        author: commit.author,
+        commitCount: 0,
+        insertions: 0,
+        deletions: 0,
+        netLines: 0,
+        filesChanged: 0
+      });
+    }
+    const stats = authorMap.get(commit.author);
+    stats.commitCount++;
+    stats.insertions += commit.insertions;
+    stats.deletions += commit.deletions;
+    stats.netLines += commit.netLines;
+    stats.filesChanged += commit.filesChanged;
+  }
+  return [...weekMap.entries()].sort(([a], [b]) => a.localeCompare(b)).map(([monday, authorMap]) => {
+    const authors = [...authorMap.values()].sort((a, b) => a.author.localeCompare(b.author));
+    return {
+      week: getISOWeekLabel(monday),
+      weekStart: monday,
+      weekEnd: getWeekSunday(monday),
+      authors,
+      summary: {
+        commitCount: authors.reduce((s, a) => s + a.commitCount, 0),
+        totalInsertions: authors.reduce((s, a) => s + a.insertions, 0),
+        totalDeletions: authors.reduce((s, a) => s + a.deletions, 0),
+        totalNetLines: authors.reduce((s, a) => s + a.netLines, 0),
+        totalFilesChanged: authors.reduce((s, a) => s + a.filesChanged, 0)
+      }
+    };
+  });
+}
+function buildByAuthor(commits) {
+  const map = /* @__PURE__ */ new Map();
+  for (const commit of commits) {
+    if (!map.has(commit.author)) {
+      map.set(commit.author, {
+        author: commit.author,
+        commitCount: 0,
+        insertions: 0,
+        deletions: 0,
+        netLines: 0,
+        filesChanged: 0
+      });
+    }
+    const stats = map.get(commit.author);
+    stats.commitCount++;
+    stats.insertions += commit.insertions;
+    stats.deletions += commit.deletions;
+    stats.netLines += commit.netLines;
+    stats.filesChanged += commit.filesChanged;
+  }
+  return [...map.values()].sort((a, b) => a.author.localeCompare(b.author));
+}
+function parseBranchReportOutput(raw, branchName, opts) {
+  const commits = [];
+  let current = null;
+  for (const line of raw.split("\n")) {
+    if (line.startsWith(COMMIT_PREFIX)) {
+      if (current) commits.push(current);
+      const parts = line.slice(COMMIT_PREFIX.length).split("	");
+      current = {
+        hash: parts[0] ?? "",
+        author: parts[1] ?? "",
+        date: parts[2] ?? "",
+        message: parts[3] ?? "",
+        filesChanged: 0,
+        insertions: 0,
+        deletions: 0,
+        netLines: 0
+      };
+    } else if (current && /^(\d+|-)\t(\d+|-)/.test(line)) {
+      const [ins, del] = line.split("	");
+      const insertions = ins === "-" ? 0 : parseInt(ins ?? "0", 10);
+      const deletions = del === "-" ? 0 : parseInt(del ?? "0", 10);
+      if (!isNaN(insertions) && !isNaN(deletions)) {
+        current.insertions += insertions;
+        current.deletions += deletions;
+        current.filesChanged++;
+        current.netLines = current.insertions - current.deletions;
+      }
+    }
+  }
+  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);
+  return {
+    branch: branchName,
+    since: opts.since ?? null,
+    until: opts.until ?? null,
+    commits,
+    weeks: buildWeeklyBreakdown(commits),
+    byAuthor: buildByAuthor(commits),
+    summary: {
+      commitCount: commits.length,
+      totalInsertions,
+      totalDeletions,
+      totalNetLines: totalInsertions - totalDeletions,
+      totalFilesChanged: commits.reduce((sum, c) => sum + c.filesChanged, 0)
+    }
+  };
+}
+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.base && opts.branch) {
+    args.push(`${opts.base}..${opts.branch}`);
+  } else if (opts.base) {
+    args.push(`${opts.base}..HEAD`);
+  } else if (opts.branch) {
+    args.push(opts.branch);
+  }
+  return args;
+}
+function getBranchReport(root, opts) {
+  const args = buildReportArgs(opts);
+  let raw = "";
+  try {
+    raw = execFileSync("git", args, { encoding: "utf8", cwd: root }).trim();
+  } catch {
+  }
+  let branchName = opts.branch ?? "";
+  if (!branchName) {
+    try {
+      branchName = execFileSync("git", ["rev-parse", "--abbrev-ref", "HEAD"], {
+        encoding: "utf8",
+        cwd: root
+      }).trim();
+    } catch {
+      branchName = "HEAD";
+    }
+  }
+  return parseBranchReportOutput(raw, branchName, opts);
+}
+function escapeCsvField(value) {
+  if (value.includes(",") || value.includes('"') || value.includes("\n") || value.includes("\r")) {
+    return `"${value.replace(/"/g, '""')}"`;
+  }
+  return value;
+}
+function formatBranchReportCsv(report) {
+  const header = "week,week_start,author,commits,insertions,deletions,net_lines,files_changed";
+  const rows = [];
+  for (const week of report.weeks) {
+    for (const a of week.authors) {
+      rows.push(
+        [
+          week.week,
+          week.weekStart,
+          escapeCsvField(a.author),
+          a.commitCount,
+          a.insertions,
+          a.deletions,
+          a.netLines,
+          a.filesChanged
+        ].join(",")
+      );
+    }
+  }
+  const s = report.summary;
+  const totalRow = ["TOTAL", "", "", s.commitCount, s.totalInsertions, s.totalDeletions, s.totalNetLines, s.totalFilesChanged].join(",");
+  return [header, ...rows, totalRow].join("\n") + "\n";
+}
 
 // src/lib/git-context.ts
 import { execSync as execSync2 } from "child_process";
@@ -529,6 +725,25 @@ function registerGitCommands(program2) {
       fail(err, "git", "branch", start);
     }
   });
+  git.command("report").description("Report lines of code and commit counts for a branch, optionally filtered by date").option("--branch <name>", "Branch to report on (defaults to current branch)").option("--base <ref>", 'Base ref to compare against, e.g. "main" (base..branch, or base..HEAD if --branch is omitted)').option("--since <date>", 'Include commits on or after this date (e.g. "2024-01-01")').option("--until <date>", 'Include commits on or before this date (e.g. "2024-12-31")').option("--csv", "Output as CSV instead of JSON").action((opts) => {
+    const start = Date.now();
+    try {
+      const root = requireRepoRoot();
+      const report = getBranchReport(root, {
+        branch: opts.branch,
+        base: opts.base,
+        since: opts.since,
+        until: opts.until
+      });
+      if (opts.csv) {
+        process.stdout.write(formatBranchReportCsv(report));
+      } else {
+        success(report, "git", "report", start);
+      }
+    } catch (err) {
+      fail(err, "git", "report", start);
+    }
+  });
   git.command("current-pr").description("Find the open PR for the current branch").action(async () => {
     const start = Date.now();
     try {
@@ -4366,6 +4581,11 @@ function registerConfigCommands(program2) {
     }
   });
 }
+function normalizeBaseUrl(raw) {
+  const trimmed = raw.trim();
+  if (!trimmed) return trimmed;
+  return /^https?:\/\//i.test(trimmed) ? trimmed : `https://${trimmed}`;
+}
 async function initGlobalConfig(start) {
   process.stderr.write("pncli config init \u2014 Global configuration\n\n");
   process.stderr.write("\u2500\u2500 Identity \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n");
@@ -4379,7 +4599,7 @@ async function initGlobalConfig(start) {
   });
   process.stderr.write("\n\u2500\u2500 Jira \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n");
   const jiraBaseUrl = await input({
-    message: "Jira base URL (e.g. https://jira.your-company.com):",
+    message: "Jira base URL (e.g. jira.your-company.com):",
     default: ""
   });
   const jiraApiToken = await password({
@@ -4387,7 +4607,7 @@ async function initGlobalConfig(start) {
   });
   process.stderr.write("\n\u2500\u2500 Bitbucket \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n");
   const bitbucketBaseUrl = await input({
-    message: "Bitbucket Server base URL (e.g. https://bitbucket.your-company.com):",
+    message: "Bitbucket Server base URL (e.g. bitbucket.your-company.com):",
     default: ""
   });
   const bitbucketPat = await password({
@@ -4395,7 +4615,7 @@ async function initGlobalConfig(start) {
   });
   process.stderr.write("\n\u2500\u2500 Confluence \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n");
   const confluenceBaseUrl = await input({
-    message: "Confluence base URL (e.g. https://confluence.your-company.com):",
+    message: "Confluence base URL (e.g. confluence.your-company.com):",
     default: ""
   });
   const confluenceApiToken = await password({
@@ -4413,7 +4633,7 @@ async function initGlobalConfig(start) {
   let mavenRepo = "";
   if (useArtifactory) {
     artifactoryBaseUrl = await input({
-      message: "Artifactory base URL (e.g. https://artifactory.company.com):",
+      message: "Artifactory base URL (e.g. artifactory.company.com):",
       default: ""
     });
     artifactoryToken = await password({
@@ -4442,7 +4662,7 @@ async function initGlobalConfig(start) {
   let sonarToken = "";
   if (useSonar) {
     sonarBaseUrl = await input({
-      message: "SonarQube Server base URL (e.g. https://sonar.your-company.com):",
+      message: "SonarQube Server base URL (e.g. sonar.your-company.com):",
       default: ""
     });
     sonarToken = await password({
@@ -4495,7 +4715,7 @@ async function initGlobalConfig(start) {
   let adoDiscoveredTypes = [];
   if (useAdo) {
     adoBaseUrl = await input({
-      message: "Azure DevOps Server base URL (e.g. https://tfs.company.com or https://devops.company.com/tfs):",
+      message: "Azure DevOps Server base URL (e.g. tfs.company.com or devops.company.com/tfs):",
       default: ""
     });
     adoPat = await password({
@@ -4515,7 +4735,7 @@ async function initGlobalConfig(start) {
         const tempConfig = {
           ...loadConfig(),
           ado: {
-            baseUrl: adoBaseUrl,
+            baseUrl: normalizeBaseUrl(adoBaseUrl),
             pat: adoPat || void 0,
             fieldAliases: {},
             discoveredFields: [],
@@ -4567,7 +4787,7 @@ async function initGlobalConfig(start) {
   let jenkinsApiToken = "";
   if (useJenkins) {
     jenkinsBaseUrl = await input({
-      message: "Jenkins base URL (e.g. https://jenkins.your-company.com):",
+      message: "Jenkins base URL (e.g. jenkins.your-company.com):",
       default: ""
     });
     jenkinsUsername = await input({
@@ -4591,7 +4811,7 @@ async function initGlobalConfig(start) {
   let udeployDefaultEnv = "";
   if (useUdeploy) {
     udeployBaseUrl = await input({
-      message: "UDeploy base URL (e.g. https://ucd.company.com:8443):",
+      message: "UDeploy base URL (e.g. ucd.company.com:8443):",
       default: ""
     });
     udeployUsername = await input({
@@ -4623,7 +4843,7 @@ async function initGlobalConfig(start) {
         const tempConfig = {
           ...loadConfig(),
           udeploy: {
-            baseUrl: udeployBaseUrl,
+            baseUrl: normalizeBaseUrl(udeployBaseUrl),
             pat: udeployPat || void 0,
             username: udeployUsername || void 0,
             password: udeployPassword || void 0
@@ -4648,7 +4868,7 @@ async function initGlobalConfig(start) {
   let checkmarxPassword = "";
   if (useCheckmarx) {
     checkmarxBaseUrl = await input({
-      message: "Checkmarx base URL (e.g. https://cx.company.com):",
+      message: "Checkmarx base URL (e.g. cx.company.com):",
       default: ""
     });
     checkmarxUsername = await input({
@@ -4665,7 +4885,7 @@ async function initGlobalConfig(start) {
         const tempConfig = {
           ...loadConfig(),
           checkmarx: {
-            baseUrl: checkmarxBaseUrl,
+            baseUrl: normalizeBaseUrl(checkmarxBaseUrl),
             username: checkmarxUsername,
             password: checkmarxPassword
           }
@@ -4690,7 +4910,7 @@ async function initGlobalConfig(start) {
   let servicenowApiToken = "";
   if (useServiceNow) {
     servicenowBaseUrl = await input({
-      message: "ServiceNow instance URL (e.g. https://mycompany.service-now.com):",
+      message: "ServiceNow instance URL (e.g. mycompany.service-now.com):",
       default: ""
     });
     servicenowUsername = await input({
@@ -4719,7 +4939,7 @@ async function initGlobalConfig(start) {
         const tempConfig = {
           ...loadConfig(),
           servicenow: {
-            baseUrl: servicenowBaseUrl,
+            baseUrl: normalizeBaseUrl(servicenowBaseUrl),
             username: servicenowUsername,
             password: servicenowPassword || void 0,
             apiToken: servicenowApiToken || void 0
@@ -4745,7 +4965,7 @@ async function initGlobalConfig(start) {
   if (useSonatypeIq) {
     process.stderr.write("  User Token credentials are found in your IQ Server profile under User Token.\n");
     sonatypeIqBaseUrl = await input({
-      message: "Sonatype IQ Server base URL (e.g. https://iq.your-company.com):",
+      message: "Sonatype IQ Server base URL (e.g. iq.your-company.com):",
       default: ""
     });
     sonatypeIqUserCode = await input({
@@ -4761,7 +4981,7 @@ async function initGlobalConfig(start) {
         const tempConfig = {
           ...loadConfig(),
           sonatypeiq: {
-            baseUrl: sonatypeIqBaseUrl,
+            baseUrl: normalizeBaseUrl(sonatypeIqBaseUrl),
             userCode: sonatypeIqUserCode,
             passcode: sonatypeIqPasscode
           }
@@ -4788,7 +5008,8 @@ async function initGlobalConfig(start) {
   if (useContrast) {
     process.stderr.write("  Find your credentials in Contrast under User Settings \u2192 Your Keys.\n");
     contrastBaseUrl = await input({
-      message: "Contrast base URL (leave blank for cloud: https://app.contrastsecurity.com):",
+      message: "Contrast base URL (e.g. https://app.contrastsecurity.com for cloud SaaS):",
+      validate: (v) => v.trim() ? true : "Base URL is required",
       default: ""
     });
     contrastOrgUuid = await input({
@@ -4812,7 +5033,7 @@ async function initGlobalConfig(start) {
         const tempConfig = {
           ...loadConfig(),
           contrast: {
-            baseUrl: contrastBaseUrl || void 0,
+            baseUrl: normalizeBaseUrl(contrastBaseUrl) || void 0,
             orgUuid: contrastOrgUuid,
             username: contrastUsername,
             apiKey: contrastApiKey,
@@ -4857,22 +5078,22 @@ async function initGlobalConfig(start) {
       userId: userId || void 0
     },
     jira: {
-      baseUrl: jiraBaseUrl || void 0,
+      baseUrl: normalizeBaseUrl(jiraBaseUrl) || void 0,
       apiToken: jiraApiToken || void 0
     },
     bitbucket: {
-      baseUrl: bitbucketBaseUrl || void 0,
+      baseUrl: normalizeBaseUrl(bitbucketBaseUrl) || void 0,
       pat: bitbucketPat || void 0
     },
     ...confluenceBaseUrl || confluenceApiToken ? {
       confluence: {
-        baseUrl: confluenceBaseUrl || void 0,
+        baseUrl: normalizeBaseUrl(confluenceBaseUrl) || void 0,
         apiToken: confluenceApiToken || void 0
       }
     } : {},
     ...useArtifactory ? {
       artifactory: {
-        baseUrl: artifactoryBaseUrl || void 0,
+        baseUrl: normalizeBaseUrl(artifactoryBaseUrl) || void 0,
         token: artifactoryToken || void 0,
         npmRepo: npmRepo || void 0,
         nugetRepo: nugetRepo || void 0,
@@ -4881,7 +5102,7 @@ async function initGlobalConfig(start) {
     } : {},
     ...useSonar ? {
       sonar: {
-        baseUrl: sonarBaseUrl || void 0,
+        baseUrl: normalizeBaseUrl(sonarBaseUrl) || void 0,
         token: sonarToken || void 0
       }
     } : {},
@@ -4892,7 +5113,7 @@ async function initGlobalConfig(start) {
     } : {},
     ...useAdo && adoBaseUrl ? {
       ado: {
-        baseUrl: adoBaseUrl,
+        baseUrl: normalizeBaseUrl(adoBaseUrl),
         ...adoPat ? { pat: adoPat } : {},
         ...Object.keys(adoFieldAliases).length ? { fieldAliases: adoFieldAliases } : {},
         ...adoDiscoveredFields.length ? { discoveredFields: adoDiscoveredFields } : {},
@@ -4901,14 +5122,14 @@ async function initGlobalConfig(start) {
     } : {},
     ...useJenkins && jenkinsBaseUrl ? {
       jenkins: {
-        baseUrl: jenkinsBaseUrl,
+        baseUrl: normalizeBaseUrl(jenkinsBaseUrl),
         ...jenkinsUsername ? { username: jenkinsUsername } : {},
         ...jenkinsApiToken ? { apiToken: jenkinsApiToken } : {}
       }
     } : {},
     ...useUdeploy && udeployBaseUrl ? {
       udeploy: {
-        baseUrl: udeployBaseUrl,
+        baseUrl: normalizeBaseUrl(udeployBaseUrl),
         ...udeployPat ? { pat: udeployPat } : {},
         ...udeployUsername ? { username: udeployUsername } : {},
         ...udeployPassword ? { password: udeployPassword } : {}
@@ -4916,14 +5137,14 @@ async function initGlobalConfig(start) {
     } : {},
     ...useCheckmarx && checkmarxBaseUrl ? {
       checkmarx: {
-        baseUrl: checkmarxBaseUrl,
+        baseUrl: normalizeBaseUrl(checkmarxBaseUrl),
         username: checkmarxUsername || void 0,
         password: checkmarxPassword || void 0
       }
     } : {},
     ...useServiceNow && servicenowBaseUrl ? {
       servicenow: {
-        baseUrl: servicenowBaseUrl,
+        baseUrl: normalizeBaseUrl(servicenowBaseUrl),
         username: servicenowUsername || void 0,
         ...servicenowApiToken ? { apiToken: servicenowApiToken } : {},
         ...servicenowPassword ? { password: servicenowPassword } : {}
@@ -4931,7 +5152,7 @@ async function initGlobalConfig(start) {
     } : {},
     ...useContrast && contrastOrgUuid ? {
       contrast: {
-        ...contrastBaseUrl ? { baseUrl: contrastBaseUrl } : {},
+        ...contrastBaseUrl ? { baseUrl: normalizeBaseUrl(contrastBaseUrl) } : {},
         orgUuid: contrastOrgUuid,
         username: contrastUsername || void 0,
         apiKey: contrastApiKey || void 0,
@@ -4940,7 +5161,7 @@ async function initGlobalConfig(start) {
     } : {},
     ...useSonatypeIq && sonatypeIqBaseUrl ? {
       sonatypeiq: {
-        baseUrl: sonatypeIqBaseUrl,
+        baseUrl: normalizeBaseUrl(sonatypeIqBaseUrl),
         userCode: sonatypeIqUserCode || void 0,
         passcode: sonatypeIqPasscode || void 0
       }
@@ -5849,11 +6070,11 @@ function registerAdoRepoCommands(ado) {
       const start = Date.now();
       try {
         const globalOpts = ado.optsWithGlobals();
-        const { loadConfig: lc } = await import("./config-NCI2BTQG.js");
+        const { loadConfig: lc } = await import("./config-OFLPO5DN.js");
         const config = lc({ configPath: globalOpts.config });
         const { collection, project, repo: repo2, gitClient } = getAdoContext(ado, true);
         const { AdoCoreClient: AdoCoreClient2 } = await import("./core-SWYVXOQ4.js");
-        const { createHttpClient: createHttpClient2 } = await import("./http-L2P23H2D.js");
+        const { createHttpClient: createHttpClient2 } = await import("./http-LNDRNPP7.js");
         const http = createHttpClient2(config, Boolean(globalOpts.dryRun));
         const coreClient = new AdoCoreClient2(http);
         const me = await coreClient.getConnectionData(collection);
@@ -6961,6 +7182,19 @@ import fs3 from "fs";
 import path5 from "path";
 import os from "os";
 import { fileURLToPath } from "url";
+import { execFileSync as execFileSync3 } from "child_process";
+import { select } from "@inquirer/prompts";
+function injectTokenIntoUrl(url, token) {
+  let parsed;
+  try {
+    parsed = new URL(url);
+  } catch {
+    throw new Error(`--token requires an HTTPS clone URL; got: ${url}`);
+  }
+  parsed.username = "x-token-auth";
+  parsed.password = token;
+  return parsed.toString();
+}
 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") }
@@ -7020,9 +7254,12 @@ function registerSkillsCommands(program2) {
           continue;
         }
         try {
-          const content = fs3.readFileSync(path5.join(bundledDir, skillName, "SKILL.md"), "utf8");
+          const mdFiles = fs3.readdirSync(path5.join(bundledDir, skillName)).filter((f) => f.endsWith(".md"));
           fs3.mkdirSync(skillDir, { recursive: true });
-          fs3.writeFileSync(path5.join(skillDir, "SKILL.md"), content, "utf8");
+          for (const mdFile of mdFiles) {
+            const content = fs3.readFileSync(path5.join(bundledDir, skillName, mdFile), "utf8");
+            fs3.writeFileSync(path5.join(skillDir, mdFile), content, "utf8");
+          }
           installed.push(skillName);
         } catch {
           failed.push(skillName);
@@ -7106,6 +7343,143 @@ function registerSkillsCommands(program2) {
       fail(err, "skills", "list", start);
     }
   });
+  const marketplace = skills.command("marketplace").description("Manage a git-hosted skills marketplace");
+  marketplace.command("setup").description("Clone a skills marketplace repo and register it in global config").argument("<url>", "Git clone URL of the marketplace repository").argument("<localPath>", "Local directory to clone 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) => {
+    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) {
+        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 cloneUrl = opts.token ? injectTokenIntoUrl(url, opts.token) : url;
+        try {
+          execFileSync3("git", ["clone", "--branch", opts.branch, cloneUrl, resolvedPath], { 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:***@"));
+        }
+      }
+      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);
+    } 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) => {
+    const start = Date.now();
+    try {
+      const configPath = getGlobalConfigPath();
+      const globalConfig = loadJsonFile(configPath) ?? {};
+      const marketplacePath = globalConfig.marketplace?.localPath;
+      if (!marketplacePath || !fs3.existsSync(marketplacePath)) {
+        throw new Error("Marketplace not configured. Run: pncli skills marketplace setup <url> <localPath>");
+      }
+      warn("Pulling latest marketplace content...");
+      const repoUrl = globalConfig.marketplace?.repoUrl;
+      const token = globalConfig.marketplace?.token;
+      const gitArgs = ["-C", marketplacePath];
+      if (repoUrl && token) {
+        gitArgs.push("-c", `remote.origin.url=${injectTokenIntoUrl(repoUrl, token)}`);
+      }
+      gitArgs.push("pull");
+      try {
+        execFileSync3("git", gitArgs, { 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:***@"));
+      }
+      const pluginChoices = resolvePluginChoices(marketplacePath);
+      if (pluginChoices.length === 0) {
+        throw new Error("No plugins found in marketplace. Check the marketplace repository structure.");
+      }
+      let selectedPlugin;
+      if (plugin) {
+        if (!pluginChoices.some((p) => p.name === plugin)) {
+          throw new Error(`Plugin "${plugin}" not found. Available: ${pluginChoices.map((p) => p.name).join(", ")}`);
+        }
+        selectedPlugin = plugin;
+      } else {
+        selectedPlugin = await select({
+          message: "Select a plugin to install:",
+          choices: pluginChoices.map((p) => ({
+            value: p.name,
+            name: p.description ? `${p.name} \u2014 ${p.description}` : p.name
+          }))
+        });
+      }
+      const skillsSrc = resolveSkillsSrc(marketplacePath, selectedPlugin);
+      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(", ")}`);
+      }
+      success({
+        plugin: selectedPlugin,
+        installed,
+        failed,
+        total: installed.length,
+        target: targetDir
+      }, "skills", "marketplace-sync", start);
+    } catch (err) {
+      fail(err, "skills", "marketplace-sync", start);
+    }
+  });
+}
+function resolvePluginChoices(marketplacePath) {
+  const marketplaceJsonPath = path5.join(marketplacePath, ".claude-plugin", "marketplace.json");
+  if (fs3.existsSync(marketplaceJsonPath)) {
+    try {
+      const meta = JSON.parse(fs3.readFileSync(marketplaceJsonPath, "utf8"));
+      if (Array.isArray(meta.plugins) && meta.plugins.length > 0) {
+        return meta.plugins.map((p) => ({ name: p.name, description: p.description ?? "" }));
+      }
+    } catch {
+    }
+  }
+  const pluginsDir = 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: "" }));
+  }
+  return [];
+}
+function resolveSkillsSrc(marketplacePath, selectedPlugin) {
+  const pluginsBase = path5.resolve(marketplacePath, "plugins");
+  const skillsSrc = path5.resolve(pluginsBase, selectedPlugin, "skills");
+  if (!skillsSrc.startsWith(pluginsBase + path5.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()
+  );
+  const installed = [];
+  const failed = [];
+  for (const skillName of skillNames) {
+    const dest = path5.resolve(targetDir, skillName);
+    if (!dest.startsWith(resolvedTarget + path5.sep)) {
+      failed.push(skillName);
+      continue;
+    }
+    fs3.rmSync(dest, { recursive: true, force: true });
+    fs3.cpSync(path5.join(skillsSrc, skillName), dest, { recursive: true });
+    installed.push(skillName);
+  }
+  return { installed, failed };
 }
 
 // src/cli.ts