amalgm 0.1.245 → 0.1.246

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

@@ -14,9 +14,9 @@ const {
   renameWorkspace,
   upsertWorkspace,
 } = require('./store');
-const { listRepoCards, refreshRepoCards } = require('./cards');
+const { listRepoCards, refreshRepoCards, repoCardServiceStats } = require('./cards');
 const { machineId } = require('./identity');
-const { readWall } = require('./wall');
+const { readWall, wallStats } = require('./wall');
 
 const execFileAsync = promisify(execFile);
 const MAX_BUFFER = 10 * 1024 * 1024;
@@ -66,10 +66,6 @@ function enrollWorkspaceTree(workspace) {
   return require('./tree-store').enrollWorkspace(workspace.id);
 }
 
-function workspaceAfterTreeEnrollment(workspace) {
-  return listWorkspaces().find((entry) => entry.id === workspace.id) || workspace;
-}
-
 async function uniqueProjectPath(workspaceRoot, requestedName) {
   const name = sanitizeProjectName(requestedName);
   let candidate = path.join(workspaceRoot, name);
@@ -220,20 +216,15 @@ async function handleProjectRegister(body, sendJson) {
     });
     ensureProjectMemory(workspace, 'workspace:register');
     const tree = enrollWorkspaceTree(workspace);
-    const enrolledWorkspace = workspaceAfterTreeEnrollment(workspace);
 
     sendJson(200, {
       success: true,
-      workspace: enrolledWorkspace,
+      workspace,
       path: workspace.path,
       name: workspace.name,
       uri: workspace.uri,
       workspaceRoot,
-      tree: {
-        nodes: tree.nodes.length,
-        created: tree.created,
-        observation: enrolledWorkspace.treeObservation,
-      },
+      tree: { nodes: tree.nodes.length, created: tree.created },
     });
   } catch (error) {
     sendJson(500, {
@@ -360,19 +351,14 @@ async function handleImport(body, sendJson) {
       });
       ensureProjectMemory(workspace, 'workspace:import');
       const tree = enrollWorkspaceTree(workspace);
-      const enrolledWorkspace = workspaceAfterTreeEnrollment(workspace);
       sendJson(200, {
         success: true,
         path: workspace.path,
         name: workspace.name,
-        workspace: enrolledWorkspace,
+        workspace,
         workspaceRoot,
         alreadyInWorkspace: true,
-        tree: {
-          nodes: tree.nodes.length,
-          created: tree.created,
-          observation: enrolledWorkspace.treeObservation,
-        },
+        tree: { nodes: tree.nodes.length, created: tree.created },
       });
       return;
     }
@@ -398,20 +384,15 @@ async function handleImport(body, sendJson) {
     });
     ensureProjectMemory(workspace, 'workspace:import');
     const tree = enrollWorkspaceTree(workspace);
-    const enrolledWorkspace = workspaceAfterTreeEnrollment(workspace);
 
     sendJson(200, {
       success: true,
       path: workspace.path,
       name: workspace.name,
-      workspace: enrolledWorkspace,
+      workspace,
       workspaceRoot,
       alreadyInWorkspace: false,
-      tree: {
-        nodes: tree.nodes.length,
-        created: tree.created,
-        observation: enrolledWorkspace.treeObservation,
-      },
+      tree: { nodes: tree.nodes.length, created: tree.created },
     });
   } catch (error) {
     sendJson(500, {
@@ -452,18 +433,13 @@ async function handleClone(body, sendJson) {
       });
       ensureProjectMemory(workspace, 'workspace:clone');
       const tree = enrollWorkspaceTree(workspace);
-      const enrolledWorkspace = workspaceAfterTreeEnrollment(workspace);
       sendJson(200, {
         success: true,
         path: workspace.path,
-        workspace: enrolledWorkspace,
+        workspace,
         workspaceRoot,
         alreadyExists: true,
-        tree: {
-          nodes: tree.nodes.length,
-          created: tree.created,
-          observation: enrolledWorkspace.treeObservation,
-        },
+        tree: { nodes: tree.nodes.length, created: tree.created },
       });
       return;
     }
@@ -501,19 +477,14 @@ async function handleClone(body, sendJson) {
   });
   ensureProjectMemory(workspace, 'workspace:clone');
   const tree = enrollWorkspaceTree(workspace);
-  const enrolledWorkspace = workspaceAfterTreeEnrollment(workspace);
 
   sendJson(200, {
     success: true,
     path: workspace.path,
-    workspace: enrolledWorkspace,
+    workspace,
     workspaceRoot,
     alreadyExists: false,
-    tree: {
-      nodes: tree.nodes.length,
-      created: tree.created,
-      observation: enrolledWorkspace.treeObservation,
-    },
+    tree: { nodes: tree.nodes.length, created: tree.created },
   });
 }
 
