@moor-sh/mcp 0.3.0 → 0.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moor-sh/mcp",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "MCP server for moor - lets AI agents (Claude Code, Cursor, etc.) manage your moor projects via the moor HTTP API.",
   "license": "MIT",
   "repository": {

package/src/index.ts

@@ -364,15 +364,49 @@ server.registerTool(
   "moor_exec",
   {
     title: "Execute Command",
-    description: "Run a shell command inside a project's running container.",
+    description:
+      "Run a shell command inside a project's running container. Bounded by a per-call timeout (default 10 min, max 1 h). For jobs that may exceed an hour, wait for the async exec tools to ship.",
     inputSchema: z.object({
       project: z.string().describe("Project name or ID"),
       command: z.string().describe("Shell command to execute"),
+      timeout_ms: z
+        .number()
+        .int()
+        .min(1000)
+        .max(3_600_000)
+        .optional()
+        .describe(
+          "Max time in milliseconds before the exec is aborted. Default 600000 (10 min). Max 3600000 (1 h).",
+        ),
     }),
   },
-  async ({ project, command }) => {
+  async ({ project, command, timeout_ms }) => {
     const p = await resolveProject(project);
-    const res = await apiPost(`/api/projects/${p.id}/exec`, { command });
+    const body: Record<string, unknown> = { command };
+    if (timeout_ms !== undefined) body.timeout_ms = timeout_ms;
+    const res = await apiPost(`/api/projects/${p.id}/exec`, body);
+    // The API returns 504 with a structured timeout body when the exec hit
+    // timeout_ms. Surface the kill outcome in the tool error so the agent can
+    // tell "the process was actually stopped" from "we just stopped waiting."
+    if (res.status === 504) {
+      const t = (await res.json()) as {
+        timeout_ms: number;
+        killed: boolean;
+        killed_pid: string | null;
+        live_remaining: number;
+        message: string;
+      };
+      let detail: string;
+      if (t.killed) {
+        detail = `Process tree terminated (container pid ${t.killed_pid}).`;
+      } else if (t.killed_pid !== null) {
+        detail = `Kill attempted on container pid ${t.killed_pid} but ${t.live_remaining} descendant process(es) still running inside the container.`;
+      } else {
+        detail =
+          "Process kill could not locate the running process — it may still be running inside the container.";
+      }
+      throw new Error(`Exec timed out after ${t.timeout_ms}ms. ${detail}`);
+    }
     if (!res.ok) throw new Error(`Failed: ${await res.text()}`);
     const result = (await res.json()) as {
       exitCode: number;