opencode-tbot 0.1.6 → 0.1.7

package/dist/plugin.js

@@ -216,13 +216,15 @@ function buildOpenCodeSdkConfig(options) {
 var EMPTY_RESPONSE_TEXT = "OpenCode returned empty response.";
 var PROMPT_MESSAGE_POLL_DELAYS_MS = [
 	0,
-	150,
-	300,
-	600,
-	1200,
+	100,
+	250,
+	500,
+	1e3,
 	2e3,
-	3200
+	4e3,
+	8e3
 ];
+var PROMPT_MESSAGE_POLL_LIMIT = 20;
 var STRUCTURED_REPLY_SCHEMA = {
 	type: "json_schema",
 	retryCount: 2,
@@ -336,6 +338,7 @@ var OpenCodeClient = class {
 			url: file.url
 		}))];
 		if (parts.length === 0) throw new Error("Prompt requires text or file attachments.");
+		const knownMessageIds = await this.captureKnownMessageIds(input.sessionId);
 		const initialData = unwrapSdkData(await this.client.session.prompt({
 			sessionID: input.sessionId,
 			...input.agent ? { agent: input.agent } : {},
@@ -344,25 +347,51 @@ var OpenCodeClient = class {
 			...input.variant ? { variant: input.variant } : {},
 			parts
 		}, SDK_OPTIONS));
-		return buildPromptSessionResult(await this.resolvePromptResponse(input, initialData), {
+		return buildPromptSessionResult(await this.resolvePromptResponse(input, initialData, knownMessageIds), {
 			emptyResponseText: EMPTY_RESPONSE_TEXT,
 			finishedAt: Date.now(),
 			startedAt,
 			structured: input.structured ?? false
 		});
 	}
-	async resolvePromptResponse(input, data) {
+	async resolvePromptResponse(input, data, knownMessageIds) {
 		if (!shouldPollPromptMessage(data, input.structured ?? false)) return data;
 		const messageId = data.info?.id;
-		if (!messageId) return data;
+		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) continue;
+			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 data;
+		return bestCandidate;
 	}
 	async fetchPromptMessage(sessionId, messageId) {
 		if (typeof this.client.session.message !== "function") return null;
@@ -375,6 +404,40 @@ var OpenCodeClient = class {
 			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)]);
 		const config = unwrapSdkData(configResponse);