@foxden-app/foxclaw 0.11.0 → 0.12.0

package/.env.example

@@ -1,4 +1,5 @@
-# Required: one or more Telegram bot tokens for Codex execution.
+# Configure at least one Codex, Antigravity, or DSH Telegram bot below.
+# For DSH-only execution, leave CODEX_BOT_TOKENS empty.
 # Comma-separated bot tokens. The 1st bot shares the default terminal CODEX_HOME (~/.codex).
 # Additional bots receive independent isolated homes (~/.foxclaw/codex/telegram/@TelegramUsername/home).
 CODEX_BOT_TOKENS=<codex_telegram_bot_token>
@@ -7,6 +8,22 @@ CODEX_BOT_TOKENS=<codex_telegram_bot_token>
 # Comma-separated bot tokens. The 1st bot shares the default Antigravity home (~/.gemini/antigravity-cli).
 # Additional bots receive independent isolated homes (~/.foxclaw/antigravity/telegram/@TelegramUsername/home).
 # ANTIGRAVITY_BOT_TOKENS=<antigravity_telegram_bot_token>
+
+# Optional DeepSeek Harness backend for existing Codex/Antigravity bots.
+# After enabling it, use /backend dsh in Telegram.
+# DSH_ENABLED=true
+# DSH_SOURCE_DIR=/absolute/path/to/deepseek-harness
+# Alternatively, use an installed CLI or its .js entry point:
+# DSH_CLI_BIN=/absolute/path/to/dsh
+# Optional independent DSH bot; also enables the backend automatically.
+# DSH_BOT_TOKEN=<different_telegram_bot_token>
+# DSH_HOME=/absolute/path/to/.dsh
+# DSH_PROFILE=acp
+# DSH_PATCHES=["/absolute/path/to/patch.yml"]
+# DSH_STARTUP_TIMEOUT_MS=60000
+# Provider credentials are managed by DSH. Environment-based keys can be set here.
+# DEEPSEEK_API_KEY=
+# See docs/dsh.md for setup, permissions, and plugin management.
 
 # Required: only this Telegram user can control the bridge
 TG_ALLOWED_USER_ID=<telegram_user_id>

package/CHANGELOG.md

@@ -2,6 +2,40 @@
 
 All notable FoxClaw changes are listed here. Each release note is bilingual so GitHub Releases and the npm package are useful to both Chinese and English readers.
 
+## 0.12.0 - 2026-10-05
+
+### 中文
+
+- 新增 **DeepSeek Harness (DSH) 后端**：通过 DSH 原生 ACP profile 接入，现有 Codex/Antigravity Bot 可使用 `/backend dsh` 切换，也支持 `DSH_BOT_TOKEN` 独立运行。
+- 新增 DSH 专用 Telegram 设置面板：原生模型与推理档位、只读/工作区写入/完全访问、工具审批、持久会话列表与恢复；隐藏 Codex 多账号、认证同步和 Fast tier 控件。
+- 支持 DSH 工具进度、最终回答、图片与 JSON 文件附件、排队、中断接管和新建会话。修复中断后的队列抢跑，以及服务重启时跨 Bot 恢复会话和队列的问题。
+- 新增 `/plugins` 配置查看入口及中英文接入文档；插件安装/移除沿用 DSH 终端命令。状态页明确标注 ACP 尚未提供的逐轮 token 统计，现有统一 Bot 的 `/update` 在 DSH 模式下继续可用。
+
+### English
+
+- Added a **DeepSeek Harness (DSH) backend** using the native ACP profile. Existing Codex/Antigravity bots can switch with `/backend dsh`; a dedicated bot can run with `DSH_BOT_TOKEN`.
+- Added DSH-specific Telegram settings for native models and reasoning levels, read-only/workspace-write/full-access presets, tool approvals, and persistent session listing/resume. Codex account, auth-sync, and Fast tier controls are omitted.
+- Added tool progress, final answers, image/JSON attachments, queueing, interruption, takeover, and new sessions. Fixed queue races after interruption and cross-bot session/queue recovery on service restart.
+- Added `/plugins` configuration inspection and bilingual setup documentation; package installation/removal stays in the DSH CLI. Status explicitly marks per-turn token counts as unavailable, and unified bots retain `/update` while using DSH.
+
+## 0.11.1 - 2026-09-30
+
+### 中文
+- **Antigravity 控制器自升级完成通知闭环**：
+  - 修复通过 Antigravity 机器人（瓦小安）触发 `/update` 后，服务自升级成功重启却未能轮询并投递升级完成卡片及更新日志的问题。
+  - 补齐 `UnifiedBridgeCore` 的自升级状态轮询（`pollSelfUpdateStatus`）与多 Bot 归属检测。
+- **只读观察器（Watcher）会话切换自动解绑**：
+  - 修复当前聊天会话切换至新任务后，后台旧任务 Watcher 持续抢占消息卡片导致跨任务串屏与日志污染的问题。
+  - `pollWatcher` 检测到当前绑定会话与被观察会话不一致时，自动静默卸载 Watcher。
+
+### English
+- **Antigravity Post-Update Notification Delivery**:
+  - Fixed an issue where running `/update` on Antigravity bots (e.g. `@WallianBot`) restarted the service upon successful update but never delivered the completion card and release notes.
+  - Implemented `pollSelfUpdateStatus` in `UnifiedBridgeCore` with scope ownership validation.
+- **Watcher Auto-Detachment on Thread Switch**:
+  - Fixed an issue where background watchers from other conversations continued hijacking Telegram previews after the chat scope switched to a different task.
+  - `pollWatcher` now silently detaches when the active thread binding no longer matches the observed conversation.
+
 ## 0.11.0 - 2026-09-30
 
 ### 中文