@@ -743,7 +714,17 @@ async function handleRepoCardsRefresh(sendJson) {
 
 function handleWorkspaceSyncStats(sendJson) {
   try {
-    sendJson(200, require('./sync-stats').workspaceSyncStats());
+    const cards = listRepoCards();
+    const health = { healthy: 0, missing: 0, broken: 0, inaccessible: 0 };
+    for (const card of cards) health[card.health] = (health[card.health] || 0) + 1;
+    sendJson(200, {
+      machine: machineId(),
+      cards: { total: cards.length, ...health },
+      service: repoCardServiceStats(),
+      wall: wallStats(),
+      checkpoints: require('./checkpoint').checkpointStats(),
+      reducer: require('./reducer').reducerStats(),
+    });
   } catch (error) {
     sendJson(500, { error: error instanceof Error ? error.message : 'Failed to read sync stats' });
   }
@@ -751,14 +732,8 @@ function handleWorkspaceSyncStats(sendJson) {
 
 function handleCodeProjectJoin(body, sendJson) {
   try {
-    const keys = Object.keys(body || {}).sort();
-    if (
-      keys.length !== 3
-      || keys[0] !== 'ownerUserId'
-      || keys[1] !== 'path'
-      || keys[2] !== 'resourceId'
-    ) throw new Error('code project join requires exactly resourceId, path, and ownerUserId');
     const project = require('./wall').bindProject(
+      body?.repoKey,
       body?.resourceId,
       body?.ownerUserId,
       body?.path,
@@ -845,8 +820,12 @@ function handleTreeMutation(body, sendJson) {
     const actorUserId = require('./identity').userId();
     if (!actorUserId) throw Object.assign(new Error('this runtime is not enrolled to a user'), { statusCode: 401 });
     const operation = body?.operation || body;
+    const accessNodeId = operation?.kind === 'tree.create' ? operation?.parentId : operation?.nodeId;
+    const access = require('./access-store').resolveAccess(accessNodeId, actorUserId);
+    if (!access?.role) throw Object.assign(new Error('tree operation is forbidden'), { statusCode: 403 });
     sendJson(200, require('./tree-store').commitTreeOperation(operation, {
       mutationId: body?.mutationId,
+      role: access.role,
       source: 'workspace-tree:api',
     }));
   } catch (error) {

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

@@ -135,17 +135,11 @@ function ensureWorkspaceIdentityRows(database, workspace, options = {}) {
   }
 }
 
-function rowToWorkspace(row, database = openLocalDb()) {
+function rowToWorkspace(row) {
   if (!row) return null;
   const parsed = parseJson(row.workspace_json, {});
   const resolvedPath = row.path ? canonicalProjectPath(row.path) : row.path;
   const legacyManagedPath = row.path ? isLegacyManagedWorkspacePath(row.path) : false;
-  const syncHolds = require('./tree/observation-holds').list(row.id, database);
-  const status = syncHolds.length
-    ? 'held'
-    : resolvedPath && fs.existsSync(resolvedPath)
-      ? 'ready'
-      : row.status;
   return {
     ...parsed,
     id: row.id,
@@ -157,13 +151,7 @@ function rowToWorkspace(row, database = openLocalDb()) {
     computerId: row.computer_id || parsed.computerId || null,
     source: legacyManagedPath ? 'computer' : row.source,
     managed: legacyManagedPath ? false : row.managed === 1,
-    status,
-    treeObservation: syncHolds.length ? {
-      state: 'held',
-      owner: 'workspace-tree',
-      retry: { kind: 'automatic' },
-      holds: syncHolds,
-    } : null,
+    status: resolvedPath && fs.existsSync(resolvedPath) ? 'ready' : row.status,
     createdAt: row.created_at,
     updatedAt: row.updated_at,
   };
@@ -194,71 +182,13 @@ function publishEvents(events) {
 }
 
 function listWorkspaces() {
-  const database = openLocalDb();
-  return database
+  return openLocalDb()
     .prepare('SELECT * FROM workspaces ORDER BY lower(name), path')
     .all()
-    .map((row) => rowToWorkspace(row, database))
+    .map(rowToWorkspace)
     .filter(Boolean);
 }
 
-function replaceTreeObservationInTransaction(
-  workspaceId,
-  holds,
-  options = {},
-) {
-  const database = options.database || openLocalDb();
-  const changed = require('./tree/observation-holds').replace(
-    workspaceId,
-    holds,
-    database,
-    {
-      ownerKind: options.ownerKind,
-      ownerId: options.ownerId,
-    },
-  );
-  if (!changed) return { changed, events: [] };
-  const row = workspaceRow(database, workspaceId);
-  if (!row) return { changed, events: [] };
-  const workspace = rowToWorkspace(row, database);
-  return {
-    changed,
-    events: publishWorkspaceEvents(
-      database,
-      'update',
-      workspace,
-      options.source || 'workspace-tree:observation-hold',
-    ),
-  };
-}
-
-function publishTreeObservationCommit(result) {
-  publishEvents(result?.events || []);
-}
-
-function commitCompletedTreeObservation(workspaceId, holds, options = {}) {
-  const database = options.database || openLocalDb();
-  let result = { changed: false, events: [] };
-  database.transaction(() => {
-    if (typeof options.mutate === 'function') options.mutate();
-    result = replaceTreeObservationInTransaction(
-      workspaceId,
-      holds,
-      {
-        database,
-        ownerKind: options.ownerKind,
-        ownerId: options.ownerId,
-        source: options.source,
-      },
-    );
-  })();
-  publishTreeObservationCommit(result);
-  return {
-    changed: result.changed,
-    holds: require('./tree/observation-holds').list(workspaceId, database),
-  };
-}
-
 function upsertWorkspace(input, options = {}) {
   const db = openLocalDb();
   let workspace;
@@ -383,9 +313,6 @@ function removeWorkspace(identifier, options = {}) {
 }
 
 module.exports = {
-  commitCompletedTreeObservation,
-  publishTreeObservationCommit,
-  replaceTreeObservationInTransaction,
   listWorkspaces,
   normalizeWorkspaceRecord,
   removeWorkspace,