@kolatts/pncli 1.21.0 → 1.23.0

package/dist/cli.js

@@ -8,7 +8,7 @@ import {
   setRepoConfigValue,
   writeGlobalConfig,
   writeRepoConfig
-} from "./chunk-FXY262BR.js";
+} from "./chunk-KRDKHGYS.js";
 import {
   ExitCode,
   PncliError,
@@ -20,7 +20,7 @@ import {
   success,
   warn,
   writeRawOutput
-} from "./chunk-PC4AHQCN.js";
+} from "./chunk-XYHZMXJU.js";
 import {
   AdoCoreClient
 } from "./chunk-VDL32PSG.js";
@@ -421,34 +421,34 @@ function parseAdoRemote(remoteUrl, adoBaseUrl) {
   } catch {
     baseHostname = adoBaseUrl.replace(/\/$/, "").replace(/^https?:\/\//, "").split(/[:/]/)[0].toLowerCase();
   }
-  let path8 = remoteUrl;
+  let path9 = remoteUrl;
   let remoteHostname = "";
-  const sshProtoMatch = path8.match(/^ssh:\/\/[^@]*@?([^/:]+)(?::\d+)?(.*)/);
+  const sshProtoMatch = path9.match(/^ssh:\/\/[^@]*@?([^/:]+)(?::\d+)?(.*)/);
   if (sshProtoMatch) {
     remoteHostname = sshProtoMatch[1].toLowerCase();
-    path8 = sshProtoMatch[2];
+    path9 = sshProtoMatch[2];
   } else {
-    const gitAtMatch = path8.match(/^git@([^:]+)(?::\d+)?:(.*)/);
+    const gitAtMatch = path9.match(/^git@([^:]+)(?::\d+)?:(.*)/);
     if (gitAtMatch) {
       remoteHostname = gitAtMatch[1].toLowerCase();
-      path8 = "/" + gitAtMatch[2];
+      path9 = "/" + gitAtMatch[2];
     } else {
-      const httpsMatch = path8.match(/^https?:\/\/([^/:]+)(?::\d+)?(.*)/);
+      const httpsMatch = path9.match(/^https?:\/\/([^/:]+)(?::\d+)?(.*)/);
       if (httpsMatch) {
         remoteHostname = httpsMatch[1].toLowerCase();
-        path8 = httpsMatch[2];
+        path9 = httpsMatch[2];
       }
     }
   }
   if (!remoteHostname || remoteHostname !== baseHostname) return null;
-  path8 = path8.replace(/\.git$/, "");
-  const gitIdx = path8.indexOf("/_git/");
-  const sshIdx = path8.indexOf("/_ssh/");
+  path9 = path9.replace(/\.git$/, "");
+  const gitIdx = path9.indexOf("/_git/");
+  const sshIdx = path9.indexOf("/_ssh/");
   const markerIdx = gitIdx !== -1 ? gitIdx : sshIdx;
   if (markerIdx === -1) return null;
-  const repo = decodeURIComponent(path8.slice(markerIdx + 6));
+  const repo = decodeURIComponent(path9.slice(markerIdx + 6));
   if (!repo) return null;
-  const before = path8.slice(1, markerIdx);
+  const before = path9.slice(1, markerIdx);
   const parts = before.split("/").filter(Boolean);
   if (parts.length < 2) return null;
   const project = decodeURIComponent(parts[parts.length - 1]);
@@ -1390,6 +1390,13 @@ function getDefaults(program2) {
     priority: config.defaults.jira?.priority
   };
 }
