amalgm 0.1.186 → 0.1.187

package/package.json

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

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/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));