opencode-tbot 0.1.10 → 0.1.12

package/dist/plugin.js

@@ -211,18 +211,28 @@ function buildOpenCodeSdkConfig(options) {
 		...apiKey ? { auth: apiKey } : {}
 	};
 }
+var OpenCodePromptTimeoutError = class extends Error {
+	data;
+	constructor(data) {
+		super(data.message ?? "OpenCode prompt timed out.");
+		this.name = "OpenCodePromptTimeoutError";
+		this.data = data;
+	}
+};
 var EMPTY_RESPONSE_TEXT = "OpenCode returned empty response.";
-var PROMPT_MESSAGE_POLL_DELAYS_MS = [
+var PROMPT_MESSAGE_POLL_INITIAL_DELAYS_MS = [
 	0,
 	100,
 	250,
 	500,
-	1e3,
-	2e3,
-	4e3,
-	8e3
+	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 STRUCTURED_REPLY_SCHEMA = {
 	type: "json_schema",
 	retryCount: 2,
@@ -244,6 +254,11 @@ 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
+	};
 	modelCache = {
 		expiresAt: 0,
 		promise: null,
@@ -288,8 +303,7 @@ var OpenCodeClient = class {
 		return unwrapSdkData(await this.client.mcp.status(directory ? { directory } : void 0, SDK_OPTIONS));
 	}
 	async getSessionStatuses() {
-		if (hasRawSdkMethod(this.client, "get")) return this.requestRaw("get", { url: "/session/status" });
-		return unwrapSdkData(await this.client.session.status(void 0, SDK_OPTIONS));
+		return this.loadSessionStatuses();
 	}
 	async listProjects() {
 		if (hasRawSdkMethod(this.client, "get")) return this.requestRaw("get", { url: "/project" });
@@ -376,117 +390,162 @@ var OpenCodeClient = class {
 		if (parts.length === 0) throw new Error("Prompt requires text or file attachments.");
 		const knownMessageIds = await this.captureKnownMessageIds(input.sessionId);
 		const initialData = await this.sendPromptRequest(input, parts);
-		return buildPromptSessionResult(await this.resolvePromptResponse(input, initialData, knownMessageIds), {
+		return buildPromptSessionResult(await this.resolvePromptResponse(input, initialData, knownMessageIds, startedAt), {
 			emptyResponseText: EMPTY_RESPONSE_TEXT,
 			finishedAt: Date.now(),
 			startedAt,
 			structured: input.structured ?? false
 		});
 	}
-	async resolvePromptResponse(input, data, knownMessageIds) {
+	async resolvePromptResponse(input, data, knownMessageIds, startedAt) {
 		const structured = input.structured ?? false;
 		if (!shouldPollPromptMessage(data, structured)) return data;
 		const messageId = extractMessageId(data.info);
-		let expectedParentId = toAssistantMessage(data.info)?.parentID ?? null;
-		let bestCandidate = data;
-		let hasWaited = false;
-		for (const delayMs of PROMPT_MESSAGE_POLL_DELAYS_MS) {
+		const candidateOptions = {
+			initialMessageId: messageId,
+			initialParentId: toAssistantMessage(data.info)?.parentID ?? null,
+			knownMessageIds,
+			requestStartedAt: resolvePromptCandidateStartTime(startedAt, data),
+			structured
+		};
+		let bestCandidate = selectPromptResponseCandidate([data], candidateOptions) ?? data;
+		const deadlineAt = Date.now() + this.promptRequestTimeouts.totalPollMs;
+		let idleStatusSeen = false;
+		let attempt = 0;
+		while (true) {
+			const delayMs = getPromptMessagePollDelayMs(attempt);
+			attempt += 1;
 			if (delayMs > 0) {
-				await delay(delayMs);
-				hasWaited = true;
+				const remainingMs = deadlineAt - Date.now();
+				if (remainingMs <= 0) break;
+				await delay(Math.min(delayMs, remainingMs));
 			}
 			if (messageId) {
 				const next = await this.fetchPromptMessage(input.sessionId, messageId);
 				if (next) {
-					bestCandidate = selectPromptResponseCandidate([bestCandidate, next], {
-						initialMessageId: messageId,
-						initialParentId: expectedParentId,
-						knownMessageIds,
-						structured
-					}) ?? bestCandidate;
-					expectedParentId = toAssistantMessage(next.info)?.parentID ?? expectedParentId;
-					if (!shouldPollPromptMessage(next, structured)) return next;
+					bestCandidate = selectPromptResponseCandidate([bestCandidate, next], candidateOptions) ?? bestCandidate;
+					if (!shouldPollPromptMessage(next, structured)) return bestCandidate;
 				}
 			}
-			const latest = await this.findLatestPromptResponse(input.sessionId, {
-				initialMessageId: messageId,
-				initialParentId: expectedParentId,
-				knownMessageIds,
-				structured
-			});
+			const latest = await this.findLatestPromptResponse(input.sessionId, candidateOptions, "poll-messages");
 			if (latest) {
-				bestCandidate = selectPromptResponseCandidate([bestCandidate, latest], {
-					initialMessageId: messageId,
-					initialParentId: expectedParentId,
-					knownMessageIds,
-					structured
-				}) ?? bestCandidate;
-				expectedParentId = toAssistantMessage(latest.info)?.parentID ?? expectedParentId;
-				if (!shouldPollPromptMessage(latest, structured)) return latest;
+				bestCandidate = selectPromptResponseCandidate([bestCandidate, latest], candidateOptions) ?? bestCandidate;
+				if (!shouldPollPromptMessage(bestCandidate, structured)) return bestCandidate;
 			}
-			if ((await this.fetchPromptSessionStatus(input.sessionId))?.type === "idle" && hasWaited) break;
+			if ((await this.fetchPromptSessionStatus(input.sessionId))?.type === "idle") {
+				if (idleStatusSeen) break;
+				idleStatusSeen = true;
+			}
+			if (Date.now() >= deadlineAt) break;
 		}
-		const latest = await this.findLatestPromptResponse(input.sessionId, {
-			initialMessageId: messageId,
-			initialParentId: expectedParentId,
-			knownMessageIds,
-			structured
-		});
-		return selectPromptResponseCandidate([bestCandidate, latest], {
-			initialMessageId: messageId,
-			initialParentId: expectedParentId,
-			knownMessageIds,
-			structured
-		}) ?? bestCandidate;
+		const latest = await this.findLatestPromptResponse(input.sessionId, candidateOptions, "final-scan");
+		const resolved = selectPromptResponseCandidate([bestCandidate, latest], candidateOptions) ?? bestCandidate;
+		if (shouldPollPromptMessage(resolved, structured)) {
+			const error = createOpenCodePromptTimeoutError({
+				sessionId: input.sessionId,
+				stage: "final-scan",
+				timeoutMs: this.promptRequestTimeouts.totalPollMs,
+				messageId: messageId ?? void 0
+			});
+			this.logPromptRequestFailure(error, {
+				sessionId: input.sessionId,
+				stage: "final-scan",
+				timeoutMs: this.promptRequestTimeouts.totalPollMs,
+				messageId
+			});
+			throw error;
+		}
+		return resolved;
 	}
 	async fetchPromptMessage(sessionId, messageId) {
 		try {
-			if (hasRawSdkMethod(this.client, "get")) return normalizePromptResponse(await this.requestRaw("get", {
-				url: "/session/{sessionID}/message/{messageID}",
-				path: {
+			return await this.runPromptRequestWithTimeout({
+				sessionId,
+				stage: "poll-message",
+				timeoutMs: this.promptRequestTimeouts.pollRequestMs,
+				messageId
+			}, async (signal) => {
+				if (hasRawSdkMethod(this.client, "get")) return normalizePromptResponse(await this.requestRaw("get", {
+					url: "/session/{sessionID}/message/{messageID}",
+					path: {
+						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
-				}
-			}));
-			if (typeof this.client.session.message !== "function") return null;
-			return normalizePromptResponse(unwrapSdkData(await this.client.session.message({
-				sessionID: sessionId,
-				messageID: messageId
-			}, SDK_OPTIONS)));
-		} catch {
+				}, {
+					...SDK_OPTIONS,
+					signal
+				})));
+			});
+		} catch (error) {
+			this.logPromptRequestFailure(error, {
+				sessionId,
+				stage: "poll-message",
+				timeoutMs: this.promptRequestTimeouts.pollRequestMs,
+				messageId
+			});
 			return null;
 		}
 	}
 	async captureKnownMessageIds(sessionId) {
-		const messages = await this.fetchRecentPromptMessages(sessionId);
+		const messages = await this.fetchRecentPromptMessages(sessionId, "capture-known-messages");
 		if (!messages) return /* @__PURE__ */ new Set();
 		return new Set(messages.map((message) => extractMessageId(message.info)).filter((id) => typeof id === "string" && id.length > 0));
 	}
-	async fetchRecentPromptMessages(sessionId) {
+	async fetchRecentPromptMessages(sessionId, stage) {
 		try {
-			if (hasRawSdkMethod(this.client, "get")) return normalizePromptResponses(await this.requestRaw("get", {
-				url: "/session/{sessionID}/message",
-				path: { sessionID: sessionId },
-				query: { limit: PROMPT_MESSAGE_POLL_LIMIT }
-			}));
-			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)));
-		} catch {
+			return await this.runPromptRequestWithTimeout({
+				sessionId,
+				stage,
+				timeoutMs: this.promptRequestTimeouts.pollRequestMs
+			}, async (signal) => {
+				if (hasRawSdkMethod(this.client, "get")) return normalizePromptResponses(await this.requestRaw("get", {
+					url: "/session/{sessionID}/message",
+					path: { sessionID: sessionId },
+					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
+				})));
+			});
+		} catch (error) {
+			this.logPromptRequestFailure(error, {
+				sessionId,
+				stage,
+				timeoutMs: this.promptRequestTimeouts.pollRequestMs
+			});
 			return null;
 		}
 	}
 	async fetchPromptSessionStatus(sessionId) {
 		try {
-			return (await this.getSessionStatuses())[sessionId] ?? null;
-		} catch {
+			return (await this.runPromptRequestWithTimeout({
+				sessionId,
+				stage: "poll-status",
+				timeoutMs: this.promptRequestTimeouts.pollRequestMs
+			}, async (signal) => this.loadSessionStatuses(signal)))[sessionId] ?? null;
+		} catch (error) {
+			this.logPromptRequestFailure(error, {
+				sessionId,
+				stage: "poll-status",
+				timeoutMs: this.promptRequestTimeouts.pollRequestMs
+			});
 			return null;
 		}
 	}
-	async findLatestPromptResponse(sessionId, options) {
-		const messages = await this.fetchRecentPromptMessages(sessionId);
+	async findLatestPromptResponse(sessionId, options, stage) {
+		const messages = await this.fetchRecentPromptMessages(sessionId, stage);
 		if (!messages || messages.length === 0) return null;
 		return selectPromptResponseCandidate(messages, options);
 	}
@@ -510,25 +569,44 @@ var OpenCodeClient = class {
 		return unwrapSdkData(await this.client.config.providers(void 0, SDK_OPTIONS));
 	}
 	async sendPromptRequest(input, parts) {
-		if (hasRawSdkMethod(this.client, "post")) return normalizePromptResponse(await this.requestRaw("post", {
-			url: "/session/{sessionID}/message",
-			path: { sessionID: input.sessionId },
-			body: {
-				...input.agent ? { agent: input.agent } : {},
-				...input.structured ? { format: STRUCTURED_REPLY_SCHEMA } : {},
-				...input.model ? { model: input.model } : {},
-				...input.variant ? { variant: input.variant } : {},
-				parts
-			}
-		}));
-		return normalizePromptResponse(unwrapSdkData(await this.client.session.prompt({
-			sessionID: input.sessionId,
-			...input.agent ? { agent: input.agent } : {},
-			...input.structured ? { format: STRUCTURED_REPLY_SCHEMA } : {},
-			...input.model ? { model: input.model } : {},
-			...input.variant ? { variant: input.variant } : {},
-			parts
-		}, SDK_OPTIONS)));
+		try {
+			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: {
+						...input.agent ? { agent: input.agent } : {},
+						...input.structured ? { format: STRUCTURED_REPLY_SCHEMA } : {},
+						...input.model ? { model: input.model } : {},
+						...input.variant ? { variant: input.variant } : {},
+						parts
+					},
+					signal
+				}));
+				return normalizePromptResponse(unwrapSdkData(await this.client.session.prompt({
+					sessionID: input.sessionId,
+					...input.agent ? { agent: input.agent } : {},
+					...input.structured ? { format: STRUCTURED_REPLY_SCHEMA } : {},
+					...input.model ? { model: input.model } : {},
+					...input.variant ? { variant: input.variant } : {},
+					parts
+				}, {
+					...SDK_OPTIONS,
+					signal
+				})));
+			});
+		} catch (error) {
+			this.logPromptRequestFailure(error, {
+				sessionId: input.sessionId,
+				stage: "send-prompt",
+				timeoutMs: this.promptRequestTimeouts.sendMs
+			});
+			throw error;
+		}
 	}
 	async requestRaw(method, options) {
 		const handler = getRawSdkClient(this.client)?.[method];
@@ -538,6 +616,67 @@ var OpenCodeClient = class {
 			...options
 		}));
 	}