package/README.md

@@ -4,7 +4,7 @@
 
 **狸爪：一个更适配编程需求的移动端 Codex 控制器。**
 
-FoxClaw（狸爪）的目标很直接：让你用手机控制本机的 Codex、OpenCode 或 Antigravity (AGY)，把移动端变成一个真正能用的 web coding 入口。Telegram 或微信负责交互，`codex app-server` / `opencode serve` / `agy` 负责本地执行；你发任务、看进度、批审批、切线程，Agent 在电脑上继续写代码。
+FoxClaw（狸爪）的目标很直接：让你用手机控制本机的 Codex、OpenCode、Antigravity (AGY) 或 DeepSeek Harness (DSH)，把移动端变成一个真正能用的 web coding 入口。Telegram 或微信负责交互，各后端负责本地执行；你发任务、看进度、批审批、切线程，Agent 在电脑上继续写代码。DSH 通过 Telegram 接入，支持独立 Bot 或在现有 Bot 中切换。
 
 这适合你离开办公桌去吃饭、在旅途中、在跑步机上，或者陪小孩逛公园的时候继续工作。人可以离开电脑，Codex 不必停；它会把关键进展、错误、审批请求和最终结果同步回手机。
 
@@ -38,12 +38,13 @@ FoxClaw（狸爪）的目标很直接：让你用手机控制本机的 Codex、O
 - 对 Node、Telegram 机器人、Codex CLI 不太熟？看 [新手安装指南](./docs/zh/install-for-beginners.md)。
 - 已经装好，想系统了解 `/help`、`/setup`、`/threads`、`/watch`、`/auth` 和账号轮转？看 [用户手册](./docs/zh/user-manual.md)。
 - 想把同一组合法 ChatGPT auth 候选同步到多台机器？看 [跨节点 auth 同步配置指南](./docs/zh/cross-node-auth-sync.md)。
+- 想接入 DeepSeek Harness，切换模型、推理档位、权限或查看插件配置？看 [DSH 后端配置](./docs/zh/dsh.md)。
 - 想了解每个版本改了什么？看 [更新日志](./CHANGELOG.md)。
 - 维护者准备发版？看 [发布 runbook](./docs/zh/release.md)。
 - Git、Node、`.env` 都玩得转？直接往下看快速设置。
 - 卡住了？看 [故障排查](./docs/zh/troubleshooting.md)。
 
-最低要求：一个或多个 Telegram bot token、你的 Telegram 数字用户 ID、Node.js 24+、一份已登录的 `codex` CLI。首次安装大约 10–20 分钟。新安装请使用 `TG_BOT_TOKENS`；`TG_BOT_TOKEN` 兼容旧的单 runtime 配置，也可在多 bot 模式中标记一个“默认/终端共享”bot。
+最低要求：一个或多个 Telegram bot token、你的 Telegram 数字用户 ID、Node.js 24+，以及已配置的执行后端。Codex 使用 `CODEX_BOT_TOKENS`；DSH 独立运行使用 `DSH_BOT_TOKEN`，无需安装或登录 Codex。首次安装大约 10–20 分钟。
 
 **30 秒体验**：启动 FoxClaw 后，给你的 Telegram 机器人发一句 `List files in DEFAULT_CWD`。Codex 会在本地检查那个目录，然后把结果发回 Telegram。
 
