@kolatts/pncli 2.0.0 → 3.0.0

package/dist/cli.js

@@ -9,7 +9,7 @@ import {
   setRepoConfigValue,
   writeGlobalConfig,
   writeRepoConfig
-} from "./chunk-PXKUQPPF.js";
+} from "./chunk-LH7WBP7W.js";
 import {
   createHttpClient
 } from "./chunk-ZDJYOI3W.js";
@@ -6365,6 +6365,25 @@ function registerConfigCommands(program2) {
       } else {
         results.openshift = { ok: null, message: "not configured" };
       }
+      for (const [envName, envCfg] of Object.entries(cfg.openshift.environments)) {
+        for (const [instName, instCfg] of Object.entries(envCfg.instances ?? {})) {
+          const key = `openshift:${envName}/${instName}`;
+          if (instCfg.baseUrl && instCfg.token) {
+            const clusterHttp = createHttpClient(
+              { ...cfg, openshift: { ...cfg.openshift, baseUrl: instCfg.baseUrl, token: instCfg.token } },
+              false
+            );
+            try {
+              await clusterHttp.openshift("/api/v1");
+              results[key] = { ok: true, message: "connected" };
+            } catch (err) {
+              results[key] = { ok: false, message: err instanceof Error ? err.message : String(err) };
+            }
+          } else {
+            results[key] = { ok: null, message: "not configured" };
+          }
+        }
+      }
       if (cfg.dynatrace.baseUrl && cfg.dynatrace.apiToken) {
         try {
           await http.dynatrace("/api/v2/entities", {
@@ -6374,8 +6393,10 @@ function registerConfigCommands(program2) {
         } catch (err) {
           results.dynatrace = { ok: false, message: err instanceof Error ? err.message : String(err) };
         }
-      } else {
+      } else if (Object.keys(cfg.dynatrace.environments).length === 0) {
         results.dynatrace = { ok: null, message: "not configured" };
+      } else {
+        results.dynatrace = { ok: null, message: "flat config not set \u2014 see named environments below" };
       }
       if (cfg.dynatrace.platformUrl && cfg.dynatrace.platformToken) {
         try {
@@ -6396,6 +6417,46 @@ function registerConfigCommands(program2) {
       } else {
         results.dynatrace_platform = { ok: null, message: "not configured" };
       }
+      for (const [envName, envConfig] of Object.entries(cfg.dynatrace.environments)) {
+        const envHttp = createHttpClient({
+          ...cfg,
+          dynatrace: {
+            ...cfg.dynatrace,
+            baseUrl: envConfig.baseUrl,
+            apiToken: envConfig.apiToken,
+            platformUrl: envConfig.platformUrl,
+            platformToken: envConfig.platformToken
+          }
+        });
+        const key = `dynatrace.${envName}`;
+        if (envConfig.baseUrl && envConfig.apiToken) {
+          try {
+            await envHttp.dynatrace("/api/v2/entities", {
+              params: { entitySelector: 'type("SERVICE")', pageSize: 1 }
+            });
+            results[key] = { ok: true, message: "connected" };
+          } catch (err) {
+            results[key] = { ok: false, message: err instanceof Error ? err.message : String(err) };
+          }
+        } else {
+          results[key] = { ok: null, message: "baseUrl or apiToken not configured" };
+        }
+        const platformKey = `dynatrace.${envName}_platform`;
+        if (envConfig.platformUrl && envConfig.platformToken) {
+          try {
+            await envHttp.dynatracePlatform("/platform/storage/query/v1/query:execute", {
+              method: "POST",
+              body: { query: "fetch spans | limit 1", requestTimeoutMilliseconds: 5e3 },
+              timeoutMs: 1e4
+            });
+            results[platformKey] = { ok: true, message: "connected" };
+          } catch (err) {
+            results[platformKey] = { ok: false, message: err instanceof Error ? err.message : String(err) };
+          }
+        } else if (envConfig.platformUrl || envConfig.platformToken) {
+          results[platformKey] = { ok: false, message: "platformUrl and platformToken must both be configured" };
+        }
+      }
       if (cfg.logscale.baseUrl && cfg.logscale.token) {
         try {
           await http.logscale("/api/v1/repositories");
@@ -6621,8 +6682,33 @@ function registerConfigCommands(program2) {
           results.openshift = categorize2(err);
         }
       }
+      for (const [envName, envCfg] of Object.entries(cfg.openshift.environments)) {
+        for (const [instName, instCfg] of Object.entries(envCfg.instances ?? {})) {
+          const key = `openshift:${envName}/${instName}`;
+          if (!instCfg.token) {
+            results[key] = { status: "blank", message: "token not configured" };
+          } else if (!instCfg.baseUrl) {
+            results[key] = { status: "error", message: "baseUrl not configured" };
+          } else {
+            const clusterHttp = createHttpClient(
+              { ...cfg, openshift: { ...cfg.openshift, baseUrl: instCfg.baseUrl, token: instCfg.token } },
+              false
+            );
+            try {
+              await clusterHttp.openshift("/api/v1", { timeoutMs: 1e4 });
+              results[key] = { status: "valid", message: "ok" };
+            } catch (err) {
+              results[key] = categorize2(err);
+            }
+          }
+        }
+      }
       if (!cfg.dynatrace.apiToken) {
-        results.dynatrace = { status: "blank", message: "not configured" };
+        if (Object.keys(cfg.dynatrace.environments).length === 0) {
+          results.dynatrace = { status: "blank", message: "not configured" };
+        } else {
+          results.dynatrace = { status: "blank", message: "flat config not set \u2014 see named environments below" };
+        }
       } else if (!cfg.dynatrace.baseUrl) {
         results.dynatrace = { status: "error", message: "baseUrl not configured" };
       } else {
@@ -6658,6 +6744,52 @@ function registerConfigCommands(program2) {
           results.dynatrace_platform = categorize2(err);
         }
       }
+      for (const [envName, envConfig] of Object.entries(cfg.dynatrace.environments)) {
+        const envHttp = createHttpClient({
+          ...cfg,
+          dynatrace: {
+            ...cfg.dynatrace,
+            baseUrl: envConfig.baseUrl,
+            apiToken: envConfig.apiToken,
+            platformUrl: envConfig.platformUrl,
+            platformToken: envConfig.platformToken
+          }
+        }, false);
+        const key = `dynatrace.${envName}`;
+        if (!envConfig.apiToken) {
+          results[key] = { status: "blank", message: "apiToken not configured" };
+        } else if (!envConfig.baseUrl) {
+          results[key] = { status: "error", message: "baseUrl not configured" };
+        } else {
+          try {
+            await envHttp.dynatrace("/api/v2/entities", {
+              params: { entitySelector: 'type("SERVICE")', pageSize: 1 },
+              timeoutMs: 1e4
+            });
+            results[key] = { status: "valid", message: "ok" };
+          } catch (err) {
+            results[key] = categorize2(err);
+          }
+        }
+        const platformKey = `dynatrace.${envName}_platform`;
+        if (envConfig.platformUrl && envConfig.platformToken) {
+          try {
+            await envHttp.dynatracePlatform("/platform/storage/query/v1/query:execute", {
+              method: "POST",
+              body: { query: "fetch spans | limit 1", requestTimeoutMilliseconds: 5e3 },
+              timeoutMs: 1e4
+            });
+            results[platformKey] = { status: "valid", message: "ok" };
+          } catch (err) {
+            results[platformKey] = categorize2(err);
+          }
+        } else if (envConfig.platformUrl || envConfig.platformToken) {
+          results[platformKey] = {
+            status: "error",
+            message: "platformUrl and platformToken must both be configured"
+          };
+        }
+      }
       if (!cfg.logscale.token) {
         results.logscale = { status: "blank", message: "not configured" };
       } else if (!cfg.logscale.baseUrl) {
@@ -6697,11 +6829,39 @@ function registerConfigCommands(program2) {
       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;
+      const clusterKeys = Object.keys(results).filter((k) => k.startsWith("openshift:")).sort();
+      const dynamicEnvKeys = Object.keys(cfg.dynatrace.environments).flatMap((envName) => {
+        const keys = [`dynatrace.${envName}`];
+        if (cfg.dynatrace.environments[envName]?.platformUrl) keys.push(`dynatrace.${envName}_platform`);
+        return keys;
+      });
+      const allServices = [
+        "jira",
+        "bitbucket",
+        "github",
+        "confluence",
+        "sonar",
+        "sde",
+        "ado",
+        "jenkins",
+        "artifactory",
+        "checkmarx",
+        "servicenow",
+        "contrast",
+        "sonatypeiq",
+        "openshift",
+        ...clusterKeys,
+        "dynatrace",
+        "dynatrace_platform",
+        ...dynamicEnvKeys,
+        "logscale",
+        "splitio",
+        "figma"
+      ];
       if (cmdOpts.output === "table") {
-        const services = ["jira", "bitbucket", "github", "confluence", "sonar", "sde", "ado", "jenkins", "artifactory", "checkmarx", "servicenow", "contrast", "sonatypeiq", "openshift", "dynatrace", "dynatrace_platform", "logscale", "splitio", "figma"];
-        const labelWidth = 14;
+        const labelWidth = Math.max(14, ...allServices.map((s) => s.length + 2));
         const statusWidth = 9;
-        for (const svc of services) {
+        for (const svc of allServices) {
           const r = results[svc];
           if (!r) continue;
           const label = svc.padEnd(labelWidth);
@@ -6712,10 +6872,9 @@ function registerConfigCommands(program2) {
         process.stdout.write("\n");
       } else {
         if (opts.pretty) {
-          const services = ["jira", "bitbucket", "github", "confluence", "sonar", "sde", "ado", "jenkins", "artifactory", "checkmarx", "servicenow", "contrast", "sonatypeiq", "openshift", "dynatrace", "dynatrace_platform", "logscale", "splitio", "figma"];
-          const labelWidth = 14;
+          const labelWidth = Math.max(14, ...allServices.map((s) => s.length + 2));
           const statusWidth = 9;
-          for (const svc of services) {
+          for (const svc of allServices) {
             const r = results[svc];
             if (!r) continue;
             const label = svc.padEnd(labelWidth);
@@ -7393,6 +7552,9 @@ async function initGlobalConfig(start) {
   }
   const existingGlobal = loadJsonFile(getGlobalConfigPath());
   const existingInstances = Array.isArray(existingGlobal?.jenkinsInstances) ? existingGlobal.jenkinsInstances : [];
+  const existingDynatraceEnvs = existingGlobal?.dynatrace?.environments;
+  const existingDynatraceDefault = existingGlobal?.dynatrace?.defaultEnvironment;
+  const existingOpenshift = existingGlobal?.openshift;
   writeGlobalConfig({
     jenkinsInstances: existingInstances,
     user: {
@@ -7491,15 +7653,25 @@ async function initGlobalConfig(start) {
     ...useOpenShift && openShiftBaseUrl ? {
       openshift: {
         baseUrl: normalizeBaseUrl(openShiftBaseUrl),
-        token: openShiftToken || void 0
+        token: openShiftToken || void 0,
+        ...existingOpenshift?.defaultEnvironment ? { defaultEnvironment: existingOpenshift.defaultEnvironment } : {},
+        ...existingOpenshift?.defaultInstance ? { defaultInstance: existingOpenshift.defaultInstance } : {},
+        ...existingOpenshift?.environments ? { environments: existingOpenshift.environments } : {}
       }
-    } : {},
+    } : existingOpenshift ? { openshift: { ...existingOpenshift } } : {},
     ...useDynatrace && dynatraceBaseUrl ? {
       dynatrace: {
         baseUrl: normalizeBaseUrl(dynatraceBaseUrl),
         apiToken: dynatraceApiToken || void 0,
         platformUrl: normalizeBaseUrl(dynatracePlatformUrl) || void 0,
-        platformToken: dynatracePlatformToken || void 0
+        platformToken: dynatracePlatformToken || void 0,
+        ...existingDynatraceDefault ? { defaultEnvironment: existingDynatraceDefault } : {},
+        ...existingDynatraceEnvs && Object.keys(existingDynatraceEnvs).length ? { environments: existingDynatraceEnvs } : {}
+      }
+    } : existingDynatraceEnvs && Object.keys(existingDynatraceEnvs).length ? {
+      dynatrace: {
+        ...existingDynatraceDefault ? { defaultEnvironment: existingDynatraceDefault } : {},
+        environments: existingDynatraceEnvs
       }
     } : {},
     ...useLogscale && logscaleBaseUrl ? {
@@ -8603,7 +8775,7 @@ function registerAdoRepoCommands(ado) {
       const start = Date.now();
       try {
         const globalOpts = ado.optsWithGlobals();
-        const { loadConfig: lc } = await import("./config-YHYQTGKT.js");
+        const { loadConfig: lc } = await import("./config-JGBUUXQX.js");
         const config = lc({ configPath: globalOpts.config });
         const { collection, project, repo: repo2, gitClient } = getAdoContext(ado, true);
         const { AdoCoreClient: AdoCoreClient2 } = await import("./core-SWYVXOQ4.js");
@@ -9644,24 +9816,51 @@ function assertInteractive(hint) {
   }
 }
 var AGENT_PATHS = {
-  "github-copilot": { project: ".agents/skills", user: path8.join(os.homedir(), ".agents/skills") },
+  "codex": { project: ".agents/skills", user: path8.join(os.homedir(), ".agents/skills") },
+  "github-copilot": { project: ".github/skills", user: path8.join(os.homedir(), ".copilot/skills") },
   "claude-code": { project: ".claude/skills", user: path8.join(os.homedir(), ".claude/skills") }
 };
+var DEFAULT_AGENT = "codex";
+var AGENT_CHOICES = Object.keys(AGENT_PATHS).join(" | ");
+var warnedRetargetedAgent = false;
+function warnIfRetargetedAgent(agentName) {
+  if (agentName !== "github-copilot" || warnedRetargetedAgent) return;
+  warnedRetargetedAgent = true;
+  warn(`--agent github-copilot now targets .github/skills (project) and ~/.copilot/skills (user). It previously meant .agents/skills \u2014 use --agent codex for that.`);
+}
 function resolveAgentName(opts) {
-  return opts.claude ? "claude-code" : opts.agent ?? "github-copilot";
+  return opts.claude ? "claude-code" : opts.agent ?? DEFAULT_AGENT;
 }
 function resolveAgentPaths(agentName) {
   const agentConfig = AGENT_PATHS[agentName];
   if (!agentConfig) {
-    throw new Error(`Unknown agent: "${agentName}". Use: ${Object.keys(AGENT_PATHS).join(" | ")}`);
+    throw new Error(`Unknown agent: "${agentName}". Use: ${AGENT_CHOICES}`);
   }
+  warnIfRetargetedAgent(agentName);
   return agentConfig;
 }
+function findGitRoot(from = process.cwd()) {
+  try {
+    const root = execFileSync3("git", ["-C", from, "rev-parse", "--show-toplevel"], {
+      encoding: "utf8",
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+    return root ? path8.resolve(root) : null;
+  } catch {
+    return null;
+  }
+}
+function resolveProjectPath(relativePath) {
+  const root = findGitRoot();
+  return root ? path8.resolve(root, relativePath) : path8.resolve(relativePath);
+}
+function resolveScopedPath(agentPaths, scope) {
+  return scope === "project" ? resolveProjectPath(agentPaths.project) : path8.resolve(agentPaths.user);
+}
 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);
+  return resolveScopedPath(agentConfig, opts.scope ?? "user");
 }
 function getBundledSkillsDir() {
   try {
@@ -9713,14 +9912,16 @@ function resolveSkillRecord(meta, targetDir, skillName) {
   };
 }
 function listActiveSkillDirs(targetDir) {
+  if (!fs4.existsSync(targetDir)) return [];
   return fs4.readdirSync(targetDir).filter((name) => {
     if (name.startsWith(".")) return false;
-    const p = path8.join(targetDir, name);
+    const dir = path8.join(targetDir, name);
     try {
-      return fs4.statSync(p).isDirectory();
+      if (!fs4.statSync(dir).isDirectory()) return false;
     } catch {
       return false;
     }
+    return fs4.existsSync(path8.join(dir, "SKILL.md"));
   });
 }
 function disablePluginSkills(targetDir, plugin, marketplaceFilter) {
@@ -9832,6 +10033,142 @@ function detectRepoBranch(repoPath) {
     return void 0;
   }
 }
+function getRepoRemoteUrl(repoPath) {
+  try {
+    const raw = execFileSync3("git", ["-C", repoPath, "remote", "get-url", "origin"], {
+      encoding: "utf8",
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+    return raw ? scrubToken(raw) : null;
+  } catch {
+    return null;
+  }
+}
+function getInstalledPluginsForMarketplace(targetDir, marketplaceName, repoUrl) {
+  const meta = readInstalledMeta(targetDir);
+  const plugins = /* @__PURE__ */ new Set();
+  for (const records of [meta.skills, meta.disabled ?? {}]) {
+    for (const record of Object.values(records)) {
+      if (record.source === "marketplace" && record.plugin) {
+        if (record.marketplace === marketplaceName || repoUrl && record.installedFrom === repoUrl) {
+          plugins.add(record.plugin);
+        }
+      }
+    }
+  }
+  return [...plugins];
+}
+function readCustomTargets(globalConfig) {
+  const raw = globalConfig.skillsTargets;
+  if (!Array.isArray(raw)) return [];
+  return [...new Set(raw.filter((t) => typeof t === "string" && t.length > 0).map((t) => path8.resolve(t)))];
+}
+function rememberCustomTarget(configPath, targetDir) {
+  const resolved = path8.resolve(targetDir);
+  const builtIn = Object.values(AGENT_PATHS).flatMap((a) => [path8.resolve(a.user), resolveProjectPath(a.project)]);
+  if (builtIn.includes(resolved)) return false;
+  const existing = loadJsonFile(configPath) ?? {};
+  const targets = readCustomTargets(existing);
+  if (targets.includes(resolved)) return false;
+  writeGlobalConfig({ ...existing, skillsTargets: [...targets, resolved] }, configPath);
+  return true;
+}
+function forgetCustomTarget(configPath, targetDir) {
+  const resolved = path8.resolve(targetDir);
+  const existing = loadJsonFile(configPath) ?? {};
+  const targets = readCustomTargets(existing);
+  if (!targets.includes(resolved)) return false;
+  writeGlobalConfig({ ...existing, skillsTargets: targets.filter((t) => t !== resolved) }, configPath);
+  return true;
+}
+function summarizeLocation(agent, scope, targetDir) {
+  const resolved = path8.resolve(targetDir);
+  const base = {
+    agent,
+    scope,
+    path: resolved,
+    exists: fs4.existsSync(resolved),
+    totalSkills: 0,
+    marketplaceSkills: 0,
+    bundledSkills: 0,
+    untrackedSkills: 0,
+    disabledSkills: 0,
+    disabledStashMissing: []
+  };
+  if (!base.exists) return base;
+  const meta = readInstalledMeta(resolved);
+  for (const skillName of listActiveSkillDirs(resolved)) {
+    base.totalSkills++;
+    const record = resolveSkillRecord(meta, resolved, skillName);
+    if (record?.source === "marketplace") base.marketplaceSkills++;
+    else if (record?.source === "bundled") base.bundledSkills++;
+    else base.untrackedSkills++;
+  }
+  const disabledNames = Object.keys(meta.disabled ?? {});
+  base.disabledSkills = disabledNames.length;
+  const stashDir = path8.join(resolved, DISABLED_SUBDIR);
+  base.disabledStashMissing = disabledNames.filter((name) => !fs4.existsSync(path8.join(stashDir, name)));
+  return base;
+}
+function listKnownLocations(globalConfig) {
+  const builtIn = Object.entries(AGENT_PATHS).flatMap(
+    ([agent, paths]) => ["project", "user"].map((scope) => summarizeLocation(agent, scope, resolveScopedPath(paths, scope)))
+  );
+  const seen = new Set(builtIn.map((l) => l.path));
+  const custom = readCustomTargets(globalConfig).filter((dir) => !seen.has(dir)).map((dir) => summarizeLocation("custom", "custom", dir));
+  return [...builtIn, ...custom];
+}
+function buildMarketplaceIndex(marketplaces) {
+  const byName = /* @__PURE__ */ new Map();
+  const byUrl = /* @__PURE__ */ new Map();
+  for (const m of marketplaces) {
+    const name = marketplaceLabel(m);
+    if (name) byName.set(name, m);
+    if (m.repoUrl) byUrl.set(m.repoUrl, m);
+  }
+  return { byName, byUrl };
+}
+function collectSkillStatus(globalConfig, locations) {
+  const { byName, byUrl } = buildMarketplaceIndex(getAllMarketplaces(globalConfig));
+  const remoteCache = /* @__PURE__ */ new Map();
+  const remoteFor = (localPath) => {
+    if (!localPath || !fs4.existsSync(localPath)) return null;
+    if (!remoteCache.has(localPath)) remoteCache.set(localPath, getRepoRemoteUrl(localPath));
+    return remoteCache.get(localPath) ?? null;
+  };
+  const records = [];
+  for (const location of locations) {
+    if (!location.exists) continue;
+    const meta = readInstalledMeta(location.path);
+    const push = (skillName, record, enabled) => {
+      const recordedName = record?.marketplace ?? null;
+      const registered = (recordedName ? byName.get(recordedName) : void 0) ?? (record?.installedFrom ? byUrl.get(record.installedFrom) : void 0) ?? null;
+      records.push({
+        skill: skillName,
+        path: enabled ? path8.join(location.path, skillName) : path8.join(location.path, DISABLED_SUBDIR, skillName),
+        agent: location.agent,
+        scope: location.scope,
+        location: location.path,
+        enabled,
+        source: record?.source ?? "untracked",
+        plugin: record?.plugin ?? null,
+        marketplace: recordedName ?? (registered ? marketplaceLabel(registered) : null),
+        repoUrl: registered?.repoUrl ?? record?.installedFrom ?? null,
+        localPath: registered?.localPath ?? null,
+        upstreamRemote: remoteFor(registered?.localPath),
+        branch: record?.branch ?? null,
+        installedAt: record?.installedAt ?? null
+      });
+    };
+    for (const skillName of listActiveSkillDirs(location.path)) {
+      push(skillName, resolveSkillRecord(meta, location.path, skillName), true);
+    }
+    for (const [skillName, record] of Object.entries(meta.disabled ?? {})) {
+      push(skillName, record, false);
+    }
+  }
+  return records;
+}
 function recordInstalledSkills(targetDir, skillNames, record) {
   if (skillNames.length === 0) return;
   const meta = readInstalledMeta(targetDir);
@@ -9995,7 +10332,7 @@ function installAllPlugins(resolvedPath, marketplaceName, url, targetDir) {
   const { results, totalInstalled } = installPluginsForMarketplace(resolvedPath, marketplaceName, url, pluginChoices.map((p) => p.name), targetDir);
   return { pluginResults: results, totalInstalled };
 }
-function syncMarketplacePlugins(m, targetDir, force, pluginFilter) {
+function syncMarketplacePlugins(m, targetDir, force, pluginFilter, installedOnly = false) {
   const marketplaceName = marketplaceLabel(m);
   try {
     const marketplacePath = m.localPath;
@@ -10014,7 +10351,16 @@ function syncMarketplacePlugins(m, targetDir, force, pluginFilter) {
     }
     let pluginNames;
     if (pluginFilter === "all") {
-      pluginNames = pluginChoices.map((p) => p.name);
+      if (installedOnly) {
+        const installed = getInstalledPluginsForMarketplace(targetDir, marketplaceName, m.repoUrl).filter((name) => pluginChoices.some((p) => p.name === name));
+        if (installed.length === 0) {
+          warn(`No installed plugins found for "${marketplaceName}" \u2014 skipping. Run marketplace sync without --installed-only to install plugins.`);
+          return { marketplace: marketplaceName, skipped: true, installedOnly: true, message: "No installed plugins found \u2014 nothing to sync." };
+        }
+        pluginNames = installed;
+      } else {
+        pluginNames = pluginChoices.map((p) => p.name);
+      }
     } else if (pluginChoices.some((p) => p.name === pluginFilter)) {
       pluginNames = [pluginFilter];
     } else {
@@ -10084,7 +10430,7 @@ async function marketplaceAddAction(url, localPath, opts, commandName) {
 }
 function registerSkillsCommands(program2) {
   const skills = program2.command("skills").description("Manage pncli Claude Code skills");
-  skills.command("install").description("Install pncli skills into the current repo").option("--agent <agent>", "Target agent host: github-copilot | claude-code", "github-copilot").option("--scope <scope>", "Installation scope: project | user", "project").option("--target <dir>", "Override install directory (ignores --agent and --scope)").action((opts) => {
+  skills.command("install").description("Install pncli skills into the current repo").option("--agent <agent>", `Target agent host: ${AGENT_CHOICES}`, DEFAULT_AGENT).option("--scope <scope>", "Installation scope: project | user", "project").option("--target <dir>", "Override install directory (ignores --agent and --scope)").action((opts) => {
     const start = Date.now();
     try {
       let targetDir;
@@ -10092,8 +10438,7 @@ function registerSkillsCommands(program2) {
         targetDir = path8.resolve(opts.target);
       } else {
         const agentConfig = resolveAgentPaths(opts.agent);
-        const scopePath = opts.scope === "user" ? agentConfig.user : agentConfig.project;
-        targetDir = path8.resolve(scopePath);
+        targetDir = resolveScopedPath(agentConfig, opts.scope === "user" ? "user" : "project");
       }
       const resolvedTarget = path8.resolve(targetDir);
       const bundledDir = getBundledSkillsDir();
@@ -10142,6 +10487,14 @@ function registerSkillsCommands(program2) {
         warn(`Failed to install: ${failed.join(", ")}`);
       }
       recordInstalledSkills(targetDir, installed, { source: "bundled" });
+      let tracked = false;
+      if (opts.target && installed.length > 0) {
+        try {
+          tracked = rememberCustomTarget(getGlobalConfigPath(), targetDir);
+        } catch {
+          warn(`Installed to ${targetDir}, but could not record it in the global config; it will not appear in "skills locations".`);
+        }
+      }
       success({
         installed,
         failed,
@@ -10149,13 +10502,14 @@ function registerSkillsCommands(program2) {
         total: installed.length,
         agent: opts.target ? "custom" : opts.agent,
         scope: opts.target ? "custom" : opts.scope,
-        source: "bundled"
+        source: "bundled",
+        ...opts.target ? { trackedAsCustomTarget: tracked } : {}
       }, "skills", "install", start);
     } catch (err) {
       fail(err, "skills", "install", start);
     }
   });
-  skills.command("list").description("List locally installed skills").option("--agent <agent>", "Target agent host: github-copilot | claude-code", "github-copilot").option("--scope <scope>", "Installation scope: project | user", "project").option("--target <dir>", "Override skills directory to scan").action((opts) => {
+  skills.command("list").description("List locally installed skills").option("--agent <agent>", `Target agent host: ${AGENT_CHOICES}`, DEFAULT_AGENT).option("--scope <scope>", "Installation scope: project | user", "project").option("--target <dir>", "Override skills directory to scan").action((opts) => {
     const start = Date.now();
     try {
       let targetDir;
@@ -10163,8 +10517,7 @@ function registerSkillsCommands(program2) {
         targetDir = path8.resolve(opts.target);
       } else {
         const agentConfig = resolveAgentPaths(opts.agent);
-        const scopePath = opts.scope === "user" ? agentConfig.user : agentConfig.project;
-        targetDir = path8.resolve(scopePath);
+        targetDir = resolveScopedPath(agentConfig, opts.scope === "user" ? "user" : "project");
       }
       if (!fs4.existsSync(targetDir)) {
         success({ skills: [], message: `No skills directory found at ${targetDir}. Run: pncli skills install` }, "skills", "list", start);
@@ -10216,7 +10569,7 @@ function registerSkillsCommands(program2) {
       fail(err, "skills", "list", start);
     }
   });
-  skills.command("uninstall").description("Uninstall a skill (defaults to user scope, matching the marketplace install target; pass --scope project for skills installed via `skills install`)").argument("<name>", "Skill name to uninstall (the directory name under your skills folder)").option("--agent <agent>", "Target agent host: github-copilot | claude-code", "github-copilot").option("--scope <scope>", "Installation scope to uninstall from: project | user", "user").option("--claude", "Shorthand for --agent claude-code").option("--target <dir>", "Override skills directory").action((name, opts) => {
+  skills.command("uninstall").description("Uninstall a skill (defaults to user scope, matching the marketplace install target; pass --scope project for skills installed via `skills install`)").argument("<name>", "Skill name to uninstall (the directory name under your skills folder)").option("--agent <agent>", `Target agent host: ${AGENT_CHOICES}`, DEFAULT_AGENT).option("--scope <scope>", "Installation scope to uninstall from: project | user", "user").option("--claude", "Shorthand for --agent claude-code").option("--target <dir>", "Override skills directory").action((name, opts) => {
     const start = Date.now();
     try {
       let targetDir;
@@ -10224,8 +10577,7 @@ function registerSkillsCommands(program2) {
         targetDir = path8.resolve(opts.target);
       } else {
         const agentConfig = resolveAgentPaths(resolveAgentName(opts));
-        const scopePath = opts.scope === "project" ? agentConfig.project : agentConfig.user;
-        targetDir = path8.resolve(scopePath);
+        targetDir = resolveScopedPath(agentConfig, opts.scope === "project" ? "project" : "user");
       }
       const resolvedTarget = path8.resolve(targetDir);
       const skillDir = path8.resolve(targetDir, name);
@@ -10250,9 +10602,77 @@ function registerSkillsCommands(program2) {
       fail(err, "skills", "uninstall", start);
     }
   });
+  skills.command("locations").description("List every skills install path pncli knows about, with per-directory skill counts").action(() => {
+    const start = Date.now();
+    try {
+      const globalConfig = loadJsonFile(getGlobalConfigPath()) ?? {};
+      const locations = listKnownLocations(globalConfig);
+      const gitRoot = findGitRoot();
+      success({
+        locations,
+        activeLocations: locations.filter((l) => l.exists).length,
+        totalSkills: locations.reduce((sum, l) => sum + l.totalSkills, 0),
+        defaultAgent: DEFAULT_AGENT,
+        projectRoot: gitRoot
+      }, "skills", "locations", start);
+    } catch (err) {
+      fail(err, "skills", "locations", start);
+    }
+  });
+  skills.command("status").description("Show every installed skill with its plugin, marketplace, and upstream remote").option("--marketplace <name>", "Only show skills installed from this marketplace (name or clone URL)").option("--plugin <name>", "Only show skills belonging to this plugin").option("--source <source>", "Filter by provenance: marketplace | bundled | untracked").option("--agent <agent>", `Only show locations for this agent host: ${AGENT_CHOICES}`).option("--scope <scope>", "Only show this scope: project | user | custom").action((opts) => {
+    const start = Date.now();
+    try {
+      if (opts.agent && !AGENT_PATHS[opts.agent]) {
+        throw new Error(`Unknown agent: "${opts.agent}". Use: ${AGENT_CHOICES}`);
+      }
+      if (opts.source && !["marketplace", "bundled", "untracked"].includes(opts.source)) {
+        throw new Error(`Unknown source: "${opts.source}". Use: marketplace | bundled | untracked`);
+      }
+      if (opts.scope && !["project", "user", "custom"].includes(opts.scope)) {
+        throw new Error(`Unknown scope: "${opts.scope}". Use: project | user | custom`);
+      }
+      const globalConfig = loadJsonFile(getGlobalConfigPath()) ?? {};
+      const locations = listKnownLocations(globalConfig).filter((l) => !opts.agent || l.agent === opts.agent).filter((l) => !opts.scope || l.scope === opts.scope);
+      const skillRecords = collectSkillStatus(globalConfig, locations).filter((r) => !opts.plugin || r.plugin === opts.plugin).filter((r) => !opts.source || r.source === opts.source).filter((r) => !opts.marketplace || r.marketplace === opts.marketplace || r.repoUrl === opts.marketplace).sort((a, b) => a.location.localeCompare(b.location) || a.skill.localeCompare(b.skill));
+      const byMarketplace = {};
+      for (const record of skillRecords) {
+        const key = record.marketplace ?? "(none)";
+        byMarketplace[key] = (byMarketplace[key] ?? 0) + 1;
+      }
+      success({
+        skills: skillRecords,
+        total: skillRecords.length,
+        enabled: skillRecords.filter((r) => r.enabled).length,
+        disabled: skillRecords.filter((r) => !r.enabled).length,
+        untracked: skillRecords.filter((r) => r.source === "untracked").length,
+        byMarketplace,
+        locations
+      }, "skills", "status", start);
+    } catch (err) {
+      fail(err, "skills", "status", start);
+    }
+  });
+  skills.command("forget-target").description("Stop tracking a custom --target directory in skills locations / status (does not delete any files)").argument("<dir>", "The custom install directory to forget").action((dir) => {
+    const start = Date.now();
+    try {
+      const configPath = getGlobalConfigPath();
+      const resolved = path8.resolve(dir);
+      const forgotten = forgetCustomTarget(configPath, resolved);
+      if (!forgotten) {
+        warn(`${resolved} is not a tracked custom target \u2014 nothing to forget.`);
+      }
+      success({
+        target: resolved,
+        forgotten,
+        remaining: readCustomTargets(loadJsonFile(configPath) ?? {})
+      }, "skills", "forget-target", start);
+    } catch (err) {
+      fail(err, "skills", "forget-target", start);
+    }
+  });
   const marketplace = skills.command("marketplace").description("Manage git-hosted skills marketplaces");
   function withMarketplaceAddOptions(cmd) {
-    return cmd.argument("<url>", "Git clone URL of the marketplace repository").argument("[localPath]", "Local directory to clone into (default: ~/.agents/marketplaces/<repo-name>)").option("--name <name>", "Human-readable name for this marketplace (default: derived from URL)").option("--branch <branch>", "Branch to clone (default: remote HEAD)").option("--token <token>", "HTTP access token for authenticated clone and pull (GitHub PAT or Bitbucket token)").option("--agent <agent>", "Target agent host for plugin install: github-copilot | claude-code (default: github-copilot)").option("--claude", "Shorthand for --agent claude-code");
+    return cmd.argument("<url>", "Git clone URL of the marketplace repository").argument("[localPath]", "Local directory to clone into (default: ~/.agents/marketplaces/<repo-name>)").option("--name <name>", "Human-readable name for this marketplace (default: derived from URL)").option("--branch <branch>", "Branch to clone (default: remote HEAD)").option("--token <token>", "HTTP access token for authenticated clone and pull (GitHub PAT or Bitbucket token)").option("--agent <agent>", `Target agent host for plugin install: ${AGENT_CHOICES} (default: ${DEFAULT_AGENT})`).option("--claude", "Shorthand for --agent claude-code");
   }
   withMarketplaceAddOptions(
     marketplace.command("add").description("Register a new marketplace, clone it, and install all its plugins")
@@ -10270,7 +10690,8 @@ function registerSkillsCommands(program2) {
           name: marketplaceLabel(m),
           repoUrl: m.repoUrl,
           localPath: m.localPath,
-          tokenConfigured: !!m.token
+          tokenConfigured: !!m.token,
+          upstreamRemote: m.localPath && fs4.existsSync(m.localPath) ? getRepoRemoteUrl(m.localPath) : null
         })),
         total: all.length
       }, "skills", "marketplace-list", start);
@@ -10308,7 +10729,7 @@ function registerSkillsCommands(program2) {
       fail(err, "skills", "marketplace-remove", start);
     }
   });
-  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) => {
+  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: ${AGENT_CHOICES} (default: ${DEFAULT_AGENT})`).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)').option("--installed-only", "Only sync plugins that are already installed \u2014 skip plugins newly added to the marketplace").action(async (plugin, opts) => {
     const start = Date.now();
     try {
       const configPath = getGlobalConfigPath();
@@ -10318,8 +10739,9 @@ function registerSkillsCommands(program2) {
       }
       const targetDir = resolveAgentPaths(resolveAgentName(opts)).user;
       const force = opts.force ?? false;
+      const installedOnly = opts.installedOnly ?? false;
       if (opts.marketplace === "all") {
-        const results = allMarketplaces.map((m) => syncMarketplacePlugins(m, targetDir, force, plugin ?? "all"));
+        const results = allMarketplaces.map((m) => syncMarketplacePlugins(m, targetDir, force, plugin ?? "all", installedOnly));
         success({ allMarketplaces: true, marketplaces: results, target: targetDir }, "skills", "marketplace-sync", start);
         return;
       }
@@ -10347,7 +10769,7 @@ function registerSkillsCommands(program2) {
             ]
           });
           if (chosen === ALL_MARKETPLACES) {
-            const results2 = allMarketplaces.map((m) => syncMarketplacePlugins(m, targetDir, force, selectedPlugin ?? "all"));
+            const results2 = allMarketplaces.map((m) => syncMarketplacePlugins(m, targetDir, force, selectedPlugin ?? "all", installedOnly));
             success({ allMarketplaces: true, marketplaces: results2, target: targetDir }, "skills", "marketplace-sync", start);
             return;
           }
@@ -10394,10 +10816,29 @@ function registerSkillsCommands(program2) {
           }, "skills", "marketplace-sync", start);
           return;
         }
-        const pluginNames = selectedPlugin === "all" ? pluginChoices.map((p) => p.name) : [selectedPlugin];
+        let pluginNames;
+        if (selectedPlugin === "all") {
+          if (installedOnly) {
+            const installed = getInstalledPluginsForMarketplace(targetDir, marketplaceName, selectedMarketplace.repoUrl).filter((name) => pluginChoices.some((p) => p.name === name));
+            if (installed.length === 0) {
+              success({
+                marketplace: marketplaceName,
+                skipped: true,
+                installedOnly: true,
+                message: `No installed plugins found for "${marketplaceName}" \u2014 run marketplace sync without --installed-only to install plugins.`
+              }, "skills", "marketplace-sync", start);
+              return;
+            }
+            pluginNames = installed;
+          } else {
+            pluginNames = pluginChoices.map((p) => p.name);
+          }
+        } else {
+          pluginNames = [selectedPlugin];
+        }
         const { results, totalInstalled } = installPluginsForMarketplace(marketplacePath, marketplaceName, selectedMarketplace.repoUrl, pluginNames, targetDir);
         if (selectedPlugin === "all") {
-          success({ marketplace: marketplaceName, plugins: results, total: totalInstalled, target: targetDir, marketplaceUpdated: updated }, "skills", "marketplace-sync", start);
+          success({ marketplace: marketplaceName, plugins: results, total: totalInstalled, target: targetDir, marketplaceUpdated: updated, ...installedOnly ? { installedOnly: true } : {} }, "skills", "marketplace-sync", start);
         } else {
           const single = results[selectedPlugin] ?? { installed: [], failed: [] };
           success({
@@ -10416,7 +10857,7 @@ 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) => {
+  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: ${AGENT_CHOICES} (default: ${DEFAULT_AGENT})`).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;
@@ -10424,8 +10865,7 @@ function registerSkillsCommands(program2) {
         targetDir = path8.resolve(opts.target);
       } else {
         const agentConfig = resolveAgentPaths(resolveAgentName(opts));
-        const scopePath = (opts.scope ?? "user") === "project" ? agentConfig.project : agentConfig.user;
-        targetDir = path8.resolve(scopePath);
+        targetDir = resolveScopedPath(agentConfig, opts.scope ?? "user");
       }
       const resolvedTarget = path8.resolve(targetDir);
       if (!fs4.existsSync(targetDir)) {
@@ -10490,7 +10930,7 @@ 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) => {
+  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: ${AGENT_CHOICES} (default: ${DEFAULT_AGENT})`).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);
@@ -10513,7 +10953,7 @@ function registerSkillsCommands(program2) {
       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) => {
+  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: ${AGENT_CHOICES} (default: ${DEFAULT_AGENT})`).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);
@@ -10542,7 +10982,7 @@ function registerSkillsCommands(program2) {
       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) => {
+  marketplace.command("manage").description("Manage marketplaces and plugins: toggle plugins on/off, add or remove marketplaces (interactive)").option("--agent <agent>", `Target agent host: ${AGENT_CHOICES} (default: ${DEFAULT_AGENT})`).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.");
@@ -10645,7 +11085,7 @@ function registerSkillsCommands(program2) {
       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) => {
+  skills.command("purge-user").description("Remove all skills from the user-level skills folder for the target agent").option("--agent <agent>", `Target agent host: ${AGENT_CHOICES} (default: ${DEFAULT_AGENT})`).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;
@@ -10789,13 +11229,47 @@ function containerState(s) {
   if (s.running) return "Running";
   return "unknown";
 }
-function getHttp2(program2) {
-  const opts = program2.optsWithGlobals();
-  const config = loadConfig({ configPath: opts.config });
+function resolveCluster(config, env, instance) {
+  const effectiveEnv = env ?? config.openshift.defaultEnvironment;
+  const effectiveInstance = instance ?? config.openshift.defaultInstance;
+  if (effectiveEnv && effectiveInstance) {
+    const envCfg = config.openshift.environments[effectiveEnv];
+    const instCfg = envCfg?.instances?.[effectiveInstance];
+    if (!instCfg?.baseUrl) {
+      throw new PncliError(
+        `OpenShift cluster "${effectiveEnv}/${effectiveInstance}" is not configured or missing baseUrl. Run: pncli config set openshift.environments.${effectiveEnv}.instances.${effectiveInstance}.baseUrl <url>`
+      );
+    }
+    if (!instCfg.token) {
+      throw new PncliError(
+        `OpenShift cluster "${effectiveEnv}/${effectiveInstance}" is missing a token. Run: pncli config set openshift.environments.${effectiveEnv}.instances.${effectiveInstance}.token <token>`
+      );
+    }
+    return { baseUrl: instCfg.baseUrl, token: instCfg.token };
+  }
+  if (effectiveEnv && !effectiveInstance) {
+    throw new PncliError(
+      `OpenShift environment "${effectiveEnv}" requires a cluster instance. Pass --instance <name> or run: pncli config set openshift.defaultInstance <name>`
+    );
+  }
+  if (!effectiveEnv && effectiveInstance) {
+    throw new PncliError(
+      `OpenShift instance "${effectiveInstance}" requires an environment. Pass --env <name> or run: pncli config set openshift.defaultEnvironment <name>`
+    );
+  }
   if (!config.openshift.baseUrl) {
     throw new PncliError("OpenShift not configured. Run: pncli config init");
   }
-  return createHttpClient(config, Boolean(opts.dryRun));
+  return { baseUrl: config.openshift.baseUrl, token: config.openshift.token };
+}
+function getHttp2(oc) {
+  const opts = oc.optsWithGlobals();
+  const config = loadConfig({ configPath: opts.config });
+  const cluster = resolveCluster(config, opts.env, opts.instance);
+  return createHttpClient(
+    { ...config, openshift: { ...config.openshift, ...cluster } },
+    Boolean(opts.dryRun)
+  );
 }
 function podAge(creationTimestamp) {
   if (!creationTimestamp) return "unknown";
@@ -10832,11 +11306,39 @@ function parseMemMiB(mem) {
   return null;
 }
 function registerOpenShiftCommands(program2) {
-  const oc = program2.command("openshift").description("OpenShift / Kubernetes operations");
+  const oc = program2.command("openshift").description("OpenShift / Kubernetes operations").option("--env <name>", "Named environment (openshift.environments.<name>) to target").option("--instance <name>", "Named cluster instance within the environment to target");
+  const cluster = oc.command("cluster").description("Manage named OpenShift cluster configurations");
+  cluster.command("list").description("List all configured OpenShift environments and cluster instances").action(() => {
+    const start = Date.now();
+    try {
+      const opts = oc.optsWithGlobals();
+      const config = loadConfig({ configPath: opts.config });
+      const clusters = [];
+      for (const [envName, envCfg] of Object.entries(config.openshift.environments)) {
+        for (const [instName, instCfg] of Object.entries(envCfg.instances ?? {})) {
+          clusters.push({ environment: envName, instance: instName, baseUrl: instCfg.baseUrl });
+        }
+      }
+      const legacy = config.openshift.baseUrl ? [{ environment: "(default)", instance: "(default)", baseUrl: config.openshift.baseUrl }] : [];
+      success(
+        {
+          count: clusters.length + legacy.length,
+          clusters: [...legacy, ...clusters],
+          defaultEnvironment: config.openshift.defaultEnvironment,
+          defaultInstance: config.openshift.defaultInstance
+        },
+        "openshift",
+        "cluster-list",
+        start
+      );
+    } catch (err) {
+      fail(err, "openshift", "cluster-list", start);
+    }
+  });
   oc.command("pods").description("List pod health summary for a namespace \u2014 pre-processed for LLM analysis. Use --raw to return the full unmodified Kubernetes pod objects.").requiredOption("--namespace <ns>", "Kubernetes namespace").option("--label-selector <selector>", "Label selector (e.g. app=my-app)").option("--raw", "Return full Kubernetes pod objects without summarization (includes env vars, images, node name, annotations, resources, etc.)", false).action(async (opts) => {
     const start = Date.now();
     try {
-      const http = getHttp2(program2);
+      const http = getHttp2(oc);
       const params = {};
       if (opts.labelSelector) params["labelSelector"] = opts.labelSelector;
       const podList = await http.openshift(
@@ -10945,7 +11447,7 @@ function registerOpenShiftCommands(program2) {
   oc.command("events").description("List Warning events for a namespace \u2014 pre-filtered for LLM analysis").requiredOption("--namespace <ns>", "Kubernetes namespace").option("--field-selector <selector>", "Additional field selector (e.g. involvedObject.name=my-pod)").option("--all", "Include Normal events in addition to Warning events", false).action(async (opts) => {
     const start = Date.now();
     try {
-      const http = getHttp2(program2);
+      const http = getHttp2(oc);
       const params = {};
       const selectors = [];
       if (!opts.all) selectors.push("type=Warning");
@@ -10979,7 +11481,7 @@ function registerOpenShiftCommands(program2) {
   oc.command("logs").description("Get recent log lines from a pod container").requiredOption("--namespace <ns>", "Kubernetes namespace").requiredOption("--pod <name>", "Pod name").option("--container <name>", "Container name (defaults to first container)").option("--lines <n>", "Number of most-recent lines to return", "100").option("--previous", "Return logs from the previous container instance", false).action(async (opts) => {
     const start = Date.now();
     try {
-      const http = getHttp2(program2);
+      const http = getHttp2(oc);
       const lines = opts.lines ? parseInt(opts.lines, 10) : 100;
       const logText = await http.openshiftText(
         `/api/v1/namespaces/${encodeURIComponent(opts.namespace)}/pods/${encodeURIComponent(opts.pod)}/log`,
@@ -11011,7 +11513,7 @@ function registerOpenShiftCommands(program2) {
   oc.command("pod-metrics").description("Get CPU and memory usage for pods in a namespace (requires metrics-server)").requiredOption("--namespace <ns>", "Kubernetes namespace").action(async (opts) => {
     const start = Date.now();
     try {
-      const http = getHttp2(program2);
+      const http = getHttp2(oc);
       const metricsList = await http.openshift(
         `/apis/metrics.k8s.io/v1beta1/namespaces/${encodeURIComponent(opts.namespace)}/pods`
       );
@@ -11031,7 +11533,7 @@ function registerOpenShiftCommands(program2) {
   oc.command("resource-usage").description("Combined CPU/memory usage, limits, and requests for all pods in a namespace \u2014 all values normalized to millicores (m) and mebibytes (Mi). Requires metrics-server. Use --csv to emit a spreadsheet-friendly CSV.").requiredOption("--namespace <ns>", "Kubernetes namespace").option("--label-selector <selector>", "Label selector (e.g. app=my-app)").option("--csv", "Output as CSV instead of JSON (suitable for Excel)", false).action(async (opts) => {
     const start = Date.now();
     try {
-      const http = getHttp2(program2);
+      const http = getHttp2(oc);
       const nsEncoded = encodeURIComponent(opts.namespace);
       const podParams = {};
       if (opts.labelSelector) podParams["labelSelector"] = opts.labelSelector;
@@ -11096,12 +11598,53 @@ function registerOpenShiftCommands(program2) {
 }
 
 // src/services/dynatrace/commands.ts
-function getHttp3(program2) {
+function getHttp3(program2, envName) {
   const opts = program2.optsWithGlobals();
-  return createHttpClient(
-    loadConfig({ configPath: opts.config }),
-    Boolean(opts.dryRun)
-  );
+  const cfg = loadConfig({ configPath: opts.config });
+  if (envName) {
+    const envConfig = cfg.dynatrace.environments[envName];
+    if (!envConfig) {
+      throw new PncliError(
+        `Dynatrace environment "${envName}" not configured. Run: pncli config set dynatrace.environments.${envName}.baseUrl <url>`
+      );
+    }
+    return createHttpClient(
+      {
+        ...cfg,
+        dynatrace: {
+          ...cfg.dynatrace,
+          baseUrl: envConfig.baseUrl ?? cfg.dynatrace.baseUrl,
+          apiToken: envConfig.apiToken ?? cfg.dynatrace.apiToken,
+          platformUrl: envConfig.platformUrl ?? cfg.dynatrace.platformUrl,
+          platformToken: envConfig.platformToken ?? cfg.dynatrace.platformToken
+        }
+      },
+      Boolean(opts.dryRun)
+    );
+  }
+  const defaultEnv = cfg.dynatrace.defaultEnvironment;
+  if (defaultEnv) {
+    const envConfig = cfg.dynatrace.environments[defaultEnv];
+    if (!envConfig) {
+      throw new PncliError(
+        `Dynatrace defaultEnvironment "${defaultEnv}" is not configured. Run: pncli config set dynatrace.environments.${defaultEnv}.baseUrl <url> or pncli config set dynatrace.defaultEnvironment <name>`
+      );
+    }
+    return createHttpClient(
+      {
+        ...cfg,
+        dynatrace: {
+          ...cfg.dynatrace,
+          baseUrl: envConfig.baseUrl ?? cfg.dynatrace.baseUrl,
+          apiToken: envConfig.apiToken ?? cfg.dynatrace.apiToken,
+          platformUrl: envConfig.platformUrl ?? cfg.dynatrace.platformUrl,
+          platformToken: envConfig.platformToken ?? cfg.dynatrace.platformToken
+        }
+      },
+      Boolean(opts.dryRun)
+    );
+  }
+  return createHttpClient(cfg, Boolean(opts.dryRun));
 }
 async function allPages(fetchPage) {
   const items = [];
@@ -11173,12 +11716,13 @@ async function runTraceQuery(http, traceId) {
   return response.result;
 }
 function registerDynatraceCommands(program2) {
-  const dynatrace = program2.command("dynatrace").description("Dynatrace observability operations");
+  const dynatrace = program2.command("dynatrace").description("Dynatrace observability operations").option("--env <name>", "Named Dynatrace environment to use (from dynatrace.environments.<name>)");
   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);
+      const envName = dynatrace.opts().env;
+      const data = await listEntities(getHttp3(program2, envName), opts.selector, opts);
       success({ totalCount: data.totalCount, entities: data.items }, "dynatrace", "entities list", start);
     } catch (err) {
       fail(err, "dynatrace", "entities list", start);
@@ -11187,7 +11731,8 @@ function registerDynatraceCommands(program2) {
   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(
+      const envName = dynatrace.opts().env;
+      const data = await getHttp3(program2, envName).dynatrace(
         `/api/v2/entities/${encodeURIComponent(opts.id)}`,
         { params: { from: opts.from, to: opts.to, fields: opts.fields } }
       );
@@ -11199,7 +11744,8 @@ function registerDynatraceCommands(program2) {
   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);
+      const envName = dynatrace.opts().env;
+      const data = await listEntities(getHttp3(program2, envName), 'type("SERVICE")', opts);
       success({ totalCount: data.totalCount, services: data.items }, "dynatrace", "services", start);
     } catch (err) {
       fail(err, "dynatrace", "services", start);
@@ -11208,8 +11754,9 @@ function registerDynatraceCommands(program2) {
   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 envName = dynatrace.opts().env;
       const selector = 'type("CLOUD_APPLICATION")';
-      const data = await listEntities(getHttp3(program2), selector, opts);
+      const data = await listEntities(getHttp3(program2, envName), selector, opts);
       success({ totalCount: data.totalCount, workloads: data.items }, "dynatrace", "workloads", start);
     } catch (err) {
       fail(err, "dynatrace", "workloads", start);
@@ -11219,8 +11766,9 @@ function registerDynatraceCommands(program2) {
   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 envName = dynatrace.opts().env;
       const data = await allPages(async (nextPageKey) => {
-        const page = await getHttp3(program2).dynatrace("/api/v2/problems", {
+        const page = await getHttp3(program2, envName).dynatrace("/api/v2/problems", {
           params: nextPageKey ? { nextPageKey } : {
             from: opts.from ?? "now-2h",
             to: opts.to ?? "now",
@@ -11239,7 +11787,8 @@ function registerDynatraceCommands(program2) {
   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(
+      const envName = dynatrace.opts().env;
+      const data = await getHttp3(program2, envName).dynatrace(
         `/api/v2/problems/${encodeURIComponent(opts.id)}`,
         { params: { fields: opts.fields } }
       );
@@ -11251,7 +11800,8 @@ function registerDynatraceCommands(program2) {
   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);
+      const envName = dynatrace.opts().env;
+      const result = await runTraceQuery(getHttp3(program2, envName), opts.id);
       success(result, "dynatrace", "trace", start);
     } catch (err) {
       fail(err, "dynatrace", "trace", start);
@@ -11882,7 +12432,7 @@ Services:
   splitio      Split.IO (feature flags, Change Requests)
   figma        Figma (files, comments, version history)
   config       Manage pncli configuration
-  skills       Download and manage Claude Code skills
+  skills       Install and manage agent skills (Codex, GitHub Copilot, Claude Code)
   jwt          JWT token utilities (decode header and payload)
 `);
 program.parseAsync(process.argv).catch((err) => {