amalgm 0.1.200 → 0.1.202

package/package.json

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

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

@@ -40,6 +40,19 @@ test.after(() => {
   fs.rmSync(tempRoot, { recursive: true, force: true });
 });
 
+test('checkpoint publication waits until the reducer finishes writing both repo layers', async () => {
+  const { withMaterialization } = require('../workspace/reducer');
+  const repoKey = 'https://example.test/repo.git';
+
+  assert.equal(_test.checkpointMayPublish(repoKey), true);
+  await withMaterialization(repoKey, async () => {
+    assert.equal(_test.checkpointMayPublish(repoKey), false);
+    await Promise.resolve();
+    assert.equal(_test.checkpointMayPublish(repoKey), false);
+  });
+  assert.equal(_test.checkpointMayPublish(repoKey), true);
+});
+
 async function run(cwd, ...args) {
   await execFileAsync(
     'git',

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

@@ -326,6 +326,15 @@ test('side branches keep one rail operation while the checked-out card advances'
 
   await run(repo, 'branch', branch);
   await refreshRepoCards();
+  const beforeMaterialization = getDocText(project.file);
+  const blocked = await require('../workspace/reducer').withMaterialization(
+    repoKey,
+    async () => publishWall(repoKey),
+  );
+  assert.equal(blocked.published, false);
+  assert.equal(blocked.reason, 'repo-materializing');
+  assert.equal(getDocText(project.file), beforeMaterialization);
+
   const created = publishWall(repoKey);
   assert.equal(created.published, true);
   let card = readWall(repoKey)[0].cards[0];

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

@@ -188,6 +188,10 @@ function checkpointBaseReady(card, reduced) {
   );
 }
 
+function checkpointMayPublish(repoKey) {
+  return !require('./reducer').isMaterializing(repoKey);
+}
+
 async function publishPass(replicaId = null) {
   const machine = machineId();
   const run = { published: 0, skips: 0, waiting: 0, failures: 0 };
@@ -196,6 +200,10 @@ async function publishPass(replicaId = null) {
     if (card.health !== 'healthy' || card.kind !== 'primary' || card.operation !== 'none') continue;
     const repoKey = repoKeyOfCard(card);
     if (!repoKey || !card.head?.oid) continue;
+    if (!checkpointMayPublish(repoKey)) {
+      run.waiting += 1;
+      continue;
+    }
     try {
       const reduced = require('./reducer').readRepoState(repoKey);
       if (!checkpointBaseReady(card, reduced)) {
@@ -376,6 +384,7 @@ module.exports = {
   _test: {
     checkpointBaseReady,
     checkpointForSharedState,
+    checkpointMayPublish,
   },
   CHECKPOINT_CONTRACT,
   MAX_INLINE_DIFF_BYTES,

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

@@ -50,6 +50,20 @@ const service = {
   repos: new Map(),
   lastPass: null,
 };
+const materializing = new Set();
+
+function isMaterializing(repoKey) {
+  return materializing.has(repoKey);
+}
+
+async function withMaterialization(repoKey, work) {
+  materializing.add(repoKey);
+  try {
+    return await work();
+  } finally {
+    materializing.delete(repoKey);
+  }
+}
 
 function stateFile(repoKey) {
   const digest = crypto.createHash('sha256').update(repoKey).digest('hex').slice(0, 24);
@@ -587,7 +601,10 @@ async function runReducer() {
     if (!plan.card) continue;
     try {
       if (!local?.head?.oid) {
-        const hydrated = await hydrateRepo(wall.projectForRepo(repoKey), plan);
+        const hydrated = await withMaterialization(
+          repoKey,
+          () => hydrateRepo(wall.projectForRepo(repoKey), plan),
+        );
         service.repos.set(repoKey, {
           repoKey,
           path: wall.projectForRepo(repoKey)?.path || local?.path || null,
@@ -627,7 +644,10 @@ async function runReducer() {
         service.counters.waiting += 1;
         continue;
       }
-      const outcome = await materializeRepo(refreshed, currentPlan);
+      const outcome = await withMaterialization(
+        repoKey,
+        () => materializeRepo(refreshed, currentPlan),
+      );
       service.repos.set(repoKey, { repoKey, path: local.path, ...outcome, at: new Date().toISOString() });
       if (outcome.state === 'waiting') service.counters.waiting += 1;
       if (outcome.moved) {
@@ -718,6 +738,7 @@ module.exports = {
   advanceIndex,
   captureIsOnRail,
   hydrateRepo,
+  isMaterializing,
   localCardMayMaterialize,
   materializeRepo,
   readRepoState,
@@ -727,4 +748,5 @@ module.exports = {
   reducerStats,
   startWorkspaceReducer,
   stopWorkspaceReducer,
+  withMaterialization,
 };

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

@@ -473,6 +473,10 @@ function publishProject(project, rawCards) {
     service.counters.publishSkips += 1;
     return { published: false, reason: 'project-not-bound', repoKey: project.repoKey };
   }
+  if (require('./reducer').isMaterializing(project.repoKey)) {
+    service.counters.publishSkips += 1;
+    return { published: false, reason: 'repo-materializing', repoKey: project.repoKey };
+  }
   const docs = require('../state/docs');
   let current = docs.getDocText(project.file);
   let previous = null;