@@ -79,7 +80,7 @@ foxclaw start
 跑 `doctor` 或 `start` 之前先把 `.env` 填好。私聊模式最小配置：
 
 ```dotenv
-TG_BOT_TOKENS=123456:telegram-token
+CODEX_BOT_TOKENS=123456:telegram-token
 TG_ALLOWED_USER_ID=123456789
 DEFAULT_CWD=/absolute/path/to/workspace
 DEFAULT_APPROVAL_POLICY=on-request

package/README_EN.md

@@ -4,7 +4,7 @@
 
 **A mobile Codex controller built for real programming workflows.**
 
-FoxClaw turns your phone into a practical web coding cockpit for local Codex, OpenCode, or Antigravity (AGY). Telegram or Weixin handles the chat interface, `codex app-server` / `opencode serve` / `agy` handles local execution, and you can send tasks, inspect progress, approve actions, switch sessions, and keep working without opening a laptop.
+FoxClaw turns your phone into a practical web coding cockpit for local Codex, OpenCode, Antigravity (AGY), or DeepSeek Harness (DSH). Telegram or Weixin handles the chat interface, each backend handles local execution, and you can send tasks, inspect progress, approve actions, switch sessions, and keep working without opening a laptop. DSH connects through Telegram, using a dedicated bot or backend switching in an existing bot.
 
 It is built for the moments when you leave your desk for lunch, commute, travel, use a treadmill, or take the kids to the park. You can step away from the keyboard while Codex keeps coding and sends progress, errors, approval requests, and final results back to your phone.
 
@@ -38,12 +38,13 @@ FoxClaw is more than message forwarding. It provides Telegram panels for Codex w
 - New to Node, Telegram bots, or Codex CLI? Use the [Beginner Install Guide](./docs/install-for-beginners.md).
 - Already installed and want the full command guide for `/help`, `/setup`, `/threads`, `/watch`, `/auth`, and auth rotation? Read the [User Manual](./docs/user-manual.md).
 - Want to sync the same legally owned ChatGPT auth candidate pool across multiple machines? Read the [Cross-Node Auth Sync Setup Guide](./docs/cross-node-auth-sync.md).
+- Want DeepSeek Harness with native models, reasoning, permissions, and plugin configuration? Read [DSH Backend Setup](./docs/dsh.md).
 - Want to see what changed in each release? Read the [Changelog](./CHANGELOG.md).
 - Maintaining a release? Use the [Release Runbook](./docs/release.md).
 - Already comfortable with Git, Node, and `.env` files? Use the quick setup below.
 - Something failed? Check [Troubleshooting](./docs/troubleshooting.md).
 
-The minimum install needs one or more Telegram bot tokens, your numeric Telegram user id, Node.js 24+, and a logged-in `codex` CLI. A first install usually takes 10–20 minutes. New installs should use `TG_BOT_TOKENS`; `TG_BOT_TOKEN` remains compatible with legacy single-runtime setups and can mark one multi-bot runtime as default/shared-terminal.
+The minimum install needs one or more Telegram bot tokens, your numeric Telegram user id, Node.js 24+, and a configured execution backend. Codex uses `CODEX_BOT_TOKENS`; standalone DSH uses `DSH_BOT_TOKEN` and does not require Codex installation or login. A first install usually takes 10–20 minutes.
 
 **30-second demo**: after FoxClaw is running, send `List files in DEFAULT_CWD` to your Telegram bot. FoxClaw asks local Codex to inspect that folder on your computer and sends the answer back to Telegram.
 
@@ -79,7 +80,7 @@ foxclaw start
 Fill `.env` before running `doctor` or `start`. Minimum private-chat config:
 
 ```dotenv
-TG_BOT_TOKENS=123456:telegram-token
+CODEX_BOT_TOKENS=123456:telegram-token
 TG_ALLOWED_USER_ID=123456789
 DEFAULT_CWD=/absolute/path/to/workspace
 DEFAULT_APPROVAL_POLICY=on-request

package/dist/antigravity/controller.d.ts

