@kolatts/pncli 1.17.0 → 1.19.0

package/dist/cli.js

@@ -8,7 +8,7 @@ import {
   setRepoConfigValue,
   writeGlobalConfig,
   writeRepoConfig
-} from "./chunk-FFVQ4PA7.js";
+} from "./chunk-FXY262BR.js";
 import {
   ExitCode,
   PncliError,
@@ -20,7 +20,7 @@ import {
   success,
   warn,
   writeRawOutput
-} from "./chunk-XPPEXJBP.js";
+} from "./chunk-WM5NYVEO.js";
 import {
   AdoCoreClient
 } from "./chunk-VDL32PSG.js";
@@ -683,9 +683,9 @@ var BitbucketClient = class {
   async getDiff(project, repo, prId, file, contextLines) {
     const params = {};
     if (contextLines !== void 0) params.contextLines = contextLines;
-    if (file) params.path = file;
+    const diffPath = file ? `${API}/projects/${project}/repos/${repo}/pull-requests/${prId}/diff/${file}` : `${API}/projects/${project}/repos/${repo}/pull-requests/${prId}/diff`;
     const result = await this.http.bitbucket(
-      `${API}/projects/${project}/repos/${repo}/pull-requests/${prId}/diff`,
+      diffPath,
       { params }
     );
     return typeof result === "string" ? result : JSON.stringify(result);
@@ -734,6 +734,19 @@ var BitbucketClient = class {
     );
     return result.values ?? [];
   }
+  async createRepo(opts) {
+    return this.http.bitbucket(
+      `${API}/projects/${opts.project}/repos`,
+      {
+        method: "POST",
+        body: {
+          name: opts.name,
+          scmId: "git",
+          ...opts.description !== void 0 ? { description: opts.description } : {}
+        }
+      }
+    );
+  }
 };
 
 // src/services/git/commands.ts
@@ -837,7 +850,7 @@ function registerGitCommands(program2) {
 }
 
 // src/services/jira/commands.ts
-import { readFileSync as readFileSync2, existsSync, writeFileSync, mkdirSync } from "fs";
+import { readFileSync as readFileSync3, existsSync, writeFileSync, mkdirSync } from "fs";
 import path from "path";
 
 // src/services/jira/client.ts
