@fro.bot/systematic 3.15.1 → 3.16.0

package/dist/cli.js

@@ -23,14 +23,17 @@ import {
   discriminatedUnion,
   _enum,
   literal,
+  extractString,
+  toSourcedPiSubagentsOverlays,
+  resolveRouting,
   loadConfigWithSources,
+  collectRoutingTargets,
   getConfigPaths,
-  extractString,
   findAgentsInDir,
   findCommandsInDir,
   findSkillsInDir,
   discoverSkills
-} from "./index-7cyxcwf5.js";
+} from "./index-ae6mhwth.js";
 var __defProp = Object.defineProperty;
 var __returnValue = (v) => v;
 function __exportSetter(name, newValue) {
@@ -59,7 +62,15 @@ function buildAgentCatalog(agentsDir) {
   const entries = [];
   for (const info of infos) {
     const content = fs.readFileSync(info.file, "utf8");
-    const entry = parseValidatedAgentEntry(content, info.file);
+    const parsed = parseValidatedAgentEntry(content, info.file);
+    const category = info.category ?? "";
+    const key = info.name;
+    const entry = {
+      ...parsed,
+      key,
+      category,
+      id: category ? `${category}/${key}` : key
+    };
     try {
       resolveToolAllowlist(entry.toolsSource);
     } catch (error) {
@@ -68,9 +79,9 @@ function buildAgentCatalog(agentsDir) {
     }
     const existing = byName.get(entry.name);
     if (existing) {
-      existing.push(info.category ?? "(root)");
+      existing.push(category);
     } else {
-      byName.set(entry.name, [info.category ?? "(root)"]);
+      byName.set(entry.name, [category]);
     }
     entries.push(entry);
   }
@@ -174,14 +185,19 @@ var CONFIG_AUTHORITY_FIELD_PATHS = [
 ];
 var CONFIG_PROTECTED_FIELD_PATHS = [
   "workflow_guard",
+  "profiles",
   "agents.*.model",
   "agents.*.permission",
   "agents.*.skills",
   "agents.*.variant",
+  "agents.*.opencode",
+  "agents.*.pi",
   "categories.*.model",
   "categories.*.permission",
   "categories.*.skills",
-  "categories.*.variant"
+  "categories.*.variant",
+  "categories.*.opencode",
+  "categories.*.pi"
 ];
 var CONFIG_SOURCE_ERROR_CODES = [
   "parse-failed",
@@ -439,7 +455,14 @@ function configErrorCode(errorCode) {
 }
 function normalizeConfigObservation(config) {
   assertRecord(config, "config");
-  assertAllowedKeys(config, ["authorities", "protectedFields", "sources"], "config");
+  assertAllowedKeys(config, [
+    "authorities",
+    "protectedFields",
+    "sources",
+    "activeProfile",
+    "profileSelectorSource",
+    "profileFallback"
+  ], "config");
   if (!Array.isArray(config.sources)) {
     throw new TypeError("config.sources must be an array");
   }
@@ -1496,21 +1519,19 @@ function lookupOverlay(map, category, agentKey) {
   }
   return map[agentKey];
 }
-function resolveModel(config, category, agentKey) {
-  const agentOverlay = lookupOverlay(config.agents, category, agentKey);
-  if (agentOverlay && Object.hasOwn(agentOverlay, "model")) {
-    const value = agentOverlay.model;
-    return typeof value === "string" ? value : undefined;
-  }
-  const categoryOverlay = category ? config.categories?.[category] : undefined;
-  if (categoryOverlay && Object.hasOwn(categoryOverlay, "model")) {
-    const value = categoryOverlay.model;
-    return typeof value === "string" ? value : undefined;
-  }
-  return;
+function resolveRoutedFields(overlays, piSubagentsOverlays, category, agentKey) {
+  const resolution = resolveRouting({
+    overlays,
+    piSubagentsOverlays,
+    target: { agentKey, category: category ?? "" },
+    harness: "pi"
+  });
+  return {
+    model: typeof resolution.model === "string" ? resolution.model : undefined,
+    thinking: resolution.qualifier
+  };
 }
-var PI_SUBAGENTS_FRONTMATTER_FIELDS = [
-  "thinking",
+var OTHER_PI_SUBAGENTS_FRONTMATTER_FIELDS = [
   "max_turns",
   "tools",
   "skills"
@@ -1519,7 +1540,7 @@ function resolvePiSubagentsFields(config, category, agentKey) {
   const categoryOverlay = category ? config.pi_subagents?.categories?.[category] : undefined;
   const agentOverlay = lookupOverlay(config.pi_subagents?.agents, category, agentKey);
   const result = {};
-  for (const field of PI_SUBAGENTS_FRONTMATTER_FIELDS) {
+  for (const field of OTHER_PI_SUBAGENTS_FRONTMATTER_FIELDS) {
     if (agentOverlay && Object.hasOwn(agentOverlay, field)) {
       result[field] = agentOverlay[field];
     } else if (categoryOverlay && Object.hasOwn(categoryOverlay, field)) {
@@ -1528,19 +1549,21 @@ function resolvePiSubagentsFields(config, category, agentKey) {
   }
   return result;
 }
-function applyConfigToContent(content, config, category, agentKey) {
+function applyConfigToContent(content, config, overlays, piSubagentsOverlays, category, agentKey) {
   const { data, body } = parseFrontmatter(content);
-  const model = resolveModel(config, category, agentKey);
-  const piSubagentsFields = resolvePiSubagentsFields(config, category, agentKey);
+  const { model, thinking } = resolveRoutedFields(overlays, piSubagentsOverlays, category, agentKey);
+  const otherFields = resolvePiSubagentsFields(config, category, agentKey);
   const frontmatter = {};
   if (typeof data.description === "string") {
     frontmatter.description = data.description;
   }
   if (model !== undefined)
     frontmatter.model = model;
-  for (const field of PI_SUBAGENTS_FRONTMATTER_FIELDS) {
-    if (Object.hasOwn(piSubagentsFields, field)) {
-      frontmatter[field] = piSubagentsFields[field];
+  if (thinking !== undefined)
+    frontmatter.thinking = thinking;
+  for (const field of OTHER_PI_SUBAGENTS_FRONTMATTER_FIELDS) {
+    if (Object.hasOwn(otherFields, field)) {
+      frontmatter[field] = otherFields[field];
     }
   }
   let frontmatterBlock;
@@ -1559,12 +1582,12 @@ ${lines}
 
 ${trimmedBody}`;
 }
-function applyConfigToEntries(entries, config) {
+function applyConfigToEntries(entries, config, overlays, piSubagentsOverlays) {
   return entries.map((entry) => {
     if (entry.status === "excluded-critical" || !entry.content)
       return entry;
     const { category, agentKey } = parseSourceCategoryAndKey(entry.sourceRelPath);
-    const content = applyConfigToContent(entry.content, config, category, agentKey);
+    const content = applyConfigToContent(entry.content, config, overlays, piSubagentsOverlays, category, agentKey);
     const hash = crypto2.createHash("sha256").update(content).digest("hex");
     return { ...entry, content, hash };
   });
@@ -1573,10 +1596,11 @@ function generateEntries(repoRoot, configOptions) {
   const entries = generateAll(repoRoot);
   if (!configOptions)
     return entries;
-  const config = loadConfigWithSources(configOptions.cwd, {
+  const { config, overlays } = loadConfigWithSources(configOptions.cwd, {
     includeProject: configOptions.scope === "project"
-  }).config;
-  return applyConfigToEntries(entries, config);
+  });
+  const piSubagentsOverlays = toSourcedPiSubagentsOverlays(config.pi_subagents);
+  return applyConfigToEntries(entries, config, overlays, piSubagentsOverlays);
 }
 function findPackageRoot() {
   const thisFile = fileURLToPath(import.meta.url);
@@ -2703,7 +2727,7 @@ Commands:
                                Exit statuses: 0 valid artifact, 1 validation failure,
                                2 operational failure, 3 legacy artifact with no schema_version
   config [subcommand]          Configuration management
-    show                       Show configuration
+    show [--json]              Show configuration (--json for a machine-readable resolved view)
     path                       Print config file locations
   setup --harness opencode|pi  Configure a harness to load Systematic (project-local only)
   pi-subagents <subcommand>    Manage Systematic persona export for pi-subagents
@@ -2722,6 +2746,7 @@ Examples:
   systematic validate-review-artifact .context/systematic/ce-review/review-summary.json
   systematic list agents
   systematic config show
+  systematic config show --json
   systematic setup --harness opencode
   systematic setup --harness pi
   systematic pi-subagents preview
@@ -2730,6 +2755,13 @@ Examples:
   systematic pi-subagents refresh
   systematic pi-subagents cleanup
 `;
+var CONFIG_SHOW_USAGE = `Usage: systematic config show [--json]
+
+Options:
+  --json    Print a machine-readable resolved view (active profile, fallback,
+            and per-agent/harness routing) instead of prose. No raw file
+            contents in JSON mode.
+`;
 var PI_SUBAGENTS_USAGE = `Usage: systematic pi-subagents <subcommand> [--scope project|global]
 
 Subcommands:
@@ -3005,7 +3037,130 @@ function listItems(type) {
     console.log(`  ${item.name}`);
   }
 }
-function configShow() {
+function formatRoutingModel(model) {
+  if (model === undefined)
+    return "(unset)";
+  if (model === null)
+    return "null (inherit)";
+  return model;
+}
+function formatRoutingQualifier(qualifier) {
+  return qualifier === undefined ? "(none)" : qualifier;
+}
+function formatRoutingSource(source) {
+  return source === undefined ? "(n/a)" : `${source.level}/${source.form}`;
+}
+function printProfileSummary(metadata) {
+  const activeLabel = metadata.activeProfile ?? "none";
+  const selectedByLabel = metadata.profileSelectorSource ?? "(none)";
+  console.log(`  Active profile: ${activeLabel}`);
+  console.log(`  Selected by:    ${selectedByLabel}`);
+  if (metadata.profileFallback) {
+    const usedLabel = metadata.profileFallback.usedDefault ? `your default profile "${metadata.profileFallback.usedDefault}"` : "base configuration (no default profile is set)";
+    console.log(`  Fallback:       requested "${metadata.profileFallback.requested}" is not defined; used ${usedLabel}`);
+  }
+}
+function disabledAgentsSet(loaded) {
+  return new Set(loaded.config.disabled_agents ?? []);
+}
+function printRoutingTable(loaded) {
+  const targets = collectRoutingTargets(loaded.overlays, disabledAgentsSet(loaded)).sort((left, right) => `${left.category}/${left.agentKey}`.localeCompare(`${right.category}/${right.agentKey}`));
+  if (targets.length === 0) {
+    console.log("  No per-agent or per-category overlays are defined.");
+    return;
+  }
+  for (const target of targets) {
+    console.log(`  ${target.agentKey} (${target.category}):`);
+    for (const harness of ["opencode", "pi"]) {
+      const resolution = resolveRouting({
+        harness,
+        overlays: loaded.overlays,
+        piSubagentsOverlays: loaded.piSubagentsOverlays,
+        target
+      });
+      const qualifierName = harness === "opencode" ? "variant" : "thinking";
+      console.log(`    ${harness}: model=${formatRoutingModel(resolution.model)} (${formatRoutingSource(resolution.source.model)}), ` + `${qualifierName}=${formatRoutingQualifier(resolution.qualifier)} (${formatRoutingSource(resolution.source.qualifier)})`);
+    }
+  }
+}
+function printResolvedSection() {
+  let loaded;
+  try {
+    loaded = loadConfigWithSources(process.cwd());
+  } catch {
+    console.log(`
+Resolved configuration: unavailable (the configuration failed to load).`);
+    return;
+  }
+  const { metadata, overlays } = loaded;
+  const hasProfileSelection = metadata.activeProfile !== null || metadata.profileSelectorSource !== null;
+  const hasOverlays = Object.keys(overlays.agents).length > 0 || Object.keys(overlays.categories).length > 0;
+  console.log(`
+Resolved configuration:`);
+  if (!hasProfileSelection && !hasOverlays) {
+    console.log("  No profiles are selected and no per-agent/category overlays are defined.");
+    return;
+  }
+  printProfileSummary(metadata);
+  console.log("");
+  console.log("  Routing:");
+  printRoutingTable(loaded);
+}
+function toJsonRoutingResolution(resolution) {
+  return {
+    model: resolution.model,
+    qualifier: resolution.qualifier,
+    source: resolution.source
+  };
+}
+function buildConfigShowJson() {
+  const paths = getConfigPaths(process.cwd());
+  const locations = {
+    user: paths.userConfig,
+    project: paths.projectConfig,
+    custom: paths.customConfig ?? null
+  };
+  let loaded;
+  try {
+    loaded = loadConfigWithSources(process.cwd());
+  } catch (error) {
+    return {
+      locations,
+      error: error instanceof Error ? error.message : String(error)
+    };
+  }
+  const targets = collectRoutingTargets(loaded.overlays, disabledAgentsSet(loaded)).sort((left, right) => `${left.category}/${left.agentKey}`.localeCompare(`${right.category}/${right.agentKey}`));
+  const routing = targets.map((target) => ({
+    target,
+    opencode: toJsonRoutingResolution(resolveRouting({
+      harness: "opencode",
+      overlays: loaded.overlays,
+      piSubagentsOverlays: loaded.piSubagentsOverlays,
+      target
+    })),
+    pi: toJsonRoutingResolution(resolveRouting({
+      harness: "pi",
+      overlays: loaded.overlays,
+      piSubagentsOverlays: loaded.piSubagentsOverlays,
+      target
+    }))
+  }));
+  return {
+    locations,
+    activeProfile: loaded.metadata.activeProfile,
+    profileSelectorSource: loaded.metadata.profileSelectorSource,
+    profileFallback: loaded.metadata.profileFallback,
+    routing
+  };
+}
+function configShow(options) {
+  if (options.json) {
+    const output = buildConfigShowJson();
+    console.log(JSON.stringify(output, null, 2));
+    if ("error" in output)
+      process.exit(1);
+    return;
+  }
   const paths = getConfigPaths(process.cwd());
   console.log(`Configuration locations:
 `);
@@ -3021,6 +3176,20 @@ Project configuration:`);
 User configuration:`);
     console.log(fs6.readFileSync(paths.userConfig, "utf-8"));
   }
+  printResolvedSection();
+}
+function parseConfigShowArgs(rest) {
+  let json = false;
+  for (const arg of rest) {
+    if (arg === "--json") {
+      json = true;
+    } else {
+      console.error(`Unknown argument: ${arg}`);
+      console.error(CONFIG_SHOW_USAGE);
+      process.exit(1);
+    }
+  }
+  return { json };
 }
 function configPath() {
   const paths = getConfigPaths(process.cwd());
@@ -3219,7 +3388,7 @@ function runLegacyCli(args) {
       switch (args[1]) {
         case "show":
         case undefined:
-          configShow();
+          configShow(parseConfigShowArgs(args.slice(2)));
           break;
         case "path":
           configPath();