+	async loadSessionStatuses(signal) {
+		if (hasRawSdkMethod(this.client, "get")) return this.requestRaw("get", {
+			url: "/session/status",
+			...signal ? { signal } : {}
+		});
+		return unwrapSdkData(await this.client.session.status(void 0, {
+			...SDK_OPTIONS,
+			...signal ? { signal } : {}
+		}));
+	}
+	async runPromptRequestWithTimeout(input, operation) {
+		const startedAt = Date.now();
+		const controller = new AbortController();
+		let timeoutHandle = null;
+		const timeoutPromise = new Promise((_, reject) => {
+			timeoutHandle = setTimeout(() => {
+				reject(createOpenCodePromptTimeoutError({
+					sessionId: input.sessionId,
+					stage: input.stage,
+					timeoutMs: input.timeoutMs,
+					messageId: input.messageId ?? void 0,
+					elapsedMs: Date.now() - startedAt
+				}));
+				controller.abort();
+			}, input.timeoutMs);
+		});
+		try {
+			return await Promise.race([operation(controller.signal), timeoutPromise]);
+		} finally {
+			if (timeoutHandle !== null) clearTimeout(timeoutHandle);
+		}
+	}
+	logPromptRequestFailure(error, input) {
+		if (error instanceof OpenCodePromptTimeoutError) {
+			this.logPromptRequest("warn", {
+				elapsedMs: error.data.elapsedMs,
+				messageId: error.data.messageId,
+				sessionId: error.data.sessionId,
+				stage: error.data.stage,
+				timeoutMs: error.data.timeoutMs
+			}, "OpenCode prompt request timed out");
+			return;
+		}
+		this.logPromptRequest("warn", {
+			error,
+			messageId: input.messageId ?? void 0,
+			sessionId: input.sessionId,
+			stage: input.stage,
+			timeoutMs: input.timeoutMs
+		}, "OpenCode prompt request failed");
+	}
+	logPromptRequest(level, extra, message) {
+		const log = this.client.app?.log;
+		if (typeof log !== "function") return;
+		log.call(this.client.app, {
+			service: PROMPT_LOG_SERVICE,
+			level,
+			message,
+			extra
+		}).catch(() => void 0);
+	}
 };
 function createOpenCodeClientFromSdkClient(client, fetchFn = fetch) {
 	return new OpenCodeClient(void 0, client, fetchFn);
@@ -709,6 +848,16 @@ function extractMessageId(message) {
 function delay(ms) {
 	return new Promise((resolve) => setTimeout(resolve, ms));
 }
+function createOpenCodePromptTimeoutError(input) {
+	return new OpenCodePromptTimeoutError({
+		...input,
+		elapsedMs: input.elapsedMs ?? input.timeoutMs,
+		message: input.message ?? "The OpenCode host did not finish this request in time."
+	});
+}
+function getPromptMessagePollDelayMs(attempt) {
+	return PROMPT_MESSAGE_POLL_INITIAL_DELAYS_MS[attempt] ?? PROMPT_MESSAGE_POLL_INTERVAL_MS;
+}
 function extractStructuredMarkdown(structured) {
 	const parsed = StructuredReplySchema.safeParse(structured);
 	if (!parsed.success) return null;
@@ -789,19 +938,34 @@ function selectPromptResponseCandidate(candidates, options) {
 function comparePromptResponseCandidates(left, right, options) {
 	const leftRank = getPromptResponseCandidateRank(left, options);
 	const rightRank = getPromptResponseCandidateRank(right, options);
-	return Number(rightRank.isUsable) - Number(leftRank.isUsable) || Number(rightRank.isInitial) - Number(leftRank.isInitial) || Number(rightRank.sharesParent) - Number(leftRank.sharesParent) || Number(rightRank.isNew) - Number(leftRank.isNew) || rightRank.createdAt - leftRank.createdAt;
+	return Number(rightRank.isUsable) - Number(leftRank.isUsable) || Number(rightRank.isInitial) - Number(leftRank.isInitial) || Number(rightRank.sharesParent) - Number(leftRank.sharesParent) || Number(rightRank.isNewSinceRequestStart) - Number(leftRank.isNewSinceRequestStart) || rightRank.createdAt - leftRank.createdAt;
 }
 function getPromptResponseCandidateRank(message, options) {
 	const assistant = toAssistantMessage(message.info);
 	const id = assistant?.id ?? null;
+	const createdAt = typeof assistant?.time?.created === "number" && Number.isFinite(assistant.time.created) ? assistant.time.created : 0;
 	return {
-		createdAt: typeof assistant?.time?.created === "number" && Number.isFinite(assistant.time.created) ? assistant.time.created : 0,
+		createdAt,
 		isInitial: !!id && id === options.initialMessageId,
-		isNew: !!id && !options.knownMessageIds.has(id),
+		isNewSinceRequestStart: isPromptResponseNewSinceRequestStart(id, createdAt, options.knownMessageIds, options.requestStartedAt),
 		isUsable: !shouldPollPromptMessage(message, options.structured),
 		sharesParent: !!assistant?.parentID && assistant.parentID === options.initialParentId
 	};
 }
+function resolvePromptCandidateStartTime(startedAt, initialMessage) {
+	const initialCreatedAt = coerceFiniteNumber(toAssistantMessage(initialMessage.info)?.time?.created);
+	if (initialCreatedAt === null) return startedAt;
+	return areComparablePromptTimestamps(startedAt, initialCreatedAt) ? startedAt : initialCreatedAt;
+}
+function isPromptResponseNewSinceRequestStart(messageId, createdAt, knownMessageIds, requestStartedAt) {
+	if (!messageId || knownMessageIds.has(messageId)) return false;
+	if (requestStartedAt === null) return true;
+	return createdAt >= requestStartedAt;
+}
+function areComparablePromptTimestamps(left, right) {
+	const epochThresholdMs = 0xe8d4a51000;
+	return left >= epochThresholdMs && right >= epochThresholdMs;
+}
 function isPlainRecord(value) {
 	return value !== null && typeof value === "object" && !Array.isArray(value);
 }
@@ -2331,6 +2495,7 @@ var EN_BOT_COPY = {
 		unexpected: "Unexpected error.",
 		providerAuth: "Provider authentication failed.",
 		requestAborted: "Request was aborted.",
+		promptTimeout: "OpenCode request timed out.",
 		structuredOutput: "Structured output validation failed.",
 		voiceNotConfigured: "Voice transcription is not configured.",
 		voiceDownload: "Failed to download the Telegram voice file.",
@@ -2566,6 +2731,7 @@ var ZH_CN_BOT_COPY = {
 		unexpected: "发生未知错误。",
 		providerAuth: "Provider 认证失败。",
 		requestAborted: "请求已中止。",
+		promptTimeout: "OpenCode 响应超时。",
 		structuredOutput: "结构化输出校验失败。",
 		voiceNotConfigured: "未配置语音转写服务。",
 		voiceDownload: "下载 Telegram 语音文件失败。",
@@ -2913,6 +3079,10 @@ function normalizeError(error, copy) {
 		message: copy.errors.requestAborted,
 		cause: extractMessage(error.data) ?? null
 	};
+	if (isNamedError(error, "OpenCodePromptTimeoutError")) return {
+		message: copy.errors.promptTimeout,
+		cause: null
+	};
 	if (isNamedError(error, "StructuredOutputError")) return {
 		message: copy.errors.structuredOutput,
 		cause: joinNonEmptyParts([extractMessage(error.data), extractRetries(error.data)])