@chatroomcp/chatroom 0.1.4 → 0.1.6

package/dist/plugins/workspace/mcp.js

@@ -1,7 +1,7 @@
 import { z } from "zod";
-import { changeSetSchema, closedRead, destructiveLocalMutation, fileInfoSchema, fileReadOutputSchema, fileWriteOutputSchema, localMutation, localWrite, mcpTool, searchMatchSchema, workspaceOutputSchema, } from "../../mcp/server/tool-support.js";
-export function registerWorkspaceTools(server, workspaces, operations) {
-    server.registerTool("open_workspace", {
+import { changeSetSchema, closedRead, destructiveLocalMutation, fileInfoSchema, fileReadOutputSchema, fileWriteOutputSchema, localMutation, localWrite, searchMatchSchema, workspaceOutputSchema, } from "../../mcp/server/tool-support.js";
+export function registerWorkspaceTools(mcp, workspaces) {
+    mcp.registerTool("open_workspace", {
         title: "Open workspace",
         description: "Open or reuse an approved checkout, or create a new isolated managed Git worktree from the source checkout HEAD.",
         inputSchema: z.object({
@@ -10,11 +10,12 @@ export function registerWorkspaceTools(server, workspaces, operations) {
         }),
         outputSchema: workspaceOutputSchema,
         annotations: localMutation,
-    }, mcpTool((input) => operations.run({ pluginId: "workspace", source: "mcp", action: "open", input }, () => workspaces.open({
+        action: "open",
+    }, (input) => workspaces.open({
         path: input.path,
         ...(input.mode ? { mode: input.mode } : {}),
-    }))));
-    server.registerTool("remove_workspace", {
+    }));
+    mcp.registerTool("remove_workspace", {
         title: "Remove workspace",
         description: "Unregister a checkout workspace or remove a managed worktree. Dirty worktrees require force=true.",
         inputSchema: z.object({
@@ -27,17 +28,12 @@ export function registerWorkspaceTools(server, workspaces, operations) {
             mode: z.enum(["checkout", "worktree"]),
         }),
         annotations: destructiveLocalMutation,
-    }, mcpTool(async (input) => {
-        const removed = await operations.run({
-            pluginId: "workspace",
-            source: "mcp",
-            action: "remove",
-            workspaceId: input.workspaceId,
-            input,
-        }, () => workspaces.remove(input.workspaceId, input.force ?? false));
+        action: "remove",
+    }, async (input) => {
+        const removed = await workspaces.remove(input.workspaceId, input.force ?? false);
         return { removed: true, workspaceId: removed.id, mode: removed.mode };
-    }));
-    server.registerTool("fs_read", {
+    });
+    mcp.registerTool("fs_read", {
         title: "Read file",
         description: "Read a workspace-relative file through the ChatRoom filesystem boundary.",
         inputSchema: z.object({
@@ -52,17 +48,12 @@ export function registerWorkspaceTools(server, workspaces, operations) {
         }),
         outputSchema: fileReadOutputSchema,
         annotations: closedRead,
-    }, mcpTool(async (input) => {
+        action: "fs.read",
+    }, async (input) => {
         const fs = await workspaces.fs(input.workspaceId);
-        return operations.run({
-            pluginId: "workspace",
-            source: "mcp",
-            action: "fs.read",
-            workspaceId: input.workspaceId,
-            input,
-        }, () => fs.read(input.path, input.maxBytes === undefined ? {} : { maxBytes: input.maxBytes }));
-    }));
-    server.registerTool("fs_write", {
+        return fs.read(input.path, input.maxBytes === undefined ? {} : { maxBytes: input.maxBytes });
+    });
+    mcp.registerTool("fs_write", {
         title: "Write file",
         description: "Atomically write a workspace-relative file.",
         inputSchema: z.object({
@@ -72,17 +63,12 @@ export function registerWorkspaceTools(server, workspaces, operations) {
         }),
         outputSchema: fileWriteOutputSchema,
         annotations: localWrite,
-    }, mcpTool(async (input) => {
+        action: "fs.write",
+    }, async (input) => {
         const fs = await workspaces.fs(input.workspaceId);
-        return operations.run({
-            pluginId: "workspace",
-            source: "mcp",
-            action: "fs.write",
-            workspaceId: input.workspaceId,
-            input,
-        }, () => fs.write(input.path, input.content));
-    }));
-    server.registerTool("fs_list", {
+        return fs.write(input.path, input.content);
+    });
+    mcp.registerTool("fs_list", {
         title: "List files",
         description: "List files under a workspace-relative directory.",
         inputSchema: z.object({
@@ -92,19 +78,14 @@ export function registerWorkspaceTools(server, workspaces, operations) {
         }),
         outputSchema: z.object({ files: z.array(fileInfoSchema) }),
         annotations: closedRead,
-    }, mcpTool(async (input) => {
+        action: "fs.list",
+    }, async (input) => {
         const fs = await workspaces.fs(input.workspaceId);
         return {
-            files: await operations.run({
-                pluginId: "workspace",
-                source: "mcp",
-                action: "fs.list",
-                workspaceId: input.workspaceId,
-                input,
-            }, () => fs.list(input.path, { recursive: input.recursive })),
+            files: await fs.list(input.path, { recursive: input.recursive }),
         };
-    }));
-    server.registerTool("fs_search", {
+    });
+    mcp.registerTool("fs_search", {
         title: "Search files",
         description: "Search text under a workspace.",
         inputSchema: z.object({
@@ -115,22 +96,17 @@ export function registerWorkspaceTools(server, workspaces, operations) {
         }),
         outputSchema: z.object({ matches: z.array(searchMatchSchema) }),
         annotations: closedRead,
-    }, mcpTool(async (input) => {
+        action: "fs.search",
+    }, async (input) => {
         const fs = await workspaces.fs(input.workspaceId);
         return {
-            matches: await operations.run({
-                pluginId: "workspace",
-                source: "mcp",
-                action: "fs.search",
-                workspaceId: input.workspaceId,
-                input,
-            }, () => fs.search(input.query, {
+            matches: await fs.search(input.query, {
                 path: input.path,
                 maxResults: input.maxResults,
-            })),
+            }),
         };
-    }));
-    server.registerTool("fs_patch", {
+    });
+    mcp.registerTool("fs_patch", {
         title: "Transactional patch",
         description: "Validate all replacements before committing a multi-file text patch.",
         inputSchema: z.object({
@@ -148,21 +124,16 @@ export function registerWorkspaceTools(server, workspaces, operations) {
         }),
         outputSchema: changeSetSchema,
         annotations: destructiveLocalMutation,
-    }, mcpTool(async (input) => {
+        action: "fs.patch",
+    }, async (input) => {
         const fs = await workspaces.fs(input.workspaceId);
-        return operations.run({
-            pluginId: "workspace",
-            source: "mcp",
-            action: "fs.patch",
-            workspaceId: input.workspaceId,
-            input,
-        }, () => fs.patch(input.replacements.map((item) => ({
+        return fs.patch(input.replacements.map((item) => ({
             path: item.path,
             oldText: item.oldText,
             newText: item.newText,
             ...(item.occurrence === undefined
                 ? {}
                 : { occurrence: item.occurrence }),
-        }))));
-    }));
+        })));
+    });
 }

package/dist/plugins/workspace/plugin.js

@@ -10,7 +10,6 @@ import { WorktreeReviewService } from "./worktree-review-service.js";
 export const WorkspaceService = createServiceToken("workspace");
 export function createWorkspacePlugin() {
     let value = null;
-    let operations = null;
     return {
         id: "workspace",
         async activate(context) {
@@ -21,17 +20,15 @@ export function createWorkspacePlugin() {
             const workspaces = await WorkspaceRuntime.create(new WorkspaceRepository(context.database), git, review, context.config.allowedRoots, context.config.dataDir);
             await workspaces.discoverGitWorkspaces();
             value = { workspaces, git };
-            operations = context.operations;
             context.services.provide(WorkspaceService, value);
         },
-        registerMcp(server) {
-            if (!value || !operations)
+        registerMcp(mcp) {
+            if (!value)
                 throw new Error("Workspace plugin is not active");
-            registerWorkspaceTools(server, value.workspaces, operations);
+            registerWorkspaceTools(mcp, value.workspaces);
         },
         deactivate() {
             value = null;
-            operations = null;
         },
     };
 }