@agents-inc/cli 0.82.4 → 0.84.0

package/dist/{chunk-KB6LCTCD.js → chunk-PTKJKDYH.js}

@@ -4,17 +4,16 @@ import {
   loadPluginSkills,
   loadSkillsByIds,
   parseFrontmatter
-} from "./chunk-XTVWVOLD.js";
+} from "./chunk-XAVVPPWP.js";
 import {
   BUILT_IN_MATRIX,
-  getCategoryDomain,
   getCustomSkillIds,
   getSkillById,
   initializeMatrix,
   matrix,
   typedEntries,
   typedKeys
-} from "./chunk-3MXMYHO3.js";
+} from "./chunk-HQNFKBZW.js";
 import {
   SKILL_ID_PATTERN,
   agentFrontmatterValidationSchema,
@@ -53,7 +52,7 @@ import {
   warn,
   warnUnknownFields,
   writeFile
-} from "./chunk-32HQMUEJ.js";
+} from "./chunk-2BF4WAYU.js";
 import {
   CACHE_DIR,
   CACHE_HASH_LENGTH,
@@ -94,7 +93,7 @@ import {
   defaultCategories,
   defaultRules,
   defaultStacks
-} from "./chunk-IMP35ETG.js";
+} from "./chunk-NPMMU4GY.js";
 import {
   init_esm_shims
 } from "./chunk-DHET7RCE.js";
@@ -521,16 +520,17 @@ function generateProjectConfigFromSkills(name, selectedSkillIds, options) {
       `${skippedCount}/${selectedSkillIds.length} skills not found in matrix. Matrix keys sample: [${matrixSample}]`
     );
   }
-  const stackProperty = agentList.length > 0 && validSkills.length > 0 ? Object.fromEntries(
+  const grouped = /* @__PURE__ */ new Map();
+  for (const { skillId, category } of validSkills) {
+    const arr = grouped.get(category) ?? [];
+    arr.push({ id: skillId, preloaded: false });
+    grouped.set(category, arr);
+  }
+  const stackProperty = agentList.length > 0 && grouped.size > 0 ? Object.fromEntries(
     agentList.map((agentId) => [
       agentId,
       // Structural cast: Object.fromEntries returns Record<string, V>, narrowing to typed keys
-      Object.fromEntries(
-        validSkills.map(({ skillId, category }) => [
-          category,
-          [{ id: skillId, preloaded: false }]
-        ])
-      )
+      Object.fromEntries(grouped)
     ])
   ) : void 0;
   const skills = options?.skillConfigs ?? selectedSkillIds.map((id) => ({ id, scope: "project", source: "local" }));
@@ -559,22 +559,6 @@ function buildStackProperty(stack) {
     }).filter(([, mappings]) => typedKeys(mappings).length > 0)
   );
 }
