npm - @agentxm/workspace-sync - Versions diffs - 0.28.4-bootstrap.0 → 0.28.5 - Mend

@agentxm/workspace-sync 0.28.4-bootstrap.0 → 0.28.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/dist/src/index.d.ts +1 -1
package/dist/src/index.js +1 -1
package/dist/src/materialize.d.ts +3 -1
package/dist/src/materialize.js +4 -22
package/dist/src/plan.d.ts +4 -2
package/dist/src/plan.js +19 -23
package/dist/src/rendered-file-cleanup.d.ts +11 -29
package/dist/src/rendered-file-cleanup.js +94 -356
package/package.json +7 -6

package/dist/src/index.d.ts CHANGED Viewed

@@ -8,7 +8,7 @@
  */
 export { WorkspaceSyncFailed, type WorkspaceSyncCleanupFailure } from "./errors.js";
 export { type SyncFailureAdapter, type SyncPolicyFailure } from "./failure-adapter.js";
-export { cleanupManagedArtifactsForRemovedAgents, cleanupStaleManagedSkillDirectories, cleanupStaleManagedSubagentFiles, inspectWorkspaceOwnership, type RemovedAgentArtifactCleanupResult, type RenderedFileCleanupResult, } from "./rendered-file-cleanup.js";
+export { inspectWorkspaceOwnership, reconcileAgentOutputs, type ReconcileAgentOutputsArgs, type ReconcileAgentOutputsResult, } from "./rendered-file-cleanup.js";
 export { buildInlineMcpServerSyncOperation, buildMcpServerPruneOperation, collectCleanupStep, collectHooksStep, collectInstructionStep, collectKnowledgeStep, isInlineMcpServerEntry, makeSyncPlan, projectionDivergenceLabel, projectionFactsNeedReconciliation, SYNC_PLAN_DESCRIPTION, SYNC_PLAN_NAME, SYNC_PRESENTATION, SYNC_RECOVERY_IDS, syncRecoveryIdentifiers, type SyncStepRequirements, } from "./plan.js";
 export { collectMaterializeSteps, normalizedIdentity, recoverableExternalPackName, scopedProblems, type ConfiguredPackRecovery, type ResolvedDesiredRef, type RunMcpServerInstall, type SyncSelection, } from "./materialize.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/src/index.js CHANGED Viewed

@@ -8,7 +8,7 @@
  */
 export { WorkspaceSyncFailed } from "./errors.js";
 export {} from "./failure-adapter.js";
-export { cleanupManagedArtifactsForRemovedAgents, cleanupStaleManagedSkillDirectories, cleanupStaleManagedSubagentFiles, inspectWorkspaceOwnership, } from "./rendered-file-cleanup.js";
+export { inspectWorkspaceOwnership, reconcileAgentOutputs, } from "./rendered-file-cleanup.js";
 export { buildInlineMcpServerSyncOperation, buildMcpServerPruneOperation, collectCleanupStep, collectHooksStep, collectInstructionStep, collectKnowledgeStep, isInlineMcpServerEntry, makeSyncPlan, projectionDivergenceLabel, projectionFactsNeedReconciliation, SYNC_PLAN_DESCRIPTION, SYNC_PLAN_NAME, SYNC_PRESENTATION, SYNC_RECOVERY_IDS, syncRecoveryIdentifiers, } from "./plan.js";
 export { collectMaterializeSteps, normalizedIdentity, recoverableExternalPackName, scopedProblems, } from "./materialize.js";
 //# sourceMappingURL=index.js.map

package/dist/src/materialize.d.ts CHANGED Viewed

@@ -64,6 +64,8 @@ export declare const collectMaterializeSteps: <E = never, R = SyncStepRequiremen
     serialMaterialization: boolean;
     expectedSkillNames: Set<string & import("effect/Brand").Brand<"ExtensionName">>;
     expectedSubagentNames: Set<string & import("effect/Brand").Brand<"ExtensionName">>;
+    expectedMcpServerNames: Set<string>;
+    expectedHookNames: Set<string & import("effect/Brand").Brand<"ExtensionName">>;
     releaseAge: {
         evaluatedAt: string;
         holdbacks: readonly import("@agentxm/registry-protocol/unstable/registry/release-age-policy").ReleaseAgeRecordBase[];
@@ -121,5 +123,5 @@ export declare const collectMaterializeSteps: <E = never, R = SyncStepRequiremen
         registryLifecycle?: import("@agentxm/workspace-operations").RegistryLifecycleEvidence;
         run: Effect.Effect<JobStepResult<never>, StepFailure, never>;
     })[];
