amalgm 0.1.234 → 0.1.235

package/package.json

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

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

@@ -440,8 +440,22 @@ test('unchanged commits reuse their card object source and one new oid is resolv
 
 test('only complete object sources are reusable', () => {
   assert.deepEqual(
-    cardTest.reusableObjectSource('a', 'a', { kind: 'bundle', checksum: 'ready' }),
-    { kind: 'bundle', checksum: 'ready' },
+    cardTest.reusableObjectSource(
+      'a',
+      'a',
+      { kind: 'bundle', resourceId: 'shr_project_a', checksum: 'ready' },
+      'shr_project_a',
+    ),
+    { kind: 'bundle', resourceId: 'shr_project_a', checksum: 'ready' },
+  );
+  assert.equal(
+    cardTest.reusableObjectSource(
+      'a',
+      'a',
+      { kind: 'bundle', resourceId: 'shr_project_old', checksum: 'ready' },
+      'shr_project_new',
+    ),
+    null,
   );
   assert.equal(cardTest.reusableObjectSource('a', 'b', { kind: 'remote' }), null);
   assert.equal(cardTest.reusableObjectSource('a', 'a', { kind: 'pending' }), null);

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

@@ -60,10 +60,10 @@ function cardKind(classified) {
   return classified.linked ? 'linked-worktree' : 'primary';
 }
 
-function reusableObjectSource(previousOid, currentOid, source) {
-  return previousOid === currentOid && ['remote', 'bundle'].includes(source?.kind)
-    ? source
-    : null;
+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;
 }
 
 async function observeWorktree(classified, previousCard = null) {
@@ -83,6 +83,9 @@ async function observeWorktree(classified, previousCard = null) {
   }
 
   const repoIdentity = remote === null ? null : remoteIdentity(remote);
+  const resourceId = repoIdentity
+    ? require('./wall').projectForRepo(repoIdentity)?.resourceId
+    : null;
   const previous = previousCard?.replica === replica.replicaId
     && previousCard.repo?.remote === repoIdentity
     ? previousCard
@@ -92,7 +95,7 @@ async function observeWorktree(classified, previousCard = null) {
   const sourceFor = (oid, priorOid, priorSource) => {
     if (!oid || !repoIdentity) return null;
     if (objectSources.has(oid)) return objectSources.get(oid);
-    const source = reusableObjectSource(priorOid, oid, priorSource)
+    const source = reusableObjectSource(priorOid, oid, priorSource, resourceId)
       || require('./objects').objectSourceFor(worktreeRoot, repoIdentity, oid);
     objectSources.set(oid, source);
     return source;