opencode-tbot 0.1.5 → 0.1.7

package/README.md

@@ -22,7 +22,7 @@ A Telegram plugin for driving [OpenCode](https://opencode.ai) from chat.
 Run:
 
 ```bash
-npx opencode-tbot@latest install
+npm install opencode-tbot@latest
 ```
 
 The installer registers the plugin globally and writes the default runtime config.

package/README.zh-CN.md

@@ -22,7 +22,7 @@
 执行：
 
 ```bash
-npx opencode-tbot@latest install
+npm install opencode-tbot@latest
 ```
 
 安装器会注册全局插件并写入默认运行时配置。

package/dist/plugin.js

@@ -214,6 +214,17 @@ function buildOpenCodeSdkConfig(options) {
 	};
 }
 var EMPTY_RESPONSE_TEXT = "OpenCode returned empty response.";
+var PROMPT_MESSAGE_POLL_DELAYS_MS = [
+	0,
+	100,
+	250,
+	500,
+	1e3,
+	2e3,
+	4e3,
+	8e3
+];
+var PROMPT_MESSAGE_POLL_LIMIT = 20;
 var STRUCTURED_REPLY_SCHEMA = {
 	type: "json_schema",
 	retryCount: 2,
@@ -327,7 +338,8 @@ var OpenCodeClient = class {
 			url: file.url
 		}))];
 		if (parts.length === 0) throw new Error("Prompt requires text or file attachments.");
