cursor-opencode-provider 0.2.3 → 0.2.5

package/dist/protocol/exec-variants.js

@@ -0,0 +1,55 @@
+export const CURSOR_EXEC_VARIANTS = [
+    { requestField: 2, requestName: "shell_args", resultField: 2, resultName: "shell_result", handling: "unsupported" },
+    { requestField: 3, requestName: "write_args", resultField: 3, resultName: "write_result", handling: "opencode-tool" },
+    { requestField: 4, requestName: "delete_args", resultField: 4, resultName: "delete_result", handling: "opencode-tool" },
+    { requestField: 5, requestName: "grep_args", resultField: 5, resultName: "grep_result", handling: "opencode-tool" },
+    { requestField: 7, requestName: "read_args", resultField: 7, resultName: "read_result", handling: "opencode-tool" },
+    { requestField: 8, requestName: "ls_args", resultField: 8, resultName: "ls_result", handling: "opencode-tool" },
+    { requestField: 9, requestName: "diagnostics_args", resultField: 9, resultName: "diagnostics_result", handling: "unsupported" },
+    { requestField: 10, requestName: "request_context_args", resultField: 10, resultName: "request_context_result", handling: "provider-control" },
+    { requestField: 11, requestName: "mcp_args", resultField: 11, resultName: "mcp_result", handling: "opencode-tool" },
+    { requestField: 14, requestName: "shell_stream_args", resultField: 14, resultName: "shell_stream", handling: "opencode-tool" },
+    { requestField: 16, requestName: "background_shell_spawn_args", resultField: 16, resultName: "background_shell_spawn_result", handling: "opencode-tool" },
+    { requestField: 17, requestName: "list_mcp_resources_exec_args", resultField: 17, resultName: "list_mcp_resources_exec_result", handling: "unsupported" },
+    { requestField: 18, requestName: "read_mcp_resource_exec_args", resultField: 18, resultName: "read_mcp_resource_exec_result", handling: "unsupported" },
+    { requestField: 20, requestName: "fetch_args", resultField: 20, resultName: "fetch_result", handling: "unsupported" },
+    { requestField: 21, requestName: "record_screen_args", resultField: 21, resultName: "record_screen_result", handling: "unsupported" },
+    { requestField: 22, requestName: "computer_use_args", resultField: 22, resultName: "computer_use_result", handling: "unsupported" },
+    { requestField: 23, requestName: "write_shell_stdin_args", resultField: 23, resultName: "write_shell_stdin_result", handling: "unsupported" },
+    { requestField: 27, requestName: "execute_hook_args", resultField: 27, resultName: "execute_hook_result", handling: "unsupported" },
+    { requestField: 28, requestName: "subagent_args", resultField: 28, resultName: "subagent_result", handling: "opencode-tool" },
+    { requestField: 29, requestName: "redacted_read_args", resultField: 29, resultName: "redacted_read_result", handling: "unsupported" },
+    { requestField: 30, requestName: "force_background_shell_args", resultField: 30, resultName: "force_background_shell_result", handling: "unsupported" },
+    { requestField: 31, requestName: "force_background_subagent_args", resultField: 31, resultName: "force_background_subagent_result", handling: "unsupported" },
+    { requestField: 36, requestName: "mcp_state_exec_args", resultField: 36, resultName: "mcp_state_exec_result", handling: "provider-control" },
+    { requestField: 37, requestName: "subagent_await_args", resultField: 37, resultName: "subagent_await_result", handling: "unsupported" },
+    { requestField: 38, requestName: "smart_mode_classifier_args", resultField: 38, resultName: "smart_mode_classifier_result", handling: "unsupported" },
+    { requestField: 40, requestName: "canvas_diagnostics_args", resultField: 40, resultName: "canvas_diagnostics_result", handling: "unsupported" },
+    { requestField: 41, requestName: "shell_allowlist_precheck_args", resultField: 41, resultName: "shell_allowlist_precheck_result", handling: "unsupported" },
+    { requestField: 42, requestName: "mcp_allowlist_precheck_args", resultField: 42, resultName: "mcp_allowlist_precheck_result", handling: "unsupported" },
+    { requestField: 43, requestName: "web_fetch_allowlist_precheck_args", resultField: 43, resultName: "web_fetch_allowlist_precheck_result", handling: "unsupported" },
+    { requestField: 44, requestName: "git_diff_request", resultField: 44, resultName: "git_diff_response", handling: "unsupported" },
+    { requestField: 45, requestName: "pi_read_args", resultField: 46, resultName: "pi_read_result", handling: "opencode-tool" },
+    { requestField: 46, requestName: "pi_bash_args", resultField: 47, resultName: "pi_bash_result", handling: "opencode-tool" },
+    { requestField: 47, requestName: "pi_edit_args", resultField: 48, resultName: "pi_edit_result", handling: "opencode-tool" },
+    { requestField: 48, requestName: "pi_write_args", resultField: 49, resultName: "pi_write_result", handling: "opencode-tool" },
+    { requestField: 49, requestName: "pi_grep_args", resultField: 50, resultName: "pi_grep_result", handling: "opencode-tool" },
+    { requestField: 50, requestName: "pi_find_args", resultField: 51, resultName: "pi_find_result", handling: "opencode-tool" },
+    { requestField: 51, requestName: "pi_ls_args", resultField: 52, resultName: "pi_ls_result", handling: "opencode-tool" },
+];
+const BY_REQUEST_FIELD = new Map(CURSOR_EXEC_VARIANTS.map((variant) => [variant.requestField, variant]));
+const BY_REQUEST_NAME = new Map(CURSOR_EXEC_VARIANTS.map((variant) => [variant.requestName, variant]));
+export function cursorExecVariantByRequestField(field) {
+    return BY_REQUEST_FIELD.get(field);
+}
+export function cursorExecVariantByRequestName(name) {
+    return BY_REQUEST_NAME.get(name);
+}
+export function describeCursorExecVariant(field) {
+    if (field === undefined)
+        return "unknown request field";
+    const variant = cursorExecVariantByRequestField(field);
+    if (!variant)
+        return `unknown request field #${field}`;
+    return `${variant.requestName} (request field #${variant.requestField}, expected result ${variant.resultName} field #${variant.resultField}, handling=${variant.handling})`;
+}

