@klhapp/skillmux 1.10.0 → 1.11.1

package/src/commands/config.ts

@@ -1,8 +1,8 @@
 import { expandHome, migrateLegacyPaths, resolveConfigPath } from "../config";
-import { type TargetAdapter } from "../adapters";
+import { type ContextAdapter } from "../adapters";
 import { type ResolvedContext } from "../context";
 import { applyConfigInit, planConfigInit, type ConfigInitPlan } from "../setup";
-import { emitSuccess, isInteractive, renderTargetBanner } from "../output";
+import { emitSuccess, isInteractive, renderContextBanner, unknownSubcommandError } from "../output";
 import { confirmAction } from "./shared";
 import { isGlobalFlag } from "../global-flags";
 function emitConfigInitOutcome(
@@ -38,10 +38,10 @@ function emitConfigInitOutcome(
 }
 
 export async function handleConfigCommand(
-  adapter: TargetAdapter,
+  adapter: ContextAdapter,
   sub: string,
   args: string[],
-  ctx: { target: ResolvedContext; isJson: boolean; dryRun: boolean },
+  ctx: { context: ResolvedContext; isJson: boolean; dryRun: boolean },
 ) {
   if (sub === "init") {
     let vaultPath: string | undefined;
@@ -127,8 +127,8 @@ export async function handleConfigCommand(
   if (sub === "show") {
     const withSources = args.includes("--sources");
     const data = await adapter.getConfigShow();
-    emitSuccess({ isJson: ctx.isJson, target: ctx.target }, data, () => {
-      renderTargetBanner(ctx.target);
+    emitSuccess({ isJson: ctx.isJson, context: ctx.context }, data, () => {
+      renderContextBanner(ctx.context);
       if (withSources) {
         const policy =
           data.effective.config?.environment_overrides === false
@@ -151,7 +151,7 @@ export async function handleConfigCommand(
     if (!key) throw new Error("usage: skillmux config get <key>");
     const val = await adapter.getConfigGet(key);
     emitSuccess(
-      { isJson: ctx.isJson, target: ctx.target },
+      { isJson: ctx.isJson, context: ctx.context },
       { key, value: val },
       () => {
         console.log(
@@ -164,7 +164,7 @@ export async function handleConfigCommand(
 
   if (sub === "validate") {
     const res = await adapter.configValidate();
-    emitSuccess({ isJson: ctx.isJson, target: ctx.target }, res, () => {
+    emitSuccess({ isJson: ctx.isJson, context: ctx.context }, res, () => {
       console.log(res.valid ? "configuration is valid" : "configuration is invalid");
     });
     return;
@@ -172,8 +172,8 @@ export async function handleConfigCommand(
 
   if (sub === "diff") {
     const res = await adapter.configDiff();
-    emitSuccess({ isJson: ctx.isJson, target: ctx.target }, res, () => {
-      renderTargetBanner(ctx.target);
+    emitSuccess({ isJson: ctx.isJson, context: ctx.context }, res, () => {
+      renderContextBanner(ctx.context);
       console.log(JSON.stringify(res.diff, null, 2));
     });
     return;
@@ -186,8 +186,8 @@ export async function handleConfigCommand(
       throw new Error("usage: skillmux config set <key> <value> [--dry-run]");
     }
     const res = await adapter.configSet(key, value, { dryRun: ctx.dryRun });
-    emitSuccess({ isJson: ctx.isJson, target: ctx.target }, res, () => {
-      renderTargetBanner(ctx.target);
+    emitSuccess({ isJson: ctx.isJson, context: ctx.context }, res, () => {
+      renderContextBanner(ctx.context);
       const prefix = ctx.dryRun ? "[dry-run] " : "";
       console.log(
         `${prefix}${key}: ${JSON.stringify(res.prior_val)} -> ${JSON.stringify(res.resulting_val)}`,
@@ -201,8 +201,8 @@ export async function handleConfigCommand(
 
   if (sub === "status") {
     const res = await adapter.configStatus();
-    emitSuccess({ isJson: ctx.isJson, target: ctx.target }, res, () => {
-      renderTargetBanner(ctx.target);
+    emitSuccess({ isJson: ctx.isJson, context: ctx.context }, res, () => {
+      renderContextBanner(ctx.context);
       console.log(`runtime: ${res.runtime}`);
       console.log(`deployment runtime: ${res.deployment_runtime}`);
       console.log(`image variant: ${res.image_variant ?? "none"}`);
@@ -212,5 +212,13 @@ export async function handleConfigCommand(
     return;
   }
 
-  throw new Error("usage: skillmux config show");
+  throw unknownSubcommandError("config", sub, [
+    "init",
+    "show",
+    "get",
+    "set",
+    "validate",
+    "diff",
+    "status",
+  ]);
 }

package/src/commands/context.ts

@@ -9,18 +9,19 @@ import {
 import {
   emitSuccess,
   renderTable,
-  renderTargetBanner,
+  renderContextBanner,
+  unknownSubcommandError,
 } from "../output";
 
 export async function handleContextCommand(
   sub: string,
   args: string[],
-  ctx: { target: ResolvedContext; isJson: boolean },
+  ctx: { context: ResolvedContext; isJson: boolean },
 ) {
   if (sub === "list") {
     const contexts = await listContexts();
-    emitSuccess({ isJson: ctx.isJson, target: ctx.target }, contexts, () => {
-      renderTargetBanner(ctx.target);
+    emitSuccess({ isJson: ctx.isJson, context: ctx.context }, contexts, () => {
+      renderContextBanner(ctx.context);
       renderTable(
         [
           { key: "name", header: "NAME" },
@@ -40,8 +41,8 @@ export async function handleContextCommand(
 
   if (sub === "current") {
     const current = await getCurrentContext();
-    emitSuccess({ isJson: ctx.isJson, target: ctx.target }, current, () => {
-      renderTargetBanner(ctx.target);
+    emitSuccess({ isJson: ctx.isJson, context: ctx.context }, current, () => {
+      renderContextBanner(ctx.context);
       console.log(`Current context: ${current.name} (${current.server})`);
     });
     return;
@@ -62,7 +63,7 @@ export async function handleContextCommand(
     }
     await addContext(name, { server, token_env: tokenEnv });
     emitSuccess(
-      { isJson: ctx.isJson, target: ctx.target },
+      { isJson: ctx.isJson, context: ctx.context },
       { name, server, token_env: tokenEnv },
       () => {
         console.log(`Added context "${name}" -> ${server}`);
@@ -76,7 +77,7 @@ export async function handleContextCommand(
     if (!name) throw new Error("usage: skillmux context use <name>");
     await useContext(name);
     emitSuccess(
-      { isJson: ctx.isJson, target: ctx.target },
+      { isJson: ctx.isJson, context: ctx.context },
       { default_context: name },
       () => {
         console.log(`Switched default context to "${name}"`);
@@ -90,7 +91,7 @@ export async function handleContextCommand(
     if (!name) throw new Error("usage: skillmux context remove <name>");
     await removeContext(name);
     emitSuccess(
-      { isJson: ctx.isJson, target: ctx.target },
+      { isJson: ctx.isJson, context: ctx.context },
       { removed: name },
       () => {
         console.log(`Removed context "${name}"`);
@@ -99,5 +100,5 @@ export async function handleContextCommand(
     return;
   }
 
-  throw new Error("usage: skillmux context <add|list|current|use|remove>");
+  throw unknownSubcommandError("context", sub, ["add", "list", "current", "use", "remove"]);
 }

package/src/commands/core.ts

@@ -1,6 +1,6 @@
 import { expandHome } from "../config";
 import { pinCore, unpinCore, validateManifest, writeManifestAtomic } from "../manifest";
-import { emitSuccess } from "../output";
+import { emitSuccess, unknownSubcommandError } from "../output";
 import { confirmIfNeeded, loadManifestContext } from "./shared";
 export async function runCore(
   subCommand: string,
@@ -8,7 +8,7 @@ export async function runCore(
   options: { isJson: boolean; dryRun: boolean },
 ): Promise<void> {
   if (subCommand !== "pin" && subCommand !== "unpin") {
-    throw new Error("usage: skillmux core <pin|unpin>");
+    throw unknownSubcommandError("core", subCommand, ["pin", "unpin"]);
   }
   const skillIds = args.filter((arg) => !arg.startsWith("-"));
   if (skillIds.length === 0) {

package/src/commands/doctor.ts

@@ -1,29 +1,50 @@
 import { resolveConfigPath } from "../config";
 import { diagnose } from "../doctor";
 import { getEffectiveConfig } from "../config-service";
-import type { TargetAdapter } from "../adapters";
+import type { ContextAdapter } from "../adapters";
 import type { ResolvedContext } from "../context";
+import { isGlobalFlag, isGlobalFlagWithValue } from "../global-flags";
 import {
   emitSuccess,
   green,
   red,
-  renderTargetBanner,
+  renderContextBanner,
 } from "../output";
 
+/**
+ * doctor takes no options of its own, but it still has to reject unknown ones
+ * rather than silently ignoring them the way every other command does.
+ */
+export function parseDoctorArgs(args: readonly string[]): void {
+  for (let i = 0; i < args.length; i++) {
+    const option = args[i];
+    if (isGlobalFlag(option, "--json", "--allow-insecure", "--verbose")) {
+      // handled globally by main(); recognized here so it isn't rejected
+    } else if (isGlobalFlagWithValue(option)) {
+      // handled globally by main()'s resolveContext(); skip its value too
+      i++;
+    } else {
+      throw new Error(`unknown doctor option: ${option}`);
+    }
+  }
+}
+
 export async function runDoctor(options: {
   isJson: boolean;
-  target: ResolvedContext;
-  adapter: TargetAdapter;
+  context: ResolvedContext;
+  adapter: ContextAdapter;
+  args?: readonly string[];
 }): Promise<void> {
-  if (options.target.type === "remote") {
-    const target = options.target;
+  parseDoctorArgs(options.args ?? []);
+  if (options.context.type === "remote") {
+    const context = options.context;
     const [status, caps] = await Promise.all([
       options.adapter.configStatus(),
       options.adapter.getCapabilities(),
     ]);
     const remoteReport = {
-      target: target.name || target.server,
-      server: target.server,
+      target: context.name || context.server,
+      server: context.server,
       version: status.version,
       deployment_runtime: status.deployment_runtime,
       image_variant: status.image_variant ?? null,
@@ -34,8 +55,8 @@ export async function runDoctor(options: {
       restart_required_keys: status.restart_required_keys,
       last_reload_error: status.last_reload_error,
     };
-    emitSuccess({ isJson: options.isJson, target: options.target }, remoteReport, () => {
-      renderTargetBanner(options.target);
+    emitSuccess({ isJson: options.isJson, target: options.context }, remoteReport, () => {
+      renderContextBanner(options.context);
       console.log(`server: ${remoteReport.server}`);
       console.log(`version: ${remoteReport.version}`);
       console.log(`deployment runtime: ${remoteReport.deployment_runtime}`);

package/src/commands/eval.ts

@@ -5,20 +5,22 @@ import { excludeExistingCases, parseEvalCases } from "../eval";
 import { emitSuccess, warn } from "../output";
 import { parseSince } from "../stats";
 import { confirmIfNeeded } from "./shared";
-import type { TargetAdapter } from "../adapters";
+import type { ContextAdapter } from "../adapters";
 import { isGlobalFlag, isGlobalFlagWithValue } from "../global-flags";
 
 export async function runEvalPromote(
   args: string[],
-  options: { isJson: boolean; dryRun: boolean; adapter: TargetAdapter },
+  options: { isJson: boolean; dryRun: boolean; adapter: ContextAdapter },
 ): Promise<void> {
   let since: string | undefined;
+  let out: string | undefined;
   let target: string | undefined;
   let dryRun = options.dryRun;
   let yes = false;
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
     if (arg === "--since") since = args[++i];
+    else if (arg === "--out") out = args[++i];
     else if (arg === "--target") target = args[++i];
     else if (arg === "--dry-run") dryRun = true;
     else if (arg === "--yes") yes = true;
@@ -31,12 +33,20 @@ export async function runEvalPromote(
     }
   }
   if (!since) {
-    throw new Error("usage: skillmux eval promote --since <window> [--target <path>] [--dry-run] [--yes] [--json]");
+    throw new Error("usage: skillmux eval promote --since <window> [--out <path>] [--dry-run] [--yes] [--json]");
+  }
+
+  if (out !== undefined && target !== undefined && out !== target) {
+    throw new Error("cannot specify conflicting --out and --target");
+  }
+
+  if (target !== undefined) {
+    warn("--target is deprecated, use --out instead");
   }
 
   const config = await loadConfig();
   const stateDir = expandHome(config.state_dir);
-  const targetPath = target ?? join(stateDir, "eval-observed.json");
+  const targetPath = out ?? target ?? join(stateDir, "eval-observed.json");
   const sinceDate = parseSince(since);
   const sinceIso = sinceDate.toISOString();