-}, WorkspaceSyncFailed | import("@agentxm/extension-workspace").CoupledDependencyFailure | import("@agentxm/extension-workspace").PackageMaterializationFailed | import("@agentxm/extension-workspace").StagedPackageInvalid | import("@agentxm/extension-workspace").CanonicalPackageProbeFailed | import("@agentxm/extension-workspace").PackageCopyFailed | import("@agentxm/extension-workspace").ArchiveIntegrityMismatch | import("@agentxm/extension-workspace").CreateDestinationExists | import("@agentxm/extension-workspace").CreateNameConfigured | import("@agentxm/extension-workspace").CreateDestinationInspectionFailed | import("@agentxm/workspace-state").PathTraversalDetected | import("@agentxm/extension-workspace").ForkPackageInvalid | import("@agentxm/extension-workspace").ForkPackageConflict | import("@agentxm/extension-workspace").ForkPackageFailed | import("@agentxm/extension-workspace").NativeImportUnsupported | import("@agentxm/extension-workspace").NativeImportInvalid | import("@agentxm/extension-workspace").NativeImportConflict | import("@agentxm/extension-workspace").NativeImportFailed | import("@agentxm/extension-workspace").SourceAuthorityBlocked | import("@agentxm/extension-workspace").LifecyclePostconditionViolated | import("@agentxm/extension-workspace").ScaffoldedExtensionUnresolved | import("@agentxm/extension-workspace").DesiredStateIncomplete | import("@agentxm/extension-workspace").AuthoredContributorUnsupported | import("@agentxm/extension-workspace").ContributorIdentityInvalid | import("@agentxm/extension-workspace").ContributorUnresolved | import("@agentxm/extension-workspace").ContributorTreeMismatch | import("@agentxm/extension-workspace").ProjectionTargetUnsupported | import("@agentxm/extension-workspace").ManagedRegionViolation | import("@agentxm/extension-workspace").ProjectionIoFailed | import("@agentxm/extension-workspace").InstructionMaintenanceFailed | import("@agentxm/extension-workspace").RuleDefinitionInvalid | import("@agentxm/extension-workspace").RuleInstallStateMissing | import("@agentxm/extension-workspace").HookDefinitionInvalid | import("@agentxm/extension-workspace").HookConfigInvalid | import("@agentxm/extension-workspace").HookIoFailed | import("@agentxm/extension-workspace").HookInstallStateMissing | import("@agentxm/extension-workspace").SubagentDefinitionInvalid | import("@agentxm/extension-workspace").SubagentContentUnreadable | import("@agentxm/extension-workspace").SubagentIoFailed | import("@agentxm/extension-workspace").SubagentInstallStateMissing | import("@agentxm/extension-workspace").McpConfigInvalid | import("@agentxm/extension-workspace").McpConfigIoFailed | import("@agentxm/extension-workspace").McpEntryUnmanaged | import("@agentxm/extension-workspace").McpOwnershipMarkerInvalid | import("@agentxm/extension-workspace").McpDefinitionInvalid | import("@agentxm/extension-workspace").McpRegistryOnlyInstall | import("@agentxm/extension-workspace").McpInstallStateMissing | import("@agentxm/extension-workspace").McpSharedTargetConflict | import("@agentxm/extension-workspace").SkillDefinitionInvalid | import("@agentxm/extension-workspace").SkillMaterializationFailed | import("@agentxm/extension-workspace").SkillInstallStateMissing | import("@agentxm/extension-workspace").AxmSkillCompatibilityUnavailable | import("@agentxm/extension-workspace").AxmSkillIncompatible | import("@agentxm/extension-workspace").PackDefinitionInvalid | import("@agentxm/extension-workspace").PackInstallStateMissing | import("@agentxm/extension-workspace").PackArchiveFetchFailed | import("@agentxm/extension-workspace").PackStagingFailed | import("@agentxm/extension-workspace").PackDependencyInvalid | import("@agentxm/extension-workspace").PackDependencyConflict | import("@agentxm/extension-workspace").PackConstraintShadowed | import("@agentxm/extension-workspace").PackDependencyMissing | import("@agentxm/extension-workspace").PackDependencyUnsatisfied | import("@agentxm/extension-workspace").KnowledgeDefinitionInvalid | import("@agentxm/extension-workspace").KnowledgeIoFailed | import("@agentxm/extension-workspace").KnowledgeInstallStateMissing | import("@agentxm/extension-workspace").KnowledgeResolutionMissing | import("@agentxm/extension-workspace").KnowledgeDesiredStateUnreconcilable | import("@agentxm/extension-workspace").KnowledgeUnavailable | import("@agentxm/extension-workspace").KnowledgeObservableContractViolated | import("@agentxm/workspace-state").MaterializedTreeInvalid | import("@agentxm/extension-workspace").TransientBackupFailed | import("@agentxm/extension-workspace").WriteBackupRetained | import("@agentxm/workspace-state").SettingsIoError | import("@agentxm/workspace-state").SettingsParseError | import("@agentxm/workspace-state").SettingsDecodeError | import("@agentxm/workspace-state").LockfileIoError | import("@agentxm/workspace-state").LockfileParseError | import("@agentxm/workspace-state").LockfileDecodeError | import("@agentxm/workspace-state").WorkspaceRootEscape | import("@agentxm/workspace-state").SettingsWriteError | import("@agentxm/workspace-state").WorkspaceSnapshotError | import("@agentxm/workspace-state").LockfileValidationError | import("@agentxm/workspace-state").LockfileWriteError | import("@agentxm/workspace-state").WorkspaceDirectoryError | import("@agentxm/workspace-state").TransitionLockError | import("@agentxm/workspace-state").TransitionLockUnavailable | import("@agentxm/workspace-state").WorkspaceTransitionCompromised | import("@agentxm/workspace-state").WorkspaceRestorationIncomplete | import("@agentxm/workspace-state").WorkspaceLayoutError | import("@agentxm/workspace-state").WorkspaceNotInitialized | import("@agentxm/workspace-state").LockedSkillMissing | import("@agentxm/workspace-state").SettingsEntryMissing | import("@agentxm/workspace-state").InvalidAgentId | import("@agentxm/workspace-state").DesiredPackGraphIncomplete | import("@agentxm/workspace-state").CanonicalPathRemovalError | import("@agentxm/workspace-state").SymlinkCreationError | import("@agentxm/workspace-state").LockEntrySourceMissing | import("@agentxm/workspace-state").LockEntryUrlInvalid | import("@agentxm/workspace-state").LockEntryNameInvalid | import("@agentxm/workspace-state").LockEntryEndpointConflict | import("@agentxm/workspace-state").LockEntrySourceTypeConflict | import("@agentxm/workspace-state").AcceptedResolutionMissing | import("@agentxm/workspace-state").InlineExtensionSourceMissing | import("@agentxm/workspace-state").SupersededCanonicalRemovalFailed | import("@agentxm/workspace-state").PackageContentHashFailed | import("@agentxm/workspace-state").WorkspaceSourceInvalid | import("@agentxm/workspace-state").SkillDiscoveryRootInvalid | import("@agentxm/workspace-state").SubagentScanFailed | import("@agentxm/workspace-state").LockfileResolvedVersionInvalid | import("@agentxm/extension-model/unstable/extensions").FqnInvalidError | import("@agentxm/registry-protocol/unstable/content/frontmatter").FrontmatterParseFailure | import("@agentxm/registry-protocol/unstable/content/subagent-content").SubagentContentError | E, Path.Path | FileSystem.FileSystem | CodingAgentRepository | WorkspaceMutations | KnowledgeManager | HookManager | RuleManager | SubagentManager | RResolve | SkillManager>;
+}, WorkspaceSyncFailed | import("@agentxm/extension-workspace").CoupledDependencyFailure | import("@agentxm/extension-workspace").PackageMaterializationFailed | import("@agentxm/extension-workspace").StagedPackageInvalid | import("@agentxm/extension-workspace").CanonicalPackageProbeFailed | import("@agentxm/extension-workspace").PackageCopyFailed | import("@agentxm/extension-workspace").ArchiveIntegrityMismatch | import("@agentxm/extension-workspace").CreateDestinationExists | import("@agentxm/extension-workspace").CreateNameConfigured | import("@agentxm/extension-workspace").CreateDestinationInspectionFailed | import("@agentxm/workspace-state").PathTraversalDetected | import("@agentxm/extension-workspace").ForkPackageInvalid | import("@agentxm/extension-workspace").ForkPackageConflict | import("@agentxm/extension-workspace").ForkPackageFailed | import("@agentxm/extension-workspace").NativeImportUnsupported | import("@agentxm/extension-workspace").NativeImportInvalid | import("@agentxm/extension-workspace").NativeImportConflict | import("@agentxm/extension-workspace").NativeImportFailed | import("@agentxm/extension-workspace").SourceAuthorityBlocked | import("@agentxm/extension-workspace").LifecyclePostconditionViolated | import("@agentxm/extension-workspace").ScaffoldedExtensionUnresolved | import("@agentxm/extension-workspace").DesiredStateIncomplete | import("@agentxm/extension-workspace").AuthoredContributorUnsupported | import("@agentxm/extension-workspace").ContributorIdentityInvalid | import("@agentxm/extension-workspace").ContributorUnresolved | import("@agentxm/extension-workspace").ContributorTreeMismatch | import("@agentxm/extension-workspace").ProjectionTargetUnsupported | import("@agentxm/extension-workspace").ManagedRegionViolation | import("@agentxm/extension-workspace").ProjectionIoFailed | import("@agentxm/extension-workspace").InstructionMaintenanceFailed | import("@agentxm/extension-workspace").RuleDefinitionInvalid | import("@agentxm/extension-workspace").RuleInstallStateMissing | import("@agentxm/extension-workspace").HookDefinitionInvalid | import("@agentxm/extension-workspace").HookConfigInvalid | import("@agentxm/extension-workspace").HookIoFailed | import("@agentxm/extension-workspace").HookInstallStateMissing | import("@agentxm/extension-workspace").SubagentDefinitionInvalid | import("@agentxm/extension-workspace").SubagentContentUnreadable | import("@agentxm/extension-workspace").SubagentIoFailed | import("@agentxm/extension-workspace").SubagentInstallStateMissing | import("@agentxm/extension-workspace").McpConfigInvalid | import("@agentxm/extension-workspace").McpConfigIoFailed | import("@agentxm/extension-workspace").McpEntryUnmanaged | import("@agentxm/extension-workspace").McpOwnershipMarkerInvalid | import("@agentxm/extension-workspace").McpDefinitionInvalid | import("@agentxm/extension-workspace").McpRegistryOnlyInstall | import("@agentxm/extension-workspace").McpInstallStateMissing | import("@agentxm/extension-workspace").McpSharedTargetConflict | import("@agentxm/extension-workspace").SkillDefinitionInvalid | import("@agentxm/extension-workspace").SkillMaterializationFailed | import("@agentxm/extension-workspace").SkillInstallStateMissing | import("@agentxm/extension-workspace").AxmSkillCompatibilityUnavailable | import("@agentxm/extension-workspace").AxmSkillIncompatible | import("@agentxm/extension-workspace").PackDefinitionInvalid | import("@agentxm/extension-workspace").PackInstallStateMissing | import("@agentxm/extension-workspace").PackArchiveFetchFailed | import("@agentxm/extension-workspace").PackStagingFailed | import("@agentxm/extension-workspace").PackDependencyInvalid | import("@agentxm/extension-workspace").PackDependencyConflict | import("@agentxm/extension-workspace").PackConstraintShadowed | import("@agentxm/extension-workspace").PackDependencyMissing | import("@agentxm/extension-workspace").PackDependencyUnsatisfied | import("@agentxm/extension-workspace").KnowledgeDefinitionInvalid | import("@agentxm/extension-workspace").KnowledgeIoFailed | import("@agentxm/extension-workspace").KnowledgeInstallStateMissing | import("@agentxm/extension-workspace").KnowledgeResolutionMissing | import("@agentxm/extension-workspace").KnowledgeDesiredStateUnreconcilable | import("@agentxm/extension-workspace").KnowledgeUnavailable | import("@agentxm/extension-workspace").KnowledgeObservableContractViolated | import("@agentxm/workspace-state").MaterializedTreeInvalid | import("@agentxm/extension-workspace").TransientBackupFailed | import("@agentxm/extension-workspace").WriteBackupRetained | import("@agentxm/workspace-state").SettingsIoError | import("@agentxm/workspace-state").SettingsParseError | import("@agentxm/workspace-state").SettingsDecodeError | import("@agentxm/workspace-state").LockfileIoError | import("@agentxm/workspace-state").LockfileParseError | import("@agentxm/workspace-state").LockfileDecodeError | import("@agentxm/workspace-state").LockfileVersionUnsupported | import("@agentxm/workspace-state").WorkspaceRootEscape | import("@agentxm/workspace-state").SettingsWriteError | import("@agentxm/workspace-state").WorkspaceSnapshotError | import("@agentxm/workspace-state").LockfileValidationError | import("@agentxm/workspace-state").LockfileWriteError | import("@agentxm/workspace-state").WorkspaceDirectoryError | import("@agentxm/workspace-state").TransitionLockError | import("@agentxm/workspace-state").TransitionLockUnavailable | import("@agentxm/workspace-state").WorkspaceTransitionCompromised | import("@agentxm/workspace-state").WorkspaceRestorationIncomplete | import("@agentxm/workspace-state").WorkspaceLayoutError | import("@agentxm/workspace-state").WorkspaceNotInitialized | import("@agentxm/workspace-state").LockedSkillMissing | import("@agentxm/workspace-state").SettingsEntryMissing | import("@agentxm/workspace-state").InvalidAgentId | import("@agentxm/workspace-state").DesiredPackGraphIncomplete | import("@agentxm/workspace-state").CanonicalPathRemovalError | import("@agentxm/workspace-state").SymlinkCreationError | import("@agentxm/workspace-state").LockEntrySourceMissing | import("@agentxm/workspace-state").LockEntryUrlInvalid | import("@agentxm/workspace-state").LockEntryNameInvalid | import("@agentxm/workspace-state").LockEntryEndpointConflict | import("@agentxm/workspace-state").LockEntrySourceTypeConflict | import("@agentxm/workspace-state").AcceptedResolutionMissing | import("@agentxm/workspace-state").InlineExtensionSourceMissing | import("@agentxm/workspace-state").SupersededCanonicalRemovalFailed | import("@agentxm/workspace-state").PackageContentHashFailed | import("@agentxm/workspace-state").WorkspaceSourceInvalid | import("@agentxm/workspace-state").SkillDiscoveryRootInvalid | import("@agentxm/workspace-state").SubagentScanFailed | import("@agentxm/workspace-state").LockfileResolvedVersionInvalid | import("@agentxm/extension-model/unstable/extensions").FqnInvalidError | import("@agentxm/registry-protocol/unstable/content/frontmatter").FrontmatterParseFailure | import("@agentxm/registry-protocol/unstable/content/subagent-content").SubagentContentError | E, CodingAgentRepository | FileSystem.FileSystem | Path.Path | WorkspaceMutations | KnowledgeManager | HookManager | RuleManager | SubagentManager | RResolve | SkillManager>;
 //# sourceMappingURL=materialize.d.ts.map

