amalgm 0.1.243 → 0.1.245

package/lib/supervisor.js

@@ -174,6 +174,8 @@ const SAFE_PROCESS_ENV_KEYS = [
   'LANG',
   'LC_ALL',
   'LOGNAME',
+  'AMALGM_AUTO_UPDATE',
+  'AMALGM_DISABLE_AUTO_UPDATE',
   'AMALGM_NATIVE_NODE_MODULES',
   'AMALGM_SKIP_NATIVE_INSTALL',
   'ELECTRON_RUN_AS_NODE',
@@ -1343,5 +1345,6 @@ module.exports = {
     liveDeclaredRuntimePorts,
     runtimeStateFilesUnder,
     runtimeStateSearchRoots,
+    safeBaseProcessEnv,
   },
 };

package/package.json

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

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

@@ -363,6 +363,77 @@ test('an official checkpoint with a pending payload is terminal corruption', asy
   );
 });
 
+test('hydration reimports official objects when its checkout is replaced before recovery', async () => {
+  const { repo: source, oid } = await makeRepo('hydrate-replaced-source');
+  const bundle = path.join(tempRoot, 'hydrate-replaced.bundle');
+  await git(source, 'bundle', 'create', bundle, 'main');
+  const bytes = fs.readFileSync(bundle);
+  const digest = require('crypto').createHash('sha256').update(bytes).digest('hex');
+  const locatorChunks = [{ sha256: digest, bytes: bytes.length }];
+  const chunks = path.join(process.env.AMALGM_DIR, 'state', 'repo-objects', 'chunks');
+  fs.mkdirSync(chunks, { recursive: true });
+  fs.writeFileSync(path.join(chunks, `${digest}.bin`), bytes);
+
+  const target = path.join(tempRoot, 'hydrate-replaced-target');
+  fs.mkdirSync(target, { recursive: true });
+  const resourceId = '018f0000-0000-7000-8000-000000000022';
+  const project = { path: target, resourceId };
+  const winning = card('/remote', oid, 1);
+  winning.objects = {
+    kind: 'bundle',
+    contract: 'git-bundle-chunks@2',
+    resourceId,
+    oid,
+    ref: `refs/amalgm/exports/${oid}`,
+    checksum: locatorChecksum(locatorChunks),
+    bytes: bytes.length,
+    chunks: locatorChunks,
+  };
+  const plan = {
+    repoKey: `code-folder:${resourceId}`,
+    card: winning,
+    branches: [],
+    transitions: [],
+  };
+  require('../workspace/wall').bindProject(
+    resourceId,
+    '11111111-1111-4111-8111-111111111111',
+    target,
+  );
+
+  const transitions = require('../workspace/transition');
+  const updateBranchRefs = transitions.updateBranchRefs;
+  let interrupt = true;
+  transitions.updateBranchRefs = async (...args) => {
+    await updateBranchRefs(...args);
+    if (interrupt) {
+      interrupt = false;
+      throw new Error('simulated process death before hydration execution');
+    }
+  };
+  try {
+    await assert.rejects(
+      hydrateRepo(project, plan),
+      /simulated process death before hydration execution/,
+    );
+  } finally {
+    transitions.updateBranchRefs = updateBranchRefs;
+  }
+  assert.equal(readRepoState(plan.repoKey, resourceId).hydrating.contract, 'repo-hydrate@5');
+
+  const displaced = `${target}.displaced`;
+  fs.renameSync(target, displaced);
+  fs.mkdirSync(target);
+
+  const result = await hydrateRepo(project, plan);
+  assert.equal(result.state, 'hydrated', JSON.stringify(result));
+  assert.equal((await git(target, 'rev-parse', 'HEAD')).trim(), oid);
+  await git(target, 'cat-file', '-e', 'HEAD^{commit}');
+  await git(target, 'status', '--porcelain=v2', '--branch');
+  await git(target, 'fsck', '--connectivity-only', '--no-dangling');
+  assert.equal(readRepoState(plan.repoKey, resourceId).materialized, true);
+});
+
 test('hydration preserves unknown files and a branch committed while recovery was down', async () => {
   const sourceRepo = await makeRepo('hydrate-source');
   const source = sourceRepo.repo;

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

@@ -440,19 +440,17 @@ async function hydrateRepo(project, plan) {
   const targetCard = activePlan.card;
   if (!targetCard?.head?.oid) throw new Error('official card has no commit');
   await transition.initializeRepo(project.path, plan.card.repo?.remote || null);
+  // Object readiness belongs to the physical checkout, not to the pathname or
+  // the durable hydration record. The directory at a registered spelling can
+  // be replaced while the runtime is down, leaving a valid recovery plan but
+  // a fresh object database. Re-prove the complete current plan on every
+  // attempt before recovery is allowed to move HEAD, refs, index, or files.
+  const prepared = await preparePlan({ path: project.path }, plan);
+  if (prepared.state !== 'ready') return prepared;
   let reduced = pending?.reduced || null;
   let through = pending?.through || null;
   if (!pending) {
-    if (plan.card.objects?.kind !== 'bundle') {
-      throw new Error('official card has no complete bundle');
-    }
-    const bundle = require('./objects').prepareBundleImport(plan.card.objects);
-    if (bundle.state !== 'ready') {
-      return { state: 'waiting', reason: `objects-${bundle.state}` };
-    }
-    await transition.importBundle(project.path, bundle.file);
-    reduced = await preparePlan({ path: project.path }, plan);
-    if (reduced.state !== 'ready') return reduced;
+    reduced = prepared;
     through = planThrough(plan);
   }
   const requestDigest = applyingRequestDigest(through, activePlan);