opencode-tbot 0.1.10 → 0.1.11

package/dist/plugin.js

@@ -212,16 +212,15 @@ function buildOpenCodeSdkConfig(options) {
 	};
 }
 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_MESSAGE_POLL_TIMEOUT_MS = 6e4;
 var PROMPT_MESSAGE_POLL_LIMIT = 20;
 var STRUCTURED_REPLY_SCHEMA = {
 	type: "json_schema",
@@ -376,68 +375,56 @@ 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() + PROMPT_MESSAGE_POLL_TIMEOUT_MS;
+		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);
 			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);
+		return selectPromptResponseCandidate([bestCandidate, latest], candidateOptions) ?? bestCandidate;
 	}
 	async fetchPromptMessage(sessionId, messageId) {
 		try {
@@ -709,6 +696,9 @@ function extractMessageId(message) {
 function delay(ms) {
 	return new Promise((resolve) => setTimeout(resolve, ms));
 }
+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 +779,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);
 }