amalgm 0.1.187 → 0.1.189

package/package.json

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

package/runtime/scripts/amalgm-mcp/state/docs.js

@@ -341,7 +341,7 @@ function commitDocMutation(Y, entry, { mutationId, update, bytes }, source) {
     localResource: entry.resource,
     sharedResourceId: replica?.resourceId,
     mutationId,
-    deviceId: replica ? process.env.AMALGM_DEVICE_ID : null,
+    deviceId: replica ? require('../workspace/identity').machineId() : null,
     authorityEpoch: replica?.authorityEpoch || 0,
     baseCloudVersion: replica?.appliedVersion || 0,
     contract: replica?.contract || 'text-yjs@1',

package/runtime/scripts/amalgm-mcp/state/promotions.js

@@ -248,7 +248,7 @@ function acknowledgePromotion(promotionIdInput, acknowledgement, options = {}) {
     `).run(
       `resource:${replica.resourceId}`,
       replica.resourceId,
-      process.env.AMALGM_DEVICE_ID || null,
+      require('../workspace/identity').machineId(),
       replica.authorityEpoch,
       replica.snapshotVersion,
       now,

package/runtime/scripts/amalgm-mcp/tests/state-shared-replica.test.js

@@ -8,6 +8,7 @@ const path = require('path');
 
 const tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'amalgm-shared-replica-test-'));
 process.env.AMALGM_DIR = path.join(tempRoot, '.amalgm');
+process.env.AMALGM_COMPUTER_ID = 'computer-shared-replica-test';
 process.env.AMALGM_DEVICE_ID = 'device-shared-replica-test';
 process.env.AMALGM_EVENT_LOG_PRUNE_INTERVAL_MS = '0';
 
@@ -142,6 +143,10 @@ test('batched surface edits retain separate IDs/versions and recipient file prec
     'mut_shared_batch_001',
     'mut_shared_batch_002',
   ]);
+  assert.deepEqual(claims.map((claim) => claim.envelope.deviceId), [
+    process.env.AMALGM_COMPUTER_ID,
+    process.env.AMALGM_COMPUTER_ID,
+  ]);
   acknowledgeCloudMutation(resourceId, 'mut_shared_batch_001', {
     version: 1,
     committedAt: '2026-07-14T20:00:00.000Z',
@@ -378,7 +383,7 @@ test('edits journaled during the promotion window are re-homed into the outbox',
   assert.equal(rehomed.sharedResourceId, fenceResourceId);
   assert.equal(rehomed.authorityEpoch, 1);
   assert.equal(rehomed.baseCloudVersion, 0);
-  assert.equal(rehomed.deviceId, process.env.AMALGM_DEVICE_ID);
+  assert.equal(rehomed.deviceId, process.env.AMALGM_COMPUTER_ID);
   const claims = claimCloudMutations().filter((claim) => claim.envelope.resourceId === fenceResourceId);
   assert.deepEqual(claims.map((claim) => claim.envelope.mutationId), ['mut_during_promotion1']);
 });

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

@@ -341,6 +341,37 @@ test('the live service hears a commit through the git-dir doorbell', async () =>
   assert.ok(repoCardServiceStats().doorbellRings >= 1);
 });
 
+test('the live service hears nested branch creation and deletion', async () => {
+  const repo = await makeRepo('projects/belled-refs');
+  const projects = path.join(tempRoot, 'projects');
+  upsertWorkspace({ path: projects, name: 'Projects', source: 'computer' });
+  startRepoCardService();
+  await refreshRepoCards();
+  const branch = 'storm/nested-short';
+  const before = findCard(listRepoCards(), repo);
+
+  await run(repo, 'branch', branch);
+  let deadline = Date.now() + 5_000;
+  let created = findCard(listRepoCards(), repo);
+  while (!created.refs.some((ref) => ref.name === branch) && Date.now() < deadline) {
+    await new Promise((resolve) => setTimeout(resolve, 25));
+    created = findCard(listRepoCards(), repo);
+  }
+  assert.ok(created.refs.some((ref) => ref.name === branch));
+
+  await run(repo, 'branch', '-D', branch);
+  deadline = Date.now() + 5_000;
+  let deleted = findCard(listRepoCards(), repo);
+  while (deleted.refs.some((ref) => ref.name === branch) && Date.now() < deadline) {
+    await new Promise((resolve) => setTimeout(resolve, 25));
+    deleted = findCard(listRepoCards(), repo);
+  }
+  stopRepoCardService();
+
+  assert.equal(deleted.refs.some((ref) => ref.name === branch), false);
+  assert.equal(deleted.generation, before.generation + 2);
+});
+
 test('the live service hears an uncommitted nested edit without a polling pass', async () => {
   const repo = await makeRepo('projects/live-dirty');
   const projects = path.join(tempRoot, 'projects');

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

@@ -128,7 +128,8 @@ test('a repo project carries exactly one line per machine, replaced in place', a
     committedAt: '2026-07-23T00:00:00.000Z',
   });
   const sealed = publishWall(repoKey);
-  assert.equal(sealed.published, true);
+  assert.equal(sealed.published, false);
+  assert.equal(sealed.reason, 'unchanged');
   const sealedCard = readWall(repoKey)[0].cards[0];
   assert.equal(sealedCard.positionMutationId, first.mutationId);
   assert.equal(sealedCard.positionVersion, 1);
@@ -176,7 +177,7 @@ test('checkpoint transitions append until the next card and carry their official
     committedAt: '2026-07-23T00:00:02.000Z',
   });
   assert.equal(readWall(repoKey)[0].cards[0].checkpoints[0].version, 2);
-  assert.equal(publishWall(repoKey).published, true);
+  assert.equal(publishWall(repoKey).published, false);
 
   fs.writeFileSync(file, `${JSON.stringify({
     ...firstCheckpoint,

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

@@ -413,24 +413,49 @@ function ringDoorbell(replicaId) {
   bell.timer = setTimeout(() => {
     bell.timer = null;
     refreshRepoCard(replicaId)
-      .then(() => require('./checkpoint').publishCheckpoints(replicaId))
+      .then((card) => {
+        if (card) rebuildDoorbell(replicaId, card);
+        return require('./checkpoint').publishCheckpoints(replicaId);
+      })
       .catch((error) => console.warn('[RepoCards] doorbell refresh failed:', error.message));
   }, DOORBELL_QUIET_MS);
   bell.timer.unref?.();
 }
 
+function nestedDirectories(root) {
+  const directories = [];
+  const pending = [root];
+  while (pending.length > 0) {
+    const current = pending.pop();
+    let entries;
+    try {
+      entries = fs.readdirSync(current, { withFileTypes: true });
+    } catch {
+      continue;
+    }
+    directories.push(current);
+    for (const entry of entries) {
+      if (entry.isDirectory()) pending.push(path.join(current, entry.name));
+    }
+  }
+  return directories;
+}
+
 function watchGitDir(card) {
   const watchers = [];
   const ring = () => ringDoorbell(card.replica);
   // The git dir itself carries HEAD, index, and operation markers; logs/
   // carries the reflog, which moves on every commit, checkout, and reset.
   const common = card.commonGitDir || card.gitDir;
-  for (const dir of [
+  const direct = [
     card.gitDir,
     path.join(card.gitDir, 'logs'),
-    path.join(common, 'refs', 'heads'),
-    path.join(common, 'logs', 'refs', 'heads'),
-  ]) {
+  ];
+  const refDirectories = [
+    ...nestedDirectories(path.join(common, 'refs', 'heads')),
+    ...nestedDirectories(path.join(common, 'logs', 'refs', 'heads')),
+  ];
+  for (const dir of new Set([...direct, ...refDirectories])) {
     try {
       const watcher = fs.watch(dir, ring);
       watcher.on('error', () => watcher.close());
@@ -455,6 +480,14 @@ function watchGitDir(card) {
   return watchers;
 }
 
+function rebuildDoorbell(replicaId, card) {
+  const bell = service.doorbells.get(replicaId);
+  if (!bell) return;
+  const previous = bell.watchers;
+  bell.watchers = watchGitDir(card);
+  for (const watcher of previous) watcher.close();
+}
+
 function dropDoorbell(replicaId) {
   const bell = service.doorbells.get(replicaId);
   if (!bell) return;

package/runtime/scripts/amalgm-mcp/workspace/tree-store.js

@@ -372,7 +372,7 @@ function commitTreeOperation(input, options = {}) {
     localResource,
     sharedResourceId: replica?.resourceId,
     mutationId,
-    deviceId: replica ? process.env.AMALGM_DEVICE_ID : null,
+    deviceId: replica ? require('./identity').machineId() : null,
     authorityEpoch: replica?.authorityEpoch || 0,
     baseCloudVersion: replica?.appliedVersion || 0,
     contract: 'workspace-tree@1',

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

@@ -249,15 +249,11 @@ function stampBranches(refs, previousBranches, mutationId, resourceId) {
       && before.mutationId
       && (validVersion(before.version) || knownMutation(resourceId, before.mutationId));
     const mutation = reusable ? before.mutationId : mutationId;
-    const version = reusable
-      ? (validVersion(before.version) ? before.version : officialVersion(resourceId, mutation))
-      : null;
     return {
       name,
       oid,
       ...(observed?.objects ? { objects: observed.objects } : {}),
       mutationId: mutation,
-      ...(validVersion(version) ? { version } : {}),
     };
   });
 }
@@ -294,15 +290,8 @@ function stampCards(cards, previousCards, mutationId, project) {
       && (
         validVersion(previous.positionVersion)
         || knownMutation(project.resourceId, previous.positionMutationId)
-      );
+    );
     const positionMutationId = reusablePosition ? previous.positionMutationId : mutationId;
-    const positionVersion = reusablePosition
-      ? (
-        validVersion(previous.positionVersion)
-          ? previous.positionVersion
-          : officialVersion(project.resourceId, positionMutationId)
-      )
-      : null;
     const checkpoint = readCheckpoint(machineId(), project.repoKey);
     const currentCheckpoint = checkpoint
       && checkpoint.baseOid === card.head?.oid
@@ -312,12 +301,7 @@ function stampCards(cards, previousCards, mutationId, project) {
     const sameBase = previous?.head?.oid === card.head?.oid
       && previous?.head?.branch === card.head?.branch;
     const history = sameBase && Array.isArray(previous?.checkpoints)
-      ? previous.checkpoints.map((entry) => {
-        const version = validVersion(entry.version)
-          ? entry.version
-          : officialVersion(project.resourceId, entry.mutationId);
-        return validVersion(version) ? { ...entry, version } : entry;
-      })
+      ? previous.checkpoints.map(({ version: _version, ...entry }) => entry)
       : [];
     const last = history.at(-1);
     const checkpoints = currentCheckpoint
@@ -328,7 +312,6 @@ function stampCards(cards, previousCards, mutationId, project) {
     return {
       ...sharedCard(card),
       positionMutationId,
-      ...(validVersion(positionVersion) ? { positionVersion } : {}),
       branches: stampBranches(
         card.refs,
         sameBase ? previous?.branches : [],