amalgm 0.1.220 → 0.1.221

package/package.json

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

@@ -903,6 +903,37 @@ test('the materializer creates, moves, and deletes branch refs without checking
   assert.equal((await git(repo, 'branch', '--show-current')).trim(), 'main');
 });
 
+test('an unpublished local branch delete is not restored while catching up', async () => {
+  const { repo, oid } = await makeRepo('pending-branch-delete');
+  await git(repo, 'switch', '-c', 'feature');
+  fs.writeFileSync(path.join(repo, 'feature.txt'), 'feature\n');
+  await git(repo, 'add', '.');
+  await git(repo, 'commit', '-m', 'feature');
+  const featureOid = (await git(repo, 'rev-parse', 'HEAD')).trim();
+  await git(repo, 'switch', 'main');
+  await git(repo, 'branch', '-D', 'feature');
+
+  const localCard = card(repo, oid, 1);
+  const plan = {
+    repoKey: 'root:pending-branch-delete',
+    card: localCard,
+    transitions: [],
+    parked: [],
+    branches: [
+      { name: 'main', oid, version: 1 },
+      { name: 'feature', oid: featureOid, version: 2 },
+    ],
+  };
+  await materializeRepo(localCard, plan);
+  assert.equal((await git(repo, 'rev-parse', 'refs/heads/feature')).trim(), featureOid);
+
+  await git(repo, 'branch', '-D', 'feature');
+  await materializeRepo(localCard, plan);
+
+  await assert.rejects(() => git(repo, 'rev-parse', 'refs/heads/feature'));
+  assert.equal((await git(repo, 'branch', '--show-current')).trim(), 'main');
+});
+
 test('a card branch switch follows branch and OID together and leaves the old branch unchanged', async () => {
   const { repo, oid: mainOid } = await makeRepo('card-branch-switch');
   await git(repo, 'checkout', '-b', 'feature');

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

@@ -427,9 +427,11 @@ async function materializeParked(localCard, entries) {
   return waiting;
 }
 
-async function materializeBranches(localCard, plan) {
+async function materializeBranches(localCard, plan, heldBranches = []) {
   const current = new Map((await localBranches(localCard.path)).map((ref) => [ref.name, ref.oid]));
+  const held = new Map(heldBranches.map((ref) => [ref.name, ref.oid]));
   const waiting = [];
+  const pending = [];
   let moved = false;
   for (const ref of plan.branches || []) {
     if (ref.name === plan.card.head?.branch) {
@@ -438,6 +440,12 @@ async function materializeBranches(localCard, plan) {
       }
       continue;
     }
+    const currentOid = current.get(ref.name) || null;
+    const heldOid = held.get(ref.name) || null;
+    if (currentOid !== heldOid && currentOid !== ref.oid) {
+      pending.push({ name: ref.name, oid: currentOid });
+      continue;
+    }
     if (ref.oid === null) {
       if (current.has(ref.name)) {
         await transition.deleteBranchRef(localCard.path, ref.name);
@@ -468,7 +476,7 @@ async function materializeBranches(localCard, plan) {
       moved = true;
     }
   }
-  return { moved, waiting };
+  return { moved, waiting, pending };
 }
 
 async function reduceCheckpoint(localCard, plan) {
@@ -599,7 +607,7 @@ async function materializeRepo(localCardInput, plan, appliedThrough = null) {
   if (requiredParkedWaiting.length > 0) {
     return { state: 'waiting', reason: `parked-${requiredParkedWaiting[0].state}` };
   }
-  const branchResult = await materializeBranches(localCard, plan);
+  const branchResult = await materializeBranches(localCard, plan, previous?.branches);
   const reduced = await reduceCheckpoint(localCard, plan);
   if (reduced.state !== 'ready') return reduced;
 
@@ -702,6 +710,7 @@ async function materializeRepo(localCardInput, plan, appliedThrough = null) {
     worktreeDiff: stateWorktreeDiff,
     checkpointVersions: plan.transitions.map((entry) => entry.version),
     branches: plan.branches || [],
+    pendingRefs: branchResult.pending,
     heldTree: applied.heldTree,
     heldIndexTree: targetIndex,
     parked,