amalgm 0.1.184 → 0.1.185

package/package.json

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

@@ -309,6 +309,41 @@ test('one materializer converges to the reduced checkpoint and later removes a r
   assert.equal(fs.readFileSync(path.join(repo, 'b.txt'), 'utf8'), 'b1\n');
 });
 
+test('a mode-only checkpoint makes the peer working file executable', async () => {
+  const { repo, oid } = await makeRepo('materialize-mode');
+  fs.chmodSync(path.join(repo, 'a.txt'), 0o755);
+  const modePatch = await git(repo, 'diff', 'HEAD', '--binary', '--full-index');
+  await git(repo, 'reset', '--hard', 'HEAD');
+  const localCard = card(repo, oid, 1);
+  const clean = { revision: null, indexDiff: '', worktreeDiff: '' };
+  const executable = {
+    revision: revisionOf(oid, '', modePatch),
+    indexDiff: '',
+    worktreeDiff: modePatch,
+  };
+  const plan = {
+    repoKey: 'root:test',
+    card: localCard,
+    transitions: [{
+      checkpoint: CHECKPOINT_CONTRACT,
+      machine: 'machine-remote',
+      repoKey: 'root:test',
+      branch: 'main',
+      baseOid: oid,
+      from: clean,
+      to: executable,
+      version: 2,
+      mutationId: 'mut_mode_only_02',
+    }],
+  };
+
+  const outcome = await materializeRepo(localCard, plan);
+  assert.equal(outcome.state, 'in-sync');
+  assert.notEqual(fs.statSync(path.join(repo, 'a.txt')).mode & 0o100, 0);
+  assert.match(await git(repo, 'diff', '--binary', '--full-index'), /new mode 100755/);
+  assert.equal(await git(repo, 'diff', '--cached', '--binary', '--full-index'), '');
+});
+
 test('once local work is on the rail, a checkpoint conflict materializes exactly without echoing', async () => {
   const { repo, oid } = await makeRepo('materialize-conflict');
   const localPatch = await patchFor(repo, { 'a.txt': 'local answer\n' });

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

@@ -166,7 +166,9 @@ function workMatches(work, entry, blobBytes) {
   if (!entry) return work === null;
   if (work === null) return false;
   if (entry.mode === '120000') return work.kind === 'symlink' && work.content.equals(blobBytes);
-  return work.kind === 'file' && work.content.equals(blobBytes);
+  return work.kind === 'file'
+    && work.exec === (entry.mode === '100755')
+    && work.content.equals(blobBytes);
 }
 
 function isText(buffer) {