@amalgm/shell 0.1.143 → 0.1.145

package/dist/user-ground-host.js

@@ -3,7 +3,7 @@ import { existsSync, lstatSync, realpathSync, readFileSync, readdirSync, readlin
 import { open, readFile } from "node:fs/promises";
 import { basename, dirname, extname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { buildUserHomeManifest, buildUserManifest, liveMachineStateDir, scopedAmalgmDir, shippedUserHomeDeclaration, } from "@amalgm/core/identity";
-import { CHUNK_BYTES, CONTENT_CONTRACT, INLINE_CARGO_MAX_BYTES, ENTITY_CLOUD_CONTRACT, ENTITY_CLOUD_SCHEMA_VERSION, artifactForRecord, canonicalVersion, checkContentManifest, classifyDirectory, classifyFile, classifyRegisteredRoot, containedRecords, createLocalEntityRecord, createEntityRecordAuthorityPort, convergeUserGround, decodeAcceptedEntityRecord, deriveUploadManifest, createUserGroundEnrollmentPolicy, isRepositoryMetadataEntry, indexRepositoryTerritory, downloadAll as downloadAllArtifacts, encodeEntityRecord, EntityApplyRail, EntityRecordRail, membershipHash, materializedSlotNames, pathIsSuspect, CONTENT_REFS_BATCH_OBJECTS, privateEntityResourceId, repositoryIdentityHash, sameRecords, snapshotFromRecords, stableJson, streamCargo, travelingRecords, upload as uploadArtifact, userGroundRecords, GRAPH_HEAD_OPERATION_KIND, } from "@amalgm/live";
+import { CHUNK_BYTES, CONTENT_CONTRACT, INLINE_CARGO_MAX_BYTES, ENTITY_CLOUD_CONTRACT, ENTITY_CLOUD_SCHEMA_VERSION, artifactForRecord, canonicalVersion, checkContentManifest, classifyDirectory, classifyFile, classifyRegisteredRoot, containedRecords, createLocalEntityRecord, createEntityRecordAuthorityPort, convergeUserGround, decodeAcceptedEntityRecord, deriveUploadManifest, createUserGroundEnrollmentPolicy, isRepositoryMetadataEntry, indexRepositoryTerritory, downloadAll as downloadAllArtifacts, encodeEntityRecord, EntityApplyRail, EntityRecordRail, membershipHash, materializedSlotNames, pathIsSuspect, CONTENT_REFS_BATCH_OBJECTS, privateEntityResourceId, repositoryIdentityHash, sameRecords, snapshotFromRecords, stableJson, streamCargo, travelingRecords, upload as uploadArtifact, userGroundRecords, portableFileMode, GRAPH_HEAD_OPERATION_KIND, } from "@amalgm/live";
 import Database from "better-sqlite3";
 import { atomicCopy, atomicWrite, ensurePrivateDir, ensureUserDir } from "./filesystem.js";
 import { emitFilesStage, } from "./files-observability.js";
@@ -945,7 +945,7 @@ export class UserGroundHost {
         // seal inventory; an older gateway cannot say which sealed artifacts are
         // packed, and this shell plans pack-span downloads and repacks against
         // exactly that answer.
-        if (this.wire.protocolVersion < 16) {
+        if (this.wire.protocolVersion < 17) {
             throw new Error("gateway speaks an older wire protocol than this shell");
         }
         this.adoptCloudDeliveryBaseline(identity, this.cloudState.deliveryWatermark);
@@ -2614,7 +2614,7 @@ export class UserGroundHost {
         for (const frame of answers) {
             if (!Array.isArray(frame.sealed) || !Array.isArray(frame.packed)) {
                 throw new Error("content authority answered a seal inventory without "
-                    + "placement; protocol 16 requires the gateway to deploy before this machine");
+                    + "placement; protocol 17 requires the gateway to deploy before this machine");
             }
             for (const hash of frame.sealed)
                 sealed.add(String(hash));
@@ -3998,6 +3998,7 @@ function portableRecord(row) {
         status: row.status,
         version: row.version,
         payloadVersion: derived ? null : row.payloadVersion,
+        fileMode: portableFileMode(row.type, row.filesystemMode),
         transportVersion: derived ? null : row.transportVersion,
     };
 }
@@ -4021,11 +4022,18 @@ function coreGroundRecords(file, userEmail) {
       )
       SELECT uuid, type, parent_uuid AS parentUUID, name, status, version,
              payload_version AS payloadVersion,
+             filesystem_mode AS filesystemMode,
              transport_version AS transportVersion
         FROM entities WHERE uuid IN (SELECT uuid FROM core) ORDER BY uuid
-    `).all(userEmail).map((record) => (record.type === "workspace" || record.type === "folder"
-            ? { ...record, payloadVersion: null, transportVersion: null }
-            : record));
+    `).all(userEmail).map(({ filesystemMode, ...record }) => {
+            const derived = record.type === "workspace" || record.type === "folder";
+            return {
+                ...record,
+                payloadVersion: derived ? null : record.payloadVersion,
+                fileMode: portableFileMode(record.type, filesystemMode),
+                transportVersion: derived ? null : record.transportVersion,
+            };
+        });
     }
     finally {
         database.close();
@@ -5112,6 +5120,7 @@ async function reconcileRoot(input) {
     const existingVersionByUuid = new Map(existingRows.map((row) => [row.uuid, row]));
     const rowsFromEntries = () => entries.map((entry) => {
         const container = entry.type === "workspace" || entry.type === "folder";
+        const fileMode = portableFileMode(entry.type, entry.filesystemMode);
         const stored = container ? undefined : existingVersionByUuid.get(entry.uuid);
         const storedVersion = stored !== undefined
             && stored.type === entry.type
@@ -5119,6 +5128,7 @@ async function reconcileRoot(input) {
             && stored.name === entry.name
             && stored.status === "active"
             && stored.payloadVersion === entry.payloadVersion
+            && portableFileMode(stored.type, stored.filesystemMode) === fileMode
             ? stored.version
             : null;
         const record = {
@@ -5135,8 +5145,10 @@ async function reconcileRoot(input) {
                 payloadVersion: container
                     ? membershipHash(children.get(entry.uuid) ?? [], sha256Hex)
                     : entry.payloadVersion,
+                fileMode,
             }, sha256Hex),
             payloadVersion: entry.payloadVersion,
+            fileMode,
             transportVersion: entry.transportVersion,
         };
         return {
@@ -5880,9 +5892,12 @@ async function materializeRecords(input) {
             // transport is never its final worktree. Ordinary file bytes are
             // the cold Add's mass, and they land exactly once.
             if (stagedDestinations && record.type !== "link") {
+                if (record.fileMode === null) {
+                    throw new Error(`cloud ordinary file ${record.uuid} has no portable mode`);
+                }
                 const destination = destinationOf(paths.get(record.uuid));
                 const list = stagedDestinations.get(artifact.contentHash) ?? [];
-                list.push(destination);
+                list.push({ path: destination, fileMode: record.fileMode });
                 stagedDestinations.set(artifact.contentHash, list);
             }
         }
@@ -5890,8 +5905,9 @@ async function materializeRecords(input) {
     if (stagedDestinations) {
         // A deterministic primary destination keeps resume evidence valid: the
         // same first path receives the stream on every attempt.
-        for (const list of stagedDestinations.values())
-            list.sort();
+        for (const list of stagedDestinations.values()) {
+            list.sort((left, right) => left.path < right.path ? -1 : left.path > right.path ? 1 : 0);
+        }
     }
     const contentStarted = performance.now();
     const fileContent = await readContent([...wanted.values()], staged && stagedDestinations
@@ -6095,9 +6111,7 @@ async function materializeRecords(input) {
                     throw new Error(`cloud materialization conflicts with ${relativePath}`);
                 }
                 ensureUserDir(dirname(destination));
-                // Mode is not portable state: a fresh user file gets 0644, the same
-                // default Apply gives a fresh target, never the cache's private 0600.
-                atomicCopy(local.file, destination, 0o644);
+                atomicCopy(local.file, destination, record.fileMode);
             }
         }
         else {