@@ -911,7 +924,7 @@ var JiraClient = class {
     if (opts.description) fields.description = opts.description;
     if (opts.priority) fields.priority = { name: opts.priority };
     if (opts.assignee) fields.assignee = { name: opts.assignee };
-    if (opts.labels) fields.labels = opts.labels;
+    if (opts.labels?.length) fields.labels = opts.labels;
     Object.assign(fields, opts.customFieldValues ?? {});
     await this.http.jira(`${API2}/issue/${key}`, {
       method: "PUT",
@@ -1207,7 +1220,119 @@ function formatFieldValue(value, type) {
   }
 }
 
+// src/services/jira/input-schema.ts
+var JIRA_INPUT_FILE_SCHEMA = {
+  $schema: "https://json-schema.org/draft/2020-12/schema",
+  title: "pncli Jira issue input file",
+  description: "Shape accepted by --input-file on `pncli jira create-issue` / `update-issue`. CLI flags (--summary, --description, --priority, --field, ...) override matching keys here; overridden keys are reported in meta.overrides.",
+  type: "object",
+  properties: {
+    project: { type: "string", description: "Project key (create-issue only)" },
+    issueType: { type: "string", description: "Issue type name, e.g. Bug, Story, Task (create-issue only)" },
+    fields: {
+      type: "object",
+      description: 'Field dictionary. Built-in keys: summary, description, priority, assignee, labels, parent. Any other key resolves as a custom field: a friendly name registered via `pncli jira fields`, or a raw field id (e.g. customfield_10032) passed through untouched \u2014 custom fields never need to be pre-registered in config. Any string value may be "@path/to/file" to read that field\'s content from a file instead of inlining it (useful for large rich-text fields).',
+      additionalProperties: true
+    }
+  },
+  additionalProperties: false
+};
+var JIRA_INPUT_FILE_EXAMPLE = {
+  project: "PROJ",
+  issueType: "Bug",
+  fields: {
+    summary: "Login broken on Safari",
+    description: "@desc.html",
+    priority: "High",
+    labels: ["frontend", "urgent"],
+    // Raw field id — passed through untouched, no pre-registration needed. A friendly
+    // custom-field name (e.g. "Story Points") also works, but only once it's registered
+    // via `pncli config set jira.customFields` / discovered with `pncli jira fields`.
+    customfield_10032: "@ac.md"
+  }
+};
+
+// src/lib/input.ts
+import { readFileSync as readFileSync2 } from "fs";
+function resolveTextInput(inline, file, optionName) {
+  if (inline !== void 0 && file !== void 0) {
+    throw new PncliError(`Cannot specify both --${optionName} and --${optionName}-file`, 1);
+  }
+  if (file !== void 0) {
+    try {
+      return readFileSync2(file === "-" ? 0 : file, "utf8");
+    } catch (e) {
+      const source = file === "-" ? "stdin" : `file "${file}"`;
+      throw new PncliError(`Cannot read ${optionName} ${source}: ${e.message}`, 1);
+    }
+  }
+  return inline;
+}
+function readJsonInputFile(filePath, optionName = "input-file") {
+  let raw;
+  try {
+    raw = readFileSync2(filePath === "-" ? 0 : filePath, "utf8");
+  } catch (e) {
+    const source = filePath === "-" ? "stdin" : `file "${filePath}"`;
+    throw new PncliError(`Cannot read --${optionName} ${source}: ${e.message}`, 1);
+  }
+  try {
+    return JSON.parse(raw);
+  } catch (e) {
+    throw new PncliError(`--${optionName} must contain valid JSON: ${e.message}`, 1);
+  }
+}
+function resolveAtFileRef(value) {
+  if (typeof value !== "string" || !value.startsWith("@")) return value;
+  const filePath = value.slice(1);
+  try {
+    return readFileSync2(filePath, "utf8");
+  } catch (e) {
+    throw new PncliError(`Cannot read referenced file "${filePath}": ${e.message}`, 1);
+  }
+}
+function mergeWithOverrides(fromJson, fromFlags) {
+  const merged = { ...fromJson };
+  const overrides = [];
+  for (const [key, value] of Object.entries(fromFlags)) {
+    if (value === void 0) continue;
+    if (Object.prototype.hasOwnProperty.call(fromJson, key)) overrides.push(key);
+    merged[key] = value;
+  }
+  return { merged, overrides };
+}
+
 // src/services/jira/commands.ts
+var BUILTIN_ISSUE_FIELDS = /* @__PURE__ */ new Set(["summary", "description", "priority", "assignee", "labels", "parent"]);
+function splitFieldsDictionary(fields, fieldMap) {
+  const builtin = {};
+  const custom = {};
+  for (const [rawKey, rawValue] of Object.entries(fields)) {
+    const value = resolveAtFileRef(rawValue);
+    const key = rawKey.toLowerCase();
+    if (BUILTIN_ISSUE_FIELDS.has(key)) {
+      builtin[key] = value;
+      continue;
+    }
+    const def = fieldMap.byName.get(key) ?? fieldMap.byId.get(rawKey);
+    if (def) {
+      custom[def.id] = value;
+    } else if (!/\s/.test(rawKey)) {
+      custom[rawKey] = value;
+    } else {
+      throw new PncliError(
+        `Unknown custom field: "${rawKey}". Fields must be registered in config by friendly name or ID. Run: pncli jira fields`,
+        1
+      );
+    }
+  }
+  return { builtin, custom };
+}
+function normalizeLabels(value) {
+  if (value === void 0) return void 0;
+  if (Array.isArray(value)) return value.map((v) => String(v).trim());
+  return String(value).split(",").map((s) => s.trim()).filter(Boolean);
+}
 function getClient(program2) {
   const opts = program2.optsWithGlobals();
   const config = loadConfig({ configPath: opts.config });
@@ -1247,7 +1372,7 @@ 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 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) => {
+  jira.command("create-issue").description("Create a Jira issue").option("--project <key>", "Project key").option("--type <type>", "Issue type (Bug, Story, Task, ...)").option("--summary <text>", "Issue summary (required, unless supplied via --input-file)").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").option("--input-file <path>", "JSON file describing the whole issue ({ project, issueType, fields: {...} }); '-' = stdin. CLI flags override matching keys. See: pncli jira schema").action(async (opts) => {
     const start = Date.now();
     let fieldMap = buildFieldMap([]);
     try {
@@ -1255,35 +1380,87 @@ function registerJiraCommands(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 jsonInput = opts.inputFile ? readJsonInputFile(opts.inputFile) : void 0;
+      const { builtin: jsonBuiltin, custom: jsonCustom } = jsonInput?.fields ? splitFieldsDictionary(jsonInput.fields, fieldMap) : { builtin: {}, custom: {} };
+      const project = opts.project ?? jsonInput?.project ?? defaults.project;
+      const issueType = opts.type ?? jsonInput?.issueType ?? defaults.issueType ?? "Task";
+      if (!project) throw new PncliError('--project required (or set defaults.jira.project in config, or "project" in --input-file)', 1);
+      const flagBuiltin = {
+        ...opts.summary !== void 0 ? { summary: opts.summary } : {},
+        ...opts.description !== void 0 ? { description: opts.description } : {},
+        ...opts.priority !== void 0 ? { priority: opts.priority } : {},
+        ...opts.assignee !== void 0 ? { assignee: opts.assignee } : {},
+        ...opts.labels !== void 0 ? { labels: opts.labels } : {},
+        ...opts.parent !== void 0 ? { parent: opts.parent } : {}
+      };
+      const { merged: builtinFields, overrides: builtinOverrides } = mergeWithOverrides(jsonBuiltin, flagBuiltin);
+      const summary = builtinFields.summary;
+      if (!summary) throw new PncliError('Must specify --summary or "fields.summary" in --input-file', 1);
+      const priority = builtinFields.priority ?? defaults.priority;
       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);
+      const flagCustom = { ...fileFields, ...parseFieldArgs(opts.field, fieldMap) };
+      const { merged: customFieldValues, overrides: customOverrides } = mergeWithOverrides(jsonCustom, flagCustom);
+      const overrides = [...builtinOverrides, ...customOverrides];
+      if (overrides.length) warn(`--input-file value(s) overridden by CLI flags: ${overrides.join(", ")}`);
+      const data = await client.createIssue({
+        project,
+        issueType,
+        summary,
+        description: builtinFields.description,
+        priority,
+        assignee: builtinFields.assignee,
+        labels: normalizeLabels(builtinFields.labels),
+        parent: builtinFields.parent,
+        customFieldValues
+      });
+      success(data, "jira", "create-issue", start, overrides);
     } catch (err) {
       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; 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) => {
+  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").option("--input-file <path>", "JSON file describing fields to update ({ fields: {...} }); '-' = stdin. CLI flags override matching keys. See: pncli jira schema").action(async (opts) => {
     const start = Date.now();
     let fieldMap = buildFieldMap([]);
     try {
       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 jsonInput = opts.inputFile ? readJsonInputFile(opts.inputFile) : void 0;
+      const { builtin: jsonBuiltin, custom: jsonCustom } = jsonInput?.fields ? splitFieldsDictionary(jsonInput.fields, fieldMap) : { builtin: {}, custom: {} };
+      const flagBuiltin = {
+        ...opts.summary !== void 0 ? { summary: opts.summary } : {},
+        ...opts.description !== void 0 ? { description: opts.description } : {},
+        ...opts.priority !== void 0 ? { priority: opts.priority } : {},
+        ...opts.assignee !== void 0 ? { assignee: opts.assignee } : {},
+        ...opts.labels !== void 0 ? { labels: opts.labels } : {}
+      };
+      const { merged: builtinFields, overrides: builtinOverrides } = mergeWithOverrides(jsonBuiltin, flagBuiltin);
       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);
+      const flagCustom = { ...fileFields, ...parseFieldArgs(opts.field, fieldMap) };
+      const { merged: customFieldValues, overrides: customOverrides } = mergeWithOverrides(jsonCustom, flagCustom);
+      const overrides = [...builtinOverrides, ...customOverrides];
+      if (overrides.length) warn(`--input-file value(s) overridden by CLI flags: ${overrides.join(", ")}`);
+      await client.updateIssue(opts.key, {
+        summary: builtinFields.summary,
+        description: builtinFields.description,
+        priority: builtinFields.priority,
+        assignee: builtinFields.assignee,
+        labels: normalizeLabels(builtinFields.labels),
+        customFieldValues
+      });
+      success({ updated: opts.key }, "jira", "update-issue", start, overrides);
     } catch (err) {
       fail(translateFieldErrors(err, fieldMap), "jira", "update-issue", start);
     }
   });
+  jira.command("schema").description("Print the --input-file JSON schema and an example for create-issue/update-issue").option("--example-only", "Print only the runnable example JSON (no envelope) \u2014 pipeable straight into --input-file").action((opts) => {
+    const start = Date.now();
+    if (opts.exampleOnly) {
+      writeRawOutput(JSON.stringify(JIRA_INPUT_FILE_EXAMPLE, null, 2) + "\n");
+      return;
+    }
+    success({ schema: JIRA_INPUT_FILE_SCHEMA, example: JIRA_INPUT_FILE_EXAMPLE }, "jira", "schema", 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) => {
     const start = Date.now();
     try {
@@ -1492,7 +1669,7 @@ function parseFieldArgs(fieldArgs, fieldMap) {
       const filePath = value.slice(1);
       let raw;
       try {
-        raw = readFileSync2(filePath, "utf8").trim();
+        raw = readFileSync3(filePath, "utf8").trim();
       } catch (e) {
         throw new PncliError(`Cannot read file "${filePath}": ${e.message}`, 1);
       }
@@ -1510,7 +1687,7 @@ function parseFieldArgs(fieldArgs, fieldMap) {
 function parseFieldsFile(filePath, fieldMap) {
   let raw;
   try {
-    raw = readFileSync2(filePath, "utf8");
+    raw = readFileSync3(filePath, "utf8");
   } catch (e) {
     throw new PncliError(`Cannot read fields file "${filePath}": ${e.message}`, 1);
   }
@@ -1563,6 +1740,24 @@ function getClient2(program2, overrides) {
 }
 function registerBitbucketCommands(program2) {
   const bb = program2.command("bitbucket").description("Bitbucket Server operations").option("--project <key>", "Bitbucket project key").option("--repo <slug>", "Bitbucket repository slug");
+  bb.command("create-repo").description("Create a new repository in a project").requiredOption("--name <name>", "Repository name (slug)").option("--description <desc>", "Repository description").option("--project <key>", "Bitbucket project key (overrides parent --project)").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const globalOpts = bb.optsWithGlobals();
+      const config = loadConfig({ configPath: globalOpts.config });
+      const http = createHttpClient(config, Boolean(globalOpts.dryRun));
+      const client = new BitbucketClient(http);
+      const ctx = getGitContext(config);
+      const project = opts.project ?? globalOpts.project ?? ctx?.project ?? config.defaults.bitbucket?.project ?? "";
+      if (!project) {
+        throw new PncliError("Could not determine Bitbucket project. Pass --project, or run pncli config init.", 1);
+      }
+      const data = await client.createRepo({ project, name: opts.name, description: opts.description });
+      success(data, "bitbucket", "create-repo", start);
+    } catch (err) {
+      fail(err, "bitbucket", "create-repo", start);
+    }
+  });
   bb.command("list-prs").description("List pull requests").option("--state <state>", "PR state: OPEN|MERGED|DECLINED|ALL", "OPEN").option("--author <username>", "Filter by author username").option("--reviewer <username>", "Filter by reviewer username").action(async (opts) => {
     const start = Date.now();
     try {
@@ -1965,6 +2160,32 @@ var GitHubClient = class {
     }
     return results;
   }
+  async createIssue(opts) {
+    return this.http.github(
+      `/repos/${opts.owner}/${opts.repo}/issues`,
+      {
+        method: "POST",
+        body: {
+          title: opts.title,
+          ...opts.body !== void 0 ? { body: opts.body } : {},
+          ...opts.labels?.length ? { labels: opts.labels } : {},
+          ...opts.assignees?.length ? { assignees: opts.assignees } : {}
+        }
+      }
+    );
+  }
+  async createRepo(opts) {
+    const path8 = opts.org ? `/orgs/${opts.org}/repos` : "/user/repos";
+    return this.http.github(path8, {
+      method: "POST",
+      body: {
+        name: opts.name,
+        ...opts.description !== void 0 ? { description: opts.description } : {},
+        ...opts.private !== void 0 ? { private: opts.private } : {},
+        ...opts.autoInit !== void 0 ? { auto_init: opts.autoInit } : {}
+      }
+    });
+  }
 };
 
 // src/services/github/commands.ts
@@ -1986,6 +2207,50 @@ function getClient3(program2, overrides) {
 }
 function registerGitHubCommands(program2) {
   const gh = program2.command("github").description("GitHub repository operations").option("--owner <owner>", "GitHub owner (user or org)").option("--repo <repo>", "GitHub repository name");
+  gh.command("create-repo").description("Create a new repository (personal or org)").requiredOption("--name <name>", "Repository name").option("--description <desc>", "Repository description").option("--private", "Create as a private repository").option("--auto-init", "Initialize with a README").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const globalOpts = gh.optsWithGlobals();
+      const config = loadConfig({ configPath: globalOpts.config });
+      const http = createHttpClient(config, Boolean(globalOpts.dryRun));
+      const client = new GitHubClient(http);
+      const owner = globalOpts.owner ?? "";
+      const data = await client.createRepo({
+        org: owner || void 0,
+        name: opts.name,
+        description: opts.description,
+        private: opts.private,
+        autoInit: opts.autoInit
+      });
+      success(data, "github", "create-repo", start);
+    } catch (err) {
+      fail(err, "github", "create-repo", start);
+    }
+  });
+  gh.command("create-issue").description("Create a GitHub issue").requiredOption("--title <title>", "Issue title").option("--body <body>", "Issue body (markdown)").option("--body-file <path>", "Read issue body from a file (use - for stdin); overridden by --body").option("--label <label>", "Label to apply (repeatable)", (v, acc) => {
+    acc.push(v);
+    return acc;
+  }, []).option("--assignee <login>", "Assignee login (repeatable)", (v, acc) => {
+    acc.push(v);
+    return acc;
+  }, []).action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { client, owner, repo } = getClient3(gh);
+      const body = opts.body ?? resolveTextInput(void 0, opts.bodyFile, "body");
+      const data = await client.createIssue({
+        owner,
+        repo,
+        title: opts.title,
+        body,
+        labels: opts.label.length ? opts.label : void 0,
+        assignees: opts.assignee.length ? opts.assignee : void 0
+      });
+      success(data, "github", "create-issue", start);
+    } catch (err) {
+      fail(err, "github", "create-issue", start);
+    }
+  });
   gh.command("list-prs").description("List pull requests").addOption(new Option("--state <state>", "PR state").choices(["open", "closed", "all"]).default("open")).option("--head <branch>", "Filter by head branch (user:branch)").option("--base <branch>", "Filter by base branch").action(async (opts) => {
     const start = Date.now();
     try {
@@ -2012,18 +2277,19 @@ function registerGitHubCommands(program2) {
       fail(err, "github", "get-pr", start);
     }
   });
-  gh.command("create-pr").description("Create a pull request").requiredOption("--title <title>", "PR title").requiredOption("--head <branch>", "Source branch (or user:branch for forks)").option("--base <branch>", "Target branch (defaults to config or main)").option("--body <body>", "PR description").option("--draft", "Create as draft PR").option("--owner <owner>", "GitHub owner (overrides parent --owner)").option("--repo <repo>", "GitHub repository name (overrides parent --repo)").action(async (opts) => {
+  gh.command("create-pr").description("Create a pull request").requiredOption("--title <title>", "PR title").requiredOption("--head <branch>", "Source branch (or user:branch for forks)").option("--base <branch>", "Target branch (defaults to config or main)").option("--body <body>", "PR description").option("--body-file <path>", "Read PR description from a file (use - for stdin); overridden by --body").option("--draft", "Create as draft PR").option("--owner <owner>", "GitHub owner (overrides parent --owner)").option("--repo <repo>", "GitHub repository name (overrides parent --repo)").action(async (opts) => {
     const start = Date.now();
     try {
       const { client, owner, repo, config } = getClient3(gh, { owner: opts.owner, repo: opts.repo });
       const base = opts.base ?? config.defaults.github?.targetBranch ?? "main";
+      const body = opts.body ?? resolveTextInput(void 0, opts.bodyFile, "body");
       const data = await client.createPR({
         owner,
         repo,
         title: opts.title,
         head: opts.head,
         base,
-        body: opts.body,
+        body,
         draft: opts.draft
       });
       success(data, "github", "create-pr", start);
@@ -2248,7 +2514,12 @@ function registerGitHubCommands(program2) {
   });
 }
 
+// src/services/confluence/commands.ts
+import { existsSync as existsSync2 } from "fs";
+
 // src/services/confluence/client.ts
+import { readFileSync as readFileSync4 } from "fs";
+import { basename as basename2 } from "path";
 var API3 = "/rest/api";
 var ConfluenceClient = class {
   constructor(http) {
@@ -2393,9 +2664,52 @@ var ConfluenceClient = class {
       });
     });
   }
+  async uploadAttachment(pageId, filePath, comment) {
+    const fileContent = readFileSync4(filePath);
+    const fileName = basename2(filePath);
+    const mimeType = guessMimeType(filePath);
+    const formData = new FormData();
+    formData.append("file", new Blob([fileContent], { type: mimeType }), fileName);
+    if (comment) formData.append("comment", comment);
+    const result = await this.http.confluenceUpload(
+      `${API3}/content/${pageId}/child/attachment`,
+      formData
+    );
+    return result.results;
+  }
+  async deleteAttachment(attachmentId) {
+    return this.http.confluence(`${API3}/content/${attachmentId}`, { method: "DELETE" });
+  }
+  async getPageHistory(id) {
+    return this.http.confluence(`${API3}/content/${id}/history`);
+  }
+  async convertToStorage(value, fromRepresentation = "markdown") {
+    const result = await this.http.confluence(
+      `${API3}/contentbody/convert/storage`,
+      {
+        method: "POST",
+        body: { value, representation: fromRepresentation }
+      }
+    );
+    return result.value;
+  }
 };
 
 // src/services/confluence/commands.ts
+function xmlParseHint(err, bodyContent, convertedFromMarkdown = false) {
+  if (!(err instanceof Error)) return null;
+  const m = err.message.match(/at \[row,col\]=\{(\d+),(\d+)\}/);
+  if (!m) return null;
+  const row = parseInt(m[1], 10);
+  const col = parseInt(m[2], 10);
+  const lines = bodyContent.split("\n");
+  const line = lines[row - 1];
+  if (!line) return null;
+  const pointer = " ".repeat(Math.max(0, col - 1)) + "^";
+  const suffix = convertedFromMarkdown ? " (converted from Markdown)" : "";
+  return `Offending line ${row}${suffix}: ${line}
+${pointer}`;
+}
 function getClient4(program2) {
   const opts = program2.optsWithGlobals();
   const config = loadConfig({ configPath: opts.config });
@@ -2473,38 +2787,67 @@ function registerConfluenceCommands(program2) {
       fail(err, "confluence", "search", start);
     }
   });
-  confluence.command("create-page").description("Create a new Confluence page").requiredOption("--space <key>", "Space key").requiredOption("--title <title>", "Page title").requiredOption("--body <html>", "Page body (storage format HTML)").option("--parent-id <id>", "Parent page ID (to nest under a page)").option("--representation <format>", "Body format: storage (default) or wiki", "storage").action(async (opts) => {
+  confluence.command("create-page").description("Create a new Confluence page").requiredOption("--space <key>", "Space key").requiredOption("--title <title>", "Page title").option("--body <html>", "Page body (storage format HTML or Markdown when --markdown is set)").option("--body-file <path>", "Path to a file containing the page body ('-' = stdin)").option("--markdown", "Convert body from Markdown to storage format via Confluence API").option("--parent-id <id>", "Parent page ID (to nest under a page)").option("--representation <format>", "Body format: storage (default) or wiki", "storage").action(async (opts) => {
     const start = Date.now();
+    let bodyContent;
     try {
       const client = getClient4(program2);
+      const rawBody = resolveTextInput(opts.body, opts.bodyFile, "body");
+      if (rawBody === void 0) throw new PncliError("Must specify --body or --body-file", 1);
+      bodyContent = opts.markdown ? await client.convertToStorage(rawBody) : rawBody;
+      const representation = opts.markdown ? "storage" : opts.representation;
       const data = await client.createPage({
         spaceKey: opts.space,
         title: opts.title,
-        body: opts.body,
+        body: bodyContent,
         parentId: opts.parentId,
-        representation: opts.representation
+        representation
       });
       success(data, "confluence", "create-page", start);
     } catch (err) {
-      fail(err, "confluence", "create-page", start);
+      const hint = bodyContent ? xmlParseHint(err, bodyContent, Boolean(opts.markdown)) : null;
+      if (hint) {
+        const msg = err instanceof Error ? err.message : String(err);
+        const status = err instanceof PncliError ? err.status : 1;
+        const url = err instanceof PncliError ? err.url : void 0;
+        fail(new PncliError(`${msg}
+
+${hint}`, status, url), "confluence", "create-page", start);
+      } else {
+        fail(err, "confluence", "create-page", start);
+      }
     }
   });
-  confluence.command("update-page").description("Update a Confluence page (fetches current version automatically)").requiredOption("--id <page-id>", "Page ID").option("--title <title>", "New page title").option("--body <html>", "New page body (storage format HTML)").option("--status <status>", "Page status: current (default) or draft", "current").option("--representation <format>", "Body format: storage (default) or wiki", "storage").action(async (opts) => {
+  confluence.command("update-page").description("Update a Confluence page (fetches current version automatically)").requiredOption("--id <page-id>", "Page ID").option("--title <title>", "New page title").option("--body <html>", "New page body (storage format HTML or Markdown when --markdown is set)").option("--body-file <path>", "Path to a file containing the new page body ('-' = stdin)").option("--markdown", "Convert body from Markdown to storage format via Confluence API").option("--status <status>", "Page status: current (default) or draft", "current").option("--representation <format>", "Body format: storage (default) or wiki", "storage").action(async (opts) => {
     const start = Date.now();
+    let bodyContent;
     try {
       const client = getClient4(program2);
+      const rawBody = resolveTextInput(opts.body, opts.bodyFile, "body");
+      bodyContent = rawBody !== void 0 && opts.markdown ? await client.convertToStorage(rawBody) : rawBody;
+      const representation = bodyContent !== void 0 && opts.markdown ? "storage" : opts.representation;
       const current = await client.getPage(opts.id, "version");
       const nextVersion = current.version.number + 1;
       const data = await client.updatePage(opts.id, {
         version: nextVersion,
         title: opts.title ?? current.title,
-        body: opts.body,
+        body: bodyContent,
         status: opts.status,
-        representation: opts.representation
+        representation
       });
       success(data, "confluence", "update-page", start);
     } catch (err) {
-      fail(err, "confluence", "update-page", start);
+      const hint = bodyContent ? xmlParseHint(err, bodyContent, Boolean(opts.markdown)) : null;
+      if (hint) {
+        const msg = err instanceof Error ? err.message : String(err);
+        const status = err instanceof PncliError ? err.status : 1;
+        const url = err instanceof PncliError ? err.url : void 0;
+        fail(new PncliError(`${msg}
+
+${hint}`, status, url), "confluence", "update-page", start);
+      } else {
+        fail(err, "confluence", "update-page", start);
+      }
     }
   });
   confluence.command("delete-page").description("Delete a Confluence page").requiredOption("--id <page-id>", "Page ID").action(async (opts) => {
@@ -2591,6 +2934,37 @@ function registerConfluenceCommands(program2) {
       fail(err, "confluence", "list-attachments", start);
     }
   });
+  confluence.command("upload-attachment").description("Upload a file as an attachment to a Confluence page").requiredOption("--id <page-id>", "Page ID").requiredOption("--file <path>", "Path to the file to upload").option("--comment <text>", "Optional comment to attach to the file version").action(async (opts) => {
+    const start = Date.now();
+    try {
+      if (!existsSync2(opts.file)) throw new PncliError(`File not found: ${opts.file}`, 1);
+      const client = getClient4(program2);
+      const data = await client.uploadAttachment(opts.id, opts.file, opts.comment);
+      success(data, "confluence", "upload-attachment", start);
+    } catch (err) {
+      fail(err, "confluence", "upload-attachment", start);
+    }
+  });
+  confluence.command("delete-attachment").description("Delete an attachment from Confluence by its content ID (moves it to the trash; does not permanently purge it)").requiredOption("--id <attachment-id>", "Attachment content ID").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const client = getClient4(program2);
+      await client.deleteAttachment(opts.id);
+      success({ deleted: opts.id }, "confluence", "delete-attachment", start);
+    } catch (err) {
+      fail(err, "confluence", "delete-attachment", start);
+    }
+  });
+  confluence.command("get-page-history").description("Get the version history metadata for a Confluence page").requiredOption("--id <page-id>", "Page ID").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const client = getClient4(program2);
+      const data = await client.getPageHistory(opts.id);
+      success(data, "confluence", "get-page-history", start);
+    } catch (err) {
+      fail(err, "confluence", "get-page-history", start);
+    }
+  });
 }
 
 // src/services/sonar/client.ts