-		const data = unwrapSdkData(await this.client.session.prompt({
+		const knownMessageIds = await this.captureKnownMessageIds(input.sessionId);
+		const initialData = unwrapSdkData(await this.client.session.prompt({
 			sessionID: input.sessionId,
 			...input.agent ? { agent: input.agent } : {},
 			...input.structured ? { format: STRUCTURED_REPLY_SCHEMA } : {},
@@ -335,19 +347,96 @@ var OpenCodeClient = class {
 			...input.variant ? { variant: input.variant } : {},
 			parts
 		}, SDK_OPTIONS));
-		const finishedAt = Date.now();
-		const bodyMd = input.structured ? extractStructuredMarkdown(data.info?.structured) : null;
-		const responseParts = Array.isArray(data.parts) ? data.parts : [];
-		const fallbackText = extractTextFromParts(responseParts) || bodyMd || EMPTY_RESPONSE_TEXT;
-		return {
-			assistantError: data.info?.error ?? null,
-			bodyMd,
-			fallbackText,
-			info: data.info ?? null,
-			metrics: extractPromptMetrics(data.info, startedAt, finishedAt),
-			parts: responseParts,
-			structured: data.info?.structured ?? null
-		};
+		return buildPromptSessionResult(await this.resolvePromptResponse(input, initialData, knownMessageIds), {
+			emptyResponseText: EMPTY_RESPONSE_TEXT,
+			finishedAt: Date.now(),
+			startedAt,
+			structured: input.structured ?? false
+		});
+	}
+	async resolvePromptResponse(input, data, knownMessageIds) {
+		if (!shouldPollPromptMessage(data, input.structured ?? false)) return data;
+		const messageId = data.info?.id;
+		let bestCandidate = data;
+		if (!messageId) return await this.findLatestPromptResponse(input.sessionId, {
+			initialMessageId: null,
+			knownMessageIds,
+			structured: input.structured ?? false
+		}) ?? data;
+		for (const delayMs of PROMPT_MESSAGE_POLL_DELAYS_MS) {
+			if (delayMs > 0) await delay(delayMs);
+			const next = await this.fetchPromptMessage(input.sessionId, messageId);
+			if (!next) {
+				const latest = await this.findLatestPromptResponse(input.sessionId, {
+					initialMessageId: messageId,
+					knownMessageIds,
+					structured: input.structured ?? false
+				});
+				if (latest) {
+					bestCandidate = latest;
+					if (!shouldPollPromptMessage(bestCandidate, input.structured ?? false)) return bestCandidate;
+				}
+				continue;
+			}
+			data = next;
+			bestCandidate = next;
+			if (!shouldPollPromptMessage(data, input.structured ?? false)) return data;
+			const latest = await this.findLatestPromptResponse(input.sessionId, {
+				initialMessageId: messageId,
+				knownMessageIds,
+				structured: input.structured ?? false
+			});
+			if (latest) {
+				bestCandidate = latest;
+				if (!shouldPollPromptMessage(bestCandidate, input.structured ?? false)) return bestCandidate;
+			}
+		}
+		return bestCandidate;
+	}
+	async fetchPromptMessage(sessionId, messageId) {
+		if (typeof this.client.session.message !== "function") return null;
+		try {
+			return unwrapSdkData(await this.client.session.message({
+				sessionID: sessionId,
+				messageID: messageId
+			}, SDK_OPTIONS));
+		} catch {
+			return null;
+		}
+	}
+	async captureKnownMessageIds(sessionId) {
+		const messages = await this.fetchRecentPromptMessages(sessionId);
+		if (!messages) return /* @__PURE__ */ new Set();
+		return new Set(messages.map((message) => message.info?.id).filter((id) => typeof id === "string" && id.length > 0));
+	}
+	async fetchRecentPromptMessages(sessionId) {
+		if (typeof this.client.session.messages !== "function") return null;
+		try {
+			const data = unwrapSdkData(await this.client.session.messages({
+				sessionID: sessionId,
+				limit: PROMPT_MESSAGE_POLL_LIMIT
+			}, SDK_OPTIONS));
+			return Array.isArray(data) ? data : null;
+		} catch {
+			return null;
+		}
+	}
+	async findLatestPromptResponse(sessionId, options) {
+		const messages = await this.fetchRecentPromptMessages(sessionId);
+		if (!messages || messages.length === 0) return null;
+		const candidates = messages.filter((message) => toAssistantMessage(message.info) !== null).map((message) => {
+			const assistant = toAssistantMessage(message.info);
+			const id = assistant?.id ?? null;
+			return {
+				createdAt: typeof assistant?.time?.created === "number" && Number.isFinite(assistant.time.created) ? assistant.time.created : 0,
+				id,
+				isInitial: !!id && id === options.initialMessageId,
+				isNew: !!id && !options.knownMessageIds.has(id),
+				isUsable: !shouldPollPromptMessage(message, options.structured),
+				message
+			};
+		}).sort((left, right) => Number(right.isUsable) - Number(left.isUsable) || Number(right.isNew) - Number(left.isNew) || Number(right.isInitial) - Number(left.isInitial) || right.createdAt - left.createdAt);
+		return (candidates.find((candidate) => candidate.isUsable && (candidate.isNew || candidate.isInitial)) ?? candidates.find((candidate) => candidate.isNew || candidate.isInitial) ?? null)?.message ?? null;
 	}
 	async loadModels() {
 		const [configResponse, providersResponse] = await Promise.all([this.client.config.get(void 0, SDK_OPTIONS), this.client.config.providers(void 0, SDK_OPTIONS)]);
@@ -450,6 +539,36 @@ function extractTextFromParts(parts) {
 	if (!Array.isArray(parts)) return "";
 	return parts.filter((part) => part.type === "text").map((part) => part.text).join("").trim();
 }
+function buildPromptSessionResult(data, options) {
+	const assistantInfo = toAssistantMessage(data.info);
+	const bodyMd = options.structured ? extractStructuredMarkdown(assistantInfo?.structured) : null;
+	const responseParts = Array.isArray(data.parts) ? data.parts : [];
+	const fallbackText = extractTextFromParts(responseParts) || bodyMd || options.emptyResponseText;
+	return {
+		assistantError: assistantInfo?.error ?? null,
+		bodyMd,
+		fallbackText,
+		info: assistantInfo,
+		metrics: extractPromptMetrics(assistantInfo, options.startedAt, options.finishedAt),
+		parts: responseParts,
+		structured: assistantInfo?.structured ?? null
+	};
+}
+function shouldPollPromptMessage(data, structured) {
+	const assistantInfo = toAssistantMessage(data.info);
+	const bodyMd = structured ? extractStructuredMarkdown(assistantInfo?.structured) : null;
+	const hasText = extractTextFromParts(Array.isArray(data.parts) ? data.parts : []).length > 0;
+	const hasAssistantError = !!assistantInfo?.error;
+	const isCompleted = typeof assistantInfo?.time?.completed === "number" && Number.isFinite(assistantInfo.time.completed);
+	return !hasText && !bodyMd && !hasAssistantError && !isCompleted;
+}
+function toAssistantMessage(message) {
+	if (!message || typeof message !== "object") return null;
+	return !("role" in message) || message.role === "assistant" ? message : null;
+}
+function delay(ms) {
+	return new Promise((resolve) => setTimeout(resolve, ms));
+}
 function extractStructuredMarkdown(structured) {
 	const parsed = StructuredReplySchema.safeParse(structured);
 	if (!parsed.success) return null;