amalgm 0.1.208 → 0.1.210

package/lib/shared-realtime-tunnel.js

@@ -17,7 +17,7 @@ const CLAIM_LIMIT = 16;
 const CLAIM_LEASE_MS = 30_000;
 const RETRY_MS = 1_000;
 const REAUTHORIZE_MS = 30_000;
-const REPO_OBJECT_REQUEST_TIMEOUT_MS = 2_000;
+const REPO_OBJECT_REQUEST_TIMEOUT_MS = 15_000;
 
 function createSharedRealtimeTunnel({
   send,
@@ -475,35 +475,45 @@ function createSharedRealtimeTunnel({
   }
 
   function handleRepoObjectStored(frame) {
-    const object = repoUploadInflight.get(frame.request_id);
+    const object = repoUploadInflight.get(frame.request_id)
+      || [...repoUploadInflight.values()].find((entry) => entry.sha256 === frame.sha256);
     if (!object || object.sha256 !== frame.sha256) return;
     void localStateJson('POST', '/state/repo-objects/uploads/ack', {
       resourceId: object.resourceId,
       sha256: object.sha256,
     })
       .then(() => {
-        repoUploadInflight.delete(frame.request_id);
+        for (const [requestId, entry] of repoUploadInflight) {
+          if (entry.sha256 === object.sha256) repoUploadInflight.delete(requestId);
+        }
         scheduleRepoObjects();
       })
       .catch(() => {
-        repoUploadInflight.delete(frame.request_id);
+        for (const [requestId, entry] of repoUploadInflight) {
+          if (entry.sha256 === object.sha256) repoUploadInflight.delete(requestId);
+        }
         scheduleRepoObjects(RETRY_MS);
       });
   }
 
   function handleRepoObjectData(frame) {
-    const object = repoDownloadInflight.get(frame.request_id);
+    const object = repoDownloadInflight.get(frame.request_id)
+      || [...repoDownloadInflight.values()].find((entry) => entry.sha256 === frame.sha256);
     if (!object || object.sha256 !== frame.sha256) return;
     void localStateJson('POST', '/state/repo-objects/downloads/receive', {
       resourceId: object.resourceId,
       sha256: object.sha256,
       dataBase64: frame.data_b64,
     }).then(() => {
-      repoDownloadInflight.delete(frame.request_id);
+      for (const [requestId, entry] of repoDownloadInflight) {
+        if (entry.sha256 === object.sha256) repoDownloadInflight.delete(requestId);
+      }
       scheduleRepoObjects();
     }).catch((error) => {
       warn(`repo object ${object.sha256} was not stored locally: ${error?.message || error}`);
-      repoDownloadInflight.delete(frame.request_id);
+      for (const [requestId, entry] of repoDownloadInflight) {
+        if (entry.sha256 === object.sha256) repoDownloadInflight.delete(requestId);
+      }
       scheduleRepoObjects(RETRY_MS);
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amalgm",
-  "version": "0.1.208",
+  "version": "0.1.210",
   "description": "Amalgm local computer runtime: login, MCP, chat, events, previews, and tunnels.",
   "license": "UNLICENSED",
   "private": false,

package/runtime/scripts/amalgm-mcp/tests/workspace-object-tunnel.test.js

@@ -127,6 +127,7 @@ test('repo object chunks retry when an acknowledgement is lost', async () => {
   const uploadBytes = Buffer.from('retry this content-addressed chunk');
   const uploadSha = crypto.createHash('sha256').update(uploadBytes).digest('hex');
   const resourceId = 'shr_cp1abcdefghijklmnopqrstuvwx';
+  let acknowledgements = 0;
   const server = http.createServer((req, res) => {
     req.resume();
     req.on('end', () => {
@@ -147,6 +148,9 @@ test('repo object chunks retry when an acknowledgement is lost', async () => {
         }));
       } else if (req.url === '/state/repo-objects/downloads/claim') {
         res.end('{"download":null}');
+      } else if (req.url === '/state/repo-objects/uploads/ack') {
+        acknowledgements += 1;
+        res.end('{"changed":true,"completed":true}');
       } else {
         res.end('{}');
       }
@@ -173,6 +177,13 @@ test('repo object chunks retry when an acknowledgement is lost', async () => {
     const puts = frames.filter((frame) => frame.type === 'repo.object.put');
     assert.notEqual(puts[0].request_id, puts[1].request_id);
     assert.equal(puts[0].sha256, puts[1].sha256);
+    tunnel.handleFrame({
+      type: 'repo.object.stored',
+      request_id: puts[0].request_id,
+      sha256: uploadSha,
+      bytes: uploadBytes.length,
+    });
+    await until(() => acknowledgements === 1, 'the late upload acknowledgement');
   } finally {
     tunnel.stop();
     server.close();

package/runtime/scripts/amalgm-mcp/tests/workspace-wall.test.js

@@ -137,6 +137,34 @@ test('only a value different from both the materialized baseline and the rail is
       branches: [{ name: 'main', oid: oidA }],
     },
   ), false);
+  assert.equal(hasLocalContribution(
+    {
+      head: { branch: 'main', oid: oidB, detached: false },
+      refs: [{ name: 'main', oid: oidB }],
+    },
+    remoteAdvance,
+    baseline,
+    null,
+    {
+      positionVersion: 10,
+      head: { branch: 'main', oid: oidB, detached: false },
+      branches: [{ name: 'main', oid: oidB, version: 10 }],
+    },
+  ), false);
+  assert.equal(hasLocalContribution(
+    {
+      head: { branch: 'main', oid: oidB, detached: false },
+      refs: [{ name: 'main', oid: oidB }],
+    },
+    remoteAdvance,
+    baseline,
+    null,
+    {
+      positionVersion: null,
+      head: { branch: 'main', oid: oidB, detached: false },
+      branches: [{ name: 'main', oid: oidB, version: null }],
+    },
+  ), true);
   assert.equal(hasLocalContribution(
     local,
     plan,
@@ -148,8 +176,8 @@ test('only a value different from both the materialized baseline and the rail is
     {
       head: { branch: 'main', oid: oidA, detached: false },
       branches: [
-        { name: 'main', oid: oidA },
-        { name: 'feature', oid: oidB },
+        { name: 'main', oid: oidA, version: 10 },
+        { name: 'feature', oid: oidB, version: 10 },
       ],
     },
   ), true);
@@ -272,6 +300,13 @@ test('a repo project appends immutable machine records', async () => {
   assert.equal(entries[0].cards[0].positionMutationId, first.mutationId);
   assert.equal(entries[0].cards[0].positionVersion, null);
   assert.equal(publishedCardFor(refreshed.cards[0]), null);
+  const awaitingNumber = publishWall(repoKey);
+  assert.equal(awaitingNumber.published, false);
+  assert.equal(awaitingNumber.reason, 'unchanged');
+  assert.equal(
+    require('../workspace/reducer').localCardMayMaterialize(null, awaitingNumber),
+    false,
+  );
 
   acknowledgeCloudMutation(project.resourceId, first.mutationId, {
     version: 1,

package/runtime/scripts/amalgm-mcp/workspace/wall.js

@@ -144,6 +144,27 @@ function parseWallLine(line) {
   }
 }
 
+function sealCardVersions(project, card) {
+  return {
+    ...card,
+    positionVersion: validVersion(card.positionVersion)
+      ? card.positionVersion
+      : officialVersion(project.resourceId, card.positionMutationId),
+    branches: (card.branches || []).map((ref) => ({
+      ...ref,
+      version: validVersion(ref.version)
+        ? ref.version
+        : officialVersion(project.resourceId, ref.mutationId),
+    })),
+    checkpoints: (card.checkpoints || []).map((checkpoint) => ({
+      ...checkpoint,
+      version: validVersion(checkpoint.version)
+        ? checkpoint.version
+        : officialVersion(project.resourceId, checkpoint.mutationId),
+    })),
+  };
+}
+
 function readProjectWall(project) {
   if (!fs.existsSync(project.file)) return [];
   const entries = new Map();
@@ -154,24 +175,7 @@ function readProjectWall(project) {
     entries.set(entry.machine, {
       ...entry,
       resourceId: project.resourceId,
-      cards: entry.cards.map((card) => ({
-        ...card,
-        positionVersion: validVersion(card.positionVersion)
-          ? card.positionVersion
-          : officialVersion(project.resourceId, card.positionMutationId),
-        branches: (card.branches || []).map((ref) => ({
-          ...ref,
-          version: validVersion(ref.version)
-            ? ref.version
-            : officialVersion(project.resourceId, ref.mutationId),
-        })),
-        checkpoints: (card.checkpoints || []).map((checkpoint) => ({
-          ...checkpoint,
-          version: validVersion(checkpoint.version)
-            ? checkpoint.version
-            : officialVersion(project.resourceId, checkpoint.mutationId),
-        })),
-      })),
+      cards: entry.cards.map((card) => sealCardVersions(project, card)),
     });
   }
   return [...entries.values()];
@@ -231,12 +235,20 @@ function hasLocalContribution(card, plan, baseline, checkpoint = null, previousC
   const atBaseline = baseline
     && card.head?.branch === baseline.branch
     && card.head?.oid === baseline.baseOid;
-  if (!onRail && !atBaseline) return true;
+  const alreadyPublished = validVersion(previousCard?.positionVersion)
+    && samePosition(card, previousCard);
+  const reversesPublishedSharedPosition = previousCard
+    && validVersion(previousCard.positionVersion)
+    && samePosition(previousCard, plan.card)
+    && !alreadyPublished;
+  if ((!onRail && !atBaseline && !alreadyPublished) || reversesPublishedSharedPosition) return true;
 
   const currentRefs = oidMap(card.refs);
   const railRefs = oidMap(plan.branches);
   const baselineRefs = oidMap(baseline?.branches);
-  const previousRefs = oidMap(previousCard?.branches || previousCard?.refs);
+  const previousRefs = new Map(
+    (previousCard?.branches || previousCard?.refs || []).map((ref) => [ref.name, ref]),
+  );
   for (const name of new Set([
     ...currentRefs.keys(),
     ...baselineRefs.keys(),
@@ -245,13 +257,16 @@ function hasLocalContribution(card, plan, baseline, checkpoint = null, previousC
     const current = currentRefs.get(name) ?? null;
     const shared = railRefs.get(name) ?? null;
     const previous = baselineRefs.get(name) ?? null;
-    const published = previousRefs.get(name) ?? null;
-    const reversesPublishedSharedValue = previousRefs.has(name)
+    const publishedRef = previousRefs.get(name);
+    const published = publishedRef?.oid ?? null;
+    const matchesBaseline = baselineRefs.has(name) && current === previous;
+    const matchesPublished = validVersion(publishedRef?.version) && current === published;
+    const reversesPublishedSharedValue = validVersion(publishedRef?.version)
       && published === shared
       && current !== published;
     if (
       current !== shared
-      && (!baselineRefs.has(name) || current !== previous || reversesPublishedSharedValue)
+      && ((!matchesBaseline && !matchesPublished) || reversesPublishedSharedValue)
     ) return true;
   }
 
@@ -513,12 +528,13 @@ function publishProject(project, rawCards) {
   const reducer = require('./reducer');
   const sharedPlan = reducer.reduceWall(readProjectWall(project)).get(project.repoKey);
   const baseline = reducer.readRepoState(project.repoKey);
-  const previousReplicas = new Set((previousEntry?.cards || []).map((card) => card.replica));
+  const previousCards = (previousEntry?.cards || []).map((card) => sealCardVersions(project, card));
+  const previousReplicas = new Set(previousCards.map((card) => card.replica));
   const currentReplicas = new Set(rawCards.map((card) => card.replica));
   const removed = [...previousReplicas].some((replica) => !currentReplicas.has(replica));
   const contributes = rawCards.some((card) => {
     const checkpoint = readCheckpoint(machineId(), project.repoKey);
-    const previousCard = previousEntry?.cards?.find((entry) => entry.replica === card.replica);
+    const previousCard = previousCards.find((entry) => entry.replica === card.replica);
     return hasLocalContribution(card, sharedPlan, baseline, checkpoint, previousCard)
       || hasObjectUpgrade(card, sharedPlan);
   });
@@ -529,7 +545,7 @@ function publishProject(project, rawCards) {
   const mutationId = `mut_project_${crypto.randomBytes(16).toString('base64url')}`;
   const cards = stampCards(
     rawCards,
-    previousEntry?.cards,
+    previousCards,
     sharedPlan,
     baseline,
     mutationId,