@@ -4909,8 +5283,8 @@ import password from "@inquirer/password";
 import confirm from "@inquirer/confirm";
 
 // src/services/ado/client/work.ts
-import { readFileSync as readFileSync3 } from "fs";
-import { basename as basename2 } from "path";
+import { readFileSync as readFileSync5 } from "fs";
+import { basename as basename3 } from "path";
 var API6 = "7.1";
 var API_PREVIEW = "7.1-preview.4";
 var AdoWorkClient = class {
@@ -5025,8 +5399,8 @@ var AdoWorkClient = class {
     );
   }
   async uploadAttachment(collection, workItemId, filePath, comment) {
-    const fileContent = readFileSync3(filePath);
-    const fileName = basename2(filePath);
+    const fileContent = readFileSync5(filePath);
+    const fileName = basename3(filePath);
     const attachment = await this.http.adoUpload(
       `/${encodeURIComponent(collection)}/_apis/wit/attachments?fileName=${encodeURIComponent(fileName)}&api-version=${API6}`,
       fileContent,
@@ -5077,32 +5451,32 @@ async function discoverTypes(client, collection, project) {
   }
   return result;
 }
+var ADO_FIELD_ALIAS_CANDIDATES = [
+  ["title", "System.Title"],
+  ["state", "System.State"],
+  ["assignedto", "System.AssignedTo"],
+  ["assigned-to", "System.AssignedTo"],
+  ["description", "System.Description"],
+  ["areapath", "System.AreaPath"],
+  ["area-path", "System.AreaPath"],
+  ["iterationpath", "System.IterationPath"],
+  ["iteration", "System.IterationPath"],
+  ["tags", "System.Tags"],
+  ["priority", "Microsoft.VSTS.Common.Priority"],
+  ["severity", "Microsoft.VSTS.Common.Severity"],
+  ["effort", "Microsoft.VSTS.Scheduling.Effort"],
+  ["storypoints", "Microsoft.VSTS.Scheduling.StoryPoints"],
+  ["story-points", "Microsoft.VSTS.Scheduling.StoryPoints"],
+  ["remainingwork", "Microsoft.VSTS.Scheduling.RemainingWork"],
+  ["remaining", "Microsoft.VSTS.Scheduling.RemainingWork"],
+  ["acceptancecriteria", "Microsoft.VSTS.Common.AcceptanceCriteria"],
+  ["reprosteps", "Microsoft.VSTS.TCM.ReproSteps"],
+  ["foundinsource", "Microsoft.VSTS.Build.FoundIn"]
+];
 function buildDefaultAliases(fields) {
   const refNames = new Set(fields.map((f) => f.referenceName));
-  const candidates = [
-    ["title", "System.Title"],
-    ["state", "System.State"],
-    ["assignedto", "System.AssignedTo"],
-    ["assigned-to", "System.AssignedTo"],
-    ["description", "System.Description"],
-    ["areapath", "System.AreaPath"],
-    ["area-path", "System.AreaPath"],
-    ["iterationpath", "System.IterationPath"],
-    ["iteration", "System.IterationPath"],
-    ["tags", "System.Tags"],
-    ["priority", "Microsoft.VSTS.Common.Priority"],
-    ["severity", "Microsoft.VSTS.Common.Severity"],
-    ["effort", "Microsoft.VSTS.Scheduling.Effort"],
-    ["storypoints", "Microsoft.VSTS.Scheduling.StoryPoints"],
-    ["story-points", "Microsoft.VSTS.Scheduling.StoryPoints"],
-    ["remainingwork", "Microsoft.VSTS.Scheduling.RemainingWork"],
-    ["remaining", "Microsoft.VSTS.Scheduling.RemainingWork"],
-    ["acceptancecriteria", "Microsoft.VSTS.Common.AcceptanceCriteria"],
-    ["reprosteps", "Microsoft.VSTS.TCM.ReproSteps"],
-    ["foundinsource", "Microsoft.VSTS.Build.FoundIn"]
-  ];
   const aliases = {};
-  for (const [alias, ref] of candidates) {
+  for (const [alias, ref] of ADO_FIELD_ALIAS_CANDIDATES) {
     if (refNames.has(ref)) {
       aliases[alias] = ref;
     }
@@ -5265,9 +5639,9 @@ function registerConfigCommands(program2) {
       } else {
         results.udeploy = { ok: null, message: "not configured" };
       }
-      if (cfg.checkmarx.baseUrl && cfg.checkmarx.username && cfg.checkmarx.password) {
+      if (cfg.checkmarx.baseUrl && cfg.checkmarx.tenantName && (cfg.checkmarx.apiKey || cfg.checkmarx.clientId && cfg.checkmarx.clientSecret)) {
         try {
-          await http.checkmarx("/cxrestapi/projects");
+          await http.checkmarx("/api/projects", { params: { limit: 1 } });
           results.checkmarx = { ok: true, message: "connected" };
         } catch (err) {
           results.checkmarx = { ok: false, message: err instanceof Error ? err.message : String(err) };
@@ -5316,6 +5690,37 @@ function registerConfigCommands(program2) {
       } else {
         results.openshift = { ok: null, message: "not configured" };
       }
+      if (cfg.dynatrace.baseUrl && cfg.dynatrace.apiToken) {
+        try {
+          await http.dynatrace("/api/v2/entities", {
+            params: { entitySelector: 'type("SERVICE")', pageSize: 1 }
+          });
+          results.dynatrace = { ok: true, message: "connected" };
+        } catch (err) {
+          results.dynatrace = { ok: false, message: err instanceof Error ? err.message : String(err) };
+        }
+      } else {
+        results.dynatrace = { ok: null, message: "not configured" };
+      }
+      if (cfg.dynatrace.platformUrl && cfg.dynatrace.platformToken) {
+        try {
+          await http.dynatracePlatform("/platform/storage/query/v1/query:execute", {
+            method: "POST",
+            body: {
+              query: "fetch spans | limit 1",
+              requestTimeoutMilliseconds: 5e3
+            },
+            timeoutMs: 1e4
+          });
+          results.dynatrace_platform = { ok: true, message: "connected" };
+        } catch (err) {
+          results.dynatrace_platform = { ok: false, message: err instanceof Error ? err.message : String(err) };
+        }
+      } else if (cfg.dynatrace.platformUrl || cfg.dynatrace.platformToken) {
+        results.dynatrace_platform = { ok: false, message: "platformUrl and platformToken must both be configured" };
+      } else {
+        results.dynatrace_platform = { ok: null, message: "not configured" };
+      }
       success(results, "config", "test", start);
     } catch (err) {
       fail(err, "config", "test", start);
@@ -5462,13 +5867,13 @@ function registerConfigCommands(program2) {
       } else {
         results.artifactory = { status: "valid", message: "ok" };
       }
-      if (!cfg.checkmarx.username || !cfg.checkmarx.password) {
+      if (!cfg.checkmarx.tenantName || !cfg.checkmarx.apiKey && (!cfg.checkmarx.clientId || !cfg.checkmarx.clientSecret)) {
         results.checkmarx = { status: "blank", message: "not configured" };
       } else if (!cfg.checkmarx.baseUrl) {
         results.checkmarx = { status: "error", message: "baseUrl not configured" };
       } else {
         try {
-          await http.checkmarx("/cxrestapi/projects", { timeoutMs: 1e4 });
+          await http.checkmarx("/api/projects", { params: { limit: 1 }, timeoutMs: 1e4 });
           results.checkmarx = { status: "valid", message: "ok" };
         } catch (err) {
           results.checkmarx = categorize2(err);
@@ -5523,11 +5928,48 @@ function registerConfigCommands(program2) {
           results.openshift = categorize2(err);
         }
       }
+      if (!cfg.dynatrace.apiToken) {
+        results.dynatrace = { status: "blank", message: "not configured" };
+      } else if (!cfg.dynatrace.baseUrl) {
+        results.dynatrace = { status: "error", message: "baseUrl not configured" };
+      } else {
+        try {
+          await http.dynatrace("/api/v2/entities", {
+            params: { entitySelector: 'type("SERVICE")', pageSize: 1 },
+            timeoutMs: 1e4
+          });
+          results.dynatrace = { status: "valid", message: "ok" };
+        } catch (err) {
+          results.dynatrace = categorize2(err);
+        }
+      }
+      if (!cfg.dynatrace.platformUrl && !cfg.dynatrace.platformToken) {
+        results.dynatrace_platform = { status: "blank", message: "not configured" };
+      } else if (!cfg.dynatrace.platformUrl || !cfg.dynatrace.platformToken) {
+        results.dynatrace_platform = {
+          status: "error",
+          message: "platformUrl and platformToken must both be configured"
+        };
+      } else {
+        try {
+          await http.dynatracePlatform("/platform/storage/query/v1/query:execute", {
+            method: "POST",
+            body: {
+              query: "fetch spans | limit 1",
+              requestTimeoutMilliseconds: 5e3
+            },
+            timeoutMs: 1e4
+          });
+          results.dynatrace_platform = { status: "valid", message: "ok" };
+        } catch (err) {
+          results.dynatrace_platform = categorize2(err);
+        }
+      }
       const statuses = Object.values(results).map((r) => r.status);
       if (statuses.includes("invalid")) process.exitCode = ExitCode.AUTH_ERROR;
       else if (statuses.includes("error")) process.exitCode = ExitCode.NETWORK_ERROR;
       if (cmdOpts.output === "table") {
-        const services = ["jira", "bitbucket", "github", "confluence", "sonar", "sde", "ado", "jenkins", "udeploy", "artifactory", "checkmarx", "servicenow", "contrast", "sonatypeiq", "openshift"];
+        const services = ["jira", "bitbucket", "github", "confluence", "sonar", "sde", "ado", "jenkins", "udeploy", "artifactory", "checkmarx", "servicenow", "contrast", "sonatypeiq", "openshift", "dynatrace", "dynatrace_platform"];
         const labelWidth = 14;
         const statusWidth = 9;
         for (const svc of services) {
@@ -5541,7 +5983,7 @@ function registerConfigCommands(program2) {
         process.stdout.write("\n");
       } else {
         if (opts.pretty) {
-          const services = ["jira", "bitbucket", "github", "confluence", "sonar", "sde", "ado", "jenkins", "udeploy", "artifactory", "checkmarx", "servicenow", "contrast", "sonatypeiq", "openshift"];
+          const services = ["jira", "bitbucket", "github", "confluence", "sonar", "sde", "ado", "jenkins", "udeploy", "artifactory", "checkmarx", "servicenow", "contrast", "sonatypeiq", "openshift", "dynatrace", "dynatrace_platform"];
           const labelWidth = 14;
           const statusWidth = 9;
           for (const svc of services) {
@@ -5874,38 +6316,51 @@ async function initGlobalConfig(start) {
   }
   process.stderr.write("\n\u2500\u2500 Checkmarx \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 useCheckmarx = await confirm({
-    message: "Configure Checkmarx CxSAST for vulnerability scanning?",
+    message: "Configure Checkmarx One for vulnerability scanning?",
     default: false
   });
   let checkmarxBaseUrl = "";
-  let checkmarxUsername = "";
-  let checkmarxPassword = "";
+  let checkmarxTenantName = "";
+  let checkmarxApiKey = "";
+  let checkmarxClientId = "";
+  let checkmarxClientSecret = "";
   if (useCheckmarx) {
     checkmarxBaseUrl = await input({
-      message: "Checkmarx base URL (e.g. cx.company.com):",
+      message: "Checkmarx One API base URL (e.g. https://ast.checkmarx.net):",
       default: ""
     });
-    checkmarxUsername = await input({
-      message: "Checkmarx username:",
+    checkmarxTenantName = await input({
+      message: "Checkmarx One tenant name (IAM realm, e.g. mycompany):",
       default: ""
     });
-    checkmarxPassword = await password({
-      message: "Checkmarx password:",
-      validate: (v) => v.length > 0 || "Password cannot be blank"
+    checkmarxApiKey = await password({
+      message: "Checkmarx One API key (leave blank to use an OAuth client):"
     });
-    if (checkmarxBaseUrl && checkmarxUsername && checkmarxPassword) {
+    if (!checkmarxApiKey) {
+      checkmarxClientId = await input({
+        message: "Checkmarx One OAuth client ID:",
+        default: ""
+      });
+      checkmarxClientSecret = await password({
+        message: "Checkmarx One OAuth client secret:",
+        validate: (v) => v.length > 0 || "Client secret cannot be blank"
+      });
+    }
+    if (checkmarxBaseUrl && checkmarxTenantName && (checkmarxApiKey || checkmarxClientId && checkmarxClientSecret)) {
       process.stderr.write("\n  Verifying connection...\n");
       try {
         const tempConfig = {
           ...loadConfig(),
           checkmarx: {
             baseUrl: normalizeBaseUrl(checkmarxBaseUrl),
-            username: checkmarxUsername,
-            password: checkmarxPassword
+            tenantName: checkmarxTenantName,
+            apiKey: checkmarxApiKey || void 0,
+            clientId: checkmarxClientId,
+            clientSecret: checkmarxClientSecret
           }
         };
         const tempHttp = createHttpClient(tempConfig);
-        await tempHttp.checkmarx("/cxrestapi/projects");
+        await tempHttp.checkmarx("/api/projects", { params: { limit: 1 } });
         process.stderr.write("  Connected.\n");
       } catch (err) {
         warn(`Could not connect to Checkmarx: ${err instanceof Error ? err.message : String(err)}`);
@@ -6098,6 +6553,59 @@ async function initGlobalConfig(start) {
       }
     }
   }
+  process.stderr.write("\n\u2500\u2500 Dynatrace \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 useDynatrace = await confirm({
+    message: "Configure Dynatrace for services, problems, workloads, and traces?",
+    default: false
+  });
+  let dynatraceBaseUrl = "";
+  let dynatraceApiToken = "";
+  let dynatracePlatformUrl = "";
+  let dynatracePlatformToken = "";
+  if (useDynatrace) {
+    dynatraceBaseUrl = await input({
+      message: "Dynatrace environment URL (e.g. https://abc12345.live.dynatrace.com):",
+      default: ""
+    });
+    dynatraceApiToken = await password({
+      message: "Environment API token (entities.read and problems.read):"
+    });
+    const configureTraces = await confirm({
+      message: "Configure the latest Dynatrace platform for Grail trace queries?",
+      default: false
+    });
+    if (configureTraces) {
+      dynatracePlatformUrl = await input({
+        message: "Dynatrace platform URL (e.g. https://abc12345.apps.dynatrace.com):",
+        default: ""
+      });
+      dynatracePlatformToken = await password({
+        message: "Platform token with Grail span read permissions:"
+      });
+    }
+    if (dynatraceBaseUrl && dynatraceApiToken) {
+      process.stderr.write("\n  Verifying connection...\n");
+      try {
+        const tempConfig = {
+          ...loadConfig(),
+          dynatrace: {
+            baseUrl: normalizeBaseUrl(dynatraceBaseUrl),
+            apiToken: dynatraceApiToken,
+            platformUrl: normalizeBaseUrl(dynatracePlatformUrl) || void 0,
+            platformToken: dynatracePlatformToken || void 0
+          }
+        };
+        const tempHttp = createHttpClient(tempConfig);
+        await tempHttp.dynatrace("/api/v2/entities", {
+          params: { entitySelector: 'type("SERVICE")', pageSize: 1 }
+        });
+        process.stderr.write("  Connected.\n");
+      } catch (err) {
+        warn(`Could not connect to Dynatrace: ${err instanceof Error ? err.message : String(err)}`);
+        warn("Config will be saved anyway. Check your URLs and tokens and re-run pncli config test.");
+      }
+    }
+  }
   process.stderr.write("\n\u2500\u2500 Defaults \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 jiraProject = await input({
     message: "Default Jira project key (optional):",
@@ -6193,8 +6701,10 @@ async function initGlobalConfig(start) {
     ...useCheckmarx && checkmarxBaseUrl ? {
       checkmarx: {
         baseUrl: normalizeBaseUrl(checkmarxBaseUrl),
-        username: checkmarxUsername || void 0,
-        password: checkmarxPassword || void 0
+        tenantName: checkmarxTenantName || void 0,
+        apiKey: checkmarxApiKey || void 0,
+        clientId: checkmarxClientId || void 0,
+        clientSecret: checkmarxClientSecret || void 0
       }
     } : {},
     ...useServiceNow && servicenowBaseUrl ? {
@@ -6227,6 +6737,14 @@ async function initGlobalConfig(start) {
         token: openShiftToken || void 0
       }
     } : {},
+    ...useDynatrace && dynatraceBaseUrl ? {
+      dynatrace: {
+        baseUrl: normalizeBaseUrl(dynatraceBaseUrl),
+        apiToken: dynatraceApiToken || void 0,
+        platformUrl: normalizeBaseUrl(dynatracePlatformUrl) || void 0,
+        platformToken: dynatracePlatformToken || void 0
+      }
+    } : {},
     defaults: {
       jira: {
         project: jiraProject || void 0
@@ -6350,6 +6868,12 @@ var AdoGitClient = class {
       `/${encodeURIComponent(collection)}/${encodeURIComponent(project)}/_apis/git/repositories/${encodeURIComponent(repoId)}?api-version=${API7}`
     );
   }
+  async createRepo(collection, project, name) {
+    return this.http.ado(
+      `/${encodeURIComponent(collection)}/${encodeURIComponent(project)}/_apis/git/repositories?api-version=${API7}`,
+      { method: "POST", body: { name } }
+    );
+  }
   // ── Pull Requests ─────────────────────────────────────────────────
   async listPRs(collection, project, repo, opts = {}) {
     return this.http.adoPaginate(async (token) => {
@@ -6604,14 +7128,34 @@ function parseFieldArgs2(fields) {
   }
   return result;
 }
+var stripSeparators = (s) => s.toLowerCase().replace(/[\s-]+/g, "");
+var DEFAULT_ADO_FIELD_ALIASES = Object.fromEntries(ADO_FIELD_ALIAS_CANDIDATES);
 function buildFieldPatch(fields, fieldAliases) {
+  const aliases = { ...DEFAULT_ADO_FIELD_ALIASES, ...fieldAliases };
   return Object.entries(fields).map(([key, value]) => {
-    const refName = fieldAliases[key.toLowerCase()] ?? fieldAliases[key] ?? key;
-    return { op: "add", path: `/fields/${refName}`, value };
-  });
-}
-function fieldArgsToPatch(fieldArgs, fieldAliases) {
-  return buildFieldPatch(parseFieldArgs2(fieldArgs), fieldAliases);
+    let refName = aliases[key.toLowerCase()] ?? aliases[key];
+    if (!refName) {
+      const target = stripSeparators(key);
+      const match = Object.entries(aliases).find(([aliasKey]) => stripSeparators(aliasKey) === target);
+      refName = match?.[1];
+    }
+    return { op: "add", path: `/fields/${refName ?? key}`, value };
+  });
+}
+var BUILTIN_WORK_FIELD_KEYS = /* @__PURE__ */ new Set(["title", "description", "assignee", "assignedto", "priority"]);
+function splitWorkFieldsDictionary(fields) {
+  const builtin = {};
+  const custom = {};
+  for (const [rawKey, rawValue] of Object.entries(fields)) {
+    const value = resolveAtFileRef(rawValue);
+    const key = rawKey.toLowerCase().replace(/\s+/g, "");
+    if (BUILTIN_WORK_FIELD_KEYS.has(key)) {
+      builtin[key === "assignedto" ? "assignee" : key] = value;
+    } else {
+      custom[rawKey] = value;
+    }
+  }
+  return { builtin, custom };
 }
 var PR_VOTE = {
   APPROVE: 10,
@@ -6679,6 +7223,35 @@ function registerAdoProjectCommands(ado) {
 // src/services/ado/commands/work.ts
 import fs3 from "fs";
 import path6 from "path";
+
+// src/services/ado/input-schema.ts
+var ADO_WORK_INPUT_FILE_SCHEMA = {
+  $schema: "https://json-schema.org/draft/2020-12/schema",
+  title: "pncli Azure DevOps work item input file",
+  description: "Shape accepted by --input-file on `pncli ado work create` / `work update`. CLI flags (--title, --description, --priority, --field, ...) override matching keys here; overridden keys are reported in meta.overrides.",
+  type: "object",
+  properties: {
+    type: { type: "string", description: "Work item type, e.g. Bug, Task, User Story (create only)" },
+    fields: {
+      type: "object",
+      description: 'Field dictionary. Built-in keys (case-insensitive): title, description, assignee, priority. Any other key (e.g. "Acceptance Criteria", or a raw reference name like "Microsoft.VSTS.Common.AcceptanceCriteria" or a custom "MyOrg.SomeField") resolves through the fieldAliases saved by `pncli ado work fields --save`, falling back to the key itself \u2014 custom fields never need to be pre-registered to be usable here. Any string value may be "@path/to/file" to read that field\'s content from a file instead of inlining it (useful for large rich-text fields like Description or Acceptance Criteria).',
+      additionalProperties: true
+    }
+  },
+  additionalProperties: false
+};
+var ADO_WORK_INPUT_FILE_EXAMPLE = {
+  type: "Bug",
+  fields: {
+    Title: "Login broken on Safari",
+    Description: "@desc.html",
+    "Acceptance Criteria": "@ac.md",
+    Priority: 2,
+    "MyOrg.SomeCustomField": "x"
+  }
+};
+
+// src/services/ado/commands/work.ts
 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) => {
@@ -6691,28 +7264,45 @@ function registerAdoWorkCommands(ado) {
       fail(err, "ado", "work-get", start);
     }
   });
-  work.command("create").description("Create a work item").requiredOption("--type <type>", "Work item type (e.g. Bug, Task, User Story)").requiredOption("--title <title>", "Work item title").option("--description <text>", "Description").option("--assignee <user>", "Assigned to (display name or email)").option("--priority <n>", "Priority (1-4)").option("--parent <id>", "Parent work item ID \u2014 creates a parent link after creation").option("--field <name=value>", "Additional field (repeatable)", (v, acc) => {
+  work.command("create").description("Create a work item").option("--type <type>", "Work item type (e.g. Bug, Task, User Story) (required, unless supplied via --input-file)").option("--title <title>", "Work item title (required, unless supplied via --input-file)").option("--description <text>", "Description").option("--assignee <user>", "Assigned to (display name or email)").option("--priority <n>", "Priority (1-4)").option("--parent <id>", "Parent work item ID \u2014 creates a parent link after creation").option("--field <name=value>", "Additional field (repeatable)", (v, acc) => {
     acc.push(v);
     return acc;
-  }, []).action(async (opts) => {
+  }, []).option("--input-file <path>", "JSON file describing the work item ({ type, fields: {...} }); '-' = stdin. CLI flags override matching keys. See: pncli ado work schema").action(async (opts) => {
     const start = Date.now();
     try {
       const globalOpts = ado.optsWithGlobals();
       const config = loadConfig({ configPath: globalOpts.config });
       const { collection, project, workClient } = getAdoContext(ado);
+      const jsonInput = opts.inputFile ? readJsonInputFile(opts.inputFile) : void 0;
+      const { builtin: jsonBuiltin, custom: jsonCustom } = jsonInput?.fields ? splitWorkFieldsDictionary(jsonInput.fields) : { builtin: {}, custom: {} };
+      const type = opts.type ?? jsonInput?.type;
+      if (!type) throw new PncliError('--type required (or "type" in --input-file)', 1);
+      const flagBuiltin = {
+        ...opts.title !== void 0 ? { title: opts.title } : {},
+        ...opts.description !== void 0 ? { description: opts.description } : {},
+        ...opts.assignee !== void 0 ? { assignee: opts.assignee } : {},
+        ...opts.priority !== void 0 ? { priority: opts.priority } : {}
+      };
+      const { merged: builtinFields, overrides: builtinOverrides } = mergeWithOverrides(jsonBuiltin, flagBuiltin);
+      if (!builtinFields.title) throw new PncliError('--title required (or "fields.Title" in --input-file)', 1);
+      const flagCustom = parseFieldArgs2(opts.field);
+      const { merged: customFields, overrides: customOverrides } = mergeWithOverrides(jsonCustom, flagCustom);
+      const overrides = [...builtinOverrides, ...customOverrides];
+      if (overrides.length) warn(`--input-file value(s) overridden by CLI flags: ${overrides.join(", ")}`);
+      const hasContent = (v) => v !== void 0 && v !== "";
       const builtIn = {
-        "System.Title": opts.title,
-        ...opts.description ? { "System.Description": opts.description } : {},
-        ...opts.assignee ? { "System.AssignedTo": opts.assignee } : {},
-        ...opts.priority ? { "Microsoft.VSTS.Common.Priority": opts.priority } : {}
+        "System.Title": builtinFields.title,
+        ...hasContent(builtinFields.description) ? { "System.Description": builtinFields.description } : {},
+        ...hasContent(builtinFields.assignee) ? { "System.AssignedTo": builtinFields.assignee } : {},
+        ...hasContent(builtinFields.priority) ? { "Microsoft.VSTS.Common.Priority": builtinFields.priority } : {}
       };
-      const extra = fieldArgsToPatch(opts.field, config.ado.fieldAliases);
+      const extra = buildFieldPatch(customFields, config.ado.fieldAliases);
       const patch = [
         ...Object.entries(builtIn).map(([k, v]) => ({ op: "add", path: `/fields/${k}`, value: v })),
         ...extra
       ];
-      const data = await workClient.createWorkItem(collection, project, opts.type, patch);
-      success(data, "ado", "work-create", start);
+      const data = await workClient.createWorkItem(collection, project, type, patch);
+      success(data, "ado", "work-create", start, overrides);
       if (opts.parent) {
         try {
           const baseUrl = config.ado.baseUrl?.replace(/\/$/, "");
@@ -6731,15 +7321,20 @@ function registerAdoWorkCommands(ado) {
   work.command("update").description("Update a work item field").requiredOption("--id <n>", "Work item ID").option("--field <name=value>", "Field to update (repeatable)", (v, acc) => {
     acc.push(v);
     return acc;
-  }, []).action(async (opts) => {
+  }, []).option("--input-file <path>", "JSON file describing fields to update ({ fields: {...} }); '-' = stdin. CLI flags override matching keys. See: pncli ado work schema").action(async (opts) => {
     const start = Date.now();
     try {
       const globalOpts = ado.optsWithGlobals();
       const config = loadConfig({ configPath: globalOpts.config });
       const { collection, workClient } = getAdoContext(ado);
-      const patch = fieldArgsToPatch(opts.field, config.ado.fieldAliases);
+      const jsonInput = opts.inputFile ? readJsonInputFile(opts.inputFile) : void 0;
+      const jsonFields = jsonInput?.fields ? Object.fromEntries(Object.entries(jsonInput.fields).map(([k, v]) => [k, resolveAtFileRef(v)])) : {};
+      const flagFields = parseFieldArgs2(opts.field);
+      const { merged, overrides } = mergeWithOverrides(jsonFields, flagFields);
+      if (overrides.length) warn(`--input-file value(s) overridden by CLI flags: ${overrides.join(", ")}`);
+      const patch = buildFieldPatch(merged, config.ado.fieldAliases);
       const data = await workClient.updateWorkItem(collection, parseInt(opts.id, 10), patch);
-      success(data, "ado", "work-update", start);
+      success(data, "ado", "work-update", start, overrides);
     } catch (err) {
       fail(err, "ado", "work-update", start);
     }
@@ -6950,6 +7545,14 @@ function registerAdoWorkCommands(ado) {
       fail(err, "ado", "work-fields", start);
     }
   });
+  work.command("schema").description("Print the --input-file JSON schema and an example for work create/update").option("--example-only", "Print only the runnable example JSON (no envelope) \u2014 pipeable straight into --input-file").action((opts) => {
+    const start = Date.now();
+    if (opts.exampleOnly) {
+      writeRawOutput(JSON.stringify(ADO_WORK_INPUT_FILE_EXAMPLE, null, 2) + "\n");
+      return;
+    }
+    success({ schema: ADO_WORK_INPUT_FILE_SCHEMA, example: ADO_WORK_INPUT_FILE_EXAMPLE }, "ado", "work-schema", start);
+  });
 }
 
 // src/services/ado/commands/repo.ts
@@ -6978,6 +7581,16 @@ function registerAdoRepoCommands(ado) {
       fail(err, "ado", "repo-list", start);
     }
   });
+  repo.command("create").description("Create a new git repository in the project").requiredOption("--name <name>", "Repository name").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const { collection, project, gitClient } = getAdoContext(ado);
+      const data = await gitClient.createRepo(collection, project, opts.name);
+      success(data, "ado", "repo-create", start);
+    } catch (err) {
+      fail(err, "ado", "repo-create", start);
+    }
+  });
   repo.command("get").description("Get a specific repository").action(async () => {
     const start = Date.now();
     try {
@@ -7219,11 +7832,11 @@ function registerAdoRepoCommands(ado) {
       const start = Date.now();
       try {
         const globalOpts = ado.optsWithGlobals();
-        const { loadConfig: lc } = await import("./config-S56LADVF.js");
+        const { loadConfig: lc } = await import("./config-CPRXY5SN.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-5WRBWEM6.js");
+        const { createHttpClient: createHttpClient2 } = await import("./http-FNRE7NQU.js");
         const http = createHttpClient2(config, Boolean(globalOpts.dryRun));
         const coreClient = new AdoCoreClient2(http);
         const me = await coreClient.getConnectionData(collection);
@@ -8037,24 +8650,35 @@ var CheckmarxClient = class {
   }
   http;
   async listProjects() {
-    return this.http.checkmarx("/cxrestapi/projects");
+    const res = await this.http.checkmarx("projects", { params: { limit: 100 } });
+    const projects = res.projects ?? [];
+    if (res.filteredTotalCount > projects.length) {
+      process.stderr.write(`warning: ${res.filteredTotalCount} projects found; only showing first ${projects.length}
+`);
+    }
+    return projects;
   }
   async getProject(id) {
-    return this.http.checkmarx(`/cxrestapi/projects/${id}`);
+    return this.http.checkmarx(`projects/${id}`);
   }
   async listScans(opts = {}) {
-    return this.http.checkmarx("/cxrestapi/sast/scans", {
-      params: {
-        projectId: opts.projectId,
-        last: opts.last
-      }
-    });
+    const params = { limit: opts.last ?? 100 };
+    if (opts.projectId) params["project-id"] = opts.projectId;
+    const res = await this.http.checkmarx("scans", { params });
+    const scans = res.scans ?? [];
+    if (res.filteredTotalCount > scans.length) {
+      process.stderr.write(`warning: ${res.filteredTotalCount} scans found; only showing first ${scans.length}
+`);
+    }
+    return scans;
   }
   async getScan(id) {
-    return this.http.checkmarx(`/cxrestapi/sast/scans/${id}`);
+    return this.http.checkmarx(`scans/${id}`);
   }
   async getScanResultsStatistics(scanId) {
-    return this.http.checkmarx(`/cxrestapi/sast/scans/${scanId}/resultsStatistics`);
+    return this.http.checkmarx("results/summary", {
+      params: { "scan-id": scanId }
+    });
   }
 };
 
@@ -8067,7 +8691,7 @@ function getClient10(program2) {
   return new CheckmarxClient(http);
 }
 function registerCheckmarxCommands(program2) {
-  const cx = program2.command("checkmarx").description("Checkmarx CxSAST operations");
+  const cx = program2.command("checkmarx").description("Checkmarx One operations");
   const project = cx.command("project").description("Project operations");
   const scan = cx.command("scan").description("Scan operations");
   project.command("list").description("List all projects").action(async () => {
@@ -8079,47 +8703,39 @@ function registerCheckmarxCommands(program2) {
       fail(err, "checkmarx", "project-list", start);
     }
   });
-  project.command("get").description("Get a project by ID").requiredOption("--id <id>", "Project ID").action(async (opts) => {
+  project.command("get").description("Get a project by ID").requiredOption("--id <id>", "Project UUID").action(async (opts) => {
     const start = Date.now();
     try {
-      const id = parseInt(opts.id, 10);
-      if (isNaN(id)) throw new PncliError(`Invalid --id "${opts.id}". Expected an integer.`, 1);
-      const data = await getClient10(program2).getProject(id);
+      const data = await getClient10(program2).getProject(opts.id);
       success(data, "checkmarx", "project-get", start);
     } catch (err) {
       fail(err, "checkmarx", "project-get", start);
     }
   });
-  scan.command("list").description("List scans").option("--project <id>", "Filter by project ID").option("--last <n>", "Return only the last N scans per project").action(async (opts) => {
+  scan.command("list").description("List scans").option("--project <id>", "Filter by project UUID").option("--last <n>", "Return only the last N scans").action(async (opts) => {
     const start = Date.now();
     try {
-      const projectId = opts.project ? parseInt(opts.project, 10) : void 0;
       const last = opts.last ? parseInt(opts.last, 10) : void 0;
-      if (opts.project && isNaN(projectId)) throw new PncliError(`Invalid --project "${opts.project}". Expected an integer.`, 1);
       if (opts.last && isNaN(last)) throw new PncliError(`Invalid --last "${opts.last}". Expected an integer.`, 1);
-      const data = await getClient10(program2).listScans({ projectId, last });
+      const data = await getClient10(program2).listScans({ projectId: opts.project, last });
       success(data, "checkmarx", "scan-list", start);
     } catch (err) {
       fail(err, "checkmarx", "scan-list", start);
     }
   });
-  scan.command("get").description("Get a scan by ID").requiredOption("--id <id>", "Scan ID").action(async (opts) => {
+  scan.command("get").description("Get a scan by ID").requiredOption("--id <id>", "Scan UUID").action(async (opts) => {
     const start = Date.now();
     try {
-      const id = parseInt(opts.id, 10);
-      if (isNaN(id)) throw new PncliError(`Invalid --id "${opts.id}". Expected an integer.`, 1);
-      const data = await getClient10(program2).getScan(id);
+      const data = await getClient10(program2).getScan(opts.id);
       success(data, "checkmarx", "scan-get", start);
     } catch (err) {
       fail(err, "checkmarx", "scan-get", start);
     }
   });
-  scan.command("stats").description("Get results statistics for a scan").requiredOption("--id <id>", "Scan ID").action(async (opts) => {
+  scan.command("stats").description("Get results statistics for a scan").requiredOption("--id <id>", "Scan UUID").action(async (opts) => {
     const start = Date.now();
     try {
-      const id = parseInt(opts.id, 10);
-      if (isNaN(id)) throw new PncliError(`Invalid --id "${opts.id}". Expected an integer.`, 1);
-      const data = await getClient10(program2).getScanResultsStatistics(id);
+      const data = await getClient10(program2).getScanResultsStatistics(opts.id);
       success(data, "checkmarx", "scan-stats", start);
     } catch (err) {
       fail(err, "checkmarx", "scan-stats", start);
@@ -8430,18 +9046,52 @@ function getBundledSkillsDir() {
 function getInstalledMetaPath(targetDir) {
   return path7.join(targetDir, ".pncli-installed.json");
 }
+var SKILL_ORIGIN_FILENAME = "pncli-origin.json";
 function readInstalledMeta(targetDir) {
   const metaPath = getInstalledMetaPath(targetDir);
   const raw = loadJsonFile(metaPath);
   if (raw && raw.version === 1 && raw.skills) return raw;
   return { version: 1, skills: {} };
 }
+function getSkillOriginPath(skillDir) {
+  return path7.join(skillDir, SKILL_ORIGIN_FILENAME);
+}
+function readSkillOrigin(skillDir) {
+  const originPath = getSkillOriginPath(skillDir);
+  if (!fs4.existsSync(originPath)) return null;
+  try {
+    const raw = JSON.parse(fs4.readFileSync(originPath, "utf8"));
+    if (raw && raw.version === 1 && raw.source) return raw;
+  } catch {
+  }
+  return null;
+}
+function detectRepoBranch(repoPath) {
+  try {
+    const result = execFileSync3("git", ["-C", repoPath, "rev-parse", "--abbrev-ref", "HEAD"], {
+      encoding: "utf8",
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+    return result && result !== "HEAD" ? result : void 0;
+  } catch {
+    return void 0;
+  }
+}
 function recordInstalledSkills(targetDir, skillNames, record) {
   if (skillNames.length === 0) return;
   const meta = readInstalledMeta(targetDir);
   const now = (/* @__PURE__ */ new Date()).toISOString();
   for (const skillName of skillNames) {
-    meta.skills[skillName] = { ...record, installedAt: now };
+    const fullRecord = { ...record, installedAt: now };
+    meta.skills[skillName] = fullRecord;
+    const skillDir = path7.join(targetDir, skillName);
+    if (fs4.existsSync(skillDir)) {
+      const origin = { version: 1, ...fullRecord };
+      try {
+        fs4.writeFileSync(getSkillOriginPath(skillDir), JSON.stringify(origin, null, 2), "utf8");
+      } catch {
+      }
+    }
   }
   fs4.writeFileSync(getInstalledMetaPath(targetDir), JSON.stringify(meta, null, 2), "utf8");
 }
@@ -8555,6 +9205,7 @@ function pullMarketplace(marketplacePath, repoUrl, token, marketplaceName) {
 function installPluginsForMarketplace(marketplacePath, marketplaceName, repoUrl, pluginNames, targetDir) {
   const results = {};
   let totalInstalled = 0;
+  const branch = detectRepoBranch(marketplacePath);
   for (const pluginName of pluginNames) {
     const skillsSrc = resolveSkillsSrc(marketplacePath, pluginName);
     if (!fs4.existsSync(skillsSrc)) {
@@ -8565,7 +9216,8 @@ function installPluginsForMarketplace(marketplacePath, marketplaceName, repoUrl,
     const { installed, failed } = copyPluginSkills(skillsSrc, targetDir, {
       marketplace: marketplaceName,
       plugin: pluginName,
-      installedFrom: repoUrl ?? ""
+      installedFrom: repoUrl ?? "",
+      branch
     });
     results[pluginName] = { installed, failed };
     totalInstalled += installed.length;
@@ -9003,6 +9655,121 @@ function registerSkillsCommands(program2) {
       fail(err, "skills", "marketplace-sync", start);
     }
   });
+  marketplace.command("purge-plugin").description("Remove all skills installed from a specific plugin (or all plugins in a marketplace)").argument("<plugin>", 'Plugin name to purge, or "all" to remove every skill from the marketplace').option("--marketplace <name>", "Restrict purge to skills from this marketplace (by name or repo URL)").option("--agent <agent>", "Target agent host: github-copilot | claude-code (default: github-copilot)").option("--claude", "Shorthand for --agent claude-code").option("--scope <scope>", "Installation scope: project | user (default: user)").option("--target <dir>", "Override skills directory").action((plugin, opts) => {
+    const start = Date.now();
+    try {
+      let targetDir;
+      if (opts.target) {
+        targetDir = path7.resolve(opts.target);
+      } else {
+        const agentConfig = resolveAgentPaths(resolveAgentName(opts));
+        const scopePath = (opts.scope ?? "user") === "project" ? agentConfig.project : agentConfig.user;
+        targetDir = path7.resolve(scopePath);
+      }
+      const resolvedTarget = path7.resolve(targetDir);
+      if (!fs4.existsSync(targetDir)) {
+        success({ removed: [], total: 0, target: targetDir, message: "No skills directory found." }, "skills", "marketplace-purge-plugin", start);
+        return;
+      }
+      const meta = readInstalledMeta(targetDir);
+      const removed = [];
+      const skipped = [];
+      const skillDirs = fs4.readdirSync(targetDir).filter((name) => {
+        if (name.startsWith(".")) return false;
+        const p = path7.join(targetDir, name);
+        try {
+          return fs4.statSync(p).isDirectory();
+        } catch {
+          return false;
+        }
+      });
+      for (const skillName of skillDirs) {
+        const skillDir = path7.resolve(targetDir, skillName);
+        if (!skillDir.startsWith(resolvedTarget + path7.sep)) continue;
+        let record = meta.skills[skillName] ?? null;
+        if (!record) {
+          const perSkill = readSkillOrigin(skillDir);
+          if (perSkill) {
+            record = {
+              source: perSkill.source,
+              marketplace: perSkill.marketplace,
+              plugin: perSkill.plugin,
+              installedFrom: perSkill.installedFrom,
+              branch: perSkill.branch,
+              installedAt: perSkill.installedAt
+            };
+          }
+        }
+        if (!record || record.source !== "marketplace") {
+          skipped.push(skillName);
+          continue;
+        }
+        const matchesMarketplace = !opts.marketplace || record.marketplace === opts.marketplace || record.installedFrom === opts.marketplace;
+        const matchesPlugin = plugin === "all" || record.plugin === plugin;
+        if (!matchesMarketplace || !matchesPlugin) {
+          skipped.push(skillName);
+          continue;
+        }
+        fs4.rmSync(skillDir, { recursive: true, force: true });
+        delete meta.skills[skillName];
+        removed.push(skillName);
+      }
+      if (removed.length > 0) {
+        fs4.writeFileSync(getInstalledMetaPath(targetDir), JSON.stringify(meta, null, 2), "utf8");
+      }
+      success({
+        removed,
+        skipped: skipped.length,
+        total: removed.length,
+        target: targetDir,
+        plugin,
+        ...opts.marketplace ? { marketplace: opts.marketplace } : {}
+      }, "skills", "marketplace-purge-plugin", start);
+    } catch (err) {
+      fail(err, "skills", "marketplace-purge-plugin", start);
+    }
+  });
+  skills.command("purge-user").description("Remove all skills from the user-level skills folder for the target agent").option("--agent <agent>", "Target agent host: github-copilot | claude-code (default: github-copilot)").option("--claude", "Shorthand for --agent claude-code").option("--force", "Skip confirmation \u2014 remove all skills without prompting").action((opts) => {
+    const start = Date.now();
+    try {
+      const userDir = resolveAgentPaths(resolveAgentName(opts)).user;
+      if (!fs4.existsSync(userDir)) {
+        success({ removed: 0, target: userDir, message: "No user-level skills directory found \u2014 nothing to purge." }, "skills", "purge-user", start);
+        return;
+      }
+      const skillDirs = fs4.readdirSync(userDir).filter((name) => {
+        if (name.startsWith(".")) return false;
+        const p = path7.join(userDir, name);
+        try {
+          return fs4.statSync(p).isDirectory();
+        } catch {
+          return false;
+        }
+      });
+      if (skillDirs.length === 0) {
+        success({ removed: 0, target: userDir, message: "No skills found in user-level skills directory." }, "skills", "purge-user", start);
+        return;
+      }
+      if (!opts.force) {
+        throw new Error(
+          `This will remove ${skillDirs.length} skill(s) from ${userDir}: ${skillDirs.join(", ")}.
+Re-run with --force to confirm, or use \`pncli skills marketplace purge-plugin\` to target a specific plugin.`
+        );
+      }
+      for (const name of skillDirs) {
+        const skillDir = path7.resolve(userDir, name);
+        if (!skillDir.startsWith(path7.resolve(userDir) + path7.sep)) continue;
+        fs4.rmSync(skillDir, { recursive: true, force: true });
+      }
+      const metaPath = getInstalledMetaPath(userDir);
+      if (fs4.existsSync(metaPath)) {
+        fs4.writeFileSync(metaPath, JSON.stringify({ version: 1, skills: {} }, null, 2), "utf8");
+      }
+      success({ removed: skillDirs.length, skills: skillDirs, target: userDir }, "skills", "purge-user", start);
+    } catch (err) {
+      fail(err, "skills", "purge-user", start);
+    }
+  });
 }
 function resolvePluginChoices(marketplacePath) {
   const marketplaceJsonPath = path7.join(marketplacePath, ".claude-plugin", "marketplace.json");
@@ -9052,7 +9819,8 @@ function copyPluginSkills(skillsSrc, targetDir, meta) {
       source: "marketplace",
       marketplace: meta.marketplace,
       plugin: meta.plugin,
-      installedFrom: meta.installedFrom
+      installedFrom: meta.installedFrom,
+      ...meta.branch ? { branch: meta.branch } : {}
     });
   }
   return { installed, failed };
@@ -9314,6 +10082,170 @@ function registerOpenShiftCommands(program2) {
   });
 }
 
+// src/services/dynatrace/commands.ts
+function getHttp3(program2) {
+  const opts = program2.optsWithGlobals();
+  return createHttpClient(
+    loadConfig({ configPath: opts.config }),
+    Boolean(opts.dryRun)
+  );
+}
+async function allPages(fetchPage) {
+  const items = [];
+  let nextPageKey;
+  do {
+    const page = await fetchPage(nextPageKey);
+    items.push(...page.items);
+    nextPageKey = page.nextPageKey;
+  } while (nextPageKey);
+  return { items, totalCount: items.length };
+}
+async function listEntities(http, entitySelector, opts) {
+  return allPages(async (nextPageKey) => {
+    const page = await http.dynatrace("/api/v2/entities", {
+      params: nextPageKey ? { nextPageKey } : {
+        entitySelector,
+        from: opts.from,
+        to: opts.to,
+        fields: opts.fields,
+        pageSize: 500
+      }
+    });
+    return {
+      items: page.entities,
+      nextPageKey: page.nextPageKey,
+      totalCount: page.totalCount
+    };
+  });
+}
+async function runTraceQuery(http, traceId) {
+  if (!/^[0-9a-f]{16,32}$/i.test(traceId)) {
+    throw new PncliError("Trace ID must be a 16- or 32-character hexadecimal value");
+  }
+  const deadline = Date.now() + 6e4;
+  let response = await http.dynatracePlatform(
+    "/platform/storage/query/v1/query:execute",
+    {
+      method: "POST",
+      body: {
+        query: `fetch spans | filter trace.id == "${traceId.toLowerCase()}" | sort start_time asc`,
+        requestTimeoutMilliseconds: 5e3
+      },
+      timeoutMs: 1e4
+    }
+  );
+  while (response.state === "RUNNING" || response.state === "NOT_STARTED") {
+    if (!response.requestToken) throw new PncliError("Dynatrace did not return a query request token");
+    const remainingMs = deadline - Date.now();
+    if (remainingMs <= 0) throw new PncliError("Dynatrace trace query did not finish within 60 seconds");
+    const pollStarted = Date.now();
+    response = await http.dynatracePlatform(
+      "/platform/storage/query/v1/query:poll",
+      {
+        params: {
+          "request-token": response.requestToken,
+          "request-timeout": Math.min(5e3, remainingMs)
+        },
+        timeoutMs: 1e4
+      }
+    );
+    if (response.state === "RUNNING" || response.state === "NOT_STARTED") {
+      const delayMs = Math.min(1e3 - (Date.now() - pollStarted), deadline - Date.now());
+      if (delayMs > 0) await new Promise((resolve) => setTimeout(resolve, delayMs));
+    }
+  }
+  if (response.state !== "SUCCEEDED") {
+    throw new PncliError(response.error?.message ?? `Dynatrace trace query ${response.state.toLowerCase()}`);
+  }
+  return response.result;
+}
+function registerDynatraceCommands(program2) {
+  const dynatrace = program2.command("dynatrace").description("Dynatrace observability operations");
+  const entities = dynatrace.command("entities").description("Monitored entity operations");
+  entities.command("list").description("List monitored entities using an entity selector").requiredOption("--selector <selector>", 'Dynatrace entity selector, e.g. type("SERVICE")').option("--from <time>", "Start time (ISO 8601 or relative, e.g. now-2h)").option("--to <time>", "End time (ISO 8601 or relative)").option("--fields <fields>", "Additional entity fields").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const data = await listEntities(getHttp3(program2), opts.selector, opts);
+      success({ totalCount: data.totalCount, entities: data.items }, "dynatrace", "entities list", start);
+    } catch (err) {
+      fail(err, "dynatrace", "entities list", start);
+    }
+  });
+  entities.command("get").description("Get a monitored entity by ID").requiredOption("--id <id>", "Entity ID, e.g. SERVICE-1234567890ABCDEF").option("--from <time>", "Start time").option("--to <time>", "End time").option("--fields <fields>", "Additional entity fields").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const data = await getHttp3(program2).dynatrace(
+        `/api/v2/entities/${encodeURIComponent(opts.id)}`,
+        { params: { from: opts.from, to: opts.to, fields: opts.fields } }
+      );
+      success(data, "dynatrace", "entities get", start);
+    } catch (err) {
+      fail(err, "dynatrace", "entities get", start);
+    }
+  });
+  dynatrace.command("services").description("List monitored services").option("--from <time>", "Start time").option("--to <time>", "End time").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const data = await listEntities(getHttp3(program2), 'type("SERVICE")', opts);
+      success({ totalCount: data.totalCount, services: data.items }, "dynatrace", "services", start);
+    } catch (err) {
+      fail(err, "dynatrace", "services", start);
+    }
+  });
+  dynatrace.command("workloads").description("List monitored Kubernetes workloads").option("--from <time>", "Start time").option("--to <time>", "End time").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const selector = 'type("CLOUD_APPLICATION")';
+      const data = await listEntities(getHttp3(program2), selector, opts);
+      success({ totalCount: data.totalCount, workloads: data.items }, "dynatrace", "workloads", start);
+    } catch (err) {
+      fail(err, "dynatrace", "workloads", start);
+    }
+  });
+  const problems = dynatrace.command("problems").description("Problem operations");
+  problems.command("list").description("List problems").option("--from <time>", "Start time (default: now-2h)").option("--to <time>", "End time (default: now)").option("--problem-selector <selector>", "Dynatrace problem selector").option("--entity-selector <selector>", "Affected entity selector").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const data = await allPages(async (nextPageKey) => {
+        const page = await getHttp3(program2).dynatrace("/api/v2/problems", {
+          params: nextPageKey ? { nextPageKey } : {
+            from: opts.from ?? "now-2h",
+            to: opts.to ?? "now",
+            problemSelector: opts.problemSelector,
+            entitySelector: opts.entitySelector,
+            pageSize: 500
+          }
+        });
+        return { items: page.problems, nextPageKey: page.nextPageKey, totalCount: page.totalCount };
+      });
+      success({ totalCount: data.totalCount, problems: data.items }, "dynatrace", "problems list", start);
+    } catch (err) {
+      fail(err, "dynatrace", "problems list", start);
+    }
+  });
+  problems.command("get").description("Get a problem by ID").requiredOption("--id <id>", "Problem ID").option("--fields <fields>", "Additional fields").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const data = await getHttp3(program2).dynatrace(
+        `/api/v2/problems/${encodeURIComponent(opts.id)}`,
+        { params: { fields: opts.fields } }
+      );
+      success(data, "dynatrace", "problems get", start);
+    } catch (err) {
+      fail(err, "dynatrace", "problems get", start);
+    }
+  });
+  dynatrace.command("trace").description("Get distributed-trace spans from Grail").requiredOption("--id <trace-id>", "16- or 32-character hexadecimal trace ID").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const result = await runTraceQuery(getHttp3(program2), opts.id);
+      success(result, "dynatrace", "trace", start);
+    } catch (err) {
+      fail(err, "dynatrace", "trace", start);
+    }
+  });
+}
+
 // src/cli.ts
 if (!process.env.PNCLI_VERIFY_TLS) {
   process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
@@ -9357,6 +10289,7 @@ registerSonatypeIqCommands(program);
 registerSkillsCommands(program);
 registerJwtCommands(program);
 registerOpenShiftCommands(program);
+registerDynatraceCommands(program);
 program.addHelpText("after", `
 Services:
   git          Local git operations (status, diff, log, branch)
@@ -9371,11 +10304,12 @@ Services:
   jenkins      Jenkins Data Center (jobs, builds, logs)
   artifactory  Artifactory (repos, artifact search, build info, properties)
   udeploy      IBM UrbanCode Deploy (component versions, deployment processes)
-  checkmarx    Checkmarx CxSAST (projects, scans, scan statistics)
+  checkmarx    Checkmarx One (projects, scans, scan statistics)
   servicenow   ServiceNow (change requests)
   contrast     Contrast IAST (applications, vulnerability findings)
   sonatypeiq   Sonatype IQ Server (applications, organizations, policies)
   openshift    OpenShift / Kubernetes (pods, events, logs, metrics)
+  dynatrace    Dynatrace (services, entities, problems, traces, Kubernetes workloads)
   config       Manage pncli configuration
   skills       Download and manage Claude Code skills
   jwt          JWT token utilities (decode header and payload)