agentwheel 0.20.2 → 0.20.3

package/dist/index.js

@@ -9372,15 +9372,22 @@ async function observe(request, transport) {
     if (candidates.length !== 1) {
       throw new Error(`Destination Fleet manifest has ambiguous ownership for ${sourceEntry.path}.`);
     }
-    assertRetirableSourceEntry(sourceEntry);
+    assertRetirableSourceEntry(sourceEntry, normalized.abandonIncompleteMergeOwner === true);
     const destinationEntry = candidates[0];
-    await assertContributionCoverage(sourceEntry, destinationEntry, normalized.targetRoot, transport);
-    const runtimeHash = await verifyManifestEntryRuntime(normalized.targetRoot, destinationEntry, transport);
+    const coverage = await assertContributionCoverage(
+      sourceEntry,
+      destinationEntry,
+      normalized.targetRoot,
+      transport,
+      normalized.abandonIncompleteMergeOwner === true
+    );
+    const runtimeHash = coverage === "abandoned-incomplete-merge" ? await transport.hashPath(containedArtifactPath(normalized.targetRoot, destinationEntry.path)) : await verifyManifestEntryRuntime(normalized.targetRoot, destinationEntry, transport);
     selected.push({
       path: sourceEntry.path,
       sourceEntryDigest: entryDigest(sourceEntry),
       destinationEntryDigest: entryDigest(destinationEntry),
-      runtimeHash
+      runtimeHash,
+      coverage
     });
   }
   selected.sort((a, b) => a.path.localeCompare(b.path) || a.sourceEntryDigest.localeCompare(b.sourceEntryDigest) || a.destinationEntryDigest.localeCompare(b.destinationEntryDigest));
@@ -9458,15 +9465,16 @@ async function requireManifest(request, stateKey, transport, label) {
   }
   return manifest;
 }
