mcp-server-opencode 1.2.0 → 1.3.0

package/build/src/modules/tools/start_task.js

@@ -1,8 +1,27 @@
 import { randomUUID } from "node:crypto";
+import { realpath, stat } from "node:fs/promises";
+import { resolve } from "node:path";
 import { z } from "zod";
+import { captureWorkspace, releaseWorkspace, reserveWorkspace, validateRelativeCwd, validateRelativePath, } from "../shared/execution-report.js";
 import { jsonError, jsonResult } from "../shared/mcp-result.js";
-import { clientForServer } from "../shared/opencode-client.js";
-import { registerTask } from "../shared/task-registry.js";
+import { createMessageId } from "../shared/message-id.js";
+import { clientForServer, sdkResponseError } from "../shared/opencode-client.js";
+import { registerPermissionSession, unregisterPermissionSession, } from "../shared/permission-scopes.js";
+import { sendPromptAndClassify } from "../shared/prompt-dispatch.js";
+import { observeRun } from "../shared/run-observer.js";
+import { getServer } from "../shared/server-registry.js";
+import { registerTask, removeTask } from "../shared/task-registry.js";
+import { acquireManagedWorkspaceDispatch, associateManagedWorkspaceTask, createManagedWorkspace, registerManagedWorkspaceSession, sharedWorkspaceMetadata, } from "../shared/workspace-manager.js";
+const expectedChangeSchema = z.object({
+    path: z.string().refine(validateRelativePath),
+    change: z.enum(["created", "modified", "deleted"]),
+});
+const checkSchema = z.object({
+    executable: z.string().min(1),
+    argv: z.array(z.string()),
+    cwd: z.string().refine(validateRelativeCwd).optional(),
+    timeout_ms: z.number().int().positive().max(300_000).optional(),
+});
 /** Parse a "providerID/modelID" string into the shape the SDK expects. */
 function parseModel(model) {
     const slash = model.indexOf("/");
@@ -15,6 +34,18 @@ export function registerOpencodeStartTask(server) {
         description: "Delegate a task to an OpenCode agent: create a session and start the prompt without waiting for it to finish",
         inputSchema: {
             server_id: z.string().describe("Id of the server instance to run the task on"),
+            directory: z
+                .string()
+                .optional()
+                .describe("Project directory, relative to the server directory unless absolute"),
+            workspace_mode: z
+                .enum(["shared", "worktree"])
+                .default("shared")
+                .describe("Use the selected directory directly or create an isolated managed Git worktree"),
+            base_ref: z
+                .string()
+                .optional()
+                .describe("Committed Git base for workspace_mode=worktree (default HEAD)"),
             prompt: z.string().describe("Prompt/instructions for the agent"),
             agent: z
                 .string()
@@ -24,10 +55,12 @@ export function registerOpencodeStartTask(server) {
                 .string()
                 .optional()
                 .describe("Model override as 'providerID/modelID', copied verbatim from opencode_list_agents output — never guess or construct the id from a model's display name. Overrides the agent's pre-assigned model for this task only. An unknown model is rejected with status 'unknown_model' and the list of available models"),
+            expected_changes: z.array(expectedChangeSchema).optional(),
+            checks: z.array(checkSchema).optional(),
         },
-    }, async ({ server_id, prompt, agent, model }) => {
-        const client = clientForServer(server_id);
-        if (!client) {
+    }, async ({ server_id, prompt, agent, model, expected_changes, checks, directory, workspace_mode, base_ref, }) => {
+        const server = getServer(server_id);
+        if (!server) {
             return jsonError({ server_id, status: "server_not_found" });
         }
         let parsedModel;
@@ -41,7 +74,53 @@ export function registerOpencodeStartTask(server) {
                 });
             }
         }
+        let provisionalLease;
+        let workspaceMetadata;
+        let releaseManagedDispatch;
         try {
+            let sourceDirectory;
+            try {
+                sourceDirectory = await realpath(resolve(server.directory ?? process.cwd(), directory ?? "."));
+                if (!(await stat(sourceDirectory)).isDirectory()) {
+                    return jsonError({ server_id, status: "invalid_directory", directory });
+                }
+            }
+            catch (error) {
+                const code = error.code;
+                if (code === "ENOENT" || code === "ENOTDIR") {
+                    return jsonError({ server_id, status: "invalid_directory", directory });
+                }
+                throw error;
+            }
+            if (base_ref !== undefined && workspace_mode !== "worktree") {
+                return jsonError({ server_id, status: "base_ref_requires_worktree" });
+            }
+            workspaceMetadata =
+                workspace_mode === "worktree"
+                    ? await createManagedWorkspace(server_id, sourceDirectory, base_ref)
+                    : sharedWorkspaceMetadata(sourceDirectory);
+            const workspace = workspaceMetadata.execution_directory;
+            const workspaceId = workspaceMetadata.workspace_id;
+            if (workspaceId) {
+                releaseManagedDispatch = acquireManagedWorkspaceDispatch(workspaceId);
+                if (!releaseManagedDispatch) {
+                    return jsonError({
+                        server_id,
+                        status: "workspace_unavailable",
+                        workspace_id: workspaceId,
+                        workspace: workspaceMetadata,
+                    });
+                }
+            }
+            const client = clientForServer(server_id, workspace);
+            if (!client)
+                return jsonError({
+                    server_id,
+                    status: "server_not_found",
+                    ...(workspaceMetadata.managed
+                        ? { workspace: workspaceMetadata, workspace_id: workspaceId }
+                        : {}),
+                });
             if (parsedModel) {
                 const requested = parsedModel;
                 // Validate against the server's real provider/model catalog: promptAsync is
@@ -56,6 +135,9 @@ export function registerOpencodeStartTask(server) {
                             server_id,
                             status: "unknown_model",
                             model,
+                            ...(workspaceMetadata.managed
+                                ? { workspace: workspaceMetadata, workspace_id: workspaceId }
+                                : {}),
                             message: "model is not available on this server; copy an exact 'providerID/modelID' from opencode_list_agents (or from available_models below) instead of guessing",
                             available_models: providers.flatMap((p) => Object.keys(p.models).map((m) => `${p.id}/${m}`)),
                         });
@@ -63,36 +145,159 @@ export function registerOpencodeStartTask(server) {
                 }
             }
             const created = await client.session.create({ body: { title: prompt.slice(0, 60) } });
+            if (sdkResponseError(created))
+                throw sdkResponseError(created);
             const sessionId = created.data?.id;
             if (!sessionId) {
-                return jsonError({ server_id, status: "error", message: "failed to create session" });
+                return jsonError({
+                    server_id,
+                    status: "error",
+                    message: "failed to create session",
+                    ...(workspaceMetadata?.managed
+                        ? { workspace: workspaceMetadata, workspace_id: workspaceMetadata.workspace_id }
+                        : {}),
+                });
+            }
+            if (workspaceId) {
+                if (!registerManagedWorkspaceSession(workspaceId, sessionId)) {
+                    return jsonError({
+                        server_id,
+                        status: "workspace_unavailable",
+                        workspace_id: workspaceId,
+                        workspace: workspaceMetadata,
+                    });
+                }
             }
-            // Fire-and-forget: promptAsync returns as soon as the prompt is accepted,
-            // the agent keeps working in the background. Poll with get_task_status.
-            await client.session.promptAsync({
+            else {
+                registerPermissionSession(server_id, sourceDirectory, sessionId, server.permissionPolicy);
+            }
+            const verified = Boolean(expected_changes?.length || checks?.length);
+            const lease = await reserveWorkspace(workspace, verified);
+            if (!lease) {
+                unregisterPermissionSession(server_id, workspace, sessionId);
+                return jsonError({
+                    server_id,
+                    status: "workspace_busy",
+                    workspace: workspaceMetadata,
+                    workspace_id: workspaceId,
+                });
+            }
+            provisionalLease = lease;
+            let baseline;
+            let baselineError;
+            try {
+                baseline = await captureWorkspace(workspace, expected_changes?.map((item) => item.path));
+            }
+            catch (error) {
+                baselineError = error instanceof Error ? error.message : String(error);
+            }
+            const taskId = randomUUID();
+            const runId = randomUUID();
+            const messageId = createMessageId();
+            const startedAt = Date.now();
+            const run = {
+                run_id: runId,
+                message_id: messageId,
+                startedAt,
+                expectedChanges: expected_changes,
+                checks: checks,
+                baseline,
+                baselineError,
+                workspaceLease: lease,
+                controller: new AbortController(),
+                dispatchState: "dispatching",
+            };
+            registerTask({
+                taskId,
+                serverId: server_id,
+                sessionId,
+                directory: workspace,
+                workspace: workspaceMetadata,
+                workspaceId,
+                createdAt: startedAt,
+                currentRunId: runId,
+                runs: [run],
+            });
+            provisionalLease = undefined;
+            if (workspaceId)
+                associateManagedWorkspaceTask(workspaceId, taskId);
+            const outcome = await sendPromptAndClassify(() => client.session.promptAsync({
                 path: { id: sessionId },
                 body: {
+                    messageID: messageId,
                     parts: [{ type: "text", text: prompt }],
                     ...(agent ? { agent } : {}),
                     ...(parsedModel ? { model: parsedModel } : {}),
                 },
-            });
-            const taskId = randomUUID();
-            registerTask({ taskId, serverId: server_id, sessionId, createdAt: Date.now() });
+            }));
+            if (outcome.state === "rejected") {
+                if (workspaceId) {
+                    run.dispatchState = "rejected";
+                    run.executionState = "failed";
+                    run.reportReady = true;
+                    run.result = {
+                        task_id: taskId,
+                        run_id: runId,
+                        status: "failed",
+                        result: null,
+                        error: outcome.error,
+                    };
+                    releaseWorkspace(lease);
+                    run.workspaceLease = undefined;
+                }
+                else {
+                    removeTask(taskId);
+                }
+                unregisterPermissionSession(server_id, workspace, sessionId);
+                return jsonError({
+                    server_id,
+                    task_id: workspaceId ? taskId : undefined,
+                    run_id: workspaceId ? runId : undefined,
+                    status: "prompt_rejected",
+                    http_status: outcome.status,
+                    message: outcome.error,
+                    workspace: workspaceMetadata,
+                    workspace_id: workspaceMetadata.workspace_id,
+                });
+            }
+            run.dispatchState = outcome.state;
+            if (outcome.state === "uncertain")
+                run.dispatchError = outcome.error;
+            observeRun(taskId, runId);
             return jsonResult({
                 task_id: taskId,
+                run_id: runId,
                 server_id,
                 session_id: sessionId,
-                status: "pending",
+                workspace: workspaceMetadata,
+                ...(workspaceId ? { workspace_id: workspaceId } : {}),
+                status: outcome.state === "accepted" ? "pending" : "dispatch_uncertain",
+                ...(outcome.state === "uncertain"
+                    ? {
+                        dispatch: {
+                            state: outcome.state,
+                            error: outcome.error,
+                            http_status: outcome.status,
+                        },
+                    }
+                    : {}),
             });
         }
         catch (error) {
+            if (provisionalLease)
+                releaseWorkspace(provisionalLease);
             return jsonError({
                 server_id,
                 status: "error",
                 message: error instanceof Error ? error.message : String(error),
+                ...(workspaceMetadata?.managed
+                    ? { workspace: workspaceMetadata, workspace_id: workspaceMetadata.workspace_id }
+                    : {}),
             });
         }
