amalgm 0.1.188 → 0.1.189

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amalgm",
-  "version": "0.1.188",
+  "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/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/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;