opencode-tbot 0.1.24 → 0.1.25

package/README.md

@@ -12,6 +12,7 @@ A Telegram plugin for driving [OpenCode](https://opencode.ai) from chat.
 
 - Text messages are forwarded to the active OpenCode session.
 - Telegram photos and image documents are uploaded as OpenCode file parts.
+- Image turns run in a temporary forked session, so later text-only prompts do not inherit image context.
 - Telegram voice messages are explicitly rejected with a localized reply.
 - Permission requests raised by OpenCode can be approved or rejected from Telegram inline buttons.
 - Session completion and error events can be reported back to the bound Telegram chat.
@@ -124,6 +125,7 @@ Message handling:
 
 - Non-command text is treated as a prompt and sent to OpenCode.
 - Telegram photos and image documents are forwarded as OpenCode file parts.
+- Image attachments are processed in a temporary fork of the active session so later text-only prompts stay clean.
 - Telegram voice messages are not supported and receive a localized rejection reply.
 
 ## Development

package/dist/plugin.js

@@ -283,6 +283,24 @@ var OpenCodeClient = class {
 		});
 		return unwrapSdkData(await this.client.session.abort({ sessionID: sessionId }, SDK_OPTIONS));
 	}
+	async deleteSession(sessionId) {
+		if (hasRawSdkMethod(this.client, "delete")) return this.requestRaw("delete", {
+			url: "/session/{sessionID}",
+			path: { sessionID: sessionId }
+		});
+		return unwrapSdkData(await this.client.session.delete({ sessionID: sessionId }, SDK_OPTIONS));
+	}
+	async forkSession(sessionId, messageId) {
+		if (hasRawSdkMethod(this.client, "post")) return this.requestRaw("post", {
+			url: "/session/{sessionID}/fork",
+			path: { sessionID: sessionId },
+			...messageId?.trim() ? { body: { messageID: messageId.trim() } } : {}
+		});
+		return unwrapSdkData(await this.client.session.fork({
+			sessionID: sessionId,
+			...messageId?.trim() ? { messageID: messageId.trim() } : {}
+		}, 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));
@@ -1146,29 +1164,73 @@ function extractErrorMessage(error) {
 //#endregion
 //#region src/services/session-activity/foreground-session-tracker.ts
 var ForegroundSessionTracker = class {
+	chatStacks = /* @__PURE__ */ new Map();
 	counts = /* @__PURE__ */ new Map();
-	begin(sessionId) {
+	sessionChats = /* @__PURE__ */ new Map();
+	begin(chatId, sessionId) {
 		const currentCount = this.counts.get(sessionId) ?? 0;
 		this.counts.set(sessionId, currentCount + 1);
+		this.incrementChat(chatId, sessionId);
 		return () => {
-			this.decrement(sessionId);
+			this.decrement(chatId, sessionId);
 		};
 	}
 	clear(sessionId) {
 		const wasForeground = this.counts.has(sessionId);
+		const chatCounts = this.sessionChats.get(sessionId);
 		this.counts.delete(sessionId);
+		this.sessionChats.delete(sessionId);
+		for (const chatId of chatCounts?.keys() ?? []) {
+			const stack = this.chatStacks.get(chatId);
+			if (!stack) continue;
+			const nextStack = stack.filter((trackedSessionId) => trackedSessionId !== sessionId);
+			if (nextStack.length === 0) {
+				this.chatStacks.delete(chatId);
+				continue;
+			}
+			this.chatStacks.set(chatId, nextStack);
+		}
 		return wasForeground;
 	}
+	getActiveSessionId(chatId) {
+		return this.chatStacks.get(chatId)?.at(-1) ?? null;
+	}
 	isForeground(sessionId) {
 		return this.counts.has(sessionId);
 	}
-	decrement(sessionId) {
+	listChatIds(sessionId) {
+		return [...this.sessionChats.get(sessionId)?.keys() ?? []];
+	}
+	decrement(chatId, sessionId) {
 		const currentCount = this.counts.get(sessionId);
-		if (!currentCount || currentCount <= 1) {
-			this.counts.delete(sessionId);
-			return;
+		if (!currentCount || currentCount <= 1) this.counts.delete(sessionId);
+		else this.counts.set(sessionId, currentCount - 1);
+		this.decrementChat(chatId, sessionId);
+	}
+	incrementChat(chatId, sessionId) {
+		const stack = this.chatStacks.get(chatId) ?? [];
+		stack.push(sessionId);
+		this.chatStacks.set(chatId, stack);
+		const chatCounts = this.sessionChats.get(sessionId) ?? /* @__PURE__ */ new Map();
+		const currentCount = chatCounts.get(chatId) ?? 0;
+		chatCounts.set(chatId, currentCount + 1);
+		this.sessionChats.set(sessionId, chatCounts);
+	}
+	decrementChat(chatId, sessionId) {
+		const stack = this.chatStacks.get(chatId);
+		if (stack) {
+			const index = stack.lastIndexOf(sessionId);
+			if (index >= 0) stack.splice(index, 1);
+			if (stack.length === 0) this.chatStacks.delete(chatId);
+			else this.chatStacks.set(chatId, stack);
 		}
-		this.counts.set(sessionId, currentCount - 1);
+		const chatCounts = this.sessionChats.get(sessionId);
+		if (!chatCounts) return;
+		const currentCount = chatCounts.get(chatId) ?? 0;
+		if (currentCount <= 1) chatCounts.delete(chatId);
+		else chatCounts.set(chatId, currentCount - 1);
+		if (chatCounts.size === 0) this.sessionChats.delete(sessionId);
+		else this.sessionChats.set(sessionId, chatCounts);
 	}
 };
 var NOOP_FOREGROUND_SESSION_TRACKER = {
@@ -1178,25 +1240,33 @@ var NOOP_FOREGROUND_SESSION_TRACKER = {
 	clear() {
 		return false;
 	},
+	getActiveSessionId() {
+		return null;
+	},
 	isForeground() {
 		return false;
+	},
+	listChatIds() {
+		return [];
 	}
 };
 //#endregion
 //#region src/use-cases/abort-prompt.usecase.ts
 var AbortPromptUseCase = class {
-	constructor(sessionRepo, opencodeClient) {
+	constructor(sessionRepo, opencodeClient, foregroundSessionTracker = NOOP_FOREGROUND_SESSION_TRACKER) {
 		this.sessionRepo = sessionRepo;
 		this.opencodeClient = opencodeClient;
+		this.foregroundSessionTracker = foregroundSessionTracker;
 	}
 	async execute(input) {
-		const binding = await this.sessionRepo.getByChatId(input.chatId);
-		if (!binding?.sessionId) return {
+		const activeSessionId = this.foregroundSessionTracker.getActiveSessionId(input.chatId);
+		const binding = activeSessionId ? null : await this.sessionRepo.getByChatId(input.chatId);
+		const sessionId = activeSessionId ?? binding?.sessionId ?? null;
+		if (!sessionId) return {
 			sessionId: null,
 			status: "no_session",
 			sessionStatus: null
 		};
-		const sessionId = binding.sessionId;
 		const sessionStatus = (await this.opencodeClient.getSessionStatuses())[sessionId] ?? null;
 		if (!sessionStatus || sessionStatus.type === "idle") return {
 			sessionId,
@@ -1693,6 +1763,7 @@ var SendPromptUseCase = class {
 		}
 		if (!binding || !binding.sessionId || !binding.projectId) throw new Error("Failed to initialize chat session.");
 		let activeBinding = binding;
+		const shouldIsolateImageTurn = hasImageFiles(files);
 		const model = activeBinding.modelProviderId && activeBinding.modelId ? {
 			providerID: activeBinding.modelProviderId,
 			modelID: activeBinding.modelId
@@ -1702,11 +1773,13 @@ var SendPromptUseCase = class {
 			activeBinding = await clearStoredAgentSelection(this.sessionRepo, activeBinding);
 			this.logger.warn?.({ chatId: input.chatId }, "selected agent is no longer available, falling back to OpenCode default");
 		}
-		const endForegroundSession = this.foregroundSessionTracker.begin(activeBinding.sessionId);
+		const temporarySessionId = shouldIsolateImageTurn ? await this.createTemporaryImageSession(input.chatId, activeBinding.sessionId) : null;
+		const executionSessionId = temporarySessionId ?? activeBinding.sessionId;
+		const endForegroundSession = this.foregroundSessionTracker.begin(input.chatId, executionSessionId);
 		let result;
 		try {
 			result = await this.opencodeClient.promptSession({
-				sessionId: activeBinding.sessionId,
+				sessionId: executionSessionId,
 				prompt: promptText,
 				...files.length > 0 ? { files } : {},
 				...selectedAgent ? { agent: selectedAgent.name } : {},
@@ -1716,6 +1789,7 @@ var SendPromptUseCase = class {
 			});
 		} finally {
 			endForegroundSession();
+			if (temporarySessionId) await this.cleanupTemporaryImageSession(input.chatId, activeBinding.sessionId, temporarySessionId);
 		}
 		await this.sessionRepo.touch(input.chatId);
 		return {
@@ -1729,6 +1803,32 @@ var SendPromptUseCase = class {
 		this.logger.warn?.({ chatId }, `${reason}, falling back to the current OpenCode project`);
 		return nextBinding;
 	}
+	async createTemporaryImageSession(chatId, sessionId) {
+		const temporarySession = await this.opencodeClient.forkSession(sessionId);
+		if (!temporarySession.id || temporarySession.id === sessionId) throw new Error("OpenCode did not return a distinct temporary session for the image turn.");
+		this.logger.info?.({
+			chatId,
+			parentSessionId: sessionId,
+			sessionId: temporarySession.id
+		}, "created temporary image session");
+		return temporarySession.id;
+	}
+	async cleanupTemporaryImageSession(chatId, parentSessionId, sessionId) {
+		try {
+			if (!await this.opencodeClient.deleteSession(sessionId)) this.logger.warn?.({
+				chatId,
+				parentSessionId,
+				sessionId
+			}, "failed to delete temporary image session");
+		} catch (error) {
+			this.logger.warn?.({
+				error,
+				chatId,
+				parentSessionId,
+				sessionId
+			}, "failed to delete temporary image session");
+		}
+	}
 };
 function buildPromptText(text, files) {
 	const trimmedText = text?.trim() ?? "";
@@ -1745,6 +1845,9 @@ function buildPromptText(text, files) {
 function isImageFile(file) {
 	return file.mime.trim().toLowerCase().startsWith("image/");
 }
+function hasImageFiles(files) {
+	return files.some(isImageFile);
+}
 //#endregion
 //#region src/use-cases/switch-agent.usecase.ts
 var SwitchAgentUseCase = class {
@@ -1938,7 +2041,7 @@ function createContainer(config, opencodeClient, logger) {
 		apiRoot: config.telegramApiRoot
 	});
 	const uploadFileUseCase = new UploadFileUseCase(telegramFileClient);
-	const abortPromptUseCase = new AbortPromptUseCase(sessionRepo, opencodeClient);
+	const abortPromptUseCase = new AbortPromptUseCase(sessionRepo, opencodeClient, foregroundSessionTracker);
 	const createSessionUseCase = new CreateSessionUseCase(sessionRepo, opencodeClient, logger);
 	const getHealthUseCase = new GetHealthUseCase(opencodeClient);
 	const getPathUseCase = new GetPathUseCase(opencodeClient);
@@ -2072,19 +2175,20 @@ async function handleTelegramBotPluginEvent(runtime, event) {
 }
 async function handlePermissionAsked(runtime, request) {
 	const bindings = await runtime.container.sessionRepo.listBySessionId(request.sessionID);
+	const chatIds = new Set([...bindings.map((binding) => binding.chatId), ...runtime.container.foregroundSessionTracker.listChatIds(request.sessionID)]);
 	const approvals = await runtime.container.permissionApprovalRepo.listByRequestId(request.id);
 	const approvedChatIds = new Set(approvals.map((approval) => approval.chatId));
-	for (const binding of bindings) {
-		if (approvedChatIds.has(binding.chatId)) continue;
+	for (const chatId of chatIds) {
+		if (approvedChatIds.has(chatId)) continue;
 		try {
-			const message = await runtime.bot.api.sendMessage(binding.chatId, buildPermissionApprovalMessage(request), {
+			const message = await runtime.bot.api.sendMessage(chatId, buildPermissionApprovalMessage(request), {
 				parse_mode: "MarkdownV2",
 				reply_markup: buildPermissionApprovalKeyboard(request.id)
 			});
 			await runtime.container.permissionApprovalRepo.set({
 				requestId: request.id,
 				sessionId: request.sessionID,
-				chatId: binding.chatId,
+				chatId,
 				messageId: message.message_id,
 				status: "pending",
 				updatedAt: (/* @__PURE__ */ new Date()).toISOString()
@@ -2092,7 +2196,7 @@ async function handlePermissionAsked(runtime, request) {
 		} catch (error) {
 			runtime.container.logger.error({
 				error,
-				chatId: binding.chatId,
+				chatId,
 				requestId: request.id
 			}, "failed to deliver permission request to Telegram");
 		}
@@ -2118,7 +2222,7 @@ async function handleSessionError(runtime, sessionId, error) {
 		runtime.container.logger.error({ error }, "session error received without a session id");
 		return;
 	}
-	if (runtime.container.foregroundSessionTracker.isForeground(sessionId)) {
+	if (runtime.container.foregroundSessionTracker.clear(sessionId)) {
 		runtime.container.logger.warn({
 			error,
 			sessionId
@@ -4727,7 +4831,9 @@ function createHooks(runtime) {
 			await handleTelegramBotPluginEvent(runtime, event);
 		},
 		async "permission.ask"(input, output) {
-			if ((await runtime.container.sessionRepo.listBySessionId(input.sessionID)).length > 0) output.status = "ask";
+			const bindings = await runtime.container.sessionRepo.listBySessionId(input.sessionID);
+			const foregroundChatIds = runtime.container.foregroundSessionTracker.listChatIds(input.sessionID);
+			if (bindings.length > 0 || foregroundChatIds.length > 0) output.status = "ask";
 		}
 	};
 }