+        finally {
+            releaseManagedDispatch?.();
+        }
     });
 }
 //# sourceMappingURL=start_task.js.map

package/build/src/modules/tools/start_task.js.map

@@ -1 +1 @@
-{"version":3,"file":"start_task.js","sourceRoot":"","sources":["../../../../src/modules/tools/start_task.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"start_task.js","sourceRoot":"","sources":["../../../../src/modules/tools/start_task.ts"],"names":[],"mappings":"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"}

package/build/src/modules/tools/stop_server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stop_server.d.ts","sourceRoot":"","sources":["../../../../src/modules/tools/stop_server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAIzE,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,SAAS,QAoC3D"}
+{"version":3,"file":"stop_server.d.ts","sourceRoot":"","sources":["../../../../src/modules/tools/stop_server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAKzE,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,SAAS,QAqD3D"}

package/build/src/modules/tools/stop_server.js

@@ -1,4 +1,5 @@
 import { z } from "zod";
+import { stopServerObservers } from "../shared/run-observer.js";
 import { getServer, removeServer } from "../shared/server-registry.js";
 export function registerOpencodeStopServer(server) {
     server.registerTool("opencode_stop_server", {
@@ -19,6 +20,22 @@ export function registerOpencodeStopServer(server) {
                 ],
             };
         }
+        const checksDrained = await stopServerObservers(server_id);
+        if (!checksDrained) {
+            return {
+                isError: true,
+                content: [
+                    {
+                        type: "text",
+                        text: JSON.stringify({
+                            server_id,
+                            status: "cleanup_pending",
+                            message: "Check process termination could not be confirmed; server and workspace lease remain active. Retry opencode_stop_server after cleanup settles.",
+                        }),
+                    },
+                ],
+            };
+        }
         instance.close();
         removeServer(server_id);
         return {

package/build/src/modules/tools/stop_server.js.map

@@ -1 +1 @@
-{"version":3,"file":"stop_server.js","sourceRoot":"","sources":["../../../../src/modules/tools/stop_server.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAEvE,MAAM,UAAU,0BAA0B,CAAC,MAAiB;IAC1D,MAAM,CAAC,YAAY,CACjB,sBAAsB,EACtB;QACE,WAAW,EAAE,yCAAyC;QACtD,WAAW,EAAE;YACX,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,mCAAmC,CAAC;SACpE;KACF,EACD,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE;QACtB,MAAM,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;QACtC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;qBACzD;iBACF;aACF,CAAC;QACJ,CAAC;QAED,QAAQ,CAAC,KAAK,EAAE,CAAC;QACjB,YAAY,CAAC,SAAS,CAAC,CAAC;QAExB,OAAO;YACL,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;iBACvD;aACF;SACF,CAAC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"stop_server.js","sourceRoot":"","sources":["../../../../src/modules/tools/stop_server.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAEvE,MAAM,UAAU,0BAA0B,CAAC,MAAiB;IAC1D,MAAM,CAAC,YAAY,CACjB,sBAAsB,EACtB;QACE,WAAW,EAAE,yCAAyC;QACtD,WAAW,EAAE;YACX,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,mCAAmC,CAAC;SACpE;KACF,EACD,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE;QACtB,MAAM,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;QACtC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;qBACzD;iBACF;aACF,CAAC;QACJ,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAAC,SAAS,CAAC,CAAC;QAC3D,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;4BACnB,SAAS;4BACT,MAAM,EAAE,iBAAiB;4BACzB,OAAO,EACL,+IAA+I;yBAClJ,CAAC;qBACH;iBACF;aACF,CAAC;QACJ,CAAC;QACD,QAAQ,CAAC,KAAK,EAAE,CAAC;QACjB,YAAY,CAAC,SAAS,CAAC,CAAC;QAExB,OAAO;YACL,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;iBACvD;aACF;SACF,CAAC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC"}

package/build/src/modules/tools/wait_for_task.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wait_for_task.d.ts","sourceRoot":"","sources":["../../../../src/modules/tools/wait_for_task.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAwDzE,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,SAAS,QAuG5D"}
+{"version":3,"file":"wait_for_task.d.ts","sourceRoot":"","sources":["../../../../src/modules/tools/wait_for_task.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AA6FzE,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,SAAS,QAuL5D"}

package/build/src/modules/tools/wait_for_task.js

@@ -1,13 +1,13 @@
 import { z } from "zod";
 import { getMaxToolTimeoutMs } from "../shared/config.js";
 import { jsonError, jsonResult } from "../shared/mcp-result.js";
-import { clientForTask, deriveTaskStatus, } from "../shared/opencode-client.js";
+import { clientForTask, deriveTaskStatus, isTerminalTaskStatus, } from "../shared/opencode-client.js";
+import { getTask } from "../shared/task-registry.js";
 const DEFAULT_TIMEOUT_MS = 120_000;
 const DEFAULT_POLL_INTERVAL_MS = 2_500;
 const MIN_POLL_INTERVAL_MS = 500;
-const FINISHED_STATUSES = new Set(["completed", "failed", "error"]);
 function isFinished(result) {
-    return result !== undefined && FINISHED_STATUSES.has(result.status);
+    return result !== undefined && isTerminalTaskStatus(result.status);
 }
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
@@ -18,7 +18,7 @@ function sleep(ms) {
  * poll loop. Failures are swallowed per-task so one bad re-derivation doesn't
  * fail the whole call.
  */
-async function enrichUnfinishedWithProgress(tasks, taskData) {
+async function enrichUnfinishedWithProgress(tasks, taskData, deadline) {
     const clientByTaskId = new Map(taskData.map((entry) => [entry.task_id, entry.client]));
     return Promise.all(tasks.map(async (task) => {
         if (isFinished(task))
@@ -26,19 +26,43 @@ async function enrichUnfinishedWithProgress(tasks, taskData) {
         // Every task_id in `tasks` was resolved into taskData before polling started.
         // biome-ignore lint/style/noNonNullAssertion: guaranteed present, see comment above
         const client = clientByTaskId.get(task.task_id);
+        const remaining = deadline - Date.now();
+        if (remaining <= 0)
+            return task;
+        const controller = new AbortController();
         try {
-            return await deriveTaskStatus(client.client, client.sessionId, task.task_id, {
+            return await pollUntilDeadline(deriveTaskStatus(client.client, client.sessionId, task.task_id, {
                 includeProgress: true,
-            });
+                includeUsage: true,
+                signal: controller.signal,
+            }), remaining, () => controller.abort(new Error("wait deadline exceeded")));
         }
         catch {
             return task;
         }
     }));
 }
+async function pollUntilDeadline(operation, remainingMs, onTimeout) {
+    let timer;
+    try {
+        return await Promise.race([
+            operation,
+            new Promise((_, reject) => {
+                timer = setTimeout(() => {
+                    onTimeout();
+                    reject(new Error("status poll deadline exceeded"));
+                }, remainingMs);
+                timer.unref?.();
+            }),
+        ]);
+    }
+    finally {
+        clearTimeout(timer);
+    }
+}
 export function registerOpencodeWaitForTask(server) {
     server.registerTool("opencode_wait_for_task", {
-        description: "Long-poll one or more delegated tasks until they finish or the timeout elapses. Use mode 'all' to wait for all tasks, or 'any' to return as soon as one completes. Set include_progress to enrich still-running tasks in the final result with a partial output snippet and the currently running tool.",
+        description: "Long-poll one or more delegated tasks until they finish or the timeout elapses. Use mode 'all' to wait for all tasks, or 'any' to return as soon as one completes. Set include_progress to best-effort enrich still-running tasks within the same wait deadline; when time runs out, return the last observed status and progress.",
         inputSchema: {
             task_ids: z.string().array().min(1).describe("IDs of tasks to wait for"),
             mode: z
@@ -53,18 +77,25 @@ export function registerOpencodeWaitForTask(server) {
                 .number()
                 .optional()
                 .describe(`Time between status checks in milliseconds (default ${DEFAULT_POLL_INTERVAL_MS})`),
+            until: z
+                .enum(["execution", "report"])
+                .optional()
+                .describe("Wait for execution (default) or finalized execution report"),
             include_progress: z
                 .boolean()
                 .optional()
-                .describe("If true, enrich tasks that are still not finished in the returned result with a partial output snippet and the currently running tool (not used during polling, only on the final result)"),
+                .describe("If true, best-effort enrich unfinished tasks with a partial output snippet and the currently running tool, without extending the wait deadline"),
         },
-    }, async ({ task_ids, mode = "all", timeout_ms, poll_interval_ms, include_progress }) => {
+    }, async ({ task_ids, mode = "all", timeout_ms, poll_interval_ms, include_progress, until = "execution", }) => {
         // Fail-fast: check for unknown task IDs before polling starts
         const unknownIds = [];
         const taskData = [];
         for (const taskId of task_ids) {
             const resolved = clientForTask(taskId);
-            if (!resolved) {
+            const tracked = getTask(taskId);
+            const cached = tracked?.runs?.find((run) => run.run_id === tracked.currentRunId);
+            if ((!tracked && !resolved) ||
+                (!resolved && until === "execution" && !cached?.reportReady)) {
                 unknownIds.push(taskId);
             }
             else {
@@ -81,40 +112,95 @@ export function registerOpencodeWaitForTask(server) {
         while (true) {
             // Poll all tasks that are not yet finished
             for (const { task_id, client } of taskData) {
+                const currentRun = getTask(task_id)?.runs?.find((run) => run.run_id === getTask(task_id)?.currentRunId);
+                if (currentRun?.reportReady) {
+                    const cachedStatus = currentRun.result?.status ?? currentRun.executionState ?? "error";
+                    statusMap.set(task_id, cachedStatus === "error"
+                        ? {
+                            task_id,
+                            status: "error",
+                            error: currentRun.result?.error ?? "execution report unavailable",
+                        }
+                        : { task_id, status: cachedStatus });
+                    continue;
+                }
                 if (isFinished(statusMap.get(task_id)))
                     continue;
+                if (!client) {
+                    statusMap.set(task_id, { task_id, status: "running" });
+                    continue;
+                }
                 try {
-                    const result = await deriveTaskStatus(client.client, client.sessionId, task_id);
+                    const remaining = Math.max(1, deadline - Date.now());
+                    const controller = new AbortController();
+                    const result = await pollUntilDeadline(deriveTaskStatus(client.client, client.sessionId, task_id, {
+                        includeUsage: true,
+                        signal: controller.signal,
+                    }), remaining, () => controller.abort(new Error("wait deadline exceeded")));
                     statusMap.set(task_id, result);
                 }
                 catch (error) {
-                    // Per-task SDK error: mark as finished with error
-                    statusMap.set(task_id, {
-                        task_id,
-                        status: "error",
-                        error: error instanceof Error ? error.message : String(error),
-                    });
+                    // The overall deadline returns the last known live status rather than
+                    // converting a slow read into a completed per-task error.
+                    statusMap.set(task_id, Date.now() >= deadline
+                        ? (statusMap.get(task_id) ?? { task_id, status: "running" })
+                        : {
+                            task_id,
+                            status: "error",
+                            error: error instanceof Error ? error.message : String(error),
+                            usage: {
+                                captured_at: new Date().toISOString(),
+                                snapshot_kind: "live_observation",
+                                report: null,
+                                diagnostic: `usage unavailable: ${error instanceof Error ? error.message : String(error)}`,
+                            },
+                        });
                 }
             }
             // biome-ignore lint/style/noNonNullAssertion: every task_id was just written to statusMap above
             const tasks = task_ids.map((id) => statusMap.get(id));
-            if (mode === "all" && tasks.every(isFinished)) {
-                return jsonResult({ mode, tasks, timed_out: false });
+            const done = (task) => until === "report"
+                ? Boolean(getTask(task.task_id)?.runs?.find((run) => run.run_id === getTask(task.task_id)?.currentRunId)?.reportReady)
+                : isFinished(task);
+            if (mode === "all" && tasks.every(done)) {
+                return jsonResult({ mode, tasks: addReports(tasks), timed_out: false });
             }
-            if (mode === "any" && tasks.some(isFinished)) {
+            if (mode === "any" && tasks.some(done)) {
                 const enriched = include_progress
-                    ? await enrichUnfinishedWithProgress(tasks, taskData)
+                    ? await enrichUnfinishedWithProgress(tasks, taskData.filter((item) => Boolean(item.client)), deadline)
                     : tasks;
-                return jsonResult({ mode, tasks: enriched, timed_out: false });
+                return jsonResult({ mode, tasks: addReports(enriched), timed_out: false });
             }
             if (Date.now() >= deadline) {
                 const enriched = include_progress
-                    ? await enrichUnfinishedWithProgress(tasks, taskData)
+                    ? await enrichUnfinishedWithProgress(tasks, taskData.filter((item) => Boolean(item.client)), deadline)
                     : tasks;
-                return jsonResult({ mode, tasks: enriched, timed_out: true });
+                return jsonResult({ mode, tasks: addReports(enriched), timed_out: true });
             }
             await sleep(pollInterval);
         }
     });
 }
+function addReports(tasks) {
+    return tasks.map((result) => {
+        const task = getTask(result.task_id);
+        const run = task?.runs?.find((item) => item.run_id === task.currentRunId);
+        if (!run)
+            return result;
+        return {
+            ...result,
+            ...(run.reportReady && run.executionState ? { status: run.executionState } : {}),
+            run_id: run.run_id,
+            changes: run.report?.changes ?? [],
+            verification: run.report?.verification ?? { state: "pending", checks: [] },
+            diagnostics: run.report?.diagnostics ?? [],
+            evidence: run.report?.evidence,
+            ...(run.usage ? { usage: run.usage } : {}),
+            ...(task?.workspace ? { workspace: task.workspace } : {}),
+            ...(run.dispatchState === "uncertain"
+                ? { dispatch: { state: run.dispatchState, error: run.dispatchError } }
+                : {}),
+        };
+    });
+}
 //# sourceMappingURL=wait_for_task.js.map

package/build/src/modules/tools/wait_for_task.js.map

@@ -1 +1 @@
-{"version":3,"file":"wait_for_task.js","sourceRoot":"","sources":["../../../../src/modules/tools/wait_for_task.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wait_for_task.js","sourceRoot":"","sources":["../../../../src/modules/tools/wait_for_task.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-server-opencode",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "MCP server that lets any MCP host (Claude Code, Codex CLI, Cursor, etc.) drive OpenCode and delegate tasks asynchronously to its agents",
   "main": "./build/src/index.js",
   "types": "./build/src/index.d.ts",
@@ -42,6 +42,7 @@
     "lint:format": "biome format --write .",
     "test": "vitest run",
     "test:coverage": "vitest run --coverage",
+    "smoke": "pnpm build && node --experimental-strip-types scripts/smoke.ts",
     "build": "rm -rf build && npx tsc && chmod +x build/src/index.js",
     "prepare": "npm run build",
     "publish": "npm publish --access public"