package/dist/src/materialize.js CHANGED Viewed

@@ -15,7 +15,7 @@ import * as Option from "effect/Option";
 import * as Path from "effect/Path";
 import * as ServiceMap from "effect/Context";
 import * as semver from "semver";
-import { CodingAgentRepository, HookManager, KnowledgeManager, RuleManager, SkillManager, SubagentManager, buildMaterializeOperation, collectManagedAgentMcpServers, enabledConfiguredEntries, extensionConstraintFactText, inspectMcpServerAcrossAgents, isConfiguredEntryEnabled, makeExtensionConstraintInvariantFact, planExtensionConstraintFact, pruneManagedMcpServersForAgent, skillArtifactFromTargets, targetFromRef, toStepKey, } from "@agentxm/extension-workspace";
+import { CodingAgentRepository, HookManager, KnowledgeManager, RuleManager, SkillManager, SubagentManager, buildMaterializeOperation, collectManagedAgentMcpServers, enabledConfiguredEntries, extensionConstraintFactText, inspectMcpServerAcrossAgents, isConfiguredEntryEnabled, makeExtensionConstraintInvariantFact, planExtensionConstraintFact, skillArtifactFromTargets, targetFromRef, toStepKey, } from "@agentxm/extension-workspace";
 import { normalizeReleaseAgeRecords, } from "@agentxm/registry-protocol/unstable/registry/release-age-policy";
 import {} from "@agentxm/extension-model/unstable/extensions/release-age";
 import { sanitizeName, acceptedResolutionRef, acceptedCanonicalObservation, isSourcedDesiredExtension, desiredStateProblemsText, WorkspaceMutations, usableAcceptedCanonical, } from "@agentxm/workspace-state";
@@ -29,7 +29,7 @@ import {} from "@agentxm/extension-model/unstable/extensions/refs/subagent";
 import { parseExtensionFqnParts, } from "@agentxm/extension-model/unstable/extensions";
 import { StepFailure, } from "@agentxm/workspace-operations";
 import { WorkspaceSyncFailed } from "./errors.js";
-import { isInlineMcpServerEntry, SYNC_RECOVERY_IDS, buildInlineMcpServerSyncOperation, buildMcpServerPruneOperation, } from "./plan.js";
+import { isInlineMcpServerEntry, SYNC_RECOVERY_IDS, buildInlineMcpServerSyncOperation, } from "./plan.js";
 export const normalizedIdentity = (identity) => identity.startsWith("workspace:") ? identity.slice("workspace:".length) : identity;
 const sourceTransitionIdentity = (authority, identity) => authority === "workspace"
     ? "workspace"
@@ -205,7 +205,6 @@ export const collectMaterializeSteps = (args) => Effect.gen(function* () {
     const configuredAgents = args.configuredAgents ?? (yield* ws.getConfiguredAgents());
     const desiredState = yield* ws.getDesiredStateGraph();
     const selection = args.selection ?? { target: Option.none(), type: Option.none() };
-    const isScoped = Option.isSome(selection.target) || Option.isSome(selection.type);
     const problems = scopedProblems(desiredState, selection);
     const blockers = problems.filter((problem) => {
         const name = recoverableExternalPackName(desiredState, problem);
@@ -435,15 +434,6 @@ export const collectMaterializeSteps = (args) => Effect.gen(function* () {
             adapter: args.adapter,
         }));
     }), { concurrency: "unbounded" }).pipe(Effect.map((steps) => steps.flatMap((step) => (Option.isSome(step) ? [step.value] : []))));
