opencode-tbot 0.1.25 → 0.1.26

package/dist/plugin.js

@@ -1,4 +1,4 @@
-import { c as loadAppConfig, i as preparePluginConfiguration, o as OPENCODE_TBOT_VERSION } from "./assets/plugin-config-CCeFjxSf.js";
+import { c as loadAppConfig, i as preparePluginConfiguration, o as OPENCODE_TBOT_VERSION } from "./assets/plugin-config-DNeV2Ckw.js";
 import { mkdir, readFile, rename, stat, writeFile } from "node:fs/promises";
 import { dirname, isAbsolute, join } from "node:path";
 import { parse, printParseErrorCode } from "jsonc-parser";
@@ -227,11 +227,13 @@ var PROMPT_MESSAGE_POLL_INITIAL_DELAYS_MS = [
 	1e3
 ];
 var PROMPT_MESSAGE_POLL_INTERVAL_MS = 2e3;
-var PROMPT_POLL_REQUEST_TIMEOUT_MS = 15e3;
-var PROMPT_SEND_TIMEOUT_MS = 3e4;
-var PROMPT_MESSAGE_POLL_TIMEOUT_MS = 6e4;
 var PROMPT_MESSAGE_POLL_LIMIT = 20;
 var PROMPT_LOG_SERVICE = "opencode-tbot";
