amalgm 0.1.176 → 0.1.177

package/package.json

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

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

@@ -146,7 +146,10 @@ function readCheckpointValue(baseOid, value) {
 }
 
 function ownPublishedCard(card) {
-  const own = require('./wall').readWall().find((entry) => entry.machine === machineId());
+  const own = require('./wall').readWall().find((entry) => (
+    entry.machine === machineId()
+    && entry.cards?.some((candidate) => candidate.replica === card.replica)
+  ));
   const published = own?.cards?.find((candidate) => candidate.replica === card.replica);
   if (
     !published

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

@@ -38,12 +38,12 @@ function ensureDirs() {
   fs.mkdirSync(REQUESTS, { recursive: true });
 }
 
-function payloadFile(key) {
-  return path.join(PAYLOADS, `${sha256(Buffer.from(key))}.json`);
+function payloadFile(resourceId, key) {
+  return path.join(PAYLOADS, `${sha256(Buffer.from(`${resourceId}\n${key}`))}.json`);
 }
 
-function manifestFile(repoKey, oid) {
-  const key = sha256(Buffer.from(`${repoKey}\n${oid}`));
+function manifestFile(resourceId, oid) {
+  const key = sha256(Buffer.from(`${resourceId}\n${oid}`));
   return path.join(MANIFESTS, `${key}.json`);
 }
 
@@ -127,14 +127,14 @@ async function prepareBundle(worktreeRoot, repoKey, resourceId, oid, file) {
 function publishPayload(key, bytesInput, repoKey) {
   ensureDirs();
   const bytes = Buffer.isBuffer(bytesInput) ? bytesInput : Buffer.from(bytesInput);
-  const file = payloadFile(key);
-  let manifest = readJson(file);
+  const project = require('./wall').projectForRepo(repoKey);
   const checksum = sha256(bytes);
+  if (!project?.resourceId) {
+    return { kind: 'pending', contract: PAYLOAD_CONTRACT, checksum };
+  }
+  const file = payloadFile(project.resourceId, key);
+  let manifest = readJson(file);
   if (!manifest || manifest.checksum !== checksum) {
-    const project = require('./wall').projectForRepo(repoKey);
-    if (!project?.resourceId) {
-      return { kind: 'pending', contract: PAYLOAD_CONTRACT, checksum };
-    }
     manifest = {
       contract: PAYLOAD_CONTRACT,
       resourceId: project.resourceId,
@@ -154,7 +154,9 @@ function publishPayload(key, bytesInput, repoKey) {
 
 async function bundleSourceFor(worktreeRoot, repoKey, oid) {
   if (!oid || !repoKey) return null;
-  const file = manifestFile(repoKey, oid);
+  const project = require('./wall').projectForRepo(repoKey);
+  if (!project?.resourceId) return { kind: 'pending' };
+  const file = manifestFile(project.resourceId, oid);
   const manifest = readJson(file);
   if (manifest?.contract === CONTRACT && manifest.oid === oid) {
     return manifest.chunks.every((chunk) => chunk.uploaded)
@@ -162,8 +164,6 @@ async function bundleSourceFor(worktreeRoot, repoKey, oid) {
       : { kind: 'pending' };
   }
 
-  const project = require('./wall').projectForRepo(repoKey);
-  if (!project?.resourceId) return { kind: 'pending' };
   if (!preparing.has(file)) {
     const promise = prepareBundle(worktreeRoot, repoKey, project.resourceId, oid, file)
       .catch((error) => console.warn(`[RepoObjects] bundle ${oid} failed:`, error.message))

package/runtime/scripts/amalgm-mcp/workspace/tree-store.js

@@ -105,6 +105,8 @@ function treeNodeLimitError(limit) {
 function skippedTreeResult(workspaceId, limit, nodeCount = null) {
   return {
     workspaceId,
+    created: 0,
+    nodes: [],
     skipped: 'node_limit',
     maxNodes: limit,
     ...(nodeCount == null ? {} : { nodeCount }),
@@ -155,7 +157,7 @@ function enrollWorkspace(identifier, options = {}) {
   const rootStats = fs.statSync(rootPath);
   if (!rootStats.isDirectory()) throw invalid('workspace path is not a folder', 409);
   if (isGitOwnedPath(rootPath)) {
-    return { workspaceId: workspace.id, skipped: 'git-owned' };
+    return { workspaceId: workspace.id, created: 0, nodes: [], skipped: 'git-owned' };
   }
 
   const maxNodes = treeNodeLimit(options);