-function compactAssignment(assignment) {
-  return assignment.preloaded ? { id: assignment.id, preloaded: true } : assignment.id;
-}
-function compactStackForYaml(stack) {
-  return Object.fromEntries(
-    typedEntries(stack).map(([agentId, agentConfig]) => {
-      const compacted = Object.fromEntries(
-        typedEntries(agentConfig).filter(([, assignments]) => assignments && assignments.length > 0).map(([category, assignments]) => [
-          category,
-          assignments.length === 1 ? compactAssignment(assignments[0]) : assignments.map(compactAssignment)
-        ])
-      );
-      return [agentId, compacted];
-    }).filter(([, compacted]) => Object.keys(compacted).length > 0)
-  );
-}
 function splitConfigByScope(config) {
   const globalSkills = config.skills.filter((s) => s.scope === "global");
   const projectSkills = config.skills.filter((s) => s.scope === "project");
@@ -979,9 +963,11 @@ function formatSkillUnion(skills) {
 }
 function generateStackAgentConfig(skillsByCategory) {
   if (skillsByCategory.size === 0) {
-    return "export type StackAgentConfig = Partial<Record<Category, SkillAssignment>>;";
+    return "export type StackAgentConfig = Partial<Record<Category, SkillAssignment[]>>;";
   }
-  const properties = [...skillsByCategory.entries()].sort(([a], [b]) => a.localeCompare(b)).map(([category, skills]) => `  "${category}"?: SkillAssignment<${formatSkillUnion(skills)}>;`);
+  const properties = [...skillsByCategory.entries()].sort(([a], [b]) => a.localeCompare(b)).map(
+    ([category, skills]) => `  "${category}"?: SkillAssignment<${formatSkillUnion(skills)}>[];`
+  );
   return ["export type StackAgentConfig = {", ...properties, "};"].join("\n");
 }
 function buildSkillsByCategory(skillIds, categories, matrix2) {
@@ -1004,8 +990,8 @@ function loadConfigTypesDataInBackground(sourceFlag, projectDir) {
     if (!await directoryExists(claudeSrcDir)) {
       throw new Error(`${CLAUDE_SRC_DIR}/ not found \u2014 run '${CLI_BIN_NAME} init' first`);
     }
-    const { loadSkillsMatrixFromSource: loadSkillsMatrixFromSource2 } = await import("./source-loader-FMDHHYDQ.js");
-    const { loadAllAgents: loadAllAgents2 } = await import("./loader-4XPDVCZK.js");
+    const { loadSkillsMatrixFromSource: loadSkillsMatrixFromSource2 } = await import("./source-loader-GHDWSV2H.js");
+    const { loadAllAgents: loadAllAgents2 } = await import("./loader-LI4IFZB7.js");
     const sourceResult = await loadSkillsMatrixFromSource2({
       sourceFlag,
       projectDir,
@@ -1214,7 +1200,7 @@ export type Domain = ${domainUnion};
 export type Category = ${categoryUnion};
 
 ${PROJECT_CONFIG_TYPES_BEFORE}
-export type StackAgentConfig = Partial<Record<Category, SkillAssignment>>;
+export type StackAgentConfig = Partial<Record<Category, SkillAssignment[]>>;
 
 ${PROJECT_CONFIG_INTERFACE_AFTER}`;
 }
@@ -1235,8 +1221,31 @@ function formatExtendedUnion(globalTypeName, projectMembers) {
 // src/cli/lib/configuration/config-writer.ts
 var EXTRACTED_FIELDS = /* @__PURE__ */ new Set(["skills", "agents", "stack", "domains"]);
 function generateConfigSource(config, options) {
-  const serializable = config.stack ? { ...config, stack: compactStackForYaml(config.stack) } : { ...config };
-  const cleaned = JSON.parse(JSON.stringify(serializable));
+  if (options?.isProjectConfig) {
+    if (options.globalConfig) {
+      const cleanedProject = JSON.parse(JSON.stringify(config));
+      const cleanedGlobal = JSON.parse(
+        JSON.stringify(options.globalConfig)
+      );
+      if (cleanedProject.stack) {
+        cleanedProject.stack = compactStackAssignments(
+          cleanedProject.stack
+        );
+      }
+      if (cleanedGlobal.stack) {
+        cleanedGlobal.stack = compactStackAssignments(
+          cleanedGlobal.stack
+        );
+      }
+      return generateProjectConfigWithInlinedGlobal(cleanedProject, cleanedGlobal);
+    }
+  }
+  const cleaned = JSON.parse(JSON.stringify(config));
+  if (cleaned.stack) {
+    cleaned.stack = compactStackAssignments(
+      cleaned.stack
+    );
+  }
   if (options?.isProjectConfig) {
     return generateProjectConfigWithGlobalImport(cleaned, getGlobalConfigImportPath());
   }
@@ -1385,6 +1394,141 @@ function generateProjectConfigWithGlobalImport(cleaned, globalImportPath) {
   lines.push(``);
   return lines.join("\n");
 }
+function generateProjectConfigWithInlinedGlobal(cleaned, cleanedGlobal) {
+  const projectSkillsArr = cleaned.skills ?? [];
+  const projectAgentsArr = cleaned.agents ?? [];
+  const projectStackObj = cleaned.stack;
+  const projectDomainsArr = cleaned.domains ?? [];
+  const projectSelectedAgentsArr = cleaned.selectedAgents ?? [];
+  const globalSkillsArr = cleanedGlobal.skills ?? [];
+  const globalAgentsArr = cleanedGlobal.agents ?? [];
+  const globalDomainsArr = cleanedGlobal.domains ?? [];
+  const globalSelectedAgentsArr = cleanedGlobal.selectedAgents ?? [];
+  const hasGlobalSkills = globalSkillsArr.length > 0;
+  const hasProjectSkills = projectSkillsArr.length > 0;
+  const hasSkills = hasGlobalSkills || hasProjectSkills;
+  const hasGlobalAgents = globalAgentsArr.length > 0;
+  const hasProjectAgents = projectAgentsArr.length > 0;
+  const hasAgents = hasGlobalAgents || hasProjectAgents;
+  const projectAgentNames = new Set(projectAgentsArr.map((a) => a.name));
+  const filteredStack = projectStackObj ? Object.fromEntries(
+    Object.entries(projectStackObj).filter(([agent]) => projectAgentNames.has(agent))
+  ) : void 0;
+  const hasStack = filteredStack != null && Object.keys(filteredStack).length > 0;
+  const hasGlobalDomains = globalDomainsArr.length > 0;
+  const hasProjectDomains = projectDomainsArr.length > 0;
+  const hasDomains = hasGlobalDomains || hasProjectDomains;
+  const typeImports = buildTypeImports({ hasSkills, hasAgents, hasStack, hasDomains });
+  const lines = [`import type { ${typeImports} } from "./config-types";`];
+  if (hasSkills) {
+    lines.push(``);
+    lines.push(`const skills: SkillConfig[] = [`);
+    if (hasGlobalSkills) {
+      lines.push(`  // global`);
+      for (const s of globalSkillsArr) {
+        lines.push(`  ${JSON.stringify(s)},`);
+      }
+    }
+    if (hasProjectSkills) {
+      lines.push(`  // project`);
+      for (const s of projectSkillsArr) {
+        lines.push(`  ${JSON.stringify(s)},`);
+      }
+    }
+    lines.push(`];`);
+  }
+  if (hasAgents) {
+    lines.push(``);
+    lines.push(`const agents: AgentScopeConfig[] = [`);
+    if (hasGlobalAgents) {
+      lines.push(`  // global`);
+      for (const a of globalAgentsArr) {
+        lines.push(`  ${JSON.stringify(a)},`);
+      }
+    }
+    if (hasProjectAgents) {
+      lines.push(`  // project`);
+      for (const a of projectAgentsArr) {
+        lines.push(`  ${JSON.stringify(a)},`);
+      }
+    }
+    lines.push(`];`);
+  }
+  if (hasStack) {
+    lines.push(``);
+    const stackBody = JSON.stringify(filteredStack, null, 2);
+    lines.push(`const stack: Partial<Record<AgentName, StackAgentConfig>> = ${stackBody};`);
+  }
+  if (hasDomains) {
+    lines.push(``);
+    const allDomains = [.../* @__PURE__ */ new Set([...globalDomainsArr, ...projectDomainsArr])];
+    const items = allDomains.map((d) => JSON.stringify(d)).join(", ");
+    lines.push(`const domains: Domain[] = [${items}];`);
+  }
+  const projectName = cleaned.name && cleaned.name !== "global" ? cleaned.name : DEFAULT_PLUGIN_NAME;
+  const exportFields = [];
+  exportFields.push(`  name: ${JSON.stringify(projectName)},`);
+  const projectScalarFields = Object.entries(cleaned).filter(
+    ([key]) => !EXTRACTED_FIELDS.has(key) && key !== "name" && key !== "selectedAgents"
+  );
+  const projectScalarKeys = new Set(projectScalarFields.map(([key]) => key));
+  const globalScalarFields = Object.entries(cleanedGlobal).filter(
+    ([key]) => !EXTRACTED_FIELDS.has(key) && key !== "name" && key !== "selectedAgents" && !projectScalarKeys.has(key)
+  );
+  for (const [key, value] of globalScalarFields) {
+    exportFields.push(`  ${JSON.stringify(key)}: ${JSON.stringify(value)},`);
+  }
+  for (const [key, value] of projectScalarFields) {
+    exportFields.push(`  ${JSON.stringify(key)}: ${JSON.stringify(value)},`);
+  }
+  if (hasSkills) {
+    exportFields.push(`  skills,`);
+  } else {
+    exportFields.push(`  skills: [],`);
+  }
+  if (hasAgents) {
+    exportFields.push(`  agents,`);
+  } else {
+    exportFields.push(`  agents: [],`);
+  }
+  if (hasStack) {
+    exportFields.push(`  stack,`);
+  }
+  if (hasDomains) {
+    exportFields.push(`  domains,`);
+  }
+  const allSelectedAgents = [.../* @__PURE__ */ new Set([...globalSelectedAgentsArr, ...projectSelectedAgentsArr])];
+  if (allSelectedAgents.length > 0) {
+    const items = allSelectedAgents.map((a) => JSON.stringify(a)).join(", ");
+    exportFields.push(`  "selectedAgents": [${items}],`);
+  }
+  lines.push(``);
+  lines.push(`export default {`);
+  lines.push(...exportFields);
+  lines.push(`} satisfies ProjectConfig;`);
+  lines.push(``);
+  return lines.join("\n");
+}
+function compactStackAssignments(stack) {
+  const result = {};
+  for (const [agent, categories] of Object.entries(stack)) {
+    const compactedCategories = {};
+    for (const [category, assignments] of Object.entries(categories)) {
+      if (!Array.isArray(assignments) || assignments.length === 0) continue;
+      compactedCategories[category] = assignments.map((a) => {
+        if (typeof a === "object" && a !== null && "id" in a && "preloaded" in a) {
+          const assignment = a;
+          return assignment.preloaded ? { id: assignment.id, preloaded: true } : assignment.id;
+        }
+        return a;
+      });
+    }
+    if (Object.keys(compactedCategories).length > 0) {
+      result[agent] = compactedCategories;
+    }
+  }
+  return result;
+}
 function getGlobalConfigImportPath() {
   return path6.join(os4.homedir(), CLAUDE_SRC_DIR);
 }
@@ -1411,7 +1555,7 @@ export type Domain = never;
 export type Category = never;
 
 ${PROJECT_CONFIG_TYPES_BEFORE}
-export type StackAgentConfig = Partial<Record<Category, SkillAssignment>>;
+export type StackAgentConfig = Partial<Record<Category, SkillAssignment[]>>;
 
 ${PROJECT_CONFIG_INTERFACE_AFTER}`;
 }
@@ -3850,44 +3994,6 @@ async function writeStandaloneConfigTypes(configPath, matrix2, agents, finalConf
   );
   await writeFile(typesPath, source);
 }
-async function writeProjectConfigTypes(projectConfigPath, projectDir, projectConfig, matrix2) {
-  const typesPath = path20.join(path20.dirname(projectConfigPath), STANDARD_FILES.CONFIG_TYPES_TS);
-  const projectClaudeSrc = path20.join(projectDir, CLAUDE_SRC_DIR);
-  const globalClaudeSrc = path20.join(os8.homedir(), CLAUDE_SRC_DIR);
-  const relativePath = path20.relative(projectClaudeSrc, globalClaudeSrc);
-  const globalTypesImportPath = relativePath.split(path20.sep).join("/");
-  const projectSkillIds = projectConfig?.skills.map((s) => s.id) ?? [];
-  const projectAgentNames = projectConfig?.agents.map((a) => a.name) ?? [];
-  let projectCategories = [];
-  let projectDomains = [];
-  if (matrix2 && projectSkillIds.length > 0) {
-    const categorySet = /* @__PURE__ */ new Set();
-    for (const id of projectSkillIds) {
-      const skill = matrix2.skills[id];
-      if (skill?.category && skill.category !== "local") {
-        categorySet.add(skill.category);
-      }
-    }
-    projectCategories = [...categorySet].sort();
-    const domainSet = /* @__PURE__ */ new Set();
-    for (const cat of projectCategories) {
-      const domain = getCategoryDomain(cat);
-      if (domain) {
-        domainSet.add(domain);
-      }
-    }
-    projectDomains = [...domainSet].sort();
-  }
-  const source = generateProjectConfigTypesSource({
-    globalTypesImportPath,
-    projectSkillIds,
-    projectAgentNames,
-    projectDomains,
-    projectCategories
-  });
-  await writeFile(typesPath, source);
-  verbose("Using project config-types.ts that imports from global");
-}
 async function writeScopedConfigs(finalConfig, matrix2, agents, projectDir, projectConfigPath, projectInstallationExists) {
   const homeDir = os8.homedir();
   const isProjectContext = fs.realpathSync(projectDir) !== fs.realpathSync(homeDir);
@@ -3906,9 +4012,12 @@ async function writeScopedConfigs(finalConfig, matrix2, agents, projectDir, proj
   const hasProjectItems = projectSplitConfig.skills.length > 0 || projectSplitConfig.agents.length > 0;
   if (projectInstallationExists || hasProjectItems) {
     await ensureDir(path20.dirname(projectConfigPath));
-    await writeConfigFile(projectSplitConfig, projectConfigPath, { isProjectConfig: true });
+    await writeConfigFile(projectSplitConfig, projectConfigPath, {
+      isProjectConfig: true,
+      globalConfig
+    });
     verbose(`Updated project config at ${projectConfigPath}`);
-    await writeProjectConfigTypes(projectConfigPath, projectDir, projectSplitConfig, matrix2);
+    await writeStandaloneConfigTypes(projectConfigPath, matrix2, agents, finalConfig);
   } else {
     verbose(
       "Skipped project config \u2014 no existing project installation and no project-scoped items"
@@ -5619,4 +5728,4 @@ export {
   validateAllPlugins,
   printPluginValidationResult
 };
-//# sourceMappingURL=chunk-KB6LCTCD.js.map
+//# sourceMappingURL=chunk-PTKJKDYH.js.map