cursor-opencode-provider 0.2.2 → 0.2.4

package/dist/protocol/messages.js

@@ -30,10 +30,17 @@ export function createMessageTypes() {
     // Display ToolCall (interaction_update.tool_call_*) — agent.v1 oneof, not
     // {tool_name,args} strings. Args-only wrappers are enough to bridge into
     // OpenCode; result payloads are ignored on decode.
+    root.add(new protobuf.Enum("TodoStatus", {
+        TODO_STATUS_UNSPECIFIED: 0,
+        TODO_STATUS_PENDING: 1,
+        TODO_STATUS_IN_PROGRESS: 2,
+        TODO_STATUS_COMPLETED: 3,
+        TODO_STATUS_CANCELLED: 4,
+    }));
     addType(root, "TodoItem", [
         { id: 1, name: "id", type: "string" },
         { id: 2, name: "content", type: "string" },
-        { id: 3, name: "status", type: "int32" },
+        { id: 3, name: "status", type: "TodoStatus" },
         { id: 4, name: "created_at", type: "int64" },
         { id: 5, name: "updated_at", type: "int64" },
         { id: 6, name: "dependencies", type: "string", repeated: true },
@@ -127,6 +134,33 @@ export function createMessageTypes() {
         { id: 6, name: "agent_id", type: "string" },
     ]);
     addType(root, "TaskToolCall", [{ id: 1, name: "args", type: "TaskToolArgs" }]);
+    // Native subagent execution is separate from the display-only TaskToolCall.
+    // Cursor asks the local client to run the task through ExecServerMessage #28
+    // and waits for the correlated SubagentResult at ExecClientMessage #28.
+    addType(root, "SubagentArgs", [
+        { id: 1, name: "tool_call_id", type: "string" },
+        { id: 2, name: "subagent_type", type: "string" },
+        { id: 3, name: "model_id", type: "string" },
+        { id: 4, name: "prompt", type: "string" },
+        { id: 5, name: "readonly", type: "bool" },
+        { id: 6, name: "resume_agent_id", type: "string" },
+        { id: 7, name: "run_in_background", type: "bool" },
+    ]);
+    addType(root, "SubagentSuccess", [
+        { id: 1, name: "agent_id", type: "string" },
+        { id: 2, name: "final_message", type: "string" },
+        { id: 3, name: "tool_call_count", type: "int32" },
+        { id: 4, name: "background_reason", type: "int32" },
+        { id: 5, name: "transcript_path", type: "string" },
+    ]);
+    addType(root, "SubagentError", [
+        { id: 1, name: "agent_id", type: "string" },
+        { id: 2, name: "error", type: "string" },
+    ]);
+    addType(root, "SubagentResult", [
+        { id: 1, name: "success", type: "SubagentSuccess" },
+        { id: 2, name: "error", type: "SubagentError" },
+    ], [{ name: "result", fields: ["success", "error"] }]);
     addType(root, "AskQuestionOption", [
         { id: 1, name: "id", type: "string" },
         { id: 2, name: "label", type: "string" },
@@ -202,7 +236,8 @@ export function createMessageTypes() {
     addType(root, "PiLsToolCall", [{ id: 1, name: "args", type: "PiLsToolArgs" }]);
     // Display-only native tools Cursor may complete without an ExecServerMessage.
     addType(root, "ReadTodosArgs", [
-        { id: 1, name: "todo_ids", type: "string", repeated: true },
+        { id: 1, name: "status_filter", type: "TodoStatus", repeated: true },
+        { id: 2, name: "id_filter", type: "string", repeated: true },
     ]);
     addType(root, "ReadTodosToolCall", [{ id: 1, name: "args", type: "ReadTodosArgs" }]);
     addType(root, "AwaitArgs", [
@@ -483,6 +518,10 @@ export function createMessageTypes() {
         { id: 2, name: "working_directory", type: "string" },
         { id: 3, name: "timeout", type: "uint32" },
         { id: 4, name: "tool_call_id", type: "string" },
+        // Canonical agent.v1 fields used by the native CLI to distinguish a
+        // foreground cancellation deadline from a soft background handoff.
+        { id: 13, name: "timeout_behavior", type: "uint32" },
+        { id: 14, name: "hard_timeout", type: "uint32" },
     ]);
     addType(root, "ShellStreamStart", []); // optional SandboxPolicy only; empty is valid
     addType(root, "ShellStreamStdout", [{ id: 1, name: "data", type: "string" }]);
@@ -490,7 +529,18 @@ export function createMessageTypes() {
     // agent.v1: code is uint32; protobufjs must emit code=0 (defaults are load-bearing).
     addType(root, "ShellStreamExit", [
         { id: 1, name: "code", type: "uint32" },
+        { id: 2, name: "cwd", type: "string" },
         { id: 4, name: "aborted", type: "bool" },
+        { id: 5, name: "abort_reason", type: "uint32" },
+        { id: 6, name: "local_execution_time_ms", type: "uint32" },
+    ]);
+    addType(root, "ShellStreamBackgrounded", [
+        { id: 1, name: "shell_id", type: "uint32" },
+        { id: 2, name: "command", type: "string" },
+        { id: 3, name: "working_directory", type: "string" },
+        { id: 4, name: "pid", type: "uint32" },
+        { id: 5, name: "ms_to_wait", type: "uint32" },
+        { id: 6, name: "reason", type: "uint32" },
     ]);
     // ShellRejected / ShellPermissionDenied (shared with ShellResult) — reason/error at #3.
     addType(root, "ShellRejected", [
@@ -503,6 +553,36 @@ export function createMessageTypes() {
         { id: 2, name: "working_directory", type: "string" },
         { id: 3, name: "error", type: "string" },
     ]);
+    // Cursor's non-blocking shell path is a separate exec variant from the
+    // foreground ShellStream above. The host only needs the fields used at the
+    // OpenCode boundary; protobufjs safely skips the richer classifier/approval
+    // messages that are private to Cursor's native client.
+    addType(root, "BackgroundShellSpawnArgs", [
+        { id: 1, name: "command", type: "string" },
+        { id: 2, name: "working_directory", type: "string" },
+        { id: 3, name: "tool_call_id", type: "string" },
+        { id: 6, name: "enable_write_shell_stdin_tool", type: "bool" },
+        { id: 7, name: "description", type: "string" },
+        { id: 12, name: "skip_approval", type: "bool" },
+        { id: 13, name: "conversation_id", type: "string" },
+    ]);
+    addType(root, "BackgroundShellSpawnSuccess", [
+        { id: 1, name: "shell_id", type: "uint32" },
+        { id: 2, name: "command", type: "string" },
+        { id: 3, name: "working_directory", type: "string" },
+        { id: 4, name: "pid", type: "uint32" },
+    ]);
+    addType(root, "BackgroundShellSpawnError", [
+        { id: 1, name: "command", type: "string" },
+        { id: 2, name: "working_directory", type: "string" },
+        { id: 3, name: "error", type: "string" },
+    ]);
+    addType(root, "BackgroundShellSpawnResult", [
+        { id: 1, name: "success", type: "BackgroundShellSpawnSuccess" },
+        { id: 2, name: "error", type: "BackgroundShellSpawnError" },
+        { id: 3, name: "rejected", type: "ShellRejected" },
+        { id: 4, name: "permission_denied", type: "ShellPermissionDenied" },
+    ], [{ name: "result", fields: ["success", "error", "rejected", "permission_denied"] }]);
     addType(root, "ShellStream", [
         { id: 1, name: "stdout", type: "ShellStreamStdout" },
         { id: 2, name: "stderr", type: "ShellStreamStderr" },
@@ -510,7 +590,8 @@ export function createMessageTypes() {
         { id: 4, name: "start", type: "ShellStreamStart" },
         { id: 5, name: "rejected", type: "ShellRejected" },
         { id: 6, name: "permission_denied", type: "ShellPermissionDenied" },
-    ], [{ name: "event", fields: ["stdout", "stderr", "exit", "start", "rejected", "permission_denied"] }]);
+        { id: 7, name: "backgrounded", type: "ShellStreamBackgrounded" },
+    ], [{ name: "event", fields: ["stdout", "stderr", "exit", "start", "rejected", "permission_denied", "backgrounded"] }]);
     addType(root, "GlobArgs", [
         { id: 1, name: "target_directory", type: "string" },
         { id: 2, name: "glob_pattern", type: "string" },
@@ -627,6 +708,10 @@ export function createMessageTypes() {
         { id: 1, name: "enabled", type: "bool" },
         { id: 2, name: "mcp_descriptors", type: "McpDescriptor", repeated: true },
     ]);
+    addType(root, "PermissionsAutoRunInstructions", [
+        { id: 1, name: "allow_instructions", type: "string", repeated: true },
+        { id: 2, name: "block_instructions", type: "string", repeated: true },
+    ]);
     addType(root, "RequestContextPayload", [
         { id: 2, name: "rules", type: "CursorRule", repeated: true },
         { id: 4, name: "env", type: "RequestContextEnv" },
@@ -648,8 +733,8 @@ export function createMessageTypes() {
         { id: 43, name: "agent_skills_info_complete", type: "bool" },
         { id: 44, name: "mcp_file_system_info_complete", type: "bool" },
         { id: 45, name: "git_status_info_complete", type: "bool" },
-        { id: 46, name: "user_permissions_auto_run", type: "bool" },
-        { id: 47, name: "project_permissions_auto_run", type: "bool" },
+        { id: 46, name: "user_permissions_auto_run", type: "PermissionsAutoRunInstructions" },
+        { id: 47, name: "project_permissions_auto_run", type: "PermissionsAutoRunInstructions" },
     ]);
     addType(root, "RequestContextSuccess", [
         { id: 1, name: "request_context", type: "RequestContextPayload" },
@@ -657,6 +742,39 @@ export function createMessageTypes() {
     addType(root, "RequestContextResult", [
         { id: 1, name: "success", type: "RequestContextSuccess" },
     ]);
+    // Cursor probes MCP server availability before emitting an MCP-backed tool
+    // call. OpenCode owns those servers, so answer from the descriptors already
+    // advertised in RequestContext rather than surfacing this as a user tool.
+    addType(root, "McpStateExecArgs", [
+        { id: 1, name: "server_identifiers", type: "string", repeated: true },
+        { id: 2, name: "kick_only", type: "bool" },
+    ]);
+    addType(root, "McpInstructions", [
+        { id: 1, name: "server_name", type: "string" },
+        { id: 2, name: "instructions", type: "string" },
+        { id: 3, name: "server_identifier", type: "string" },
+    ]);
+    addType(root, "McpStateServer", [
+        { id: 1, name: "server_name", type: "string" },
+        { id: 2, name: "server_identifier", type: "string" },
+        { id: 3, name: "plugin", type: "string" },
+        { id: 4, name: "marketplace", type: "string" },
+        // Unlike McpDescriptor (#23/#34), exec #36 returns the full canonical
+        // McpToolDefinition shape, including composite name and provider identity.
+        { id: 5, name: "tools", type: "McpToolDefinition", repeated: true },
+        { id: 6, name: "instructions", type: "McpInstructions", repeated: true },
+        { id: 7, name: "status", type: "string" },
+    ]);
+    addType(root, "McpStateSuccess", [
+        { id: 1, name: "servers", type: "McpStateServer", repeated: true },
+    ]);
+    addType(root, "McpStateError", [{ id: 1, name: "error", type: "string" }]);
+    addType(root, "McpStateRejected", [{ id: 1, name: "reason", type: "string" }]);
+    addType(root, "McpStateExecResult", [
+        { id: 1, name: "success", type: "McpStateSuccess" },
+        { id: 2, name: "error", type: "McpStateError" },
+        { id: 3, name: "rejected", type: "McpStateRejected" },
+    ], [{ name: "result", fields: ["success", "error", "rejected"] }]);
     // ExecServerMessage — server asks us to execute a tool
     addType(root, "ExecServerMessage", [
         { id: 1, name: "id", type: "uint32" },
@@ -670,6 +788,9 @@ export function createMessageTypes() {
         { id: 10, name: "request_context_args", type: "RequestContextArgs" },
         { id: 11, name: "mcp_args", type: "McpArgs" },
         { id: 14, name: "shell_stream_args", type: "ShellArgs" },
+        { id: 16, name: "background_shell_spawn_args", type: "BackgroundShellSpawnArgs" },
+        { id: 28, name: "subagent_args", type: "SubagentArgs" },
+        { id: 36, name: "mcp_state_exec_args", type: "McpStateExecArgs" },
         { id: 45, name: "pi_read_args", type: "PiReadToolArgs" },
         { id: 46, name: "pi_bash_args", type: "PiBashToolArgs" },
         { id: 47, name: "pi_edit_args", type: "PiEditToolArgs" },
@@ -679,7 +800,8 @@ export function createMessageTypes() {
         { id: 51, name: "pi_ls_args", type: "PiLsToolArgs" },
     ], [{ name: "args", fields: [
                 "write_args", "delete_args", "grep_args", "read_args", "ls_args",
-                "request_context_args", "mcp_args", "shell_stream_args",
+                "request_context_args", "mcp_args", "shell_stream_args", "background_shell_spawn_args", "mcp_state_exec_args",
+                "subagent_args",
                 "pi_read_args", "pi_bash_args", "pi_edit_args", "pi_write_args",
                 "pi_grep_args", "pi_find_args", "pi_ls_args",
             ] }]);
@@ -696,6 +818,9 @@ export function createMessageTypes() {
         { id: 10, name: "request_context_result", type: "RequestContextResult" },
         { id: 11, name: "mcp_result", type: "McpResult" },
         { id: 14, name: "shell_stream", type: "ShellStream" },
+        { id: 16, name: "background_shell_spawn_result", type: "BackgroundShellSpawnResult" },
+        { id: 28, name: "subagent_result", type: "SubagentResult" },
+        { id: 36, name: "mcp_state_exec_result", type: "McpStateExecResult" },
         { id: 46, name: "pi_read_result", type: "PiReadExecResult" },
         { id: 47, name: "pi_bash_result", type: "PiBashExecResult" },
         { id: 48, name: "pi_edit_result", type: "PiEditExecResult" },
@@ -705,7 +830,8 @@ export function createMessageTypes() {
         { id: 52, name: "pi_ls_result", type: "PiLsExecResult" },
     ], [{ name: "result", fields: [
                 "write_result", "delete_result", "grep_result", "read_result", "ls_result",
-                "request_context_result", "mcp_result", "shell_stream",
+                "request_context_result", "mcp_result", "shell_stream", "background_shell_spawn_result", "mcp_state_exec_result",
+                "subagent_result",
                 "pi_read_result", "pi_bash_result", "pi_edit_result", "pi_write_result",
                 "pi_grep_result", "pi_find_result", "pi_ls_result",
             ] }]);
@@ -743,19 +869,6 @@ export function createMessageTypes() {
         { id: 1, name: "text", type: "string" },
         { id: 2, name: "message_id", type: "string" },
     ]);
-    // McpToolDefinition — agent.v1 shape used by RequestContext.tools (#7) and
-    // AgentRunRequest.mcp_tools (#4). Capture 00074 / CLI: { #1 name (composite
-    // <server>-<tool>), #2 description, #3 input_schema (Value bytes),
-    // #4 provider_identifier, #5 tool_name }.
-    // (Defined later as McpToolDefinition; keep a legacy alias type name for
-    // any older encode paths that still look up "McpToolDescriptor".)
-    addType(root, "McpToolDescriptor", [
-        { id: 1, name: "name", type: "string" },
-        { id: 2, name: "description", type: "string" },
-        { id: 3, name: "input_schema", type: "bytes" },
-        { id: 4, name: "provider_identifier", type: "string" },
-        { id: 5, name: "tool_name", type: "string" },
-    ]);
     // RequestContext — UserMessageAction #2. Live per-turn tools go here
     // (AgentRunRequest.mcp_tools #4 is prewarm-only / empty on real turns).
     addType(root, "RequestContext", [
@@ -779,8 +892,8 @@ export function createMessageTypes() {
         { id: 43, name: "agent_skills_info_complete", type: "bool" },
         { id: 44, name: "mcp_file_system_info_complete", type: "bool" },
         { id: 45, name: "git_status_info_complete", type: "bool" },
-        { id: 46, name: "user_permissions_auto_run", type: "bool" },
-        { id: 47, name: "project_permissions_auto_run", type: "bool" },
+        { id: 46, name: "user_permissions_auto_run", type: "PermissionsAutoRunInstructions" },
+        { id: 47, name: "project_permissions_auto_run", type: "PermissionsAutoRunInstructions" },
     ]);
     addType(root, "UserMessageAction", [
         { id: 1, name: "user_message", type: "UserMessage" },
@@ -834,8 +947,8 @@ export function createMessageTypes() {
         { id: 9, name: "requested_model", type: "RequestedModel" },
         { id: 10, name: "unknown_flag", type: "uint32" },
         { id: 12, name: "field_12", type: "uint32" },
-        { id: 14, name: "available_models", type: "RequestedModel", repeated: true },
-        { id: 16, name: "conversation_id_dup", type: "string" },
+        { id: 14, name: "selected_subagent_models", type: "RequestedModel", repeated: true },
+        { id: 16, name: "conversation_group_id", type: "string" },
     ]);
     // ── Client heartbeat ──
     addType(root, "ClientHeartbeat", []);

package/dist/protocol/request.d.ts

@@ -1,5 +1,4 @@
 import { type OpencodeToolDef } from "./tools.js";
-import type { ModelInfo } from "../models.js";
 export type SeedHistoryMessage = {
     role: "system" | "user" | "assistant";
     content: string;
@@ -28,7 +27,6 @@ export type RunRequestInput = {
     }>;
     maxMode?: boolean;
     messageId?: string;
-    availableModels?: ModelInfo[];
     tools?: OpencodeToolDef[];
     /** Pre-resolved descriptors (including config-backed MCP server identity). */
     toolDescriptors?: Array<Record<string, unknown>>;

package/dist/protocol/request.js

@@ -34,12 +34,6 @@ export function buildSeedConversationState(input) {
         obj.root_prompt_messages_json = messages;
     return type.encode(type.fromObject(obj)).finish();
 }
-function buildAvailableModels(models) {
-    return models.map((m) => ({
-        model_id: m.id,
-        parameters: (m.variants ?? []).flatMap((v) => (v.parameterValues ?? []).map((p) => p)),
-    }));
-}
 /**
  * Build an AgentClientMessage{run_request} for a conversation turn.
  *
@@ -88,8 +82,6 @@ export function buildRunRequest(input) {
         mcp_tools: { mcp_tools: mcpTools },
         unknown_flag: 0,
         field_12: 0,
-        available_models: input.availableModels ? buildAvailableModels(input.availableModels) : [],
-        conversation_id_dup: input.conversationId,
     };
     return encodeMessage("AgentClientMessage", {
         run_request: runRequest,

package/dist/protocol/struct.js

@@ -3,7 +3,7 @@
 // Cursor's per-turn tool descriptors carry the tool `input_schema` (a JSON
 // Schema object) as a `google.protobuf.Value` whose `struct_value` holds the
 // schema — NOT a JSON string. Verified against a live capture
-// (request_context #7 → McpToolDescriptor #3):
+// (request_context #7 → McpToolDefinition #3):
 //   2a 9a07  0a10 0a04 74797065 1208 1a06 6f626a656374 ...
 //   = Value{#5 struct_value: Struct{#1 fields: {"type": Value{#3 string "object"}}}}
 //

package/dist/protocol/tool-call-bridge.js

@@ -467,7 +467,9 @@ export function extractExecDisplayCallId(execMsg) {
         "ls_args",
         "delete_args",
         "shell_stream_args",
+        "background_shell_spawn_args",
         "mcp_args",
+        "subagent_args",
     ]) {
         const args = asRecord(execMsg[key]);
         if (!args)

package/dist/protocol/tools.d.ts

@@ -1,3 +1,4 @@
+import type { CursorShellOutcome } from "../shell-timeout.js";
 export declare const REQUEST_CONTEXT_RESULT_FIELD = 10;
 export type OpencodeToolDef = {
     name: string;
@@ -54,6 +55,8 @@ export type ParsedExecRequest = {
     resultField: string;
     /** Typed error to return without asking OpenCode to execute invalid args. */
     localError?: string;
+    /** Original request values needed by typed Cursor result messages. */
+    resultMetadata?: Record<string, unknown>;
 };
 export declare function parseExecServerMessage(msg: Record<string, unknown>): ParsedExecRequest | undefined;
 /**
@@ -84,6 +87,10 @@ export type ToolResultInput = {
      * rewritten. read_result is always a read, so it unwraps regardless.
      */
     toolName?: string;
+    /** Original request fields required by a typed result (background shell). */
+    resultMetadata?: Record<string, unknown>;
+    /** Structured shell completion captured by the OpenCode plugin hook. */
+    shellOutcome?: CursorShellOutcome;
 };
 /**
  * Build one or more ExecClientMessage frames for a tool result.
@@ -121,7 +128,7 @@ export declare function unwrapReadOutput(output: string): string;
  * OpenCode returns free-form text; we wrap it in the minimal success shape the
  * server accepts (verified against agent.v1 wire captures).
  */
-export declare function buildTypedExecResult(resultField: string, output: string, error?: string, toolName?: string): Record<string, unknown>;
+export declare function buildTypedExecResult(resultField: string, output: string, error?: string, toolName?: string, resultMetadata?: Record<string, unknown>): Record<string, unknown>;
 export declare function buildToolCallPart(execMsg: ParsedExecRequest, sessionId: string): {
     toolCallId: string;
     toolName: string;
@@ -142,3 +149,9 @@ export declare function detectExecVariantField(agentServerPayload: Uint8Array):
  * Encode exec #10 request_context_result from a prebuilt RequestContext payload.
  */
 export declare function buildRequestContextResult(execId: number, requestContext: Record<string, unknown>): Uint8Array;
+/**
+ * Answer Cursor's exec #36 MCP-state probe from the same descriptors advertised
+ * in RequestContext. OpenCode remains the executor; this only confirms that the
+ * provider's virtual MCP servers and their tools are available.
+ */
+export declare function buildMcpStateResult(execId: number, args: Record<string, unknown>, requestContext: Record<string, unknown>): Uint8Array;