@grinev/opencode-telegram-bot 0.21.0 → 0.21.2

package/.env.example

@@ -80,6 +80,15 @@ OPENCODE_MODEL_ID=big-pickle
 # If exceeded, the bot stops waiting for the result and marks the run as failed.
 # SCHEDULED_TASK_EXECUTION_TIMEOUT_MINUTES=120
 
+# Send scheduled task result/error messages without Telegram push notifications (default: false)
+# SCHEDULED_TASK_DISABLE_NOTIFICATION=false
+
+# Response streaming mode: "edit" (default) or "draft" (default: edit)
+# edit = uses editMessageText to update messages incrementally (may flicker)
+# draft = uses sendMessageDraft (Bot API 9.5+) for smooth animated draft previews,
+#         then finalizes with sendMessage. Only works in private chats.
+# RESPONSE_STREAMING_MODE=edit
+
 # Stream update throttle in milliseconds for assistant/tool message edits (default: 1000)
 # Higher value = fewer Telegram edit requests, lower value = more real-time updates
 # RESPONSE_STREAM_THROTTLE_MS=1000
@@ -89,7 +98,7 @@ OPENCODE_MODEL_ID=big-pickle
 # BASH_TOOL_DISPLAY_MAX_LENGTH=128
 
 # Bot locale: supported locale code (default: en)
-# Supported locales: en, de, es, fr, ru, zh
+# Supported locales: en, ar, de, es, fr, ru, zh
 # BOT_LOCALE=en
 
 # Hide thinking indicator messages (default: false)
@@ -135,7 +144,7 @@ OPENCODE_MODEL_ID=big-pickle
 
 # Text-to-Speech credentials (optional)
 # TTS reply behavior is controlled globally with /tts and persisted in settings.json.
-# Provider: "openai" (default) or "google".
+# Provider: "openai" (default), "elevenlabs", or "google".
 #
 # --- OpenAI-compatible (default) ---
 # Set TTS_API_URL and TTS_API_KEY to any OpenAI-compatible TTS endpoint.
@@ -144,6 +153,13 @@ OPENCODE_MODEL_ID=big-pickle
 # TTS_MODEL=gpt-4o-mini-tts
 # TTS_VOICE=alloy
 #
+# --- ElevenLabs ---
+# TTS_PROVIDER=elevenlabs
+# TTS_API_URL=https://api.elevenlabs.io/v1
+# TTS_API_KEY=
+# TTS_MODEL=eleven_flash_v2_5
+# TTS_VOICE=21m00Tcm4TlvDq8ikWAM
+#
 # --- Google Cloud TTS ---
 # 1. Create a project at https://console.cloud.google.com
 # 2. Enable "Cloud Text-to-Speech API"

package/README.md

@@ -17,12 +17,14 @@ Scheduled tasks support. Turns the bot into a lightweight OpenClaw alternative f
 
 Platforms: macOS, Windows, Linux
 
-Languages: English (`en`), Deutsch (`de`), Español (`es`), Français (`fr`), Русский (`ru`), 简体中文 (`zh`)
+Languages: English (`en`), العربية (`ar`), Deutsch (`de`), Español (`es`), Français (`fr`), Русский (`ru`), 简体中文 (`zh`)
 
 <p align="center">
   <img src="assets/screencast.gif" width="45%" alt="OpenCode Telegram Bot screencast" />
 </p>
 