-function assertRetirableSourceEntry(entry) {
+function assertRetirableSourceEntry(entry, abandonIncompleteMergeOwner) {
   if (entry.semanticPlugin || entry.semanticCommand || entry.executed) {
     throw new Error(`Cannot retire semantic source ownership at ${entry.path}.`);
   }
-  if (entry.mergeStrategy && !entry.mergeRemoval) {
+  if (entry.mergeStrategy && !hasMergeRemovalContent(entry.mergeRemoval)) {
+    if (abandonIncompleteMergeOwner) return;
     throw new Error(`Cannot retire incomplete merge ownership at ${entry.path}.`);
   }
 }
-async function assertContributionCoverage(source, destination, targetRoot, transport) {
+async function assertContributionCoverage(source, destination, targetRoot, transport, abandonIncompleteMergeOwner) {
   const sourceManagedBlock = source.mode === "managed-block";
   const destinationManagedBlock = destination.mode === "managed-block";
   const sourceMerge = source.mergeStrategy !== void 0;
@@ -9478,24 +9486,29 @@ async function assertContributionCoverage(source, destination, targetRoot, trans
       `Destination Fleet ownership category ${destinationCategory} cannot replace stale source category ${sourceCategory} at ${source.path}.`
     );
   }
-  if (sourceCategory === "plain") return;
+  if (sourceCategory === "plain") return "exact";
   if (sourceManagedBlock) {
     const sourceSelector = managedInstructionSelector(source.logicalSelector, source.artifactType, source.artifactName);
     const destinationSelector = managedInstructionSelector(destination.logicalSelector, destination.artifactType, destination.artifactName);
     if (!sourceManagedBlock || !destinationManagedBlock || sourceSelector !== destinationSelector) {
       throw new Error(`Destination Fleet does not exactly cover stale source managed block contribution at ${source.path}.`);
     }
-    return;
+    return "exact";
   }
   if (source.mergeStrategy && destination.mergeStrategy) {
-    if (!source.mergeRemoval) throw new Error(`Cannot retire incomplete merge ownership at ${source.path}.`);
-    const exactlyCovered = destination.mergeStrategy === source.mergeStrategy && destination.mergeRemoval && contributionSelector(source) === contributionSelector(destination) && canonicalJson(source.mergeRemoval) === canonicalJson(destination.mergeRemoval);
-    if (exactlyCovered) return;
+    if (!hasMergeRemovalContent(source.mergeRemoval)) {
+      if (abandonIncompleteMergeOwner) return "abandoned-incomplete-merge";
+      throw new Error(`Cannot retire incomplete merge ownership at ${source.path}.`);
+    }
+    const exactlyCovered = destination.mergeStrategy === source.mergeStrategy && hasMergeRemovalContent(destination.mergeRemoval) && contributionSelector(source) === contributionSelector(destination) && canonicalJson(source.mergeRemoval) === canonicalJson(destination.mergeRemoval);
+    if (exactlyCovered) return "exact";
     const current = await transport.readFile(containedArtifactPath(targetRoot, source.path));
     if (!mergeContributionAbsent(source.mergeRemoval, source.mergeStrategy, current)) {
       throw new Error(`Destination Fleet does not exactly cover or replace stale source merge contribution at ${source.path}.`);
     }
+    return "exact";
   }
+  throw new Error(`Unsupported ownership coverage at ${source.path}.`);
 }
 function contributionSelector(entry) {
   return entry.logicalSelector ?? `${entry.artifactType}/${entry.artifactName}`;
@@ -12935,7 +12948,7 @@ ownershipCommand.command("handoff").description("transfer one managed artifact b
   console.log(`Manifest revision: ${result.manifestRevision}`);
   console.log(`Owner: ${result.fromOwner} -> ${result.toOwner}`);
 });
-ownershipCommand.command("retire-stale").description("retire stale source-manifest ownership already covered by one Fleet manifest").requiredOption("--from-workspace-root <path>", "exact stale workspace owner root").requiredOption("--to-workspace-root <path>", "registered destination Fleet root").requiredOption("--source-state-key <key>", "exact source install-manifest state key").requiredOption("--fleet <id>", "registered destination Fleet").option("--adapter <adapter>", "built-in adapter").option("-i, --installation-type <type>", "installation type (for example local or user)").option("--adapter-config <path>", "adapter JSON/JSONC file").option("--adapter-module <path>", "local programmatic adapter module").option("--allow-adapter-code", "allow loading local adapter code", false).option("-t, --target-root <path>", "runtime/project root").option("--agent <name>", "named destination Fleet agent").option("--profile <name>", "destination Fleet profile resolving to one target").option("--plan-digest <sha256>", "reviewed plan digest; required with --apply").option("--expected-source-revision <sha256>", "reviewed source manifest revision; required with --apply").option("--expected-destination-revision <sha256>", "reviewed destination manifest revision; required with --apply").option("--expected-inventory-revision <sha256>", "reviewed runtime manifest inventory revision; required with --apply").option("--apply", "apply the exact reviewed metadata-only retirement", false).option("--json", "print the complete deterministic plan as JSON", false).action(async (options) => {
+ownershipCommand.command("retire-stale").description("retire stale source-manifest ownership already covered by one Fleet manifest").requiredOption("--from-workspace-root <path>", "exact stale workspace owner root").requiredOption("--to-workspace-root <path>", "registered destination Fleet root").requiredOption("--source-state-key <key>", "exact source install-manifest state key").requiredOption("--fleet <id>", "registered destination Fleet").option("--adapter <adapter>", "built-in adapter").option("-i, --installation-type <type>", "installation type (for example local or user)").option("--adapter-config <path>", "adapter JSON/JSONC file").option("--adapter-module <path>", "local programmatic adapter module").option("--allow-adapter-code", "allow loading local adapter code", false).option("-t, --target-root <path>", "runtime/project root").option("--agent <name>", "named destination Fleet agent").option("--profile <name>", "destination Fleet profile resolving to one target").option("--plan-digest <sha256>", "reviewed plan digest; required with --apply").option("--expected-source-revision <sha256>", "reviewed source manifest revision; required with --apply").option("--expected-destination-revision <sha256>", "reviewed destination manifest revision; required with --apply").option("--expected-inventory-revision <sha256>", "reviewed runtime manifest inventory revision; required with --apply").option("--abandon-incomplete-merge-owner", "explicitly retire incomplete legacy merge metadata without changing runtime bytes", false).option("--apply", "apply the exact reviewed metadata-only retirement", false).option("--json", "print the complete deterministic plan as JSON", false).action(async (options) => {
   const normalizedOptions = normalizeRuntimeScopeOptions(options);
   const fleet = await showRegisteredFleet(options.fleet);
   const toWorkspaceRoot = normalizeCliPath(options.toWorkspaceRoot);
@@ -12967,6 +12980,7 @@ ownershipCommand.command("retire-stale").description("retire stale source-manife
     expectedSourceRevision: options.expectedSourceRevision,
     expectedDestinationRevision: options.expectedDestinationRevision,
     expectedInventoryRevision: options.expectedInventoryRevision,
+    abandonIncompleteMergeOwner: options.abandonIncompleteMergeOwner,
     transport: transportForTarget(target)
   };
   const result = options.apply ? await applyRetireStaleOwnership(request) : await planRetireStaleOwnership(request);
@@ -12989,6 +13003,7 @@ ownershipCommand.command("retire-stale").description("retire stale source-manife
     ...options.adapterConfig ? ["--adapter-config", options.adapterConfig] : [],
     ...options.adapterModule ? ["--adapter-module", options.adapterModule] : [],
     ...options.allowAdapterCode ? ["--allow-adapter-code"] : [],
+    ...options.abandonIncompleteMergeOwner ? ["--abandon-incomplete-merge-owner"] : [],
     "--plan-digest",
     result.planDigest,
     "--expected-source-revision",

package/openpack.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 2,
   "name": "NestDevLab/agentwheel",
-  "version": "0.20.2",
+  "version": "0.20.3",
   "provides": [
     { "type": "skills", "path": "skills" }
   ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentwheel",
-  "version": "0.20.2",
+  "version": "0.20.3",
   "description": "Weave skills, rules, and instructions across every AI agent.",
   "type": "module",
   "license": "MIT",

package/skills/agentwheel/SKILL.md

@@ -5,7 +5,7 @@ allowed-tools: [Bash]
 license: MIT
 metadata:
   author: NestDevLab
-  version: "0.20.2"
+  version: "0.20.3"
 ---
 
 # agentwheel

package/skills/agentwheel-discovery/SKILL.md

@@ -5,7 +5,7 @@ allowed-tools: [Bash]
 license: MIT
 metadata:
   author: NestDevLab
-  version: "0.20.2"
+  version: "0.20.3"
 ---
 
 # Agentwheel Discovery