-    const needsMcpServerPrune = problems.length === 0 &&
-        !isScoped &&
-        configuredAgents.length > 0 &&
-        (yield* Effect.forEach(configuredAgents, (agentId) => pruneManagedMcpServersForAgent(agentId, {
-            workspaceRoot: ws.baseDir,
-            declaredServerNames: declaredMcpServerNames,
-            scope: ws.scope,
-            dryRun: true,
-        }).pipe(Effect.provideService(FileSystem.FileSystem, fs), Effect.provideService(Path.Path, path)), { concurrency: "unbounded" }).pipe(Effect.map((outcomes) => outcomes.some((outcome) => outcome._tag === "success" && outcome.targets !== undefined))));
     const skillMaterializeStep = ({ ref, force, transitionLabel }) => Effect.gen(function* () {
         const buildArtifact = () => skillSyncArtifact({
             ref,
@@ -490,6 +480,8 @@ export const collectMaterializeSteps = (args) => Effect.gen(function* () {
         serialMaterialization: packRecoverySteps.length > 0,
         expectedSkillNames: new Set(skillRefs.map(({ ref }) => ref.skill.name)),
         expectedSubagentNames: new Set(subagentRefs.map(({ ref }) => ref.subagent.name)),
+        expectedMcpServerNames: declaredMcpServerNames,
+        expectedHookNames: new Set(hookRefs.map(({ ref }) => ref.hook.name)),
         releaseAge: {
             evaluatedAt: DateTime.formatIso(releaseAgeEvaluation.evaluatedAt),
             holdbacks: normalizeReleaseAgeRecords([
@@ -513,16 +505,6 @@ export const collectMaterializeSteps = (args) => Effect.gen(function* () {
                 runMcpServerInstall: args.runMcpServerInstall,
             })),
             ...inlineMcpServerSteps,
-            ...(needsMcpServerPrune
-                ? [
-                    buildMcpServerPruneOperation({
-                        declaredServerNames: declaredMcpServerNames,
-                        agentIds: configuredAgents,
-                        ws,
-                        adapter: args.adapter,
-                    }),
-                ]
-                : []),
             ...subagentRefs.filter(({ materialize }) => materialize).map(subagentMaterializeStep),
             ...ruleRefs
                 .filter(({ materialize }) => materialize)

package/dist/src/plan.d.ts CHANGED Viewed

@@ -76,8 +76,10 @@ export declare const collectKnowledgeStep: (args: {
 export declare const collectCleanupStep: (args: {
     readonly expectedSkillNames: ReadonlySet<string>;
     readonly expectedSubagentNames: ReadonlySet<string>;
+    readonly expectedMcpServerNames: ReadonlySet<string>;
+    readonly expectedHookNames: ReadonlySet<string>;
     readonly adapter: SyncFailureAdapter;
-}) => Effect.Effect<Option.Option<PlannedJobStep<SyncStepRequirements>>, import("./errors.ts").WorkspaceSyncCleanupFailure, Path.Path | FileSystem.FileSystem | CodingAgentRepository | WorkspaceMutations>;
+}) => Effect.Effect<Option.Option<PlannedJobStep<SyncStepRequirements>>, import("./errors.ts").WorkspaceSyncFailed | import("@agentxm/extension-workspace").CoupledDependencyFailure | import("@agentxm/extension-workspace").PackageMaterializationFailed | import("@agentxm/extension-workspace").StagedPackageInvalid | import("@agentxm/extension-workspace").CanonicalPackageProbeFailed | import("@agentxm/extension-workspace").PackageCopyFailed | import("@agentxm/extension-workspace").ArchiveIntegrityMismatch | import("@agentxm/extension-workspace").CreateDestinationExists | import("@agentxm/extension-workspace").CreateNameConfigured | import("@agentxm/extension-workspace").CreateDestinationInspectionFailed | import("@agentxm/workspace-state").PathTraversalDetected | import("@agentxm/extension-workspace").ForkPackageInvalid | import("@agentxm/extension-workspace").ForkPackageConflict | import("@agentxm/extension-workspace").ForkPackageFailed | import("@agentxm/extension-workspace").NativeImportUnsupported | import("@agentxm/extension-workspace").NativeImportInvalid | import("@agentxm/extension-workspace").NativeImportConflict | import("@agentxm/extension-workspace").NativeImportFailed | import("@agentxm/extension-workspace").SourceAuthorityBlocked | import("@agentxm/extension-workspace").LifecyclePostconditionViolated | import("@agentxm/extension-workspace").ScaffoldedExtensionUnresolved | import("@agentxm/extension-workspace").DesiredStateIncomplete | import("@agentxm/extension-workspace").AuthoredContributorUnsupported | import("@agentxm/extension-workspace").ContributorIdentityInvalid | import("@agentxm/extension-workspace").ContributorUnresolved | import("@agentxm/extension-workspace").ContributorTreeMismatch | import("@agentxm/extension-workspace").ProjectionTargetUnsupported | import("@agentxm/extension-workspace").ManagedRegionViolation | import("@agentxm/extension-workspace").ProjectionIoFailed | import("@agentxm/extension-workspace").InstructionMaintenanceFailed | import("@agentxm/extension-workspace").RuleDefinitionInvalid | import("@agentxm/extension-workspace").RuleInstallStateMissing | import("@agentxm/extension-workspace").HookDefinitionInvalid | import("@agentxm/extension-workspace").HookConfigInvalid | import("@agentxm/extension-workspace").HookIoFailed | import("@agentxm/extension-workspace").HookInstallStateMissing | import("@agentxm/extension-workspace").SubagentDefinitionInvalid | import("@agentxm/extension-workspace").SubagentContentUnreadable | import("@agentxm/extension-workspace").SubagentIoFailed | import("@agentxm/extension-workspace").SubagentInstallStateMissing | import("@agentxm/extension-workspace").McpConfigInvalid | import("@agentxm/extension-workspace").McpConfigIoFailed | import("@agentxm/extension-workspace").McpEntryUnmanaged | import("@agentxm/extension-workspace").McpOwnershipMarkerInvalid | import("@agentxm/extension-workspace").McpDefinitionInvalid | import("@agentxm/extension-workspace").McpRegistryOnlyInstall | import("@agentxm/extension-workspace").McpInstallStateMissing | import("@agentxm/extension-workspace").McpSharedTargetConflict | import("@agentxm/extension-workspace").SkillDefinitionInvalid | import("@agentxm/extension-workspace").SkillMaterializationFailed | import("@agentxm/extension-workspace").SkillInstallStateMissing | import("@agentxm/extension-workspace").AxmSkillCompatibilityUnavailable | import("@agentxm/extension-workspace").AxmSkillIncompatible | import("@agentxm/extension-workspace").PackDefinitionInvalid | import("@agentxm/extension-workspace").PackInstallStateMissing | import("@agentxm/extension-workspace").PackArchiveFetchFailed | import("@agentxm/extension-workspace").PackStagingFailed | import("@agentxm/extension-workspace").PackDependencyInvalid | import("@agentxm/extension-workspace").PackDependencyConflict | import("@agentxm/extension-workspace").PackConstraintShadowed | import("@agentxm/extension-workspace").PackDependencyMissing | import("@agentxm/extension-workspace").PackDependencyUnsatisfied | import("@agentxm/extension-workspace").KnowledgeDefinitionInvalid | import("@agentxm/extension-workspace").KnowledgeIoFailed | import("@agentxm/extension-workspace").KnowledgeInstallStateMissing | import("@agentxm/extension-workspace").KnowledgeResolutionMissing | import("@agentxm/extension-workspace").KnowledgeDesiredStateUnreconcilable | import("@agentxm/extension-workspace").KnowledgeUnavailable | import("@agentxm/extension-workspace").KnowledgeObservableContractViolated | import("@agentxm/workspace-state").MaterializedTreeInvalid | import("@agentxm/extension-workspace").TransientBackupFailed | import("@agentxm/extension-workspace").WriteBackupRetained | import("@agentxm/workspace-state").SettingsIoError | import("@agentxm/workspace-state").SettingsParseError | import("@agentxm/workspace-state").SettingsDecodeError | import("@agentxm/workspace-state").LockfileIoError | import("@agentxm/workspace-state").LockfileParseError | import("@agentxm/workspace-state").LockfileDecodeError | import("@agentxm/workspace-state").LockfileVersionUnsupported | import("@agentxm/workspace-state").WorkspaceRootEscape | import("@agentxm/workspace-state").SettingsWriteError | import("@agentxm/workspace-state").WorkspaceSnapshotError | import("@agentxm/workspace-state").LockfileValidationError | import("@agentxm/workspace-state").LockfileWriteError | import("@agentxm/workspace-state").WorkspaceDirectoryError | import("@agentxm/workspace-state").TransitionLockError | import("@agentxm/workspace-state").TransitionLockUnavailable | import("@agentxm/workspace-state").WorkspaceTransitionCompromised | import("@agentxm/workspace-state").WorkspaceRestorationIncomplete | import("@agentxm/workspace-state").WorkspaceLayoutError | import("@agentxm/workspace-state").WorkspaceNotInitialized | import("@agentxm/workspace-state").LockedSkillMissing | import("@agentxm/workspace-state").SettingsEntryMissing | import("@agentxm/workspace-state").InvalidAgentId | import("@agentxm/workspace-state").DesiredPackGraphIncomplete | import("@agentxm/workspace-state").CanonicalPathRemovalError | import("@agentxm/workspace-state").SymlinkCreationError | import("@agentxm/workspace-state").LockEntrySourceMissing | import("@agentxm/workspace-state").LockEntryUrlInvalid | import("@agentxm/workspace-state").LockEntryNameInvalid | import("@agentxm/workspace-state").LockEntryEndpointConflict | import("@agentxm/workspace-state").LockEntrySourceTypeConflict | import("@agentxm/workspace-state").AcceptedResolutionMissing | import("@agentxm/workspace-state").InlineExtensionSourceMissing | import("@agentxm/workspace-state").SupersededCanonicalRemovalFailed | import("@agentxm/workspace-state").PackageContentHashFailed | import("@agentxm/workspace-state").WorkspaceSourceInvalid | import("@agentxm/workspace-state").SkillDiscoveryRootInvalid | import("@agentxm/workspace-state").SubagentScanFailed | import("@agentxm/workspace-state").LockfileResolvedVersionInvalid | import("@agentxm/extension-model/unstable/extensions").FqnInvalidError | import("@agentxm/registry-protocol/unstable/content/frontmatter").FrontmatterParseFailure | import("@agentxm/registry-protocol/unstable/content/subagent-content").SubagentContentError, CodingAgentRepository | FileSystem.FileSystem | Path.Path | WorkspaceMutations>;
 export declare const collectHooksStep: (args: {
     readonly facts: ReadonlyArray<ProjectionInvariantFact>;
     readonly adapter: SyncFailureAdapter;
@@ -85,7 +87,7 @@ export declare const collectHooksStep: (args: {
 export declare const collectInstructionStep: (args: {
     readonly projectionFacts: ReadonlyArray<ProjectionInvariantFact>;
     readonly adapter: SyncFailureAdapter;
-}) => Effect.Effect<Option.Option<PlannedJobStep<SyncStepRequirements>>, import("@agentxm/workspace-state").WorkspaceSettingsReadFailure, Path.Path | FileSystem.FileSystem | WorkspaceMutations | RuleManager>;
+}) => Effect.Effect<Option.Option<PlannedJobStep<SyncStepRequirements>>, import("@agentxm/workspace-state").WorkspaceSettingsReadFailure, FileSystem.FileSystem | Path.Path | WorkspaceMutations | RuleManager>;
 export declare const makeSyncPlan: <R>({ materializeSteps, knowledgeStep, hooksStep, cleanupStep, instructionStep, releaseAge, serialMaterialization, name, description, }: {
     readonly materializeSteps: ReadonlyArray<PlannedJobStep<R>>;
     readonly knowledgeStep: Option.Option<PlannedJobStep<R>>;

package/dist/src/plan.js CHANGED Viewed

@@ -19,7 +19,7 @@ import * as Result from "effect/Result";
 import { CodingAgentRepository, HookManager, KnowledgeManager, RuleManager, applyPlannedProjections, inspectMcpServerAcrossAgents, observeInstructionProjection, projectionFactRequiresReconciliation, pruneManagedMcpServersForAgent, resolveInstructionsConfig, syncInlineMcpServerToAgents, assertInstructionTargetsSafe, assertInstructionsGitignoreSafe, instructionProjectionEffects, instructionProjectionIsCurrent, } from "@agentxm/extension-workspace";
 import { StepFailure, } from "@agentxm/workspace-operations";
 import { WorkspaceMutations } from "@agentxm/workspace-state";
-import { cleanupStaleManagedSkillDirectories, cleanupStaleManagedSubagentFiles, } from "./rendered-file-cleanup.js";
+import { reconcileAgentOutputs } from "./rendered-file-cleanup.js";
 export const SYNC_RECOVERY_IDS = {
     packManifestDivergence: "pack:manifest-divergence",
     extensionConstraintMismatch: "extension:constraint-mismatch",
@@ -53,9 +53,7 @@ export const projectionFactsNeedReconciliation = (facts) => facts.some(projectio
 export const projectionDivergenceLabel = (label, facts) => {
     const violations = facts.filter(projectionFactRequiresReconciliation);
     const statuses = Array.from(new Set(violations.map(({ observation }) => observation.status))).join(", ");
-    const contributors = Array.from(new Set(violations.flatMap(({ affectedContributors }) => affectedContributors)));
-    const details = contributors.length === 0 ? statuses : `${statuses}: ${contributors.join(", ")}`;
-    return details.length === 0 ? label : `${label} (${details})`;
+    return statuses.length === 0 ? label : `${label} (${statuses})`;
 };
 const managedRegionsForFacts = (facts) => facts.flatMap(({ subject }) => subject.owner === undefined
     ? []
@@ -188,7 +186,7 @@ export const collectKnowledgeStep = Effect.fn("Sync.collectKnowledgeStep")(funct
     };
     return Option.some({
         key: "knowledge:discovery",
-        label: "Knowledge discovery",
+        label: projectionDivergenceLabel("Knowledge discovery", args.facts ?? []),
         readiness: "ready",
         artifact,
         ...(message.length === 0 ? {} : { message }),
@@ -215,21 +213,24 @@ export const collectKnowledgeStep = Effect.fn("Sync.collectKnowledgeStep")(funct
 });
 export const collectCleanupStep = Effect.fn("Sync.collectCleanupStep")(function* (args) {
     const ws = yield* WorkspaceMutations;
+    const agentRepo = yield* CodingAgentRepository;
+    const desiredAgentIds = new Set((yield* agentRepo.getMaterializationAgents()).map(({ id }) => id));
     const expectedSkillProjectionNames = new Set([
         ...args.expectedSkillNames,
         ...args.expectedSubagentNames,
     ]);
-    const preview = yield* Effect.all([
-        cleanupStaleManagedSkillDirectories({
-            expectedSkillNames: expectedSkillProjectionNames,
-            dryRun: true,
-        }),
-        cleanupStaleManagedSubagentFiles({
-            expectedSubagentNames: args.expectedSubagentNames,
-            dryRun: true,
-        }),
-    ]);
-    const previewPaths = preview.flatMap(({ removedPaths }) => removedPaths);
+    const expectedNames = {
+        skill: expectedSkillProjectionNames,
+        subagent: args.expectedSubagentNames,
+        "mcp-server": args.expectedMcpServerNames,
+        hook: args.expectedHookNames,
+    };
+    const preview = yield* reconcileAgentOutputs({
+        desiredAgentIds,
+        expectedNames,
+        dryRun: true,
+    });
+    const previewPaths = preview.removedPaths;
     if (previewPaths.length === 0)
         return Option.none();
     return Option.some({
@@ -243,13 +244,8 @@ export const collectCleanupStep = Effect.fn("Sync.collectCleanupStep")(function*
             fileCount: previewPaths.length,
             targets: previewPaths.map((filePath) => ({ path: filePath, change: "removed" })),
         },
-        run: Effect.all([
-            cleanupStaleManagedSkillDirectories({
-                expectedSkillNames: expectedSkillProjectionNames,
-            }),
-            cleanupStaleManagedSubagentFiles({ expectedSubagentNames: args.expectedSubagentNames }),
-        ]).pipe(Effect.mapError(args.adapter.toStepFailure), Effect.map((results) => {
-            const removedPaths = results.flatMap((result) => result.removedPaths);
+        run: reconcileAgentOutputs({ desiredAgentIds, expectedNames }).pipe(Effect.mapError(args.adapter.toStepFailure), Effect.map((result) => {
+            const removedPaths = result.removedPaths;
             return {
                 result: "success",
                 message: `Removed ${count(removedPaths.length, "stale managed agent projection")}`,

package/dist/src/rendered-file-cleanup.d.ts CHANGED Viewed

@@ -1,45 +1,27 @@
 /**
- * Destructive sweep of AXM-managed rendered files across agent surfaces:
- * stale skill and subagent projections, managed MCP server entries, and
- * managed hook groups. Read-only discovery primitives live in
- * `extension-workspace/managed-file-discovery.ts`.
+ * Destructive reconciliation of AXM-owned agent-native outputs. Read-only
+ * ownership and claimant discovery lives in `@agentxm/extension-workspace`.
  *
  * @experimental This API is unstable and may change without notice.
- * @packageDocumentation
  */
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Path from "effect/Path";
-import { type WorkspaceSyncCleanupFailure } from "./errors.js";
 import { CodingAgentRepository, type WorkspaceOwnershipIssue } from "@agentxm/extension-workspace";
+import type { PerAgentType } from "@agentxm/extension-model/unstable/extensions/common";
 import { WorkspaceMutations } from "@agentxm/workspace-state";
-export interface RenderedFileCleanupResult {
-    readonly removedPaths: ReadonlyArray<string>;
-}
-export interface RemovedAgentArtifactCleanupResult {
+import { type WorkspaceSyncCleanupFailure } from "./errors.js";
+export interface ReconcileAgentOutputsResult {
     readonly removedPaths: ReadonlyArray<string>;
     readonly preservedPaths: ReadonlyArray<string>;
 }
-/** Remove AXM-owned skill projections whose package is no longer desired. */
-export declare const cleanupStaleManagedSkillDirectories: (args: {
-    readonly expectedSkillNames: ReadonlySet<string>;
+export interface ReconcileAgentOutputsArgs {
+    readonly desiredAgentIds: ReadonlySet<string>;
+    readonly expectedNames: Readonly<Record<PerAgentType, ReadonlySet<string>>>;
     readonly dryRun?: boolean;
-}) => Effect.Effect<RenderedFileCleanupResult, WorkspaceSyncCleanupFailure, CodingAgentRepository | FileSystem.FileSystem | Path.Path | WorkspaceMutations>;
-/**
- * Remove AXM-managed artifacts for agents that are no longer configured for a
- * workspace: rendered skill and subagent files, plus the agent's
- * managed MCP server entries and hook groups. Only content carrying an
- * AXM-managed signal is removed; user-authored files and entries are left
- * untouched.
- */
-export declare const cleanupManagedArtifactsForRemovedAgents: (args: {
-    readonly removedAgentIds: ReadonlySet<string>;
-    readonly dryRun?: boolean;
-}) => Effect.Effect<RemovedAgentArtifactCleanupResult, WorkspaceSyncCleanupFailure, CodingAgentRepository | FileSystem.FileSystem | Path.Path | WorkspaceMutations>;
+}
+/** Converge all AXM-owned per-agent outputs on desired workspace state. */
+export declare const reconcileAgentOutputs: (args: ReconcileAgentOutputsArgs) => Effect.Effect<ReconcileAgentOutputsResult, WorkspaceSyncCleanupFailure, CodingAgentRepository | FileSystem.FileSystem | Path.Path | WorkspaceMutations>;
 /** Inspect ownership proofs without mutating any agent-native artifact. */
 export declare const inspectWorkspaceOwnership: () => Effect.Effect<ReadonlyArray<WorkspaceOwnershipIssue>, WorkspaceSyncCleanupFailure, CodingAgentRepository | FileSystem.FileSystem | Path.Path | WorkspaceMutations>;
-export declare const cleanupStaleManagedSubagentFiles: (args: {
-    readonly expectedSubagentNames: ReadonlySet<string>;
-    readonly dryRun?: boolean;
-}) => Effect.Effect<RenderedFileCleanupResult, WorkspaceSyncCleanupFailure, CodingAgentRepository | FileSystem.FileSystem | Path.Path | WorkspaceMutations>;
 //# sourceMappingURL=rendered-file-cleanup.d.ts.map

package/dist/src/rendered-file-cleanup.js CHANGED Viewed

@@ -1,381 +1,119 @@
 /**
- * Destructive sweep of AXM-managed rendered files across agent surfaces:
- * stale skill and subagent projections, managed MCP server entries, and
- * managed hook groups. Read-only discovery primitives live in
- * `extension-workspace/managed-file-discovery.ts`.
+ * Destructive reconciliation of AXM-owned agent-native outputs. Read-only
+ * ownership and claimant discovery lives in `@agentxm/extension-workspace`.
  *
  * @experimental This API is unstable and may change without notice.
- * @packageDocumentation
  */
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Path from "effect/Path";
-import { WorkspaceSyncFailed } from "./errors.js";
-import { CodingAgentRepository, pruneManagedMcpServersForAgent, extensionNameFromFilename, hasAxmManagedMarker, safeReadDirectory, safeReadFileString, readAmbiguousHookCommands, stripManagedHooksFromJson, } from "@agentxm/extension-workspace";
+import { CodingAgentRepository, observeAgentOutputs, pruneManagedHooksFromJson, pruneManagedMcpServersForAgent, safeReadFileString, } from "@agentxm/extension-workspace";
 import { AGENTS as CAPABILITY_AGENTS } from "@agentxm/extension-model/unstable/agent-capabilities";
-import { PER_AGENT_EXTENSION_TYPES, } from "@agentxm/extension-model/unstable/extensions/common";
-import { ACQUIRED_EXTENSIONS_DIR } from "@agentxm/workspace-state";
-import { WorkspaceMutations } from "@agentxm/workspace-state";
-import { protectWorkspacePath } from "@agentxm/workspace-state";
-import { recordFootprint } from "@agentxm/workspace-state";
-const isWithin = (path, parent, child) => {
-    const relative = path.relative(path.resolve(parent), path.resolve(child));
-    return relative === "" || (!relative.startsWith("..") && !path.isAbsolute(relative));
-};
-const removePath = (fs, filePath, dryRun) => dryRun
-    ? Effect.void
-    : protectWorkspacePath(filePath).pipe(Effect.andThen(fs.remove(filePath, { recursive: true })), Effect.andThen(recordFootprint({ path: filePath, change: "removed" })), Effect.mapError((error) => new WorkspaceSyncFailed({
-        category: "internal",
-        detail: `Failed to remove managed agent artifact: ${filePath}`,
-        cause: error,
-    })));
-const hasManagedSkillCopyMarker = (fs, path, artifactPath) => safeReadFileString(fs, path.join(artifactPath, "SKILL.md")).pipe(Effect.map(hasAxmManagedMarker));
-const cleanupSkillArtifactsInDir = (args) => Effect.gen(function* () {
-    const removedPaths = [];
-    const preservedPaths = [];
-    const entries = yield* safeReadDirectory(args.fs, args.skillsDir);
-    const configuredRoots = args.ownershipRoots ?? [
-        args.path.join(args.baseDir, ACQUIRED_EXTENSIONS_DIR),
-    ];
-    const ownershipRoots = yield* Effect.forEach(configuredRoots, (root) => args.fs.realPath(root).pipe(Effect.orElseSucceed(() => root)));
-    for (const entry of entries) {
-        if (args.expectedNames?.has(entry) === true)
-            continue;
-        const artifactPath = args.path.join(args.skillsDir, entry);
-        const linkTarget = yield* args.fs.readLink(artifactPath).pipe(Effect.option);
-        if (linkTarget._tag === "Some") {
-            const resolvedTarget = args.path.resolve(args.skillsDir, linkTarget.value);
-            const canonicalTarget = yield* args.fs.realPath(resolvedTarget).pipe(Effect.option);
-            const ownershipTarget = canonicalTarget._tag === "Some" ? canonicalTarget.value : resolvedTarget;
-            if (!ownershipRoots.some((root) => isWithin(args.path, root, ownershipTarget))) {
-                preservedPaths.push(artifactPath);
-                continue;
-            }
-            yield* removePath(args.fs, artifactPath, args.dryRun);
-            removedPaths.push(artifactPath);
-            continue;
-        }
-        const stat = yield* args.fs.stat(artifactPath).pipe(Effect.option);
-        if (stat._tag === "None")
-            continue;
-        if (stat.value.type !== "Directory") {
-            preservedPaths.push(artifactPath);
-            continue;
-        }
-        const managedCopy = yield* hasManagedSkillCopyMarker(args.fs, args.path, artifactPath);
-        if (!managedCopy) {
-            preservedPaths.push(artifactPath);
-            continue;
-        }
-        yield* removePath(args.fs, artifactPath, args.dryRun);
-        removedPaths.push(artifactPath);
-    }
-    return { removedPaths, preservedPaths };
-});
-/** Remove AXM-owned skill projections whose package is no longer desired. */
-export const cleanupStaleManagedSkillDirectories = (args) => Effect.gen(function* () {
-    const fs = yield* FileSystem.FileSystem;
-    const path = yield* Path.Path;
+import { WorkspaceMutations, protectWorkspacePath, recordFootprint, } from "@agentxm/workspace-state";
+import { WorkspaceSyncFailed } from "./errors.js";
+const inventory = (args) => Effect.gen(function* () {
     const ws = yield* WorkspaceMutations;
-    const agentRepo = yield* CodingAgentRepository;
-    const configuredAgentIds = new Set(yield* ws.getConfiguredAgents());
-    const agents = yield* agentRepo.all;
-    const removedPaths = [];
-    const ownershipRoots = ws.layout.scope === "project"
-        ? [ws.layout.acquiredRoot, ws.layout.authoredRoot("skill")]
-        : [ws.layout.acquiredRoot];
-    for (const agent of agents) {
-        if (!configuredAgentIds.has(agent.id))
-            continue;
-        const resolved = yield* agent.resolveEffectiveSkillsDir({ workspaceRoot: ws.baseDir });
-        if (resolved._tag !== "supported")
-            continue;
-        const result = yield* cleanupSkillArtifactsInDir({
-            fs,
-            path,
-            baseDir: ws.baseDir,
-            skillsDir: resolved.dir,
-            dryRun: args.dryRun === true,
-            ownershipRoots,
-            expectedNames: args.expectedSkillNames,
-        });
-        removedPaths.push(...result.removedPaths);
-    }
-    return { removedPaths: [...new Set(removedPaths)] };
-});
-const cleanupSubagentArtifactsInDir = (args) => Effect.gen(function* () {
-    const removedPaths = [];
-    const preservedPaths = [];
-    const entries = yield* safeReadDirectory(args.fs, args.subagentsDir);
-    for (const entry of entries) {
-        const filePath = args.path.join(args.subagentsDir, entry);
-        const stat = yield* args.fs.stat(filePath).pipe(Effect.option);
-        if (stat._tag === "None" || stat.value.type !== "File")
-            continue;
-        const content = yield* safeReadFileString(args.fs, filePath);
-        if (!hasAxmManagedMarker(content)) {
-            preservedPaths.push(filePath);
-            continue;
-        }
-        yield* removePath(args.fs, filePath, args.dryRun);
-        removedPaths.push(filePath);
-    }
-    return { removedPaths, preservedPaths };
-});
-const NO_PATHS = { removedPaths: [], preservedPaths: [] };
-const cleanupAgentSkills = (context) => Effect.gen(function* () {
-    const skillsDir = yield* context.agent.resolveEffectiveSkillsDir({
-        workspaceRoot: context.workspaceRoot,
-    });
-    if (skillsDir._tag !== "supported")
-        return NO_PATHS;
-    return yield* cleanupSkillArtifactsInDir({
-        fs: context.fs,
-        path: context.path,
-        baseDir: context.workspaceRoot,
-        skillsDir: skillsDir.dir,
-        dryRun: context.dryRun,
-        ownershipRoots: context.skillOwnershipRoots,
-    });
-});
-const cleanupAgentSubagents = (context) => Effect.gen(function* () {
-    const subagentsDir = yield* context.agent.resolveEffectiveSubagentsDir({
-        workspaceRoot: context.workspaceRoot,
-        scope: context.scope,
-    });
-    if (subagentsDir._tag !== "supported")
-        return NO_PATHS;
-    return yield* cleanupSubagentArtifactsInDir({
-        fs: context.fs,
-        path: context.path,
-        subagentsDir: subagentsDir.dir,
-        dryRun: context.dryRun,
+    return yield* observeAgentOutputs({
+        workspaceRoot: ws.baseDir,
+        scope: ws.scope,
+        desiredAgentIds: args.desiredAgentIds,
+        expectedNames: args.expectedNames,
+        skillOwnershipRoots: ws.layout.scope === "project"
+            ? [ws.layout.acquiredRoot, ws.layout.authoredRoot("skill")]
+            : [ws.layout.acquiredRoot],
     });
 });
-/**
- * Drop every `x-axm`-tagged server from the agent's MCP config. An empty
- * declared set means "nothing should remain", so only managed entries go and
- * user-authored servers stay.
- */
-const cleanupAgentMcpServers = (context) => Effect.gen(function* () {
-    const outcome = yield* pruneManagedMcpServersForAgent(context.agent.id, {
-        workspaceRoot: context.workspaceRoot,
-        declaredServerNames: new Set(),
-        scope: context.scope,
-        dryRun: context.dryRun,
-    });
-    if (outcome._tag !== "success")
-        return NO_PATHS;
-    return {
-        removedPaths: (outcome.targets ?? []).map((target) => target.path),
-        preservedPaths: [],
-    };
+const cleanupFailure = (detail, cause) => new WorkspaceSyncFailed({ category: "internal", detail, cause });
+const removeOwnedFile = (fs, output) => protectWorkspacePath(output.path).pipe(Effect.andThen(fs.remove(output.path, { recursive: true })), Effect.andThen(recordFootprint({ path: output.path, change: "removed" })), Effect.mapError((error) => cleanupFailure(`Failed to remove managed agent artifact: ${output.path}`, error)));
+const uniqueContainers = (outputs) => outputs.filter((output, index) => outputs.findIndex((candidate) => candidate.extensionType === output.extensionType &&
+    candidate.containerPath === output.containerPath) === index);
+const desiredNamesForContainer = (output, args) => output.claimantAgentIds.some((agentId) => args.desiredAgentIds.has(agentId))
+    ? args.expectedNames[output.extensionType]
+    : new Set();
+const pruneMcpContainer = (output, args, workspaceRoot, scope) => {
+    const claimant = output.claimantAgentIds[0];
+    if (claimant === undefined)
+        return Effect.void;
+    return pruneManagedMcpServersForAgent(claimant, {
+        workspaceRoot,
+        scope,
+        declaredServerNames: desiredNamesForContainer(output, args),
+    }).pipe(Effect.mapError((error) => cleanupFailure(`Failed to reconcile managed MCP entries in: ${output.containerPath}`, error)), Effect.asVoid);
+};
+const pruneHookContainer = (fs, path, output, args, workspaceRoot, scope) => Effect.gen(function* () {
+    const writer = CAPABILITY_AGENTS.flatMap((agent) => {
+        if (!output.claimantAgentIds.includes(agent.id))
+            return [];
+        const candidate = agent.capabilities.hook.axm.writer;
+        if (candidate === null)
+            return [];
+        const ownsPath = candidate.configFiles.some((file) => file.scope === scope &&
+            file.format === "json" &&
+            path.resolve(workspaceRoot, file.path) === output.containerPath);
+        return ownsPath ? [candidate] : [];
+    })[0];
+    if (writer === undefined)
+        return;
+    const raw = yield* safeReadFileString(fs, output.containerPath);
+    const next = yield* pruneManagedHooksFromJson(output.containerPath, writer.settingsKey, raw, desiredNamesForContainer(output, args)).pipe(Effect.mapError((error) => cleanupFailure(`Failed to reconcile managed hooks in: ${output.containerPath}`, error)));
+    if (next === raw)
+        return;
+    yield* protectWorkspacePath(output.containerPath).pipe(Effect.andThen(fs.writeFileString(output.containerPath, next)), Effect.andThen(recordFootprint({ path: output.containerPath, change: "modified" })), Effect.mapError((error) => cleanupFailure(`Failed to write reconciled hooks to: ${output.containerPath}`, error)));
 });
-/**
- * Strip AXM-rendered hook groups from the agent's settings files. Edits go
- * through jsonc-parser so user-authored groups, comments, and formatting in
- * these user-owned files survive.
- */
-const cleanupAgentHooks = (context) => Effect.gen(function* () {
-    const capabilityAgent = CAPABILITY_AGENTS.find((candidate) => candidate.id === context.agent.id);
-    const writer = capabilityAgent?.capabilities.hook.axm.writer;
-    if (writer === undefined || writer === null)
-        return NO_PATHS;
-    const removedPaths = [];
-    const configFiles = writer.configFiles.filter((file) => file.scope === "project" && file.format === "json");
-    for (const file of configFiles) {
-        const configPath = context.path.resolve(context.workspaceRoot, file.path);
-        const exists = yield* context.fs
-            .exists(configPath)
-            .pipe(Effect.catch(() => Effect.succeed(false)));
-        if (!exists)
-            continue;
-        const raw = yield* safeReadFileString(context.fs, configPath);
-        const next = yield* stripManagedHooksFromJson(configPath, writer.settingsKey, raw);
-        if (next === raw)
-            continue;
-        if (!context.dryRun) {
-            yield* protectWorkspacePath(configPath);
-            yield* context.fs.writeFileString(configPath, next).pipe(Effect.mapError((error) => new WorkspaceSyncFailed({
-                category: "internal",
-                detail: `Failed to strip managed hooks from: ${configPath}`,
-                cause: error,
-            })));
-        }
-        removedPaths.push(configPath);
+/** Converge all AXM-owned per-agent outputs on desired workspace state. */
+export const reconcileAgentOutputs = (args) => Effect.gen(function* () {
+    const before = yield* inventory(args);
+    const candidates = before.ownedResidue;
+    const preservedPaths = [...new Set(before.unownedFootprints.map(({ path }) => path))].sort();
+    if (args.dryRun === true) {
+        return {
+            removedPaths: [...new Set(candidates.map(({ path }) => path))].sort(),
+            preservedPaths,
+        };
     }
-    return { removedPaths, preservedPaths: [] };
-});
-/**
- * Cleanup keyed on the placement axis: every extension type that renders into a
- * directory the agent owns needs removal behavior here, and adding a per-agent
- * type fails to compile until that behavior is decided.
- *
- * Workspace-placed types are deliberately absent rather than mapped to a no-op.
- * Workspace-placed extensions live in shared workspace content and are not
- * keyed to a single agent, so removing one agent must not delete them.
- */
-const cleanupByExtensionType = {
-    skill: cleanupAgentSkills,
-    subagent: cleanupAgentSubagents,
-    "mcp-server": cleanupAgentMcpServers,
-    hook: cleanupAgentHooks,
-};
-/**
- * Remove AXM-managed artifacts for agents that are no longer configured for a
- * workspace: rendered skill and subagent files, plus the agent's
- * managed MCP server entries and hook groups. Only content carrying an
- * AXM-managed signal is removed; user-authored files and entries are left
- * untouched.
- */
-export const cleanupManagedArtifactsForRemovedAgents = (args) => Effect.gen(function* () {
     const fs = yield* FileSystem.FileSystem;
     const path = yield* Path.Path;
     const ws = yield* WorkspaceMutations;
-    const agentRepo = yield* CodingAgentRepository;
-    const agents = yield* agentRepo.all;
-    const removedPaths = [];
-    const preservedPaths = [];
-    for (const agent of agents) {
-        if (!args.removedAgentIds.has(agent.id))
-            continue;
-        const context = {
-            fs,
-            path,
-            agent,
-            workspaceRoot: ws.baseDir,
-            scope: ws.scope,
-            skillOwnershipRoots: ws.layout.scope === "project"
-                ? [ws.layout.acquiredRoot, ws.layout.authoredRoot("skill")]
-                : [ws.layout.acquiredRoot],
-            dryRun: args.dryRun === true,
-        };
-        for (const type of PER_AGENT_EXTENSION_TYPES) {
-            const result = yield* cleanupByExtensionType[type](context);
-            removedPaths.push(...result.removedPaths);
-            preservedPaths.push(...result.preservedPaths);
+    for (const output of candidates) {
+        if (output.extensionType === "skill" || output.extensionType === "subagent") {
+            yield* removeOwnedFile(fs, output);
         }
     }
-    return {
-        removedPaths: [...new Set(removedPaths)],
-        preservedPaths: [...new Set(preservedPaths)],
-    };
+    for (const output of uniqueContainers(candidates.filter(({ extensionType }) => extensionType === "mcp-server"))) {
+        yield* pruneMcpContainer(output, args, ws.baseDir, ws.scope);
+    }
+    for (const output of uniqueContainers(candidates.filter(({ extensionType }) => extensionType === "hook"))) {
+        yield* pruneHookContainer(fs, path, output, args, ws.baseDir, ws.scope);
+    }
+    const after = yield* inventory(args);
+    const remaining = new Set(after.outputs.map((output) => `${output.extensionType}\u0000${output.path}\u0000${output.entryName}`));
+    const removedPaths = candidates
+        .filter((output) => !remaining.has(`${output.extensionType}\u0000${output.path}\u0000${output.entryName}`))
+        .map(({ path: outputPath }) => outputPath);
+    return { removedPaths: [...new Set(removedPaths)].sort(), preservedPaths };
 });
 /** Inspect ownership proofs without mutating any agent-native artifact. */
 export const inspectWorkspaceOwnership = () => Effect.gen(function* () {
-    const fs = yield* FileSystem.FileSystem;
-    const path = yield* Path.Path;
     const ws = yield* WorkspaceMutations;
-    const agentRepo = yield* CodingAgentRepository;
     const configured = new Set(yield* ws.getConfiguredAgents());
-    const agents = yield* agentRepo.all;
-    const issues = [];
-    for (const agent of agents) {
-        if (!configured.has(agent.id))
-            continue;
-        const skillsDir = yield* agent.resolveEffectiveSkillsDir({ workspaceRoot: ws.baseDir });
-        if (skillsDir._tag === "supported") {
-            const result = yield* cleanupSkillArtifactsInDir({
-                fs,
-                path,
-                baseDir: ws.baseDir,
-                skillsDir: skillsDir.dir,
-                dryRun: true,
-                ownershipRoots: ws.layout.scope === "project"
-                    ? [ws.layout.acquiredRoot, ws.layout.authoredRoot("skill")]
-                    : [ws.layout.acquiredRoot],
-            });
-            issues.push(...result.preservedPaths.map((artifactPath) => ({
-                kind: "managed-file-unowned",
-                path: artifactPath,
-                detail: "Agent skill artifact has no AXM symlink or structured file ownership proof.",
-            })));
-        }
-        const subagentsDir = yield* agent.resolveEffectiveSubagentsDir({
-            workspaceRoot: ws.baseDir,
-            scope: ws.scope,
-        });
-        if (subagentsDir._tag === "supported") {
-            const result = yield* cleanupSubagentArtifactsInDir({
-                fs,
-                path,
-                subagentsDir: subagentsDir.dir,
-                dryRun: true,
-            });
-            issues.push(...result.preservedPaths.map((artifactPath) => ({
-                kind: "managed-file-unowned",
-                path: artifactPath,
-                detail: "Agent subagent artifact has no structured file ownership proof.",
-            })));
-        }
-        const capabilityAgent = CAPABILITY_AGENTS.find((candidate) => candidate.id === agent.id);
-        const writer = capabilityAgent?.capabilities.hook.axm.writer;
-        if (writer === undefined || writer === null)
-            continue;
-        for (const file of writer.configFiles.filter((candidate) => candidate.scope === ws.scope && candidate.format === "json")) {
-            const configPath = path.resolve(ws.baseDir, file.path);
-            if (!(yield* fs.exists(configPath).pipe(Effect.catch(() => Effect.succeed(false)))))
-                continue;
-            const raw = yield* safeReadFileString(fs, configPath);
-            const commands = yield* readAmbiguousHookCommands(configPath, writer.settingsKey, raw);
-            issues.push(...commands.map((command) => ({
-                kind: "hook-ownership-ambiguous",
-                path: configPath,
-                detail: `Hook command targets an AXM canonical extension path without x-axm ownership metadata: ${command}`,
-            })));
-        }
-    }
-    return issues.filter((issue, index) => issues.findIndex((candidate) => candidate.kind === issue.kind &&
-        candidate.path === issue.path &&
-        candidate.detail === issue.detail) === index);
-});
-export const cleanupStaleManagedSubagentFiles = (args) => Effect.gen(function* () {
-    const fs = yield* FileSystem.FileSystem;
-    const path = yield* Path.Path;
-    const ws = yield* WorkspaceMutations;
-    const agentRepo = yield* CodingAgentRepository;
-    const configuredAgentIds = new Set(yield* ws.getConfiguredAgents());
-    const agents = yield* agentRepo.all;
-    const removedPaths = [];
-    for (const agent of agents) {
-        const resolved = yield* agent.resolveEffectiveSubagentsDir({
-            workspaceRoot: ws.baseDir,
-            scope: ws.scope,
-        });
-        if (resolved._tag !== "supported")
-            continue;
-        const exists = yield* fs.exists(resolved.dir).pipe(Effect.catch(() => Effect.succeed(false)));
-        if (!exists)
-            continue;
-        const entries = yield* fs
-            .readDirectory(resolved.dir)
-            .pipe(Effect.catch(() => Effect.succeed([])));
-        for (const entry of entries) {
-            const filePath = path.join(resolved.dir, entry);
-            const stat = yield* fs.stat(filePath).pipe(Effect.option);
-            if (stat._tag === "None" || stat.value.type !== "File")
-                continue;
-            const content = yield* fs
-                .readFileString(filePath)
-                .pipe(Effect.catch(() => Effect.succeed("")));
-            if (!hasAxmManagedMarker(content))
-                continue;
-            const expected = configuredAgentIds.has(agent.id) &&
-                args.expectedSubagentNames.has(extensionNameFromFilename(entry));
-            if (expected)
-                continue;
-            if (args.dryRun !== true) {
-                yield* protectWorkspacePath(filePath);
-                yield* fs.remove(filePath).pipe(Effect.mapError((error) => new WorkspaceSyncFailed({
-                    category: "internal",
-                    detail: `Failed to remove stale managed subagent file: ${filePath}`,
-                    cause: error,
-                })));
-                yield* recordFootprint({ path: filePath, change: "removed" });
-            }
-            removedPaths.push(filePath);
-        }
-    }
-    return { removedPaths };
+    const empty = new Set();
+    const observed = yield* inventory({
+        desiredAgentIds: configured,
+        expectedNames: {
+            skill: empty,
+            subagent: empty,
+            "mcp-server": empty,
+            hook: empty,
+        },
+    });
+    return observed.unownedFootprints.map((output) => ({
+        kind: output.extensionType === "hook"
+            ? "hook-ownership-ambiguous"
+            : "managed-file-unowned",
+        path: output.path,
+        detail: output.extensionType === "hook"
+            ? `Hook command targets an AXM canonical extension path without x-axm ownership metadata: ${output.entryName}`
+            : `Agent ${output.extensionType} artifact has no AXM ownership proof.`,
+    }));
 });
 //# sourceMappingURL=rendered-file-cleanup.js.map

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@agentxm/workspace-sync",
-  "version": "0.28.4-bootstrap.0",
+  "version": "0.28.5",
   "description": "AXM workspace-sync feature: desired-state reconciliation planning, projection realization, and reconciliation outcomes for the axm CLI. Unstable and unsupported — use the axm.sh CLI.",
   "type": "module",
   "license": "FSL-1.1-MIT",
@@ -18,6 +18,7 @@
   "exports": {
     ".": {
       "types": "./dist/src/index.d.ts",
+      "axm-source": "./src/index.ts",
       "default": "./dist/src/index.js"
     }
   },
@@ -37,11 +38,11 @@
   "dependencies": {
     "effect": "4.0.0-rc.112",
     "semver": "^7.8.5",
-    "@agentxm/extension-model": "^0.28.4-bootstrap.0",
-    "@agentxm/extension-workspace": "^0.28.4-bootstrap.0",
-    "@agentxm/registry-protocol": "^0.28.4-bootstrap.0",
-    "@agentxm/workspace-state": "^0.28.4-bootstrap.0",
-    "@agentxm/workspace-operations": "^0.28.4-bootstrap.0"
+    "@agentxm/workspace-operations": "^0.28.5",
+    "@agentxm/extension-model": "^0.28.5",
+    "@agentxm/registry-protocol": "^0.28.5",
+    "@agentxm/workspace-state": "^0.28.5",
+    "@agentxm/extension-workspace": "^0.28.5"
   },
   "devDependencies": {
     "@effect/platform-node": "4.0.0-rc.112",