amalgm 0.1.234 → 0.1.236

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amalgm",
-  "version": "0.1.234",
+  "version": "0.1.236",
   "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/tests/workspace-reducer.test.js

@@ -59,6 +59,21 @@ test('a hydration failure still has a project path before a local card exists',
   assert.equal(pathForRepo({ path: '/projects/local' }, { path: '/projects/fresh' }), '/projects/local');
 });
 
+test('a reducer cursor belongs only to the rail that created it', () => {
+  const repoKey = 'root:rail-scoped-cursor';
+  const digest = require('crypto').createHash('sha256').update(repoKey).digest('hex').slice(0, 24);
+  const file = path.join(process.env.AMALGM_DIR, 'state', 'repo-reducer', `${digest}.json`);
+  fs.mkdirSync(path.dirname(file), { recursive: true });
+  fs.writeFileSync(file, `${JSON.stringify({
+    repoKey,
+    resourceId: 'shr_old_project_rail',
+    appliedThrough: 2764,
+  })}\n`);
+
+  assert.equal(readRepoState(repoKey, 'shr_old_project_rail').appliedThrough, 2764);
+  assert.equal(readRepoState(repoKey, 'shr_new_project_rail'), null);
+});
+
 test.after(() => {
   closeLocalDb();
   fs.rmSync(tempRoot, { recursive: true, force: true });

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

@@ -59,7 +59,11 @@ function markReducerApplied(version) {
   const digest = crypto.createHash('sha256').update(repoKey).digest('hex').slice(0, 24);
   const file = path.join(process.env.AMALGM_DIR, 'state', 'repo-reducer', `${digest}.json`);
   fs.mkdirSync(path.dirname(file), { recursive: true });
-  fs.writeFileSync(file, `${JSON.stringify({ repoKey, appliedThrough: version })}\n`);
+  fs.writeFileSync(file, `${JSON.stringify({
+    repoKey,
+    resourceId: project.resourceId,
+    appliedThrough: version,
+  })}\n`);
 }
 
 function settleProject() {
@@ -450,6 +454,7 @@ test('a checkpoint base replaces history already covered by the applied rail', a
   );
   fs.writeFileSync(reducerFile, `${JSON.stringify({
     repoKey,
+    resourceId: project.resourceId,
     baseOid: card.head.oid,
     branch: card.head.branch,
     appliedThrough: 2,

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;

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

@@ -383,8 +383,11 @@ async function publishPass(replicaId = null) {
       continue;
     }
     try {
-      const reduced = require('./reducer').readRepoState(repoKey);
       const wall = require('./wall');
+      const reduced = require('./reducer').readRepoState(
+        repoKey,
+        wall.projectForRepo(repoKey)?.resourceId,
+      );
       if (!checkpointBaseReady(card, reduced, wall.publicationStatus(repoKey, reduced))) {
         run.waiting += 1;
         continue;

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

@@ -72,10 +72,12 @@ function stateFile(repoKey) {
   return path.join(STATE_DIR, `${digest}.json`);
 }
 
-function readRepoState(repoKey) {
+function readRepoState(repoKey, resourceId = null) {
   try {
     const state = JSON.parse(fs.readFileSync(stateFile(repoKey), 'utf8'));
-    return state?.repoKey === repoKey ? state : null;
+    if (state?.repoKey !== repoKey) return null;
+    if (resourceId && state.resourceId !== resourceId) return null;
+    return state;
   } catch {
     return null;
   }
@@ -90,7 +92,7 @@ function repoStateIdentity(state) {
 function persistRepoState(repoKey, state) {
   fs.mkdirSync(STATE_DIR, { recursive: true });
   const next = { repoKey, ...state, updatedAt: new Date().toISOString() };
-  const previous = readRepoState(repoKey);
+  const previous = readRepoState(repoKey, state?.resourceId || null);
   if (repoStateIdentity(previous) === repoStateIdentity(next)) {
     return { state: previous, changed: false };
   }
@@ -349,7 +351,8 @@ async function moveToWinningCard(localCard, targetCard) {
     return { state: 'waiting', reason: 'local-state-moving' };
   }
   const repoKey = repoKeyOfCard(localCard);
-  const reducedState = readRepoState(repoKey);
+  const resourceId = require('./wall').projectForRepo(repoKey)?.resourceId;
+  const reducedState = readRepoState(repoKey, resourceId);
   const capturedOnRail = reducedState?.baseOid === current.head.oid
     && reducedState.checkpointRevision === revisionOf(
       current.head.oid,
@@ -590,7 +593,8 @@ async function materializeRepo(localCardInput, plan, appliedThrough = null) {
   const localCard = cardResult.moved
     ? await refreshRepoCard(refreshed.replica) || refreshed
     : refreshed;
-  const previous = readRepoState(plan.repoKey);
+  const project = require('./wall').projectForRepo(plan.repoKey);
+  const previous = readRepoState(plan.repoKey, project?.resourceId);
   const parked = parkedForState(
     previous?.parked,
     plan.parked,
@@ -604,6 +608,7 @@ async function materializeRepo(localCardInput, plan, appliedThrough = null) {
     // bundle, so the next pass cannot replace unnumbered local work.
     const persisted = persistRepoState(plan.repoKey, {
       ...(previous || {}),
+      resourceId: project?.resourceId || null,
       path: localCard.path,
       replica: localCard.replica,
       parked,
@@ -681,7 +686,6 @@ async function materializeRepo(localCardInput, plan, appliedThrough = null) {
     const captured = await captureCheckpoint(localCard.path);
     const wall = require('./wall');
     const localCheckpoint = readCheckpoint(machineId(), plan.repoKey);
-    const project = wall.projectForRepo(plan.repoKey);
     const acknowledged = localCheckpoint && {
       ...localCheckpoint,
       version: wall.mutationVersion(
@@ -716,6 +720,7 @@ async function materializeRepo(localCardInput, plan, appliedThrough = null) {
   const indexResult = await advanceIndex(localCard.path, currentIndex, reducedLocalIndex.tree);
   if (indexResult.state !== 'ready') return indexResult;
   const persisted = persistRepoState(plan.repoKey, {
+    resourceId: project?.resourceId || null,
     path: localCard.path,
     replica: localCard.replica,
     branch: stateBranch,

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

@@ -138,7 +138,7 @@ function publicationStatus(repoKey, reduced = undefined) {
   const replica = project ? wallReplica(project) : null;
   const receivedThrough = replica?.appliedVersion ?? null;
   const baseline = reduced === undefined
-    ? require('./reducer').readRepoState(repoKey)
+    ? require('./reducer').readRepoState(repoKey, project?.resourceId)
     : reduced;
   const appliedThrough = Number.isInteger(baseline?.appliedThrough)
     ? baseline.appliedThrough
@@ -559,7 +559,7 @@ function publishProject(project, rawCards) {
 
   const reducer = require('./reducer');
   const sharedPlan = reducer.reduceWall(readProjectWall(project)).get(project.repoKey);
-  const baseline = reducer.readRepoState(project.repoKey);
+  const baseline = reducer.readRepoState(project.repoKey, project.resourceId);
   const previousCards = (previousEntry?.cards || [])
     .map((card) => sealCardVersions(project, card, previousEntry));
   const previousReplicas = new Set(previousCards.map((card) => card.replica));