cursor-opencode-provider 0.6.4 → 0.6.7

package/dist/protocol/messages.js

@@ -653,6 +653,199 @@ export function createMessageTypes() {
         { id: 2, name: "working_directory", type: "string" },
         { id: 3, name: "error", type: "string" },
     ]);
+    // ── Soft-deny stubs for known unsupported Cursor-native exec variants ──
+    // These are encode-only: enough to emit a populated deny, not full success.
+    // Canonical field numbers from agent.proto ExecClientMessage.
+    // ShellResult is also the live reply for exec #2 shell_args (OpenCode bash).
+    addType(root, "ShellSuccess", [
+        { id: 1, name: "command", type: "string" },
+        { id: 2, name: "working_directory", type: "string" },
+        { id: 3, name: "exit_code", type: "int32" },
+        { id: 4, name: "signal", type: "string" },
+        { id: 5, name: "stdout", type: "string" },
+        { id: 6, name: "stderr", type: "string" },
+        { id: 7, name: "execution_time", type: "int32" },
+        { id: 9, name: "shell_id", type: "uint32" },
+        { id: 11, name: "pid", type: "uint32" },
+        { id: 12, name: "ms_to_wait", type: "int32" },
+        { id: 13, name: "local_execution_time_ms", type: "int32" },
+        { id: 14, name: "background_reason", type: "uint32" },
+    ]);
+    addType(root, "ShellFailure", [
+        { id: 1, name: "command", type: "string" },
+        { id: 2, name: "working_directory", type: "string" },
+        { id: 3, name: "exit_code", type: "int32" },
+        { id: 4, name: "signal", type: "string" },
+        { id: 5, name: "stdout", type: "string" },
+        { id: 6, name: "stderr", type: "string" },
+        { id: 7, name: "execution_time", type: "int32" },
+        { id: 10, name: "abort_reason", type: "uint32" },
+        { id: 11, name: "aborted", type: "bool" },
+    ]);
+    addType(root, "ShellTimeout", [
+        { id: 1, name: "command", type: "string" },
+        { id: 2, name: "working_directory", type: "string" },
+        { id: 3, name: "timeout_ms", type: "int32" },
+    ]);
+    addType(root, "ShellResult", [
+        { id: 1, name: "success", type: "ShellSuccess" },
+        { id: 2, name: "failure", type: "ShellFailure" },
+        { id: 3, name: "timeout", type: "ShellTimeout" },
+        { id: 4, name: "rejected", type: "ShellRejected" },
+        { id: 102, name: "is_background", type: "bool" },
+        { id: 104, name: "pid", type: "uint32" },
+    ], [{ name: "result", fields: ["success", "failure", "timeout", "rejected"] }]);
+    addType(root, "DiagnosticsError", [
+        { id: 1, name: "path", type: "string" },
+        { id: 2, name: "error", type: "string" },
+    ]);
+    addType(root, "DiagnosticsResult", [
+        { id: 2, name: "error", type: "DiagnosticsError" },
+    ], [{ name: "result", fields: ["error"] }]);
+    addType(root, "FetchError", [
+        { id: 1, name: "url", type: "string" },
+        { id: 2, name: "error", type: "string" },
+    ]);
+    addType(root, "FetchResult", [
+        { id: 2, name: "error", type: "FetchError" },
+    ], [{ name: "result", fields: ["error"] }]);
+    addType(root, "RecordScreenFailure", [
+        { id: 1, name: "error", type: "string" },
+    ]);
+    addType(root, "RecordScreenResult", [
+        { id: 4, name: "failure", type: "RecordScreenFailure" },
+    ], [{ name: "result", fields: ["failure"] }]);
+    addType(root, "ComputerUseError", [
+        { id: 1, name: "error", type: "string" },
+    ]);
+    addType(root, "ComputerUseResult", [
+        { id: 2, name: "error", type: "ComputerUseError" },
+    ], [{ name: "result", fields: ["error"] }]);
+    addType(root, "WriteShellStdinError", [
+        { id: 1, name: "error", type: "string" },
+    ]);
+    addType(root, "WriteShellStdinResult", [
+        { id: 2, name: "error", type: "WriteShellStdinError" },
+    ], [{ name: "result", fields: ["error"] }]);
+    addType(root, "SubagentAwaitError", [
+        { id: 1, name: "agent_id", type: "string" },
+        { id: 2, name: "error", type: "string" },
+    ]);
+    addType(root, "SubagentAwaitResult", [
+        { id: 4, name: "error", type: "SubagentAwaitError" },
+    ], [{ name: "result", fields: ["error"] }]);
+    addType(root, "SmartModeClassifierError", [
+        { id: 1, name: "error", type: "string" },
+    ]);
+    addType(root, "SmartModeClassifierResult", [
+        { id: 2, name: "error", type: "SmartModeClassifierError" },
+    ], [{ name: "result", fields: ["error"] }]);
+    addType(root, "CanvasDiagnosticsError", [
+        { id: 1, name: "path", type: "string" },
+        { id: 2, name: "error", type: "string" },
+    ]);
+    addType(root, "CanvasDiagnosticsResult", [
+        { id: 2, name: "error", type: "CanvasDiagnosticsError" },
+    ], [{ name: "result", fields: ["error"] }]);
+    addType(root, "ShellAllowlistPrecheckResult", [
+        { id: 1, name: "allowlisted", type: "bool" },
+    ]);
+    addType(root, "McpAllowlistPrecheckResult", [
+        { id: 1, name: "allowlisted", type: "bool" },
+    ]);
+    addType(root, "WebFetchAllowlistPrecheckResult", [
+        { id: 1, name: "allowlisted", type: "bool" },
+    ]);
+    addType(root, "ForceBackgroundShellResult", [
+        { id: 1, name: "status", type: "uint32" },
+    ]);
+    addType(root, "ForceBackgroundSubagentResult", [
+        { id: 1, name: "status", type: "uint32" },
+    ]);
+    addType(root, "ConversationSearchHit", [
+        { id: 1, name: "conversation_id", type: "string" },
+        { id: 2, name: "title", type: "string" },
+        { id: 3, name: "source", type: "uint32" },
+        { id: 4, name: "updated_at_ms", type: "int64" },
+        { id: 5, name: "snippet", type: "string" },
+    ]);
+    addType(root, "ConversationSearchSuccess", [
+        { id: 1, name: "hits", type: "ConversationSearchHit", repeated: true },
+        { id: 2, name: "truncated", type: "bool" },
+        { id: 3, name: "partial", type: "bool" },
+        { id: 4, name: "rebuilding", type: "bool" },
+    ]);
+    addType(root, "ConversationSearchError", [
+        { id: 1, name: "error", type: "string" },
+    ]);
+    addType(root, "ConversationSearchResult", [
+        { id: 1, name: "success", type: "ConversationSearchSuccess" },
+        { id: 2, name: "error", type: "ConversationSearchError" },
+    ], [{ name: "result", fields: ["success", "error"] }]);
+    addType(root, "AgentStoreConflictError", [
+        { id: 1, name: "error", type: "string" },
+    ]);
+    addType(root, "AgentStoreConflictResult", [
+        { id: 2, name: "error", type: "AgentStoreConflictError" },
+    ], [{ name: "result", fields: ["error"] }]);
+    addType(root, "AdoptResult", [
+        { id: 1, name: "source_agent_id", type: "string" },
+        { id: 2, name: "target_agent_id", type: "string" },
+        { id: 3, name: "project_root_id", type: "string" },
+        { id: 5, name: "error", type: "string" },
+    ], [{ name: "result", fields: ["error"] }]);
+    // aiserver.v1.GetDiffRequest / GetDiffResponse (exec #44). Enums as uint32
+    // so protobufjs json decode does not stringify output_format / diff_type.
+    addType(root, "GitDiffChunk", [
+        { id: 1, name: "content", type: "string" },
+        { id: 2, name: "lines", type: "string", repeated: true },
+        { id: 3, name: "old_start", type: "int32" },
+        { id: 4, name: "old_lines", type: "int32" },
+        { id: 5, name: "new_start", type: "int32" },
+        { id: 6, name: "new_lines", type: "int32" },
+    ]);
+    addType(root, "GitFileDiff", [
+        { id: 1, name: "from", type: "string" },
+        { id: 2, name: "to", type: "string" },
+        { id: 3, name: "chunks", type: "GitDiffChunk", repeated: true },
+        { id: 4, name: "added", type: "int32" },
+        { id: 5, name: "removed", type: "int32" },
+        { id: 6, name: "before_file_contents", type: "string" },
+        { id: 7, name: "after_file_contents", type: "string" },
+        { id: 8, name: "is_generated", type: "bool" },
+    ]);
+    addType(root, "GitDiff", [
+        { id: 1, name: "diffs", type: "GitFileDiff", repeated: true },
+        { id: 2, name: "diff_type", type: "uint32" },
+    ]);
+    addType(root, "GitDiffSubmoduleDiff", [
+        { id: 1, name: "relative_path", type: "string" },
+        { id: 2, name: "diff", type: "GitDiff" },
+        { id: 3, name: "errored", type: "bool" },
+    ]);
+    addType(root, "GetDiffRequest", [
+        { id: 1, name: "cwd", type: "string" },
+        { id: 2, name: "ref", type: "string" },
+        { id: 3, name: "base_ref", type: "string" },
+        { id: 4, name: "merge_base", type: "bool" },
+        { id: 5, name: "target_paths", type: "string", repeated: true },
+        { id: 6, name: "unified_context_lines", type: "int32" },
+        { id: 7, name: "max_untracked_files", type: "int32" },
+        { id: 8, name: "output_format", type: "uint32" },
+        { id: 9, name: "submodule_recurse_depth", type: "int32" },
+        { id: 10, name: "include_space_changes", type: "bool" },
+        { id: 11, name: "committed_only", type: "bool" },
+        { id: 12, name: "compute_patch_id", type: "bool" },
+        { id: 13, name: "return_head_sha", type: "bool" },
+        { id: 14, name: "max_response_bytes", type: "int32" },
+    ]);
+    addType(root, "GetDiffResponse", [
+        { id: 1, name: "diff", type: "GitDiff" },
+        { id: 2, name: "submodule_diffs", type: "GitDiffSubmoduleDiff", repeated: true },
+        { id: 3, name: "patch_id", type: "string" },
+        { id: 4, name: "head_sha", type: "string" },
+        { id: 5, name: "has_uncommitted_changes", type: "bool" },
+    ]);
     // 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