package/dist/protocol/interactions.d.ts

@@ -19,5 +19,12 @@ export declare class UnsupportedInteractionQueryError extends Error {
  * instead of accidentally restoring the heartbeat-only deadlock.
  */
 export declare function inspectInteractionQueryWire(agentServerPayload: Uint8Array): InteractionQueryWireInfo;
-/** Build the immediate typed response required by Cursor's Run RPC. */
+/**
+ * Build the immediate typed response required by Cursor's Run RPC.
+ *
+ * OpenCode has no Cursor UI callbacks, so every InteractionQuery is answered
+ * here with a conservative headless policy (reject UI-bound prompts; ack a few
+ * no-UI cases). See case 7 / F14 for create_plan auto-ack parity with Cursor
+ * CLI headless mode.
+ */
 export declare function handleInteractionQuery(query: Record<string, unknown>, agentServerPayload: Uint8Array): HandledInteraction;

package/dist/protocol/interactions.js

@@ -51,7 +51,14 @@ export function inspectInteractionQueryWire(agentServerPayload) {
         variantName: variantField === undefined ? undefined : variantNames[variantField],
     };
 }
-/** Build the immediate typed response required by Cursor's Run RPC. */
+/**
+ * Build the immediate typed response required by Cursor's Run RPC.
+ *
+ * OpenCode has no Cursor UI callbacks, so every InteractionQuery is answered
+ * here with a conservative headless policy (reject UI-bound prompts; ack a few
+ * no-UI cases). See case 7 / F14 for create_plan auto-ack parity with Cursor
+ * CLI headless mode.
+ */
 export function handleInteractionQuery(query, agentServerPayload) {
     const info = inspectInteractionQueryWire(agentServerPayload);
     if (info.id === undefined || info.variantField === undefined || !info.variantName) {
@@ -80,8 +87,14 @@ export function handleInteractionQuery(query, agentServerPayload) {
             outcome = "rejected";
             break;
         case 7:
+            // F14: create_plan_request_query auto-ack (Cursor CLI headless parity).
             // Cursor CLI's headless fallback acknowledges plan creation without a
-            // client-side URI; the plan remains in conversation state/checkpoints.
+            // client-side URI (`success` + empty `plan_uri`); the plan remains in
+            // conversation state / checkpoints. This provider mirrors that reply so
+            // the Run RPC does not deadlock waiting for UI approval. Impact: Cursor
+            // may treat the plan as accepted without an OpenCode UI confirm; local
+            // tool execution is still gated by OpenCode permissions. Do not change
+            // this to reject/prompt without CLI parity evidence.
             response = { create_plan_request_response: { result: { success: {}, plan_uri: "" } } };
             outcome = "acknowledged";
             break;

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", [
@@ -322,8 +357,11 @@ export function createMessageTypes() {
         { id: 2, name: "content", type: "string" },
         { id: 3, name: "total_lines", type: "int32" },
         { id: 4, name: "file_size", type: "int64" },
+        { id: 5, name: "data", type: "bytes" },
         { id: 6, name: "truncated", type: "bool" },
-    ]);
+        { id: 7, name: "output_blob_id", type: "bytes" },
+        { id: 8, name: "range_applied", type: "bool" },
+    ], [{ name: "output", fields: ["content", "data"] }]);
     addType(root, "ReadError", [
         { id: 1, name: "path", type: "string" },
         { id: 2, name: "error", type: "string" },
@@ -483,6 +521,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 +532,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 +556,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 +593,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 +711,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 +736,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" },
@@ -674,7 +762,9 @@ export function createMessageTypes() {
         { id: 2, name: "server_identifier", type: "string" },
         { id: 3, name: "plugin", type: "string" },
         { id: 4, name: "marketplace", type: "string" },
-        { id: 5, name: "tools", type: "McpFsToolDescriptor", repeated: true },
+        // 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" },
     ]);
@@ -701,6 +791,8 @@ 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" },
@@ -711,7 +803,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", "mcp_state_exec_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",
             ] }]);
