amalgm 0.1.175 → 0.1.176

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

@@ -166,6 +166,61 @@ async function moveToCard(worktreeRoot, {
   }
 }
 
+/** Keep a commit reachable under one content-derived internal ref. */
+function parkCommit(worktreeRoot, oid) {
+  const ref = `refs/amalgm/parked/${oid}`;
+  return run('park-commit', worktreeRoot, [
+    '-C', worktreeRoot, 'update-ref', ref, oid,
+  ]).then(() => ref);
+}
+
+function setBranchRef(worktreeRoot, branch, oid) {
+  return run('set-branch-ref', worktreeRoot, [
+    '-C', worktreeRoot, 'update-ref', `refs/heads/${branch}`, oid,
+  ]);
+}
+
+function deleteBranchRef(worktreeRoot, branch) {
+  return run('delete-branch-ref', worktreeRoot, [
+    '-C', worktreeRoot, 'update-ref', '-d', `refs/heads/${branch}`,
+  ]);
+}
+
+/**
+ * Exact card movement after the caller has durably parked the old commit
+ * and captured the working tree. This deliberately discards the local
+ * checkout copy; the caller immediately pours the preserved work back as
+ * the checkpoint layer.
+ */
+async function forceMoveToCard(worktreeRoot, {
+  expectedBranch,
+  expectedOid,
+  targetBranch,
+  targetOid,
+}) {
+  const before = await currentHead(worktreeRoot);
+  if (before.branch !== expectedBranch || before.oid !== expectedOid) {
+    throw new TransitionError('force-move-to-card', worktreeRoot, 'local card changed before movement');
+  }
+  if (targetBranch) {
+    await run('force-move-to-card', worktreeRoot, [
+      '-C', worktreeRoot, 'checkout', '--force', '-B', targetBranch, targetOid,
+    ], { timeoutMs: 60_000 });
+  } else {
+    await run('force-move-to-card', worktreeRoot, [
+      '-C', worktreeRoot, 'checkout', '--force', '--detach', targetOid,
+    ], { timeoutMs: 60_000 });
+  }
+  const after = await currentHead(worktreeRoot);
+  if (after.branch !== (targetBranch || null) || after.oid !== targetOid) {
+    throw new TransitionError(
+      'force-move-to-card',
+      worktreeRoot,
+      `expected ${targetBranch || '(detached)'}@${targetOid}, observed ${after.branch || '(detached)'}@${after.oid}`,
+    );
+  }
+}
+
 /**
  * Apply a captured worktree patch — or reverse one — from a file on disk.
  * The patch file lives outside the repo (in the state dir), so what was
@@ -177,6 +232,13 @@ function applyPatch(worktreeRoot, patchFile, { reverse = false } = {}) {
   ], { timeoutMs: 60_000 });
 }
 
+/** Set only Git's index; working files are left exactly as they are. */
+function setIndexTree(worktreeRoot, treeOid) {
+  return run('set-index-tree', worktreeRoot, [
+    '-C', worktreeRoot, 'read-tree', treeOid,
+  ]);
+}
+
 /**
  * Land a merged write set in a working tree — the coexistence engine's
  * only mutation path. Each entry is { path, content, mode } (content a
@@ -224,8 +286,13 @@ module.exports = {
   applyMergedFiles,
   applyPatch,
   createBundle,
+  deleteBranchRef,
   fastForwardTo,
   fetchBranch,
+  forceMoveToCard,
   importBundle,
   moveToCard,
+  parkCommit,
+  setBranchRef,
+  setIndexTree,
 };

package/runtime/scripts/amalgm-mcp/workspace/tree/local-state.js

@@ -32,12 +32,11 @@ function rowToNode(row) {
 
 function workspaceRow(identifier, database = openLocalDb()) {
   return database.prepare(`
-    SELECT workspaces.*
+    SELECT *
     FROM workspaces
-    LEFT JOIN workspace_id_aliases ON workspace_id_aliases.workspace_id = workspaces.id
-    WHERE workspaces.id = ? OR workspaces.path = ? OR workspace_id_aliases.alias_id = ?
+    WHERE id = ? OR path = ?
     LIMIT 1
-  `).get(identifier, identifier, identifier) || null;
+  `).get(identifier, identifier) || null;
 }
 
 function relativePathForNode(nodes, nodeId, memo = new Map()) {