@@ -17,6 +17,7 @@ export interface UnifiedBridgeRuntimeStatus {
     running: boolean;
     connected: boolean;
     activeTurns: number;
+    dshPendingApprovals: number;
     botUsername: string | null;
     codexHome: string;
     codexAppServer?: CodexAppServerRuntimeStatus | undefined;
@@ -53,6 +54,7 @@ export declare class UnifiedBridgeCore {
     private readonly defaultBackendId;
     private readonly selfUpdater?;
     private readonly orchestrator;
+    private readonly dshUi?;
     private readonly watchers;
     private readonly pendingAgyRenames;
     private readonly stalePanelDeleteTimers;
@@ -65,6 +67,11 @@ export declare class UnifiedBridgeCore {
     startTelegramPolling(): Promise<void>;
     start(): Promise<void>;
     stop(): Promise<void>;
+    private selfUpdatePollTimer;
+    private scheduleSelfUpdateStatusPoll;
+    private clearSelfUpdateStatusPoll;
+    private ownsScope;
+    private pollSelfUpdateStatus;
     getRuntimeStatus(): UnifiedBridgeRuntimeStatus;
     isIdleForServiceUpdate(): boolean;
     getCurrentAuthLabel(): Promise<string | null>;

package/dist/antigravity/controller.js

@@ -15,8 +15,9 @@ import { CodexEngineAdapter } from '../codex_app/adapter.js';
 import { OpencodeEngineAdapter } from '../opencode/adapter.js';
 import { BridgeSessionCore } from '../controller/controller.js';
 import { BridgeMessagingRouter } from '../channels/bridge_messaging_router.js';
-import { BRIDGE_SCOPE_WEIXIN_PREFIX } from '../core/bridge_scope.js';
+import { BRIDGE_SCOPE_WEIXIN_PREFIX, BRIDGE_SCOPE_TELEGRAM_PREFIX, parseTelegramTargetFromBridgeScope } from '../core/bridge_scope.js';
 import { syncCodexLocalUsageToStore } from '../store/token_usage.js';
+import { DshUi } from '../dsh/ui.js';
 function formatCandidateButtonPrefix(c) {
     const p5h = typeof c.quota?.fiveHourPercent === 'number' ? `${c.quota.fiveHourPercent}%` : '—';
     const pw = typeof c.quota?.weeklyPercent === 'number' ? `${c.quota.weeklyPercent}%` : '—';
@@ -67,6 +68,7 @@ export class UnifiedBridgeCore {
     defaultBackendId;
     selfUpdater;
     orchestrator;
+    dshUi;
     watchers = new Map();
     pendingAgyRenames = new Map();
     stalePanelDeleteTimers = new Map();
@@ -158,7 +160,13 @@ export class UnifiedBridgeCore {
                 isDefault: isOpencodeDefault,
             });
         }
+        if (config.dsh) {
+            this.dshUi = new DshUi(config, store, logger, this.messaging);
+            initialBackends.push({ id: 'dsh', name: 'DeepSeek Harness (DSH)', engineType: 'dsh', adapter: this.dshUi.adapter });
+        }
         const allAdapters = [this.adapter];
+        if (this.dshUi)
+            allAdapters.push(this.dshUi.adapter);
         if (this.codexAdapter)
             allAdapters.push(this.codexAdapter);
         if (this.opencodeAdapter)
@@ -172,9 +180,27 @@ export class UnifiedBridgeCore {
             adapters: allAdapters,
             backends: initialBackends,
             defaultBackendId: this.defaultBackendId,
+            ownsScope: scopeId => {
+                if (!scopeId.startsWith(BRIDGE_SCOPE_TELEGRAM_PREFIX))
+                    return !config.tgMultiBotMode && !scopeId.startsWith(BRIDGE_SCOPE_WEIXIN_PREFIX);
+                const target = parseTelegramTargetFromBridgeScope(scopeId);
+                return target.botId ? target.botId === this.bot.identity : !config.tgMultiBotMode;
+            },
             backendProvider: () => this.getBackendDescriptors(),
             messaging: this.messaging,
             customUi: {
+                renderSetupMenu: async (scopeId, locale, messageId) => {
+                    if (this.orchestrator.getBackendDescriptorForScope(scopeId).engineType !== 'dsh' || !this.dshUi)
+                        return false;
+                    await this.dshUi.setup(scopeId, locale, this.orchestrator, messageId);
+                    return true;
+                },
+                renderModelsMenu: async (scopeId, locale, messageId) => {
+                    if (this.orchestrator.getBackendDescriptorForScope(scopeId).engineType !== 'dsh' || !this.dshUi)
+                        return false;
+                    await this.dshUi.models(scopeId, locale, this.orchestrator, messageId);
+                    return true;
+                },
                 renderCustomStatus: (scopeId, locale) => this.renderCustomStatus(scopeId, locale),
                 renderCustomSetupRows: (scopeId, locale) => this.renderCustomSetupRows(scopeId, locale),
                 handleCustomCallback: (scopeId, data, locale, messageId, event) => this.handleCustomCallback(scopeId, data, locale, messageId, event),
@@ -185,6 +211,8 @@ export class UnifiedBridgeCore {
     }
     async getBackendDescriptors() {
         const list = [];
+        if (this.dshUi)
+            list.push({ id: 'dsh', name: 'DeepSeek Harness (DSH)', engineType: 'dsh', adapter: this.dshUi.adapter });
         const isCodexDefault = this.defaultBackendId === 'codex';
         const active = await this.auth.getActiveAccount();
         const activeQuota = active?.quota
@@ -291,9 +319,14 @@ export class UnifiedBridgeCore {
         catch (err) {
             this.logger.warn('antigravity.restore_watchers_error', { error: String(err) });
         }
+        if (this.selfUpdater) {
+            this.scheduleSelfUpdateStatusPoll(500);
+        }
     }
     async stop() {
+        this.clearSelfUpdateStatusPoll();
         await this.orchestrator.stop();
+        await this.dshUi?.stop();
         this.auth.stopKeepAlive();
         for (const [scopeId, watcher] of this.watchers.entries()) {
             watcher.stopped = true;
@@ -302,6 +335,73 @@ export class UnifiedBridgeCore {
             this.watchers.delete(scopeId);
         }
     }
+    selfUpdatePollTimer = null;
+    scheduleSelfUpdateStatusPoll(delay = 1000) {
+        if (!this.selfUpdater || this.selfUpdatePollTimer) {
+            return;
+        }
+        this.selfUpdatePollTimer = setTimeout(() => {
+            this.selfUpdatePollTimer = null;
+            void this.pollSelfUpdateStatus().catch((error) => {
+                this.logger.error('antigravity.self_update_poll_failed', { error: String(error) });
+                this.scheduleSelfUpdateStatusPoll();
+            });
+        }, delay);
+        this.selfUpdatePollTimer.unref?.();
+    }
+    clearSelfUpdateStatusPoll() {
+        if (!this.selfUpdatePollTimer)
+            return;
+        clearTimeout(this.selfUpdatePollTimer);
+        this.selfUpdatePollTimer = null;
+    }
+    ownsScope(scopeId) {
+        if (this.bot.identity) {
+            return scopeId.includes(`:${this.bot.identity}:`);
+        }
+        return !scopeId.includes(':bot');
+    }
+    async pollSelfUpdateStatus() {
+        const status = await this.selfUpdater?.readStatus();
+        if (!status)
+            return;
+        if (status.state === 'pending') {
+            this.scheduleSelfUpdateStatusPoll();
+            return;
+        }
+        if (status.scopeId.startsWith('cluster:')) {
+            await this.selfUpdater?.clearStatus();
+            return;
+        }
+        if (!this.ownsScope(status.scopeId)) {
+            this.scheduleSelfUpdateStatusPoll();
+            return;
+        }
+        const isZh = status.locale === 'zh';
+        if (status.state === 'succeeded') {
+            const notes = status.releaseNotes?.filter((n) => n.trim()) ?? [];
+            const title = isZh ? '🎉 FoxClaw 全链路升级完成' : '🎉 FoxClaw Update Completed';
+            const lines = [
+                `**${title}**`,
+                `• FoxClaw: \`${status.fromVersion}\` ➔ \`${status.toVersion ?? '0.11.0'}\``,
+                `• Codex CLI: \`${status.codexFromVersion ?? '0.157.1'}\` ➔ \`${status.codexToVersion ?? '0.159.2'}\``,
+                `• Antigravity CLI: \`${status.agyFromVersion ?? '1.2.14'}\` (最新)`,
+            ];
+            if (notes.length > 0) {
+                lines.push('', isZh ? '**更新日志**:' : '**Release Notes**:');
+                for (const note of notes) {
+                    lines.push(`• ${note}`);
+                }
+            }
+            lines.push('', isZh ? '服务已自动重载并恢复就绪。' : 'Service reloaded and ready.');
+            await this.sendMessage(status.scopeId, lines.join('\n')).catch(() => { });
+        }
+        else {
+            const errorMsg = status.error ?? (isZh ? '未知错误' : 'Unknown error');
+            await this.sendMessage(status.scopeId, `❌ **FoxClaw 升级失败**: ${errorMsg}`).catch(() => { });
+        }
+        await this.selfUpdater?.clearStatus();
+    }
     getRuntimeStatus() {
         const isConnected = this.codexApp && typeof this.codexApp.isConnected === 'function'
             ? this.codexApp.isConnected()
@@ -310,6 +410,7 @@ export class UnifiedBridgeCore {
             running: true,
             connected: isConnected,
             activeTurns: this.orchestrator.getActiveTurnsCount(),
+            dshPendingApprovals: this.dshUi?.pendingApprovals ?? 0,
             botUsername: this.bot.username,
             codexHome: this.config.codexHome ?? this.config.codexAuthDir ?? path.join(os.homedir(), '.codex'),
             ...(this.codexApp && typeof this.codexApp.getServerStatus === 'function' && this.codexApp.getServerStatus()
@@ -389,6 +490,8 @@ export class UnifiedBridgeCore {
     }
     async renderCustomStatus(scopeId, locale) {
         const activeBackend = this.orchestrator.getBackendDescriptorForScope(scopeId);
+        if (activeBackend.engineType === 'dsh' && this.dshUi)
+            return this.dshUi.status(scopeId, locale);
         if (activeBackend.engineType === 'codex') {
             const codexHome = this.config.codexAuthDir ?? this.config.codexHome ?? path.join(os.homedir(), '.codex');
             let currentCodexAccount = 'default';
@@ -496,6 +599,8 @@ export class UnifiedBridgeCore {
     }
     async handleCustomInbound(event, locale) {
         const scopeId = event.scopeId;
+        if (this.orchestrator.getBackendDescriptorForScope(scopeId).engineType === 'dsh')
+            return false;
         // Check for JSON token upload / document attachment
         const doc = event.attachments?.find((a) => a.kind === 'document');
         if (doc && (doc.fileName?.endsWith('.json') || doc.mimeType?.includes('json'))) {
@@ -654,6 +759,8 @@ export class UnifiedBridgeCore {
                 : '⚠️ Self-updater is not available in current runtime. Run `foxclaw update` in terminal.');
             return true;
         }
+        if (activeBackend.engineType === 'dsh' && this.dshUi)
+            return this.dshUi.command(scopeId, cmd, args, locale, this.orchestrator);
         if (isCodex) {
             if (this.codexCore) {
                 switch (cmd.toLowerCase()) {
@@ -765,6 +872,16 @@ export class UnifiedBridgeCore {
         }
     }
     async handleCustomCallback(scopeId, data, locale, messageId, event) {
+        if (this.dshUi && await this.dshUi.callback(scopeId, data, locale, this.orchestrator, event))
+            return true;
+        if (this.orchestrator.getBackendDescriptorForScope(scopeId).engineType === 'dsh') {
+            if (!['engine:setup:main', 'engine:setup:active_mode', 'engine:setup:new', 'engine:setup:backend'].includes(data) && !data.startsWith('engine:backend:')) {
+                if (event)
+                    await this.messaging.answerCallback(event.callbackQueryId, locale === 'zh' ? '请重新打开 DSH 设置面板' : 'Open the DSH setup panel');
+                return true;
+            }
+            return false;
+        }
         if (this.codexCore && (data.startsWith('thread:') ||
             data.startsWith('auth:') ||
             data.startsWith('settings:access:') ||
@@ -1529,6 +1646,11 @@ export class UnifiedBridgeCore {
     async pollWatcher(watcher) {
         if (watcher.stopped)
             return;
+        const currentBinding = this.store.getBinding(watcher.scopeId);
+        if (currentBinding?.threadId && currentBinding.threadId !== watcher.conversationId) {
+            await this.unwatchConversation(watcher.scopeId, this.getScopeLocale(watcher.scopeId), false);
+            return;
+        }
         if (this.orchestrator.hasActiveTurn(watcher.scopeId)) {
             try {
                 if (fs.existsSync(watcher.transcriptPath)) {

package/dist/config.d.ts

@@ -1,5 +1,6 @@
 import type { LogLevel } from './logger.js';
 import type { ApprovalPolicyValue, SandboxModeValue } from './types.js';
+import type { DshClientOptions } from './dsh/client.js';
 export declare const APP_HOME: string;
 export declare const DEFAULT_STORE_PATH: string;
 export declare const DEFAULT_STATUS_PATH: string;
@@ -19,6 +20,8 @@ export declare function resolveEnvPath(): string;
 export declare function getLoadedEnvPath(): string | null;
 export declare function loadEnv(): void;
 export interface AppConfig {
+    dsh?: DshClientOptions;
+    dshBotToken?: string | null;
     codexBotTokens: string[];
     antigravityBotTokens: string[];
     tgBotToken: string;
@@ -112,6 +115,7 @@ export interface CodexApiProviderConfig {
 export declare function loadConfig(): AppConfig;
 export declare function buildCodexApiProviderOverrides(providers: readonly CodexApiProviderConfig[], defaultProviderId?: string | null): string[];
 export declare function validateCodexBotTokens(tokens: readonly string[]): void;
+export declare function parseDshPatches(value?: string): string[];
 export declare function validateOpencodeBotToken(token: string | null, codexTokens: readonly string[]): void;
 export declare function validateAntigravityBotTokens(tokens: readonly string[], codexTokens: readonly string[], opencodeToken: string | null): void;
 export declare function validateAntigravityBotToken(token: string | null, codexTokens: readonly string[], opencodeToken: string | null): void;

package/dist/config.js

@@ -50,8 +50,12 @@ export function loadConfig() {
     const codexBotTokens = parseCommaSeparatedIds(process.env.CODEX_BOT_TOKENS || process.env.CODEX_BOT_TOKEN);
     const antigravityBotTokens = parseCommaSeparatedIds(process.env.ANTIGRAVITY_BOT_TOKENS || process.env.ANTIGRAVITY_BOT_TOKEN);
     const opencodeBotToken = optional('OPENCODE_BOT_TOKEN');
-    if (codexBotTokens.length === 0 && antigravityBotTokens.length === 0) {
-        throw new Error('At least one Telegram bot token must be configured via CODEX_BOT_TOKENS or ANTIGRAVITY_BOT_TOKENS');
+    const dshBotToken = optional('DSH_BOT_TOKEN');
+    if (dshBotToken && [...codexBotTokens, ...antigravityBotTokens, opencodeBotToken].includes(dshBotToken)) {
+        throw new Error('DSH_BOT_TOKEN must use a different bot from Codex, Antigravity, and OpenCode');
+    }
+    if (codexBotTokens.length === 0 && antigravityBotTokens.length === 0 && !dshBotToken) {
+        throw new Error('At least one Telegram bot token must be configured via CODEX_BOT_TOKENS, ANTIGRAVITY_BOT_TOKENS, or DSH_BOT_TOKEN');
     }
     validateCodexBotTokens(codexBotTokens);
     validateAntigravityBotTokens(antigravityBotTokens, codexBotTokens, opencodeBotToken);
@@ -60,11 +64,23 @@ export function loadConfig() {
     const antigravityDefaultRuntimeBotToken = selectDefaultRuntimeBotToken(antigravityBotTokens, optional('ANTIGRAVITY_DEFAULT_RUNTIME_BOT_TOKEN')) ||
         antigravityBotTokens[0] ||
         null;
-    const totalBots = codexBotTokens.length + antigravityBotTokens.length;
-    const tgBotTokens = codexBotTokens.length > 0 ? codexBotTokens : antigravityBotTokens;
-    const tgBotToken = (codexBotTokens[0] || antigravityBotTokens[0]);
+    const totalBots = codexBotTokens.length + antigravityBotTokens.length + (dshBotToken ? 1 : 0);
+    const tgBotTokens = codexBotTokens.length > 0 ? codexBotTokens : antigravityBotTokens.length > 0 ? antigravityBotTokens : dshBotToken ? [dshBotToken] : [];
+    const tgBotToken = (codexBotTokens[0] || antigravityBotTokens[0] || dshBotToken);
     const antigravityBotToken = antigravityBotTokens[0] || null;
     const config = {
+        dshBotToken,
+        ...(boolEnv('DSH_ENABLED', Boolean(dshBotToken || optional('DSH_SOURCE_DIR') || optional('DSH_CLI_BIN'))) ? {
+            dsh: {
+                cliBin: optional('DSH_CLI_BIN') || resolveCommand('dsh') || 'dsh',
+                sourceDir: optional('DSH_SOURCE_DIR'),
+                home: optional('DSH_HOME'),
+                profile: optional('DSH_PROFILE') || 'acp',
+                patches: parseDshPatches(process.env.DSH_PATCHES),
+                runtimeDir: path.join(APP_HOME, 'runtime', 'dsh'),
+                startupTimeoutMs: Number(optional('DSH_STARTUP_TIMEOUT_MS') || 60000),
+            },
+        } : {}),
         codexBotTokens,
         antigravityBotTokens,
         tgBotToken,
@@ -142,6 +158,12 @@ export function loadConfig() {
         voiceTextLimit: intEnv('VOICE_TEXT_LIMIT', 2800),
         voiceTtsTimeoutMs: intEnv('VOICE_TTS_TIMEOUT_MS', 300_000),
     };
+    if (dshBotToken && !config.dsh)
+        throw new Error('DSH_BOT_TOKEN requires DSH_ENABLED=true');
+    if (config.dsh && (!Number.isSafeInteger(config.dsh.startupTimeoutMs) || config.dsh.startupTimeoutMs <= 0))
+        throw new Error('DSH_STARTUP_TIMEOUT_MS must be a positive integer');
+    if (config.wxEnabled && codexBotTokens.length === 0 && antigravityBotTokens.length === 0)
+        throw new Error('WX_ENABLED currently requires a Codex or Antigravity runtime alongside DSH');
     ensureAppDirs(config);
     return config;
 }
@@ -176,6 +198,20 @@ export function validateCodexBotTokens(tokens) {
         seen.add(token);
     }
 }
+export function parseDshPatches(value) {
+    if (!value?.trim())
+        return [];
+    let parsed;
+    try {
+        parsed = JSON.parse(value);
+    }
+    catch {
+        throw new Error('DSH_PATCHES must be a JSON array of patch paths');
+    }
+    if (!Array.isArray(parsed) || !parsed.every(item => typeof item === 'string' && item.trim().length > 0))
+        throw new Error('DSH_PATCHES must be a JSON array of patch paths');
+    return parsed.map(item => path.resolve(item));
+}
 export function validateOpencodeBotToken(token, codexTokens) {
     if (!token)
         return;

package/dist/core/engine_spi.d.ts

@@ -60,7 +60,7 @@ export interface EngineTurnErrorContext {
 export interface IEngineAdapter {
     readonly id: string;
     readonly name: string;
-    listModels(): Promise<EngineModel[]>;
+    listModels(scopeId?: string): Promise<EngineModel[]>;
     executeTurn(request: EngineTurnRequest): EngineTurnExecution;
     preflightTurn?(request: EngineTurnRequest): Promise<void>;
     handleTurnError?(context: EngineTurnErrorContext): Promise<boolean>;

package/dist/core/orchestrator.d.ts

@@ -21,9 +21,12 @@ export interface UnifiedActiveTurn {
     stepIndex?: number;
     toolCount: number;
     currentTool?: string | null;
+    suppressQueueDrain?: boolean;
     startTime: number;
 }
 export interface EngineCustomUiHook {
+    renderSetupMenu?(scopeId: string, locale: AppLocale, messageId?: number): Promise<boolean>;
+    renderModelsMenu?(scopeId: string, locale: AppLocale, messageId?: number): Promise<boolean>;
     renderCustomStatus?(scopeId: string, locale: AppLocale): Promise<string | null>;
     renderCustomSetupRows?(scopeId: string, locale: AppLocale): Promise<InlineKeyboard>;
     handleCustomCallback?(scopeId: string, data: string, locale: AppLocale, messageId?: number, event?: TelegramCallbackEvent): Promise<boolean>;
@@ -42,6 +45,8 @@ export declare class UnifiedChannelOrchestrator {
     private readonly defaultBackendId;
     private readonly activeTurns;
     private readonly stalePanelDeleteTimers;
+    private readonly recoveryTimers;
+    private readonly ownsScope;
     private readonly backendProvider?;
     get adapter(): IEngineAdapter;
     constructor(options: {
@@ -54,6 +59,7 @@ export declare class UnifiedChannelOrchestrator {
         backends?: BackendDescriptor[];
         backendProvider?: (() => Promise<BackendDescriptor[]> | BackendDescriptor[]) | undefined;
         defaultBackendId?: string;
+        ownsScope?: (scopeId: string) => boolean;
         messaging: TelegramMessagingPort;
         customUi?: EngineCustomUiHook | undefined;
     });