agentwheel 0.20.0 → 0.20.2

package/dist/{apply-7HJQQOCI.js → apply-OGC6E2Y4.js}

@@ -2,14 +2,16 @@
 import {
   applyCombinedInstallPlan,
   applyInstallPlan,
+  commitManifestMetadataJournal,
   recoverPendingApply,
   uninstall
-} from "./chunk-USHT7FGV.js";
-import "./chunk-HOYIIUL5.js";
+} from "./chunk-BAJEWUI6.js";
+import "./chunk-Z4N7TB6Q.js";
 import "./chunk-7VPI5J5Y.js";
 export {
   applyCombinedInstallPlan,
   applyInstallPlan,
+  commitManifestMetadataJournal,
   recoverPendingApply,
   uninstall
 };

package/dist/{chunk-USHT7FGV.js → chunk-BAJEWUI6.js}

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import {
   acquireApplyLock,
+  applyJournalPath,
   artifactFormatSchema,
   artifactTypeSchema,
   assertApplyJournalRecoveryAllowed,
@@ -11,6 +12,7 @@ import {
   fileKindSchema,
   installManifestPath,
   installationTypeSchema,
+  listApplyJournals,
   localPathExists,
   localTransport,
   metadataDir,
@@ -22,7 +24,7 @@ import {
   rollbackCompletedOperations,
   sourceLockPath,
   writeApplyJournal
-} from "./chunk-HOYIIUL5.js";
+} from "./chunk-Z4N7TB6Q.js";
 import {
   pathExists,
   writeJsonAtomic
@@ -549,16 +551,15 @@ async function readInstallManifest(targetRoot, adapter, transport = localTranspo
 async function listInstallManifests(targetRoot, adapter, transport = localTransport) {
   const dir = metadataDir(targetRoot);
   const suffix = ".install-manifest.json";
-  const prefix = `${adapter}.`;
   const found = [];
   for (const fileName of await transport.listDir(dir)) {
     if (!fileName.endsWith(suffix)) continue;
     const stateKey = fileName.slice(0, -suffix.length);
-    if (stateKey !== adapter && !stateKey.startsWith(prefix)) continue;
     const path = join(dir, fileName);
     try {
       const raw = JSON.parse(await transport.readFile(path));
       const parsed = installManifestSchema.parse(raw);
+      if (parsed.adapter !== adapter) continue;
       found.push({ path, fileName, stateKey, manifest: { ...parsed, revision: computeManifestRevision(raw) } });
     } catch (error) {
       throw new Error(`Unreadable install manifest at ${path}: ${error instanceof Error ? error.message : String(error)}`);
@@ -566,6 +567,10 @@ async function listInstallManifests(targetRoot, adapter, transport = localTransp
   }
   return found.sort((a, b) => a.fileName.localeCompare(b.fileName));
 }
+async function computeInstallManifestInventoryRevision(targetRoot, adapter, transport = localTransport) {
+  const inventory = (await listInstallManifests(targetRoot, adapter, transport)).map((item) => [item.fileName, item.manifest.revision]);
+  return createHash2("sha256").update(JSON.stringify(inventory)).digest("hex");
+}
 async function writeInstallManifest(manifest, transport = localTransport) {
   const next = withManifestRevision(manifest);
   await transport.writeJsonAtomic(installManifestPath(next.targetRoot, next.adapter, {
@@ -1360,6 +1365,7 @@ async function recoverPendingApply(targetRoot, adapter, transport = localTranspo
   assertGovernedRuntimeTransportSupported(transport);
   const lock = await acquireApplyLock(targetRoot, adapter, transport, {}, scope);
   try {
+    await assertRuntimeJournalGate(targetRoot, adapter, transport, scope, true);
     const journal = await readApplyJournal(targetRoot, adapter, transport, scope);
     if (!journal) return void 0;
     assertApplyJournalRecoveryAllowed(journal);
@@ -1402,6 +1408,26 @@ async function recoverPendingApply(targetRoot, adapter, transport = localTranspo
     await lock.release();
   }
 }
+async function assertRuntimeJournalGate(targetRoot, adapter, transport, scope, allowRequestedJournal = false) {
+  const pending = await listApplyJournals(targetRoot, adapter, transport, {
+    installationType: scope.installationType
+  });
+  if (pending.length === 0) return;
+  const requestedPath = applyJournalPath(targetRoot, adapter, scope);
+  if (allowRequestedJournal && pending.length === 1 && pending[0].path === requestedPath) return;
+  throw new Error(
+    `Cannot mutate ${adapter}/${scope.installationType ?? "local"} at ${targetRoot} while runtime apply journal(s) are pending: ` + pending.map((item) => item.path).join(", ")
+  );
+}
+async function assertRuntimeStateRevision(plan, transport) {
+  if (!plan.runtimeStateRevision) return;
+  const current = await computeInstallManifestInventoryRevision(plan.targetRoot, plan.adapter, transport);
+  if (current !== plan.runtimeStateRevision) {
+    throw new Error(
+      `Runtime manifest inventory changed after planning: expected ${plan.runtimeStateRevision}, found ${current}; replan needed.`
+    );
+  }
+}
 async function applyPlanTransactionally(plan, options = {}) {
   const transport = options.transport ?? localTransport;
   const scope = { installationType: plan.installationType, stateKey: plan.stateKey };
@@ -1412,6 +1438,8 @@ async function applyPlanTransactionally(plan, options = {}) {
   assertGovernedRuntimeTransportSupported(transport);
   const lock = await acquireApplyLock(plan.targetRoot, plan.adapter, transport, options.lock, scope);
   try {
+    await assertRuntimeJournalGate(plan.targetRoot, plan.adapter, transport, scope);
+    await assertRuntimeStateRevision(plan, transport);
     await assertBaseRevision(plan, transport);
     const now = (/* @__PURE__ */ new Date()).toISOString();
     const graphLockDigest = options.graphLockDigest ?? plan.graphLockDigest;
@@ -1493,7 +1521,7 @@ async function uninstall(plan, options = {}) {
   const preserved = [...preservedKept, ...skipped].filter((operation) => operation.preserveInManifest !== false);
   for (const operation of [...removable, ...preserved]) assertOperationContained(operation, plan.targetRoot);
   const now = (/* @__PURE__ */ new Date()).toISOString();
-  const finalManifest = withManifestRevision({
+  let finalManifest = withManifestRevision({
     version: 2,
     adapter: plan.adapter,
     installationType: plan.installationType,
@@ -1517,8 +1545,25 @@ async function uninstall(plan, options = {}) {
   });
   const lock = await acquireApplyLock(plan.targetRoot, plan.adapter, transport, resolvedOptions.lock, scope);
   try {
+    await assertRuntimeJournalGate(plan.targetRoot, plan.adapter, transport, scope);
+    await assertRuntimeStateRevision(plan, transport);
     await assertBaseRevision(plan, transport);
     await assertExactMergeRemovalPreconditions(removable, transport);
+    const revalidatedSkips = /* @__PURE__ */ new Map();
+    for (const operation of skipped) {
+      const entry = await applyOperation(operation, {
+        transport,
+        now,
+        graphLockDigest: operation.graphLockDigest ?? plan.graphLockDigest
+      });
+      if (entry) revalidatedSkips.set(operation.relativeDestPath, entry);
+    }
+    if (revalidatedSkips.size > 0) {
+      finalManifest = withManifestRevision({
+        ...finalManifest,
+        entries: finalManifest.entries.map((entry) => revalidatedSkips.get(entry.path) ?? entry)
+      });
+    }
     const mutation = mutationMetadataForApplyJournal();
     const journal = {
       version: mutation ? 2 : 1,
@@ -1562,6 +1607,12 @@ function shouldPreserveKeptOperationWhenKeepingFiles(operation) {
 function isForceRemovableKeep(operation) {
   return operation.action === "keep" && operation.preserveInManifest !== true;
 }
+async function commitManifestMetadataJournal(journal, transport = localTransport) {
+  if (journal.mode !== "uninstall" || journal.operations.length !== 0) {
+    throw new Error("Manifest metadata journal must contain no runtime operations.");
+  }
+  return commitJournalState(journal, transport, void 0, journal.createdAt);
+}
 async function commitJournalState(journal, transport, entries, now) {
   const manifest = withManifestRevision({
     ...journal.manifest,
@@ -1724,9 +1775,33 @@ async function applyOperation(operation, context) {
     if (!operation.desiredHash) {
       throw new Error(`Invalid skip operation missing hash: ${operation.relativeDestPath}`);
     }
+    let verifiedCurrentHash = operation.currentHash;
+    if (operation.mode === managedInstructionBlockMode) {
+      const selector = managedInstructionSelector(operation.logicalSelector, operation.artifactType, operation.artifactName);
+      if (!await managedInstructionBlockLanded(operation.destPath, selector, operation.desiredHash, transport)) {
+        throw new Error(`Managed block changed after planning: ${operation.relativeDestPath}`);
+      }
+      verifiedCurrentHash = operation.desiredHash;
+    } else if (operation.mergeStrategy && hasMergeRemovalContent(operation.mergeRemoval)) {
+      if (!await transport.pathExists(operation.destPath)) {
+        throw new Error(`Merge skip destination disappeared after planning: ${operation.relativeDestPath}`);
+      }
+      assertExactMergeContribution(operation.mergeRemoval, operation.mergeStrategy, await transport.readFile(operation.destPath));
+      verifiedCurrentHash = await transport.hashPath(operation.destPath);
+    } else if (!operation.semanticPlugin && !operation.programmaticOperation) {
+      if (!await transport.pathExists(operation.destPath)) {
+        throw new Error(`Skip destination disappeared after planning: ${operation.relativeDestPath}`);
+      }
+      const currentHash = await transport.hashPath(operation.destPath);
+      const expectedHash = operation.currentHash ?? operation.desiredHash;
+      if (currentHash !== expectedHash) {
+        throw new Error(`Skip destination changed after planning: ${operation.relativeDestPath}`);
+      }
+      verifiedCurrentHash = currentHash;
+    }
     return manifestEntryForOperation(operation, {
       now,
-      hash: (operation.mergeStrategy || operation.mode === managedInstructionBlockMode) && operation.currentHash ? operation.currentHash : operation.desiredHash,
+      hash: (operation.mergeStrategy || operation.mode === managedInstructionBlockMode) && verifiedCurrentHash ? verifiedCurrentHash : operation.desiredHash,
       sourceHash: operation.desiredHash,
       graphLockDigest: context.graphLockDigest
     });
@@ -2210,6 +2285,7 @@ export {
   installManifestSchema,
   readInstallManifest,
   listInstallManifests,
+  computeInstallManifestInventoryRevision,
   writeInstallManifest,
   normalizeTargetRoot,
   withManifestRevision,
@@ -2221,6 +2297,7 @@ export {
   combineMergeRemovals,
   hasMergeRemovalContent,
   mergeRemovalForInstall,
+  mergeContributionAbsent,
   normalizeOwners,
   managedInstructionBlockMode,
   desiredManagedInstructionBlockHash,
@@ -2231,5 +2308,6 @@ export {
   applyInstallPlan,
   applyCombinedInstallPlan,
   recoverPendingApply,
-  uninstall
+  uninstall,
+  commitManifestMetadataJournal
 };

package/dist/{chunk-HOYIIUL5.js → chunk-Z4N7TB6Q.js}

@@ -344,7 +344,7 @@ var targetRegistryInputSchema = z2.union([
   targetRegistrySchema
 ]);
 var adapterSchema = z2.object({
-  name: z2.string().min(1),
+  name: z2.string().regex(/^[a-z0-9][a-z0-9._-]*$/i, "adapter name must be a canonical path-safe identifier"),
   displayName: z2.string().min(1).optional(),
   targets: z2.partialRecord(
     artifactTypeSchema,
@@ -460,6 +460,7 @@ function metadataDir(targetRoot) {
   return join(targetRoot, ".agentwheel");
 }
 function stateKeyFor(adapter, scope = {}) {
+  assertPathSafeAdapterName(adapter);
   if (scope.stateKey) {
     const explicit = sanitizeStateKey(scope.stateKey);
     const adapterScoped = scope.fleetId && explicit !== adapter && !explicit.startsWith(`${adapter}.`) ? `${adapter}.${explicit}` : explicit;
@@ -470,6 +471,11 @@ function stateKeyFor(adapter, scope = {}) {
   const fingerprint = scope.targetFingerprint ? `.${scope.targetFingerprint}` : "";
   return sanitizeStateKey(`${adapter}.${installationType}${fingerprint}`);
 }
+function assertPathSafeAdapterName(adapter) {
+  if (!/^[a-z0-9][a-z0-9._-]*$/i.test(adapter)) {
+    throw new Error(`Adapter name '${adapter}' is not a canonical path-safe identifier.`);
+  }
+}
 function installManifestPath(targetRoot, adapter, scope = {}) {
   return join(metadataDir(targetRoot), `${stateKeyFor(adapter, scope)}.install-manifest.json`);
 }
@@ -2618,8 +2624,8 @@ async function recoverMutationRuntime(operationId, options = {}) {
     }
     mutation = GovernedMutation.activateExisting(receipt, baseline, lock);
     const [{ recoverPendingApply }, { readLinkedLocalApplyJournal: readLinkedLocalApplyJournal2, removeApplyJournal: removeApplyJournal2, localPathExists: localPathExists2 }] = await Promise.all([
-      import("./apply-7HJQQOCI.js"),
-      import("./transaction-IM5MZS4B.js")
+      import("./apply-OGC6E2Y4.js"),
+      import("./transaction-7CNV5MAQ.js")
     ]);
     let missingReservation = false;
     for (const entry of pending) {
@@ -2782,7 +2788,8 @@ function upsertRuntimeJournal(entries, link2, status) {
 
 // src/install/transaction.ts
 function applyLockPath(targetRoot, adapter, scope = {}) {
-  return join6(metadataDir(targetRoot), `${stateKeyFor(adapter, scope)}.apply-lock`);
+  const installationType = scope.installationType ?? "local";
+  return join6(metadataDir(targetRoot), `${stateKeyFor(adapter, { installationType })}.runtime-apply-lock`);
 }
 function applyJournalPath(targetRoot, adapter, scope = {}) {
   return join6(metadataDir(targetRoot), `${stateKeyFor(adapter, scope)}.apply-journal.json`);
@@ -2850,6 +2857,30 @@ async function readApplyJournal(targetRoot, adapter, transport = localTransport,
   if (!await transport.pathExists(path)) return void 0;
   return parseApplyJournal(JSON.parse(await transport.readFile(path)));
 }
+async function listApplyJournals(targetRoot, adapter, transport = localTransport, scope = {}) {
+  const installationType = scope.installationType ?? "local";
+  const suffix = ".apply-journal.json";
+  const found = [];
+  for (const fileName of await transport.listDir(metadataDir(targetRoot))) {
+    if (!fileName.endsWith(suffix)) continue;
+    const path = join6(metadataDir(targetRoot), fileName);
+    const journal = parseApplyJournal(JSON.parse(await transport.readFile(path)));
+    if (journal.adapter !== adapter || (journal.installationType ?? "local") !== installationType) continue;
+    found.push({ path, journal });
+  }
+  return found.sort((a, b) => a.path.localeCompare(b.path));
+}
+async function listAllApplyJournals(targetRoot, adapter, transport = localTransport) {
+  const suffix = ".apply-journal.json";
+  const found = [];
+  for (const fileName of await transport.listDir(metadataDir(targetRoot))) {
+    if (!fileName.endsWith(suffix)) continue;
+    const path = join6(metadataDir(targetRoot), fileName);
+    const journal = parseApplyJournal(JSON.parse(await transport.readFile(path)));
+    if (journal.adapter === adapter) found.push({ path, journal });
+  }
+  return found.sort((a, b) => a.path.localeCompare(b.path));
+}
 async function readLinkedLocalApplyJournal(path, operationId, expectedDigest, expectedTransportDescription) {
   const absolutePath = resolve9(path);
   const journal = parseApplyJournal(JSON.parse(await readFile7(absolutePath, "utf8")));
@@ -3129,6 +3160,8 @@ export {
   acquireApplyLock,
   writeApplyJournal,
   readApplyJournal,
+  listApplyJournals,
+  listAllApplyJournals,
   readLinkedLocalApplyJournal,
   removeApplyJournal,
   abortApplyJournal,