amalgm 0.1.207 → 0.1.209

package/lib/shared-realtime-tunnel.js

@@ -17,6 +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 = 15_000;
 
 function createSharedRealtimeTunnel({
   send,
@@ -24,6 +25,7 @@ function createSharedRealtimeTunnel({
   localPort,
   localHeaders,
   warn,
+  repoObjectRequestTimeoutMs = REPO_OBJECT_REQUEST_TIMEOUT_MS,
 }) {
   const mutationInflight = new Map();
   const promotionInflight = new Map();
@@ -277,8 +279,17 @@ function createSharedRealtimeTunnel({
     repoObjectTimer.unref?.();
   }
 
+  function expireRepoObjectRequests(now = Date.now()) {
+    for (const inflight of [repoUploadInflight, repoDownloadInflight]) {
+      for (const [requestId, object] of inflight) {
+        if (now - object.sentAt >= repoObjectRequestTimeoutMs) inflight.delete(requestId);
+      }
+    }
+  }
+
   async function drainRepoObjects() {
     if (!enabled) return;
+    expireRepoObjectRequests();
     if (repoUploadInflight.size === 0) {
       const result = await localStateJson('POST', '/state/repo-objects/uploads/claim', {});
       const upload = result?.upload;
@@ -295,6 +306,7 @@ function createSharedRealtimeTunnel({
           repoUploadInflight.set(requestId, {
             resourceId: upload.resourceId,
             sha256: upload.sha256,
+            sentAt: Date.now(),
           });
         }
       }
@@ -313,6 +325,7 @@ function createSharedRealtimeTunnel({
           repoDownloadInflight.set(requestId, {
             resourceId: download.resourceId,
             sha256: download.sha256,
+            sentAt: Date.now(),
           });
         }
       }
@@ -462,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.207",
+  "version": "0.1.209",
   "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

@@ -122,3 +122,70 @@ test('repo object chunks travel through the shared tunnel one at a time', async
     server.close();
   }
 });
+
+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', () => {
+      res.setHeader('content-type', 'application/json');
+      if (req.url === '/state/shared/replicas') {
+        res.end('{"replicas":[]}');
+      } else if (req.url.startsWith('/state/stream')) {
+        res.writeHead(200, { 'content-type': 'text/event-stream' });
+        res.write('\n');
+      } else if (req.url === '/state/repo-objects/uploads/claim') {
+        res.end(JSON.stringify({
+          upload: {
+            resourceId,
+            sha256: uploadSha,
+            bytes: uploadBytes.length,
+            dataBase64: uploadBytes.toString('base64'),
+          },
+        }));
+      } 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('{}');
+      }
+    });
+  });
+  await new Promise((resolve) => { server.listen(0, '127.0.0.1', resolve); });
+
+  const frames = [];
+  const tunnel = createSharedRealtimeTunnel({
+    send: (frame) => { frames.push(frame); return true; },
+    sendLarge: (frame) => { frames.push(frame); return true; },
+    localPort: () => server.address().port,
+    localHeaders: (headers) => headers,
+    warn: () => {},
+    repoObjectRequestTimeoutMs: 25,
+  });
+
+  try {
+    tunnel.enable(['shared.mutation.v1']);
+    await until(
+      () => frames.filter((frame) => frame.type === 'repo.object.put').length >= 2,
+      'the unacknowledged upload retry',
+    );
+    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

@@ -120,6 +120,52 @@ test('only a value different from both the materialized baseline and the rail is
     branches: [{ name: 'main', oid: oidC }],
   };
   assert.equal(hasLocalContribution(local, remoteAdvance, baseline), false);
+  assert.equal(hasLocalContribution(
+    {
+      head: { branch: 'main', oid: oidB, detached: false },
+      refs: [{ name: 'main', oid: oidB }],
+    },
+    remoteAdvance,
+    {
+      branch: 'main',
+      baseOid: oidB,
+      branches: [{ name: 'main', oid: oidB }],
+    },
+    null,
+    {
+      head: { branch: 'main', oid: oidA, detached: false },
+      branches: [{ name: 'main', oid: oidA }],
+    },
+  ), false);
+  assert.equal(hasLocalContribution(
+    {
+      head: { branch: 'main', oid: oidB, detached: false },
+      refs: [{ name: 'main', oid: oidB }],
+    },
+    remoteAdvance,
+    baseline,
+    null,
+    {
+      head: { branch: 'main', oid: oidB, detached: false },
+      branches: [{ name: 'main', oid: oidB }],
+    },
+  ), false);
+  assert.equal(hasLocalContribution(
+    local,
+    plan,
+    {
+      ...baseline,
+      branches: [...baseline.branches, { name: 'feature', oid: null }],
+    },
+    null,
+    {
+      head: { branch: 'main', oid: oidA, detached: false },
+      branches: [
+        { name: 'main', oid: oidA },
+        { name: 'feature', oid: oidB },
+      ],
+    },
+  ), true);
   assert.equal(hasLocalContribution(local, plan, baseline, {
     checkpoint: 'repo-checkpoint@7',
     machine: 'machine-a',

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

@@ -231,7 +231,11 @@ 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 = previousCard && samePosition(card, previousCard);
+  const reversesPublishedSharedPosition = previousCard
+    && samePosition(previousCard, plan.card)
+    && !alreadyPublished;
+  if ((!onRail && !atBaseline && !alreadyPublished) || reversesPublishedSharedPosition) return true;
 
   const currentRefs = oidMap(card.refs);
   const railRefs = oidMap(plan.branches);
@@ -245,11 +249,15 @@ 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 changedFromPublished = previousRefs.has(name)
-      && current !== (previousRefs.get(name) ?? null);
+    const published = previousRefs.get(name) ?? null;
+    const matchesBaseline = baselineRefs.has(name) && current === previous;
+    const matchesPublished = previousRefs.has(name) && current === published;
+    const reversesPublishedSharedValue = previousRefs.has(name)
+      && published === shared
+      && current !== published;
     if (
       current !== shared
-      && (!baselineRefs.has(name) || current !== previous || changedFromPublished)
+      && ((!matchesBaseline && !matchesPublished) || reversesPublishedSharedValue)
     ) return true;
   }