@danieljvdm/dev-kit 0.7.0 → 0.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danieljvdm/dev-kit",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "private": false,
   "description": "Declarative project development toolkit with portable agent skills.",
   "license": "MIT",

package/src/path-digest.ts

@@ -27,6 +27,7 @@ const textEncoder = new TextEncoder();
 // Git preserves only the executable distinction for regular files. Canonicalizing
 // the remaining bits keeps digests stable across checkout and copy umasks.
 const canonicalFileMode = (mode: number): number => ((mode & 0o111) === 0 ? 0o644 : 0o755);
+const rawFileMode = (mode: number): number => mode & 0o777;
 
 const frame = (value: string | Uint8Array): Uint8Array => {
   const bytes = typeof value === "string" ? textEncoder.encode(value) : value;
@@ -75,6 +76,7 @@ const digestFrames = Effect.fn("digestPathFrames")(function* (
 
 const digestFileSystemPath = Effect.fn("digestFileSystemPath")(function* (
   absolutePath: string,
+  fileMode: (mode: number) => number,
 ): Effect.fn.Return<
   ObservedPath,
   PlatformError.PlatformError | PathInspectionError,
@@ -107,7 +109,7 @@ const digestFileSystemPath = Effect.fn("digestFileSystemPath")(function* (
       kind: "file",
       digest: yield* digestFrames([
         "file-v1",
-        String(canonicalFileMode(info.mode)),
+        String(fileMode(info.mode)),
         yield* fs.readFile(absolutePath),
       ]),
     };
@@ -119,7 +121,7 @@ const digestFileSystemPath = Effect.fn("digestFileSystemPath")(function* (
 
     for (const entry of entries) {
       const childPath = path.join(absolutePath, entry);
-      const child = yield* digestFileSystemPath(childPath);
+      const child = yield* digestFileSystemPath(childPath, fileMode);
 
       if (child.kind === "missing") {
         return yield* new PathInspectionError({
@@ -142,7 +144,19 @@ const digestFileSystemPath = Effect.fn("digestFileSystemPath")(function* (
 });
 
 export const observePath = Effect.fn("observeManagedPath")(function* (absolutePath: string) {
-  return yield* digestFileSystemPath(absolutePath).pipe(
+  return yield* digestFileSystemPath(absolutePath, canonicalFileMode).pipe(
+    Effect.mapError((cause) =>
+      cause instanceof PathInspectionError
+        ? cause
+        : new PathInspectionError({ path: absolutePath, operation: "inspect", cause }),
+    ),
+  );
+});
+
+export const observePathWithRawModes = Effect.fn("observeManagedPathWithRawModes")(function* (
+  absolutePath: string,
+) {
+  return yield* digestFileSystemPath(absolutePath, rawFileMode).pipe(
     Effect.mapError((cause) =>
       cause instanceof PathInspectionError
         ? cause

package/src/sync.ts

@@ -23,6 +23,7 @@ import {
   digestSymlinkTarget,
   digestText,
   observePath,
+  observePathWithRawModes,
   type ObservedPath,
 } from "./path-digest.ts";
 import { readDirectDependencyNames } from "./project-package.ts";
@@ -430,6 +431,27 @@ const outputIdentity = (output: ManagedOutput) =>
       : { sourcePath: output.sourcePath }),
   });
 
+const outputOwnershipIdentity = (output: ManagedOutput) =>
+  JSON.stringify({
+    resourceId: output.resourceId,
+    path: output.path,
+    mode: output.mode,
+    kind: output.kind,
+    ...("skill" in output
+      ? { skill: output.skill, target: output.target }
+      : { sourcePath: output.sourcePath }),
+  });
+
+const usesRawFileModeDigests = (toolVersion: string): boolean => {
+  const match = /^(\d+)\.(\d+)\./.exec(toolVersion);
+
+  if (match === null) return false;
+  const major = Number(match[1]);
+  const minor = Number(match[2]);
+
+  return major === 0 && minor <= 6;
+};
+
 const validateInventory = Effect.fn("validateManagedInventory")(function* (
   projectDir: string,
   outputs: ReadonlyArray<ManagedOutput | OwnershipReceipt>,
@@ -743,12 +765,31 @@ const planDesiredOutputs = Effect.fn("planDesiredSkillOutputs")(function* (
     const receipt = receiptsById.get(output.resourceId);
     const sameReceipt = receipt?.path === output.path ? receipt : undefined;
     const locked = lockById.get(output.resourceId);
-    const adoptable = locked !== undefined && outputIdentity(locked) === outputIdentity(output);
+    const matchingLockedOutput =
+      locked !== undefined &&
+      outputOwnershipIdentity(locked) === outputOwnershipIdentity(output) &&
+      observed.kind === locked.kind
+        ? locked
+        : undefined;
+    const rawModeObservation =
+      matchingLockedOutput !== undefined &&
+      observed.kind !== "missing" &&
+      observed.digest !== matchingLockedOutput.digest &&
+      currentLock !== undefined &&
+      usesRawFileModeDigests(currentLock.toolVersion)
+        ? yield* observePathWithRawModes(output.destination)
+        : undefined;
+    const lockedOwnsObserved =
+      matchingLockedOutput !== undefined &&
+      observed.kind !== "missing" &&
+      (observed.digest === matchingLockedOutput.digest ||
+        (rawModeObservation?.kind === matchingLockedOutput.kind &&
+          rawModeObservation.digest === matchingLockedOutput.digest));
 
     if (observed.kind === "missing") {
       actions.push({ action: "create", desired: output, observed });
     } else if (observed.kind === output.kind && observed.digest === output.digest) {
-      if (sameReceipt || adoptable || ("adoptIfExact" in output && output.adoptIfExact)) {
+      if (sameReceipt || lockedOwnsObserved || ("adoptIfExact" in output && output.adoptIfExact)) {
         actions.push({ action: "unchanged", desired: output, observed, adopted: !sameReceipt });
       } else {
         actions.push({
@@ -758,9 +799,10 @@ const planDesiredOutputs = Effect.fn("planDesiredSkillOutputs")(function* (
         });
       }
     } else if (
-      sameReceipt &&
-      observed.kind === sameReceipt.kind &&
-      observed.digest === sameReceipt.digest
+      (sameReceipt !== undefined &&
+        observed.kind === sameReceipt.kind &&
+        observed.digest === sameReceipt.digest) ||
+      lockedOwnsObserved
     ) {
       actions.push({ action: "update", desired: output, observed });
     } else {