agents-inc 0.165.0 → 0.167.0

package/dist/commands/doctor.js

@@ -1,47 +1,43 @@
 #!/usr/bin/env node
 import {
   unofferablePlacementsFound
-} from "../chunk-IVNKU4DM.js";
+} from "../chunk-PXWG7KFO.js";
 import {
   detectProject,
   loadSource
-} from "../chunk-WTANOSXK.js";
-import "../chunk-WIFIAQZU.js";
-import "../chunk-42TNV2TK.js";
-import "../chunk-UR3RRTPO.js";
+} from "../chunk-G6UREQ4V.js";
+import "../chunk-HWEKHVLE.js";
+import "../chunk-PMJWD27C.js";
+import "../chunk-ZR4YPKXQ.js";
 import {
   filterExcludedEntries,
   listAgentFilesOf,
   listAgentMdFiles,
   splitAgentsByProvenance
-} from "../chunk-V5CWACR5.js";
+} from "../chunk-GE3WKJ6Q.js";
 import {
   ambiguityFinding
-} from "../chunk-MBUGQI2M.js";
+} from "../chunk-NBXXFIIW.js";
 import {
   BaseCommand,
   EXIT_CODES
-} from "../chunk-AAWZED5M.js";
-import "../chunk-6CY6PW5X.js";
-import "../chunk-CTUJO23Z.js";
+} from "../chunk-Y3VIRVVE.js";
+import "../chunk-VAPTVR3J.js";
+import "../chunk-RZDXDMT6.js";
 import {
   ConfigDefaultExportError,
   MarketplaceManifestRequiredError,
   MarketplaceNameRefusedError,
-  REGISTRY_IS_NOT_AN_INVENTORY,
   SOURCE_ENV_VAR,
   agentCodec,
   agentYamlGenerationSchema,
-  bothSourceFoldersPresent,
   checkMatrixHealth,
-  compiledAgentNamesTheOtherFolder,
   configDirsInPlay,
   declaresNoContent,
   directoryExists,
   discoverLocalSkills,
   fileExists,
   findConfigLoadFailures,
-  folderBeingRead,
   formatZodErrors,
   getErrorMessage,
   getInstalledConfigPath,
@@ -58,7 +54,6 @@ import {
   isLocalSource,
   isRecord,
   layoutIsCurrent,
-  layoutIsLegacy,
   listDirectories,
   listRegisteredPluginInstalls,
   loadConfig,
@@ -78,7 +73,6 @@ import {
   relativeConfigPath,
   resolveInstallPaths,
   resolvePrimarySourceEntry,
-  resolveSourceDir,
   scopeLabel,
   scopeNoun,
   skillCategoriesFileSchema,
@@ -89,7 +83,6 @@ import {
   splitMetadataValidationIssues,
   stackConfigValidationSchema,
   stacksConfigSchema,
-  unusedSourceFolderName,
   validResult,
   validateAgentFrontmatter,
   validateAllPlugins,
@@ -97,12 +90,11 @@ import {
   validateProjectConfig,
   validateSkillFrontmatter,
   validateSkillMetadata
-} from "../chunk-IM45LLQX.js";
+} from "../chunk-A4KDXNOT.js";
 import {
   matrix
-} from "../chunk-GKPW33FP.js";
+} from "../chunk-V5WXIM2F.js";
 import {
-  CLAUDE_DIR,
   CLI_INVOKE_COMMAND,
   DEFAULT_BRANDING,
   DIRS,
@@ -113,77 +105,23 @@ import {
   SKILL_CATEGORIES_PATH,
   SKILL_RULES_PATH,
   STACKS_FILE_PATH,
-  STANDARD_DIRS,
   STANDARD_FILES,
   UI_SYMBOLS,
   effectivelyExcludedSkillIds
-} from "../chunk-AQXKAPCD.js";
+} from "../chunk-ENGYJCTF.js";
 import "../chunk-OI2H6M5I.js";
 
 // src/cli/commands/doctor.ts
 import os2 from "os";
-import path4 from "path";
-
-// src/cli/lib/installation/layout-findings.ts
-import path from "path";
-async function layoutFindingFor(scope) {
-  const { move } = scope;
-  const label = scopeLabel(scope.kind);
-  if (move === null) {
-    return { status: "pass", message: layoutIsCurrent(label, scope.relName), details: [] };
-  }
-  const whichLayout = layoutStatement(scope, move, label);
-  const faults = await faultsFor(scope, move);
-  const [worst, ...rest] = faults;
-  if (worst === void 0) return { ...whichLayout, details: [] };
-  return {
-    status: "fail",
-    message: `${label}: ${worst}`,
-    details: [...rest.map((fault) => `${label}: ${fault}`), whichLayout.message]
-  };
-}
-function layoutStatement(scope, move, label) {
-  if (!scope.legacy) return { status: "pass", message: layoutIsCurrent(label, move.to.relName) };
-  return { status: "warn", message: layoutIsLegacy(label, move.from.relName, move.to.relName) };
-}
-async function faultsFor(scope, move) {
-  const staleAgents = await compiledAgentsNamingTheOtherFolder(scope);
-  return [...rivalFolderFault(scope, move), ...staleAgents];
-}
-function rivalFolderFault(scope, move) {
-  if (!scope.both) return [];
-  return [
-    bothSourceFoldersPresent(move.from.relName, move.to.relName, folderBeingRead(scope, move))
-  ];
-}
-async function compiledAgentsNamingTheOtherFolder(scope) {
-  const unused = unusedSourceFolderName(scope.root, scope.provider);
-  if (unused === null) return [];
-  const agentsDir = path.join(scope.root, CLAUDE_DIR, STANDARD_DIRS.AGENTS);
-  const files = await listAgentMdFiles(agentsDir);
-  const named = await Promise.all(
-    files.map(async (file) => ({
-      file,
-      names: await namesFolder(path.join(agentsDir, file), unused)
-    }))
-  );
-  return named.filter((entry) => entry.names).map((entry) => compiledAgentNamesTheOtherFolder(entry.file, unused));
-}
-async function namesFolder(agentPath, folder) {
-  try {
-    return (await readFile(agentPath)).includes(folder);
-  } catch {
-    return false;
-  }
-}
+import path3 from "path";
 
 // src/cli/lib/source-validator.ts
-import path2 from "path";
+import path from "path";
 import { parse as parseYaml } from "yaml";
 import "zod";
 async function isSourceRepo(dir) {
   const sourceConfig = await loadSourceRepoConfig(dir);
-  return directoryExists(path2.join(dir, sourceConfig?.skillsDir ?? SKILLS_DIR_PATH));
+  return directoryExists(path.join(dir, sourceConfig?.skillsDir ?? SKILLS_DIR_PATH));
 }
 function isSnakeCase(key) {
   return /[a-z]_[a-z]/.test(key);
@@ -207,10 +145,10 @@ function checkDirNameMatchesSkillId(skillId, relPath, dirName) {
   ];
 }
 async function checkSkillDirName(skillsDir2, skillsDirRelPath, skillDir) {
-  const dirName = path2.basename(skillDir);
-  const skillMdRelPath = path2.join(skillsDirRelPath, skillDir, STANDARD_FILES.SKILL_MD);
+  const dirName = path.basename(skillDir);
+  const skillMdRelPath = path.join(skillsDirRelPath, skillDir, STANDARD_FILES.SKILL_MD);
   try {
-    const content = await readFile(path2.join(skillsDir2, skillDir, STANDARD_FILES.SKILL_MD));
+    const content = await readFile(path.join(skillsDir2, skillDir, STANDARD_FILES.SKILL_MD));
     const frontmatter = parseFrontmatter(content, skillMdRelPath);
     if (frontmatter === null) {
       return [
@@ -235,18 +173,18 @@ async function checkSkillDirName(skillsDir2, skillsDirRelPath, skillDir) {
 function validateSkillFilePairs(skillMdDirs, metadataDirs, skillsDir2) {
   const missingMetadata = [...skillMdDirs].filter((dir) => !metadataDirs.has(dir)).map((dir) => ({
     severity: "error",
-    file: path2.join(skillsDir2, dir),
+    file: path.join(skillsDir2, dir),
     message: `Missing ${STANDARD_FILES.METADATA_YAML} \u2014 skill directory has ${STANDARD_FILES.SKILL_MD} but no metadata`
   }));
   const missingSkillMd = [...metadataDirs].filter((dir) => !skillMdDirs.has(dir)).map((dir) => ({
     severity: "error",
-    file: path2.join(skillsDir2, dir),
+    file: path.join(skillsDir2, dir),
     message: `Missing ${STANDARD_FILES.SKILL_MD} \u2014 skill directory has ${STANDARD_FILES.METADATA_YAML} but no SKILL.md`
   }));
   return [...missingMetadata, ...missingSkillMd];
 }
 async function validateSource(sourcePath, reader = "author") {
-  const resolvedPath = path2.isAbsolute(sourcePath) ? sourcePath : path2.resolve(sourcePath);
+  const resolvedPath = path.isAbsolute(sourcePath) ? sourcePath : path.resolve(sourcePath);
   if (!await directoryExists(resolvedPath)) {
     return buildResult(
       [{ severity: "error", file: resolvedPath, message: "Marketplace directory does not exist" }],
@@ -255,7 +193,7 @@ async function validateSource(sourcePath, reader = "author") {
   }
   const sourceProjectConfig = await loadSourceRepoConfig(resolvedPath);
   const skillsDirRelPath = sourceProjectConfig?.skillsDir ?? SKILLS_DIR_PATH;
-  const skillsDir2 = path2.join(resolvedPath, skillsDirRelPath);
+  const skillsDir2 = path.join(resolvedPath, skillsDirRelPath);
   if (!await directoryExists(skillsDir2)) {
     return buildResult(
       [{ severity: "error", file: skillsDir2, message: "Skills directory does not exist" }],
@@ -264,10 +202,10 @@ async function validateSource(sourcePath, reader = "author") {
   }
   const skillMdFiles = await glob(`**/${STANDARD_FILES.SKILL_MD}`, skillsDir2);
   const metadataFiles = await glob(`**/${STANDARD_FILES.METADATA_YAML}`, skillsDir2);
-  const skillMdDirs = new Set(skillMdFiles.map((f) => path2.dirname(f)));
-  const metadataDirs = new Set(metadataFiles.map((f) => path2.dirname(f)));
+  const skillMdDirs = new Set(skillMdFiles.map((f) => path.dirname(f)));
+  const metadataDirs = new Set(metadataFiles.map((f) => path.dirname(f)));
   const pairIssues = validateSkillFilePairs(skillMdDirs, metadataDirs, skillsDir2);
-  const validMetadataFiles = metadataFiles.filter((f) => skillMdDirs.has(path2.dirname(f)));
+  const validMetadataFiles = metadataFiles.filter((f) => skillMdDirs.has(path.dirname(f)));
   const skillIssues = await validateSkillsInTurn(skillsDir2, skillsDirRelPath, validMetadataFiles);
   const crossReferenceIssues = await checkCrossReferences(resolvedPath, reader);
   const extraIssues = await Promise.all([
@@ -291,10 +229,10 @@ function yamlParseFailure(error) {
   return `Failed to parse YAML: ${getErrorMessage(error)}`;
 }
 async function validateOneSkill(skillsDir2, skillsDirRelPath, metadataFile) {
-  const relPath = path2.join(skillsDirRelPath, metadataFile);
+  const relPath = path.join(skillsDirRelPath, metadataFile);
   let rawMetadata;
   try {
-    rawMetadata = parseYaml(await readFile(path2.join(skillsDir2, metadataFile)));
+    rawMetadata = parseYaml(await readFile(path.join(skillsDir2, metadataFile)));
   } catch (error) {
     return [{ severity: "error", file: relPath, message: yamlParseFailure(error) }];
   }
@@ -302,7 +240,7 @@ async function validateOneSkill(skillsDir2, skillsDirRelPath, metadataFile) {
     ...checkSnakeCaseKeys(rawMetadata, relPath),
     ...checkMetadataSchema(rawMetadata, relPath),
     // Independent of metadata validity — the id lives in SKILL.md frontmatter
-    ...await checkSkillDirName(skillsDir2, skillsDirRelPath, path2.dirname(metadataFile))
+    ...await checkSkillDirName(skillsDir2, skillsDirRelPath, path.dirname(metadataFile))
   ];
 }
 function checkMetadataSchema(rawMetadata, relPath) {
@@ -314,7 +252,7 @@ function checkMetadataSchema(rawMetadata, relPath) {
     ...warnings.map((message) => ({ severity: "warning", file: relPath, message }))
   ];
 }
-var MARKETPLACE_MANIFEST_PATH = path2.join(PLUGIN_MANIFEST_DIR, MARKETPLACE_JSON);
+var MARKETPLACE_MANIFEST_PATH = path.join(PLUGIN_MANIFEST_DIR, MARKETPLACE_JSON);
 var MANIFEST_REQUIRED_SEVERITY = {
   author: "warning",
   consumer: "error"
@@ -387,7 +325,7 @@ function consumedMarketplaceMessage(marketplacePath, details) {
   return `Marketplace '${marketplacePath}': ${details}. Nothing to fix here \u2014 the rule is that marketplace's, not this project's`;
 }
 async function validateStacks(resolvedPath) {
-  const stacksDir = path2.join(resolvedPath, DIRS.stacks);
+  const stacksDir = path.join(resolvedPath, DIRS.stacks);
   if (!await directoryExists(stacksDir)) return [];
   const [skillMetaIssues, configIssues] = await Promise.all([
     validateYamlFiles({
@@ -406,7 +344,7 @@ async function validateStacks(resolvedPath) {
   return [...skillMetaIssues, ...configIssues];
 }
 async function validateAgents(resolvedPath) {
-  const agentsDir = path2.join(resolvedPath, DIRS.agents);
+  const agentsDir = path.join(resolvedPath, DIRS.agents);
   if (!await directoryExists(agentsDir)) return [];
   return validateYamlFiles({
     baseDir: agentsDir,
@@ -432,10 +370,10 @@ async function validateYamlFiles(scan) {
   return issues;
 }
 async function validateYamlFile(scan, relFile) {
-  const displayPath = path2.join(scan.relBaseDir, relFile);
+  const displayPath = path.join(scan.relBaseDir, relFile);
   let parsed;
   try {
-    parsed = parseYaml(await readFile(path2.join(scan.baseDir, relFile)));
+    parsed = parseYaml(await readFile(path.join(scan.baseDir, relFile)));
   } catch (error) {
     return [{ severity: "error", file: displayPath, message: yamlParseFailure(error) }];
   }
@@ -448,7 +386,7 @@ async function validateYamlFile(scan, relFile) {
   }));
 }
 async function validateTsConfig(resolvedPath, relConfigPath, schema) {
-  const absPath = path2.join(resolvedPath, relConfigPath);
+  const absPath = path.join(resolvedPath, relConfigPath);
   if (!await fileExists(absPath)) return [];
   try {
     const loaded = await loadConfig(absPath, schema);
@@ -478,7 +416,7 @@ function buildResult(issues, skillCount) {
 
 // src/cli/lib/content-validator.ts
 import os from "os";
-import path3 from "path";
+import path2 from "path";
 import { partition } from "remeda";
 var CWD_SOURCE_NAME = "current directory";
 var AGENT_FILE_EXTENSION = ".md";
@@ -496,8 +434,8 @@ function mergeValidations(parts) {
 function displayDir(absolutePath) {
   const home = os.homedir();
   if (absolutePath === home) return "~";
-  if (absolutePath.startsWith(home + path3.sep)) {
-    return `~${path3.sep}${path3.relative(home, absolutePath)}`;
+  if (absolutePath.startsWith(home + path2.sep)) {
+    return `~${path2.sep}${path2.relative(home, absolutePath)}`;
   }
   return absolutePath;
 }
@@ -552,7 +490,7 @@ async function localSourcesToValidate(projectDir, registered) {
   return [...local, { name: CWD_SOURCE_NAME, url: projectDir }];
 }
 function isCwdMarketplace(projectDir, source) {
-  return path3.resolve(projectDir, source.url) === projectDir;
+  return path2.resolve(projectDir, source.url) === projectDir;
 }
 function readerFor(projectDir, source) {
   return isCwdMarketplace(projectDir, source) ? "author" : "consumer";
@@ -621,7 +559,7 @@ async function findPluginDirectories(pluginsDir) {
   const checks = await Promise.all(
     entries.map(async (name) => ({
       name,
-      isPlugin: await directoryExists(path3.join(pluginsDir, name, PLUGIN_MANIFEST_DIR))
+      isPlugin: await directoryExists(path2.join(pluginsDir, name, PLUGIN_MANIFEST_DIR))
     }))
   );
   return checks.filter((check) => check.isPlugin).map((check) => check.name);
@@ -681,7 +619,7 @@ async function listAcrossScopes(dirs, listEntries) {
 async function listDisplayPaths(dir, listEntries) {
   if (!await directoryExists(dir)) return [];
   const entries = await listEntries(dir);
-  return entries.map((entry) => displayDir(path3.join(dir, entry)));
+  return entries.map((entry) => displayDir(path2.join(dir, entry)));
 }
 async function validateSkillsDirectory(skillsDir2, configuredIds) {
   if (!await directoryExists(skillsDir2)) return NOTHING_VALIDATED;
@@ -696,7 +634,7 @@ async function validateSkillsDirectory(skillsDir2, configuredIds) {
   const [ours, foreign] = partition(judged, (entry) => entry.ours);
   const results = await Promise.all(
     ours.map(async ({ name }) => {
-      const skillDir = path3.join(skillsDir2, name);
+      const skillDir = path2.join(skillsDir2, name);
       return toIssues(displayDir(skillDir), await validateInstalledSkill(skillDir));
     })
   );
@@ -711,10 +649,10 @@ async function isOurSkillDirectory(skillsDir2, name, configuredIds) {
   return carriesOurProvenance(skillsDir2, name);
 }
 async function carriesOurProvenance(skillsDir2, name) {
-  return await readForkedFromMetadata(path3.join(skillsDir2, name)) !== null;
+  return await readForkedFromMetadata(path2.join(skillsDir2, name)) !== null;
 }
 function foreignSkillNote(skillsDir2, name) {
-  return `${displayDir(path3.join(skillsDir2, name))} \u2014 not installed by this CLI and named by no configuration here: not validated`;
+  return `${displayDir(path2.join(skillsDir2, name))} \u2014 not installed by this CLI and named by no configuration here: not validated`;
 }
 async function validateAgentsDirectory(agentsDir) {
   if (!await directoryExists(agentsDir)) return NOTHING_VALIDATED;
@@ -722,7 +660,7 @@ async function validateAgentsDirectory(agentsDir) {
   if (agentFiles.length === 0) return NOTHING_VALIDATED;
   const results = await Promise.all(
     agentFiles.map(async (fileName) => {
-      const agentPath = path3.join(agentsDir, fileName);
+      const agentPath = path2.join(agentsDir, fileName);
       return toIssues(displayDir(agentPath), await validateAgentFrontmatter(agentPath));
     })
   );
@@ -742,7 +680,7 @@ async function validateInstalledSkill(skillDir) {
   return mergeValidationResults([skillMd, metadata]);
 }
 async function validateSkillFile(skillDir, fileName, validate) {
-  const filePath = path3.join(skillDir, fileName);
+  const filePath = path2.join(skillDir, fileName);
   if (!await fileExists(filePath)) return invalidResult(`Missing ${fileName}`);
   return validate(filePath);
 }
@@ -945,7 +883,7 @@ async function agentCompileCheck(agent, hosts, agentsDirs) {
     return { name: agent.name, provider, state: "unrenderable" };
   }
   const file = `${agent.name}${agentCodec(provider).extension}`;
-  const compiled = await fileExists(path4.join(agentsDirs[agent.scope], file));
+  const compiled = await fileExists(path3.join(agentsDirs[agent.scope], file));
   return { name: agent.name, provider, state: compiled ? "compiled" : "missing" };
 }
 async function checkNoOrphans(config, projectDir) {
@@ -992,7 +930,7 @@ async function checkNoOrphans(config, projectDir) {
   };
 }
 function orphanedAgentNames(mdFiles, knownAgents, codec) {
-  return mdFiles.map((fileName) => path4.basename(fileName, codec.extension)).filter((agentName) => !knownAgents.has(agentName));
+  return mdFiles.map((fileName) => path3.basename(fileName, codec.extension)).filter((agentName) => !knownAgents.has(agentName));
 }
 async function checkUnownedInstallation(projectDir) {
   const { skills, agents } = await listInstalledArtifacts(projectDir);
@@ -1046,7 +984,7 @@ async function checkSkillsInstalled(config, projectDir) {
 async function ejectedSkillCheck(skill, projectDir) {
   const provider = providerInUse(installBaseDir(projectDir, skill.scope));
   const dir = skillsDir(provider, skill.scope, projectDir);
-  const installed = await fileExists(path4.join(dir, skill.id, STANDARD_FILES.SKILL_MD));
+  const installed = await fileExists(path3.join(dir, skill.id, STANDARD_FILES.SKILL_MD));
   return {
     id: skill.id,
     installed,
@@ -1312,21 +1250,13 @@ async function recreateConfigTips(contentResults, projectDir) {
   );
 }
 var LAYOUT_ROW_NAME = "Layout";
-function toLayoutResult(finding) {
+function toLayoutResult(scope) {
   return {
     kind: "layout",
-    status: finding.status,
-    message: finding.message,
-    details: finding.details
+    status: "pass",
+    message: layoutIsCurrent(scopeLabel(scope.kind), scope.relName)
   };
 }
-async function registeredProjectsOnTheOldFolder(home) {
-  const loaded = await loadInstalledConfig(home).catch(() => null);
-  return (loaded?.config.projects ?? []).filter(isOnTheLegacySourceFolder);
-}
-function isOnTheLegacySourceFolder(dir) {
-  return resolveSourceDir(dir, providerInUse(dir)).legacy;
-}
 var PLACEMENTS_ROW_NAME = "Placements Offered";
 async function checkOfferedPlacements(projectDir) {
   const findings = await everythingThatWouldStopACommandActing(projectDir);
@@ -1492,47 +1422,20 @@ var Doctor = class _Doctor extends BaseCommand {
     ];
   }
   /**
-   * One `Layout` row per scope in play, and — at the home directory — the registered projects
-   * still on the old folder.
+   * One `Layout` row per scope in play.
    *
-   * Per scope rather than per machine: a project and the global installation can be on different
-   * layouts, and one row for the two can only be right about one of them.
+   * Per scope rather than per machine: a project and the global installation are two
+   * installations, and one row for the two can only name one of their folders.
    *
    * Printed right under `Config Valid`, because every row below it is read out of a config file
-   * whose folder this row is about — a scope with two rival folders has a config the rest of the
-   * report may have read from either one.
+   * in the folder this row names.
    */
   async reportLayout(projectDir) {
-    const scopes = await sourceScopesInPlay(projectDir);
-    const rows = await Promise.all(
-      scopes.map(async (scope) => toLayoutResult(await layoutFindingFor(scope)))
-    );
-    const withRegistry = await this.appendRegistryList(projectDir, rows);
-    for (const row of withRegistry) {
+    const rows = (await sourceScopesInPlay(projectDir)).map(toLayoutResult);
+    for (const row of rows) {
       this.logCheck(LAYOUT_ROW_NAME, row);
     }
-    return withRegistry;
-  }
-  /**
-   * The registered projects still on the old folder, added to the LAST row, and only at HOME.
-   *
-   * At home because that is where the registry lives, and the move a legacy project needs is made
-   * by hand in that project — a list of other people's projects printed inside one of them is a
-   * list nobody standing there can act on. The caveat travels with it: the registry holds a
-   * fraction of the installations on a machine, so a list printed without it reads as an
-   * inventory.
-   */
-  async appendRegistryList(projectDir, rows) {
-    const last = rows.at(-1);
-    if (!isHomeDirectory(projectDir) || last === void 0) return rows;
-    const legacyProjects = await registeredProjectsOnTheOldFolder(projectDir);
-    if (legacyProjects.length === 0) return rows;
-    const detailed = {
-      ...last,
-      status: last.status === "fail" ? "fail" : "warn",
-      details: [...last.details ?? [], REGISTRY_IS_NOT_AN_INVENTORY, ...legacyProjects]
-    };
-    return [...rows.slice(0, -1), detailed];
+    return rows;
   }
   /**
    * The orphan row, and which question it can answer. With a config it names the compiled