amalgm 0.1.183 → 0.1.185

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amalgm",
-  "version": "0.1.183",
+  "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-checkpoint.test.js

@@ -164,7 +164,7 @@ test('checkpoint captures are local cache; their operations travel on the one wa
   assert.equal(first, checkpointFile('m1', 'https://github.com/a/b'));
   assert.notEqual(first, checkpointFile('m2', 'https://github.com/a/b'));
   assert.notEqual(first, checkpointFile('m1', 'https://github.com/a/c'));
-  assert.match(first, /repo-checkpoints-v6/);
+  assert.match(first, /repo-checkpoints-v7/);
 });
 
 test('an uploading checkpoint payload is not published as a transition', () => {

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

@@ -133,7 +133,7 @@ test('a stale lower rail card cannot roll back a newer branch and commit', () =>
 test('checkpoint reduction reads only the current rail contract', () => {
   const current = card('/current-contract', 'a'.repeat(40), 1);
   const stale = transition('machine-local', 2, current.head.oid, '', 'stale');
-  stale.checkpoint = 'repo-checkpoint@5';
+  stale.checkpoint = 'repo-checkpoint@6';
   current.checkpoints = [
     stale,
     transition('machine-local', 3, current.head.oid, '', 'current'),
@@ -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/tests/workspace-wall.test.js

@@ -155,7 +155,7 @@ test('checkpoint transitions append until the next card and carry their official
   const file = checkpointFile('machine-a', repoKey);
   fs.mkdirSync(path.dirname(file), { recursive: true });
   const firstCheckpoint = {
-    checkpoint: 'repo-checkpoint@6',
+    checkpoint: 'repo-checkpoint@7',
     machine: 'machine-a',
     repoKey,
     branch: card.head.branch,

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

@@ -25,7 +25,7 @@ const { machineId } = require('./identity');
 const { listRepoCards } = require('./cards');
 const { captureCheckpoint } = require('./git');
 
-const CHECKPOINT_CONTRACT = 'repo-checkpoint@6';
+const CHECKPOINT_CONTRACT = 'repo-checkpoint@7';
 const MAX_INLINE_DIFF_BYTES = 512 * 1024;
 const PUBLISH_QUIET_MS = 25;
 const RECONCILE_INTERVAL_MS = 30_000;
@@ -54,7 +54,7 @@ function checkpointFile(machine, repoKey) {
     .update(`${CHECKPOINT_CONTRACT}|${machine}|${repoKey}`)
     .digest('hex')
     .slice(0, 24);
-  return path.join(AMALGM_DIR, 'state', 'repo-checkpoints-v6', `${digest}.json`);
+  return path.join(AMALGM_DIR, 'state', 'repo-checkpoints-v7', `${digest}.json`);
 }
 
 function revisionOf(baseOid, indexDiff, worktreeDiff = '') {

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) {