opencode-tbot 0.1.32 → 0.1.34

package/dist/plugin.js

@@ -1,7 +1,6 @@
-import { i as OPENCODE_TBOT_VERSION, n as preparePluginConfiguration, o as loadAppConfig } from "./assets/plugin-config-jkAZYbFW.js";
+import { i as OPENCODE_TBOT_VERSION, n as preparePluginConfiguration, o as loadAppConfig } from "./assets/plugin-config-LIr8LS0-.js";
 import { appendFile, mkdir, readFile, readdir, rename, stat, unlink, writeFile } from "node:fs/promises";
 import { dirname, isAbsolute, join } from "node:path";
-import { parse, printParseErrorCode } from "jsonc-parser";
 import { randomUUID } from "node:crypto";
 import { createOpencodeClient } from "@opencode-ai/sdk";
 import { run } from "@grammyjs/runner";
@@ -919,6 +918,9 @@ var OpenCodeClient = class {
 		this.modelCache.promise = refreshPromise;
 		return refreshPromise;
 	}
+	async listConfiguredPlugins() {
+		return normalizeConfiguredPluginSpecs((await this.loadConfig()).plugin);
+	}
 	async promptSession(input) {
 		const startedAt = Date.now();
 		const promptText = input.prompt?.trim() ?? "";
@@ -1539,6 +1541,19 @@ function normalizePermissionRequest(permission) {
 		sessionID
 	};
 }
+function normalizeConfiguredPluginSpecs(value) {
+	if (!Array.isArray(value)) return [];
+	const normalizedPlugins = [];
+	const seenPlugins = /* @__PURE__ */ new Set();
+	for (const item of value) {
+		if (typeof item !== "string") continue;
+		const normalizedItem = item.trim();
+		if (normalizedItem.length === 0 || seenPlugins.has(normalizedItem)) continue;
+		seenPlugins.add(normalizedItem);
+		normalizedPlugins.push(normalizedItem);
+	}
+	return normalizedPlugins;
+}
 function normalizePermissionPatterns$1(permission) {
 	if (Array.isArray(permission.patterns)) return permission.patterns.filter((value) => typeof value === "string");
 	if (typeof permission.pattern === "string" && permission.pattern.trim().length > 0) return [permission.pattern];
@@ -1739,7 +1754,7 @@ async function readStateFile(filePath, createDefaultState) {
 		const content = await readFile(filePath, "utf8");
 		return JSON.parse(content);
 	} catch (error) {
-		if (isMissingFileError$1(error)) return createDefaultState();
+		if (isMissingFileError(error)) return createDefaultState();
 		throw error;
 	}
 }
