agents-inc 0.174.0 → 0.176.0

package/dist/{chunk-R7GKQBZJ.js → chunk-CKBWEWHZ.js}

@@ -2,20 +2,23 @@
 import {
   compileAgents,
   withCatalogueSeatedFor
-} from "./chunk-REHVGFJE.js";
+} from "./chunk-XMQIWPIR.js";
 import {
   loadAgentDefs
-} from "./chunk-7BHDKEGK.js";
+} from "./chunk-JNRACLNS.js";
 import {
   ConfigLoadError,
   EXTRACTED_FIELDS,
   GlobalPairWriteViolation,
   INDENT_STEP,
+  agentsDir,
   assertGateToken,
   brokenUnionLayout,
   buildAndMergeConfig,
+  declaresNoContent,
   detectGlobalInstallation,
   detectInstallation,
+  detectInstallations,
   detectProjectInstallation,
   disableBuffering,
   drainBuffer,
@@ -28,6 +31,7 @@ import {
   getErrorMessage,
   getInstalledConfigPath,
   getProjectConfigPath,
+  inheritedGlobalProvider,
   isHomeDirectory,
   isRecord,
   loadInstalledConfig,
@@ -39,6 +43,7 @@ import {
   providerInUse,
   quoteText,
   readFile,
+  remove,
   renderKey,
   renderTypeImportLine,
   renderUnionBody,
@@ -53,12 +58,12 @@ import {
   warn,
   withGateToken,
   writeFile
-} from "./chunk-E45IT3HC.js";
+} from "./chunk-ENET4IF6.js";
 import {
   matrix,
   typedEntries,
   typedKeys
-} from "./chunk-AIBVAYHS.js";
+} from "./chunk-UE4Z3YMB.js";
 import {
   CLI_INVOKE_COMMAND,
   CODEX_MODEL_NAMES,
@@ -66,7 +71,6 @@ import {
   GLOBAL_CONFIG_NAME,
   LOCAL_PSEUDO_CATEGORY,
   MODEL_NAMES,
-  PROVIDERS,
   STANDARD_FILES,
   activeAgentNames,
   activeProjectAgentNames,
@@ -76,7 +80,7 @@ import {
   isExclusiveCategory,
   isGlobalTombstone,
   skillDomain
-} from "./chunk-WUSEZFER.js";
+} from "./chunk-U46LYYRA.js";
 
 // src/cli/lib/operations/source/load-source.ts
 async function loadSource(options) {
@@ -125,7 +129,7 @@ async function detectProject(projectDir) {
 
 // src/cli/lib/operations/project/detect-both-installations.ts
 async function detectBothInstallations(projectDir) {
-  const global = await detectGlobalInstallation();
+  const global = await detectGlobalInstallation(projectDir);
   const project = isHomeDirectory(projectDir) ? null : await detectProjectInstallation(projectDir);
   return { global, project, hasBoth: !!global && !!project };
 }
@@ -672,8 +676,8 @@ function activeEntriesNotIn(incoming, existing, keyOf) {
   return incoming.filter((entry) => !entry.excluded && !held.has(keyOf(entry)));
 }
 function marketplaceIdentityFilledFrom(existing, arriving) {
-  const marketplaceName = existing.marketplaceName ?? arriving?.marketplaceName;
-  const marketplace = existing.marketplace ?? arriving?.marketplace;
+  const fillsFromArriving = arriving !== null && existing.marketplace === void 0;
+  const { marketplace, marketplaceName } = fillsFromArriving ? arriving : existing;
   return {
     ...marketplaceName !== void 0 && { marketplaceName },
     ...marketplace !== void 0 && { marketplace }
@@ -901,9 +905,13 @@ function refuseAWriteOutsideTheInstallation(projectDir, provider) {
   }
   return configPath;
 }
+async function installationToRewrite(projectPath) {
+  const loaded = await loadInstalledConfig(projectPath);
+  return loaded !== null && !declaresNoContent(loaded.config) ? loaded : null;
+}
 async function propagateToProject(projectPath, provider, globalConfig, agents, options) {
-  const existingProject = await loadInstalledConfig(projectPath);
-  if (!existingProject?.config) return false;
+  const existingProject = await installationToRewrite(projectPath);
+  if (existingProject === null) return false;
   return withCatalogueSeatedFor(projectPath, async (catalogue) => {
     const projectSplit = reconcileAgainstGlobal(existingProject.config, globalConfig, catalogue);
     await writeProjectConfigPair(
@@ -943,11 +951,12 @@ async function propagateGlobalChangesToProjects(globalConfig, agents, provider,
   return result;
 }
 async function propagateToRegisteredProject(projectPath, provider, globalConfig, agents, options) {
-  if (!await holdsAnInstallation(projectPath)) {
+  const installed = await providersInstalledAt(projectPath);
+  if (installed.length === 0) {
     verbose(`Skipped propagation to ${projectPath} (nothing installed there)`);
     return "gone";
   }
-  const notOurs = await whyThisProjectIsNotOurs(projectPath, provider);
+  const notOurs = whyThisProjectIsNotOurs(projectPath, provider, installed);
   if (notOurs !== null) {
     verbose(`Skipped propagation to ${projectPath} (${notOurs})`);
     return "notOurs";
@@ -972,28 +981,26 @@ async function projectsAFanOutReaches(projects, provider) {
   return reached.flat();
 }
 async function wouldBeRewritten(projectPath, provider) {
-  if (!await holdsAnInstallation(projectPath)) return false;
-  if (await whyThisProjectIsNotOurs(projectPath, provider) !== null) return false;
+  const installed = await providersInstalledAt(projectPath);
+  if (whyThisProjectIsNotOurs(projectPath, provider, installed) !== null) return false;
   try {
-    return await loadInstalledConfig(projectPath) !== null;
+    return await installationToRewrite(projectPath) !== null;
   } catch {
     return false;
   }
 }
-async function holdsAnInstallation(projectPath) {
-  const configs = await Promise.all(
-    PROVIDERS.map((installed) => fileExists(getProjectConfigPath(projectPath, installed)))
-  );
-  return configs.includes(true);
+async function providersInstalledAt(projectPath) {
+  const found = await detectInstallations(projectPath);
+  return found.filter((installation) => installation.scope === "project").map((installation) => installation.provider);
 }
-async function whyThisProjectIsNotOurs(projectPath, provider) {
+function whyThisProjectIsNotOurs(projectPath, provider, installed) {
   const notOurs = `not a ${provider} installation`;
   try {
     if (providerInUse(projectPath) !== provider) return notOurs;
   } catch (error) {
     return getErrorMessage(error);
   }
-  return await fileExists(getProjectConfigPath(projectPath, provider)) ? null : notOurs;
+  return installed.includes(provider) ? null : notOurs;
 }
 async function pruneGlobalEntriesFromRegisteredProjects(globalConfig, agents, provider) {
   const emptiedGlobal = {
@@ -1232,7 +1239,7 @@ var NOTHING_RECOMPILED = {
 };
 async function recompilePropagated(projectDirs, pairsRewritten) {
   if (projectDirs.length === 0) return NOTHING_RECOMPILED;
-  const { recompilePropagatedProjectAgents } = await import("./recompile-project-agents-KYK44C24.js");
+  const { recompilePropagatedProjectAgents } = await import("./recompile-project-agents-U3UGHPWG.js");
   return recompilePropagatedProjectAgents(projectDirs, pairsRewritten);
 }
 function pairRewriteSummary(projectDirs, pairsRewritten) {
@@ -1272,6 +1279,21 @@ async function pairsRewrittenSince(before, projectDirs, provider) {
   );
   return new Set(judged.filter(({ rewritten }) => rewritten).map(({ dir }) => dir));
 }
+async function restoreProjectPairs(before, provider) {
+  await Promise.all([...before].map(([dir, pair]) => restorePair(dir, pair, provider)));
+}
+async function restorePair(dir, [config, types], provider) {
+  const configPath = getProjectConfigPath(dir, provider);
+  await Promise.all([
+    restoreHalf(configPath, config),
+    restoreHalf(typesPathFor(configPath), types)
+  ]);
+}
+async function restoreHalf(filePath, before) {
+  if (await readHalf(filePath) === before) return;
+  if (before === null) return remove(filePath);
+  if (typeof before === "string") return writeFile(filePath, before);
+}
 function snapshotOf(before, dir) {
   const pair = before.get(dir);
   if (pair === void 0) throw new Error(`No snapshot of ${dir} was taken before the fan-out`);
@@ -1328,7 +1350,7 @@ async function applyConsequences(globalConfig, changes, deps, provider, currentP
 function lazyGateDeps(projectDir) {
   return {
     loadMatrix: async () => {
-      const { loadSkillsMatrixFromSource: loadSkillsMatrixFromSource2 } = await import("./source-loader-G5I4RNUP.js");
+      const { loadSkillsMatrixFromSource: loadSkillsMatrixFromSource2 } = await import("./source-loader-E2Y5MMN5.js");
       const { matrix: matrix2 } = await loadSkillsMatrixFromSource2({
         projectDir,
         skipExtraSources: true,
@@ -1337,7 +1359,7 @@ function lazyGateDeps(projectDir) {
       return matrix2;
     },
     loadAgents: async () => {
-      const { loadAgentDefs: loadAgentDefs2 } = await import("./load-agent-defs-5U5KAURA.js");
+      const { loadAgentDefs: loadAgentDefs2 } = await import("./load-agent-defs-5BSECHE6.js");
       return (await loadAgentDefs2()).agents;
     }
   };
@@ -1355,11 +1377,10 @@ async function writeFromHome(args, homeDir, deps) {
   const provider = providerInUse(homeDir);
   const priorGlobal = await loadProjectConfigFromDir(homeDir, provider);
   const changes = classifyGlobalChange(priorGlobal?.config, finalConfig);
-  const globalWritten = await writeGlobalPair(
-    finalConfig,
-    projectConfigPath,
-    deps.matrix,
-    deps.agents
+  const globalWritten = await restoringThePairsOnFailure(
+    [homeDir],
+    provider,
+    () => writeGlobalPair(finalConfig, projectConfigPath, deps.matrix, deps.agents)
   );
   const { propagated, recompile } = await applyConsequences(finalConfig, changes, deps, provider);
   return report(globalWritten, changes, propagated, recompile);
@@ -1369,6 +1390,7 @@ async function writeFromProjectContext(args, homeDir, deps) {
   const { global: globalConfig, project: projectSplitConfig } = splitConfigByScope(finalConfig);
   const provider = providerInUse(projectDir);
   const globalConfigPath = getProjectConfigPath(homeDir, provider);
+  await ensureBlankPair(provider);
   const existingGlobal = await loadProjectConfigFromDir(homeDir, provider);
   const effective = await resolveEffectiveGlobalConfig(
     globalConfig,
@@ -1378,28 +1400,45 @@ async function writeFromProjectContext(args, homeDir, deps) {
   );
   const effectiveGlobalConfig = effective.config;
   const changes = classifyGlobalChange(existingGlobal?.config, effectiveGlobalConfig);
-  const globalWritten = await writeGlobalPairWhenChanged(effective, globalConfigPath, deps);
-  const { propagated, recompile } = await applyConsequences(
-    effectiveGlobalConfig,
-    changes,
-    deps,
-    provider,
-    projectDir
-  );
   const reconciledProjectConfig = reconcileProjectSplitAgainstGlobal(
     projectSplitConfig,
     effectiveGlobalConfig,
     deps.matrix
   );
-  await writeProjectPairWhenOwed(
-    args,
+  const globalWritten = await restoringThePairsOnFailure(
+    [projectDir, homeDir],
     provider,
-    reconciledProjectConfig,
+    async () => {
+      await writeProjectPairWhenOwed(
+        args,
+        provider,
+        reconciledProjectConfig,
+        effectiveGlobalConfig,
+        deps
+      );
+      return writeGlobalPairWhenChanged(effective, globalConfigPath, deps);
+    }
+  );
+  const { propagated, recompile } = await applyConsequences(
     effectiveGlobalConfig,
-    deps
+    changes,
+    deps,
+    provider,
+    projectDir
   );
   return report(globalWritten, changes, propagated, recompile);
 }
+async function restoringThePairsOnFailure(dirs, provider, write) {
+  const before = await snapshotProjectPairs(dirs, provider);
+  try {
+    return await write();
+  } catch (error) {
+    await restoreProjectPairs(before, provider).catch((restoreError) => {
+      verbose(`Could not restore a config pair: ${getErrorMessage(restoreError)}`);
+    });
+    throw error;
+  }
+}
 async function writeGlobalPairWhenChanged(effective, globalConfigPath, deps) {
   if (!effective.changed) {
     verbose("Global config unchanged, skipping write");
@@ -1581,9 +1620,6 @@ async function writeProjectConfig(options) {
   );
   const finalConfig = mergeResult.config;
   const isProjectContext = !isHomeDirectory(projectDir);
-  if (isProjectContext) {
-    await ensureBlankPair2(providerInUse(projectDir));
-  }
   const propagation = await writeConfigByScope({
     finalConfig,
     matrix: sourceResult.matrix,
@@ -1619,14 +1655,22 @@ async function compileAgentsAllScopes(options) {
       outputDir: resolveInstallPaths(projectDir, "project").agentsDir
     });
   }
-  const globalResult = await compileAgents({
-    ...base,
+  const globalResult = await compileGlobalScope(options);
+  const projectResult = await compileProjectScope(options);
+  return mergeCompilationResults(globalResult, projectResult);
+}
+async function compileGlobalScope(options) {
+  const { projectDir, sourcePath, skills, agentScopeMap } = options;
+  const provider = inheritedGlobalProvider(projectDir);
+  return compileAgents({
+    sourcePath,
+    skills,
+    agentScopeMap,
     projectDir: os3.homedir(),
-    outputDir: resolveInstallPaths(os3.homedir(), "global").agentsDir,
+    provider,
+    outputDir: agentsDir(provider, "global", projectDir),
     scopeFilter: "global"
   });
-  const projectResult = await compileProjectScope(options);
-  return mergeCompilationResults(globalResult, projectResult);
 }
 async function compileProjectScope(options) {
   const { projectDir, sourcePath, skills, agentScopeMap } = options;
@@ -1665,4 +1709,4 @@ export {
   compileAgentsAllScopes,
   compileProjectScope
 };
-//# sourceMappingURL=chunk-R7GKQBZJ.js.map
+//# sourceMappingURL=chunk-CKBWEWHZ.js.map