@grinev/opencode-telegram-bot 0.21.1 → 0.22.0

package/dist/bot/commands/{status.js → status-command.js}

@@ -1,15 +1,15 @@
 import { opencodeClient } from "../../opencode/client.js";
-import { getGitWorktreeContext } from "../../git/worktree.js";
-import { getCurrentSession } from "../../session/manager.js";
-import { getCurrentProject, isTtsEnabled } from "../../settings/manager.js";
-import { fetchCurrentAgent } from "../../agent/manager.js";
-import { getAgentDisplayName } from "../../agent/types.js";
-import { fetchCurrentModel } from "../../model/manager.js";
-import { keyboardManager } from "../../keyboard/manager.js";
-import { pinnedMessageManager } from "../../pinned/manager.js";
+import { getGitWorktreeContext } from "../../app/services/worktree-service.js";
+import { getCurrentSession } from "../../app/services/session-service.js";
+import { getCurrentProject, getTtsMode } from "../../app/stores/settings-store.js";
+import { fetchCurrentAgent } from "../../app/services/agent-selection-service.js";
+import { fetchCurrentModel } from "../../app/services/model-selection-service.js";
+import { getAgentDisplayName } from "../../app/types/agent.js";
+import { keyboardManager } from "../keyboards/keyboard-manager.js";
+import { pinnedMessageManager } from "../pinned/pinned-message-manager.js";
 import { logger } from "../../utils/logger.js";
 import { t } from "../../i18n/index.js";
