agentwheel 0.19.4 → 0.19.5

package/dist/index.js

@@ -1712,7 +1712,7 @@ function hasMergeRemovalContent(removal) {
 async function mergeRemovalForInstall(sourcePath, strategy, currentContent, options = {}) {
   const source = await readMergeSource(sourcePath, strategy);
   if (currentContent === void 0) return source;
-  if (options.adoptExistingMcp) {
+  if (options.adoptExisting) {
     if (strategy === "codex-toml-mcp") {
       const mismatched = mismatchedCodexTomlMcpServers(source, currentContent);
       if (mismatched.length > 0) {
@@ -1720,10 +1720,8 @@ async function mergeRemovalForInstall(sourcePath, strategy, currentContent, opti
       }
       return source;
     }
-    if (strategy !== "json-deep") {
-      throw new MergeAdoptionMismatchError(`cannot adopt merged contribution: strategy ${strategy} is not supported for MCP adoption`);
-    }
-    const mismatch = firstMcpContributionMismatch(parseMergeDestination(currentContent, strategy), source);
+    const current = parseMergeDestination(currentContent, strategy);
+    const mismatch = options.adoptExisting === "mcp" ? firstMcpContributionMismatch(current, source) : firstMergeContributionMismatch(current, source);
     if (mismatch) {
       throw new MergeAdoptionMismatchError(`cannot adopt merged contribution: destination differs or is missing at ${mismatch}`);
     }
@@ -4015,10 +4013,12 @@ async function createPlanFromOperations(desiredOps, adapter, targetRoot, manifes
         }
       }
       const incompleteMergeOwnership = existing2 && existing2.mergeStrategy && !("mergeCreatedDestination" in existing2 && existing2.mergeCreatedDestination === true) && !("mergeRemoval" in existing2 && hasMergeRemovalContent(existing2.mergeRemoval));
-      const adoptExisting = exists2 && (!existing2 || incompleteMergeOwnership) && options.forceConflict === true && op.artifactType === "mcp" && (op.mergeStrategy === "json-deep" || op.mergeStrategy === "codex-toml-mcp");
+      const adoptExisting = exists2 && (!existing2 || incompleteMergeOwnership) && options.forceConflict === true;
       let mergeRemoval;
       try {
-        mergeRemoval = await mergeRemovalForInstall(op.sourcePath, op.mergeStrategy, currentContent, { adoptExistingMcp: adoptExisting });
+        mergeRemoval = await mergeRemovalForInstall(op.sourcePath, op.mergeStrategy, currentContent, {
+          adoptExisting: adoptExisting ? op.artifactType === "mcp" ? "mcp" : "generic" : void 0
+        });
       } catch (error) {
         if (!(error instanceof MergeAdoptionMismatchError)) throw error;
         operations.push({

package/openpack.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentwheel",
-  "version": "0.19.4",
+  "version": "0.19.5",
   "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.19.4"
+  version: "0.19.5"
 ---
 
 # agentwheel

package/skills/agentwheel-discovery/SKILL.md

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