amalgm 0.1.238 → 0.1.240

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

@@ -52,7 +52,11 @@ function resolveAccess(nodeId, userIdInput, options = {}) {
   const database = options.database || openLocalDb();
   const userId = cleanUserId(userIdInput);
   const target = nodeRow(database, nodeId);
-  if (!target || target.purged_at || target.missing_at) return null;
+  // `missing_at` is a durable observation that the physical node disappeared;
+  // it does not erase the UUID or its inherited authority. Reconciliation must
+  // still be able to authorize and journal that offline deletion. Purge alone
+  // retires the identity.
+  if (!target || target.purged_at) return null;
   const parents = new Map(
     database.prepare('SELECT id, parent_id FROM workspace_nodes WHERE workspace_id = ?')
       .all(target.workspace_id)

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

@@ -23,7 +23,7 @@ const {
 } = require('./git');
 const { cacheRootCommit, machineId, replicaForGitDir } = require('./identity');
 
-const CARD_CONTRACT = 'repo-card@2';
+const CARD_CONTRACT = 'repo-card@3';
 
 // A transportable identity needs a dotted host: bare names resolve through
 // this machine's own config (ssh aliases, LAN names) and identify nothing
@@ -62,7 +62,6 @@ function cardKind(classified) {
 
 function reusableObjectSource(previousOid, currentOid, source, resourceId) {
   if (previousOid !== currentOid) return null;
-  if (source?.kind === 'remote') return source;
   return source?.kind === 'bundle' && source.resourceId === resourceId ? source : null;
 }
 
@@ -83,8 +82,9 @@ async function observeWorktree(classified, previousCard = null) {
   }
 
   const repoIdentity = remote === null ? null : remoteIdentity(remote);
-  const resourceId = repoIdentity
-    ? require('./wall').projectForRepo(repoIdentity)?.resourceId
+  const repoKey = repoIdentity || (anchor ? `root:${anchor}` : null);
+  const resourceId = repoKey
+    ? require('./wall').projectForPath(worktreeRoot)?.resourceId
     : null;
   const previous = previousCard?.replica === replica.replicaId
     && previousCard.repo?.remote === repoIdentity
@@ -93,10 +93,10 @@ async function observeWorktree(classified, previousCard = null) {
   const previousRefs = new Map((previous?.refs || []).map((ref) => [ref.name, ref]));
   const objectSources = new Map();
   const sourceFor = (oid, priorOid, priorSource) => {
-    if (!oid || !repoIdentity) return null;
+    if (!oid || !repoKey) return null;
     if (objectSources.has(oid)) return objectSources.get(oid);
     const source = reusableObjectSource(priorOid, oid, priorSource, resourceId)
-      || require('./objects').objectSourceFor(worktreeRoot, repoIdentity, oid);
+      || require('./objects').objectSourceFor(worktreeRoot, repoKey, oid);
     objectSources.set(oid, source);
     return source;
   };
@@ -131,7 +131,7 @@ async function observeWorktree(classified, previousCard = null) {
 }
 
 /**
- * Build the repo-card@2 for one worktree. `dirPath` may be any directory
+ * Build the repo-card@3 for one worktree. `dirPath` may be any directory
  * inside the worktree; the card is always for the worktree root. Throws
  * on anything that is not a worktree — discovery filters first.
  *

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

@@ -37,7 +37,7 @@ const service = {
   reconcileTimer: null,
   workspaceTimer: null,
   unsubscribe: null,
-  doorbells: new Map(), // replicaId → { watchers, timer }
+  doorbells: new Map(), // replicaId → { watchSet, timer }
   counters: { refreshes: 0, doorbellRings: 0 },
   lastRefresh: null,
 };
@@ -443,7 +443,7 @@ function nestedDirectories(root) {
 }
 
 function watchGitDir(card) {
-  const watchers = [];
+  const watchSet = { handles: [], complete: true };
   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.
@@ -459,9 +459,13 @@ function watchGitDir(card) {
   for (const dir of new Set([...direct, ...refDirectories])) {
     try {
       const watcher = fs.watch(dir, ring);
-      watcher.on('error', () => watcher.close());
-      watchers.push(watcher);
+      watcher.on('error', () => {
+        watchSet.complete = false;
+        watcher.close();
+      });
+      watchSet.handles.push(watcher);
     } catch {
+      watchSet.complete = false;
       // The directory vanished between observation and watch; the next
       // reconcile pass re-syncs the bells.
     }
@@ -472,27 +476,31 @@ function watchGitDir(card) {
       if (relative === '.git' || relative.startsWith('.git/')) return;
       ring();
     });
-    watcher.on('error', () => watcher.close());
-    watchers.push(watcher);
+    watcher.on('error', () => {
+      watchSet.complete = false;
+      watcher.close();
+    });
+    watchSet.handles.push(watcher);
   } catch {
+    watchSet.complete = false;
     // The periodic card refresh remains the fallback on filesystems that
     // cannot watch a checkout recursively.
   }
-  return watchers;
+  return watchSet;
 }
 
 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();
+  const previous = bell.watchSet;
+  for (const watcher of previous.handles) watcher.close();
+  bell.watchSet = watchGitDir(card);
 }
 
 function dropDoorbell(replicaId) {
   const bell = service.doorbells.get(replicaId);
   if (!bell) return;
-  for (const watcher of bell.watchers) watcher.close();
+  for (const watcher of bell.watchSet.handles) watcher.close();
   if (bell.timer) clearTimeout(bell.timer);
   service.doorbells.delete(replicaId);
 }
@@ -507,7 +515,9 @@ function syncDoorbells(cards) {
   }
   for (const [replicaId, card] of healthy) {
     if (!service.doorbells.has(replicaId)) {
-      service.doorbells.set(replicaId, { watchers: watchGitDir(card), timer: null });
+      service.doorbells.set(replicaId, { watchSet: watchGitDir(card), timer: null });
+    } else if (!service.doorbells.get(replicaId).watchSet.complete) {
+      rebuildDoorbell(replicaId, card);
     }
   }
 }
@@ -552,6 +562,8 @@ function repoCardServiceStats() {
     refreshes: service.counters.refreshes,
     doorbellRings: service.counters.doorbellRings,
     doorbells: service.doorbells.size,
+    incompleteDoorbells: Array.from(service.doorbells.values())
+      .filter((bell) => !bell.watchSet.complete).length,
     lastRefresh: service.lastRefresh,
   };
 }
@@ -563,4 +575,16 @@ module.exports = {
   repoCardServiceStats,
   startRepoCardService,
   stopRepoCardService,
+  // Test hooks only. Filesystem delivery itself belongs to the host; these
+  // expose the deterministic doorbell boundary behind that latency hint.
+  _private: {
+    rebuildDoorbell,
+    ringDoorbell,
+    watcherCount(replicaId) {
+      return service.doorbells.get(replicaId)?.watchSet.handles.length || 0;
+    },
+    watcherComplete(replicaId) {
+      return service.doorbells.get(replicaId)?.watchSet.complete === true;
+    },
+  },
 };