@@ -728,6 +821,8 @@ 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" },
@@ -738,7 +833,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", "mcp_state_exec_result",
+                "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",
             ] }]);
@@ -776,19 +872,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", [
@@ -812,8 +895,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" },
@@ -867,8 +950,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;
@@ -11,8 +10,8 @@ export type RunRequestInput = {
     systemPrompt?: string;
     /**
      * Prior chat turns for a seed ConversationStateStructure (no checkpoint).
-     * Used after compaction reset so Cursor sees OpenCode's compacted history
-     * instead of an empty conversation.
+     * Tool outputs, when required for compaction/recovery, are represented as
+     * user-role OpenCode host observations rather than assistant-authored prose.
      */
     history?: SeedHistoryMessage[];
     /**
@@ -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

@@ -7,7 +7,12 @@ const TODO_STATUS = {
     3: "completed",
     4: "cancelled",
 };
-/** Cursor ToolCall oneof field → default OpenCode tool id. */
+/**
+ * Cursor ToolCall oneof field → default OpenCode tool id.
+ *
+ * F11: `delete_tool_call` has no OpenCode builtin; it remaps to bash (see the
+ * delete_tool_call branch below for `rm -f -- <path>`).
+ */
 const VARIANT_TO_OPENCODE = {
     shell_tool_call: "bash",
     delete_tool_call: "bash",
@@ -121,6 +126,10 @@ export function parseDisplayToolCall(callId, toolCall) {
             args: mcpArgs,
         };
     }
+    // create_plan_tool_call here is display-state mirroring into todowrite.
+    // Separately, InteractionQuery create_plan_request_query is auto-acked in
+    // protocol/interactions.ts (F14 / CLI headless parity) — that ack is not an
+    // execution of this display payload.
     if (variant === "update_todos_tool_call" || variant === "create_plan_tool_call") {
         const result = asRecord(payload.result);
         const success = asRecord(result?.success);
@@ -238,6 +247,7 @@ export function parseDisplayToolCall(callId, toolCall) {
             args: {},
         };
     }
+    // F11: display-path delete → bash `rm -f` (OpenCode has no delete tool).
     if (variant === "delete_tool_call") {
         const path = typeof args.path === "string" ? args.path : "";
         return {
@@ -467,7 +477,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;