agentwheel 0.19.3 → 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({
@@ -15076,7 +15076,7 @@ program.command("sync", { hidden: true }).argument("[name-or-source]", "configur
   console.error("warning: 'agentwheel sync' is deprecated and will be removed in 0.10. Use 'agentwheel install'.");
   await runInstallCommand(source, options, { apply: !options.dryRun });
 });
-program.command("update").description("re-resolve tracking packages, then apply the result").argument("[name]", "configured package name or source to update").option("--adapter <adapter>", "built-in adapter or comma-separated adapters").option("-i, --installation-type <type>", "installation type (for example local or user)").option("--user", "use the user workspace", false).option("--local", "use the nearest local workspace", false).option("--fleet <id>", "use one registered named fleet").option("-t, --target-root <path>", "workspace root").option("--agent <name>", "named agent from merged config").option("--all", "run for every configured agent", false).option("--profile <name>", "workspace runtime profile").option("--dry-run", "show plans without writing", false).option("--force-drift", "replace drifted managed artifacts", false).option("--force-foreign-state", "plan even when another workspace owns install state at the same paths", false).option("--force-conflict", "adopt unmanaged destinations when their content already matches the desired artifact", false).option("--replace-conflict", "replace unmanaged destinations even when their content differs", false).option("--execute-plugins", "execute semantic plugin installs", false).option("--reload-runtimes", "run configured runtime reload commands after executed semantic plugin changes", false).option("--restart-runtimes", "alias for --reload-runtimes", false).option("--allow-adapter-code", "allow loading local adapter code from configured packages", false).option("--select <type/name>", "temporarily select an artifact by type/name (repeatable or comma-separated)", collectSelectOption, []).option("--skill <name>", "temporarily select a skill by name (repeatable or comma-separated)", collectSkillOption, []).option("--dependency <name-or-source>", "update one tracking dependency while keeping unrelated graph nodes locked (repeatable)", collectDependencyOption, []).option("--with-suggestions", "include suggested companion artifacts for selected roots", false).option("--suggestion <alias>", "include one suggested companion alias (repeatable or comma-separated)", collectSuggestionOption, []).option("--no-deps", "resolve only root sources and ignore requires with a warning").option("--only-source", "exclude unrelated configured workspace packages", false).option("--frozen-lock", "resolve strictly from the existing graph lock and cached sources", false).option("--offline", "resolve strictly from graph locks and local caches", false).option("--refresh", "refresh available package versions even when the version-index TTL is fresh", false).option("--yes", "trust all new transitive sources", false).option("--trust <pattern>", "pre-approve a transitive source glob (repeatable)", collectTrustOption, []).action(async (name, options) => {
+program.command("update").description("re-resolve tracking packages, then apply the result").argument("[name]", "configured package name or source to update").option("--adapter <adapter>", "built-in adapter or comma-separated adapters").option("-i, --installation-type <type>", "installation type (for example local or user)").option("--user", "use the user workspace", false).option("--local", "use the nearest local workspace", false).option("--fleet <id>", "use one registered named fleet").option("-t, --target-root <path>", "workspace root").option("--agent <name>", "named agent from merged config").option("--all", "run for every configured agent", false).option("--profile <name>", "workspace runtime profile").option("--dry-run", "show plans without writing", false).option("--force-drift", "replace drifted managed artifacts", false).option("--force-foreign-state", "plan even when another workspace owns install state at the same paths", false).option("--force-conflict", "adopt unmanaged destinations when their content already matches the desired artifact", false).option("--replace-conflict", "replace unmanaged destinations even when their content differs", false).option("--execute-plugins", "execute semantic plugin installs", false).option("--reload-runtimes", "run configured runtime reload commands after executed semantic plugin changes", false).option("--restart-runtimes", "alias for --reload-runtimes", false).option("--allow-adapter-code", "allow loading local adapter code from configured packages", false).option("--select <type/name>", "temporarily select an artifact by type/name (repeatable or comma-separated)", collectSelectOption, []).option("--artifact <type/name>", "update only one configured artifact while preserving sibling state").option("--skill <name>", "temporarily select a skill by name (repeatable or comma-separated)", collectSkillOption, []).option("--dependency <name-or-source>", "update one tracking dependency while keeping unrelated graph nodes locked (repeatable)", collectDependencyOption, []).option("--with-suggestions", "include suggested companion artifacts for selected roots", false).option("--suggestion <alias>", "include one suggested companion alias (repeatable or comma-separated)", collectSuggestionOption, []).option("--no-deps", "resolve only root sources and ignore requires with a warning").option("--only-source", "exclude unrelated configured workspace packages", false).option("--frozen-lock", "resolve strictly from the existing graph lock and cached sources", false).option("--offline", "resolve strictly from graph locks and local caches", false).option("--refresh", "refresh available package versions even when the version-index TTL is fresh", false).option("--yes", "trust all new transitive sources", false).option("--trust <pattern>", "pre-approve a transitive source glob (repeatable)", collectTrustOption, []).action(async (name, options) => {
   if (options.onlySource && options.dependency.length > 0) throw new Error("--only-source cannot be combined with --dependency.");
   if (options.onlySource && !name) throw new Error("--only-source requires a configured package argument.");
   if (name && options.dependency.length > 0) throw new Error("A package argument cannot be combined with --dependency.");
@@ -15086,15 +15086,23 @@ program.command("update").description("re-resolve tracking packages, then apply
   if (options.dependency.length > 0 && (options.frozenLock || options.offline)) {
     throw new Error("--dependency cannot be combined with --frozen-lock or --offline.");
   }
+  if (options.artifact && !name) throw new Error("--artifact requires a configured package argument.");
+  if (options.artifact && (options.select.length > 0 || options.skill.length > 0 || options.dependency.length > 0)) {
+    throw new Error("--artifact cannot be combined with --select, --skill, or --dependency.");
+  }
+  const focusedSelector = options.artifact ? normalizeArtifactSelectors([options.artifact])?.[0] : void 0;
+  const focusedSeparator = focusedSelector?.indexOf("/") ?? -1;
+  const focusedArtifact = focusedSelector && focusedSeparator > 0 ? { type: focusedSelector.slice(0, focusedSeparator), name: focusedSelector.slice(focusedSeparator + 1) } : void 0;
   const normalizedOptions = normalizeRuntimeScopeOptions(options);
   const composite = await resolveSelectedCompositeProfile(normalizedOptions);
   if (composite) {
+    if (focusedArtifact) throw new Error("--artifact does not support composite profiles; select one concrete profile or agent.");
     await runCompositeUpdate(composite.workspaceRoot, composite.name, composite.profile, name, normalizedOptions);
     return;
   }
   const targets = await resolveCliTargets(normalizedOptions, { preferAllProfile: true });
   for (const target of targets) {
-    await runConfiguredGraphPackages(target, { ...normalizedOptions, scope: name }, { mode: "update" });
+    await runConfiguredGraphPackages(target, { ...normalizedOptions, scope: name, focusedArtifact }, { mode: "update" });
   }
 });
 program.command("skill").description("operate on configured skills").addCommand(
@@ -16144,7 +16152,7 @@ async function buildGraphPlansForTarget(target, source, options, behavior) {
       const state = installStateForTarget(group.target, adapter, group.adapterOptions, group.installationType);
       const manifest = await readInstallManifest(state.installRoot, adapter.name, transport, state);
       const scopedResult = targetOptions.focusedArtifact ? previousGroupLock ? scopeUpdatePlanToArtifact(result, scopedRootId, targetOptions.focusedArtifact, previousGroupLock, manifest) : scopeInstallPlanToArtifact(result, scopedRootId, targetOptions.focusedArtifact, manifest) : previousGroupLock ? scopeUpdatePlanToRoot(result, scopedRootId, previousGroupLock, manifest) : scopeInstallPlanToRoot(result, scopedRootId, manifest);
-      if (targetOptions.focusedArtifact && (targetOptions.forceForeignState !== true || group.target.fleetId)) {
+      if (targetOptions.focusedArtifact && targetOptions.forceForeignState !== true) {
         const focusedPaths = scopedResult.plan.operations.filter((operation) => operationMatchesFocusedArtifact(
           operation,
           targetOptions.focusedArtifact,

package/openpack.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentwheel",
-  "version": "0.19.3",
+  "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.3"
+  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.3"
+  version: "0.19.5"
 ---
 
 # Agentwheel Discovery