cursor-opencode-provider 0.8.0 → 0.8.3

package/dist/plugin.js

@@ -4,16 +4,18 @@ import { pollForTokens, exchangeApiKey, isExpiringSoon, generatePkceParams, gene
 import { renewSessionIfDue, resolveApiKeyToken, } from "./auth-renewal.js";
 import { CursorAuthError } from "./errors.js";
 import { errorMessage, trace } from "./debug.js";
+import { normalizeClassicInterruptedResults } from "./classic-tool-results.js";
 import { readCache, discoverModels, isCacheFresh } from "./models.js";
 import { modelsToConfig } from "./model-config.js";
 import { loadClassicTools } from "./classic-tools.js";
 import { opencodeGlobalCacheDir } from "./context/paths.js";
 import { readStoredAuth } from "./context/auth-store.js";
 import { resolveAgentUrl } from "./agent-url.js";
-import { captureCursorShellResult, cursorShellEnvForCall, cursorShellOriginalCommand, prepareCursorShellArgs, releaseCursorShellEnv, sanitizeRegisteredCursorShellOutput, setCursorShellPath, } from "./shell-timeout.js";
-import { sessionActivity } from "./activity.js";
-import { createPlanExecutionKickoffText, setPlanExecutionKickoff, } from "./plan-execution-kickoff.js";
+import { captureCursorShellResult, cursorShellEnvForCall, cursorShellOriginalCommand, cursorShellTimeoutMs, prepareCursorShellArgs, releaseCursorShellEnv, sanitizeRegisteredCursorShellOutput, setCursorShellPath, resolveCursorShellPath, } from "./shell-timeout.js";
+import { applyHostPromptEvent, applyHostToolEvent, sessionActivity } from "./activity.js";
 import { dispatchHostEventBridge } from "./host-event-bridge.js";
+import { createPromptHostAgentModeSwitch, setHostAgentModeSwitch } from "./host-agent-mode.js";
+import { isHostPlanFileResolved, resolveHostPlanFile } from "./host-plan-file.js";
 const MODULE_URL = new URL("./index.js", import.meta.url).href;
 /**
  * Raw `crsr_` key behind an API-key login: under `metadata.apiKey` (saved at
@@ -41,29 +43,63 @@ function isSameCredential(latest, started) {
     }
     return false;
 }
+/** Names of the host's own user-selectable primary agents, from `app.agents()`. */
+function primaryAgentNames(response) {
+    const list = Array.isArray(response)
+        ? response
+        : Array.isArray(response?.data)
+            ? response.data
+            : undefined;
+    if (!list)
+        return undefined;
+    const names = new Set();
+    for (const item of list) {
+        if (typeof item?.name !== "string" || item.mode === "subagent" || item.hidden === true)
+            continue;
+        names.add(item.name);
+    }
+    return names;
+}
+/**
+ * Install the OpenCode 1.x host-agent switch. Returns the agent-list refresh,
+ * which the caller runs once the host serves requests: the list is read from
+ * the host's own API, and a failed read leaves SwitchMode provider-owned.
+ */
+function installPromptHostAgentModeSwitch(input, sessionClient, promptAsync) {
+    const app = input.client?.app;
+    const agents = app?.agents;
+    // Nothing to install; a switch another entrypoint installed stays in place.
+    if (typeof promptAsync !== "function" || typeof agents !== "function")
+        return undefined;
+    let primary;
+    const refresh = () => agents.call(app)
+        .then((response) => { primary = primaryAgentNames(response) ?? primary; })
+        .catch((error) => trace(`host-agent-mode: agent list unavailable: ${errorMessage(error)}`));
+    const { apply, accepts } = createPromptHostAgentModeSwitch(async ({ sessionID, agent, text }) => {
+        await promptAsync.call(sessionClient, {
+            path: { id: sessionID },
+            body: { agent, parts: [{ type: "text", text, synthetic: true }] },
+        });
+        void refresh();
+    }, () => primary);
+    setHostAgentModeSwitch(apply, { resumesTurn: true, accepts });
+    return refresh;
+}
 export async function CursorPlugin(input) {
     const cacheDir = opencodeGlobalCacheDir();
     const apiBaseURL = cursorApiBaseURL();
     const classicTools = await loadClassicTools();
-    // Install the OpenCode plan-exit-shaped kickoff only when the OpenCode client
-    // exposes that structural API. Without it, no synthetic kickoff is registered.
     const sessionClient = input.client?.session;
     const promptAsync = sessionClient?.promptAsync;
-    setPlanExecutionKickoff(typeof promptAsync === "function"
-        ? async ({ sessionID, planPath }) => {
-            await promptAsync.call(sessionClient, {
-                path: { id: sessionID },
-                body: {
-                    agent: "build",
-                    parts: [{
-                            type: "text",
-                            text: createPlanExecutionKickoffText(planPath),
-                            synthetic: true,
-                        }],
-                },
-            });
-        }
-        : undefined);
+    // Cursor SwitchMode without an advertised plan_enter selects the host's
+    // primary agent the OpenCode 1.x way once its Run has ended. The OpenCode 2.0
+    // entrypoint replaces this with `session.switchAgent` in its own setup().
+    const refreshHostAgents = installPromptHostAgentModeSwitch(input, sessionClient, promptAsync);
+    let hostAgentsLoaded;
+    const sessionGet = sessionClient?.get;
+    const getSession = typeof sessionGet === "function"
+        ? (sessionID) => sessionGet.call(sessionClient, { path: { id: sessionID } })
+        : undefined;
     let lastPersistAttempt;
     async function persistAuth(body) {
         await input.client.auth.set({
@@ -215,6 +251,9 @@ export async function CursorPlugin(input) {
             cursor_image_save: classicTools.imageSave,
         },
         async event({ event }) {
+            // The SDK's event union predates these prompt events; read them untyped.
+            applyHostPromptEvent(sessionActivity, event.type, event.properties);
+            applyHostToolEvent(sessionActivity, event.type, event.properties);
             switch (event.type) {
                 case "session.created":
                     sessionActivity.linkSession(event.properties.info.id, event.properties.info.parentID);
@@ -231,6 +270,11 @@ export async function CursorPlugin(input) {
                     break;
                 case "message.part.updated":
                     sessionActivity.recordActivity(event.properties.part.sessionID);
+                    // Rejection/abort can stop the classic host before a continuation or
+                    // execute.after. Its persisted tool state is still authoritative.
+                    if (event.properties.part.type === "tool" && event.properties.part.state.status === "error") {
+                        releaseCursorShellEnv(event.properties.part.callID);
+                    }
                     break;
             }
             await dispatchHostEventBridge({
@@ -240,13 +284,22 @@ export async function CursorPlugin(input) {
                 serverUrl: input.serverUrl,
             });
         },
+        async "experimental.chat.messages.transform"(_hookInput, output) {
+            // The classic host retains the original array and discards hook output.
+            // Replace entries with request-only clones, preserving array identity.
+            const normalized = normalizeClassicInterruptedResults(output.messages);
+            for (let index = 0; index < output.messages.length; index++)
+                output.messages[index] = normalized[index];
+        },
         async "tool.execute.before"(hookInput, output) {
             if (hookInput.tool !== "bash")
                 return;
             // bash/zsh retain the original display/permission command and wrap via
-            // shell.env. sh/dash need a short wrapper-file command because their
+            // shell.env. sh/dash disclose the managed launcher inline because their
             // non-interactive `-c` path ignores BASH_ENV / ZDOTDIR.
-            prepareCursorShellArgs(hookInput.callID, output.args);
+            prepareCursorShellArgs(hookInput.callID, output.args, {
+                shellPath: resolveCursorShellPath(undefined, input.directory),
+            });
         },
         async "shell.env"(hookInput, output) {
             const env = cursorShellEnvForCall(hookInput.callID);
@@ -267,6 +320,11 @@ export async function CursorPlugin(input) {
                     if (typeof metadata.output === "string") {
                         metadata.output = sanitizeRegisteredCursorShellOutput(hookInput.callID, metadata.output);
                     }
+                    // The stored output keeps only a display notice, and the saved
+                    // outcome does not survive consumption or a restart.
+                    const timeoutMs = cursorShellTimeoutMs(hookInput.callID);
+                    if (timeoutMs !== undefined)
+                        metadata.cursorShellTimeoutMs = timeoutMs;
                 }
             }
             finally {
@@ -280,6 +338,22 @@ export async function CursorPlugin(input) {
             // Carry the canonical OpenCode id so an incompatible Cursor checkpoint
             // is rotated instead of resuming the prior agent's prompt.
             output.options[CURSOR_HOST_AGENT_OPTION] = hookInput.agent;
+            // First Cursor request: the host now serves its API, so read its agents
+            // before any Run can raise SwitchMode. Concurrent first requests share
+            // the one read; later requests find it settled.
+            hostAgentsLoaded ??= refreshHostAgents?.();
+            await hostAgentsLoaded;
+            // Know the session's own plan file (OpenCode's `Session.plan`) before the
+            // Run starts, so CreatePlan records the plan where the plan agent and
+            // plan_exit read it. It is fixed per session, so resolve it once.
+            if (hookInput.agent !== "compaction" && getSession && !isHostPlanFileResolved(hookInput.sessionID)) {
+                await resolveHostPlanFile({
+                    sessionID: hookInput.sessionID,
+                    getSession,
+                    worktree: input.worktree || input.project?.worktree,
+                    vcs: !!input.project?.vcs,
+                });
+            }
             // OpenCode's compaction pipeline invokes the LLM with agent="compaction".
             // Carry that stable runtime fact into LanguageModelV3 providerOptions so
             // the provider never has to guess from an empty tool list.
@@ -288,7 +362,7 @@ export async function CursorPlugin(input) {
             }
         },
         async config(cfg) {
-            setCursorShellPath(cfg.shell);
+            setCursorShellPath(cfg.shell, input.directory);
             cfg.provider ??= {};
             const models = await loadModels();
             const existing = cfg.provider[CURSOR_PROVIDER_ID];

package/dist/pricing-data.d.ts

@@ -25,6 +25,12 @@ export declare const CURSOR_MODEL_COSTS: {
         readonly cache_read: 0.1;
         readonly cache_write: 1.25;
     };
+    readonly "claude-haiku-5-5": {
+        readonly input: 0.1;
+        readonly output: 0.5;
+        readonly cache_read: 0.01;
+        readonly cache_write: 0.125;
+    };
     readonly "claude-opus-4-5": {
         readonly input: 5;
         readonly output: 25;
@@ -94,7 +100,7 @@ export declare const CURSOR_MODEL_COSTS: {
     readonly "claude-sonnet-5-5": {
         readonly input: 2;
         readonly output: 10;
-        readonly cache_read: 0.2;
+        readonly cache_read: 0.1;
         readonly cache_write: 2.5;
     };
     readonly "composer-2.5": {
@@ -134,14 +140,19 @@ export declare const CURSOR_MODEL_COSTS: {
     };
     readonly "gemini-3.7-flash": {
         readonly input: 0.75;
-        readonly output: 3.5;
+        readonly output: 3.75;
         readonly cache_read: 0.075;
     };
     readonly "gemini-3.8-flash": {
         readonly input: 0.75;
-        readonly output: 3.5;
+        readonly output: 3.75;
         readonly cache_read: 0.075;
     };
+    readonly "gemini-4-argon": {
+        readonly input: 2;
+        readonly output: 10;
+        readonly cache_read: 0.1;
+    };
     readonly "glm-5.2": {
         readonly input: 1.4;
         readonly output: 4.4;
@@ -298,6 +309,11 @@ export declare const CURSOR_MODEL_COSTS: {
         readonly output: 4.25;
         readonly cache_read: 0.15;
     };
+    readonly "muse-wonder-1.0": {
+        readonly input: 4;
+        readonly output: 20;
+        readonly cache_read: 0.2;
+    };
 };
 export declare const CURSOR_MODEL_CONTEXTS: {
     readonly "claude-fable-5": {
@@ -311,6 +327,10 @@ export declare const CURSOR_MODEL_CONTEXTS: {
     readonly "claude-haiku-4-5": {
         readonly maxContext: 200000;
     };
+    readonly "claude-haiku-5-5": {
+        readonly maxContext: 300000;
+        readonly maxContextForMaxMode: 1000000;
+    };
     readonly "claude-opus-4-5": {
         readonly maxContext: 200000;
         readonly maxContextForMaxMode: 200000;
@@ -386,6 +406,10 @@ export declare const CURSOR_MODEL_CONTEXTS: {
         readonly maxContext: 200000;
         readonly maxContextForMaxMode: 1000000;
     };
+    readonly "gemini-4-argon": {
+        readonly maxContext: 200000;
+        readonly maxContextForMaxMode: 1000000;
+    };
     readonly "glm-5.2": {
         readonly maxContext: 200000;
     };
@@ -454,6 +478,10 @@ export declare const CURSOR_MODEL_CONTEXTS: {
         readonly maxContext: 300000;
         readonly maxContextForMaxMode: 1000000;
     };
+    readonly "muse-wonder-1.0": {
+        readonly maxContext: 300000;
+        readonly maxContextForMaxMode: 1000000;
+    };
 };
 export declare const CURSOR_MODEL_CAPABILITIES: {
     readonly "claude-fable-5": {
@@ -465,6 +493,9 @@ export declare const CURSOR_MODEL_CAPABILITIES: {
     readonly "claude-haiku-4-5": {
         readonly supportsImages: true;
     };
+    readonly "claude-haiku-5-5": {
+        readonly supportsImages: true;
+    };
     readonly "claude-opus-4-5": {
         readonly supportsImages: true;
     };
@@ -522,6 +553,9 @@ export declare const CURSOR_MODEL_CAPABILITIES: {
     readonly "gemini-3.8-flash": {
         readonly supportsImages: true;
     };
+    readonly "gemini-4-argon": {
+        readonly supportsImages: true;
+    };
     readonly "glm-5.2": {
         readonly supportsImages: false;
     };
@@ -582,4 +616,7 @@ export declare const CURSOR_MODEL_CAPABILITIES: {
     readonly "muse-spark-1.3": {
         readonly supportsImages: true;
     };
+    readonly "muse-wonder-1.0": {
+        readonly supportsImages: true;
+    };
 };

package/dist/pricing-data.js

@@ -25,6 +25,12 @@ export const CURSOR_MODEL_COSTS = {
         "cache_read": 0.1,
         "cache_write": 1.25
     },
+    "claude-haiku-5-5": {
+        "input": 0.1,
+        "output": 0.5,
+        "cache_read": 0.01,
+        "cache_write": 0.125
+    },
     "claude-opus-4-5": {
         "input": 5,
         "output": 25,
@@ -94,7 +100,7 @@ export const CURSOR_MODEL_COSTS = {
     "claude-sonnet-5-5": {
         "input": 2,
         "output": 10,
-        "cache_read": 0.2,
+        "cache_read": 0.1,
         "cache_write": 2.5
     },
     "composer-2.5": {
@@ -134,14 +140,19 @@ export const CURSOR_MODEL_COSTS = {
     },
     "gemini-3.7-flash": {
         "input": 0.75,
-        "output": 3.5,
+        "output": 3.75,
         "cache_read": 0.075
     },
     "gemini-3.8-flash": {
         "input": 0.75,
-        "output": 3.5,
+        "output": 3.75,
         "cache_read": 0.075
     },
+    "gemini-4-argon": {
+        "input": 2,
+        "output": 10,
+        "cache_read": 0.1
+    },
     "glm-5.2": {
         "input": 1.4,
         "output": 4.4,
@@ -297,6 +308,11 @@ export const CURSOR_MODEL_COSTS = {
         "input": 1.25,
         "output": 4.25,
         "cache_read": 0.15
+    },
+    "muse-wonder-1.0": {
+        "input": 4,
+        "output": 20,
+        "cache_read": 0.2
     }
 };
 export const CURSOR_MODEL_CONTEXTS = {
@@ -311,6 +327,10 @@ export const CURSOR_MODEL_CONTEXTS = {
     "claude-haiku-4-5": {
         "maxContext": 200000
     },
+    "claude-haiku-5-5": {
+        "maxContext": 300000,
+        "maxContextForMaxMode": 1000000
+    },
     "claude-opus-4-5": {
         "maxContext": 200000,
         "maxContextForMaxMode": 200000
@@ -386,6 +406,10 @@ export const CURSOR_MODEL_CONTEXTS = {
         "maxContext": 200000,
         "maxContextForMaxMode": 1000000
     },
+    "gemini-4-argon": {
+        "maxContext": 200000,
+        "maxContextForMaxMode": 1000000
+    },
     "glm-5.2": {
         "maxContext": 200000
     },
@@ -453,6 +477,10 @@ export const CURSOR_MODEL_CONTEXTS = {
     "muse-spark-1.3": {
         "maxContext": 300000,
         "maxContextForMaxMode": 1000000
+    },
+    "muse-wonder-1.0": {
+        "maxContext": 300000,
+        "maxContextForMaxMode": 1000000
     }
 };
 export const CURSOR_MODEL_CAPABILITIES = {
@@ -465,6 +493,9 @@ export const CURSOR_MODEL_CAPABILITIES = {
     "claude-haiku-4-5": {
         "supportsImages": true
     },
+    "claude-haiku-5-5": {
+        "supportsImages": true
+    },
     "claude-opus-4-5": {
         "supportsImages": true
     },
@@ -522,6 +553,9 @@ export const CURSOR_MODEL_CAPABILITIES = {
     "gemini-3.8-flash": {
         "supportsImages": true
     },
+    "gemini-4-argon": {
+        "supportsImages": true
+    },
     "glm-5.2": {
         "supportsImages": false
     },
@@ -581,5 +615,8 @@ export const CURSOR_MODEL_CAPABILITIES = {
     },
     "muse-spark-1.3": {
         "supportsImages": true
+    },
+    "muse-wonder-1.0": {
+        "supportsImages": true
     }
 };

package/dist/pricing.d.ts

@@ -40,7 +40,7 @@ export declare function validateOpenCodeModelCost(value: unknown, path?: string)
     errors: string[];
 };
 export declare function isOpenCodeModelCost(value: unknown): value is OpenCodeModelCost;
-/** Strip synthetic OpenCode suffixes (`…-1m`, `…-1m-2`, `…-1m-fast`, …). */
+/** Strip synthetic context suffixes (`…-1m`, `…-500k`, `…-500k-2-fast`, …). */
 export declare function wireModelIdForPricing(modelId: string): {
     baseId: string;
     longContextEntry: boolean;

package/dist/pricing.js

@@ -47,9 +47,9 @@ export function validateOpenCodeModelCost(value, path = "cost") {
 export function isOpenCodeModelCost(value) {
     return validateOpenCodeModelCost(value).valid;
 }
-/** Strip synthetic OpenCode suffixes (`…-1m`, `…-1m-2`, `…-1m-fast`, …). */
+/** Strip synthetic context suffixes (`…-1m`, `…-500k`, `…-500k-2-fast`, …). */
 export function wireModelIdForPricing(modelId) {
-    const match = /^(.*)-1m(?:-\d+)?(-fast)?$/.exec(modelId);
+    const match = /^(.*)-\d+(?:\.\d+)?[km](?:-\d+)?(-fast)?$/.exec(modelId);
     if (match) {
         return { baseId: `${match[1]}${match[2] ?? ""}`, longContextEntry: true };
     }
@@ -79,8 +79,11 @@ function asMutableCost(value) {
  * Synthetic `-fast` entries are stored as their own keys.
  */
 export function getCursorModelCost(modelId) {
-    const { baseId } = wireModelIdForPricing(modelId);
-    const found = CURSOR_MODEL_COSTS[baseId];
+    const costs = CURSOR_MODEL_COSTS;
+    // A priced wire id wins over suffix stripping (`-<n>k` / `-<n>m` may be real).
+    const found = Object.hasOwn(costs, modelId)
+        ? costs[modelId]
+        : costs[wireModelIdForPricing(modelId).baseId];
     if (!found)
         return undefined;
     return asMutableCost(found);

package/dist/process-shared.d.ts

@@ -0,0 +1,14 @@
+/**
+ * State shared by every copy of this package in one process.
+ *
+ * OpenCode 2 imports a separate copy of a plugin's module graph for each
+ * location (project directory) it serves, all in one realm. Module-level state
+ * then exists once per copy, so per-account work such as credential renewal ran
+ * once per location. Keep that state here instead.
+ *
+ * Store plain data only (maps, strings, numbers, promises): every copy has its
+ * own classes, so an instance stored by one copy fails `instanceof` in another.
+ * Name keys with a version suffix (`….v1`) and bump it when the stored shape
+ * changes, so two package versions in one process never read each other's data.
+ */
+export declare function processShared<T>(name: string, create: () => T): T;

package/dist/process-shared.js

@@ -0,0 +1,18 @@
+/**
+ * State shared by every copy of this package in one process.
+ *
+ * OpenCode 2 imports a separate copy of a plugin's module graph for each
+ * location (project directory) it serves, all in one realm. Module-level state
+ * then exists once per copy, so per-account work such as credential renewal ran
+ * once per location. Keep that state here instead.
+ *
+ * Store plain data only (maps, strings, numbers, promises): every copy has its
+ * own classes, so an instance stored by one copy fails `instanceof` in another.
+ * Name keys with a version suffix (`….v1`) and bump it when the stored shape
+ * changes, so two package versions in one process never read each other's data.
+ */
+export function processShared(name, create) {
+    const key = Symbol.for(`cursor-opencode-provider.${name}`);
+    const registry = globalThis;
+    return registry[key] ??= create();
+}

package/dist/protocol/apply-patch.d.ts

@@ -1,6 +1,6 @@
 /**
- * Synthesis of OpenCode `apply_patch` envelopes from Cursor's native write/edit
- * exec requests.
+ * Synthesis of OpenCode `apply_patch` (2.0: `patch`) envelopes from Cursor's
+ * native write/edit exec requests.
  *
  * ## Why this exists
  *
@@ -36,10 +36,12 @@
  *   `ctx.session.context(...)` hook exposing a mutable tool roster, and lists
  *   "Select `apply_patch` versus `edit` + `write`" as work to move out of the
  *   registry. Once that lands, a host-side opt-out replaces this shim.
- * - OpenCode 2.0 (`packages/core`) has **no** such gate: `apply_patch`, `edit`
- *   and `write` are all registered unconditionally in `tool/builtins.ts`. This
- *   translation is therefore 1.x-only in practice, but it is keyed off the
- *   advertised set rather than a version check, so it simply never fires on 2.0.
+ * - OpenCode 2.0 (`packages/core`) keeps the gate under a new name. The tool is
+ *   `patch` (still `{ patchText }`, same envelope format), and
+ *   `tool/plugin/patch.ts` applies the same model-id predicate in its session
+ *   `context`/`compaction`/`generate` hooks, deleting `edit` and `write` for GPT models and
+ *   `patch` for everyone else. Both names are recognised here; which one the
+ *   host offers is read from the advertised set rather than a version check.
  *
  * ## Why translation, not advertisement
  *
@@ -59,7 +61,7 @@
  * native requests arrive for every model. Those names are absent from
  * the catalog, so the request is refused before it reaches OpenCode.
  *
- * ## Format notes (verified against `packages/opencode/src/patch/index.ts`)
+ * ## Format notes (verified against `packages/opencode/src/patch/index.ts` and 2.0's `packages/util/src/patch.ts`)
  *
  * - `*** Add File:` **overwrites an existing file** — the tool's `add` case uses
  *   `oldContent = ""` and never stats the target (upstream test: "adds file
@@ -71,15 +73,25 @@
  * - Every payload line is prefixed with `+`, `-`, or a space, and the parser
  *   only breaks on *unprefixed* `***` / `@@`. Content lines that themselves
  *   begin with `***` or `@@` therefore survive a round trip unharmed.
- * - `Add File` content is rejoined with `\n` and normalized to exactly one
- *   trailing newline. A write of content with no trailing newline gains one.
+ * - `Add File` content is rejoined with `\n`; the tool appends a final newline
+ *   only when nonempty content lacks one. Keep the trailing empty payload line
+ *   so blank lines survive. Nonempty unterminated content cannot round-trip.
+ * - OpenCode 2's `patch` parser strips a trailing `\r` from every payload
+ *   line, unlike 1.x `apply_patch`. Refuse that lossy encoding on `patch`.
  * - Update chunks match **whole lines** via `seekSequence`, unlike OpenCode
  *   `edit`, which is substring-based. Substring edits must be expanded to line
  *   boundaries before they can be expressed as a patch — see `planSubstringEdit`.
- * - Renames are rejected by OpenCode 2.0's implementation ("apply_patch moves
- *   are not supported yet"), so `*** Move to:` is never emitted here.
+ * - Cursor's write/edit requests never rename, so `*** Move to:` is never
+ *   emitted here.
  */
+/** OpenCode 1.x name for the patch tool. */
 export declare const APPLY_PATCH_TOOL = "apply_patch";
+/** OpenCode 2.0 name for the same tool (renamed from `apply_patch`). */
+export declare const PATCH_TOOL = "patch";
+export type HostPatchTool = typeof APPLY_PATCH_TOOL | typeof PATCH_TOOL;
+/** The patch tool this host advertises in place of `edit`/`write`, if any. */
+export declare function hostPatchTool(advertised: ReadonlySet<string>): HostPatchTool | undefined;
+export declare function isHostPatchTool(name: string): name is HostPatchTool;
 /** One `@@` chunk: replace `oldLines` with `newLines`. */
 export type UpdateChunk = {
     oldLines: string[];
@@ -89,9 +101,9 @@ export type UpdateChunk = {
  * Whole-file write as `*** Add File:`. Valid whether or not the target exists —
  * OpenCode's add case overwrites unconditionally.
  */
-export declare function buildAddFilePatch(filePath: string, content: string): string;
+export declare function buildAddFilePatch(filePath: string, content: string, tool?: HostPatchTool): string;
 /** Targeted replacement as `*** Update File:` with one `@@` chunk per change. */
-export declare function buildUpdateFilePatch(filePath: string, chunks: UpdateChunk[]): string;
+export declare function buildUpdateFilePatch(filePath: string, chunks: UpdateChunk[], tool?: HostPatchTool): string;
 export type SubstringEditPlan = {
     ok: true;
     chunks: UpdateChunk[];