@@ -965,6 +1158,7 @@ export function createMessageTypes() {
         { id: 1, name: "id", type: "uint32" },
         { id: 15, name: "exec_id", type: "string" },
         { id: 19, name: "span", type: "string" },
+        { id: 2, name: "shell_args", type: "ShellArgs" },
         { id: 3, name: "write_args", type: "WriteArgs" },
         { id: 4, name: "delete_args", type: "DeleteArgs" },
         { id: 5, name: "grep_args", type: "GrepArgs" },
@@ -978,6 +1172,7 @@ export function createMessageTypes() {
         { id: 18, name: "read_mcp_resource_exec_args", type: "ReadMcpResourceExecArgs" },
         { id: 28, name: "subagent_args", type: "SubagentArgs" },
         { id: 36, name: "mcp_state_exec_args", type: "McpStateExecArgs" },
+        { id: 44, name: "git_diff_request", type: "GetDiffRequest" },
         { id: 45, name: "pi_read_args", type: "PiReadToolArgs" },
         { id: 46, name: "pi_bash_args", type: "PiBashToolArgs" },
         { id: 47, name: "pi_edit_args", type: "PiEditToolArgs" },
@@ -986,10 +1181,10 @@ export function createMessageTypes() {
         { id: 50, name: "pi_find_args", type: "PiFindToolArgs" },
         { id: 51, name: "pi_ls_args", type: "PiLsToolArgs" },
     ], [{ name: "args", fields: [
-                "write_args", "delete_args", "grep_args", "read_args", "ls_args",
+                "shell_args", "write_args", "delete_args", "grep_args", "read_args", "ls_args",
                 "request_context_args", "mcp_args", "shell_stream_args", "background_shell_spawn_args",
                 "list_mcp_resources_exec_args", "read_mcp_resource_exec_args", "mcp_state_exec_args",
-                "subagent_args",
+                "subagent_args", "git_diff_request",
                 "pi_read_args", "pi_bash_args", "pi_edit_args", "pi_write_args",
                 "pi_grep_args", "pi_find_args", "pi_ls_args",
             ] }]);
@@ -998,19 +1193,35 @@ export function createMessageTypes() {
         { id: 1, name: "id", type: "uint32" },
         { id: 15, name: "exec_id", type: "string" },
         { id: 39, name: "local_execution_time_ms", type: "uint64" },
+        { id: 2, name: "shell_result", type: "ShellResult" },
         { id: 3, name: "write_result", type: "WriteResult" },
         { id: 4, name: "delete_result", type: "DeleteResult" },
         { id: 5, name: "grep_result", type: "GrepResult" },
         { id: 7, name: "read_result", type: "ReadResult" },
         { id: 8, name: "ls_result", type: "LsResult" },
+        { id: 9, name: "diagnostics_result", type: "DiagnosticsResult" },
         { 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: 17, name: "list_mcp_resources_exec_result", type: "ListMcpResourcesExecResult" },
         { id: 18, name: "read_mcp_resource_exec_result", type: "ReadMcpResourceExecResult" },
+        { id: 20, name: "fetch_result", type: "FetchResult" },
+        { id: 21, name: "record_screen_result", type: "RecordScreenResult" },
+        { id: 22, name: "computer_use_result", type: "ComputerUseResult" },
+        { id: 23, name: "write_shell_stdin_result", type: "WriteShellStdinResult" },
         { id: 28, name: "subagent_result", type: "SubagentResult" },
+        { id: 29, name: "redacted_read_result", type: "ReadResult" },
+        { id: 30, name: "force_background_shell_result", type: "ForceBackgroundShellResult" },
+        { id: 31, name: "force_background_subagent_result", type: "ForceBackgroundSubagentResult" },
         { id: 36, name: "mcp_state_exec_result", type: "McpStateExecResult" },
+        { id: 37, name: "subagent_await_result", type: "SubagentAwaitResult" },
+        { id: 38, name: "smart_mode_classifier_result", type: "SmartModeClassifierResult" },
+        { id: 40, name: "canvas_diagnostics_result", type: "CanvasDiagnosticsResult" },
+        { id: 41, name: "shell_allowlist_precheck_result", type: "ShellAllowlistPrecheckResult" },
+        { id: 42, name: "mcp_allowlist_precheck_result", type: "McpAllowlistPrecheckResult" },
+        { id: 43, name: "web_fetch_allowlist_precheck_result", type: "WebFetchAllowlistPrecheckResult" },
+        { id: 44, name: "git_diff_response", type: "GetDiffResponse" },
         { id: 46, name: "pi_read_result", type: "PiReadExecResult" },
         { id: 47, name: "pi_bash_result", type: "PiBashExecResult" },
         { id: 48, name: "pi_edit_result", type: "PiEditExecResult" },
@@ -1018,13 +1229,25 @@ export function createMessageTypes() {
         { id: 50, name: "pi_grep_result", type: "PiGrepExecResult" },
         { id: 51, name: "pi_find_result", type: "PiFindExecResult" },
         { id: 52, name: "pi_ls_result", type: "PiLsExecResult" },
+        { id: 53, name: "conversation_search_result", type: "ConversationSearchResult" },
+        { id: 54, name: "agent_store_conflict_result", type: "AgentStoreConflictResult" },
+        { id: 55, name: "mini_swe_agent_bash_result", type: "ShellResult" },
+        { id: 56, name: "adopt_result", type: "AdoptResult" },
     ], [{ name: "result", fields: [
-                "write_result", "delete_result", "grep_result", "read_result", "ls_result",
-                "request_context_result", "mcp_result", "shell_stream", "background_shell_spawn_result",
-                "list_mcp_resources_exec_result", "read_mcp_resource_exec_result", "mcp_state_exec_result",
-                "subagent_result",
+                "shell_result", "write_result", "delete_result", "grep_result", "read_result", "ls_result",
+                "diagnostics_result", "request_context_result", "mcp_result", "shell_stream", "background_shell_spawn_result",
+                "list_mcp_resources_exec_result", "read_mcp_resource_exec_result",
+                "fetch_result", "record_screen_result", "computer_use_result", "write_shell_stdin_result",
+                "subagent_result", "redacted_read_result",
+                "force_background_shell_result", "force_background_subagent_result",
+                "mcp_state_exec_result",
+                "subagent_await_result", "smart_mode_classifier_result", "canvas_diagnostics_result",
+                "shell_allowlist_precheck_result", "mcp_allowlist_precheck_result", "web_fetch_allowlist_precheck_result",
+                "git_diff_response",
                 "pi_read_result", "pi_bash_result", "pi_edit_result", "pi_write_result",
                 "pi_grep_result", "pi_find_result", "pi_ls_result",
+                "conversation_search_result", "agent_store_conflict_result",
+                "mini_swe_agent_bash_result", "adopt_result",
             ] }]);
     addType(root, "ExecServerControlMessage", [
         { id: 1, name: "abort", type: "ExecServerAbort" },

package/dist/protocol/progress-continuation.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Prefixes that can introduce a progress fragment. These are not complete
+ * answers by themselves; `isProgressOnlyAssistantText` still requires a
+ * fragment (no sentence punctuation) and, for most verbs, an inspection object.
+ */
+export declare const PROGRESS_ONLY_PATTERNS: readonly RegExp[];
+/**
+ * True only for a short progress *fragment* that ended the turn without tools.
+ *
+ * Complete answers that happen to start with a progress verb ("Looking at the
+ * code, the bug is in X", "Reviewing this PR: LGTM") must not match. A trailing
+ * ellipsis is allowed; any other `.!?`, colon, semicolon, or comma is not.
+ * Inspection verbs also need an inspection object ("the workspace", "this PR"),
+ * not copulas such as "is not needed".
+ */
+export declare function isProgressOnlyAssistantText(text: string): boolean;
+export declare function shouldContinueProgressOnlyTurn(input: {
+    allowTools: boolean;
+    advertisedToolCount: number;
+    assistantText: string;
+    emittedHostTools: number;
+    continuationAttempts: number;
+    pendingExecs: number;
+}): boolean;
+export declare function progressOnlyContinuationPrompt(workspaceRoot?: string): string;

package/dist/protocol/progress-continuation.js

@@ -0,0 +1,92 @@
+import { appendWorkspaceRootGrounding } from "./workspace-grounding.js";
+/**
+ * Prefixes that can introduce a progress fragment. These are not complete
+ * answers by themselves; `isProgressOnlyAssistantText` still requires a
+ * fragment (no sentence punctuation) and, for most verbs, an inspection object.
+ */
+export const PROGRESS_ONLY_PATTERNS = [
+    /^checking\b/i,
+    /^inspecting\b/i,
+    /^let me check\b/i,
+    /^looking into\b/i,
+    /^looking at\b/i,
+    /^reviewing\b/i,
+    /^scanning\b/i,
+    /^verifying\b/i,
+    /^examining\b/i,
+    /^investigating\b/i,
+];
+const PREFIXES_WITH_OBJECT = [
+    /^checking\b/i,
+    /^inspecting\b/i,
+    /^reviewing\b/i,
+    /^scanning\b/i,
+    /^verifying\b/i,
+    /^examining\b/i,
+    /^investigating\b/i,
+];
+const INSPECTION_OBJECT = /^(?:the|how|whether|if|for|on|this|that|it)\b/i;
+const MAX_PROGRESS_FRAGMENT_WORDS = 8;
+function normalizeWhitespace(text) {
+    return text.trim().replace(/\s+/g, " ");
+}
+function restAfterPrefix(text, prefix) {
+    return text.slice(prefix.length).trim();
+}
+/**
+ * True only for a short progress *fragment* that ended the turn without tools.
+ *
+ * Complete answers that happen to start with a progress verb ("Looking at the
+ * code, the bug is in X", "Reviewing this PR: LGTM") must not match. A trailing
+ * ellipsis is allowed; any other `.!?`, colon, semicolon, or comma is not.
+ * Inspection verbs also need an inspection object ("the workspace", "this PR"),
+ * not copulas such as "is not needed".
+ */
+export function isProgressOnlyAssistantText(text) {
+    const trimmed = text.trim();
+    if (!trimmed)
+        return false;
+    if (trimmed.length > 240)
+        return false;
+    if (/\n\s*\n/.test(trimmed))
+        return false;
+    const normalized = normalizeWhitespace(trimmed);
+    const withoutEllipsis = normalized.replace(/(?:\.{3}|…)+\s*$/u, "").trim();
+    if (!withoutEllipsis)
+        return false;
+    if (/[.!?;:]/.test(withoutEllipsis))
+        return false;
+    if (withoutEllipsis.includes(","))
+        return false;
+    if (withoutEllipsis.split(" ").length > MAX_PROGRESS_FRAGMENT_WORDS)
+        return false;
+    if (!PROGRESS_ONLY_PATTERNS.some((pattern) => pattern.test(withoutEllipsis)))
+        return false;
+    const lower = withoutEllipsis.toLowerCase();
+    if (lower.startsWith("let me check")) {
+        return withoutEllipsis.length > "let me check".length;
+    }
+    if (lower.startsWith("looking into") || lower.startsWith("looking at")) {
+        const prefix = lower.startsWith("looking into") ? "looking into" : "looking at";
+        return INSPECTION_OBJECT.test(restAfterPrefix(withoutEllipsis, prefix));
+    }
+    if (PREFIXES_WITH_OBJECT.some((pattern) => pattern.test(withoutEllipsis))) {
+        const rest = withoutEllipsis.replace(/^\S+\s+/i, "");
+        return INSPECTION_OBJECT.test(rest);
+    }
+    return false;
+}
+export function shouldContinueProgressOnlyTurn(input) {
+    return (input.allowTools &&
+        input.advertisedToolCount > 0 &&
+        input.pendingExecs === 0 &&
+        input.emittedHostTools === 0 &&
+        input.continuationAttempts < 1 &&
+        isProgressOnlyAssistantText(input.assistantText));
+}
+export function progressOnlyContinuationPrompt(workspaceRoot) {
+    const base = "Continue the same turn now. Your previous assistant message was only progress narration and ended without a tool call or a complete answer. Do not repeat the progress update. If evidence is still needed, call an available listed tool immediately; otherwise provide the complete user-facing answer now. Do not finish until the requested work or answer is complete.";
+    if (!workspaceRoot || !workspaceRoot.trim())
+        return base;
+    return appendWorkspaceRootGrounding(base, workspaceRoot);
+}

package/dist/protocol/tools.d.ts

@@ -1,3 +1,4 @@
+import { type CursorExecVariant } from "./exec-variants.js";
 import { type CursorShellOutcome } from "../shell-timeout.js";
 export declare const REQUEST_CONTEXT_RESULT_FIELD = 10;
 export type OpencodeToolDef = {
@@ -255,6 +256,11 @@ export type ToolResultInput = {
 export declare function buildExecClientMessages(input: ToolResultInput): Uint8Array[];
 /** ACM #5 exec_client_control_message { stream_close { id } }. */
 export declare function buildExecStreamClose(execId: number): Uint8Array;
+export declare function buildUnsupportedExecDeny(input: {
+    execId: number;
+    variant: CursorExecVariant;
+    reason: string;
+}): Uint8Array[];
 /**
  * Strip opencode's `read` envelope, leaving raw file content.
  *