+var DEFAULT_OPENCODE_PROMPT_TIMEOUT_POLICY = {
+	pollRequestTimeoutMs: 15e3,
+	recoveryInactivityTimeoutMs: 12e4,
+	waitTimeoutMs: 18e5
+};
 var STRUCTURED_REPLY_SCHEMA = {
 	type: "json_schema",
 	retryCount: 2,
@@ -253,20 +255,39 @@ var StructuredReplySchema = z.object({ body_md: z.string() });
 var OpenCodeClient = class {
 	client;
 	fetchFn;
-	promptRequestTimeouts = {
-		pollRequestMs: PROMPT_POLL_REQUEST_TIMEOUT_MS,
-		sendMs: PROMPT_SEND_TIMEOUT_MS,
-		totalPollMs: PROMPT_MESSAGE_POLL_TIMEOUT_MS
-	};
+	sdkFlavor;
+	promptTimeoutPolicy;
 	modelCache = {
 		expiresAt: 0,
 		promise: null,
 		value: null
 	};
-	constructor(options, client, fetchFn = fetch) {
+	constructor(options, client, fetchFn = fetch, promptTimeoutPolicy = {}) {
 		if (!options && !client) throw new Error("OpenCodeClient requires either base URL options or an injected SDK client.");
 		this.client = client ?? createOpencodeClient(buildOpenCodeSdkConfig(options));
 		this.fetchFn = fetchFn;
+		this.sdkFlavor = detectSdkFlavor(this.client);
+		this.promptTimeoutPolicy = resolvePromptTimeoutPolicy(promptTimeoutPolicy);
+	}
+	configurePromptTimeoutPolicy(promptTimeoutPolicy) {
+		this.promptTimeoutPolicy = resolvePromptTimeoutPolicy({
+			...this.promptTimeoutPolicy,
+			...promptTimeoutPolicy
+		});
+	}
+	async callScopedSdkMethod(scope, method, input) {
+		const target = this.client[scope];
+		const handler = target?.[method];
+		if (typeof handler !== "function") throw new Error(`OpenCode SDK client does not expose a compatible ${scope}.${method} method.`);
+		if (this.sdkFlavor === "legacy") return unwrapSdkData(await handler.call(target, {
+			...SDK_OPTIONS,
+			...input.signal ? { signal: input.signal } : {},
+			...input.legacyOptions ?? {}
+		}));
+		return unwrapSdkData(await handler.call(target, input.v2Parameters, {
+			...SDK_OPTIONS,
+			...input.signal ? { signal: input.signal } : {}
+		}));
 	}
 	async getHealth() {
 		const rawClient = getRawSdkClient(this.client);
@@ -277,62 +298,70 @@ var OpenCodeClient = class {
 		return this.requestRaw("get", { url: "/global/health" });
 	}
 	async abortSession(sessionId) {
-		if (hasRawSdkMethod(this.client, "post")) return this.requestRaw("post", {
-			url: "/session/{sessionID}/abort",
-			path: { sessionID: sessionId }
+		if (hasRawSdkMethod(this.client, "post")) return this.requestRaw("post", buildRawSessionRequest(this.sdkFlavor, sessionId, "/abort"));
+		return this.callScopedSdkMethod("session", "abort", {
+			legacyOptions: { path: { id: sessionId } },
+			v2Parameters: { sessionID: sessionId }
 		});
-		return unwrapSdkData(await this.client.session.abort({ sessionID: sessionId }, SDK_OPTIONS));
 	}
 	async deleteSession(sessionId) {
-		if (hasRawSdkMethod(this.client, "delete")) return this.requestRaw("delete", {
-			url: "/session/{sessionID}",
-			path: { sessionID: sessionId }
+		if (hasRawSdkMethod(this.client, "delete")) return this.requestRaw("delete", buildRawSessionRequest(this.sdkFlavor, sessionId));
+		return this.callScopedSdkMethod("session", "delete", {
+			legacyOptions: { path: { id: sessionId } },
+			v2Parameters: { sessionID: sessionId }
 		});
-		return unwrapSdkData(await this.client.session.delete({ sessionID: sessionId }, SDK_OPTIONS));
 	}
 	async forkSession(sessionId, messageId) {
-		if (hasRawSdkMethod(this.client, "post")) return this.requestRaw("post", {
-			url: "/session/{sessionID}/fork",
-			path: { sessionID: sessionId },
-			...messageId?.trim() ? { body: { messageID: messageId.trim() } } : {}
+		if (hasRawSdkMethod(this.client, "post")) return this.requestRaw("post", buildRawSessionRequest(this.sdkFlavor, sessionId, "/fork", messageId?.trim() ? { body: { messageID: messageId.trim() } } : {}));
+		return this.callScopedSdkMethod("session", "fork", {
+			legacyOptions: {
+				path: { id: sessionId },
+				...messageId?.trim() ? { body: { messageID: messageId.trim() } } : {}
+			},
+			v2Parameters: {
+				sessionID: sessionId,
+				...messageId?.trim() ? { messageID: messageId.trim() } : {}
+			}
 		});
-		return unwrapSdkData(await this.client.session.fork({
-			sessionID: sessionId,
-			...messageId?.trim() ? { messageID: messageId.trim() } : {}
-		}, SDK_OPTIONS));
 	}
 	async getPath() {
 		if (hasRawSdkMethod(this.client, "get")) return this.requestRaw("get", { url: "/path" });
-		return unwrapSdkData(await this.client.path.get(void 0, SDK_OPTIONS));
+		return this.callScopedSdkMethod("path", "get", {});
 	}
 	async listLspStatuses(directory) {
 		if (hasRawSdkMethod(this.client, "get")) return this.requestRaw("get", {
 			url: "/lsp",
 			...directory ? { query: { directory } } : {}
 		});
-		return unwrapSdkData(await this.client.lsp.status(directory ? { directory } : void 0, SDK_OPTIONS));
+		return this.callScopedSdkMethod("lsp", "status", {
+			legacyOptions: directory ? { query: { directory } } : void 0,
+			v2Parameters: directory ? { directory } : void 0
+		});
 	}
 	async listMcpStatuses(directory) {
 		if (hasRawSdkMethod(this.client, "get")) return this.requestRaw("get", {
 			url: "/mcp",
 			...directory ? { query: { directory } } : {}
 		});
-		return unwrapSdkData(await this.client.mcp.status(directory ? { directory } : void 0, SDK_OPTIONS));
+		return this.callScopedSdkMethod("mcp", "status", {
+			legacyOptions: directory ? { query: { directory } } : void 0,
+			v2Parameters: directory ? { directory } : void 0
+		});
 	}
 	async getSessionStatuses() {
 		return this.loadSessionStatuses();
 	}
 	async listProjects() {
 		if (hasRawSdkMethod(this.client, "get")) return this.requestRaw("get", { url: "/project" });
-		return unwrapSdkData(await this.client.project.list(void 0, SDK_OPTIONS));
+		return this.callScopedSdkMethod("project", "list", {});
 	}
 	async listSessions() {
 		if (hasRawSdkMethod(this.client, "get")) return this.requestRaw("get", { url: "/session" });
-		return unwrapSdkData(await this.client.session.list(void 0, SDK_OPTIONS));
+		return this.callScopedSdkMethod("session", "list", {});
 	}
 	async getCurrentProject() {
 		if (hasRawSdkMethod(this.client, "get")) return this.requestRaw("get", { url: "/project/current" });
-		return unwrapSdkData(await this.client.project.current(void 0, SDK_OPTIONS));
+		return this.callScopedSdkMethod("project", "current", {});
 	}
 	async createSessionForDirectory(directory, title) {
 		if (hasRawSdkMethod(this.client, "post")) return this.requestRaw("post", {
@@ -340,34 +369,57 @@ var OpenCodeClient = class {
 			query: { directory },
 			...title ? { body: { title } } : {}
 		});
-		return unwrapSdkData(await this.client.session.create(title ? {
-			directory,
-			title
-		} : { directory }, SDK_OPTIONS));
+		return this.callScopedSdkMethod("session", "create", {
+			legacyOptions: {
+				query: { directory },
+				...title ? { body: { title } } : {}
+			},
+			v2Parameters: title ? {
+				directory,
+				title
+			} : { directory }
+		});
 	}
 	async renameSession(sessionId, title) {
-		if (hasRawSdkMethod(this.client, "patch")) return this.requestRaw("patch", {
-			url: "/session/{sessionID}",
-			path: { sessionID: sessionId },
-			body: { title }
+		if (hasRawSdkMethod(this.client, "patch")) return this.requestRaw("patch", buildRawSessionRequest(this.sdkFlavor, sessionId, "", { body: { title } }));
+		return this.callScopedSdkMethod("session", "update", {
+			legacyOptions: {
+				path: { id: sessionId },
+				body: { title }
+			},
+			v2Parameters: {
+				sessionID: sessionId,
+				title
+			}
 		});
-		return unwrapSdkData(await this.client.session.update({
-			sessionID: sessionId,
-			title
-		}, SDK_OPTIONS));
 	}
 	async listAgents() {
 		if (hasRawSdkMethod(this.client, "get")) return this.requestRaw("get", { url: "/agent" });
-		return unwrapSdkData(await this.client.app.agents(void 0, SDK_OPTIONS));
+		return this.callScopedSdkMethod("app", "agents", {});
 	}
 	async listPendingPermissions(directory) {
-		if (hasRawSdkMethod(this.client, "get")) return this.requestRaw("get", {
+		if (this.sdkFlavor === "v2" && hasRawSdkMethod(this.client, "get")) return this.requestRaw("get", {
 			url: "/permission",
 			...directory ? { query: { directory } } : {}
 		});
-		return unwrapSdkData(await this.client.permission.list(directory ? { directory } : void 0, SDK_OPTIONS));
+		return this.callScopedSdkMethod("permission", "list", {
+			legacyOptions: directory ? { query: { directory } } : void 0,
+			v2Parameters: directory ? { directory } : void 0
+		});
 	}
-	async replyToPermission(requestId, reply, message) {
+	async replyToPermission(requestId, reply, message, sessionId) {
+		if (this.sdkFlavor === "legacy" && sessionId) {
+			if (hasRawSdkMethod(this.client, "post")) return this.requestRaw("post", buildRawLegacyPermissionReplyRequest(sessionId, requestId, reply));
+			const legacyClient = this.client;
+			if (typeof legacyClient.postSessionIdPermissionsPermissionId === "function") return unwrapSdkData(await legacyClient.postSessionIdPermissionsPermissionId({
+				...SDK_OPTIONS,
+				body: { response: reply },
+				path: {
+					id: sessionId,
+					permissionID: requestId
+				}
+			}));
+		}
 		if (hasRawSdkMethod(this.client, "post")) return this.requestRaw("post", {
 			url: "/permission/{requestID}/reply",
 			path: { requestID: requestId },
@@ -376,11 +428,20 @@ var OpenCodeClient = class {
 				...message?.trim() ? { message: message.trim() } : {}
 			}
 		});
-		return unwrapSdkData(await this.client.permission.reply({
-			requestID: requestId,
-			reply,
-			...message?.trim() ? { message: message.trim() } : {}
-		}, SDK_OPTIONS));
+		return this.callScopedSdkMethod("permission", "reply", {
+			legacyOptions: sessionId ? {
+				body: { response: reply },
+				path: {
+					id: sessionId,
+					permissionID: requestId
+				}
+			} : void 0,
+			v2Parameters: {
+				requestID: requestId,
+				reply,
+				...message?.trim() ? { message: message.trim() } : {}
+			}
+		});
 	}
 	async listModels() {
 		const now = Date.now();
@@ -416,7 +477,7 @@ var OpenCodeClient = class {
 	}
 	async resolvePromptResponse(input, data, knownMessageIds, startedAt) {
 		const structured = input.structured ?? false;
-		if (data && !shouldPollPromptMessage(data, structured)) return data;
+		if (data && shouldReturnPromptResponseImmediately(data, structured)) return data;
 		const messageId = data ? extractMessageId(data.info) : null;
 		const candidateOptions = {
 			initialMessageId: messageId,
@@ -426,14 +487,18 @@ var OpenCodeClient = class {
 			structured
 		};
 		let bestCandidate = selectPromptResponseCandidate(data ? [data] : [], candidateOptions);
-		const deadlineAt = Date.now() + this.promptRequestTimeouts.totalPollMs;
+		let lastProgressAt = Date.now();
+		const deadlineAt = startedAt + this.promptTimeoutPolicy.waitTimeoutMs;
 		let idleStatusSeen = false;
 		let attempt = 0;
 		while (true) {
+			const remainingWaitMs = deadlineAt - Date.now();
+			const remainingInactivityMs = this.promptTimeoutPolicy.recoveryInactivityTimeoutMs - (Date.now() - lastProgressAt);
+			if (remainingWaitMs <= 0 || remainingInactivityMs <= 0) break;
 			const delayMs = getPromptMessagePollDelayMs(attempt);
 			attempt += 1;
 			if (delayMs > 0) {
-				const remainingMs = deadlineAt - Date.now();
+				const remainingMs = Math.min(remainingWaitMs, remainingInactivityMs);
 				if (remainingMs <= 0) break;
 				await delay(Math.min(delayMs, remainingMs));
 			}
@@ -441,37 +506,59 @@ var OpenCodeClient = class {
 				const next = await this.fetchPromptMessage(input.sessionId, messageId);
 				if (next) {
 					const nextCandidate = selectPromptResponseCandidate([bestCandidate, next], candidateOptions);
-					if (nextCandidate) bestCandidate = nextCandidate;
-					if (bestCandidate && !shouldPollPromptMessage(bestCandidate, structured)) return bestCandidate;
+					if (nextCandidate) {
+						if (didPromptResponseAdvance(bestCandidate, nextCandidate, structured)) {
+							lastProgressAt = Date.now();
+							idleStatusSeen = false;
+						}
+						bestCandidate = nextCandidate;
+					}
+					if (bestCandidate && shouldReturnPromptResponseImmediately(bestCandidate, structured)) return bestCandidate;
 				}
 			}
 			const latest = await this.findLatestPromptResponse(input.sessionId, candidateOptions, "poll-messages");
 			if (latest) {
 				const nextCandidate = selectPromptResponseCandidate([bestCandidate, latest], candidateOptions);
-				if (nextCandidate) bestCandidate = nextCandidate;
-				if (bestCandidate && !shouldPollPromptMessage(bestCandidate, structured)) return bestCandidate;
+				if (nextCandidate) {
+					if (didPromptResponseAdvance(bestCandidate, nextCandidate, structured)) {
+						lastProgressAt = Date.now();
+						idleStatusSeen = false;
+					}
+					bestCandidate = nextCandidate;
+				}
+				if (bestCandidate && shouldReturnPromptResponseImmediately(bestCandidate, structured)) return bestCandidate;
 			}
-			if ((await this.fetchPromptSessionStatus(input.sessionId))?.type === "idle") {
+			const status = await this.fetchPromptSessionStatus(input.sessionId);
+			if (status?.type === "busy" || status?.type === "retry") {
+				lastProgressAt = Date.now();
+				idleStatusSeen = false;
+			} else if (status?.type === "idle") {
 				if (idleStatusSeen) break;
 				idleStatusSeen = true;
 			}
+			if (bestCandidate && isCompletedEmptyPromptResponse(bestCandidate, structured) && status?.type !== "busy" && status?.type !== "retry") break;
 			if (Date.now() >= deadlineAt) break;
 		}
 		const latest = await this.findLatestPromptResponse(input.sessionId, candidateOptions, "final-scan");
 		const resolved = selectPromptResponseCandidate([bestCandidate, latest], candidateOptions);
 		if (!resolved || shouldPollPromptMessage(resolved, structured)) {
+			const timeoutReason = Date.now() >= deadlineAt ? "max-wait" : "recovery-inactivity";
+			const timeoutMs = timeoutReason === "max-wait" ? this.promptTimeoutPolicy.waitTimeoutMs : this.promptTimeoutPolicy.recoveryInactivityTimeoutMs;
 			const error = createOpenCodePromptTimeoutError({
 				sessionId: input.sessionId,
 				stage: "final-scan",
-				timeoutMs: this.promptRequestTimeouts.totalPollMs,
+				timeoutMs,
 				messageId: messageId ?? void 0
 			});
-			this.logPromptRequestFailure(error, {
+			this.logPromptRequest("warn", {
+				lastProgressAt,
+				messageId: messageId ?? void 0,
+				sdkFlavor: this.sdkFlavor,
 				sessionId: input.sessionId,
 				stage: "final-scan",
-				timeoutMs: this.promptRequestTimeouts.totalPollMs,
-				messageId
-			});
+				timeoutMs,
+				timeoutReason
+			}, "OpenCode prompt recovery timed out");
 			throw error;
 		}
 		return resolved;
@@ -481,31 +568,28 @@ var OpenCodeClient = class {
 			return await this.runPromptRequestWithTimeout({
 				sessionId,
 				stage: "poll-message",
-				timeoutMs: this.promptRequestTimeouts.pollRequestMs,
+				timeoutMs: this.promptTimeoutPolicy.pollRequestTimeoutMs,
 				messageId
 			}, async (signal) => {
-				if (hasRawSdkMethod(this.client, "get")) return normalizePromptResponse(await this.requestRaw("get", {
-					url: "/session/{sessionID}/message/{messageID}",
-					path: {
+				if (hasRawSdkMethod(this.client, "get")) return normalizePromptResponse(await this.requestRaw("get", buildRawSessionMessageRequest(this.sdkFlavor, sessionId, messageId, { signal })));
+				if (typeof this.client.session.message !== "function") return null;
+				return normalizePromptResponse(await this.callScopedSdkMethod("session", "message", {
+					legacyOptions: { path: {
+						id: sessionId,
+						messageID: messageId
+					} },
+					signal,
+					v2Parameters: {
 						sessionID: sessionId,
 						messageID: messageId
-					},
-					signal
+					}
 				}));
-				if (typeof this.client.session.message !== "function") return null;
-				return normalizePromptResponse(unwrapSdkData(await this.client.session.message({
-					sessionID: sessionId,
-					messageID: messageId
-				}, {
-					...SDK_OPTIONS,
-					signal
-				})));
 			});
 		} catch (error) {
 			this.logPromptRequestFailure(error, {
 				sessionId,
 				stage: "poll-message",
-				timeoutMs: this.promptRequestTimeouts.pollRequestMs,
+				timeoutMs: this.promptTimeoutPolicy.pollRequestTimeoutMs,
 				messageId
 			});
 			return null;
@@ -521,28 +605,30 @@ var OpenCodeClient = class {
 			return await this.runPromptRequestWithTimeout({
 				sessionId,
 				stage,
-				timeoutMs: this.promptRequestTimeouts.pollRequestMs
+				timeoutMs: this.promptTimeoutPolicy.pollRequestTimeoutMs
 			}, async (signal) => {
-				if (hasRawSdkMethod(this.client, "get")) return normalizePromptResponses(await this.requestRaw("get", {
-					url: "/session/{sessionID}/message",
-					path: { sessionID: sessionId },
+				if (hasRawSdkMethod(this.client, "get")) return normalizePromptResponses(await this.requestRaw("get", buildRawSessionRequest(this.sdkFlavor, sessionId, "/message", {
 					query: { limit: PROMPT_MESSAGE_POLL_LIMIT },
 					signal
-				}));
-				if (typeof this.client.session.messages !== "function") return null;
-				return normalizePromptResponses(unwrapSdkData(await this.client.session.messages({
-					sessionID: sessionId,
-					limit: PROMPT_MESSAGE_POLL_LIMIT
-				}, {
-					...SDK_OPTIONS,
-					signal
 				})));
+				if (typeof this.client.session.messages !== "function") return null;
+				return normalizePromptResponses(await this.callScopedSdkMethod("session", "messages", {
+					legacyOptions: {
+						path: { id: sessionId },
+						query: { limit: PROMPT_MESSAGE_POLL_LIMIT }
+					},
+					signal,
+					v2Parameters: {
+						sessionID: sessionId,
+						limit: PROMPT_MESSAGE_POLL_LIMIT
+					}
+				}));
 			});
 		} catch (error) {
 			this.logPromptRequestFailure(error, {
 				sessionId,
 				stage,
-				timeoutMs: this.promptRequestTimeouts.pollRequestMs
+				timeoutMs: this.promptTimeoutPolicy.pollRequestTimeoutMs
 			});
 			return null;
 		}
@@ -552,13 +638,13 @@ var OpenCodeClient = class {
 			return (await this.runPromptRequestWithTimeout({
 				sessionId,
 				stage: "poll-status",
-				timeoutMs: this.promptRequestTimeouts.pollRequestMs
+				timeoutMs: this.promptTimeoutPolicy.pollRequestTimeoutMs
 			}, async (signal) => this.loadSessionStatuses(signal)))[sessionId] ?? null;
 		} catch (error) {
 			this.logPromptRequestFailure(error, {
 				sessionId,
 				stage: "poll-status",
-				timeoutMs: this.promptRequestTimeouts.pollRequestMs
+				timeoutMs: this.promptTimeoutPolicy.pollRequestTimeoutMs
 			});
 			return null;
 		}
@@ -581,11 +667,11 @@ var OpenCodeClient = class {
 	}
 	async loadConfig() {
 		if (hasRawSdkMethod(this.client, "get")) return this.requestRaw("get", { url: "/config" });
-		return unwrapSdkData(await this.client.config.get(void 0, SDK_OPTIONS));
+		return this.callScopedSdkMethod("config", "get", {});
 	}
 	async loadProviderCatalog() {
 		if (hasRawSdkMethod(this.client, "get")) return this.requestRaw("get", { url: "/config/providers" });
-		return unwrapSdkData(await this.client.config.providers(void 0, SDK_OPTIONS));
+		return this.callScopedSdkMethod("config", "providers", {});
 	}
 	async sendPromptRequest(input, parts) {
 		const requestBody = {
@@ -600,43 +686,52 @@ var OpenCodeClient = class {
 			...requestBody
 		};
 		try {
+			if (hasRawSdkMethod(this.client, "post")) return await this.runPromptRequestWithTimeout({
+				sessionId: input.sessionId,
+				stage: "send-prompt",
+				timeoutMs: this.promptTimeoutPolicy.waitTimeoutMs
+			}, async (signal) => normalizePromptResponse(await this.requestRaw("post", buildRawSessionRequest(this.sdkFlavor, input.sessionId, "/message", {
+				body: requestBody,
+				signal
+			}))));
+			if (typeof this.client.session?.prompt === "function") return await this.runPromptRequestWithTimeout({
+				sessionId: input.sessionId,
+				stage: "send-prompt",
+				timeoutMs: this.promptTimeoutPolicy.waitTimeoutMs
+			}, async (signal) => normalizePromptResponse(await this.callScopedSdkMethod("session", "prompt", {
+				legacyOptions: {
+					body: requestBody,
+					path: { id: input.sessionId }
+				},
+				signal,
+				v2Parameters: requestParameters
+			})));
 			if (typeof this.client.session?.promptAsync === "function") {
 				await this.runPromptRequestWithTimeout({
 					sessionId: input.sessionId,
 					stage: "send-prompt",
-					timeoutMs: this.promptRequestTimeouts.sendMs
+					timeoutMs: this.promptTimeoutPolicy.waitTimeoutMs
 				}, async (signal) => {
-					await this.client.session.promptAsync(requestParameters, {
-						...SDK_OPTIONS,
-						signal
+					await this.callScopedSdkMethod("session", "promptAsync", {
+						legacyOptions: {
+							body: requestBody,
+							path: { id: input.sessionId }
+						},
+						signal,
+						v2Parameters: requestParameters
 					});
 				});
 				return null;
 			}
-			return await this.runPromptRequestWithTimeout({
-				sessionId: input.sessionId,
-				stage: "send-prompt",
-				timeoutMs: this.promptRequestTimeouts.sendMs
-			}, async (signal) => {
-				if (hasRawSdkMethod(this.client, "post")) return normalizePromptResponse(await this.requestRaw("post", {
-					url: "/session/{sessionID}/message",
-					path: { sessionID: input.sessionId },
-					body: requestBody,
-					signal
-				}));
-				return normalizePromptResponse(unwrapSdkData(await this.client.session.prompt(requestParameters, {
-					...SDK_OPTIONS,
-					signal
-				})));
-			});
 		} catch (error) {
 			this.logPromptRequestFailure(error, {
 				sessionId: input.sessionId,
 				stage: "send-prompt",
-				timeoutMs: this.promptRequestTimeouts.sendMs
+				timeoutMs: this.promptTimeoutPolicy.waitTimeoutMs
 			});
 			throw error;
 		}
+		throw new Error("OpenCode SDK client does not expose a compatible prompt endpoint.");
 	}
 	async requestRaw(method, options) {
 		const handler = getRawSdkClient(this.client)?.[method];
@@ -651,10 +746,7 @@ var OpenCodeClient = class {
 			url: "/session/status",
 			...signal ? { signal } : {}
 		});
-		return unwrapSdkData(await this.client.session.status(void 0, {
-			...SDK_OPTIONS,
-			...signal ? { signal } : {}
-		}));
+		return this.callScopedSdkMethod("session", "status", { signal });
 	}
 	async runPromptRequestWithTimeout(input, operation) {
 		const startedAt = Date.now();
@@ -681,8 +773,10 @@ var OpenCodeClient = class {
 	logPromptRequestFailure(error, input) {
 		if (error instanceof OpenCodePromptTimeoutError) {
 			this.logPromptRequest("warn", {
+				endpointKind: resolvePromptEndpointKind(error.data.stage),
 				elapsedMs: error.data.elapsedMs,
 				messageId: error.data.messageId,
+				sdkFlavor: this.sdkFlavor,
 				sessionId: error.data.sessionId,
 				stage: error.data.stage,
 				timeoutMs: error.data.timeoutMs
@@ -690,8 +784,10 @@ var OpenCodeClient = class {
 			return;
 		}
 		this.logPromptRequest("warn", {
+			endpointKind: resolvePromptEndpointKind(input.stage),
 			error,
 			messageId: input.messageId ?? void 0,
+			sdkFlavor: this.sdkFlavor,
 			sessionId: input.sessionId,
 			stage: input.stage,
 			timeoutMs: input.timeoutMs
@@ -708,8 +804,8 @@ var OpenCodeClient = class {
 		}).catch(() => void 0);
 	}
 };
-function createOpenCodeClientFromSdkClient(client, fetchFn = fetch) {
-	return new OpenCodeClient(void 0, client, fetchFn);
+function createOpenCodeClientFromSdkClient(client, fetchFn = fetch, promptTimeoutPolicy = {}) {
+	return new OpenCodeClient(void 0, client, fetchFn, promptTimeoutPolicy);
 }
 function buildSelectableModels(config, providers, providerAvailability = /* @__PURE__ */ new Map()) {
 	const configuredProviders = config.provider ?? {};
@@ -816,7 +912,14 @@ function shouldPollPromptMessage(data, structured) {
 	const bodyMd = structured ? extractStructuredMarkdown(extractStructuredPayload(assistantInfo)) : null;
 	const hasText = extractTextFromParts(Array.isArray(data.parts) ? data.parts : []).length > 0;
 	const hasAssistantError = !!assistantInfo?.error;
-	return !hasText && !bodyMd && !hasAssistantError;
+	const isCompleted = isAssistantMessageCompleted(assistantInfo);
+	return !hasText && !bodyMd && !hasAssistantError && !isCompleted;
+}
+function shouldReturnPromptResponseImmediately(data, structured) {
+	return !shouldPollPromptMessage(data, structured) && !isCompletedEmptyPromptResponse(data, structured);
+}
+function isPromptResponseUsable(data, structured) {
+	return !shouldPollPromptMessage(data, structured) && !isCompletedEmptyPromptResponse(data, structured);
 }
 function normalizePromptResponse(response) {
 	return {
@@ -878,6 +981,9 @@ function extractMessageId(message) {
 function delay(ms) {
 	return new Promise((resolve) => setTimeout(resolve, ms));
 }
+function didPromptResponseAdvance(previous, next, structured) {
+	return getPromptResponseProgressSignature(previous, structured) !== getPromptResponseProgressSignature(next, structured);
+}
 function createOpenCodePromptTimeoutError(input) {
 	return new OpenCodePromptTimeoutError({
 		...input,
@@ -885,6 +991,16 @@ function createOpenCodePromptTimeoutError(input) {
 		message: input.message ?? "The OpenCode host did not finish this request in time."
 	});
 }
+function resolvePromptEndpointKind(stage) {
+	switch (stage) {
+		case "capture-known-messages":
+		case "poll-messages":
+		case "final-scan": return "messages";
+		case "poll-message": return "message";
+		case "poll-status": return "status";
+		default: return "prompt";
+	}
+}
 function getPromptMessagePollDelayMs(attempt) {
 	return PROMPT_MESSAGE_POLL_INITIAL_DELAYS_MS[attempt] ?? PROMPT_MESSAGE_POLL_INTERVAL_MS;
 }
@@ -940,6 +1056,47 @@ function unwrapSdkData(response) {
 	if (response && typeof response === "object" && "data" in response) return response.data;
 	return response;
 }
+function resolvePromptTimeoutPolicy(input) {
+	return {
+		pollRequestTimeoutMs: input.pollRequestTimeoutMs ?? DEFAULT_OPENCODE_PROMPT_TIMEOUT_POLICY.pollRequestTimeoutMs,
+		recoveryInactivityTimeoutMs: input.recoveryInactivityTimeoutMs ?? DEFAULT_OPENCODE_PROMPT_TIMEOUT_POLICY.recoveryInactivityTimeoutMs,
+		waitTimeoutMs: input.waitTimeoutMs ?? DEFAULT_OPENCODE_PROMPT_TIMEOUT_POLICY.waitTimeoutMs
+	};
+}
+function detectSdkFlavor(client) {
+	if (typeof client.global?.health === "function" || "permission" in client) return "v2";
+	return clientExposesTwoArgumentSdkMethod(client) ? "v2" : "legacy";
+}
+function buildRawSessionRequest(sdkFlavor, sessionId, suffix = "", extra = {}) {
+	return {
+		url: sdkFlavor === "legacy" ? `/session/{id}${suffix}` : `/session/{sessionID}${suffix}`,
+		path: sdkFlavor === "legacy" ? { id: sessionId } : { sessionID: sessionId },
+		...extra
+	};
+}
+function buildRawSessionMessageRequest(sdkFlavor, sessionId, messageId, extra = {}) {
+	return {
+		url: sdkFlavor === "legacy" ? "/session/{id}/message/{messageID}" : "/session/{sessionID}/message/{messageID}",
+		path: sdkFlavor === "legacy" ? {
+			id: sessionId,
+			messageID: messageId
+		} : {
+			sessionID: sessionId,
+			messageID: messageId
+		},
+		...extra
+	};
+}
+function buildRawLegacyPermissionReplyRequest(sessionId, requestId, reply) {
+	return {
+		body: { response: reply },
+		path: {
+			id: sessionId,
+			permissionID: requestId
+		},
+		url: "/session/{id}/permissions/{permissionID}"
+	};
+}
 function getRawSdkClient(client) {
 	return client.client ?? client._client ?? null;
 }
@@ -954,6 +1111,32 @@ function normalizeAssistantError(value) {
 		...isPlainRecord(value.data) ? { data: value.data } : {}
 	};
 }
+function isAssistantMessageCompleted(message) {
+	return !!message?.error || typeof message?.time?.completed === "number" || typeof message?.finish === "string" && message.finish.trim().length > 0;
+}
+function isCompletedEmptyPromptResponse(data, structured) {
+	const assistantInfo = toAssistantMessage(data.info);
+	const bodyMd = structured ? extractStructuredMarkdown(extractStructuredPayload(assistantInfo)) : null;
+	const hasText = extractTextFromParts(Array.isArray(data.parts) ? data.parts : []).length > 0;
+	return isAssistantMessageCompleted(assistantInfo) && !assistantInfo?.error && !hasText && !bodyMd;
+}
+function clientExposesTwoArgumentSdkMethod(client) {
+	return [
+		"app",
+		"config",
+		"global",
+		"lsp",
+		"mcp",
+		"path",
+		"permission",
+		"project",
+		"session"
+	].some((scope) => {
+		const target = client[scope];
+		if (!target || typeof target !== "object") return false;
+		return Object.values(target).some((value) => typeof value === "function" && value.length >= 2);
+	});
+}
 function extractStructuredPayload(message) {
 	if (!isPlainRecord(message)) return null;
 	if ("structured" in message && message.structured !== void 0) return message.structured;
@@ -978,7 +1161,7 @@ function getPromptResponseCandidateRank(message, options) {
 		createdAt,
 		isInitial: !!id && id === options.initialMessageId,
 		isNewSinceRequestStart: isPromptResponseNewSinceRequestStart(id, createdAt, options.knownMessageIds, options.requestStartedAt),
-		isUsable: !shouldPollPromptMessage(message, options.structured),
+		isUsable: isPromptResponseUsable(message, options.structured),
 		sharesParent: !!assistant?.parentID && assistant.parentID === options.initialParentId
 	};
 }
@@ -988,6 +1171,20 @@ function resolvePromptCandidateStartTime(startedAt, initialMessage) {
 	if (initialCreatedAt === null) return startedAt;
 	return areComparablePromptTimestamps(startedAt, initialCreatedAt) ? startedAt : initialCreatedAt;
 }
+function getPromptResponseProgressSignature(response, structured) {
+	if (!response) return "null";
+	const assistant = toAssistantMessage(response.info);
+	const responseParts = Array.isArray(response.parts) ? response.parts : [];
+	return JSON.stringify({
+		assistantError: assistant?.error?.name ?? null,
+		bodyMd: structured ? extractStructuredMarkdown(extractStructuredPayload(assistant)) : null,
+		completedAt: assistant?.time?.completed ?? null,
+		finish: assistant?.finish ?? null,
+		id: assistant?.id ?? null,
+		partCount: responseParts.length,
+		text: extractTextFromParts(responseParts)
+	});
+}
 function isPromptResponseNewSinceRequestStart(messageId, createdAt, knownMessageIds, requestStartedAt) {
 	if (!messageId || knownMessageIds.has(messageId)) return false;
 	if (requestStartedAt === null) return true;
@@ -2025,7 +2222,11 @@ function resolveExtension(mimeType) {
 //#region src/app/container.ts
 function createAppContainer(config, client) {
 	const logger = createOpenCodeAppLogger(client, { level: config.logLevel });
-	return createContainer(config, createOpenCodeClientFromSdkClient(client), logger);
+	return createContainer(config, createOpenCodeClientFromSdkClient(client, fetch, {
+		waitTimeoutMs: config.promptWaitTimeoutMs,
+		pollRequestTimeoutMs: config.promptPollRequestTimeoutMs,
+		recoveryInactivityTimeoutMs: config.promptRecoveryInactivityTimeoutMs
+	}), logger);
 }
 function createContainer(config, opencodeClient, logger) {
 	const stateStore = new JsonStateStore({
@@ -4478,8 +4679,8 @@ async function handlePermissionApprovalCallback(ctx, dependencies) {
 	const parsed = parsePermissionApprovalCallbackData(data);
 	if (!parsed) return;
 	try {
-		await dependencies.opencodeClient.replyToPermission(parsed.requestId, parsed.reply);
 		const approval = (await dependencies.permissionApprovalRepo.listByRequestId(parsed.requestId)).find((item) => item.chatId === ctx.chat?.id);
+		await dependencies.opencodeClient.replyToPermission(parsed.requestId, parsed.reply, void 0, approval?.sessionId);
 		if (approval) await dependencies.permissionApprovalRepo.set({
 			...approval,
 			status: parsed.reply,