+function resolveJqlInput(jql, jqlFile) {
+  const raw = resolveTextInput(jql, jqlFile, "jql");
+  if (raw === void 0) throw new PncliError("Must specify --jql or --jql-file", 1);
+  const trimmed = raw.trim();
+  if (!trimmed) throw new PncliError("JQL query is empty", 1);
+  return trimmed;
+}
 function registerJiraCommands(program2) {
   const jira = program2.command("jira").description("Jira Data Cloud operations");
   jira.command("get-issue").description("Get a Jira issue by key").requiredOption("--key <issue-key>", "Issue key (e.g. PROJ-123)").action(async (opts) => {
@@ -1539,12 +1546,13 @@ function registerJiraCommands(program2) {
       fail(err, "jira", "list-comments", start);
     }
   });
-  jira.command("search").description("Search Jira issues with JQL (consider --output-file for large results)").requiredOption("--jql <query>", "JQL query string").option("--max-results <n>", "Maximum number of results").action(async (opts) => {
+  jira.command("search").description("Search Jira issues with JQL (consider --output-file for large results)").option("--jql <query>", "JQL query string").option("--jql-file <path>", "Path to a file containing the JQL query ('-' = stdin)").option("--max-results <n>", "Maximum number of results").action(async (opts) => {
     const start = Date.now();
     try {
       const { client, fieldMap, customFields } = getClientAndFields(program2);
+      const jql = resolveJqlInput(opts.jql, opts.jqlFile);
       const maxResults = opts.maxResults ? parseInt(opts.maxResults, 10) : void 0;
-      const translatedJql = translateJql(opts.jql, fieldMap);
+      const translatedJql = translateJql(jql, fieldMap);
       const data = await client.search(translatedJql, maxResults, customFields);
       const translatedIssues = data.issues.map((issue) => ({
         ...issue,
@@ -2216,8 +2224,8 @@ var GitHubClient = class {
     );
   }
   async createRepo(opts) {
-    const path8 = opts.org ? `/orgs/${opts.org}/repos` : "/user/repos";
-    return this.http.github(path8, {
+    const path9 = opts.org ? `/orgs/${opts.org}/repos` : "/user/repos";
+    return this.http.github(path9, {
       method: "POST",
       body: {
         name: opts.name,
@@ -2556,7 +2564,8 @@ function registerGitHubCommands(program2) {
 }
 
 // src/services/confluence/commands.ts
-import { existsSync as existsSync2 } from "fs";
+import { existsSync as existsSync2, mkdirSync as mkdirSync2, writeFileSync as writeFileSync2 } from "fs";
+import path2 from "path";
 
 // src/services/confluence/client.ts
 import { readFileSync as readFileSync4 } from "fs";
@@ -2718,6 +2727,19 @@ var ConfluenceClient = class {
     );
     return result.results;
   }
+  async getAttachment(attachmentId) {
+    return this.http.confluence(`${API3}/content/${attachmentId}`);
+  }
+  async downloadAttachment(attachment) {
+    const downloadPath = attachment._links.download;
+    if (!downloadPath) {
+      throw new PncliError(
+        `Content ${attachment.id} has no download link \u2014 is it an attachment? (title: ${attachment.title})`,
+        1
+      );
+    }
+    return this.http.confluenceBuffer(downloadPath);
+  }
   async deleteAttachment(attachmentId) {
     return this.http.confluence(`${API3}/content/${attachmentId}`, { method: "DELETE" });
   }
@@ -2737,6 +2759,11 @@ var ConfluenceClient = class {
 };
 
 // src/services/confluence/commands.ts
+function resolveAttachmentPath(outDir, title) {
+  const segments = title.split(/[\\/]/).filter((s) => s !== "" && s !== "." && s !== "..");
+  const name = segments.pop() ?? "attachment";
+  return path2.join(outDir, name);
+}
 function xmlParseHint(err, bodyContent, convertedFromMarkdown = false) {
   if (!(err instanceof Error)) return null;
   const m = err.message.match(/at \[row,col\]=\{(\d+),(\d+)\}/);
@@ -2986,6 +3013,21 @@ ${hint}`, status, url), "confluence", "update-page", start);
       fail(err, "confluence", "upload-attachment", start);
     }
   });
+  confluence.command("download-attachment").description("Download a Confluence attachment to .pncli/ (or --dir)").requiredOption("--id <attachment-id>", "Attachment content ID").option("--dir <path>", "Output directory (default: .pncli relative to cwd)").action(async (opts) => {
+    const start = Date.now();
+    try {
+      const client = getClient4(program2);
+      const attachment = await client.getAttachment(opts.id);
+      const outDir = opts.dir ?? path2.join(process.cwd(), ".pncli");
+      mkdirSync2(outDir, { recursive: true });
+      const outPath = resolveAttachmentPath(outDir, attachment.title);
+      const buffer = await client.downloadAttachment(attachment);
+      writeFileSync2(outPath, buffer);
+      success({ saved: outPath, filename: attachment.title, size: buffer.length }, "confluence", "download-attachment", start);
+    } catch (err) {
+      fail(err, "confluence", "download-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 {
@@ -3549,23 +3591,23 @@ import { Option as Option2 } from "commander";
 
 // src/services/deps/parsers/index.ts
 import fs from "fs";
-import path5 from "path";
+import path6 from "path";
 import { execSync as execSync3, execFileSync as execFileSync2 } from "child_process";
 
 // src/services/deps/parsers/npm.ts
-import path2 from "path";
+import path3 from "path";
 function findNpmManifests(files) {
   const lockFiles = new Set(
     files.filter((f) => {
-      const base = path2.basename(f);
+      const base = path3.basename(f);
       return base === "package-lock.json" || base === "yarn.lock" || base === "pnpm-lock.yaml";
     })
   );
   const manifests = [];
   for (const file of files) {
-    if (path2.basename(file) !== "package.json") continue;
+    if (path3.basename(file) !== "package.json") continue;
     if (file.split("/").includes("node_modules")) continue;
-    const dir = path2.dirname(file);
+    const dir = path3.dirname(file);
     let lockFile;
     for (const lf of ["package-lock.json", "yarn.lock", "pnpm-lock.yaml"]) {
       const candidate = dir === "." ? lf : `${dir}/${lf}`;
@@ -3580,7 +3622,7 @@ function findNpmManifests(files) {
 }
 function parseNpmPackages(content, manifest, opts, lockContent) {
   if (lockContent && manifest.lockFile) {
-    const base = path2.basename(manifest.lockFile);
+    const base = path3.basename(manifest.lockFile);
     if (base === "package-lock.json") {
       const pkgs = parsePackageLock(lockContent, manifest.lockFile, opts);
       if (pkgs.length > 0) return pkgs;
@@ -3728,26 +3770,26 @@ function parsePnpmLock(content, lockFilePath, opts, packageJsonContent) {
 }
 
 // src/services/deps/parsers/nuget.ts
-import path3 from "path";
+import path4 from "path";
 var PROJ_EXTENSIONS = /* @__PURE__ */ new Set([".csproj", ".fsproj", ".vbproj"]);
 function findNugetManifests(files) {
   const lockFiles = /* @__PURE__ */ new Map();
   for (const f of files) {
-    if (path3.basename(f) === "packages.lock.json") {
-      lockFiles.set(path3.dirname(f), f);
+    if (path4.basename(f) === "packages.lock.json") {
+      lockFiles.set(path4.dirname(f), f);
     }
   }
   const manifests = [];
   for (const file of files) {
-    const base = path3.basename(file);
-    const ext = path3.extname(file);
+    const base = path4.basename(file);
+    const ext = path4.extname(file);
     if (PROJ_EXTENSIONS.has(ext) || base === "packages.config") {
-      const dir = path3.dirname(file);
+      const dir = path4.dirname(file);
       const lockFile = lockFiles.get(dir);
       manifests.push({ file, ecosystem: "nuget", lockFile });
     }
     if (base === "Directory.Packages.props") {
-      const dir = path3.dirname(file);
+      const dir = path4.dirname(file);
       manifests.push({ file, ecosystem: "nuget", lockFile: lockFiles.get(dir) });
     }
   }
@@ -3766,7 +3808,7 @@ function findNugetManifests(files) {
   return deduped;
 }
 function parseNugetPackages(content, manifest, opts, lockContent, propsContent) {
-  const base = path3.basename(manifest.file);
+  const base = path4.basename(manifest.file);
   if (lockContent) {
     return parsePackagesLock(lockContent, manifest.lockFile ?? manifest.file, opts);
   }
@@ -3887,14 +3929,14 @@ function parsePackagesLock(content, filePath, opts) {
 }
 
 // src/services/deps/parsers/maven.ts
-import path4 from "path";
+import path5 from "path";
 function findMavenManifests(files) {
-  const lockFiles = new Set(files.filter((f) => path4.basename(f) === "gradle.lockfile"));
+  const lockFiles = new Set(files.filter((f) => path5.basename(f) === "gradle.lockfile"));
   const manifests = [];
   for (const file of files) {
-    const base = path4.basename(file);
+    const base = path5.basename(file);
     if (base === "pom.xml" || base === "build.gradle" || base === "build.gradle.kts") {
-      const dir = path4.dirname(file);
+      const dir = path5.dirname(file);
       const lockCandidate = dir === "." ? "gradle.lockfile" : `${dir}/gradle.lockfile`;
       const lockFile = lockFiles.has(lockCandidate) ? lockCandidate : void 0;
       manifests.push({ file, ecosystem: "maven", lockFile });
@@ -3903,7 +3945,7 @@ function findMavenManifests(files) {
   return manifests;
 }
 function parseMavenPackages(content, manifest, opts, lockContent) {
-  const base = path4.basename(manifest.file);
+  const base = path5.basename(manifest.file);
   if (lockContent && manifest.lockFile) {
     return parseGradleLock(lockContent, manifest.lockFile, opts);
   }
@@ -4064,7 +4106,7 @@ function getRepoFiles(repoRoot) {
 }
 function readFile(repoRoot, relPath) {
   try {
-    return fs.readFileSync(path5.join(repoRoot, relPath), "utf8");
+    return fs.readFileSync(path6.join(repoRoot, relPath), "utf8");
   } catch {
     return null;
   }
@@ -4082,13 +4124,13 @@ function readFileAtRef(repoRoot, ref, relPath) {
   }
 }
 function findPropsContent(manifestFile, readFn) {
-  let dir = path5.dirname(manifestFile);
+  let dir = path6.dirname(manifestFile);
   for (let depth = 0; depth < 10; depth++) {
     const candidate = dir === "." ? "Directory.Packages.props" : `${dir}/Directory.Packages.props`;
     const content = readFn(candidate);
     if (content) return content;
     if (dir === ".") break;
-    dir = path5.dirname(dir);
+    dir = path6.dirname(dir);
   }
   return null;
 }
@@ -5530,7 +5572,7 @@ import chalk from "chalk";
 import fs2 from "fs";
 function registerConfigCommands(program2) {
   const config = program2.command("config").description("Manage pncli configuration");
-  config.command("init").description("Interactive setup wizard").option("--repo", "Write repo config (.pncli.json) instead of global config").action(async (opts) => {
+  config.command("init").description("Setup wizard for service credentials (interactive)").option("--repo", "Write repo config (.pncli.json) instead of global config").action(async (opts) => {
     const start = Date.now();
     try {
       if (opts.repo) {
@@ -5641,8 +5683,8 @@ function registerConfigCommands(program2) {
       if (cfg.ado.baseUrl) {
         try {
           const collection = cfg.defaults.ado?.collection;
-          const path8 = collection ? `/${encodeURIComponent(collection)}/_apis/connectionData?api-version=7.1-preview.1` : "/_apis/projectCollections?api-version=7.1";
-          await http.ado(path8);
+          const path9 = collection ? `/${encodeURIComponent(collection)}/_apis/connectionData?api-version=7.1-preview.1` : "/_apis/projectCollections?api-version=7.1";
+          await http.ado(path9);
           results.ado = { ok: true, message: "connected" };
         } catch (err) {
           results.ado = { ok: false, message: err instanceof Error ? err.message : String(err) };
@@ -5762,6 +5804,16 @@ function registerConfigCommands(program2) {
       } else {
         results.dynatrace_platform = { ok: null, message: "not configured" };
       }
+      if (cfg.logscale.baseUrl && cfg.logscale.token) {
+        try {
+          await http.logscale("/api/v1/repositories");
+          results.logscale = { ok: true, message: "connected" };
+        } catch (err) {
+          results.logscale = { ok: false, message: err instanceof Error ? err.message : String(err) };
+        }
+      } else {
+        results.logscale = { ok: null, message: "not configured" };
+      }
       success(results, "config", "test", start);
     } catch (err) {
       fail(err, "config", "test", start);
@@ -5867,8 +5919,8 @@ function registerConfigCommands(program2) {
       } else {
         try {
           const collection = cfg.defaults.ado?.collection;
-          const path8 = collection ? `/${encodeURIComponent(collection)}/_apis/connectionData?api-version=7.1-preview.1` : "/_apis/projectCollections?api-version=7.1";
-          await http.ado(path8, { timeoutMs: 1e4 });
+          const path9 = collection ? `/${encodeURIComponent(collection)}/_apis/connectionData?api-version=7.1-preview.1` : "/_apis/projectCollections?api-version=7.1";
+          await http.ado(path9, { timeoutMs: 1e4 });
           results.ado = { status: "valid", message: "ok" };
         } catch (err) {
           results.ado = categorize2(err);
@@ -6006,11 +6058,23 @@ function registerConfigCommands(program2) {
           results.dynatrace_platform = categorize2(err);
         }
       }
+      if (!cfg.logscale.token) {
+        results.logscale = { status: "blank", message: "not configured" };
+      } else if (!cfg.logscale.baseUrl) {
+        results.logscale = { status: "error", message: "baseUrl not configured" };
+      } else {
+        try {
+          await http.logscale("/api/v1/repositories", { timeoutMs: 1e4 });
+          results.logscale = { status: "valid", message: "ok" };
+        } catch (err) {
+          results.logscale = 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", "dynatrace", "dynatrace_platform"];
+        const services = ["jira", "bitbucket", "github", "confluence", "sonar", "sde", "ado", "jenkins", "udeploy", "artifactory", "checkmarx", "servicenow", "contrast", "sonatypeiq", "openshift", "dynatrace", "dynatrace_platform", "logscale"];
         const labelWidth = 14;
         const statusWidth = 9;
         for (const svc of services) {
@@ -6024,7 +6088,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", "dynatrace", "dynatrace_platform"];
+          const services = ["jira", "bitbucket", "github", "confluence", "sonar", "sde", "ado", "jenkins", "udeploy", "artifactory", "checkmarx", "servicenow", "contrast", "sonatypeiq", "openshift", "dynatrace", "dynatrace_platform", "logscale"];
           const labelWidth = 14;
           const statusWidth = 9;
           for (const svc of services) {
@@ -6647,6 +6711,40 @@ async function initGlobalConfig(start) {
       }
     }
   }
+  process.stderr.write("\n\u2500\u2500 LogScale \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 useLogscale = await confirm({
+    message: "Configure LogScale (Falcon LogScale / Humio) for log queries?",
+    default: false
+  });
+  let logscaleBaseUrl = "";
+  let logscaleToken = "";
+  if (useLogscale) {
+    logscaleBaseUrl = await input({
+      message: "LogScale base URL (e.g. https://logscale.imagile.dev):",
+      default: ""
+    });
+    logscaleToken = await password({
+      message: "LogScale personal access token:"
+    });
+    if (logscaleBaseUrl && logscaleToken) {
+      process.stderr.write("\n  Verifying connection...\n");
+      try {
+        const tempConfig = {
+          ...loadConfig(),
+          logscale: {
+            baseUrl: normalizeBaseUrl(logscaleBaseUrl),
+            token: logscaleToken
+          }
+        };
+        const tempHttp = createHttpClient(tempConfig);
+        await tempHttp.logscale("/api/v1/repositories");
+        process.stderr.write("  Connected.\n");
+      } catch (err) {
+        warn(`Could not connect to LogScale: ${err instanceof Error ? err.message : String(err)}`);
+        warn("Config will be saved anyway. Check your URL and token and re-run pncli config init or 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):",
@@ -6786,6 +6884,12 @@ async function initGlobalConfig(start) {
         platformToken: dynatracePlatformToken || void 0
       }
     } : {},
+    ...useLogscale && logscaleBaseUrl ? {
+      logscale: {
+        baseUrl: normalizeBaseUrl(logscaleBaseUrl),
+        token: logscaleToken || void 0
+      }
+    } : {},
     defaults: {
       jira: {
         project: jiraProject || void 0
@@ -7263,7 +7367,7 @@ function registerAdoProjectCommands(ado) {
 
 // src/services/ado/commands/work.ts
 import fs3 from "fs";
-import path6 from "path";
+import path7 from "path";
 
 // src/services/ado/input-schema.ts
 var ADO_WORK_INPUT_FILE_SCHEMA = {
@@ -7504,9 +7608,9 @@ function registerAdoWorkCommands(ado) {
       const attachments = await workClient.listAttachments(collection, parseInt(opts.id, 10));
       const attachment = attachments.find((a) => a.id === opts.attachmentId);
       if (!attachment) throw new PncliError(`Attachment not found: ${opts.attachmentId}`, 1);
-      const outDir = opts.dir ?? path6.join(process.cwd(), ".pncli");
+      const outDir = opts.dir ?? path7.join(process.cwd(), ".pncli");
       fs3.mkdirSync(outDir, { recursive: true });
-      const outPath = path6.join(outDir, path6.basename(attachment.name));
+      const outPath = path7.join(outDir, path7.basename(attachment.name));
       const buffer = await workClient.downloadAttachment(attachment.url);
       fs3.writeFileSync(outPath, buffer);
       success({ saved: outPath, name: attachment.name, size: buffer.length }, "ado", "work-download-attachment", start);
@@ -7666,7 +7770,7 @@ function registerAdoRepoCommands(ado) {
       fail(err, "ado", "repo-get-pr", start);
     }
   });
-  repo.command("create-pr").description("Create a pull request").requiredOption("--title <title>", "PR title").requiredOption("--source <branch>", "Source branch").option("--target <branch>", "Target branch (default: main)", "main").option("--description <text>", "PR description").option("--reviewers <ids>", "Comma-separated reviewer IDs or display names").action(async (opts) => {
+  repo.command("create-pr").description("Create a pull request").requiredOption("--title <title>", "PR title").requiredOption("--source <branch>", "Source branch").option("--target <branch>", "Target branch (default: main)", "main").option("--description <text>", "PR description").option("--reviewers <ids>", "Comma-separated reviewer IDs or display names").option("--draft", "Create as a draft pull request").action(async (opts) => {
     const start = Date.now();
     try {
       const { collection, project, repo: repo2, gitClient } = getAdoContext(ado, true);
@@ -7676,14 +7780,15 @@ function registerAdoRepoCommands(ado) {
         description: opts.description,
         sourceRefName: `refs/heads/${opts.source}`,
         targetRefName: `refs/heads/${opts.target}`,
-        reviewers
+        reviewers,
+        ...opts.draft !== void 0 ? { isDraft: opts.draft } : {}
       });
       success(data, "ado", "repo-create-pr", start);
     } catch (err) {
       fail(err, "ado", "repo-create-pr", start);
     }
   });
-  repo.command("update-pr").description("Update a pull request").requiredOption("--id <n>", "Pull request ID").option("--title <title>", "New title").option("--description <text>", "New description").option("--reviewers <ids>", "Comma-separated reviewer IDs").action(async (opts) => {
+  repo.command("update-pr").description("Update a pull request").requiredOption("--id <n>", "Pull request ID").option("--title <title>", "New title").option("--description <text>", "New description").option("--reviewers <ids>", "Comma-separated reviewer IDs").option("--draft <bool>", "Set draft status: true|false").action(async (opts) => {
     const start = Date.now();
     try {
       const { collection, project, repo: repo2, gitClient } = getAdoContext(ado, true);
@@ -7692,6 +7797,7 @@ function registerAdoRepoCommands(ado) {
       if (opts.title) body.title = opts.title;
       if (opts.description !== void 0) body.description = opts.description;
       if (reviewers) body.reviewers = reviewers;
+      if (opts.draft !== void 0) body.isDraft = opts.draft === "true";
       const data = await gitClient.updatePR(collection, project, repo2, parseInt(opts.id, 10), body);
       success(data, "ado", "repo-update-pr", start);
     } catch (err) {
@@ -7873,11 +7979,11 @@ function registerAdoRepoCommands(ado) {
       const start = Date.now();
       try {
         const globalOpts = ado.optsWithGlobals();
-        const { loadConfig: lc } = await import("./config-CPRXY5SN.js");
+        const { loadConfig: lc } = await import("./config-QN5FFAZY.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-IXJA4TMS.js");
+        const { createHttpClient: createHttpClient2 } = await import("./http-MCIU2IV6.js");
         const http = createHttpClient2(config, Boolean(globalOpts.dryRun));
         const coreClient = new AdoCoreClient2(http);
         const me = await coreClient.getConnectionData(collection);
@@ -8278,18 +8384,18 @@ var ArtifactoryClient = class {
       }
     });
   }
-  async getStorageInfo(repo, path8) {
-    const cleanPath = path8.startsWith("/") ? path8.slice(1) : path8;
+  async getStorageInfo(repo, path9) {
+    const cleanPath = path9.startsWith("/") ? path9.slice(1) : path9;
     return this.http.artifactory(`${API9}/storage/${repo}/${cleanPath}`);
   }
-  async getProperties(repo, path8) {
-    const cleanPath = path8.startsWith("/") ? path8.slice(1) : path8;
+  async getProperties(repo, path9) {
+    const cleanPath = path9.startsWith("/") ? path9.slice(1) : path9;
     return this.http.artifactory(`${API9}/storage/${repo}/${cleanPath}`, {
       params: { properties: "" }
     });
   }
-  async setProperties(repo, path8, properties, opts = {}) {
-    const cleanPath = path8.startsWith("/") ? path8.slice(1) : path8;
+  async setProperties(repo, path9, properties, opts = {}) {
+    const cleanPath = path9.startsWith("/") ? path9.slice(1) : path9;
     const propString = Object.entries(properties).map(([k, v]) => `${k}=${v}`).join(";");
     await this.http.artifactory(`${API9}/storage/${repo}/${cleanPath}`, {
       method: "PUT",
@@ -8371,27 +8477,27 @@ function registerArtifactoryCommands(program2) {
       fail(err, "artifactory", "repos", start);
     }
   });
-  art.command("artifact-info <repo> <path>").description("Get metadata for an artifact or folder (checksums, size, timestamps)").action(async (repo, path8) => {
+  art.command("artifact-info <repo> <path>").description("Get metadata for an artifact or folder (checksums, size, timestamps)").action(async (repo, path9) => {
     const start = Date.now();
     try {
       const client = getClient8(program2);
-      const data = await client.getStorageInfo(repo, path8);
+      const data = await client.getStorageInfo(repo, path9);
       success(data, "artifactory", "artifact-info", start);
     } catch (err) {
       fail(err, "artifactory", "artifact-info", start);
     }
   });
-  art.command("properties-get <repo> <path>").description("Read custom properties on an artifact").action(async (repo, path8) => {
+  art.command("properties-get <repo> <path>").description("Read custom properties on an artifact").action(async (repo, path9) => {
     const start = Date.now();
     try {
       const client = getClient8(program2);
-      const data = await client.getProperties(repo, path8);
+      const data = await client.getProperties(repo, path9);
       success(data, "artifactory", "properties-get", start);
     } catch (err) {
       fail(err, "artifactory", "properties-get", start);
     }
   });
-  art.command("properties-set <repo> <path> [keyvals...]").description("Set custom properties on an artifact (format: key=value key=value...)").option("--recursive", "Apply recursively to folder contents", false).action(async (repo, path8, keyvals, opts) => {
+  art.command("properties-set <repo> <path> [keyvals...]").description("Set custom properties on an artifact (format: key=value key=value...)").option("--recursive", "Apply recursively to folder contents", false).action(async (repo, path9, keyvals, opts) => {
     const start = Date.now();
     try {
       if (!keyvals.length) throw new PncliError("Provide at least one key=value pair");
@@ -8402,8 +8508,8 @@ function registerArtifactoryCommands(program2) {
         properties[kv.slice(0, eq)] = kv.slice(eq + 1);
       }
       const client = getClient8(program2);
-      await client.setProperties(repo, path8, properties, { recursive: opts.recursive });
-      success({ repo, path: path8, properties }, "artifactory", "properties-set", start);
+      await client.setProperties(repo, path9, properties, { recursive: opts.recursive });
+      success({ repo, path: path9, properties }, "artifactory", "properties-set", start);
     } catch (err) {
       fail(err, "artifactory", "properties-set", start);
     }
@@ -9010,8 +9116,8 @@ function registerSonatypeIqCommands(program2) {
     const startTime = Date.now();
     try {
       const http = getHttpClient(program2);
-      const path8 = opts.organizationId ? `/api/v2/policies/organization/${encodeURIComponent(opts.organizationId)}` : "/api/v2/policies";
-      const data = await http.sonatypeiq(path8);
+      const path9 = opts.organizationId ? `/api/v2/policies/organization/${encodeURIComponent(opts.organizationId)}` : "/api/v2/policies";
+      const data = await http.sonatypeiq(path9);
       success(data, "sonatypeiq", "policies list", startTime);
     } catch (err) {
       fail(err, "sonatypeiq", "policies list", startTime);
@@ -9021,11 +9127,13 @@ function registerSonatypeIqCommands(program2) {
 
 // src/services/skills/commands.ts
 import fs4 from "fs";
-import path7 from "path";
+import path8 from "path";
 import os from "os";
 import { fileURLToPath } from "url";
 import { execFileSync as execFileSync3 } from "child_process";
 import select from "@inquirer/select";
+import checkbox, { Separator } from "@inquirer/checkbox";
+import input2 from "@inquirer/input";
 var BACK = "__back__";
 var ALL_MARKETPLACES = "__all_marketplaces__";
 function injectTokenIntoUrl(url, token) {
@@ -9049,7 +9157,7 @@ function repoNameFromUrl(url) {
   }
 }
 function defaultMarketplacePath(url) {
-  return path7.join(os.homedir(), ".agents", "marketplaces", repoNameFromUrl(url));
+  return path8.join(os.homedir(), ".agents", "marketplaces", repoNameFromUrl(url));
 }
 function marketplaceLabel(m) {
   return m.name ?? repoNameFromUrl(m.repoUrl ?? "");
@@ -9063,8 +9171,8 @@ function assertInteractive(hint) {
   }
 }
 var AGENT_PATHS = {
-  "github-copilot": { project: ".agents/skills", user: path7.join(os.homedir(), ".agents/skills") },
-  "claude-code": { project: ".claude/skills", user: path7.join(os.homedir(), ".claude/skills") }
+  "github-copilot": { project: ".agents/skills", user: path8.join(os.homedir(), ".agents/skills") },
+  "claude-code": { project: ".claude/skills", user: path8.join(os.homedir(), ".claude/skills") }
 };
 function resolveAgentName(opts) {
   return opts.claude ? "claude-code" : opts.agent ?? "github-copilot";
@@ -9076,18 +9184,25 @@ function resolveAgentPaths(agentName) {
   }
   return agentConfig;
 }
+function resolveTargetDir(opts) {
+  if (opts.target) return path8.resolve(opts.target);
+  const agentConfig = resolveAgentPaths(resolveAgentName(opts));
+  const scopePath = (opts.scope ?? "user") === "project" ? agentConfig.project : agentConfig.user;
+  return path8.resolve(scopePath);
+}
 function getBundledSkillsDir() {
   try {
     const thisFile = fileURLToPath(import.meta.url);
-    return path7.resolve(path7.dirname(thisFile), "..", "skills");
+    return path8.resolve(path8.dirname(thisFile), "..", "skills");
   } catch {
     return "";
   }
 }
 function getInstalledMetaPath(targetDir) {
-  return path7.join(targetDir, ".pncli-installed.json");
+  return path8.join(targetDir, ".pncli-installed.json");
 }
 var SKILL_ORIGIN_FILENAME = "pncli-origin.json";
+var DISABLED_SUBDIR = ".pncli-disabled";
 function readInstalledMeta(targetDir) {
   const metaPath = getInstalledMetaPath(targetDir);
   const raw = loadJsonFile(metaPath);
@@ -9095,7 +9210,7 @@ function readInstalledMeta(targetDir) {
   return { version: 1, skills: {} };
 }
 function getSkillOriginPath(skillDir) {
-  return path7.join(skillDir, SKILL_ORIGIN_FILENAME);
+  return path8.join(skillDir, SKILL_ORIGIN_FILENAME);
 }
 function readSkillOrigin(skillDir) {
   const originPath = getSkillOriginPath(skillDir);
@@ -9107,6 +9222,132 @@ function readSkillOrigin(skillDir) {
   }
   return null;
 }
+function matchesMarketplaceFilter(record, filter) {
+  return !filter || record.marketplace === filter || record.installedFrom === filter;
+}
+function resolveSkillRecord(meta, targetDir, skillName) {
+  const fromMeta = meta.skills[skillName];
+  if (fromMeta) return fromMeta;
+  const perSkill = readSkillOrigin(path8.join(targetDir, skillName));
+  if (!perSkill) return null;
+  return {
+    source: perSkill.source,
+    marketplace: perSkill.marketplace,
+    plugin: perSkill.plugin,
+    installedFrom: perSkill.installedFrom,
+    branch: perSkill.branch,
+    installedAt: perSkill.installedAt
+  };
+}
+function listActiveSkillDirs(targetDir) {
+  return fs4.readdirSync(targetDir).filter((name) => {
+    if (name.startsWith(".")) return false;
+    const p = path8.join(targetDir, name);
+    try {
+      return fs4.statSync(p).isDirectory();
+    } catch {
+      return false;
+    }
+  });
+}
+function disablePluginSkills(targetDir, plugin, marketplaceFilter) {
+  const resolvedTarget = path8.resolve(targetDir);
+  const stashDir = path8.join(targetDir, DISABLED_SUBDIR);
+  const meta = readInstalledMeta(targetDir);
+  const disabled = [];
+  const alreadyDisabled = [];
+  const skipped = [];
+  for (const skillName of listActiveSkillDirs(targetDir)) {
+    const skillDir = path8.resolve(targetDir, skillName);
+    if (!skillDir.startsWith(resolvedTarget + path8.sep)) continue;
+    const record = resolveSkillRecord(meta, targetDir, skillName);
+    if (!record || record.source !== "marketplace") {
+      skipped.push(skillName);
+      continue;
+    }
+    if (!matchesMarketplaceFilter(record, marketplaceFilter) || record.plugin !== plugin) {
+      skipped.push(skillName);
+      continue;
+    }
+    const stashDest = path8.join(stashDir, skillName);
+    fs4.mkdirSync(stashDir, { recursive: true });
+    if (fs4.existsSync(stashDest)) fs4.rmSync(stashDest, { recursive: true, force: true });
+    fs4.renameSync(skillDir, stashDest);
+    delete meta.skills[skillName];
+    meta.disabled = meta.disabled ?? {};
+    meta.disabled[skillName] = record;
+    disabled.push(skillName);
+  }
+  for (const [skillName, record] of Object.entries(meta.disabled ?? {})) {
+    if (record.plugin === plugin && matchesMarketplaceFilter(record, marketplaceFilter) && !disabled.includes(skillName)) {
+      alreadyDisabled.push(skillName);
+    }
+  }
+  if (disabled.length > 0) {
+    fs4.writeFileSync(getInstalledMetaPath(targetDir), JSON.stringify(meta, null, 2), "utf8");
+  }
+  return { disabled, alreadyDisabled, skipped };
+}
+function enablePluginSkills(targetDir, plugin, marketplaceFilter) {
+  const resolvedTarget = path8.resolve(targetDir);
+  const stashDir = path8.join(targetDir, DISABLED_SUBDIR);
+  const meta = readInstalledMeta(targetDir);
+  const enabled = [];
+  const stashMissing = [];
+  const skipped = [];
+  const disabledEntries = Object.entries(meta.disabled ?? {});
+  for (const [skillName, record] of disabledEntries) {
+    if (record.plugin !== plugin || !matchesMarketplaceFilter(record, marketplaceFilter)) {
+      skipped.push(skillName);
+      continue;
+    }
+    const dest = path8.resolve(targetDir, skillName);
+    if (!dest.startsWith(resolvedTarget + path8.sep)) {
+      skipped.push(skillName);
+      continue;
+    }
+    const stashSrc = path8.join(stashDir, skillName);
+    if (!fs4.existsSync(stashSrc)) {
+      stashMissing.push(skillName);
+      continue;
+    }
+    if (fs4.existsSync(dest)) fs4.rmSync(dest, { recursive: true, force: true });
+    fs4.renameSync(stashSrc, dest);
+    meta.skills[skillName] = record;
+    delete meta.disabled[skillName];
+    enabled.push(skillName);
+  }
+  if (fs4.existsSync(stashDir) && fs4.readdirSync(stashDir).length === 0) {
+    fs4.rmdirSync(stashDir);
+  }
+  if (enabled.length > 0) {
+    fs4.writeFileSync(getInstalledMetaPath(targetDir), JSON.stringify(meta, null, 2), "utf8");
+  }
+  return { enabled, stashMissing, skipped, hadDisabled: disabledEntries.length > 0 };
+}
+function listPluginStates(targetDir) {
+  const meta = readInstalledMeta(targetDir);
+  const byKey = /* @__PURE__ */ new Map();
+  const bucketFor = (record) => {
+    if (record.source !== "marketplace" || !record.plugin) return null;
+    const marketplaceName = record.marketplace ?? record.installedFrom;
+    const key = `${marketplaceName ?? ""}\0${record.plugin}`;
+    let state = byKey.get(key);
+    if (!state) {
+      state = { plugin: record.plugin, marketplace: marketplaceName, activeSkills: [], disabledSkills: [] };
+      byKey.set(key, state);
+    }
+    return state;
+  };
+  for (const skillName of listActiveSkillDirs(targetDir)) {
+    const record = resolveSkillRecord(meta, targetDir, skillName);
+    if (record) bucketFor(record)?.activeSkills.push(skillName);
+  }
+  for (const [skillName, record] of Object.entries(meta.disabled ?? {})) {
+    bucketFor(record)?.disabledSkills.push(skillName);
+  }
+  return [...byKey.values()].sort((a, b) => a.plugin.localeCompare(b.plugin));
+}
 function detectRepoBranch(repoPath) {
   try {
     const result = execFileSync3("git", ["-C", repoPath, "rev-parse", "--abbrev-ref", "HEAD"], {
@@ -9125,7 +9366,7 @@ function recordInstalledSkills(targetDir, skillNames, record) {
   for (const skillName of skillNames) {
     const fullRecord = { ...record, installedAt: now };
     meta.skills[skillName] = fullRecord;
-    const skillDir = path7.join(targetDir, skillName);
+    const skillDir = path8.join(targetDir, skillName);
     if (fs4.existsSync(skillDir)) {
       const origin = { version: 1, ...fullRecord };
       try {
@@ -9195,7 +9436,7 @@ function upsertMarketplace(all, entry) {
   }
 }
 function cloneOrReuseMarketplace(url, resolvedPath, opts) {
-  const hasGit = fs4.existsSync(path7.join(resolvedPath, ".git"));
+  const hasGit = fs4.existsSync(path8.join(resolvedPath, ".git"));
   if (fs4.existsSync(resolvedPath) && !hasGit && fs4.readdirSync(resolvedPath).length > 0) {
     throw new Error(`Directory already exists and is not a git repo: ${resolvedPath}`);
   }
@@ -9263,7 +9504,7 @@ function installPluginsForMarketplace(marketplacePath, marketplaceName, repoUrl,
     results[pluginName] = { installed, failed };
     totalInstalled += installed.length;
     for (const skill of installed) {
-      warn(`  ${skill}: ${path7.join(skillsSrc, skill)} \u2192 ${path7.join(targetDir, skill)}`);
+      warn(`  ${skill}: ${path8.join(skillsSrc, skill)} \u2192 ${path8.join(targetDir, skill)}`);
     }
     if (failed.length > 0) {
       warn(`Skipped ${failed.length} skill(s) with invalid names in "${pluginName}": ${failed.join(", ")}`);
@@ -9315,34 +9556,55 @@ function syncMarketplacePlugins(m, targetDir, force, pluginFilter) {
     return { marketplace: marketplaceName, skipped: true, error: message };
   }
 }
+function performMarketplaceAdd(url, localPath, opts) {
+  const resolvedPath = path8.resolve(localPath ?? defaultMarketplacePath(url));
+  const marketplaceName = opts.name ?? repoNameFromUrl(url);
+  cloneOrReuseMarketplace(url, resolvedPath, opts);
+  const configPath = getGlobalConfigPath();
+  const { existing, all } = loadMarketplacesConfig(configPath);
+  const entry = {
+    name: marketplaceName,
+    repoUrl: url,
+    localPath: resolvedPath,
+    ...opts.token ? { token: opts.token } : {}
+  };
+  upsertMarketplace(all, entry);
+  saveMarketplaces(configPath, existing, all);
+  const targetDir = resolveAgentPaths(resolveAgentName(opts)).user;
+  const { pluginResults, totalInstalled } = installAllPlugins(resolvedPath, marketplaceName, url, targetDir);
+  return {
+    name: marketplaceName,
+    repoUrl: url,
+    localPath: resolvedPath,
+    branch: opts.branch ?? null,
+    tokenConfigured: !!opts.token,
+    plugins: pluginResults,
+    total: totalInstalled,
+    target: targetDir
+  };
+}
+function performMarketplaceRemove(name) {
+  const configPath = getGlobalConfigPath();
+  const { existing, all } = loadMarketplacesConfig(configPath);
+  const idx = all.findIndex((m) => m.name === name || m.repoUrl === name);
+  if (idx === -1) {
+    throw new Error(`Marketplace "${name}" not found. Run: pncli skills marketplace list`);
+  }
+  const removed = all.splice(idx, 1)[0];
+  saveMarketplaces(configPath, existing, all);
+  return {
+    removed: {
+      name: marketplaceLabel(removed),
+      repoUrl: removed.repoUrl,
+      localPath: removed.localPath
+    },
+    remaining: all.length
+  };
+}
 async function marketplaceAddAction(url, localPath, opts, commandName) {
   const start = Date.now();
   try {
-    const resolvedPath = path7.resolve(localPath ?? defaultMarketplacePath(url));
-    const marketplaceName = opts.name ?? repoNameFromUrl(url);
-    cloneOrReuseMarketplace(url, resolvedPath, opts);
-    const configPath = getGlobalConfigPath();
-    const { existing, all } = loadMarketplacesConfig(configPath);
-    const entry = {
-      name: marketplaceName,
-      repoUrl: url,
-      localPath: resolvedPath,
-      ...opts.token ? { token: opts.token } : {}
-    };
-    upsertMarketplace(all, entry);
-    saveMarketplaces(configPath, existing, all);
-    const targetDir = resolveAgentPaths(resolveAgentName(opts)).user;
-    const { pluginResults, totalInstalled } = installAllPlugins(resolvedPath, marketplaceName, url, targetDir);
-    success({
-      name: marketplaceName,
-      repoUrl: url,
-      localPath: resolvedPath,
-      branch: opts.branch ?? null,
-      tokenConfigured: !!opts.token,
-      plugins: pluginResults,
-      total: totalInstalled,
-      target: targetDir
-    }, "skills", commandName, start);
+    success(performMarketplaceAdd(url, localPath, opts), "skills", commandName, start);
   } catch (err) {
     fail(err, "skills", commandName, start);
   }
@@ -9354,19 +9616,19 @@ function registerSkillsCommands(program2) {
     try {
       let targetDir;
       if (opts.target) {
-        targetDir = path7.resolve(opts.target);
+        targetDir = path8.resolve(opts.target);
       } else {
         const agentConfig = resolveAgentPaths(opts.agent);
         const scopePath = opts.scope === "user" ? agentConfig.user : agentConfig.project;
-        targetDir = path7.resolve(scopePath);
+        targetDir = path8.resolve(scopePath);
       }
-      const resolvedTarget = path7.resolve(targetDir);
+      const resolvedTarget = path8.resolve(targetDir);
       const bundledDir = getBundledSkillsDir();
       let skillDirs = [];
       if (bundledDir !== "") {
         try {
           skillDirs = fs4.readdirSync(bundledDir).filter(
-            (name) => fs4.existsSync(path7.join(bundledDir, name, "SKILL.md"))
+            (name) => fs4.existsSync(path8.join(bundledDir, name, "SKILL.md"))
           );
         } catch {
         }
@@ -9377,25 +9639,25 @@ function registerSkillsCommands(program2) {
       const installed = [];
       const failed = [];
       for (const skillName of skillDirs) {
-        const existingDir = path7.resolve(targetDir, skillName);
-        if (!existingDir.startsWith(resolvedTarget + path7.sep)) continue;
+        const existingDir = path8.resolve(targetDir, skillName);
+        if (!existingDir.startsWith(resolvedTarget + path8.sep)) continue;
         if (fs4.existsSync(existingDir)) {
           fs4.rmSync(existingDir, { recursive: true, force: true });
         }
       }
       warn(`Installing ${skillDirs.length} bundled skill(s) to ${targetDir}...`);
       for (const skillName of skillDirs) {
-        const skillDir = path7.resolve(targetDir, skillName);
-        if (!skillDir.startsWith(resolvedTarget + path7.sep)) {
+        const skillDir = path8.resolve(targetDir, skillName);
+        if (!skillDir.startsWith(resolvedTarget + path8.sep)) {
           failed.push(skillName);
           continue;
         }
         try {
-          const mdFiles = fs4.readdirSync(path7.join(bundledDir, skillName)).filter((f) => f.endsWith(".md"));
+          const mdFiles = fs4.readdirSync(path8.join(bundledDir, skillName)).filter((f) => f.endsWith(".md"));
           fs4.mkdirSync(skillDir, { recursive: true });
           for (const mdFile of mdFiles) {
-            const content = fs4.readFileSync(path7.join(bundledDir, skillName, mdFile), "utf8");
-            fs4.writeFileSync(path7.join(skillDir, mdFile), content, "utf8");
+            const content = fs4.readFileSync(path8.join(bundledDir, skillName, mdFile), "utf8");
+            fs4.writeFileSync(path8.join(skillDir, mdFile), content, "utf8");
           }
           installed.push(skillName);
         } catch {
@@ -9425,11 +9687,11 @@ function registerSkillsCommands(program2) {
     try {
       let targetDir;
       if (opts.target) {
-        targetDir = path7.resolve(opts.target);
+        targetDir = path8.resolve(opts.target);
       } else {
         const agentConfig = resolveAgentPaths(opts.agent);
         const scopePath = opts.scope === "user" ? agentConfig.user : agentConfig.project;
-        targetDir = path7.resolve(scopePath);
+        targetDir = path8.resolve(scopePath);
       }
       if (!fs4.existsSync(targetDir)) {
         success({ skills: [], message: `No skills directory found at ${targetDir}. Run: pncli skills install` }, "skills", "list", start);
@@ -9438,11 +9700,11 @@ function registerSkillsCommands(program2) {
       const meta = readInstalledMeta(targetDir);
       const skillDirs = fs4.readdirSync(targetDir).filter((name) => {
         if (name.startsWith(".")) return false;
-        const skillPath = path7.join(targetDir, name, "SKILL.md");
+        const skillPath = path8.join(targetDir, name, "SKILL.md");
         return fs4.existsSync(skillPath);
       });
       const skillsList = skillDirs.map((name) => {
-        const content = fs4.readFileSync(path7.join(targetDir, name, "SKILL.md"), "utf8");
+        const content = fs4.readFileSync(path8.join(targetDir, name, "SKILL.md"), "utf8");
         const frontmatter = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
         const data = {};
         const metadata = {};
@@ -9486,15 +9748,15 @@ function registerSkillsCommands(program2) {
     try {
       let targetDir;
       if (opts.target) {
-        targetDir = path7.resolve(opts.target);
+        targetDir = path8.resolve(opts.target);
       } else {
         const agentConfig = resolveAgentPaths(resolveAgentName(opts));
         const scopePath = opts.scope === "project" ? agentConfig.project : agentConfig.user;
-        targetDir = path7.resolve(scopePath);
+        targetDir = path8.resolve(scopePath);
       }
-      const resolvedTarget = path7.resolve(targetDir);
-      const skillDir = path7.resolve(targetDir, name);
-      if (!skillDir.startsWith(resolvedTarget + path7.sep)) {
+      const resolvedTarget = path8.resolve(targetDir);
+      const skillDir = path8.resolve(targetDir, name);
+      if (!skillDir.startsWith(resolvedTarget + path8.sep)) {
         throw new Error(`Invalid skill name: "${name}"`);
       }
       if (!fs4.existsSync(skillDir)) {
@@ -9568,27 +9830,12 @@ function registerSkillsCommands(program2) {
   marketplace.command("remove").description("Remove a registered marketplace from the config (does not delete the local clone)").argument("<name>", "Name of the marketplace to remove").action((name) => {
     const start = Date.now();
     try {
-      const configPath = getGlobalConfigPath();
-      const { existing, all } = loadMarketplacesConfig(configPath);
-      const idx = all.findIndex((m) => m.name === name || m.repoUrl === name);
-      if (idx === -1) {
-        throw new Error(`Marketplace "${name}" not found. Run: pncli skills marketplace list`);
-      }
-      const removed = all.splice(idx, 1)[0];
-      saveMarketplaces(configPath, existing, all);
-      success({
-        removed: {
-          name: marketplaceLabel(removed),
-          repoUrl: removed.repoUrl,
-          localPath: removed.localPath
-        },
-        remaining: all.length
-      }, "skills", "marketplace-remove", start);
+      success(performMarketplaceRemove(name), "skills", "marketplace-remove", start);
     } catch (err) {
       fail(err, "skills", "marketplace-remove", start);
     }
   });
-  marketplace.command("sync").description("Pull latest marketplace content and install plugin skills").argument("[plugin]", 'Plugin name to install, or "all" to install every plugin (skips interactive selection)').option("--marketplace <name>", 'Marketplace name to sync, or "all" to sync every registered marketplace (skips interactive selection)').option("--agent <agent>", "Target agent host: github-copilot | claude-code (default: github-copilot)").option("--claude", "Shorthand for --agent claude-code").option("--force", 'Reinstall even if a marketplace has no new changes (applies to single-plugin and "all" installs alike)').action(async (plugin, opts) => {
+  marketplace.command("sync").description("Pull latest marketplace content and install plugin skills (interactive picker when no plugin is given)").argument("[plugin]", 'Plugin name to install, or "all" to install every plugin (skips interactive selection)').option("--marketplace <name>", 'Marketplace name to sync, or "all" to sync every registered marketplace (skips interactive selection)').option("--agent <agent>", "Target agent host: github-copilot | claude-code (default: github-copilot)").option("--claude", "Shorthand for --agent claude-code").option("--force", 'Reinstall even if a marketplace has no new changes (applies to single-plugin and "all" installs alike)').action(async (plugin, opts) => {
     const start = Date.now();
     try {
       const configPath = getGlobalConfigPath();
@@ -9701,13 +9948,13 @@ function registerSkillsCommands(program2) {
     try {
       let targetDir;
       if (opts.target) {
-        targetDir = path7.resolve(opts.target);
+        targetDir = path8.resolve(opts.target);
       } else {
         const agentConfig = resolveAgentPaths(resolveAgentName(opts));
         const scopePath = (opts.scope ?? "user") === "project" ? agentConfig.project : agentConfig.user;
-        targetDir = path7.resolve(scopePath);
+        targetDir = path8.resolve(scopePath);
       }
-      const resolvedTarget = path7.resolve(targetDir);
+      const resolvedTarget = path8.resolve(targetDir);
       if (!fs4.existsSync(targetDir)) {
         success({ removed: [], total: 0, target: targetDir, message: "No skills directory found." }, "skills", "marketplace-purge-plugin", start);
         return;
@@ -9717,7 +9964,7 @@ function registerSkillsCommands(program2) {
       const skipped = [];
       const skillDirs = fs4.readdirSync(targetDir).filter((name) => {
         if (name.startsWith(".")) return false;
-        const p = path7.join(targetDir, name);
+        const p = path8.join(targetDir, name);
         try {
           return fs4.statSync(p).isDirectory();
         } catch {
@@ -9725,8 +9972,8 @@ function registerSkillsCommands(program2) {
         }
       });
       for (const skillName of skillDirs) {
-        const skillDir = path7.resolve(targetDir, skillName);
-        if (!skillDir.startsWith(resolvedTarget + path7.sep)) continue;
+        const skillDir = path8.resolve(targetDir, skillName);
+        if (!skillDir.startsWith(resolvedTarget + path8.sep)) continue;
         let record = meta.skills[skillName] ?? null;
         if (!record) {
           const perSkill = readSkillOrigin(skillDir);
@@ -9770,6 +10017,161 @@ function registerSkillsCommands(program2) {
       fail(err, "skills", "marketplace-purge-plugin", start);
     }
   });
+  marketplace.command("disable").description("Temporarily deactivate a plugin's skills without deleting them (re-enable with `marketplace enable`)").argument("<plugin>", "Plugin name to disable").option("--marketplace <name>", "Restrict 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 {
+      const targetDir = resolveTargetDir(opts);
+      if (!fs4.existsSync(targetDir)) {
+        success({ disabled: [], total: 0, target: targetDir, message: "No skills directory found." }, "skills", "marketplace-disable", start);
+        return;
+      }
+      const result = disablePluginSkills(targetDir, plugin, opts.marketplace);
+      success({
+        disabled: result.disabled,
+        alreadyDisabled: result.alreadyDisabled,
+        skipped: result.skipped.length,
+        total: result.disabled.length,
+        target: targetDir,
+        plugin,
+        stash: path8.join(targetDir, DISABLED_SUBDIR),
+        ...opts.marketplace ? { marketplace: opts.marketplace } : {}
+      }, "skills", "marketplace-disable", start);
+    } catch (err) {
+      fail(err, "skills", "marketplace-disable", start);
+    }
+  });
+  marketplace.command("enable").description("Re-activate a previously disabled plugin's skills").argument("<plugin>", "Plugin name to enable").option("--marketplace <name>", "Restrict 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 {
+      const targetDir = resolveTargetDir(opts);
+      if (!fs4.existsSync(targetDir)) {
+        success({ enabled: [], total: 0, target: targetDir, message: "No skills directory found." }, "skills", "marketplace-enable", start);
+        return;
+      }
+      const result = enablePluginSkills(targetDir, plugin, opts.marketplace);
+      if (!result.hadDisabled) {
+        success({ enabled: [], total: 0, target: targetDir, plugin, message: `No disabled skills found for plugin "${plugin}".` }, "skills", "marketplace-enable", start);
+        return;
+      }
+      success({
+        enabled: result.enabled,
+        skipped: result.skipped.length,
+        total: result.enabled.length,
+        target: targetDir,
+        plugin,
+        ...result.stashMissing.length > 0 ? {
+          stashMissing: result.stashMissing,
+          warning: `Skills marked disabled but missing from the stash were left as-is. Re-install the plugin (pncli skills marketplace sync ${plugin}) to restore them.`
+        } : {},
+        ...opts.marketplace ? { marketplace: opts.marketplace } : {}
+      }, "skills", "marketplace-enable", start);
+    } catch (err) {
+      fail(err, "skills", "marketplace-enable", start);
+    }
+  });
+  marketplace.command("manage").description("Manage marketplaces and plugins: toggle plugins on/off, add or remove marketplaces (interactive)").option("--agent <agent>", "Target agent host: 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(async (opts) => {
+    const start = Date.now();
+    try {
+      assertInteractive("Use `pncli skills marketplace enable|disable <plugin>`, `add <url>`, and `remove <name>` to manage non-interactively.");
+      const targetDir = resolveTargetDir(opts);
+      const enabledPlugins = [];
+      const disabledPlugins = [];
+      const stashMissing = [];
+      const addedMarketplaces = [];
+      const removedMarketplaces = [];
+      for (; ; ) {
+        const states = fs4.existsSync(targetDir) ? listPluginStates(targetDir) : [];
+        const registered = loadMarketplaces(getGlobalConfigPath());
+        const action = await select({
+          message: `Manage skills marketplaces (target: ${targetDir}):`,
+          choices: [
+            ...states.length > 0 ? [{ value: "toggle", name: `Toggle plugins on/off (${states.length} installed)` }] : [],
+            { value: "add", name: "Add a marketplace" },
+            ...registered.length > 0 ? [{ value: "remove", name: `Remove a marketplace (${registered.length} registered)` }] : [],
+            { value: "done", name: "Done" }
+          ]
+        });
+        if (action === "done") break;
+        if (action === "toggle") {
+          const sorted = [...states].sort((a, b) => (a.marketplace ?? "").localeCompare(b.marketplace ?? "") || a.plugin.localeCompare(b.plugin));
+          const choices = [];
+          let lastMarketplace = null;
+          sorted.forEach((state, index) => {
+            const marketplaceName = state.marketplace ?? "(unknown marketplace)";
+            if (marketplaceName !== lastMarketplace) {
+              choices.push(new Separator(`\u2500\u2500 ${marketplaceName} \u2500\u2500`));
+              lastMarketplace = marketplaceName;
+            }
+            const active = state.activeSkills.length;
+            const stashed = state.disabledSkills.length;
+            const skillCount = stashed === 0 ? `${active} skill${active === 1 ? "" : "s"}` : active === 0 ? `${stashed} skill${stashed === 1 ? "" : "s"}, disabled` : `${active} active, ${stashed} disabled`;
+            choices.push({ name: `${state.plugin} (${skillCount})`, value: index, checked: active > 0 });
+          });
+          const checkedIndexes = await checkbox({
+            message: "Toggle plugins (space toggles, enter applies):",
+            choices,
+            pageSize: 15
+          });
+          const wanted = new Set(checkedIndexes);
+          sorted.forEach((state, index) => {
+            if (wanted.has(index)) {
+              if (state.disabledSkills.length === 0) return;
+              const result = enablePluginSkills(targetDir, state.plugin, state.marketplace);
+              stashMissing.push(...result.stashMissing);
+              if (result.enabled.length > 0) {
+                enabledPlugins.push({ plugin: state.plugin, marketplace: state.marketplace, skills: result.enabled });
+              }
+            } else {
+              if (state.activeSkills.length === 0) return;
+              const result = disablePluginSkills(targetDir, state.plugin, state.marketplace);
+              if (result.disabled.length > 0) {
+                disabledPlugins.push({ plugin: state.plugin, marketplace: state.marketplace, skills: result.disabled });
+              }
+            }
+          });
+        } else if (action === "add") {
+          const url = (await input2({
+            message: "Git clone URL of the marketplace repository:",
+            validate: (v) => v.trim().length > 0 || "URL is required"
+          })).trim();
+          const name = (await input2({
+            message: "Marketplace name:",
+            default: repoNameFromUrl(url)
+          })).trim();
+          addedMarketplaces.push(performMarketplaceAdd(url, void 0, {
+            name: name || void 0,
+            agent: opts.agent,
+            claude: opts.claude
+          }));
+        } else if (action === "remove") {
+          const chosen = await select({
+            message: "Remove which marketplace? (the local clone is kept on disk)",
+            choices: [
+              // Index-based values: labels alone aren't guaranteed unique (two marketplaces can share a derived name).
+              ...registered.map((m, i) => ({ value: String(i), name: `${marketplaceLabel(m)} \u2014 ${m.repoUrl ?? ""}` })),
+              { value: BACK, name: "\u2190 Back" }
+            ]
+          });
+          if (chosen === BACK) continue;
+          const target = registered[Number(chosen)];
+          removedMarketplaces.push(performMarketplaceRemove(target.repoUrl ?? marketplaceLabel(target)));
+        }
+      }
+      success({
+        enabled: enabledPlugins,
+        disabled: disabledPlugins,
+        addedMarketplaces,
+        removedMarketplaces,
+        target: targetDir,
+        ...stashMissing.length > 0 ? {
+          stashMissing,
+          warning: "Skills marked disabled but missing from the stash were left as-is. Re-install their plugin (pncli skills marketplace sync <plugin>) to restore them."
+        } : {}
+      }, "skills", "marketplace-manage", start);
+    } catch (err) {
+      fail(err, "skills", "marketplace-manage", 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 {
@@ -9780,7 +10182,7 @@ function registerSkillsCommands(program2) {
       }
       const skillDirs = fs4.readdirSync(userDir).filter((name) => {
         if (name.startsWith(".")) return false;
-        const p = path7.join(userDir, name);
+        const p = path8.join(userDir, name);
         try {
           return fs4.statSync(p).isDirectory();
         } catch {
@@ -9798,8 +10200,8 @@ Re-run with --force to confirm, or use \`pncli skills marketplace purge-plugin\`
         );
       }
       for (const name of skillDirs) {
-        const skillDir = path7.resolve(userDir, name);
-        if (!skillDir.startsWith(path7.resolve(userDir) + path7.sep)) continue;
+        const skillDir = path8.resolve(userDir, name);
+        if (!skillDir.startsWith(path8.resolve(userDir) + path8.sep)) continue;
         fs4.rmSync(skillDir, { recursive: true, force: true });
       }
       const metaPath = getInstalledMetaPath(userDir);
@@ -9813,7 +10215,7 @@ Re-run with --force to confirm, or use \`pncli skills marketplace purge-plugin\`
   });
 }
 function resolvePluginChoices(marketplacePath) {
-  const marketplaceJsonPath = path7.join(marketplacePath, ".claude-plugin", "marketplace.json");
+  const marketplaceJsonPath = path8.join(marketplacePath, ".claude-plugin", "marketplace.json");
   if (fs4.existsSync(marketplaceJsonPath)) {
     try {
       const meta = JSON.parse(fs4.readFileSync(marketplaceJsonPath, "utf8"));
@@ -9823,36 +10225,36 @@ function resolvePluginChoices(marketplacePath) {
     } catch {
     }
   }
-  const pluginsDir = path7.join(marketplacePath, "plugins");
+  const pluginsDir = path8.join(marketplacePath, "plugins");
   if (fs4.existsSync(pluginsDir)) {
-    return fs4.readdirSync(pluginsDir).filter((name) => fs4.statSync(path7.join(pluginsDir, name)).isDirectory()).map((name) => ({ name, description: "" }));
+    return fs4.readdirSync(pluginsDir).filter((name) => fs4.statSync(path8.join(pluginsDir, name)).isDirectory()).map((name) => ({ name, description: "" }));
   }
   return [];
 }
 function resolveSkillsSrc(marketplacePath, selectedPlugin) {
-  const pluginsBase = path7.resolve(marketplacePath, "plugins");
-  const skillsSrc = path7.resolve(pluginsBase, selectedPlugin, "skills");
-  if (!skillsSrc.startsWith(pluginsBase + path7.sep)) {
+  const pluginsBase = path8.resolve(marketplacePath, "plugins");
+  const skillsSrc = path8.resolve(pluginsBase, selectedPlugin, "skills");
+  if (!skillsSrc.startsWith(pluginsBase + path8.sep)) {
     throw new Error(`Invalid plugin name: "${selectedPlugin}"`);
   }
   return skillsSrc;
 }
 function copyPluginSkills(skillsSrc, targetDir, meta) {
   fs4.mkdirSync(targetDir, { recursive: true });
-  const resolvedTarget = path7.resolve(targetDir);
+  const resolvedTarget = path8.resolve(targetDir);
   const skillNames = fs4.readdirSync(skillsSrc).filter(
-    (name) => fs4.statSync(path7.join(skillsSrc, name)).isDirectory()
+    (name) => fs4.statSync(path8.join(skillsSrc, name)).isDirectory()
   );
   const installed = [];
   const failed = [];
   for (const skillName of skillNames) {
-    const dest = path7.resolve(targetDir, skillName);
-    if (!dest.startsWith(resolvedTarget + path7.sep)) {
+    const dest = path8.resolve(targetDir, skillName);
+    if (!dest.startsWith(resolvedTarget + path8.sep)) {
       failed.push(skillName);
       continue;
     }
     fs4.rmSync(dest, { recursive: true, force: true });
-    fs4.cpSync(path7.join(skillsSrc, skillName), dest, { recursive: true });
+    fs4.cpSync(path8.join(skillsSrc, skillName), dest, { recursive: true });
     installed.push(skillName);
   }
   if (meta) {
@@ -9868,8 +10270,8 @@ function copyPluginSkills(skillsSrc, targetDir, meta) {
 }
 
 // src/services/jwt/commands.ts
-function base64urlDecode(input2) {
-  const base64 = input2.replace(/-/g, "+").replace(/_/g, "/");
+function base64urlDecode(input3) {
+  const base64 = input3.replace(/-/g, "+").replace(/_/g, "/");
   const padded = base64 + "=".repeat((4 - base64.length % 4) % 4);
   return Buffer.from(padded, "base64").toString("utf8");
 }
@@ -10287,6 +10689,65 @@ function registerDynatraceCommands(program2) {
   });
 }
 
+// src/services/logscale/commands.ts
+function getHttp4(program2) {
+  const opts = program2.optsWithGlobals();
+  return createHttpClient(
+    loadConfig({ configPath: opts.config }),
+    Boolean(opts.dryRun)
+  );
+}
+function registerLogscaleCommands(program2) {
+  const logscale = program2.command("logscale").description("LogScale log query operations");
+  const repositories = logscale.command("repositories").description("Repository operations");
+  repositories.command("list").description("List available repositories").action(async () => {
+    const start = Date.now();
+    try {
+      const data = await getHttp4(program2).logscale("/api/v1/repositories");
+      success({ count: data.length, repositories: data }, "logscale", "repositories list", start);
+    } catch (err) {
+      fail(err, "logscale", "repositories list", start);
+    }
+  });
+  logscale.command("query").description("Execute a LogScale Query Language (LQL) search against a repository").requiredOption("--repository <name>", "Repository name to query").requiredOption("--query <lql>", 'LogScale Query Language expression (e.g. "error" or "level=error | count()")').option("--start <time>", "Start time (ISO 8601 or relative such as 1h or 24h)", "1h").option("--end <time>", "End time (ISO 8601 or relative)", "now").option("--limit <n>", "Maximum number of events to return", "200").option("--timeout-ms <ms>", "Client-side HTTP timeout in milliseconds", "30000").action(async (opts) => {
+    const ts = Date.now();
+    try {
+      const body = {
+        queryString: opts.query,
+        start: opts.start,
+        end: opts.end,
+        limit: parseInt(opts.limit, 10),
+        showQueryEventDistribution: false,
+        isLive: false
+      };
+      const data = await getHttp4(program2).logscale(
+        `/api/v1/repositories/${encodeURIComponent(opts.repository)}/query`,
+        {
+          method: "POST",
+          body,
+          timeoutMs: parseInt(opts.timeoutMs, 10)
+        }
+      );
+      success(
+        {
+          repository: opts.repository,
+          done: data.done,
+          cancelled: data.cancelled,
+          eventCount: data.events.length,
+          events: data.events,
+          warnings: data.warnings ?? [],
+          metaData: data.metaData
+        },
+        "logscale",
+        "query",
+        ts
+      );
+    } catch (err) {
+      fail(err, "logscale", "query", ts);
+    }
+  });
+}
+
 // src/cli.ts
 if (!process.env.PNCLI_VERIFY_TLS) {
   process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
@@ -10331,6 +10792,7 @@ registerSkillsCommands(program);
 registerJwtCommands(program);
 registerOpenShiftCommands(program);
 registerDynatraceCommands(program);
+registerLogscaleCommands(program);
 program.addHelpText("after", `
 Services:
   git          Local git operations (status, diff, log, branch)
@@ -10351,6 +10813,7 @@ Services:
   sonatypeiq   Sonatype IQ Server (applications, organizations, policies)
   openshift    OpenShift / Kubernetes (pods, events, logs, metrics)
   dynatrace    Dynatrace (services, entities, problems, traces, Kubernetes workloads)
+  logscale     LogScale (log query, repositories)
   config       Manage pncli configuration
   skills       Download and manage Claude Code skills
   jwt          JWT token utilities (decode header and payload)