amalgm 0.1.186 → 0.1.188

package/package.json

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

package/runtime/scripts/amalgm-mcp/state/docs.js

@@ -341,7 +341,7 @@ function commitDocMutation(Y, entry, { mutationId, update, bytes }, source) {
     localResource: entry.resource,
     sharedResourceId: replica?.resourceId,
     mutationId,
-    deviceId: replica ? process.env.AMALGM_DEVICE_ID : null,
+    deviceId: replica ? require('../workspace/identity').machineId() : null,
     authorityEpoch: replica?.authorityEpoch || 0,
     baseCloudVersion: replica?.appliedVersion || 0,
     contract: replica?.contract || 'text-yjs@1',

package/runtime/scripts/amalgm-mcp/state/promotions.js

@@ -248,7 +248,7 @@ function acknowledgePromotion(promotionIdInput, acknowledgement, options = {}) {
     `).run(
       `resource:${replica.resourceId}`,
       replica.resourceId,
-      process.env.AMALGM_DEVICE_ID || null,
+      require('../workspace/identity').machineId(),
       replica.authorityEpoch,
       replica.snapshotVersion,
       now,

package/runtime/scripts/amalgm-mcp/tests/state-shared-replica.test.js

@@ -8,6 +8,7 @@ const path = require('path');
 
 const tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'amalgm-shared-replica-test-'));
 process.env.AMALGM_DIR = path.join(tempRoot, '.amalgm');
+process.env.AMALGM_COMPUTER_ID = 'computer-shared-replica-test';
 process.env.AMALGM_DEVICE_ID = 'device-shared-replica-test';
 process.env.AMALGM_EVENT_LOG_PRUNE_INTERVAL_MS = '0';
 
@@ -142,6 +143,10 @@ test('batched surface edits retain separate IDs/versions and recipient file prec
     'mut_shared_batch_001',
     'mut_shared_batch_002',
   ]);
+  assert.deepEqual(claims.map((claim) => claim.envelope.deviceId), [
+    process.env.AMALGM_COMPUTER_ID,
+    process.env.AMALGM_COMPUTER_ID,
+  ]);
   acknowledgeCloudMutation(resourceId, 'mut_shared_batch_001', {
     version: 1,
     committedAt: '2026-07-14T20:00:00.000Z',
@@ -378,7 +383,7 @@ test('edits journaled during the promotion window are re-homed into the outbox',
   assert.equal(rehomed.sharedResourceId, fenceResourceId);
   assert.equal(rehomed.authorityEpoch, 1);
   assert.equal(rehomed.baseCloudVersion, 0);
-  assert.equal(rehomed.deviceId, process.env.AMALGM_DEVICE_ID);
+  assert.equal(rehomed.deviceId, process.env.AMALGM_COMPUTER_ID);
   const claims = claimCloudMutations().filter((claim) => claim.envelope.resourceId === fenceResourceId);
   assert.deepEqual(claims.map((claim) => claim.envelope.mutationId), ['mut_during_promotion1']);
 });

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

@@ -116,6 +116,34 @@ test('wall reduction chooses one rail winner and orders checkpoint transitions b
   assert.deepEqual(plan.transitions.map((item) => item.version), [8]);
 });
 
+test('a ready parked bundle never regresses to pending', () => {
+  const oid = 'c'.repeat(40);
+  const ready = card('/ready', 'a'.repeat(40), 1);
+  const readyCheckpoint = transition('machine-ready', 2, ready.head.oid, '', '');
+  readyCheckpoint.parked = [{
+    oid,
+    ref: `refs/amalgm/parked/${oid}`,
+    objects: { kind: 'bundle', checksum: 'd'.repeat(64) },
+  }];
+  ready.checkpoints = [readyCheckpoint];
+
+  const pending = card('/pending', ready.head.oid, 3);
+  const pendingCheckpoint = transition('machine-pending', 4, pending.head.oid, '', '');
+  pendingCheckpoint.parked = [{
+    oid,
+    ref: `refs/amalgm/parked/${oid}`,
+    objects: { kind: 'pending' },
+  }];
+  pending.checkpoints = [pendingCheckpoint];
+
+  const plan = reduceWall([
+    { machine: 'machine-ready', cards: [ready] },
+    { machine: 'machine-pending', cards: [pending] },
+  ]).get('root:test');
+  assert.equal(plan.parked.length, 1);
+  assert.equal(plan.parked[0].objects.kind, 'bundle');
+});
+
 test('a stale lower rail card cannot roll back a newer branch and commit', () => {
   const newer = card('/newer', 'b'.repeat(40), 12);
   newer.head.branch = 'feature';

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

@@ -128,7 +128,8 @@ test('a repo project carries exactly one line per machine, replaced in place', a
     committedAt: '2026-07-23T00:00:00.000Z',
   });
   const sealed = publishWall(repoKey);
-  assert.equal(sealed.published, true);
+  assert.equal(sealed.published, false);
+  assert.equal(sealed.reason, 'unchanged');
   const sealedCard = readWall(repoKey)[0].cards[0];
   assert.equal(sealedCard.positionMutationId, first.mutationId);
   assert.equal(sealedCard.positionVersion, 1);
@@ -176,7 +177,7 @@ test('checkpoint transitions append until the next card and carry their official
     committedAt: '2026-07-23T00:00:02.000Z',
   });
   assert.equal(readWall(repoKey)[0].cards[0].checkpoints[0].version, 2);
-  assert.equal(publishWall(repoKey).published, true);
+  assert.equal(publishWall(repoKey).published, false);
 
   fs.writeFileSync(file, `${JSON.stringify({
     ...firstCheckpoint,

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

@@ -124,6 +124,7 @@ function reduceWall(entries) {
         && entry.branch === repo.card.head?.branch
       ))
       .sort((left, right) => left.version - right.version);
+    repo.parked = uniqueParked(repo.parked);
     if (repo.card.head?.branch) {
       const held = repo.branchMap.get(repo.card.head.branch);
       if (!held || repo.card.positionVersion > held.version) {
@@ -146,7 +147,10 @@ function uniqueParked(entries) {
   const byOid = new Map();
   for (const entry of entries || []) {
     if (typeof entry?.oid === 'string' && /^[0-9a-f]{40,64}$/.test(entry.oid)) {
-      byOid.set(entry.oid, entry);
+      const held = byOid.get(entry.oid);
+      if (!held || held.objects?.kind !== 'bundle' || entry.objects?.kind === 'bundle') {
+        byOid.set(entry.oid, entry);
+      }
     }
   }
   return [...byOid.values()].sort((left, right) => left.oid.localeCompare(right.oid));

package/runtime/scripts/amalgm-mcp/workspace/tree-store.js

@@ -372,7 +372,7 @@ function commitTreeOperation(input, options = {}) {
     localResource,
     sharedResourceId: replica?.resourceId,
     mutationId,
-    deviceId: replica ? process.env.AMALGM_DEVICE_ID : null,
+    deviceId: replica ? require('./identity').machineId() : null,
     authorityEpoch: replica?.authorityEpoch || 0,
     baseCloudVersion: replica?.appliedVersion || 0,
     contract: 'workspace-tree@1',

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

@@ -249,15 +249,11 @@ function stampBranches(refs, previousBranches, mutationId, resourceId) {
       && before.mutationId
       && (validVersion(before.version) || knownMutation(resourceId, before.mutationId));
     const mutation = reusable ? before.mutationId : mutationId;
-    const version = reusable
-      ? (validVersion(before.version) ? before.version : officialVersion(resourceId, mutation))
-      : null;
     return {
       name,
       oid,
       ...(observed?.objects ? { objects: observed.objects } : {}),
       mutationId: mutation,
-      ...(validVersion(version) ? { version } : {}),
     };
   });
 }
@@ -294,15 +290,8 @@ function stampCards(cards, previousCards, mutationId, project) {
       && (
         validVersion(previous.positionVersion)
         || knownMutation(project.resourceId, previous.positionMutationId)
-      );
+    );
     const positionMutationId = reusablePosition ? previous.positionMutationId : mutationId;
-    const positionVersion = reusablePosition
-      ? (
-        validVersion(previous.positionVersion)
-          ? previous.positionVersion
-          : officialVersion(project.resourceId, positionMutationId)
-      )
-      : null;
     const checkpoint = readCheckpoint(machineId(), project.repoKey);
     const currentCheckpoint = checkpoint
       && checkpoint.baseOid === card.head?.oid
@@ -312,12 +301,7 @@ function stampCards(cards, previousCards, mutationId, project) {
     const sameBase = previous?.head?.oid === card.head?.oid
       && previous?.head?.branch === card.head?.branch;
     const history = sameBase && Array.isArray(previous?.checkpoints)
-      ? previous.checkpoints.map((entry) => {
-        const version = validVersion(entry.version)
-          ? entry.version
-          : officialVersion(project.resourceId, entry.mutationId);
-        return validVersion(version) ? { ...entry, version } : entry;
-      })
+      ? previous.checkpoints.map(({ version: _version, ...entry }) => entry)
       : [];
     const last = history.at(-1);
     const checkpoints = currentCheckpoint
@@ -328,7 +312,6 @@ function stampCards(cards, previousCards, mutationId, project) {
     return {
       ...sharedCard(card),
       positionMutationId,
-      ...(validVersion(positionVersion) ? { positionVersion } : {}),
       branches: stampBranches(
         card.refs,
         sameBase ? previous?.branches : [],