amalgm 0.1.213 → 0.1.214

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amalgm",
-  "version": "0.1.213",
+  "version": "0.1.214",
   "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

@@ -507,6 +507,21 @@ test('a losing commit is parked, the winning card lands exactly, and losing work
   assert.equal(fs.readFileSync(path.join(repo, 'local-dirty.txt'), 'utf8'), 'also uncommitted\n');
   assert.equal((await git(repo, 'status', '--porcelain')).trim().length > 0, true);
   assert.deepEqual(readRepoState('root:test').parked.map((entry) => entry.oid), [losingOid]);
+
+  await git(repo, 'add', '.');
+  await git(repo, 'commit', '-m', 'fold parked work');
+  const foldedOid = (await git(repo, 'rev-parse', 'HEAD')).trim();
+  const foldedCard = card(repo, foldedOid, 3);
+  const folded = await materializeRepo(foldedCard, {
+    repoKey: 'root:test',
+    card: foldedCard,
+    transitions: [],
+    parked: [],
+  });
+
+  assert.equal(folded.state, 'in-sync');
+  assert.deepEqual(readRepoState('root:test').parked, []);
+  assert.equal((await git(repo, 'rev-parse', `refs/amalgm/parked/${losingOid}`)).trim(), losingOid);
 });
 
 test('rail-parked peer commits become one staged checkpoint on every machine', async () => {

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

@@ -120,6 +120,15 @@ 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(local, remoteAdvance, baseline, {
+    checkpoint: 'repo-checkpoint@7',
+    machine: 'machine-a',
+    branch: 'main',
+    baseOid: oidA,
+    from: { revision: null, indexDiff: '', worktreeDiff: '' },
+    to: { revision: 'old-work', indexDiff: '', worktreeDiff: 'patch' },
+    parked: [],
+  }), false);
   assert.equal(hasLocalContribution(
     {
       head: { branch: 'main', oid: oidB, detached: false },

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

@@ -513,7 +513,6 @@ async function materializeRepo(localCardInput, plan) {
     : refreshed;
   const previous = readRepoState(plan.repoKey);
   const parked = uniqueParked([
-    ...(previous?.parked || []),
     ...(plan.parked || []),
     ...(cardResult.parked || []),
   ]);

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

@@ -260,7 +260,8 @@ function hasLocalContribution(card, plan, baseline, checkpoint = null, previousC
   }
 
   if (
-    checkpoint
+    onRail
+    && checkpoint
     && checkpoint.baseOid === card.head?.oid
     && checkpoint.branch === card.head?.branch
   ) {