agentwheel 0.19.6 → 0.19.8

package/dist/index.js

@@ -4132,7 +4132,8 @@ async function createPlanFromOperations(desiredOps, adapter, targetRoot, manifes
     const semanticPlugin = entry.semanticPlugin;
     const destPath = semanticPlugin ? targetRoot : join17(targetRoot, entry.path);
     if (!semanticPlugin && !await transport.pathExists(destPath)) continue;
-    const currentHash = semanticPlugin ? entry.hash : await currentEntryHash(entry, destPath, transport);
+    const inferredMode = semanticPlugin ? void 0 : await inferExactLegacyManagedInstructionMode(entry, destPath, transport);
+    const currentHash = semanticPlugin ? entry.hash : await currentEntryHash(entry, destPath, transport, inferredMode);
     if (workspaceOwner && !entryOwnedByWorkspace(entry, workspaceOwner)) {
       operations.push(keepForeignManifestEntryOperation(entry, targetRoot, workspaceOwner, void 0, currentHash));
       continue;
@@ -4154,7 +4155,7 @@ async function createPlanFromOperations(desiredOps, adapter, targetRoot, manifes
         semanticPlugin,
         execute: entry.executed,
         mergeStrategy: entry.mergeStrategy,
-        mode: entry.mode,
+        mode: entry.mode ?? inferredMode,
         composedFrom: entry.composedFrom,
         ...operationMetadataFromEntry(entry),
         ...options.forceDrift ? { action: "remove", reason: "force removing drifted stale managed destination", overrideDrift: true } : {}
@@ -4176,7 +4177,7 @@ async function createPlanFromOperations(desiredOps, adapter, targetRoot, manifes
         semanticPlugin,
         execute: entry.executed,
         mergeStrategy: entry.mergeStrategy,
-        mode: entry.mode,
+        mode: entry.mode ?? inferredMode,
         composedFrom: entry.composedFrom,
         ...operationMetadataFromEntry(entry)
       });
@@ -4361,12 +4362,19 @@ async function planManagedBlockOperation(op, manifestByPath, transport, options,
     reason: reasonWithComposedDiff("managed instruction source changed", op.composedFrom, existing.composedFrom)
   }];
 }
-async function currentEntryHash(entry, destPath, transport) {
-  if (entry.mode !== managedInstructionBlockMode) return transport.hashPath(destPath);
+async function currentEntryHash(entry, destPath, transport, mode = entry.mode) {
+  if (mode !== managedInstructionBlockMode) return transport.hashPath(destPath);
   const selector = managedInstructionSelector("logicalSelector" in entry ? entry.logicalSelector : void 0, entry.artifactType, entry.artifactName);
   const state = await readManagedInstructionBlockState(destPath, selector, transport);
   return state.hash;
 }
+async function inferExactLegacyManagedInstructionMode(entry, destPath, transport) {
+  if (entry.mode || entry.artifactType !== "instructions") return void 0;
+  const selector = managedInstructionSelector("logicalSelector" in entry ? entry.logicalSelector : void 0, entry.artifactType, entry.artifactName);
+  const state = await readManagedInstructionBlockState(destPath, selector, transport);
+  if (!state.hasBlock || state.drifted || state.hash !== entry.hash) return void 0;
+  return managedInstructionBlockMode;
+}
 async function canStrictlyAdoptLegacyEntry(entry, op, targetRoot, transport) {
   if (entry.artifactType !== op.artifactType || entry.artifactName !== op.artifactName) return false;
   if (!op.desiredHash || entry.sourceHash !== op.desiredHash) return false;
@@ -7361,6 +7369,7 @@ async function expandFile(file, packageRoot, appendEntries, artifactPaths, optio
   const expanded = await expandContent(raw, packageRoot, [owner], artifactPaths, options);
   let content = expanded.content;
   const composedFrom = [...expanded.composedFrom];
+  const appliedCompositionRules = /* @__PURE__ */ new Set();
   for (const external of appendEntries) {
     const { entry } = external;
     const included = await expandInclude(entry.include, external.packageRoot, external.artifactPaths, {
@@ -7371,6 +7380,12 @@ async function expandFile(file, packageRoot, appendEntries, artifactPaths, optio
       chain: [owner]
     });
     if (!included) continue;
+    if (external.deduplicate) {
+      const markerMode = entry.markers === false ? "plain" : "markers";
+      const identity = `${markerMode}\0${composedLineageKey(included.composedFrom)}`;
+      if (appliedCompositionRules.has(identity)) continue;
+      appliedCompositionRules.add(identity);
+    }
     content = `${content.trimEnd()}
 
 ${included.rendered}
@@ -7583,6 +7598,9 @@ function uniqueComposedFrom(entries) {
   const byKey = new Map(entries.map((entry) => [`${entry.selector}\0${entry.hash}`, entry]));
   return [...byKey.values()].sort((a, b) => `${a.selector}:${a.hash}`.localeCompare(`${b.selector}:${b.hash}`));
 }
+function composedLineageKey(entries) {
+  return entries.map((entry) => `${entry.selector}\0${entry.hash}`).sort((a, b) => a.localeCompare(b)).join("
");
+}
 function artifactKey(artifact) {
   return `${artifact.type}:${artifact.name}:${artifact.channel ?? "managed"}`;
 }
@@ -10062,14 +10080,16 @@ function matchingCompositionEntries(artifact, targetNodeId, runtime, rules) {
     if (rule.runtimes?.length && (!runtime || !rule.runtimes.includes(runtime))) continue;
     if (!globMatches(rule.target, selector) && !globMatches(rule.target, qualifiedSelector)) continue;
     if (rule.exclude?.some((pattern) => globMatches(pattern, selector) || globMatches(pattern, qualifiedSelector))) continue;
-    const key = `${candidate.ownerNodeId}\0${rule.include}`;
+    const markerMode = rule.markers === false ? "plain" : "markers";
+    const key = `${candidate.ownerNodeId}\0${rule.include}\0${markerMode}`;
     if (seen.has(key)) continue;
     seen.add(key);
     entries.push({
       entry: { include: rule.include, markers: rule.markers },
       packageRoot: candidate.packageRoot,
       artifactPaths: candidate.artifactPaths,
-      nodeId: candidate.ownerNodeId
+      nodeId: candidate.ownerNodeId,
+      deduplicate: true
     });
   }
   return entries;

package/openpack.json

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

package/package.json

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

package/skills/agentwheel-discovery/SKILL.md

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