opencode-tbot 0.1.8 → 0.1.10

package/dist/plugin.js

@@ -255,58 +255,96 @@ var OpenCodeClient = class {
 		this.fetchFn = fetchFn;
 	}
 	async getHealth() {
+		const rawClient = getRawSdkClient(this.client);
+		if (rawClient?.get) return await this.requestRaw("get", { url: "/global/health" });
 		const healthEndpoint = this.client.global?.health;
 		if (typeof healthEndpoint === "function") return unwrapSdkData(await healthEndpoint.call(this.client.global, SDK_OPTIONS));
-		const rawClient = getRawSdkClient(this.client);
-		if (!rawClient) throw new Error("OpenCode SDK client does not expose a compatible health endpoint.");
-		return unwrapSdkData(await rawClient.get({
-			url: "/global/health",
-			...SDK_OPTIONS
-		}));
+		if (!rawClient?.get) throw new Error("OpenCode SDK client does not expose a compatible health endpoint.");
+		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 }
+		});
 		return unwrapSdkData(await this.client.session.abort({ sessionID: sessionId }, 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));
 	}
 	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));
 	}
 	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));
 	}
 	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));
 	}
 	async listProjects() {
+		if (hasRawSdkMethod(this.client, "get")) return this.requestRaw("get", { url: "/project" });
 		return unwrapSdkData(await this.client.project.list(void 0, SDK_OPTIONS));
 	}
 	async listSessions() {
+		if (hasRawSdkMethod(this.client, "get")) return this.requestRaw("get", { url: "/session" });
 		return unwrapSdkData(await this.client.session.list(void 0, SDK_OPTIONS));
 	}
 	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));
 	}
 	async createSessionForDirectory(directory, title) {
+		if (hasRawSdkMethod(this.client, "post")) return this.requestRaw("post", {
+			url: "/session",
+			query: { directory },
+			...title ? { body: { title } } : {}
+		});
 		return unwrapSdkData(await this.client.session.create(title ? {
 			directory,
 			title
 		} : { directory }, SDK_OPTIONS));
 	}
 	async renameSession(sessionId, title) {
+		if (hasRawSdkMethod(this.client, "patch")) return this.requestRaw("patch", {
+			url: "/session/{sessionID}",
+			path: { sessionID: sessionId },
+			body: { 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));
 	}
 	async listPendingPermissions(directory) {
+		if (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));
 	}
 	async replyToPermission(requestId, reply, message) {
+		if (hasRawSdkMethod(this.client, "post")) return this.requestRaw("post", {
+			url: "/permission/{requestID}/reply",
+			path: { requestID: requestId },
+			body: {
+				reply,
+				...message?.trim() ? { message: message.trim() } : {}
+			}
+		});
 		return unwrapSdkData(await this.client.permission.reply({
 			requestID: requestId,
 			reply,
@@ -337,14 +375,7 @@ 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 = 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));
+		const initialData = await this.sendPromptRequest(input, parts);
 		return buildPromptSessionResult(await this.resolvePromptResponse(input, initialData, knownMessageIds), {
 			emptyResponseText: EMPTY_RESPONSE_TEXT,
 			finishedAt: Date.now(),
@@ -353,51 +384,75 @@ var OpenCodeClient = class {
 		});
 	}
 	async resolvePromptResponse(input, data, knownMessageIds) {
-		if (!shouldPollPromptMessage(data, input.structured ?? false)) return data;
-		const messageId = data.info?.id;
+		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;
-		if (!messageId) return await this.findLatestPromptResponse(input.sessionId, {
-			initialMessageId: null,
-			knownMessageIds,
-			structured: input.structured ?? false
-		}) ?? data;
+		let hasWaited = false;
 		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;
+			if (delayMs > 0) {
+				await delay(delayMs);
+				hasWaited = true;
+			}
+			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;
 				}
-				continue;
 			}
-			data = next;
-			bestCandidate = next;
-			if (!shouldPollPromptMessage(data, input.structured ?? false)) return data;
 			const latest = await this.findLatestPromptResponse(input.sessionId, {
 				initialMessageId: messageId,
+				initialParentId: expectedParentId,
 				knownMessageIds,
-				structured: input.structured ?? false
+				structured
 			});
 			if (latest) {
-				bestCandidate = latest;
-				if (!shouldPollPromptMessage(bestCandidate, input.structured ?? false)) return bestCandidate;
+				bestCandidate = selectPromptResponseCandidate([bestCandidate, latest], {
+					initialMessageId: messageId,
+					initialParentId: expectedParentId,
+					knownMessageIds,
+					structured
+				}) ?? bestCandidate;
+				expectedParentId = toAssistantMessage(latest.info)?.parentID ?? expectedParentId;
+				if (!shouldPollPromptMessage(latest, structured)) return latest;
 			}
+			if ((await this.fetchPromptSessionStatus(input.sessionId))?.type === "idle" && hasWaited) break;
 		}