-import { sendBotText } from "../utils/telegram-text.js";
+import { sendBotText } from "../messages/telegram-text.js";
 export async function statusCommand(ctx) {
     try {
         const { data, error } = await opencodeClient.global.health();
@@ -22,8 +22,13 @@ export async function statusCommand(ctx) {
         if (data.version) {
             message += `${t("status.line.version", { version: data.version })}\n`;
         }
+        const ttsMode = getTtsMode();
         message += `${t("status.line.tts", {
-            tts: isTtsEnabled() ? t("status.tts.on") : t("status.tts.off"),
+            tts: ttsMode === "off"
+                ? t("status.tts.off")
+                : ttsMode === "all"
+                    ? t("status.tts.all")
+                    : t("status.tts.auto"),
         })}\n`;
         // Add agent information
         const currentAgent = await fetchCurrentAgent();

package/dist/bot/commands/{task.js → task-command.js}

@@ -1,35 +1,17 @@
 import { randomUUID } from "node:crypto";
-import { InlineKeyboard } from "grammy";
 import { config } from "../../config.js";
 import { getDateLocale, t } from "../../i18n/index.js";
-import { interactionManager } from "../../interaction/manager.js";
-import { getStoredModel } from "../../model/manager.js";
-import { getCurrentProject } from "../../settings/manager.js";
-import { taskCreationManager } from "../../scheduled-task/creation-manager.js";
-import { parseTaskSchedule } from "../../scheduled-task/schedule-parser.js";
-import { addScheduledTask, listScheduledTasks } from "../../scheduled-task/store.js";
-import { scheduledTaskRuntime } from "../../scheduled-task/runtime.js";
-import { createScheduledTaskModel, } from "../../scheduled-task/types.js";
+import { interactionManager } from "../../app/managers/interaction-manager.js";
+import { getStoredModel } from "../../app/services/model-selection-service.js";
+import { getCurrentProject } from "../../app/stores/settings-store.js";
+import { taskCreationManager } from "../../app/managers/scheduled-task-creation-manager.js";
+import { parseTaskSchedule } from "../../app/services/scheduled-task-schedule-parser-service.js";
+import { addScheduledTask, listScheduledTasks } from "../../app/stores/scheduled-task-store.js";
+import { scheduledTaskRuntime } from "../../app/services/scheduled-task-runtime-service.js";
+import { buildCancelKeyboard, buildRetryScheduleKeyboard } from "../menus/scheduled-task-menu.js";
+import { createScheduledTaskModel, } from "../../app/types/scheduled-task.js";
 import { logger } from "../../utils/logger.js";
-const TASK_RETRY_SCHEDULE_CALLBACK = "task:retry-schedule";
-const TASK_CANCEL_CALLBACK = "task:cancel";
 const TASK_PROMPT_PREVIEW_LENGTH = 100;
-function buildRetryScheduleKeyboard() {
-    return new InlineKeyboard()
-        .text(t("task.button.retry_schedule"), TASK_RETRY_SCHEDULE_CALLBACK)
-        .text(t("task.button.cancel"), TASK_CANCEL_CALLBACK);
-}
-function buildCancelKeyboard() {
-    return new InlineKeyboard().text(t("task.button.cancel"), TASK_CANCEL_CALLBACK);
-}
-function getCallbackMessageId(ctx) {
-    const message = ctx.callbackQuery?.message;
-    if (!message || !("message_id" in message)) {
-        return null;
-    }
-    const messageId = message.message_id;
-    return typeof messageId === "number" ? messageId : null;
-}
 function clearTaskInteraction(reason) {
     const state = interactionManager.getSnapshot();
     if (state?.kind === "task") {
@@ -179,13 +161,6 @@ function buildTaskInteractionMetadata(stage, projectId, projectWorktree, preview
 function isTaskInteraction(state) {
     return state?.kind === "task";
 }
-function isTaskCallbackActive(flowState, messageId) {
-    return [
-        flowState.scheduleRequestMessageId,
-        flowState.previewMessageId,
-        flowState.promptRequestMessageId,
-    ].includes(messageId);
-}
 async function deleteMessageIfPresent(ctx, messageId) {
     if (!ctx.chat || typeof messageId !== "number") {
         return;
@@ -244,53 +219,6 @@ export async function taskCommand(ctx) {
     });
     taskCreationManager.setScheduleRequestMessageId(message.message_id);
 }
-export async function handleTaskCallback(ctx) {
-    const data = ctx.callbackQuery?.data;
-    if (data !== TASK_RETRY_SCHEDULE_CALLBACK && data !== TASK_CANCEL_CALLBACK) {
-        return false;
-    }
-    const flowState = taskCreationManager.getState();
-    const interactionState = interactionManager.getSnapshot();
-    const callbackMessageId = getCallbackMessageId(ctx);
-    if (!flowState ||
-        !isTaskInteraction(interactionState) ||
-        callbackMessageId === null ||
-        !isTaskCallbackActive(flowState, callbackMessageId)) {
-        if (!flowState && isTaskInteraction(interactionState)) {
-            clearTaskInteraction("task_retry_inactive_state");
-        }
-        await ctx.answerCallbackQuery({ text: t("task.inactive_callback"), show_alert: true });
-        return true;
-    }
-    if (data === TASK_CANCEL_CALLBACK) {
-        await ctx.answerCallbackQuery({ text: t("task.cancel_callback") });
-        await deleteMessageIfPresent(ctx, flowState.scheduleRequestMessageId);
-        await deleteMessageIfPresent(ctx, flowState.previewMessageId);
-        await deleteMessageIfPresent(ctx, flowState.promptRequestMessageId);
-        clearTaskFlow("task_cancelled");
-        await ctx.reply(t("task.cancelled"));
-        return true;
-    }
-    if (!taskCreationManager.isWaitingForPrompt() ||
-        callbackMessageId !== flowState.previewMessageId) {
-        await ctx.answerCallbackQuery({ text: t("task.inactive_callback"), show_alert: true });
-        return true;
-    }
-    taskCreationManager.resetSchedule();
-    interactionManager.transition({
-        kind: "task",
-        expectedInput: "text",
-        metadata: buildTaskInteractionMetadata("awaiting_schedule", flowState.projectId, flowState.projectWorktree),
-    });
-    await ctx.answerCallbackQuery({ text: t("task.retry_schedule_callback") });
-    await deleteMessageIfPresent(ctx, flowState.promptRequestMessageId);
-    await deleteMessageIfPresent(ctx, flowState.previewMessageId);
-    const message = await ctx.reply(t("task.prompt.schedule"), {
-        reply_markup: buildCancelKeyboard(),
-    });
-    taskCreationManager.setScheduleRequestMessageId(message.message_id);
-    return true;
-}
 export async function handleTaskTextInput(ctx) {
     const text = ctx.message?.text;
     if (!text || text.startsWith("/")) {

package/dist/bot/commands/tasklist-command.js

@@ -0,0 +1,40 @@
+import { t } from "../../i18n/index.js";
+import { interactionManager } from "../../app/managers/interaction-manager.js";
+import { listScheduledTasks } from "../../app/stores/scheduled-task-store.js";
+import { buildTaskListKeyboard } from "../menus/scheduled-task-menu.js";
+import { logger } from "../../utils/logger.js";
+function sortTasks(tasks) {
+    return [...tasks].sort((left, right) => {
+        const leftNextRun = left.nextRunAt ? Date.parse(left.nextRunAt) : Number.POSITIVE_INFINITY;
+        const rightNextRun = right.nextRunAt ? Date.parse(right.nextRunAt) : Number.POSITIVE_INFINITY;
+        if (leftNextRun !== rightNextRun) {
+            return leftNextRun - rightNextRun;
+        }
+        return left.createdAt.localeCompare(right.createdAt);
+    });
+}
+export async function taskListCommand(ctx) {
+    try {
+        const tasks = sortTasks(listScheduledTasks());
+        if (tasks.length === 0) {
+            await ctx.reply(t("tasklist.empty"));
+            return;
+        }
+        const message = await ctx.reply(t("tasklist.select"), {
+            reply_markup: buildTaskListKeyboard(tasks),
+        });
+        interactionManager.start({
+            kind: "custom",
+            expectedInput: "callback",
+            metadata: {
+                flow: "tasklist",
+                stage: "list",
+                messageId: message.message_id,
+            },
+        });
+    }
+    catch (error) {
+        logger.error("[TaskList] Failed to open task list", error);
+        await ctx.reply(t("tasklist.load_error"));
+    }
+}

package/dist/bot/commands/worktree-command.js

@@ -0,0 +1,47 @@
+import { getGitWorktreeContext } from "../../app/services/worktree-service.js";
+import { isForegroundBusy } from "../../app/services/run-control-service.js";
+import { getCurrentProject } from "../../app/stores/settings-store.js";
+import { logger } from "../../utils/logger.js";
+import { t } from "../../i18n/index.js";
+import { replyWithInlineMenu } from "../menus/inline-menu.js";
+import { buildWorktreeMenuView } from "../menus/worktree-selection-menu.js";
+import { replyBusyBlocked } from "../messages/busy-blocked-renderer.js";
+async function loadCurrentWorktreeContext() {
+    const currentProject = getCurrentProject();
+    if (!currentProject) {
+        return { currentProject: null, context: null };
+    }
+    const context = await getGitWorktreeContext(currentProject.worktree);
+    return { currentProject, context };
+}
+export async function worktreeCommand(ctx) {
+    try {
+        if (isForegroundBusy()) {
+            await replyBusyBlocked(ctx);
+            return;
+        }
+        const { currentProject, context } = await loadCurrentWorktreeContext();
+        if (!currentProject) {
+            await ctx.reply(t("worktree.project_not_selected"));
+            return;
+        }
+        if (!context) {
+            await ctx.reply(t("worktree.not_git_repo"));
+            return;
+        }
+        if (context.worktrees.length === 0) {
+            await ctx.reply(t("worktree.empty"));
+            return;
+        }
+        const { text, keyboard } = buildWorktreeMenuView(context.worktrees, 0);
+        await replyWithInlineMenu(ctx, {
+            menuKind: "worktree",
+            text,
+            keyboard,
+        });
+    }
+    catch (error) {
+        logger.error("[Bot] Error loading worktrees:", error);
+        await ctx.reply(t("worktree.fetch_error"));
+    }
+}

package/dist/bot/handlers/{document.js → document-handler.js}

@@ -1,8 +1,8 @@
 import { config } from "../../config.js";
 import { processUserPrompt } from "./prompt.js";
-import { downloadTelegramFile, toDataUri, isTextMimeType, isFileSizeAllowed, } from "../utils/file-download.js";
-import { getModelCapabilities, supportsInput } from "../../model/capabilities.js";
-import { getStoredModel } from "../../model/manager.js";
+import { downloadTelegramFile, toDataUri, isTextMimeType, isFileSizeAllowed, } from "../../app/services/file-download-service.js";
+import { getModelCapabilities, supportsInput } from "../../app/services/model-capabilities-service.js";
+import { getStoredModel } from "../../app/services/model-selection-service.js";
 import { logger } from "../../utils/logger.js";
 import { t } from "../../i18n/index.js";
 export async function handleDocumentMessage(ctx, deps) {

package/dist/bot/handlers/{media-group.js → media-group-handler.js}

@@ -1,9 +1,9 @@
 import { config } from "../../config.js";
 import { t } from "../../i18n/index.js";
-import { getModelCapabilities, supportsInput } from "../../model/capabilities.js";
-import { getStoredModel } from "../../model/manager.js";
+import { getModelCapabilities, supportsInput } from "../../app/services/model-capabilities-service.js";
+import { getStoredModel } from "../../app/services/model-selection-service.js";
 import { logger } from "../../utils/logger.js";
-import { downloadTelegramFile, isFileSizeAllowed, isTextMimeType, toDataUri, } from "../utils/file-download.js";
+import { downloadTelegramFile, isFileSizeAllowed, isTextMimeType, toDataUri, } from "../../app/services/file-download-service.js";
 import { processUserPrompt } from "./prompt.js";
 const DEFAULT_MEDIA_GROUP_DEBOUNCE_MS = 1_000;
 export class MediaGroupAttachmentHandler {

package/dist/bot/handlers/photo-handler.js

@@ -0,0 +1,44 @@
+import { downloadTelegramFile, toDataUri } from "../../app/services/file-download-service.js";
+import { getModelCapabilities, supportsInput } from "../../app/services/model-capabilities-service.js";
+import { getStoredModel } from "../../app/services/model-selection-service.js";
+import { t } from "../../i18n/index.js";
+import { logger } from "../../utils/logger.js";
+import { processUserPrompt } from "./prompt.js";
+export async function handlePhotoMessage(ctx, deps) {
+    const photos = ctx.message?.photo;
+    if (!photos || photos.length === 0) {
+        return;
+    }
+    const caption = ctx.message.caption || "";
+    const largestPhoto = photos[photos.length - 1];
+    const downloadFile = deps.downloadFile ?? downloadTelegramFile;
+    const getCapabilities = deps.getModelCapabilities ?? getModelCapabilities;
+    const getStored = deps.getStoredModel ?? getStoredModel;
+    const processPrompt = deps.processPrompt ?? processUserPrompt;
+    try {
+        const storedModel = getStored();
+        const capabilities = await getCapabilities(storedModel.providerID, storedModel.modelID);
+        if (!supportsInput(capabilities, "image")) {
+            logger.warn(`[Bot] Model ${storedModel.providerID}/${storedModel.modelID} doesn't support image input`);
+            await ctx.reply(t("bot.photo_model_no_image"));
+            if (caption.trim().length > 0) {
+                await processPrompt(ctx, caption, deps);
+            }
+            return;
+        }
+        await ctx.reply(t("bot.photo_downloading"));
+        const downloadedFile = await downloadFile(ctx.api, largestPhoto.file_id);
+        const filePart = {
+            type: "file",
+            mime: "image/jpeg",
+            filename: "photo.jpg",
+            url: toDataUri(downloadedFile.buffer, "image/jpeg"),
+        };
+        logger.info(`[Bot] Sending photo (${downloadedFile.buffer.length} bytes) with prompt`);
+        await processPrompt(ctx, caption, deps, [filePart]);
+    }
+    catch (err) {
+        logger.error("[Bot] Error handling photo message:", err);
+        await ctx.reply(t("bot.photo_download_error"));
+    }
+}

package/dist/bot/handlers/prompt.js

@@ -1,25 +1,25 @@
 import { opencodeClient } from "../../opencode/client.js";
-import { clearSession, getCurrentSession, setCurrentSession } from "../../session/manager.js";
-import { ingestSessionInfoForCache } from "../../session/cache-manager.js";
-import { getCurrentProject, isTtsEnabled } from "../../settings/manager.js";
-import { getStoredAgent, resolveProjectAgent } from "../../agent/manager.js";
-import { getStoredModel } from "../../model/manager.js";
-import { formatVariantForButton } from "../../variant/manager.js";
-import { createMainKeyboard } from "../utils/keyboard.js";
-import { keyboardManager } from "../../keyboard/manager.js";
-import { pinnedMessageManager } from "../../pinned/manager.js";
-import { summaryAggregator } from "../../summary/aggregator.js";
+import { clearSession, getCurrentSession, setCurrentSession, } from "../../app/services/session-service.js";
+import { ingestSessionInfoForCache } from "../../app/services/session-cache-service.js";
+import { getCurrentProject, getTtsMode } from "../../app/stores/settings-store.js";
+import { getStoredAgent, resolveProjectAgent } from "../../app/services/agent-selection-service.js";
+import { getStoredModel } from "../../app/services/model-selection-service.js";
+import { formatVariantForButton } from "../../app/services/variant-selection-service.js";
+import { createMainKeyboard } from "../keyboards/main-reply-keyboard.js";
+import { keyboardManager } from "../keyboards/keyboard-manager.js";
+import { pinnedMessageManager } from "../pinned/pinned-message-manager.js";
+import { summaryAggregator } from "../../app/managers/summary-aggregation-manager.js";
 import { stopEventListening } from "../../opencode/events.js";
-import { interactionManager } from "../../interaction/manager.js";
-import { clearAllInteractionState } from "../../interaction/cleanup.js";
+import { interactionManager } from "../../app/managers/interaction-manager.js";
+import { clearAllInteractionState } from "../../app/managers/interaction-manager.js";
 import { safeBackgroundTask } from "../../utils/safe-background-task.js";
 import { formatErrorDetails } from "../../utils/error-format.js";
 import { logger } from "../../utils/logger.js";
 import { t } from "../../i18n/index.js";
-import { foregroundSessionState } from "../../scheduled-task/foreground-state.js";
-import { assistantRunState } from "../assistant-run-state.js";
-import { attachToSession, detachAttachedSession, markAttachedSessionBusy, markAttachedSessionIdle, } from "../../attach/service.js";
-import { externalUserInputSuppressionManager } from "../../external-input/suppression.js";
+import { foregroundSessionState } from "../../app/managers/foreground-session-state-manager.js";
+import { assistantRunState } from "../../app/managers/assistant-run-state-manager.js";
+import { attachToSession, detachAttachedSession, markAttachedSessionBusy, markAttachedSessionIdle, } from "../../app/services/attach-service.js";
+import { externalUserInputSuppressionManager } from "../../app/managers/external-input-suppression-manager.js";
 /** Module-level references for async callbacks that don't have ctx. */
 let botInstance = null;
 let chatIdInstance = null;
@@ -91,7 +91,7 @@ async function resetMismatchedSessionContext() {
  */
 export async function processUserPrompt(ctx, text, deps, fileParts = [], options = {}) {
     const { bot, ensureEventSubscription } = deps;
-    const responseMode = options.responseMode ?? (isTtsEnabled() ? "text_and_tts" : "text_only");
+    const responseMode = options.responseMode ?? (getTtsMode() === "all" ? "text_and_tts" : "text_only");
     const currentProject = getCurrentProject();
     if (!currentProject) {
         await ctx.reply(t("bot.project_not_selected"));

package/dist/bot/handlers/text-message-handler.js

@@ -0,0 +1,61 @@
+import { interactionManager } from "../../app/managers/interaction-manager.js";
+import { t } from "../../i18n/index.js";
+import { clearCommandsInteraction, executeCommand, parseCommandsMetadata, } from "../callbacks/command-catalog-callback-handler.js";
+import { clearSkillsInteraction, executeSkill, parseSkillsMetadata, } from "../callbacks/skills-catalog-callback-handler.js";
+export async function handleCommandTextArguments(ctx, deps) {
+    const text = ctx.message?.text;
+    if (!text || text.startsWith("/")) {
+        return false;
+    }
+    const metadata = parseCommandsMetadata(interactionManager.getSnapshot());
+    if (!metadata || metadata.stage !== "confirm") {
+        return false;
+    }
+    const argumentsText = text.trim();
+    if (!argumentsText) {
+        await ctx.reply(t("commands.arguments_empty"));
+        return true;
+    }
+    clearCommandsInteraction("commands_arguments_submitted");
+    if (ctx.chat) {
+        await ctx.api.deleteMessage(ctx.chat.id, metadata.messageId).catch(() => { });
+    }
+    await executeCommand(ctx, deps, {
+        projectDirectory: metadata.projectDirectory,
+        commandName: metadata.commandName,
+        argumentsText,
+    });
+    return true;
+}
+export async function handleSkillTextArguments(ctx, deps) {
+    const text = ctx.message?.text;
+    if (!text || text.startsWith("/")) {
+        return false;
+    }
+    const metadata = parseSkillsMetadata(interactionManager.getSnapshot());
+    if (!metadata || metadata.stage !== "confirm") {
+        return false;
+    }
+    const argumentsText = text.trim();
+    if (!argumentsText) {
+        await ctx.reply(t("skills.arguments_empty"));
+        return true;
+    }
+    clearSkillsInteraction("skills_arguments_submitted");
+    if (ctx.chat) {
+        await ctx.api.deleteMessage(ctx.chat.id, metadata.messageId).catch(() => { });
+    }
+    await executeSkill(ctx, deps, {
+        projectDirectory: metadata.projectDirectory,
+        skillName: metadata.skillName,
+        argumentsText,
+    });
+    return true;
+}
+export async function handleCatalogTextArguments(ctx, deps) {
+    const handledCommandArgs = await handleCommandTextArguments(ctx, deps);
+    if (handledCommandArgs) {
+        return true;
+    }
+    return handleSkillTextArguments(ctx, deps);
+}

package/dist/bot/handlers/tts-response-handler.js

@@ -0,0 +1,29 @@
+import { InputFile } from "grammy";
+import { prepareTtsResponseForSession } from "../../app/services/tts-service.js";
+import { t } from "../../i18n/index.js";
+import { logger } from "../../utils/logger.js";
+import { consumePromptResponseMode } from "./prompt.js";
+export async function sendTtsResponseForSession({ api, sessionId, chatId, text, consumeResponseMode: consumeResponseModeImpl = consumePromptResponseMode, isTtsConfigured, synthesizeSpeech, }) {
+    try {
+        const prepared = await prepareTtsResponseForSession({
+            sessionId,
+            text,
+            consumeResponseMode: consumeResponseModeImpl,
+            isTtsConfigured,
+            synthesizeSpeech,
+        });
+        if (!prepared.shouldSend) {
+            return false;
+        }
+        await api.sendAudio(chatId, new InputFile(prepared.speech.buffer, prepared.speech.filename));
+        logger.info(`[TTS] Sent audio reply for session ${sessionId}`);
+        return true;
+    }
+    catch (error) {
+        logger.warn(`[TTS] Failed to send audio reply for session ${sessionId}`, error);
+        await api.sendMessage(chatId, t("tts.failed")).catch((sendError) => {
+            logger.warn(`[TTS] Failed to send audio error message for session ${sessionId}`, sendError);
+        });
+        return false;
+    }
+}

package/dist/bot/handlers/{voice.js → voice-handler.js}

@@ -4,11 +4,12 @@ import { URL } from "node:url";
 import { HttpsProxyAgent } from "https-proxy-agent";
 import { SocksProxyAgent } from "socks-proxy-agent";
 import { config } from "../../config.js";
-import { isSttConfigured, transcribeAudio } from "../../stt/client.js";
+import { getTtsMode } from "../../app/stores/settings-store.js";
+import { isSttConfigured, transcribeAudio, } from "../../app/services/stt-service.js";
 import { processUserPrompt } from "./prompt.js";
 import { logger } from "../../utils/logger.js";
 import { t } from "../../i18n/index.js";
-import { buildTelegramFileUrl } from "../utils/telegram-file-url.js";
+import { buildTelegramFileUrl } from "../../app/services/file-download-service.js";
 const TELEGRAM_DOWNLOAD_TIMEOUT_MS = 30_000;
 const TELEGRAM_DOWNLOAD_MAX_REDIRECTS = 3;
 let telegramDownloadAgent;
@@ -169,7 +170,9 @@ export async function handleVoiceMessage(ctx, deps) {
             textForLLM = `${llmNote}\n${recognizedText}`;
         }
         // Process the recognized text as a prompt
-        await processPrompt(ctx, textForLLM, deps);
+        const currentTtsMode = getTtsMode();
+        const responseMode = currentTtsMode === "all" || currentTtsMode === "auto" ? "text_and_tts" : "text_only";
+        await processPrompt(ctx, textForLLM, deps, [], { responseMode });
     }
     catch (err) {
         const errorMessage = err instanceof Error ? err.message : "unknown error";