amalgm 0.1.190 → 0.1.191

package/package.json

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

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

@@ -38,6 +38,7 @@ const {
   publishedCardFor,
   publishWall,
   readWall,
+  stampCards,
   wallStats,
 } = require('../workspace/wall');
 
@@ -126,6 +127,61 @@ test('only a value different from both the materialized baseline and the rail is
   }), true);
 });
 
+test('checkpoint work on the materialized baseline keeps the baseline card and branch numbers', () => {
+  const baselineOid = 'a'.repeat(40);
+  const railOid = 'b'.repeat(40);
+  const card = {
+    card: 'repo-card@2',
+    machine: 'machine-a',
+    replica: 'rpl_baseline',
+    kind: 'primary',
+    head: { branch: 'main', oid: baselineOid, detached: false },
+    refs: [{ name: 'main', oid: baselineOid }],
+    health: 'healthy',
+  };
+  const stamped = stampCards(
+    [card],
+    [{
+      ...card,
+      head: { branch: 'old', oid: 'c'.repeat(40), detached: false },
+      positionMutationId: 'mut_stale_card_01',
+      positionVersion: 8,
+      branches: [],
+    }],
+    {
+      card: {
+        ...card,
+        head: { branch: 'main', oid: railOid, detached: false },
+        positionMutationId: 'mut_winning_card1',
+        positionVersion: 12,
+      },
+      branches: [{
+        name: 'main',
+        oid: railOid,
+        mutationId: 'mut_winning_ref01',
+        version: 12,
+      }],
+    },
+    {
+      branch: 'main',
+      baseOid: baselineOid,
+      cardMutationId: 'mut_baseline_card',
+      cardVersion: 9,
+      branches: [{
+        name: 'main',
+        oid: baselineOid,
+        mutationId: 'mut_baseline_ref1',
+        version: 9,
+      }],
+    },
+    'mut_checkpoint_only',
+    { repoKey: 'root:baseline-stamp', resourceId: 'shr_baseline_stamp_test' },
+  )[0];
+
+  assert.equal(stamped.positionMutationId, 'mut_baseline_card');
+  assert.equal(stamped.branches[0].mutationId, 'mut_baseline_ref1');
+});
+
 test('a collaborator binds the same repo to the owner project, not a parallel project', () => {
   const shared = projectResourceId('repo-shared', '22222222-2222-4222-8222-222222222222');
   const localPath = path.join(tempRoot, 'projects/shared');

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

@@ -281,15 +281,24 @@ function officialVersion(resourceId, mutationId) {
   return Number.isInteger(mutation?.officialCloudVersion) ? mutation.officialCloudVersion : null;
 }
 
-function stampBranches(refs, previousBranches, sharedBranches, mutationId, resourceId) {
+function stampBranches(
+  refs,
+  previousBranches,
+  sharedBranches,
+  baselineBranches,
+  mutationId,
+  resourceId,
+) {
   const current = new Map((refs || []).map((ref) => [ref.name, ref]));
   const previous = new Map((previousBranches || []).map((ref) => [ref.name, ref]));
   const shared = new Map((sharedBranches || []).map((ref) => [ref.name, ref]));
+  const baseline = new Map((baselineBranches || []).map((ref) => [ref.name, ref]));
   const names = [...new Set([...current.keys(), ...previous.keys()])].sort();
   return names.map((name) => {
     const observed = current.get(name);
     const before = previous.get(name);
     const onRail = shared.get(name);
+    const materialized = baseline.get(name);
     const oid = observed?.oid ?? null;
     const unchanged = before && (before.oid ?? null) === oid;
     const previousReusable = unchanged
@@ -299,9 +308,15 @@ function stampBranches(refs, previousBranches, sharedBranches, mutationId, resou
       && (onRail.oid ?? null) === oid
       && onRail.mutationId
       && validVersion(onRail.version);
+    const baselineReusable = materialized
+      && (materialized.oid ?? null) === oid
+      && materialized.mutationId
+      && validVersion(materialized.version);
     const mutation = previousReusable
       ? before.mutationId
-      : railReusable ? onRail.mutationId : mutationId;
+      : railReusable
+        ? onRail.mutationId
+        : baselineReusable ? materialized.mutationId : mutationId;
     return {
       name,
       oid,
@@ -332,7 +347,7 @@ function isCommittedCard(card) {
   return typeof card?.head?.oid === 'string' && /^[0-9a-f]{40,64}$/.test(card.head.oid);
 }
 
-function stampCards(cards, previousCards, sharedPlan, mutationId, project) {
+function stampCards(cards, previousCards, sharedPlan, baseline, mutationId, project) {
   const previousByReplica = new Map(
     (previousCards || []).filter((card) => card?.replica).map((card) => [card.replica, card]),
   );
@@ -347,9 +362,16 @@ function stampCards(cards, previousCards, sharedPlan, mutationId, project) {
     const reusableRailPosition = samePosition(sharedPlan?.card, card)
       && sharedPlan.card.positionMutationId
       && validVersion(sharedPlan.card.positionVersion);
+    const reusableBaselinePosition = baseline
+      && card.head?.branch === baseline.branch
+      && card.head?.oid === baseline.baseOid
+      && baseline.cardMutationId
+      && validVersion(baseline.cardVersion);
     const positionMutationId = reusablePosition
       ? previous.positionMutationId
-      : reusableRailPosition ? sharedPlan.card.positionMutationId : mutationId;
+      : reusableRailPosition
+        ? sharedPlan.card.positionMutationId
+        : reusableBaselinePosition ? baseline.cardMutationId : mutationId;
     const checkpoint = readCheckpoint(machineId(), project.repoKey);
     const currentCheckpoint = checkpoint
       && checkpoint.baseOid === card.head?.oid
@@ -374,6 +396,7 @@ function stampCards(cards, previousCards, sharedPlan, mutationId, project) {
         card.refs,
         previous?.branches,
         sharedPlan?.branches,
+        baseline?.branches,
         mutationId,
         project.resourceId,
       ),
@@ -437,7 +460,14 @@ function publishProject(project, rawCards) {
     return { published: false, reason: 'shared-state-covered', repoKey: project.repoKey };
   }
   const mutationId = `mut_project_${crypto.randomBytes(16).toString('base64url')}`;
-  const cards = stampCards(rawCards, previousEntry?.cards, sharedPlan, mutationId, project);
+  const cards = stampCards(
+    rawCards,
+    previousEntry?.cards,
+    sharedPlan,
+    baseline,
+    mutationId,
+    project,
+  );
   const mine = JSON.stringify({
     wall: WALL_CONTRACT,
     project: project.repoKey,
@@ -648,6 +678,7 @@ module.exports = {
   publishedCardFor,
   publishWall,
   readWall,
+  stampCards,
   startWallService,
   stopWallService,
   wallStats,