-		return bestCandidate;
+		const latest = await this.findLatestPromptResponse(input.sessionId, {
+			initialMessageId: messageId,
+			initialParentId: expectedParentId,
+			knownMessageIds,
+			structured
+		});
+		return selectPromptResponseCandidate([bestCandidate, latest], {
+			initialMessageId: messageId,
+			initialParentId: expectedParentId,
+			knownMessageIds,
+			structured
+		}) ?? bestCandidate;
 	}
 	async fetchPromptMessage(sessionId, messageId) {
-		if (typeof this.client.session.message !== "function") return null;
 		try {
-			return unwrapSdkData(await this.client.session.message({
+			if (hasRawSdkMethod(this.client, "get")) return normalizePromptResponse(await this.requestRaw("get", {
+				url: "/session/{sessionID}/message/{messageID}",
+				path: {
+					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));
+			}, SDK_OPTIONS)));
 		} catch {
 			return null;
 		}
@@ -405,16 +460,27 @@ var OpenCodeClient = class {
 	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));
+		return new Set(messages.map((message) => extractMessageId(message.info)).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({
+			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));
-			return Array.isArray(data) ? data : null;
+			}, SDK_OPTIONS)));
+		} catch {
+			return null;
+		}
+	}
+	async fetchPromptSessionStatus(sessionId) {
+		try {
+			return (await this.getSessionStatuses())[sessionId] ?? null;
 		} catch {
 			return null;
 		}
@@ -422,24 +488,10 @@ var OpenCodeClient = class {
 	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;
+		return selectPromptResponseCandidate(messages, options);
 	}
 	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);
-		const providerCatalog = unwrapSdkData(providersResponse);
+		const [config, providerCatalog] = await Promise.all([this.loadConfig(), this.loadProviderCatalog()]);
 		const providerAvailability = await resolveProviderAvailability(config, this.fetchFn);
 		const models = buildSelectableModels(config, providerCatalog.providers, providerAvailability);
 		this.modelCache = {
@@ -449,6 +501,43 @@ var OpenCodeClient = class {
 		};
 		return models;
 	}
