agents-inc 0.159.0 → 0.161.0

package/dist/{chunk-YAHTF4NO.js → chunk-MED6GNV3.js}

@@ -1,19 +1,18 @@
 #!/usr/bin/env node
 import {
   compileAgents
-} from "./chunk-VCUXNKOY.js";
+} from "./chunk-A2NA377T.js";
 import {
   loadAgentDefs
-} from "./chunk-G7TYOPON.js";
+} from "./chunk-B3YSTZZC.js";
 import {
   ConfigLoadError,
   GlobalPairWriteViolation,
-  STACK_AGENT_CONFIG_LOOSE_LINE,
-  activeProjectAgentNames,
-  assembleConfigTypesSource,
+  INDENT_STEP,
   assertGateToken,
   buildAndMergeConfig,
   buildConfigTypesBackgroundData,
+  commentEntry,
   deriveCategories,
   deriveDomains,
   detectGlobalInstallation,
@@ -24,40 +23,50 @@ import {
   enableBuffering,
   ensureDir,
   fileExists,
+  generateBlankGlobalConfigTypesSource,
   generateConfigTypesSource,
   getErrorMessage,
   getProjectConfigPath,
-  isActiveAt,
-  isGlobalTombstone,
   isHomeDirectory,
-  isSkillAssignment,
+  isKeyedRecord,
   loadProjectConfig,
   loadProjectConfigFromDir,
   loadSkillsMatrixFromSource,
   mergeConfigs,
   normalizeStackRecord,
+  quoteText,
   readFile,
   regenerateConfigTypes,
+  renderArrayLine,
+  renderKey,
+  renderTypeImportLine,
+  renderValueLine,
   resolveInstallPaths,
+  sourceEntry,
   splitConfigByScope,
+  valueEntries,
   verbose,
   withGateToken,
   writeFile
-} from "./chunk-V625APR6.js";
+} from "./chunk-YSQ76LWG.js";
 import {
-  byCategoryDeclarationOrder,
   matrix,
   typedEntries,
   typedKeys
-} from "./chunk-7Z4N4JWQ.js";
+} from "./chunk-BLGETWYI.js";
 import {
   CLAUDE_SRC_DIR,
   CLI_INVOKE_COMMAND,
   DEFAULT_PLUGIN_NAME,
   GLOBAL_CONFIG_NAME,
   LOCAL_PSEUDO_CATEGORY,
-  STANDARD_FILES
-} from "./chunk-5KB4I5J7.js";
+  STANDARD_FILES,
+  activeProjectAgentNames,
+  byCategoryDeclarationOrder,
+  isActiveAt,
+  isExclusiveCategory,
+  isGlobalTombstone
+} from "./chunk-AMZO4YJK.js";
 
 // src/cli/lib/operations/source/load-source.ts
 async function loadSource(options) {
@@ -118,10 +127,13 @@ async function detectBothInstallations(projectDir) {
 import fs from "fs";
 import { isDeepEqual, unique } from "remeda";
 
-// src/cli/lib/configuration/config-writer.ts
-import os from "os";
-import path from "path";
-var EXTRACTED_FIELDS = /* @__PURE__ */ new Set(["skills", "agents", "stack", "selectedDomains"]);
+// ../compile/src/config-source.ts
+var EXTRACTED_FIELDS = /* @__PURE__ */ new Set([
+  "skills",
+  "agents",
+  "stack",
+  "selectedDomains"
+]);
 var CANONICAL_FIELD_ORDER = [
   "name",
   "description",
@@ -135,33 +147,94 @@ var CANONICAL_FIELD_ORDER = [
   "agentsSource",
   "projects"
 ];
-var CANONICAL_FIELDS = new Set(CANONICAL_FIELD_ORDER);
-function canonicalizeFieldOrder(cleaned) {
-  const inSchemaOrder = CANONICAL_FIELD_ORDER.filter(
-    (key) => key in cleaned
-  ).map((key) => [key, cleaned[key]]);
-  const passthrough = Object.entries(cleaned).filter(([key]) => !CANONICAL_FIELDS.has(key));
+var CANONICAL_SKILL_ENTRY_ORDER = [
+  "id",
+  "scope",
+  "origin",
+  "excluded"
+];
+var CANONICAL_AGENT_ENTRY_ORDER = [
+  "name",
+  "scope",
+  "model",
+  "effort",
+  "excluded"
+];
+var CANONICAL_ASSIGNMENT_ORDER = [
+  "id",
+  "preloaded",
+  "local",
+  "path"
+];
+function withKeysInSchemaOrder(record, schemaOrder) {
+  const named = new Set(schemaOrder);
+  const inSchemaOrder = schemaOrder.filter((key) => key in record).map((key) => [key, record[key]]);
+  const passthrough = Object.entries(record).filter(([key]) => !named.has(key));
   return Object.fromEntries([...inSchemaOrder, ...passthrough]);
 }
+function canonicalizeFieldOrder(cleaned) {
+  return withKeysInSchemaOrder(cleaned, CANONICAL_FIELD_ORDER);
+}
+function withEntriesInSchemaOrder(cleaned) {
+  const reordered = { ...cleaned };
+  if (Array.isArray(reordered.skills)) {
+    reordered.skills = entriesInSchemaOrder(
+      reordered.skills,
+      CANONICAL_SKILL_ENTRY_ORDER
+    );
+  }
+  if (Array.isArray(reordered.agents)) {
+    reordered.agents = entriesInSchemaOrder(
+      reordered.agents,
+      CANONICAL_AGENT_ENTRY_ORDER
+    );
+  }
+  return reordered;
+}
+function entriesInSchemaOrder(entries, schemaOrder) {
+  return entries.map(
+    (entry) => isKeyedRecord(entry) ? withKeysInSchemaOrder(entry, schemaOrder) : entry
+  );
+}
 function withKeysOrderedBy(record, compareKeys) {
-  return Object.fromEntries(Object.entries(record).sort(([a], [b]) => compareKeys(a, b)));
+  return Object.fromEntries(
+    Object.entries(record).sort(([a], [b]) => compareKeys(a, b))
+  );
 }
 function compareNamesInCodeUnitOrder(a, b) {
   if (a === b) return 0;
   return a < b ? -1 : 1;
 }
-function canonicalizeStackOrder(stack) {
-  const byDeclaration = byCategoryDeclarationOrder();
+function canonicalizeStackOrder(stack, catalog) {
+  const byDeclaration = byCategoryDeclarationOrder(catalog);
   const withCategoriesInOrder = Object.entries(stack).map(
     ([agent, categories]) => [agent, withKeysOrderedBy(categories, byDeclaration)]
   );
-  return withKeysOrderedBy(Object.fromEntries(withCategoriesInOrder), compareNamesInCodeUnitOrder);
+  return withKeysOrderedBy(
+    Object.fromEntries(withCategoriesInOrder),
+    compareNamesInCodeUnitOrder
+  );
 }
-function renderEntryLine(entry) {
-  return `  ${JSON.stringify(entry)},`;
+var CONFIG_TYPES_SPECIFIER = "./config-types";
+var STACK_TYPE = "Partial<Record<ProjectAgentName, StackAgentConfig>>";
+function declarationPosition(name, type) {
+  return { indent: 0, prefix: `const ${name}: ${type} = `, suffix: "" };
+}
+function declaration(name, type, value) {
+  return ["", renderValueLine(value, declarationPosition(name, type))];
+}
+function entryDeclaration(name, type, entries) {
+  return ["", renderArrayLine(entries, declarationPosition(name, type))];
+}
+function exportFieldPosition(key) {
+  return {
+    indent: INDENT_STEP,
+    prefix: `${renderKey(key)}: `,
+    suffix: ","
+  };
 }
 function renderScalarField(key, value) {
-  return `  ${JSON.stringify(key)}: ${JSON.stringify(value)},`;
+  return renderValueLine(value, exportFieldPosition(key));
 }
 function extractConfigArrays(cleaned) {
   return {
@@ -171,33 +244,101 @@ function extractConfigArrays(cleaned) {
     selectedDomains: cleaned.selectedDomains ?? []
   };
 }
-function cleanForEmission(config, options) {
+function cleanForEmission(config, catalog, options) {
   const cleaned = JSON.parse(JSON.stringify(config));
   if (options.dropProjects) {
     delete cleaned.projects;
   }
   if (cleaned.stack) {
     const compacted = compactStackAssignments(
-      cleaned.stack
+      cleaned.stack,
+      catalog
     );
-    cleaned.stack = canonicalizeStackOrder(compacted);
+    cleaned.stack = canonicalizeStackOrder(compacted, catalog);
   }
-  return canonicalizeFieldOrder(cleaned);
+  return canonicalizeFieldOrder(withEntriesInSchemaOrder(cleaned));
 }
-function generateConfigSource(config, options) {
-  if (options?.isProjectConfig && options.globalConfig) {
+function generateConfigSource(config, catalog, options) {
+  if (options?.isProjectConfig) {
+    return generateProjectConfig(config, catalog, options);
+  }
+  return generateStandaloneConfig(
+    cleanForEmission(config, catalog, { dropProjects: false })
+  );
+}
+function generateProjectConfig(config, catalog, options) {
+  const cleaned = cleanForEmission(config, catalog, { dropProjects: true });
+  if (options.globalConfig) {
     return generateProjectConfigWithInlinedGlobal(
-      cleanForEmission(config, { dropProjects: true }),
-      cleanForEmission(options.globalConfig, { dropProjects: true })
+      cleaned,
+      cleanForEmission(options.globalConfig, catalog, { dropProjects: true })
     );
   }
-  if (options?.isProjectConfig) {
+  if (options.globalImportPath !== void 0) {
     return generateProjectConfigWithGlobalImport(
-      cleanForEmission(config, { dropProjects: true }),
-      getGlobalConfigImportPath()
+      cleaned,
+      options.globalImportPath
     );
   }
-  return generateStandaloneConfig(cleanForEmission(config, { dropProjects: false }));
+  throw new Error(
+    "A project config needs the global config it extends: pass `globalConfig` to inline its entries, or `globalImportPath` to import and spread them. Neither was given, and the standalone writer this used to fall through to emits a global-shaped config carrying the `projects` tracking array a project root must never hold."
+  );
+}
+function generateProjectConfigWithGlobalImport(cleaned, globalImportPath) {
+  const importPath = `${globalImportPath}/config`;
+  const { skills, agents, stack, selectedDomains } = extractConfigArrays(cleaned);
+  const hasProjectDomains = selectedDomains.length > 0;
+  const hasStack = stack != null && Object.keys(stack).length > 0;
+  const typeImports = buildTypeImports({
+    // Always present, spread from global.
+    hasSkills: true,
+    hasAgents: true,
+    hasStack,
+    hasSelectedDomains: hasProjectDomains
+  });
+  const lines = [
+    `import globalConfig from ${quoteText(importPath)}`,
+    renderTypeImportLine(typeImports, CONFIG_TYPES_SPECIFIER)
+  ];
+  lines.push(
+    ...entryDeclaration("skills", "SkillConfig[]", [
+      sourceEntry("...globalConfig.skills"),
+      ...valueEntries(skills)
+    ])
+  );
+  lines.push(
+    ...entryDeclaration("agents", "AgentScopeConfig[]", [
+      sourceEntry("...globalConfig.agents"),
+      ...valueEntries(agents)
+    ])
+  );
+  if (hasStack) {
+    lines.push(...declaration("stack", STACK_TYPE, stack));
+  }
+  if (hasProjectDomains) {
+    lines.push(
+      ...entryDeclaration("selectedDomains", "Domain[]", [
+        sourceEntry("...(globalConfig.selectedDomains ?? [])"),
+        ...valueEntries(selectedDomains)
+      ])
+    );
+  }
+  const scalarFields = Object.entries(cleaned).filter(([key]) => !EXTRACTED_FIELDS.has(key) && key !== "name").map(([key, value]) => renderScalarField(key, value));
+  const exportFields = [
+    `  ...globalConfig,`,
+    renderScalarField("name", resolveProjectName(cleaned)),
+    `  skills,`,
+    `  agents,`,
+    ...hasStack ? [`  stack,`] : [],
+    ...hasProjectDomains ? [`  selectedDomains,`] : [],
+    ...scalarFields
+  ];
+  lines.push(``);
+  lines.push(`export default {`);
+  lines.push(...exportFields);
+  lines.push(`} satisfies ProjectConfig`);
+  lines.push(``);
+  return lines.join("\n");
 }
 function generateStandaloneConfig(cleaned) {
   const { skills, agents, stack, selectedDomains } = extractConfigArrays(cleaned);
@@ -211,28 +352,20 @@ function generateStandaloneConfig(cleaned) {
     hasStack,
     hasSelectedDomains
   });
-  const lines = [`import type { ${typeImports} } from "./config-types";`];
+  const lines = [
+    renderTypeImportLine(typeImports, CONFIG_TYPES_SPECIFIER)
+  ];
   if (hasSkills) {
-    lines.push(``);
-    lines.push(`const skills: SkillConfig[] = [`);
-    lines.push(skills.map(renderEntryLine).join("\n"));
-    lines.push(`];`);
+    lines.push(...declaration("skills", "SkillConfig[]", skills));
   }
   if (hasAgents) {
-    lines.push(``);
-    lines.push(`const agents: AgentScopeConfig[] = [`);
-    lines.push(agents.map(renderEntryLine).join("\n"));
-    lines.push(`];`);
+    lines.push(...declaration("agents", "AgentScopeConfig[]", agents));
   }
   if (hasStack) {
-    lines.push(``);
-    const stackBody = JSON.stringify(stack, null, 2);
-    lines.push(`const stack: Partial<Record<ProjectAgentName, StackAgentConfig>> = ${stackBody};`);
+    lines.push(...declaration("stack", STACK_TYPE, stack));
   }
   if (hasSelectedDomains) {
-    lines.push(``);
-    const items = selectedDomains.map((d) => JSON.stringify(d)).join(", ");
-    lines.push(`const selectedDomains: Domain[] = [${items}];`);
+    lines.push(...declaration("selectedDomains", "Domain[]", selectedDomains));
   }
   const renderExportField = (key, value) => {
     if (!EXTRACTED_FIELDS.has(key)) return [renderScalarField(key, value)];
@@ -247,7 +380,7 @@ function generateStandaloneConfig(cleaned) {
   lines.push(``);
   lines.push(`export default {`);
   lines.push(...exportFields);
-  lines.push(`} satisfies ProjectConfig;`);
+  lines.push(`} satisfies ProjectConfig`);
   lines.push(``);
   return lines.join("\n");
 }
@@ -259,66 +392,7 @@ function buildTypeImports(flags) {
     flags.hasAgents && "AgentScopeConfig",
     flags.hasSkills && "SkillConfig",
     flags.hasStack && "StackAgentConfig"
-  ].filter((t) => Boolean(t)).join(", ");
-}
-function generateProjectConfigWithGlobalImport(cleaned, globalImportPath) {
-  const importPath = `${globalImportPath}/config`;
-  const { skills, agents, stack, selectedDomains } = extractConfigArrays(cleaned);
-  const hasProjectDomains = selectedDomains.length > 0;
-  const hasStack = stack != null && Object.keys(stack).length > 0;
-  const typeImports = buildTypeImports({
-    hasSkills: true,
-    // Always present (spread from global)
-    hasAgents: true,
-    // Always present (spread from global)
-    hasStack,
-    hasSelectedDomains: hasProjectDomains
-  });
-  const lines = [
-    `import globalConfig from "${importPath}";`,
-    `import type { ${typeImports} } from "./config-types";`
-  ];
-  lines.push(``);
-  const skillItems = skills.map(renderEntryLine).join("\n");
-  lines.push(`const skills: SkillConfig[] = [`);
-  lines.push(`  ...globalConfig.skills,`);
-  if (skillItems) lines.push(skillItems);
-  lines.push(`];`);
-  lines.push(``);
-  const agentItems = agents.map(renderEntryLine).join("\n");
-  lines.push(`const agents: AgentScopeConfig[] = [`);
-  lines.push(`  ...globalConfig.agents,`);
-  if (agentItems) lines.push(agentItems);
-  lines.push(`];`);
-  if (hasStack) {
-    lines.push(``);
-    const stackBody = JSON.stringify(stack, null, 2);
-    lines.push(`const stack: Partial<Record<ProjectAgentName, StackAgentConfig>> = ${stackBody};`);
-  }
-  if (hasProjectDomains) {
-    lines.push(``);
-    const domainItems = selectedDomains.map(renderEntryLine).join("\n");
-    lines.push(`const selectedDomains: Domain[] = [`);
-    lines.push(`  ...(globalConfig.selectedDomains ?? []),`);
-    if (domainItems) lines.push(domainItems);
-    lines.push(`];`);
-  }
-  const scalarFields = Object.entries(cleaned).filter(([key]) => !EXTRACTED_FIELDS.has(key) && key !== "name").map(([key, value]) => renderScalarField(key, value)).join("\n");
-  const exportFields = [
-    `  ...globalConfig,`,
-    `  name: ${JSON.stringify(resolveProjectName(cleaned))},`,
-    `  skills,`,
-    `  agents,`,
-    ...hasStack ? [`  stack,`] : [],
-    ...hasProjectDomains ? [`  selectedDomains,`] : [],
-    ...scalarFields ? [scalarFields] : []
-  ];
-  lines.push(``);
-  lines.push(`export default {`);
-  lines.push(...exportFields);
-  lines.push(`} satisfies ProjectConfig;`);
-  lines.push(``);
-  return lines.join("\n");
+  ].filter((t) => Boolean(t));
 }
 function resolveProjectName(cleaned) {
   return cleaned.name && cleaned.name !== GLOBAL_CONFIG_NAME ? cleaned.name : DEFAULT_PLUGIN_NAME;
@@ -345,7 +419,9 @@ function partitionInlinedConfigEntries(cleaned, cleanedGlobal) {
   ];
   const projectAgentNames = new Set(projectAgents.map(nameOf));
   const filteredStack = project.stack ? Object.fromEntries(
-    Object.entries(project.stack).filter(([agent]) => projectAgentNames.has(agent))
+    Object.entries(project.stack).filter(
+      ([agent]) => projectAgentNames.has(agent)
+    )
   ) : void 0;
   return {
     globalSkills,
@@ -353,17 +429,25 @@ function partitionInlinedConfigEntries(cleaned, cleanedGlobal) {
     projectSkills,
     projectAgents,
     filteredStack,
-    selectedDomains: [.../* @__PURE__ */ new Set([...global.selectedDomains, ...project.selectedDomains])]
+    selectedDomains: [
+      .../* @__PURE__ */ new Set([...global.selectedDomains, ...project.selectedDomains])
+    ]
   };
 }
 function mergeInlinedScalarFields(cleaned, cleanedGlobal) {
-  return Object.entries(canonicalizeFieldOrder({ ...cleanedGlobal, ...cleaned })).filter(
-    ([key]) => !EXTRACTED_FIELDS.has(key) && key !== "name"
-  );
+  return Object.entries(
+    canonicalizeFieldOrder({ ...cleanedGlobal, ...cleaned })
+  ).filter(([key]) => !EXTRACTED_FIELDS.has(key) && key !== "name");
 }
 function generateProjectConfigWithInlinedGlobal(cleaned, cleanedGlobal) {
   const partition = partitionInlinedConfigEntries(cleaned, cleanedGlobal);
-  const { globalSkills, globalAgents, projectSkills, projectAgents, filteredStack } = partition;
+  const {
+    globalSkills,
+    globalAgents,
+    projectSkills,
+    projectAgents,
+    filteredStack
+  } = partition;
   const hasGlobalSkills = globalSkills.length > 0;
   const hasProjectSkills = projectSkills.length > 0;
   const hasSkills = hasGlobalSkills || hasProjectSkills;
@@ -378,38 +462,38 @@ function generateProjectConfigWithInlinedGlobal(cleaned, cleanedGlobal) {
     hasStack,
     hasSelectedDomains
   });
-  const lines = [`import type { ${typeImports} } from "./config-types";`];
+  const lines = [
+    renderTypeImportLine(typeImports, CONFIG_TYPES_SPECIFIER)
+  ];
   if (hasSkills) {
-    lines.push(``);
-    lines.push(`const skills: SkillConfig[] = [`);
     lines.push(
-      ...hasGlobalSkills ? [`  // global`, ...globalSkills.map(renderEntryLine)] : [],
-      ...hasProjectSkills ? [`  // project`, ...projectSkills.map(renderEntryLine)] : []
+      ...entryDeclaration(
+        "skills",
+        "SkillConfig[]",
+        scopeSectionEntries(globalSkills, projectSkills)
+      )
     );
-    lines.push(`];`);
   }
   if (hasAgents) {
-    lines.push(``);
-    lines.push(`const agents: AgentScopeConfig[] = [`);
     lines.push(
-      ...hasGlobalAgents ? [`  // global`, ...globalAgents.map(renderEntryLine)] : [],
-      ...hasProjectAgents ? [`  // project`, ...projectAgents.map(renderEntryLine)] : []
+      ...entryDeclaration(
+        "agents",
+        "AgentScopeConfig[]",
+        scopeSectionEntries(globalAgents, projectAgents)
+      )
     );
-    lines.push(`];`);
   }
   if (hasStack) {
-    lines.push(``);
-    const stackBody = JSON.stringify(filteredStack, null, 2);
-    lines.push(`const stack: Partial<Record<ProjectAgentName, StackAgentConfig>> = ${stackBody};`);
+    lines.push(...declaration("stack", STACK_TYPE, filteredStack));
   }
   if (hasSelectedDomains) {
-    lines.push(``);
-    const items = partition.selectedDomains.map((d) => JSON.stringify(d)).join(", ");
-    lines.push(`const selectedDomains: Domain[] = [${items}];`);
+    lines.push(
+      ...declaration("selectedDomains", "Domain[]", partition.selectedDomains)
+    );
   }
   const scalarFields = mergeInlinedScalarFields(cleaned, cleanedGlobal);
   const exportFields = [
-    `  name: ${JSON.stringify(resolveProjectName(cleaned))},`,
+    renderScalarField("name", resolveProjectName(cleaned)),
     ...scalarFields.map(([key, value]) => renderScalarField(key, value)),
     hasSkills ? `  skills,` : `  skills: [],`,
     hasAgents ? `  agents,` : `  agents: [],`,
@@ -419,23 +503,31 @@ function generateProjectConfigWithInlinedGlobal(cleaned, cleanedGlobal) {
   lines.push(``);
   lines.push(`export default {`);
   lines.push(...exportFields);
-  lines.push(`} satisfies ProjectConfig;`);
+  lines.push(`} satisfies ProjectConfig`);
   lines.push(``);
   return lines.join("\n");
 }
+function scopeSectionEntries(global, project) {
+  return [
+    ...global.length > 0 ? [commentEntry("global"), ...valueEntries(global)] : [],
+    ...project.length > 0 ? [commentEntry("project"), ...valueEntries(project)] : []
+  ];
+}
 function carriesFlags(assignment) {
   return Boolean(assignment.preloaded || assignment.local || assignment.path);
 }
-function compactAssignment(assignment) {
-  if (isSkillAssignment(assignment) && !carriesFlags(assignment)) return assignment.id;
-  return assignment;
+function isSkillAssignment(value) {
+  if (typeof value !== "object" || value === null) return false;
+  return typeof value.id === "string";
 }
-function isExclusiveCategory(category) {
-  return matrix.categories[category]?.exclusive === true;
+function compactAssignment(assignment) {
+  if (!isSkillAssignment(assignment)) return assignment;
+  if (!carriesFlags(assignment)) return assignment.id;
+  return withKeysInSchemaOrder(assignment, CANONICAL_ASSIGNMENT_ORDER);
 }
-function compactCategoryAssignments(category, assignments) {
+function compactCategoryAssignments(category, assignments, catalog) {
   const compacted = assignments.map(compactAssignment);
-  if (!isExclusiveCategory(category)) return compacted;
+  if (!isExclusiveCategory(catalog, category)) return compacted;
   if (compacted.length > 1) {
     throw new Error(
       `Category '${category}' is exclusive but holds ${compacted.length} skills: ${JSON.stringify(compacted)}`
@@ -443,48 +535,38 @@ function compactCategoryAssignments(category, assignments) {
   }
   return compacted[0];
 }
-function compactCategories(categories) {
+function compactCategories(categories, catalog) {
   return Object.fromEntries(
-    Object.entries(categories).filter(([, assignments]) => Array.isArray(assignments) && assignments.length > 0).map(([category, assignments]) => [
+    Object.entries(categories).filter(
+      ([, assignments]) => Array.isArray(assignments) && assignments.length > 0
+    ).map(([category, assignments]) => [
       category,
-      compactCategoryAssignments(category, assignments)
+      compactCategoryAssignments(category, assignments, catalog)
     ])
   );
 }
-function compactStackAssignments(stack) {
+function compactStackAssignments(stack, catalog) {
   return Object.fromEntries(
-    Object.entries(stack).map(([agent, categories]) => [agent, compactCategories(categories)]).filter(([, categories]) => Object.keys(categories).length > 0)
+    Object.entries(stack).map(
+      ([agent, categories]) => [agent, compactCategories(categories, catalog)]
+    ).filter(([, categories]) => Object.keys(categories).length > 0)
   );
 }
-function getGlobalConfigImportPath() {
-  return path.join(os.homedir(), CLAUDE_SRC_DIR);
-}
 function generateBlankGlobalConfigSource() {
-  return `import type { ProjectConfig } from "./config-types";
+  return `import type { ProjectConfig } from ${quoteText(CONFIG_TYPES_SPECIFIER)}
 
 export default {
-  "name": "${GLOBAL_CONFIG_NAME}",
-  "skills": [],
-  "agents": [],
-  "selectedDomains": []
-} satisfies ProjectConfig;
+  name: ${quoteText(GLOBAL_CONFIG_NAME)},
+  skills: [],
+  agents: [],
+  selectedDomains: [],
+} satisfies ProjectConfig
 `;
 }
-function generateBlankGlobalConfigTypesSource() {
-  return assembleConfigTypesSource({
-    skillId: "never",
-    agentName: "never",
-    selectedAgentName: "never",
-    projectAgentName: "SelectedAgentName",
-    domain: "never",
-    category: "never",
-    stackAgentConfig: STACK_AGENT_CONFIG_LOOSE_LINE
-  });
-}
 
 // src/cli/lib/config-gate/propagate.ts
 async function writeConfigFile(config, configPath, options) {
-  const source = generateConfigSource(config, options);
+  const source = generateConfigSource(config, matrix, options);
   await writeFile(configPath, source);
 }
 function additiveMergeStack(existing, incoming) {
@@ -820,8 +902,8 @@ function buildProjectTypesExtras(finalConfig, matrix2) {
 }
 
 // src/cli/lib/config-gate/index.ts
-import os3 from "os";
-import path3 from "path";
+import os2 from "os";
+import path2 from "path";
 
 // src/cli/lib/config-gate/classify.ts
 import { isDeepEqual as isDeepEqual2 } from "remeda";
@@ -940,17 +1022,17 @@ async function resolveGateDeps(deps, tier) {
 var NO_AGENTS = Promise.resolve({});
 
 // src/cli/lib/config-gate/pair-writer.ts
-import os2 from "os";
-import path2 from "path";
+import os from "os";
+import path from "path";
 function globalPairPaths() {
-  const dir = path2.join(os2.homedir(), CLAUDE_SRC_DIR);
+  const dir = path.join(os.homedir(), CLAUDE_SRC_DIR);
   return {
-    configPath: path2.join(dir, STANDARD_FILES.CONFIG_TS),
-    typesPath: path2.join(dir, STANDARD_FILES.CONFIG_TYPES_TS)
+    configPath: path.join(dir, STANDARD_FILES.CONFIG_TS),
+    typesPath: path.join(dir, STANDARD_FILES.CONFIG_TYPES_TS)
   };
 }
 function typesPathFor(configPath) {
-  return path2.join(path2.dirname(configPath), STANDARD_FILES.CONFIG_TYPES_TS);
+  return path.join(path.dirname(configPath), STANDARD_FILES.CONFIG_TYPES_TS);
 }
 async function writeIfChanged(filePath, source) {
   assertGateToken(filePath);
@@ -969,7 +1051,7 @@ function renderStandaloneTypes(config, matrix2, agents, extras) {
   );
 }
 async function writeGlobalConfigHalf(config, configPath) {
-  return writeIfChanged(configPath, generateConfigSource(config));
+  return writeIfChanged(configPath, generateConfigSource(config, matrix));
 }
 async function writeGlobalTypesHalf(config, configPath, matrix2, agents, extras) {
   return writeIfChanged(
@@ -978,7 +1060,7 @@ async function writeGlobalTypesHalf(config, configPath, matrix2, agents, extras)
   );
 }
 async function writeGlobalPair(config, configPath, matrix2, agents) {
-  const configWritten = await writeIfChanged(configPath, generateConfigSource(config));
+  const configWritten = await writeIfChanged(configPath, generateConfigSource(config, matrix2));
   const typesWritten = await writeIfChanged(
     typesPathFor(configPath),
     renderStandaloneTypes(config, matrix2, agents)
@@ -991,10 +1073,10 @@ async function ensureBlankPair() {
     verbose("Global config already exists, skipping blank creation");
     return false;
   }
-  await ensureDir(path2.dirname(configPath));
+  await ensureDir(path.dirname(configPath));
   await writeIfChanged(configPath, generateBlankGlobalConfigSource());
   await writeIfChanged(typesPath, generateBlankGlobalConfigTypesSource());
-  verbose(`Created blank global config at ${path2.dirname(configPath)}`);
+  verbose(`Created blank global config at ${path.dirname(configPath)}`);
   return true;
 }
 
@@ -1007,7 +1089,7 @@ var NOTHING_RECOMPILED = {
 };
 async function recompilePropagated(projectDirs) {
   if (projectDirs.length === 0) return NOTHING_RECOMPILED;
-  const { recompilePropagatedProjectAgents: recompilePropagatedProjectAgents2 } = await import("./recompile-project-agents-QIAMBCM4.js");
+  const { recompilePropagatedProjectAgents: recompilePropagatedProjectAgents2 } = await import("./recompile-project-agents-GQLODH24.js");
   return recompilePropagatedProjectAgents2(projectDirs);
 }
 
@@ -1037,7 +1119,7 @@ async function applyConsequences(globalConfig, changes, deps, currentProjectDir)
 function lazyGateDeps(projectDir) {
   return {
     loadMatrix: async () => {
-      const { loadSkillsMatrixFromSource: loadSkillsMatrixFromSource2 } = await import("./source-loader-CC6ZWKTI.js");
+      const { loadSkillsMatrixFromSource: loadSkillsMatrixFromSource2 } = await import("./source-loader-TSF5VS6V.js");
       const { matrix: matrix2 } = await loadSkillsMatrixFromSource2({
         projectDir,
         skipExtraSources: true,
@@ -1046,7 +1128,7 @@ function lazyGateDeps(projectDir) {
       return matrix2;
     },
     loadAgents: async () => {
-      const { loadAgentDefs: loadAgentDefs2 } = await import("./load-agent-defs-2H42B2OO.js");
+      const { loadAgentDefs: loadAgentDefs2 } = await import("./load-agent-defs-LDSND43G.js");
       return (await loadAgentDefs2()).agents;
     }
   };
@@ -1054,7 +1136,7 @@ function lazyGateDeps(projectDir) {
 async function writeScopedFromWizard(args) {
   return withGateToken(async () => {
     const { finalConfig, matrix: matrix2, agents, projectDir, projectConfigPath } = args;
-    const homeDir = os3.homedir();
+    const homeDir = os2.homedir();
     const deps = { matrix: matrix2, agents };
     if (!isHomeDirectory(projectDir)) {
       return writeFromProjectContext(args, homeDir, deps);
@@ -1081,7 +1163,7 @@ async function writeFromProjectContext(args, homeDir, deps) {
   const changes = classifyGlobalChange(existingGlobal?.config, effectiveGlobalConfig);
   let globalWritten = false;
   if (effective.changed) {
-    await ensureDir(path3.dirname(globalConfigPath));
+    await ensureDir(path2.dirname(globalConfigPath));
     globalWritten = await writeGlobalPair(effectiveGlobalConfig, globalConfigPath, matrix2, agents);
     verbose(`Updated global config at ${globalConfigPath}`);
   } else {
@@ -1100,7 +1182,7 @@ async function writeFromProjectContext(args, homeDir, deps) {
   );
   const hasProjectItems = reconciledProjectConfig.skills.length > 0 || reconciledProjectConfig.agents.length > 0;
   if (args.projectInstallationExists || hasProjectItems) {
-    await ensureDir(path3.dirname(projectConfigPath));
+    await ensureDir(path2.dirname(projectConfigPath));
     await writeProjectConfigPair(
       projectDir,
       reconciledProjectConfig,
@@ -1202,7 +1284,7 @@ function fallbackNameFor(mutation) {
 }
 async function mutateGlobal(mutation, deps) {
   return withGateToken(async () => {
-    const homeDir = os3.homedir();
+    const homeDir = os2.homedir();
     const loadedGlobal = await loadProjectConfigFromDir(homeDir);
     if (!loadedGlobal) return report(false, NO_CHANGES);
     const current = loadedGlobal.config;
@@ -1247,19 +1329,22 @@ async function writeProjectPartial(projectDir, partial, options = {}) {
     throw new GlobalPairWriteViolation(getProjectConfigPath(projectDir));
   }
   const configPath = getProjectConfigPath(projectDir);
-  await ensureDir(path3.join(projectDir, CLAUDE_SRC_DIR));
+  await ensureDir(path2.join(projectDir, CLAUDE_SRC_DIR));
   await writeFile(
     configPath,
-    generateConfigSource(fillRequiredFields(withNormalizedStack(partial), options.fallbackName))
+    generateConfigSource(
+      fillRequiredFields(withNormalizedStack(partial), options.fallbackName),
+      matrix
+    )
   );
 }
 
 // src/cli/lib/operations/project/write-project-config.ts
-import path4 from "path";
+import path3 from "path";
 async function writeProjectConfig(options) {
   const { wizardResult, sourceResult, projectDir, sourceFlag } = options;
   const projectPaths = resolveInstallPaths(projectDir, "project");
-  await ensureDir(path4.dirname(projectPaths.configPath));
+  await ensureDir(path3.dirname(projectPaths.configPath));
   const { agents } = options.agentDefs ?? await loadAgentDefs();
   const mergeResult = await buildAndMergeConfig(
     wizardResult,
@@ -1300,7 +1385,7 @@ async function writeProjectConfig(options) {
 }
 
 // src/cli/lib/operations/project/compile-agents-all-scopes.ts
-import os4 from "os";
+import os3 from "os";
 async function compileAgentsAllScopes(options) {
   const { projectDir, sourcePath, skills, agentScopeMap } = options;
   const base = { sourcePath, skills, agentScopeMap };
@@ -1313,8 +1398,8 @@ async function compileAgentsAllScopes(options) {
   }
   const globalResult = await compileAgents({
     ...base,
-    projectDir: os4.homedir(),
-    outputDir: resolveInstallPaths(os4.homedir(), "global").agentsDir,
+    projectDir: os3.homedir(),
+    outputDir: resolveInstallPaths(os3.homedir(), "global").agentsDir,
     scopeFilter: "global"
   });
   const projectResult = await compileAgents({
@@ -1349,4 +1434,4 @@ export {
   writeProjectConfig,
   compileAgentsAllScopes
 };
-//# sourceMappingURL=chunk-YAHTF4NO.js.map
+//# sourceMappingURL=chunk-MED6GNV3.js.map