@@ -1752,7 +1767,7 @@ async function writeStateFile(filePath, state) {
 function cloneState(state) {
 	return JSON.parse(JSON.stringify(state));
 }
-function isMissingFileError$1(error) {
+function isMissingFileError(error) {
 	return error instanceof Error && "code" in error && error.code === "ENOENT";
 }
 //#endregion
@@ -2056,27 +2071,30 @@ var GetPathUseCase = class {
 //#endregion
 //#region src/use-cases/get-status.usecase.ts
 var GetStatusUseCase = class {
-	constructor(getHealthUseCase, getPathUseCase, listLspUseCase, listMcpUseCase, listSessionsUseCase, sessionRepo) {
+	constructor(getHealthUseCase, getPathUseCase, listLspUseCase, listMcpUseCase, listSessionsUseCase, sessionRepo, configuredPluginReader) {
 		this.getHealthUseCase = getHealthUseCase;
 		this.getPathUseCase = getPathUseCase;
 		this.listLspUseCase = listLspUseCase;
 		this.listMcpUseCase = listMcpUseCase;
 		this.listSessionsUseCase = listSessionsUseCase;
 		this.sessionRepo = sessionRepo;
+		this.configuredPluginReader = configuredPluginReader;
 	}
 	async execute(input) {
-		const [health, path, lsp, mcp] = await Promise.allSettled([
+		const [health, path, lsp, mcp, plugins] = await Promise.allSettled([
 			this.getHealthUseCase.execute(),
 			this.getPathUseCase.execute(),
 			this.listLspUseCase.execute({ chatId: input.chatId }),
-			this.listMcpUseCase.execute({ chatId: input.chatId })
+			this.listMcpUseCase.execute({ chatId: input.chatId }),
+			this.configuredPluginReader.listConfiguredPlugins()
 		]);
 		const pathResult = mapSettledResult(path);
-		const [plugins, workspace] = await Promise.all([loadConfiguredPluginsResult(pathResult), loadWorkspaceStatusResult(input.chatId, pathResult, this.listSessionsUseCase, this.sessionRepo)]);
+		const pluginResult = loadConfiguredPluginsResult(plugins);
+		const workspace = await loadWorkspaceStatusResult(input.chatId, pathResult, this.listSessionsUseCase, this.sessionRepo);
 		return {
 			health: mapSettledResult(health),
 			path: pathResult,
-			plugins,
+			plugins: pluginResult,
 			workspace,
 			lsp: mapSettledResult(lsp),
 			mcp: mapSettledResult(mcp)
@@ -2093,49 +2111,14 @@ function mapSettledResult(result) {
 		status: "error"
 	};
 }
-async function loadConfiguredPluginsResult(path) {
-	if (path.status === "error") return {
-		error: path.error,
+function loadConfiguredPluginsResult(result) {
+	if (result.status === "rejected") return {
+		error: result.reason,
 		status: "error"
 	};
-	try {
-		return {
-			data: await loadConfiguredPlugins(path.data.config),
-			status: "ok"
-		};
-	} catch (error) {
-		return {
-			error,
-			status: "error"
-		};
-	}
-}
-async function loadConfiguredPlugins(configFilePath) {
-	const resolvedConfigFilePath = await resolveOpenCodeConfigFilePath(configFilePath);
-	let content;
-	try {
-		content = await readFile(resolvedConfigFilePath, "utf8");
-	} catch (error) {
-		if (isMissingFileError(error)) return {
-			configFilePath: resolvedConfigFilePath,
-			plugins: []
-		};
-		throw error;
-	}
-	const parseErrors = [];
-	const parsed = parse(content, parseErrors, { allowTrailingComma: true });
-	if (parseErrors.length > 0) {
-		const errorSummary = parseErrors.map((error) => printParseErrorCode(error.error)).join(", ");
-		throw new Error(`Failed to parse ${resolvedConfigFilePath}: ${errorSummary}`);
-	}
-	if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return {
-		configFilePath: resolvedConfigFilePath,
-		plugins: []
-	};
-	const pluginSpecs = Array.isArray(parsed.plugin) ? parsed.plugin : [];
 	return {
-		configFilePath: resolvedConfigFilePath,
-		plugins: [...new Set(pluginSpecs.filter((value) => typeof value === "string").map((value) => value.trim()).filter((value) => value.length > 0))]
+		data: { plugins: normalizeConfiguredPluginLabels(result.value) },
+		status: "ok"
 	};
 }
 async function loadWorkspaceStatusResult(chatId, path, listSessionsUseCase, sessionRepo) {
@@ -2178,17 +2161,43 @@ function isUsableWorkspacePath(value) {
 	const normalized = value.trim();
 	return normalized.length > 0 && normalized !== "/" && normalized !== "\\" && isAbsolute(normalized);
 }
-async function resolveOpenCodeConfigFilePath(configPath) {
+function normalizeConfiguredPluginLabels(plugins) {
+	const normalizedPlugins = [];
+	const seenPlugins = /* @__PURE__ */ new Set();
+	for (const plugin of plugins) {
+		const normalizedPlugin = normalizeConfiguredPluginLabel(plugin);
+		if (normalizedPlugin.length === 0 || seenPlugins.has(normalizedPlugin)) continue;
+		seenPlugins.add(normalizedPlugin);
+		normalizedPlugins.push(normalizedPlugin);
+	}
+	return normalizedPlugins;
+}
+function normalizeConfiguredPluginLabel(plugin) {
+	const normalizedPlugin = plugin.trim();
+	const localPluginName = extractLocalPluginName(normalizedPlugin);
+	return localPluginName ? `${localPluginName} (local plugin)` : normalizedPlugin;
+}
+function extractLocalPluginName(plugin) {
+	const filePath = parseFilePluginPath(plugin);
+	if (!filePath) return null;
+	const pathSegments = filePath.split("/").filter((segment) => segment.length > 0);
+	const fileName = pathSegments.at(-1);
+	const parentDirectoryName = pathSegments.at(-2);
+	if (!fileName || parentDirectoryName !== "plugins") return null;
+	const pluginName = fileName.replace(/\.(?:[cm]?js|[cm]?ts)$/iu, "");
+	return pluginName.trim().length > 0 ? pluginName.trim() : null;
+}
+function parseFilePluginPath(plugin) {
+	if (!plugin.startsWith("file://")) return null;
 	try {
-		return (await stat(configPath)).isDirectory() ? join(configPath, "opencode.json") : configPath;
-	} catch (error) {
-		if (isMissingFileError(error)) return configPath;
-		throw error;
+		const fileUrl = new URL(plugin);
+		if (fileUrl.protocol !== "file:") return null;
+		const normalizedPath = decodeURIComponent(fileUrl.pathname).replace(/^\/([A-Za-z]:)/u, "$1").replace(/\\/gu, "/");
+		return normalizedPath.length > 0 ? normalizedPath : null;
+	} catch {
+		return null;
 	}
 }
-function isMissingFileError(error) {
-	return error instanceof Error && "code" in error && error.code === "ENOENT";
-}
 function isSelectableAgent(agent) {
 	return !agent.hidden && agent.mode !== "subagent";
 }
@@ -2798,7 +2807,7 @@ function createContainer(config, opencodeClient, logger) {
 	const listLspUseCase = new ListLspUseCase(sessionRepo, opencodeClient);
 	const listMcpUseCase = new ListMcpUseCase(sessionRepo, opencodeClient);
 	const listSessionsUseCase = new ListSessionsUseCase(sessionRepo, opencodeClient);
-	const getStatusUseCase = new GetStatusUseCase(getHealthUseCase, getPathUseCase, listLspUseCase, listMcpUseCase, listSessionsUseCase, sessionRepo);
+	const getStatusUseCase = new GetStatusUseCase(getHealthUseCase, getPathUseCase, listLspUseCase, listMcpUseCase, listSessionsUseCase, sessionRepo, opencodeClient);
 	const listModelsUseCase = new ListModelsUseCase(sessionRepo, opencodeClient);
 	const renameSessionUseCase = new RenameSessionUseCase(sessionRepo, opencodeClient, opencodeLogger);
 	const sendPromptUseCase = new SendPromptUseCase(sessionRepo, opencodeClient, promptLogger);
@@ -3015,11 +3024,7 @@ async function handleSessionIdle(runtime, event) {
 		component: "plugin-event",
 		sessionId: event.sessionId
 	});
-	if (runtime.container.foregroundSessionTracker.clear(event.sessionId)) {
-		logPluginEvent(logger, { event: "plugin-event.session.idle.foreground_suppressed" }, "session idle notification suppressed for foreground Telegram session");
-		return;
-	}
-	await notifyBoundChats(runtime, event.sessionId, `Session finished.\n\nSession: ${event.sessionId}`);
+	if (runtime.container.foregroundSessionTracker.clear(event.sessionId)) logPluginEvent(logger, { event: "plugin-event.session.idle.foreground_suppressed" }, "session idle notification suppressed for foreground Telegram session");
 }
 async function handleSessionStatus(runtime, event) {
 	if (event.statusType !== "idle") return;
@@ -3115,14 +3120,16 @@ function normalizePermissionReply(value) {
 function extractSessionErrorMessage(error) {
 	if (error instanceof Error && error.message.trim().length > 0) return error.message.trim();
 	if (!isPlainRecord(error)) return null;
+	if (typeof error.message === "string" && error.message.trim().length > 0) return error.message.trim();
 	if (isPlainRecord(error.data) && typeof error.data.message === "string" && error.data.message.trim().length > 0) return error.data.message.trim();
 	return asNonEmptyString(error.name);
 }
 function normalizeForegroundSessionError(error) {
 	if (error instanceof Error) return error;
-	if (isPlainRecord(error) && typeof error.name === "string" && error.name.trim().length > 0) {
+	if (isPlainRecord(error)) {
 		const normalized = new Error(extractSessionErrorMessage(error) ?? "Unknown session error.");
-		normalized.name = error.name.trim();
+		const normalizedName = asNonEmptyString(error.name);
+		if (normalizedName) normalized.name = normalizedName;
 		if (isPlainRecord(error.data)) normalized.data = error.data;
 		return normalized;
 	}
@@ -3915,14 +3922,18 @@ function normalizeError(error, copy) {
 		message: copy.errors.contextOverflow,
 		cause: extractMessage(error.data) ?? null
 	};
-	if (isNamedError(error, "APIError")) return {
-		message: copy.errors.providerRequest,
-		cause: joinNonEmptyParts([
-			extractMessage(error.data),
-			extractStatusCode(error.data, copy),
-			extractRetryable(error.data, copy)
-		])
-	};
+	if (isNamedError(error, "APIError")) {
+		const providerMessage = extractMessage(error.data);
+		return {
+			message: copy.errors.providerRequest,
+			cause: joinNonEmptyParts([
+				getProviderCompatibilityHint(providerMessage),
+				providerMessage,
+				extractStatusCode(error.data, copy),
+				extractRetryable(error.data, copy)
+			])
+		};
+	}
 	if (isNamedError(error, "NotFoundError")) return {
 		message: copy.errors.notFound,
 		cause: extractMessage(error.data) ?? null
@@ -3940,6 +3951,10 @@ function normalizeError(error, copy) {
 		cause: extractMessage(error) ?? stringifyUnknown(error)
 	};
 }
+function getProviderCompatibilityHint(message) {
+	if (!message) return null;
+	return /tool_choice parameter does not support being set to required or object in thinking mode/iu.test(message) ? "Current model/reasoning mode is incompatible with tool calling. Switch to a compatible model or disable thinking mode." : null;
+}
 function isBadRequestError(error) {
 	return !!error && typeof error === "object" && "success" in error && error.success === false;
 }
@@ -4369,7 +4384,7 @@ function getStatusLayoutCopy(copy) {
 		mcpNotesLabel: "Notes",
 		mcpRegistrationRequiredStatus: "🟡",
 		mcpTitle: "🔌 MCP",
-		noPluginsMessage: "No plugins configured in the OpenCode config.",
+		noPluginsMessage: "No plugins detected in the current OpenCode setup.",
 		noneStatus: "⚪",
 		openCodeVersionLabel: "OpenCode Version",
 		overviewTitle: "🖥️ Overview",
@@ -4390,7 +4405,7 @@ function getStatusLayoutCopy(copy) {
 		mcpNotesLabel: "補足",
 		mcpRegistrationRequiredStatus: "🟡",
 		mcpTitle: "🔌 MCP",
-		noPluginsMessage: "現在の OpenCode 設定にはプラグインが設定されていません。",
+		noPluginsMessage: "現在の OpenCode 構成ではプラグインが検出されていません。",
 		noneStatus: "⚪",
 		openCodeVersionLabel: "OpenCode バージョン",
 		overviewTitle: "🖥️ 概要",
@@ -4411,7 +4426,7 @@ function getStatusLayoutCopy(copy) {
 		mcpNotesLabel: "说明",
 		mcpRegistrationRequiredStatus: "🟡",
 		mcpTitle: "🔌 MCP",
-		noPluginsMessage: "当前 OpenCode 配置中未配置插件。",
+		noPluginsMessage: "当前 OpenCode 环境中未检测到插件。",
 		noneStatus: "⚪",
 		openCodeVersionLabel: "OpenCode版本",
 		overviewTitle: "🖥️ 概览",
@@ -5832,14 +5847,15 @@ function getTelegramBotRuntimeRegistry() {
 //#region src/plugin.ts
 async function ensureTelegramBotPluginRuntime(options) {
 	const runtimeStateHolder = getTelegramBotPluginRuntimeStateHolder();
-	const cwd = resolvePluginRuntimeCwd(options.context);
-	if (runtimeStateHolder.state && runtimeStateHolder.state.cwd !== cwd) {
+	const explicitCwd = resolveExplicitPluginRuntimeCwd(options.context);
+	if (runtimeStateHolder.state && explicitCwd === null) return runtimeStateHolder.state.runtimePromise;
+	if (runtimeStateHolder.state && explicitCwd !== null && runtimeStateHolder.state.cwd !== explicitCwd) {
 		const activeState = runtimeStateHolder.state;
 		runtimeStateHolder.state = null;
 		await disposeTelegramBotPluginRuntimeState(activeState);
 	}
 	if (!runtimeStateHolder.state) {
-		const runtimePromise = startPluginRuntime(options, cwd).then((runtime) => {
+		const runtimePromise = startPluginRuntime(options, resolvePluginRuntimeCwd(options.context), requirePluginClient(options.context)).then((runtime) => {
 			if (runtimeStateHolder.state?.runtimePromise === runtimePromise) runtimeStateHolder.state.runtime = runtime;
 			return runtime;
 		}).catch((error) => {
@@ -5847,7 +5863,7 @@ async function ensureTelegramBotPluginRuntime(options) {
 			throw error;
 		});
 		runtimeStateHolder.state = {
-			cwd,
+			cwd: explicitCwd ?? resolvePluginRuntimeCwd(options.context),
 			runtime: null,
 			runtimePromise
 		};
@@ -5864,7 +5880,7 @@ async function resetTelegramBotPluginRuntimeForTests() {
 	runtimeStateHolder.state = null;
 	await disposeTelegramBotPluginRuntimeState(activeState);
 }
-async function startPluginRuntime(options, cwd) {
+async function startPluginRuntime(options, cwd, client) {
 	const bootstrapApp = options.bootstrapApp ?? bootstrapPluginApp;
 	const prepareConfiguration = options.prepareConfiguration ?? preparePluginConfiguration;
 	const startRuntime = options.startRuntime ?? startTelegramBotRuntime;
@@ -5872,7 +5888,7 @@ async function startPluginRuntime(options, cwd) {
 		cwd,
 		config: options.config
 	});
-	const { config, container } = bootstrapApp(options.context.client, preparedConfiguration.config, { cwd: preparedConfiguration.cwd });
+	const { config, container } = bootstrapApp(client, preparedConfiguration.config, { cwd: preparedConfiguration.cwd });
 	try {
 		if (preparedConfiguration.ignoredProjectConfigFilePath) container.logger.child({ component: "runtime" }).warn({
 			cwd: preparedConfiguration.cwd,
@@ -5899,7 +5915,19 @@ async function startPluginRuntime(options, cwd) {
 	}
 }
 function resolvePluginRuntimeCwd(context) {
-	return context.worktree ?? context.directory ?? process.cwd();
+	return resolveExplicitPluginRuntimeCwd(context) ?? process.cwd();
+}
+function resolveExplicitPluginRuntimeCwd(context) {
+	return normalizePluginRuntimePath(context?.worktree) ?? normalizePluginRuntimePath(context?.directory);
+}
+function requirePluginClient(context) {
+	if (context?.client) return context.client;
+	throw new Error("OpenCode plugin context.client is required.");
+}
+function normalizePluginRuntimePath(value) {
+	if (typeof value !== "string") return null;
+	const normalized = value.trim();
+	return normalized.length > 0 ? normalized : null;
 }
 async function disposeTelegramBotPluginRuntimeState(state) {
 	await (state.runtime ?? await state.runtimePromise.catch(() => null))?.dispose();