+	async loadConfig() {
+		if (hasRawSdkMethod(this.client, "get")) return this.requestRaw("get", { url: "/config" });
+		return unwrapSdkData(await this.client.config.get(void 0, SDK_OPTIONS));
+	}
+	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));
+	}
+	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)));
+	}
+	async requestRaw(method, options) {
+		const handler = getRawSdkClient(this.client)?.[method];
+		if (typeof handler !== "function") throw new Error(`OpenCode SDK client does not expose a compatible raw ${method.toUpperCase()} method.`);
+		return unwrapSdkData(await handler({
+			...SDK_OPTIONS,
+			...options
+		}));
+	}
 };
 function createOpenCodeClientFromSdkClient(client, fetchFn = fetch) {
 	return new OpenCodeClient(void 0, client, fetchFn);
@@ -539,7 +628,8 @@ function extractTextFromParts(parts) {
 }
 function buildPromptSessionResult(data, options) {
 	const assistantInfo = toAssistantMessage(data.info);
-	const bodyMd = options.structured ? extractStructuredMarkdown(assistantInfo?.structured) : null;
+	const structuredPayload = extractStructuredPayload(assistantInfo);
+	const bodyMd = options.structured ? extractStructuredMarkdown(structuredPayload) : null;
 	const responseParts = Array.isArray(data.parts) ? data.parts : [];
 	const fallbackText = extractTextFromParts(responseParts) || bodyMd || options.emptyResponseText;
 	return {
@@ -549,20 +639,72 @@ function buildPromptSessionResult(data, options) {
 		info: assistantInfo,
 		metrics: extractPromptMetrics(assistantInfo, options.startedAt, options.finishedAt),
 		parts: responseParts,
-		structured: assistantInfo?.structured ?? null
+		structured: structuredPayload ?? null
 	};
 }
 function shouldPollPromptMessage(data, structured) {
 	const assistantInfo = toAssistantMessage(data.info);
-	const bodyMd = structured ? extractStructuredMarkdown(assistantInfo?.structured) : null;
+	const bodyMd = structured ? extractStructuredMarkdown(extractStructuredPayload(assistantInfo)) : 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;
+	return !hasText && !bodyMd && !hasAssistantError;
+}
+function normalizePromptResponse(response) {
+	return {
+		info: isPlainRecord(response?.info) ? response.info : null,
+		parts: normalizePromptParts(response?.parts)
+	};
+}
+function normalizePromptResponses(responses) {
+	if (!Array.isArray(responses)) return null;
+	return responses.map((response) => normalizePromptResponse(response));
+}
+function normalizePromptParts(parts) {
+	return Array.isArray(parts) ? parts : [];
 }
 function toAssistantMessage(message) {
 	if (!message || typeof message !== "object") return null;
-	return !("role" in message) || message.role === "assistant" ? message : null;
+	if ("role" in message && message.role !== "assistant") return null;
+	const normalized = {};
+	if ("agent" in message && typeof message.agent === "string" && message.agent.trim().length > 0) normalized.agent = message.agent;
+	if ("cost" in message && typeof message.cost === "number" && Number.isFinite(message.cost)) normalized.cost = message.cost;
+	const error = normalizeAssistantError("error" in message ? message.error : void 0);
+	if (error) normalized.error = error;
+	if ("finish" in message && typeof message.finish === "string" && message.finish.trim().length > 0) normalized.finish = message.finish;
+	if ("id" in message && typeof message.id === "string" && message.id.trim().length > 0) normalized.id = message.id;
+	if ("mode" in message && typeof message.mode === "string" && message.mode.trim().length > 0) normalized.mode = message.mode;
+	if ("modelID" in message && typeof message.modelID === "string" && message.modelID.trim().length > 0) normalized.modelID = message.modelID;
+	if ("parentID" in message && typeof message.parentID === "string" && message.parentID.trim().length > 0) normalized.parentID = message.parentID;
+	if ("path" in message && isPlainRecord(message.path)) normalized.path = {
+		...typeof message.path.cwd === "string" && message.path.cwd.trim().length > 0 ? { cwd: message.path.cwd } : {},
+		...typeof message.path.root === "string" && message.path.root.trim().length > 0 ? { root: message.path.root } : {}
+	};
+	if ("providerID" in message && typeof message.providerID === "string" && message.providerID.trim().length > 0) normalized.providerID = message.providerID;
+	if ("role" in message && message.role === "assistant") normalized.role = "assistant";
+	if ("sessionID" in message && typeof message.sessionID === "string" && message.sessionID.trim().length > 0) normalized.sessionID = message.sessionID;
+	const structuredPayload = extractStructuredPayload(message);
+	if (structuredPayload !== null) normalized.structured = structuredPayload;
+	if ("summary" in message && typeof message.summary === "boolean") normalized.summary = message.summary;
+	if ("time" in message && isPlainRecord(message.time)) normalized.time = {
+		...typeof message.time.created === "number" && Number.isFinite(message.time.created) ? { created: message.time.created } : {},
+		...typeof message.time.completed === "number" && Number.isFinite(message.time.completed) ? { completed: message.time.completed } : {}
+	};
+	if ("tokens" in message && isPlainRecord(message.tokens)) normalized.tokens = {
+		...typeof message.tokens.input === "number" && Number.isFinite(message.tokens.input) ? { input: message.tokens.input } : {},
+		...typeof message.tokens.output === "number" && Number.isFinite(message.tokens.output) ? { output: message.tokens.output } : {},
+		...typeof message.tokens.reasoning === "number" && Number.isFinite(message.tokens.reasoning) ? { reasoning: message.tokens.reasoning } : {},
+		...typeof message.tokens.total === "number" && Number.isFinite(message.tokens.total) ? { total: message.tokens.total } : {},
+		...isPlainRecord(message.tokens.cache) ? { cache: {
+			...typeof message.tokens.cache.read === "number" && Number.isFinite(message.tokens.cache.read) ? { read: message.tokens.cache.read } : {},
+			...typeof message.tokens.cache.write === "number" && Number.isFinite(message.tokens.cache.write) ? { write: message.tokens.cache.write } : {}
+		} } : {}
+	};
+	if ("variant" in message && typeof message.variant === "string" && message.variant.trim().length > 0) normalized.variant = message.variant;
+	return normalized;
+}
+function extractMessageId(message) {
+	if (!isPlainRecord(message)) return null;
+	return typeof message.id === "string" && message.id.trim().length > 0 ? message.id : null;
 }
 function delay(ms) {
 	return new Promise((resolve) => setTimeout(resolve, ms));
@@ -622,6 +764,47 @@ function unwrapSdkData(response) {
 function getRawSdkClient(client) {
 	return client.client ?? client._client ?? null;
 }
+function hasRawSdkMethod(client, method) {
+	return typeof getRawSdkClient(client)?.[method] === "function";
+}
+function normalizeAssistantError(value) {
+	if (!isPlainRecord(value) || typeof value.name !== "string" || value.name.trim().length === 0) return;
+	return {
+		...value,
+		name: value.name,
+		...isPlainRecord(value.data) ? { data: value.data } : {}
+	};
+}
+function extractStructuredPayload(message) {
+	if (!isPlainRecord(message)) return null;
+	if ("structured" in message && message.structured !== void 0) return message.structured;
+	if ("structured_output" in message && message.structured_output !== void 0) return message.structured_output;
+	return null;
+}
+function selectPromptResponseCandidate(candidates, options) {
+	const availableCandidates = candidates.filter((candidate) => !!candidate).filter((candidate) => toAssistantMessage(candidate.info) !== null);
+	if (availableCandidates.length === 0) return null;
+	return [...availableCandidates].sort((left, right) => comparePromptResponseCandidates(left, right, options))[0] ?? null;
+}
+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;
+}
+function getPromptResponseCandidateRank(message, options) {
+	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,
+		isInitial: !!id && id === options.initialMessageId,
+		isNew: !!id && !options.knownMessageIds.has(id),
+		isUsable: !shouldPollPromptMessage(message, options.structured),
+		sharesParent: !!assistant?.parentID && assistant.parentID === options.initialParentId
+	};
+}
+function isPlainRecord(value) {
+	return value !== null && typeof value === "object" && !Array.isArray(value);
+}
 async function resolveProviderAvailability(config, fetchFn) {
 	const configuredProviders = Object.entries(config.provider ?? {});
 	const availabilityEntries = await Promise.all(configuredProviders.map(async ([providerId, providerConfig]) => [providerId, await fetchProviderAvailableModelIds(providerConfig, fetchFn)]));