+> I use [boardown](https://github.com/grinev/boardown), my open-source Markdown-based task board, to plan and track this project. It stores tasks in plain `.md` files and can be used as a VS Code extension or a desktop app.
+
 ## Features
 
 - **Remote coding** — send prompts to OpenCode from anywhere, receive complete results with code sent as files
@@ -190,7 +192,7 @@ For this to work, the console OpenCode instance must be started on the same port
 
 ### Localization
 
-- Supported locales: `en`, `de`, `es`, `fr`, `ru`, `zh`
+- Supported locales: `en`, `ar`, `de`, `es`, `fr`, `ru`, `zh`
 - The setup wizard asks for language first
 - You can change locale later with `BOT_LOCALE`
 
@@ -217,7 +219,7 @@ When installed via npm, the configuration wizard handles the initial setup. The
 | `OPENCODE_SERVER_PASSWORD`                 | Server auth password                                                                                                  |    No    | —                        |
 | `OPENCODE_MODEL_PROVIDER`                  | Default model provider                                                                                                |   Yes    | `opencode`               |
 | `OPENCODE_MODEL_ID`                        | Default model ID                                                                                                      |   Yes    | `big-pickle`             |
-| `BOT_LOCALE`                               | Bot UI language (supported locale code, e.g. `en`, `de`, `es`, `fr`, `ru`, `zh`)                                      |    No    | `en`                     |
+| `BOT_LOCALE`                               | Bot UI language (supported locale code, e.g. `en`, `ar`, `de`, `es`, `fr`, `ru`, `zh`)                                |    No    | `en`                     |
 | `SESSIONS_LIST_LIMIT`                      | Sessions per page in `/sessions`                                                                                      |    No    | `10`                     |
 | `MESSAGES_LIST_LIMIT`                      | User messages per page in `/messages`                                                                                 |    No    | `10`                     |
 | `PROJECTS_LIST_LIMIT`                      | Projects per page in `/projects`                                                                                      |    No    | `10`                     |
@@ -225,6 +227,7 @@ When installed via npm, the configuration wizard handles the initial setup. The
 | `COMMANDS_LIST_LIMIT`                      | Items per page in `/commands` and `/skills`                                                                           |    No    | `10`                     |
 | `TASK_LIMIT`                               | Maximum number of scheduled tasks that can exist at once                                                              |    No    | `10`                     |
 | `SCHEDULED_TASK_EXECUTION_TIMEOUT_MINUTES` | Maximum time the bot waits for one scheduled task run before marking it failed                                        |    No    | `120`                    |
+| `SCHEDULED_TASK_DISABLE_NOTIFICATION`      | Send scheduled task result/error messages without Telegram push notifications                                         |    No    | `false`                  |
 | `BASH_TOOL_DISPLAY_MAX_LENGTH`             | Maximum displayed length for `bash` tool commands in Telegram summaries; longer commands are truncated                |    No    | `128`                    |
 | `SERVICE_MESSAGES_INTERVAL_SEC`            | Service messages interval (thinking + tool calls); keep `>=2` to avoid Telegram rate limits, `0` = immediate          |    No    | `5`                      |
 | `HIDE_THINKING_MESSAGES`                   | Hide `💭 Thinking...` service messages                                                                                |    No    | `false`                  |
@@ -239,11 +242,11 @@ When installed via npm, the configuration wizard handles the initial setup. The
 | `STT_MODEL`                                | STT model name passed to `/audio/transcriptions`                                                                      |    No    | `whisper-large-v3-turbo` |
 | `STT_LANGUAGE`                             | Optional language hint (empty = provider auto-detect)                                                                 |    No    | —                        |
 | `STT_NOTE_PROMPT`                          | Optional note prepended to the LLM prompt as `[Note: ...]` for voice transcriptions; empty / `false` / `0` disable it |    No    | —                        |
-| `TTS_PROVIDER`                             | TTS provider: `openai` for OpenAI-compatible APIs or `google` for Google Cloud TTS                                    |    No    | `openai`                 |
-| `TTS_API_URL`                              | OpenAI-compatible TTS API base URL                                                                                    |    No    | —                        |
-| `TTS_API_KEY`                              | OpenAI-compatible TTS API key                                                                                         |    No    | —                        |
-| `TTS_MODEL`                                | OpenAI-compatible TTS model name passed to `/audio/speech`                                                            |    No    | `gpt-4o-mini-tts`        |
-| `TTS_VOICE`                                | TTS voice name. Defaults to `alloy` for OpenAI-compatible APIs and `en-US-Studio-O` for Google Cloud TTS              |    No    | provider-specific        |
+| `TTS_PROVIDER`                             | TTS provider: `openai` for OpenAI-compatible APIs, `elevenlabs` for ElevenLabs, or `google` for Google Cloud TTS      |    No    | `openai`                 |
+| `TTS_API_URL`                              | TTS API base URL for OpenAI-compatible APIs or ElevenLabs                                                             |    No    | —                        |
+| `TTS_API_KEY`                              | TTS API key for OpenAI-compatible APIs or ElevenLabs                                                                  |    No    | —                        |
+| `TTS_MODEL`                                | TTS model name. Passed as `model` for OpenAI-compatible APIs and `model_id` for ElevenLabs                            |    No    | `gpt-4o-mini-tts`        |
+| `TTS_VOICE`                                | TTS voice name or ElevenLabs voice ID. Defaults to `alloy`, `21m00Tcm4TlvDq8ikWAM`, or `en-US-Studio-O` by provider   |    No    | provider-specific        |
 | `GOOGLE_APPLICATION_CREDENTIALS`           | Path to a Google Cloud service account JSON key file for `TTS_PROVIDER=google`                                        |    No    | —                        |
 | `LOG_LEVEL`                                | Log level (`debug`, `info`, `warn`, `error`)                                                                          |    No    | `info`                   |
 | `LOG_RETENTION`                            | Number of log files to keep: launch files in `sources`, daily files in `installed`                                    |    No    | `10`                     |
@@ -323,6 +326,16 @@ TTS_MODEL=gpt-4o-mini-tts
 TTS_VOICE=alloy
 ```
 
+ElevenLabs TTS configuration example:
+
+```env
+TTS_PROVIDER=elevenlabs
+TTS_API_URL=https://api.elevenlabs.io/v1
+TTS_API_KEY=your-elevenlabs-api-key
+TTS_MODEL=eleven_flash_v2_5
+TTS_VOICE=21m00Tcm4TlvDq8ikWAM
+```
+
 Google Cloud TTS configuration example:
 
 ```env

package/dist/app/{start-bot-app.js → bootstrap/start-bot-app.js}

@@ -1,22 +1,23 @@
 import fs from "node:fs/promises";
 import { readFile } from "node:fs/promises";
-import { cleanupBotRuntime, createBot } from "../bot/index.js";
-import { config } from "../config.js";
-import { opencodeAutoRestartService } from "../opencode/auto-restart.js";
-import { notifyOpencodeReadyIfHealthy, registerOpenCodeReadyRefreshHandler, } from "../opencode/ready-refresh.js";
-import { loadSettings } from "../settings/manager.js";
-import { scheduledTaskRuntime } from "../scheduled-task/runtime.js";
-import { reconcileStoredModelSelection } from "../model/manager.js";
-import { getRuntimeMode } from "../runtime/mode.js";
-import { getRuntimePaths } from "../runtime/paths.js";
-import { clearServiceStateFile } from "../service/manager.js";
-import { getServiceStateFilePathFromEnv, isServiceChildProcess } from "../service/runtime.js";
-import { getLogFilePath, initializeLogger, logger } from "../utils/logger.js";
-import { safeBackgroundTask } from "../utils/safe-background-task.js";
+import { cleanupBotRuntime, createBot } from "../../bot/index.js";
+import { createScheduledTaskDeliverySender } from "../../bot/messages/scheduled-task-delivery.js";
+import { config } from "../../config.js";
+import { opencodeAutoRestartService } from "../../opencode/auto-restart.js";
+import { notifyOpencodeReadyIfHealthy, registerOpenCodeReadyRefreshHandler, } from "../../opencode/ready-refresh.js";
+import { loadSettings } from "../stores/settings-store.js";
+import { scheduledTaskRuntime } from "../services/scheduled-task-runtime-service.js";
+import { reconcileStoredModelSelection } from "../services/model-selection-service.js";
+import { getRuntimeMode } from "../../runtime/mode.js";
+import { getRuntimePaths } from "../../runtime/paths.js";
+import { clearServiceStateFile } from "../../runtime/service/manager.js";
+import { getServiceStateFilePathFromEnv, isServiceChildProcess } from "../../runtime/service/env.js";
+import { getLogFilePath, initializeLogger, logger } from "../../utils/logger.js";
+import { safeBackgroundTask } from "../../utils/safe-background-task.js";
 const SHUTDOWN_TIMEOUT_MS = 5000;
 async function getBotVersion() {
     try {
-        const packageJsonPath = new URL("../../package.json", import.meta.url);
+        const packageJsonPath = new URL("../../../package.json", import.meta.url);
         const packageJsonContent = await readFile(packageJsonPath, "utf-8");
         const packageJson = JSON.parse(packageJsonContent);
         return packageJson.version ?? "unknown";
@@ -43,7 +44,7 @@ export async function startBotApp() {
     await reconcileStoredModelSelection();
     registerOpenCodeReadyRefreshHandler();
     const bot = createBot();
-    await scheduledTaskRuntime.initialize(bot);
+    await scheduledTaskRuntime.initialize(bot, createScheduledTaskDeliverySender(bot.api, config.telegram.allowedUserId));
     safeBackgroundTask({
         taskName: "app.opencodeStartup",
         task: async () => {

package/dist/{bot/utils/assistant-run-footer.js → app/formatters/assistant-run-footer-formatter.js}

@@ -1,4 +1,4 @@
-import { getAgentDisplayName } from "../../agent/types.js";
+import { getAgentDisplayName } from "../types/agent.js";
 function formatDuration(elapsedMs) {
     const safeElapsedMs = Math.max(0, Math.round(elapsedMs));
     const totalSeconds = Math.floor(safeElapsedMs / 1000);

package/dist/{summary → app/formatters}/subagent-formatter.js

@@ -1,6 +1,11 @@
-import { formatModelDisplayName } from "../pinned/format.js";
-import { t } from "../i18n/index.js";
-import { formatCompactToolInfo } from "./formatter.js";
+import { t } from "../../i18n/index.js";
+import { formatCompactToolInfo } from "./summary-formatter.js";
+function formatModelDisplayName(providerID, modelID) {
+    if (providerID && modelID) {
+        return `${providerID}/${modelID}`;
+    }
+    return t("pinned.unknown");
+}
 function shouldPreferInputDetails(tool, input) {
     if (!input) {
         return false;

package/dist/{summary/formatter.js → app/formatters/summary-formatter.js}

@@ -1,12 +1,8 @@
 import * as path from "path";
-import { config } from "../config.js";
-import { logger } from "../utils/logger.js";
-import { t } from "../i18n/index.js";
-import { getCurrentProject } from "../settings/manager.js";
-import { convertToTelegramMarkdownV2 } from "./markdown-to-telegram-v2.js";
-import { normalizeMarkdownForTelegramRendering } from "../telegram/render/markdown-normalizer.js";
-const TELEGRAM_MESSAGE_LIMIT = 4096;
-const MARKDOWN_V2_RESERVED_CHARS = /([_\*\[\]\(\)~`>#+\-=|{}.!\\])/g;
+import { config } from "../../config.js";
+import { logger } from "../../utils/logger.js";
+import { t } from "../../i18n/index.js";
+import { getCurrentProject } from "../stores/settings-store.js";
 function truncateWithEllipsis(text, maxLength) {
     if (text.length <= maxLength) {
         return text;
@@ -16,50 +12,6 @@ function truncateWithEllipsis(text, maxLength) {
     }
     return `${text.slice(0, maxLength - 3).trimEnd()}...`;
 }
-function endsWithOddTrailingBackslashes(text, start, end) {
-    let backslashCount = 0;
-    for (let index = end - 1; index >= start; index--) {
-        if (text[index] !== "\\") {
-            break;
-        }
-        backslashCount += 1;
-    }
-    return backslashCount % 2 === 1;
-}
-function resolveSplitEndIndex(text, currentIndex, maxLength, options) {
-    const hardLimit = Math.min(text.length, currentIndex + maxLength);
-    if (hardLimit >= text.length) {
-        return text.length;
-    }
-    let endIndex = hardLimit;
-    const breakPoint = text.lastIndexOf("\n", endIndex);
-    if (breakPoint > currentIndex) {
-        endIndex = breakPoint + 1;
-    }
-    if (!options?.avoidTrailingMarkdownEscape) {
-        return endIndex;
-    }
-    while (endIndex > currentIndex && endsWithOddTrailingBackslashes(text, currentIndex, endIndex)) {
-        endIndex -= 1;
-    }
-    return endIndex > currentIndex ? endIndex : hardLimit;
-}
-function splitText(text, maxLength, options) {
-    const parts = [];
-    let currentIndex = 0;
-    while (currentIndex < text.length) {
-        const endIndex = resolveSplitEndIndex(text, currentIndex, maxLength, options);
-        if (endIndex <= currentIndex) {
-            const fallbackEnd = Math.min(text.length, currentIndex + 1);
-            parts.push(text.slice(currentIndex, fallbackEnd));
-            currentIndex = fallbackEnd;
-            continue;
-        }
-        parts.push(text.slice(currentIndex, endIndex));
-        currentIndex = endIndex;
-    }
-    return parts;
-}
 export function normalizePathForDisplay(filePath) {
     const normalizedPath = filePath.replace(/\\/g, "/");
     const project = getCurrentProject();
@@ -81,86 +33,6 @@ export function normalizePathForDisplay(filePath) {
     }
     return normalizedPath;
 }
-export function formatSummary(text) {
-    return formatSummaryWithMode(text, config.bot.messageFormatMode);
-}
-export function escapePlainTextForTelegramMarkdownV2(text) {
-    return text.replace(MARKDOWN_V2_RESERVED_CHARS, "\\$1");
-}
-function formatMarkdownForTelegram(text) {
-    try {
-        const preprocessed = normalizeMarkdownForTelegramRendering(text);
-        return escapeMarkdownV2PipesOutsideCode(convertToTelegramMarkdownV2(preprocessed));
-    }
-    catch (error) {
-        logger.warn("[Formatter] Failed to convert markdown summary, falling back to raw text", error);
-        return text;
-    }
-}
-function escapeMarkdownV2PipesOutsideCode(text) {
-    let result = "";
-    let index = 0;
-    let inInlineCode = false;
-    let inCodeFence = false;
-    while (index < text.length) {
-        if (text.startsWith("```", index)) {
-            result += "```";
-            index += 3;
-            inCodeFence = !inCodeFence;
-            continue;
-        }
-        const char = text[index];
-        if (!inCodeFence && char === "`") {
-            inInlineCode = !inInlineCode;
-            result += char;
-            index += 1;
-            continue;
-        }
-        if (!inCodeFence && !inInlineCode && char === "|" && text[index - 1] !== "\\") {
-            result += "\\|";
-            index += 1;
-            continue;
-        }
-        result += char;
-        index += 1;
-    }
-    return result;
-}
-export function formatSummaryWithMode(text, mode, maxLength = TELEGRAM_MESSAGE_LIMIT) {
-    if (!text || text.trim().length === 0) {
-        return [];
-    }
-    const normalizedMaxLength = Math.max(1, Math.floor(maxLength));
-    const rawTextLimit = mode === "raw" ? Math.max(1, normalizedMaxLength - "```\n\n```".length) : normalizedMaxLength;
-    const parts = splitText(text, rawTextLimit);
-    const formattedParts = [];
-    for (const part of parts) {
-        const trimmed = part.trim();
-        if (!trimmed) {
-            continue;
-        }
-        if (mode === "markdown") {
-            const converted = formatMarkdownForTelegram(trimmed);
-            const convertedParts = splitText(converted, normalizedMaxLength, {
-                avoidTrailingMarkdownEscape: true,
-            });
-            for (const convertedPart of convertedParts) {
-                const normalizedPart = convertedPart.trim();
-                if (normalizedPart) {
-                    formattedParts.push(normalizedPart);
-                }
-            }
-            continue;
-        }
-        if (parts.length > 1) {
-            formattedParts.push(`\`\`\`\n${trimmed}\n\`\`\``);
-        }
-        else {
-            formattedParts.push(trimmed);
-        }
-    }
-    return formattedParts;
-}
 function getToolDetails(tool, input) {
     if (!input) {
         return "";

package/dist/{summary → app/formatters}/tool-message-batcher.js

@@ -1,4 +1,4 @@
-import { logger } from "../utils/logger.js";
+import { logger } from "../../utils/logger.js";
 export class ToolMessageBatcher {
     sendText;
     sendFile;

package/dist/{bot/assistant-run-state.js → app/managers/assistant-run-state-manager.js}

@@ -1,4 +1,4 @@
-import { logger } from "../utils/logger.js";
+import { logger } from "../../utils/logger.js";
 class AssistantRunState {
     runs = new Map();
     startRun(sessionId, info) {

package/dist/{attach/manager.js → app/managers/attach-manager.js}

@@ -1,4 +1,4 @@
-import { logger } from "../utils/logger.js";
+import { logger } from "../../utils/logger.js";
 class AttachManager {
     state = null;
     attach(sessionId, directory) {

package/dist/{background-session/tracker.js → app/managers/background-session-manager.js}

@@ -1,5 +1,5 @@
-import { isScheduledTaskSessionIgnored } from "../scheduled-task/session-ignore.js";
-import { logger } from "../utils/logger.js";
+import { isScheduledTaskSessionIgnored } from "../services/scheduled-task-session-ignore-service.js";
+import { logger } from "../../utils/logger.js";
 class BackgroundSessionTracker {
     directory = null;
     onNotification = null;

package/dist/{scheduled-task/foreground-state.js → app/managers/foreground-session-state-manager.js}

@@ -1,4 +1,4 @@
-import { logger } from "../utils/logger.js";
+import { logger } from "../../utils/logger.js";
 class ForegroundSessionState {
     activeSessions = new Map();
     markBusy(sessionId, directory) {

package/dist/{interaction/manager.js → app/managers/interaction-manager.js}

@@ -1,4 +1,8 @@
-import { logger } from "../utils/logger.js";
+import { permissionManager } from "./permission-manager.js";
+import { questionManager } from "./question-manager.js";
+import { renameManager } from "./rename-manager.js";
+import { taskCreationManager } from "./scheduled-task-creation-manager.js";
+import { logger } from "../../utils/logger.js";
 export const DEFAULT_ALLOWED_INTERACTION_COMMANDS = ["/help", "/status", "/abort", "/detach"];
 function normalizeCommand(command) {
     const trimmed = command.trim().toLowerCase();
@@ -104,3 +108,29 @@ class InteractionManager {
     }
 }
 export const interactionManager = new InteractionManager();
+export function clearAllInteractionState(reason) {
+    const questionActive = questionManager.isActive();
+    const permissionActive = permissionManager.isActive();
+    const renameActive = renameManager.isWaitingForName();
+    const taskCreationActive = taskCreationManager.isActive();
+    const interactionSnapshot = interactionManager.getSnapshot();
+    questionManager.clear();
+    permissionManager.clear();
+    renameManager.clear();
+    taskCreationManager.clear();
+    interactionManager.clear(reason);
+    const hasAnyActiveState = questionActive ||
+        permissionActive ||
+        renameActive ||
+        taskCreationActive ||
+        interactionSnapshot !== null;
+    const message = `[InteractionCleanup] Cleared state: reason=${reason}, ` +
+        `questionActive=${questionActive}, permissionActive=${permissionActive}, ` +
+        `renameActive=${renameActive}, taskCreationActive=${taskCreationActive}, ` +
+        `interactionKind=${interactionSnapshot?.kind || "none"}`;
+    if (hasAnyActiveState) {
+        logger.info(message);
+        return;
+    }
+    logger.debug(message);
+}

package/dist/{permission/manager.js → app/managers/permission-manager.js}

@@ -1,4 +1,4 @@
-import { logger } from "../utils/logger.js";
+import { logger } from "../../utils/logger.js";
 class PermissionManager {
     state = {
         requestsByMessageId: new Map(),

package/dist/{question/manager.js → app/managers/question-manager.js}

@@ -1,4 +1,4 @@
-import { logger } from "../utils/logger.js";
+import { logger } from "../../utils/logger.js";
 class QuestionManager {
     state = {
         questions: [],

package/dist/{rename/manager.js → app/managers/rename-manager.js}

@@ -1,4 +1,4 @@
-import { logger } from "../utils/logger.js";
+import { logger } from "../../utils/logger.js";
 class RenameManager {
     state = {
         isWaiting: false,

package/dist/{scheduled-task/creation-manager.js → app/managers/scheduled-task-creation-manager.js}

@@ -1,5 +1,5 @@
-import { cloneParsedTaskSchedule, cloneScheduledTaskModel } from "./types.js";
-import { logger } from "../utils/logger.js";
+import { cloneParsedTaskSchedule, cloneScheduledTaskModel } from "../types/scheduled-task.js";
+import { logger } from "../../utils/logger.js";
 function cloneState(state) {
     return {
         ...state,

package/dist/{summary/aggregator.js → app/managers/summary-aggregation-manager.js}

@@ -1,6 +1,6 @@
-import { normalizePathForDisplay, prepareCodeFile } from "./formatter.js";
-import { logger } from "../utils/logger.js";
-import { getCurrentProject } from "../settings/manager.js";
+import { normalizePathForDisplay, prepareCodeFile } from "../formatters/summary-formatter.js";
+import { logger } from "../../utils/logger.js";
+import { getCurrentProject } from "../stores/settings-store.js";
 function extractFirstUpdatedFileFromTitle(title) {
     for (const rawLine of title.split("\n")) {
         const line = rawLine.trim();

package/dist/{agent/manager.js → app/services/agent-selection-service.js}

@@ -1,8 +1,7 @@
-import { opencodeClient } from "../opencode/client.js";
-import { getCurrentProject } from "../settings/manager.js";
-import { getCurrentSession } from "../session/manager.js";
-import { getCurrentAgent, setCurrentAgent } from "../settings/manager.js";
-import { logger } from "../utils/logger.js";
+import { opencodeClient } from "../../opencode/client.js";
+import { getCurrentAgent, getCurrentProject, setCurrentAgent } from "../stores/settings-store.js";
+import { getCurrentSession } from "./session-service.js";
+import { logger } from "../../utils/logger.js";
 /**
  * Get list of available agents from OpenCode API
  * @returns Array of available agents (filtered by mode and hidden flag)

package/dist/{attach/service.js → app/services/attach-service.js}

@@ -1,17 +1,17 @@
-import { opencodeClient } from "../opencode/client.js";
-import { isOpencodeServerHealthy } from "../opencode/ready-refresh.js";
-import { summaryAggregator } from "../summary/aggregator.js";
-import { pinnedMessageManager } from "../pinned/manager.js";
-import { keyboardManager } from "../keyboard/manager.js";
-import { questionManager } from "../question/manager.js";
-import { permissionManager } from "../permission/manager.js";
-import { showCurrentQuestion } from "../bot/handlers/question.js";
-import { showPermissionRequest } from "../bot/handlers/permission.js";
-import { getCurrentSession } from "../session/manager.js";
-import { getCurrentProject } from "../settings/manager.js";
-import { attachManager } from "./manager.js";
-import { logger } from "../utils/logger.js";
-import { isExpectedOpencodeUnavailableError } from "../utils/opencode-error.js";
+import { opencodeClient } from "../../opencode/client.js";
+import { isOpencodeServerHealthy } from "../../opencode/ready-refresh.js";
+import { summaryAggregator } from "../managers/summary-aggregation-manager.js";
+import { questionManager } from "../managers/question-manager.js";
+import { permissionManager } from "../managers/permission-manager.js";
+import { getCurrentSession } from "./session-service.js";
+import { getCurrentProject } from "../stores/settings-store.js";
+import { attachManager } from "../managers/attach-manager.js";
+import { logger } from "../../utils/logger.js";
+import { isExpectedOpencodeUnavailableError } from "../../utils/opencode-error.js";
+let attachPresentation = null;
+export function configureAttachPresentation(deps) {
+    attachPresentation = deps;
+}
 function getAttachBusyStatus(sessionId, statuses) {
     if (!statuses || typeof statuses !== "object") {
         return false;
@@ -19,36 +19,12 @@ function getAttachBusyStatus(sessionId, statuses) {
     const sessionStatus = statuses[sessionId];
     return sessionStatus?.type === "busy";
 }
-async function ensureAttachPinnedSession({ api, chatId, session, forceFullRestore = false, }) {
-    if (!pinnedMessageManager.isInitialized()) {
-        pinnedMessageManager.initialize(api, chatId);
-    }
-    keyboardManager.initialize(api, chatId);
-    const pinnedState = pinnedMessageManager.getState();
-    if (pinnedState.sessionId === session.id && pinnedState.messageId) {
-        if (forceFullRestore) {
-            await pinnedMessageManager.loadContextFromHistory(session.id, session.directory);
-        }
-        return;
-    }
-    if (pinnedState.messageId && pinnedState.sessionId === null) {
-        await pinnedMessageManager.restoreExistingSession(session.id, session.title);
-    }
-    else {
-        await pinnedMessageManager.onSessionChange(session.id, session.title);
-    }
-    await pinnedMessageManager.loadContextFromHistory(session.id, session.directory);
-    const contextInfo = pinnedMessageManager.getContextInfo();
-    if (contextInfo) {
-        keyboardManager.updateContext(contextInfo.tokensUsed, contextInfo.tokensLimit);
-    }
-}
 async function syncPinnedAttachState() {
-    if (!pinnedMessageManager.isInitialized()) {
+    if (!attachPresentation) {
         return;
     }
     const attached = attachManager.getSnapshot();
-    await pinnedMessageManager.setAttachState(attached !== null, attached?.busy ?? false);
+    await attachPresentation.syncAttachState(attached !== null, attached?.busy ?? false);
 }
 async function restorePendingQuestion(bot, chatId, sessionId, directory) {
     const { data, error } = await opencodeClient.question.list({
@@ -64,11 +40,11 @@ async function restorePendingQuestion(bot, chatId, sessionId, directory) {
         return false;
     }
     const pendingQuestion = data.find((request) => request.sessionID === sessionId);
-    if (!pendingQuestion) {
+    if (!pendingQuestion || !attachPresentation) {
         return false;
     }
     questionManager.startQuestions(pendingQuestion.questions, pendingQuestion.id);
-    await showCurrentQuestion(bot.api, chatId);
+    await attachPresentation.showCurrentQuestion(bot.api, chatId);
     return true;
 }
 async function restorePendingPermissions(bot, chatId, sessionId, directory) {
@@ -85,15 +61,18 @@ async function restorePendingPermissions(bot, chatId, sessionId, directory) {
         return 0;
     }
     const pendingPermissions = data.filter((request) => request.sessionID === sessionId);
+    if (!attachPresentation) {
+        return 0;
+    }
     for (const request of pendingPermissions) {
-        await showPermissionRequest(bot.api, chatId, request);
+        await attachPresentation.showPermissionRequest(bot.api, chatId, request);
     }
     return pendingPermissions.length;
 }
 export async function attachToSession(deps) {
     const { bot, chatId, session, ensureEventSubscription, forceFullRestore = false } = deps;
     const alreadyAttached = attachManager.isAttachedSession(session.id, session.directory);
-    await ensureAttachPinnedSession({
+    await attachPresentation?.ensurePinnedSession({
         api: bot.api,
         chatId,
         session,

package/dist/{bot/utils/busy-reconciliation.js → app/services/busy-reconciliation-service.js}

@@ -1,19 +1,22 @@
 import { opencodeClient } from "../../opencode/client.js";
-import { foregroundSessionState, } from "../../scheduled-task/foreground-state.js";
-import { scheduledTaskRuntime } from "../../scheduled-task/runtime.js";
-import { attachManager } from "../../attach/manager.js";
-import { markAttachedSessionBusy, markAttachedSessionIdle } from "../../attach/service.js";
-import { assistantRunState } from "../assistant-run-state.js";
-import { clearPromptResponseMode } from "../handlers/prompt.js";
+import { foregroundSessionState, } from "../managers/foreground-session-state-manager.js";
+import { scheduledTaskRuntime } from "./scheduled-task-runtime-service.js";
+import { attachManager } from "../managers/attach-manager.js";
+import { markAttachedSessionBusy, markAttachedSessionIdle } from "./attach-service.js";
+import { assistantRunState } from "../managers/assistant-run-state-manager.js";
 import { logger } from "../../utils/logger.js";
 const RECONCILE_MIN_INTERVAL_MS = 10_000;
 const FOREGROUND_BUSY_RECONCILE_GRACE_MS = 2_000;
 const inFlightDirectories = new Set();
 const lastReconcileAtByDirectory = new Map();
 let responseStreamerInstance = null;
+let clearPromptResponseModeForReconciliation = null;
 export function setResponseStreamerForReconciliation(streamer) {
     responseStreamerInstance = streamer;
 }
+export function setPromptResponseModeClearerForReconciliation(clearer) {
+    clearPromptResponseModeForReconciliation = clearer;
+}
 function getReconciliationTargets(directory) {
     const foregroundBusySessions = foregroundSessionState
         .getBusySessions()
@@ -38,7 +41,7 @@ function isWithinForegroundBusyGracePeriod(session, now) {
 async function clearForegroundBusySession(sessionId, reason) {
     foregroundSessionState.markIdle(sessionId);
     assistantRunState.clearRun(sessionId, reason);
-    clearPromptResponseMode(sessionId);
+    clearPromptResponseModeForReconciliation?.(sessionId);
 }
 export async function reconcileBusyStateNow(directory, now = Date.now()) {
     if (!directory) {
@@ -118,4 +121,6 @@ export async function reconcileBusyState(directory, now = Date.now()) {
 export function __resetBusyReconciliationForTests() {
     inFlightDirectories.clear();
     lastReconcileAtByDirectory.clear();
+    responseStreamerInstance = null;
+    clearPromptResponseModeForReconciliation = null;
 }