amalgm 0.1.241 → 0.1.242

package/package.json

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

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

@@ -2,6 +2,7 @@
 
 const test = require('node:test');
 const assert = require('node:assert/strict');
+const crypto = require('crypto');
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
@@ -284,3 +285,44 @@ test('failed uploads yield the bulk lane to later durable objects', () => {
   acknowledgeUpload(third.resourceId, third.sha256);
   assert.equal(claimUpload(), null);
 });
+
+test('legacy shared-resource uploads can terminate without starving current projects', () => {
+  const legacyResourceId = 'shr_legacyobjectqueue0001';
+  const legacyBytes = Buffer.from('stale object from a legacy rail');
+  const legacyDigest = crypto.createHash('sha256').update(legacyBytes).digest('hex');
+  const objectRoot = path.join(process.env.AMALGM_DIR, 'state', 'repo-objects');
+  const manifests = path.join(objectRoot, 'manifests');
+  const chunks = path.join(objectRoot, 'chunks');
+  fs.writeFileSync(path.join(chunks, `${legacyDigest}.bin`), legacyBytes);
+  fs.writeFileSync(path.join(manifests, '000-legacy-shared-resource.json'), JSON.stringify({
+    contract: 'git-bundle-chunks@2',
+    resourceId: legacyResourceId,
+    repoKey: 'legacy-repo',
+    oid: '1'.repeat(40),
+    ref: `refs/amalgm/exports/${'1'.repeat(40)}`,
+    checksum: locatorChecksum([{ sha256: legacyDigest, bytes: legacyBytes.length }]),
+    bytes: legacyBytes.length,
+    chunks: [{ sha256: legacyDigest, bytes: legacyBytes.length, uploaded: false }],
+    createdAt: new Date().toISOString(),
+  }));
+
+  assert.equal(
+    publishPayload('current-after-legacy', Buffer.from('current project object'), REPO_KEY).kind,
+    'pending',
+  );
+  const legacy = claimUpload();
+  assert.equal(legacy.resourceId, legacyResourceId);
+  assert.equal(legacy.sha256, legacyDigest);
+  const terminal = failUpload(legacy.resourceId, legacy.sha256, {
+    retryable: false,
+    code: 'shared_resource_read_forbidden',
+    message: 'the legacy rail is no longer readable',
+  });
+  assert.equal(terminal.changed, true);
+  assert.equal(terminal.terminal, true);
+
+  const current = claimUpload();
+  assert.equal(current.resourceId, PROJECT);
+  assert.notEqual(current.sha256, legacy.sha256);
+  acknowledgeUpload(current.resourceId, current.sha256);
+});

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

@@ -13,6 +13,7 @@ const crypto = require('crypto');
 const fs = require('fs');
 const path = require('path');
 const { AMALGM_DIR } = require('../config');
+const { isSharedResourceId } = require('../state/cloud-resource-id');
 const { appendStateEvent } = require('../state/events');
 const durable = require('./durable');
 const transition = require('./transition');
@@ -288,7 +289,11 @@ function acknowledgeUpload(resourceId, digest) {
 }
 
 function failUpload(resourceId, digest, failure = {}) {
-  if (!isProjectId(resourceId) || !/^[0-9a-f]{64}$/.test(String(digest || ''))) {
+  // Upload work is durable across protocol generations. Match the exact
+  // identity that was accepted when the work was queued, including legacy
+  // `shr_` rails, so stale historical work can reach a terminal state instead
+  // of monopolizing every newer code project behind it.
+  if (!isSharedResourceId(resourceId) || !/^[0-9a-f]{64}$/.test(String(digest || ''))) {
     return { changed: false, terminal: false };
   }
   ensureDirs();