@rezti/dsh-rez-wechat 0.1.8 → 0.1.12

package/README.md

@@ -1,19 +1,28 @@
 # @rezti/dsh-rez-wechat
 
-由 `@rezti/dsh-rez-suite` 一次装入。不要单独 `dsh plugin add`。
+企业微信走现成 `wecom-mcp`；个人微信走 QClaw 同款 `dsh-wechat-bridge`（腾讯 iLink）。都不自写长连接。
+
+```bash
+dsh plugin --profile web add @rezti/dsh-rez-suite
+```
+
+以后升级只记：`dsh plugin --profile web update @rezti/dsh-rez-suite`。不要再单独 add 本包。
 
 | 能力 | 做法 |
 |---|---|
-| 个人微信（QClaw / ClawBot） | 打开 dsh Web → Rez 面板 → **微信** → 扫码。之后直接在微信里说话。消息进左侧 **微信** 文件夹的同一会话，模型跟网页默认。 |
 | 企业微信发到群 | `wecom-mcp`（`mcp__wechat__*`）+ `REZ_WECHAT_WEBHOOK` |
+| 个人微信（QClaw / ClawBot） | dsh Web 设置面板扫码，之后直接在微信里说话。消息进左侧 **微信** 文件夹的同一会话，模型跟网页默认。 |
 
-个人微信复用现成 `dsh-wechat-bridge`（腾讯官方 iLink），不自写 WebSocket，也不用员工再跑 `npx weixin-mcp login`。桥接到正在跑的 `dsh web`（不是 `dsh --profile headless`），所以：
+个人微信桥接到正在跑的 `dsh web`（不是 `dsh --profile headless`）：
 
 - 左侧工作区分组是 **微信**，不是 Ungrouped
-- 连续消息延续同一会话，不会一条一个窗口
-- 模型跟网页默认（在网页里用 Kimi Code，微信也会用）
-- 能用 web profile 里已经挂上的 Odoo 等 MCP
+- 连续消息延续同一会话
+- 模型跟网页默认（网页选了 Kimi，微信也走 Kimi）
+- 网页归档后再从微信说话会自动回到侧栏（官方会藏空白会话，所以「重启对话」会先打一句招呼）
+- 网页端选择题（Selection）会编成 `1. 2. 3.` 发到微信；回复数字或选项原文即可继续，不必在网页点选
+- 思考过程不会发到微信；多段正文会保留换行
+- 通道断了点「重新连接」，已登录不必再扫码
 
-网页端必须开着。微信里 `/new <名字>` 会新开一条网页会话。
+扫码 UI 在 suite 面板；通道本身在本包。不要对同一 profile 既 add suite 又 add wechat，会重复注册。
 
-这是 ClawBot 客服会话，不是用个人微信号管好友/群。
+这是 ClawBot 客服会话，不是用个人微信号管好友/群，也不是客户层 WhatsApp/邮件通道。

package/cordis.patch.yml

@@ -0,0 +1,5 @@
+# WeCom MCP is started by this plugin after rezSso resolves REZ_WECHAT_WEBHOOK.
+# Personal WeChat (QClaw/ClawBot) is always owned here (dsh-wechat-bridge).
+- insert:
+    - id: rez-wechat
+      name: '@rezti/dsh-rez-wechat'

package/lib/channel.d.ts

@@ -11,6 +11,7 @@ export interface WeixinStatus {
     qrDataUrl?: string;
     hint: string;
 }
+export declare function weixinLoginKind(authExists: boolean): 'reconnect' | 'qr';
 export declare function weixinRunEnv(env?: NodeJS.ProcessEnv): NodeJS.ProcessEnv;
 export declare class WeixinChannel {
     private loginChild;
@@ -20,6 +21,9 @@ export declare class WeixinChannel {
     private qrDataUrl;
     private hint;
     private logBuf;
+    private runStopped;
+    private runExits;
+    private runTimer;
     status(): WeixinStatus;
     startIfLoggedIn(): void;
     startLogin(): Promise<WeixinStatus>;

package/lib/channel.js

@@ -11,6 +11,9 @@ import { weixinBridgeEnv, writeWeixinDshLauncher } from './web-shim.js';
 const DATA_DIR = join(homedir(), '.dsh', 'dsh-rez-weixin');
 const AUTH_FILE = join(DATA_DIR, 'weixin-auth.json');
 const SHIM_SCRIPT = join(dirname(fileURLToPath(import.meta.url)), 'web-shim-cli.js');
+export function weixinLoginKind(authExists) {
+    return authExists ? 'reconnect' : 'qr';
+}
 export function weixinRunEnv(env = process.env) {
     const launcher = writeWeixinDshLauncher({
         dataDir: DATA_DIR,
@@ -49,6 +52,9 @@ export class WeixinChannel {
     qrDataUrl;
     hint = '打开 Rez 面板的「微信」页扫码，然后直接在微信里说话。';
     logBuf = '';
+    runStopped = true;
+    runExits = 0;
+    runTimer;
     status() {
         const loggedIn = existsSync(AUTH_FILE);
         const status = {
@@ -69,10 +75,16 @@ export class WeixinChannel {
     }
     async startLogin() {
         this.stopLogin();
-        this.phase = 'login';
+        this.stopRun();
         this.qrContent = undefined;
         this.qrDataUrl = undefined;
         this.logBuf = '';
+        if (weixinLoginKind(existsSync(AUTH_FILE)) === 'reconnect') {
+            this.hint = '已重新拉起微信监听。若手机上仍发不出去，先点退出再扫码。';
+            this.startRun();
+            return this.status();
+        }
+        this.phase = 'login';
         this.hint = '正在向微信申请二维码…';
         const child = spawn('npx', ['-y', 'dsh-wechat-bridge', 'login', '--data-dir', DATA_DIR], {
             env: process.env,
@@ -147,6 +159,11 @@ export class WeixinChannel {
         this.stopRun();
     }
     startRun() {
+        this.runStopped = false;
+        if (this.runTimer !== undefined) {
+            clearTimeout(this.runTimer);
+            this.runTimer = undefined;
+        }
         if (this.runChild !== undefined && this.runChild.exitCode === null)
             return;
         this.phase = 'listening';
@@ -156,13 +173,32 @@ export class WeixinChannel {
             stdio: ['ignore', 'pipe', 'pipe'],
         });
         this.runChild = child;
+        const startedAt = Date.now();
         child.on('exit', code => {
             if (this.runChild === child)
                 this.runChild = undefined;
-            if (this.phase === 'listening') {
-                this.phase = existsSync(AUTH_FILE) ? 'idle' : 'error';
-                this.hint = code === 0 ? '微信监听已停。' : '微信监听退出，可再点扫码或等自动重连。';
+            if (this.runStopped)
+                return;
+            if (Date.now() - startedAt > 30_000)
+                this.runExits = 0;
+            this.runExits += 1;
+            if (!existsSync(AUTH_FILE)) {
+                this.phase = 'error';
+                this.hint = '微信登录已失效。请重新扫码。';
+                return;
+            }
+            if (this.runExits >= 5) {
+                this.phase = 'error';
+                this.hint = '微信监听反复断开。请点退出，再扫码登录。';
+                return;
             }
+            this.phase = 'idle';
+            this.hint = `微信监听断了（退出码 ${code ?? 'null'}），正在重连…`;
+            this.runTimer = setTimeout(() => {
+                this.runTimer = undefined;
+                if (!this.runStopped)
+                    this.startRun();
+            }, 2000);
         });
     }
     stopLogin() {
@@ -172,6 +208,12 @@ export class WeixinChannel {
         this.loginChild = undefined;
     }
     stopRun() {
+        this.runStopped = true;
+        this.runExits = 0;
+        if (this.runTimer !== undefined) {
+            clearTimeout(this.runTimer);
+            this.runTimer = undefined;
+        }
         if (this.runChild === undefined)
             return;
         this.runChild.kill('SIGTERM');

package/lib/index.js

@@ -1,10 +1,11 @@
 import { startMcpWhenSecret } from '@rezti/dsh-rez-sso';
 import { WeixinChannel } from './channel.js';
+import { revealSessionInRegistry } from './unarchive.js';
 export const name = 'rez-wechat';
 export const inject = ['systemPrompt', 'webServer', 'rezSso'];
 const GUIDANCE = [
     '企业微信群发送走官方 dsh-mcp-client + wecom-mcp（mcp__wechat__*），密钥 REZ_WECHAT_WEBHOOK。未配置时不拉起 wecom-mcp。Webhook 在 设置 → 插件 → ReZ-TI 里填。',
-    '个人微信是 QClaw 同款 ClawBot 通道：在 Rez 面板「微信」页扫码一次，然后直接在微信里说话。消息进入网页左侧「微信」文件夹并延续同一会话，模型跟网页默认（在网页里选了 Kimi 就会走 Kimi）。不要再跑 npx weixin-mcp login，也不要调用 mcp__weixin__*。网页端必须开着。',
+    '个人微信是 QClaw 同款 ClawBot 通道：在 Rez 面板「微信」页扫码一次，然后直接在微信里说话。消息进入网页左侧「微信」文件夹并延续同一会话，模型跟网页默认（在网页里选了 Kimi 就会走 Kimi）。网页端归档了也能从微信自动恢复到侧栏（空白会话网页会藏起来，所以新开的会话会先打一句招呼再出现）。网页端出现选择题时会编成纯文本发到微信，回复数字或选项原文即可；思考过程不会转发。发「重启对话」会新开一条可见的网页会话并把旧的归档。通道断了点「重新连接」（已登录不必再扫码）。不要再跑 npx weixin-mcp login，也不要调用 mcp__weixin__*。网页端必须开着。',
     '这是 ClawBot 客服会话，不是用个人微信号管好友/群。对外发消息必须先征得用户批准。',
 ].join('');
 function isLoopbackRequest(request) {
@@ -43,7 +44,7 @@ async function readJsonBody(req) {
         return undefined;
     }
 }
-function weixinRoutes(channel) {
+function weixinRoutes(channel, ctx) {
     const path = '/api/dsh-rez-suite/weixin';
     const guard = (req, res, method) => {
         if (!isLoopbackRequest(req)) {
@@ -93,8 +94,38 @@ function weixinRoutes(channel) {
                 writeJson(res, 200, channel.sendVerify(code));
             },
         },
+        {
+            kind: 'exact',
+            path: path + '/unarchive',
+            handler: async (req, res) => {
+                if (!guard(req, res, 'POST'))
+                    return;
+                const body = await readJsonBody(req);
+                const sessionId = typeof body?.sessionId === 'string' ? body.sessionId.trim() : '';
+                if (sessionId.length === 0) {
+                    writeJson(res, 400, { error: 'missing sessionId' });
+                    return;
+                }
+                const workspacePath = typeof body?.workspacePath === 'string' ? body.workspacePath.trim() : '';
+                try {
+                    writeJson(res, 200, await revealSessionInRegistry(getWorkspaceRegistry(ctx), sessionId, workspacePath.length > 0 ? workspacePath : undefined));
+                }
+                catch (error) {
+                    const message = error instanceof Error ? error.message : String(error);
+                    writeJson(res, 501, { error: message });
+                }
+            },
+        },
     ];
 }
+function getWorkspaceRegistry(ctx) {
+    try {
+        return ctx.get('workspaceRegistry');
+    }
+    catch {
+        return undefined;
+    }
+}
 export async function apply(ctx) {
     const channel = new WeixinChannel();
     channel.startIfLoggedIn();
@@ -103,7 +134,7 @@ export async function apply(ctx) {
         order: 162,
         text: GUIDANCE,
     }), 'dsh-rez-wechat: prompt');
-    const routes = weixinRoutes(channel);
+    const routes = weixinRoutes(channel, ctx);
     ctx.effect(() => {
         const disposers = routes.map(route => ctx.webServer.register(route));
         return () => { for (const dispose of disposers)

package/lib/unarchive.d.ts

@@ -0,0 +1,43 @@
+/**
+ * dsh 0.1.0-rc.6 archives one-way over RPC. Stock Harness still exposes
+ * workspaceRegistry.requireState / setState (same primitives archiveSession
+ * uses). Weixin follow-ups call this so an archived web session reappears
+ * in the sidebar instead of staying hidden while WeChat keeps talking to it.
+ *
+ * Disk form is often `global.archivedSessionIds` in workspace.json; the live
+ * registry state may be that nested object or a flat `{ archivedSessionIds }`.
+ * After dropping the id, attachSession puts Ungrouped sessions into 微信 —
+ * session.create({ cwd }) never joins a workspace on its own after bootstrap.
+ */
+export interface WorkspaceLike {
+    id?: string;
+    path?: string;
+    title?: string;
+    attachSession?: (sessionId: string) => Promise<void>;
+}
+export interface WorkspaceRegistryLike {
+    requireState?: () => Record<string, unknown>;
+    setState?: (state: Record<string, unknown>) => Promise<void>;
+    archiveSession?: (sessionId: string) => Promise<void>;
+    unarchiveSession?: (sessionId: string) => Promise<void>;
+    list?: () => WorkspaceLike[];
+    get?: (id: string) => WorkspaceLike | undefined;
+    resolveByPath?: (path: string) => Promise<WorkspaceLike | undefined>;
+}
+/** Read archive ids from either the live registry shape or the on-disk global bag. */
+export declare function archivedSessionIds(state: unknown): string[];
+export declare function unarchiveSessionInRegistry(registry: WorkspaceRegistryLike | undefined, sessionId: string): Promise<{
+    sessionId: string;
+    archived: boolean;
+    changed: boolean;
+}>;
+/**
+ * Drop the archive bit, then attach so the GUI's 微信 folder actually lists it.
+ * attachSession is host-only (no workspace.attachSession RPC on stock dsh).
+ */
+export declare function revealSessionInRegistry(registry: WorkspaceRegistryLike | undefined, sessionId: string, workspacePath?: string): Promise<{
+    sessionId: string;
+    archived: boolean;
+    changed: boolean;
+    attached: boolean;
+}>;

package/lib/unarchive.js

@@ -0,0 +1,115 @@
+/**
+ * dsh 0.1.0-rc.6 archives one-way over RPC. Stock Harness still exposes
+ * workspaceRegistry.requireState / setState (same primitives archiveSession
+ * uses). Weixin follow-ups call this so an archived web session reappears
+ * in the sidebar instead of staying hidden while WeChat keeps talking to it.
+ *
+ * Disk form is often `global.archivedSessionIds` in workspace.json; the live
+ * registry state may be that nested object or a flat `{ archivedSessionIds }`.
+ * After dropping the id, attachSession puts Ungrouped sessions into 微信 —
+ * session.create({ cwd }) never joins a workspace on its own after bootstrap.
+ */
+function asRecord(value) {
+    return typeof value === 'object' && value !== null ? value : undefined;
+}
+function stringIds(value) {
+    if (!Array.isArray(value))
+        return [];
+    return value.filter((id) => typeof id === 'string');
+}
+/** Read archive ids from either the live registry shape or the on-disk global bag. */
+export function archivedSessionIds(state) {
+    const rec = asRecord(state);
+    if (rec === undefined)
+        return [];
+    const top = stringIds(rec.archivedSessionIds);
+    if (top.length > 0)
+        return top;
+    return stringIds(asRecord(rec.global)?.archivedSessionIds);
+}
+function dropArchivedId(state, sessionId) {
+    const next = { ...state };
+    if (Array.isArray(state.archivedSessionIds)) {
+        next.archivedSessionIds = stringIds(state.archivedSessionIds).filter(id => id !== sessionId);
+    }
+    const global = asRecord(state.global);
+    if (global !== undefined && Array.isArray(global.archivedSessionIds)) {
+        next.global = {
+            ...global,
+            archivedSessionIds: stringIds(global.archivedSessionIds).filter(id => id !== sessionId),
+        };
+    }
+    return next;
+}
+export async function unarchiveSessionInRegistry(registry, sessionId) {
+    if (registry !== undefined && typeof registry.unarchiveSession === 'function') {
+        await registry.unarchiveSession(sessionId);
+        return { sessionId, archived: false, changed: true };
+    }
+    if (registry === undefined || typeof registry.requireState !== 'function' || typeof registry.setState !== 'function') {
+        throw new Error('当前 Harness 不支持取消归档（缺少 workspaceRegistry 状态原语）');
+    }
+    const state = registry.requireState();
+    const ids = archivedSessionIds(state);
+    if (!ids.includes(sessionId))
+        return { sessionId, archived: false, changed: false };
+    await registry.setState(dropArchivedId(state, sessionId));
+    return { sessionId, archived: false, changed: true };
+}
+function pathLooksLike(candidate, wanted) {
+    if (candidate === undefined || candidate.length === 0)
+        return false;
+    const a = candidate.replace(/\\/g, '/').replace(/\/+$/, '');
+    const b = wanted.replace(/\\/g, '/').replace(/\/+$/, '');
+    return a === b || a.endsWith('/' + b.split('/').pop());
+}
+async function attachToWorkspace(workspace, sessionId) {
+    if (workspace === undefined || typeof workspace.attachSession !== 'function')
+        return false;
+    try {
+        await workspace.attachSession(sessionId);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Drop the archive bit, then attach so the GUI's 微信 folder actually lists it.
+ * attachSession is host-only (no workspace.attachSession RPC on stock dsh).
+ */
+export async function revealSessionInRegistry(registry, sessionId, workspacePath) {
+    let unarchived = { sessionId, archived: true, changed: false };
+    try {
+        unarchived = await unarchiveSessionInRegistry(registry, sessionId);
+    }
+    catch {
+        // Stock registry may lack requireState; attachSession still puts the row in 微信.
+    }
+    let attached = false;
+    if (registry !== undefined && workspacePath !== undefined && workspacePath.length > 0 && typeof registry.resolveByPath === 'function') {
+        try {
+            attached = await attachToWorkspace(await registry.resolveByPath(workspacePath), sessionId);
+        }
+        catch {
+            attached = false;
+        }
+    }
+    if (!attached && registry !== undefined && typeof registry.list === 'function') {
+        const workspaces = registry.list();
+        const preferred = workspacePath !== undefined
+            ? workspaces.find(ws => pathLooksLike(ws.path, workspacePath) || ws.title === '微信')
+            : undefined;
+        if (preferred !== undefined)
+            attached = await attachToWorkspace(preferred, sessionId);
+        if (!attached) {
+            for (const workspace of workspaces) {
+                if (await attachToWorkspace(workspace, sessionId)) {
+                    attached = true;
+                    break;
+                }
+            }
+        }
+    }
+    return { ...unarchived, attached };
+}

package/lib/web-shim.d.ts

@@ -13,12 +13,21 @@ export interface ModelRef {
     provider?: string;
     model: string;
 }
+export interface PendingQuestion {
+    id: string;
+    header?: string;
+    question: string;
+    options: string[];
+}
+export interface SessionRecord {
+    sessionId: string;
+    updatedAt: number;
+    pendingQuestions?: PendingQuestion[];
+}
 export interface SessionStore {
-    sessions: Record<string, {
-        sessionId: string;
-        updatedAt: number;
-    }>;
+    sessions: Record<string, SessionRecord>;
 }
+export declare const ASK_USER_QUESTION_TOOL = "ask_user_question";
 export interface RpcFn {
     (method: string, params: Record<string, unknown>): Promise<unknown>;
 }
@@ -28,6 +37,19 @@ export declare function parseHeadlessArgv(argv: string[]): {
     error: string;
 };
 export declare function isFreshBridgeTurn(task: string): boolean;
+/** WeChat /new is handled by dsh-wechat-bridge. Chinese "重启对话" is a normal message and must be detected here. */
+export declare function isRestartCommand(text: string): boolean;
+export declare const RESTART_ACK = "\u5DF2\u65B0\u5F00\u7F51\u9875\u4F1A\u8BDD\uFF08\u5DE6\u4FA7\u300C\u5FAE\u4FE1\u300D\u6587\u4EF6\u5939\uFF09\u3002\u4E4B\u540E\u76F4\u63A5\u8BF4\u8BDD\u5373\u53EF\u3002\u518D\u53D1\u300C\u91CD\u542F\u5BF9\u8BDD\u300D\u4F1A\u518D\u5F00\u4E00\u6761\uFF1B\u65E7\u4F1A\u8BDD\u4F1A\u5F52\u6863\uFF0C\u7F51\u9875\u4FA7\u680F\u66F4\u5E72\u51C0\u3002";
+export declare const RESTART_SEED = "\u65B0\u4F1A\u8BDD\u5DF2\u5F00\u59CB\u3002\u8BF7\u7528\u4E00\u53E5\u4E2D\u6587\u6253\u62DB\u547C\uFF0C\u4E0D\u8981\u89E3\u91CA\u5185\u90E8\u6B65\u9AA4\u3002";
+export declare const STUCK_ACK = "\u7F51\u9875\u7AEF\u8FD9\u6761\u4F1A\u8BDD\u5361\u4F4F\u4E86\uFF08\u5728\u7B49\u6279\u51C6\uFF0C\u6216\u6A21\u578B\u628A\u5185\u90E8\u63A8\u7406\u53D1\u51FA\u6765\u4E86\uFF09\u3002\u8BF7\u770B\u7F51\u9875\u5DE6\u4FA7\u300C\u5FAE\u4FE1\u300D\u6587\u4EF6\u5939\uFF0C\u6216\u53D1\u300C\u91CD\u542F\u5BF9\u8BDD\u300D\u3002";
+export declare const RPC_TIMEOUT_MS = 15000;
+export declare const QUESTION_HINT = "\u56DE\u590D\u6570\u5B57\u6216\u9009\u9879\u539F\u6587\u5373\u53EF\u3002";
+export declare function stripThinkTags(text: string): string;
+/** 微信 iLink 单条 text 能保留真实换行；多段之间空一行，避免粘成一团。 */
+export declare function formatWechatPlain(text: string): string;
+export declare function looksLikeInternalMonologue(text: string): boolean;
+export declare function usableAssistantText(text: string): string;
+export declare function turnIsBlocked(events: unknown[]): boolean;
 export declare function extractLatestUserText(task: string): string;
 export declare function dshHomeDir(env?: NodeJS.ProcessEnv, home?: string): string;
 export declare function wechatWorkspaceDir(env?: NodeJS.ProcessEnv, home?: string): string;
@@ -35,7 +57,7 @@ export declare function sessionStorePath(env?: NodeJS.ProcessEnv, home?: string)
 export declare function webBaseUrl(env?: NodeJS.ProcessEnv): string;
 export declare function loadSessionStore(path: string): SessionStore;
 export declare function saveSessionStore(path: string, store: SessionStore): void;
-export declare function encodeClientRequest(method: string, payload: Record<string, unknown>, rpcId?: `${string}-${string}-${string}-${string}-${string}`): {
+export declare function encodeClientRequest(method: string, payload: Record<string, unknown>, rpcId?: string): {
     type: 'client-request';
     rpcId: string;
     method: string;
@@ -45,6 +67,15 @@ export declare function unwrapRpc(body: unknown): unknown;
 export declare function rpcErrorMessage(body: unknown): string | undefined;
 export declare function extractSessionId(body: unknown): string | undefined;
 export declare function extractWorkspaceId(body: unknown): string | undefined;
+export declare function findWorkspaceId(body: unknown, cwd?: string): string | undefined;
+export declare function flattenVisibleText(content: unknown): string;
+export declare function historySettledQuestions(events: unknown[]): boolean;
+export declare function extractPendingQuestions(events: unknown[]): PendingQuestion[];
+export declare function formatQuestionForWechat(questions: PendingQuestion[]): string;
+export declare function parseChoice(userText: string, questions: PendingQuestion[]): {
+    id: string;
+    label: string;
+} | undefined;
 export declare function historyEvents(body: unknown): unknown[];
 export declare function lastAssistantText(events: unknown[]): string;
 export declare function turnIsIdle(events: unknown[]): boolean;
@@ -62,7 +93,10 @@ export declare function weixinBridgeEnv(opts: {
     launcherPath: string;
     shimScript: string;
 }): NodeJS.ProcessEnv;
-export declare function postRpc(baseUrl: string, method: string, params: Record<string, unknown>): Promise<unknown>;
+export declare function postRpc(baseUrl: string, method: string, params: Record<string, unknown>, timeoutMs?: number): Promise<unknown>;
+export declare function extractArchivedSessionIds(body: unknown): string[];
+/** Stock dsh archives one-way and hides blank sessions. Restore + attach + title. */
+export declare function ensureSessionVisible(rpc: RpcFn, sessionId: string, env?: NodeJS.ProcessEnv, workspaceId?: string, loopback?: boolean): Promise<void>;
 export declare function runHeadlessViaWeb(opts: {
     task: string;
     cwd?: string;

package/lib/web-shim.js

@@ -13,6 +13,7 @@ import { homedir } from 'node:os';
 import { basename, dirname, join } from 'node:path';
 export const WECHAT_WORKSPACE_NAME = '微信';
 export const DEFAULT_WEB_URL = 'http://127.0.0.1:3080';
+export const ASK_USER_QUESTION_TOOL = 'ask_user_question';
 export function parseHeadlessArgv(argv) {
     const args = argv[0]?.endsWith('node') || argv[0]?.includes('node.exe') ? argv.slice(1) : argv;
     const start = args[0]?.endsWith('.js') || args[0]?.endsWith('.mjs') || args[0]?.endsWith('.cjs') ? 1 : 0;
@@ -27,6 +28,78 @@ export function parseHeadlessArgv(argv) {
 export function isFreshBridgeTurn(task) {
     return !task.includes('【桥接上下文】');
 }
+/** WeChat /new is handled by dsh-wechat-bridge. Chinese "重启对话" is a normal message and must be detected here. */
+export function isRestartCommand(text) {
+    const t = text.trim();
+    if (t.length === 0)
+        return false;
+    if (/^\/(new|restart|reset|clear)(\s+\S+)?$/i.test(t))
+        return true;
+    return /^(重启对话|重新开始|新对话|开启新对话|重置对话)[。.!！]?$/.test(t);
+}
+export const RESTART_ACK = '已新开网页会话（左侧「微信」文件夹）。之后直接说话即可。再发「重启对话」会再开一条；旧会话会归档，网页侧栏更干净。';
+export const RESTART_SEED = '新会话已开始。请用一句中文打招呼，不要解释内部步骤。';
+export const STUCK_ACK = '网页端这条会话卡住了（在等批准，或模型把内部推理发出来了）。请看网页左侧「微信」文件夹，或发「重启对话」。';
+export const RPC_TIMEOUT_MS = 15_000;
+export const QUESTION_HINT = '回复数字或选项原文即可。';
+const SKIP_CONTENT_TYPES = new Set(['reasoning', 'thinking', 'tool-call', 'tool-result', 'image']);
+const MONOLOGUE_MARKERS = [
+    'sandbox_permissions',
+    'danger-full-access',
+    'workspace-write',
+    'Sandbox mode escalation',
+    'escalate speculatively',
+    'outside workspace',
+    'I need danger-full-access',
+    '思考过程',
+    '思考内容',
+];
+export function stripThinkTags(text) {
+    return text
+        .replace(/<think(?:ing|thought)?>[\s\S]*?<\/think(?:ing|thought)?>/gi, '')
+        .replace(/<\/?think(?:ing|thought)?>/gi, '');
+}
+/** 微信 iLink 单条 text 能保留真实换行；多段之间空一行，避免粘成一团。 */
+export function formatWechatPlain(text) {
+    return text
+        .replace(/\r\n?/g, '\n')
+        .replace(/[\u2028\u2029]/g, '\n')
+        .replace(/[ \t]+\n/g, '\n')
+        .replace(/\n{3,}/g, '\n\n')
+        .trim();
+}
+export function looksLikeInternalMonologue(text) {
+    const trimmed = text.trim();
+    if (trimmed.length === 0)
+        return false;
+    if (MONOLOGUE_MARKERS.some(marker => trimmed.includes(marker)))
+        return true;
+    if (/^\s*(thought|thinking|reasoning)\b/i.test(trimmed))
+        return true;
+    if (/<(think|thinking|thought)>/i.test(trimmed) && stripThinkTags(trimmed).trim().length === 0)
+        return true;
+    return trimmed.length > 400 && /sandbox_permissions|danger-full-access|workspace-write|AbortSignal|justification/i.test(trimmed);
+}
+export function usableAssistantText(text) {
+    const trimmed = formatWechatPlain(stripThinkTags(text));
+    if (trimmed.length === 0 || looksLikeInternalMonologue(trimmed))
+        return '';
+    return trimmed;
+}
+export function turnIsBlocked(events) {
+    let blocked = false;
+    for (const event of events) {
+        if (typeof event !== 'object' || event === null)
+            continue;
+        const type = event.type;
+        // Selection / ask_user_question 不是批准卡住：编成纯文本发给微信，不要 STUCK_ACK。
+        if (type === 'approval/asked' || type === 'approval/requested')
+            blocked = true;
+        if (type === 'approval/decided' || type === 'approval/resolved' || type === 'turn/end')
+            blocked = false;
+    }
+    return blocked;
+}
 export function extractLatestUserText(task) {
     if (!task.includes('【桥接上下文】'))
         return task.trim();
@@ -139,25 +212,339 @@ export function extractWorkspaceId(body) {
         if (typeof nested.id === 'string')
             return nested.id;
     }
+    // WorkspaceView-like row, or a live Workspace entity serialized with `id`.
+    if (typeof rec.id === 'string' && (typeof rec.path === 'string' || typeof rec.title === 'string' || Array.isArray(rec.sessionIds))) {
+        return rec.id;
+    }
     return undefined;
 }
-function flattenText(content) {
+function normalizePath(path) {
+    return path.replace(/\\/g, '/').replace(/\/+$/, '');
+}
+export function findWorkspaceId(body, cwd) {
+    const direct = extractWorkspaceId(body);
+    if (direct !== undefined)
+        return direct;
+    if (typeof body !== 'object' || body === null)
+        return undefined;
+    const rec = body;
+    const items = Array.isArray(rec.items) ? rec.items
+        : Array.isArray(body) ? body
+            : Array.isArray(rec.workspaces) ? rec.workspaces
+                : [];
+    const rows = items.filter((item) => typeof item === 'object' && item !== null);
+    if (rows.length === 0)
+        return undefined;
+    const wanted = cwd !== undefined ? normalizePath(cwd) : undefined;
+    const basename = wanted?.split('/').pop();
+    const match = rows.find(row => {
+        const path = typeof row.path === 'string' ? normalizePath(row.path) : undefined;
+        const title = typeof row.title === 'string' ? row.title : undefined;
+        if (wanted !== undefined && path === wanted)
+            return true;
+        if (basename !== undefined && title === basename)
+            return true;
+        if (basename !== undefined && path !== undefined && path.endsWith('/' + basename))
+            return true;
+        return false;
+    }) ?? rows.find(row => row.title === WECHAT_WORKSPACE_NAME);
+    return match !== undefined ? extractWorkspaceId(match) : undefined;
+}
+function asRecord(value) {
+    return typeof value === 'object' && value !== null ? value : undefined;
+}
+function eventPayload(event) {
+    const data = asRecord(event.data);
+    return data ?? event;
+}
+export function flattenVisibleText(content) {
     if (typeof content === 'string')
-        return content;
+        return stripThinkTags(content);
     if (!Array.isArray(content))
         return '';
-    return content
-        .map(block => {
-        if (typeof block === 'string')
-            return block;
-        if (typeof block !== 'object' || block === null)
-            return '';
-        const rec = block;
-        if (typeof rec.text === 'string')
-            return rec.text;
-        return '';
-    })
-        .join('');
+    const parts = [];
+    for (const block of content) {
+        if (typeof block === 'string') {
+            const text = stripThinkTags(block).trim();
+            if (text !== '')
+                parts.push(text);
+            continue;
+        }
+        const rec = asRecord(block);
+        if (rec === undefined)
+            continue;
+        const type = typeof rec.type === 'string' ? rec.type : 'text';
+        if (SKIP_CONTENT_TYPES.has(type))
+            continue;
+        if (type !== 'text' && rec.type !== undefined)
+            continue;
+        if (typeof rec.text !== 'string')
+            continue;
+        const text = stripThinkTags(rec.text).trim();
+        if (text !== '')
+            parts.push(text);
+    }
+    return parts.join('\n\n');
+}
+function optionLabel(option) {
+    if (typeof option === 'string')
+        return option.trim();
+    const rec = asRecord(option);
+    if (rec !== undefined && typeof rec.label === 'string')
+        return rec.label.trim();
+    return '';
+}
+function questionsFromAskArgs(args, fallbackId) {
+    let parsed = args;
+    if (typeof args === 'string') {
+        try {
+            parsed = JSON.parse(args);
+        }
+        catch {
+            return [];
+        }
+    }
+    const rec = asRecord(parsed);
+    if (rec === undefined)
+        return [];
+    const rawQuestions = Array.isArray(rec.questions) ? rec.questions : [rec];
+    const out = [];
+    for (const item of rawQuestions) {
+        if (typeof item === 'string') {
+            const question = item.trim();
+            if (question !== '')
+                out.push({ id: fallbackId, question, options: [] });
+            continue;
+        }
+        const q = asRecord(item);
+        if (q === undefined)
+            continue;
+        const id = typeof q.id === 'string' && q.id.trim() !== '' ? q.id.trim() : fallbackId;
+        const question = typeof q.question === 'string' ? q.question.trim()
+            : typeof q.prompt === 'string' ? q.prompt.trim()
+                : '';
+        const header = typeof q.header === 'string' && q.header.trim() !== '' ? q.header.trim() : undefined;
+        const options = Array.isArray(q.options) ? q.options.map(optionLabel).filter(label => label !== '') : [];
+        if (question === '' && options.length === 0)
+            continue;
+        const pending = { id, question: question || header || '请选择', options };
+        if (header !== undefined)
+            pending.header = header;
+        out.push(pending);
+    }
+    return out;
+}
+function toolNameOf(rec) {
+    const payload = eventPayload(rec);
+    const name = payload.name ?? payload.tool ?? payload.toolName ?? rec.name ?? rec.tool ?? rec.toolName;
+    return typeof name === 'string' ? name : '';
+}
+function callIdOf(rec) {
+    const payload = eventPayload(rec);
+    const id = payload.callID ?? payload.callId ?? payload.toolCallId ?? rec.callID ?? rec.callId ?? rec.toolCallId ?? rec.id;
+    return typeof id === 'string' ? id : '';
+}
+function isAskUserTool(name) {
+    return name === ASK_USER_QUESTION_TOOL || name.endsWith(`__${ASK_USER_QUESTION_TOOL}`);
+}
+function addId(into, value) {
+    if (typeof value === 'string' && value.trim() !== '')
+        into.add(value.trim());
+}
+function resolvedIdsFrom(rec) {
+    const payload = eventPayload(rec);
+    const ids = new Set();
+    addId(ids, callIdOf(rec));
+    addId(ids, payload.questionId);
+    addId(ids, payload.requestId);
+    addId(ids, rec.questionId);
+    addId(ids, rec.requestId);
+    const buckets = [payload.answers, rec.answers, payload.questions, rec.questions];
+    for (const bucket of buckets) {
+        if (!Array.isArray(bucket))
+            continue;
+        for (const item of bucket) {
+            const row = asRecord(item);
+            if (row !== undefined)
+                addId(ids, row.id);
+        }
+    }
+    return [...ids];
+}
+function contentBlocks(rec) {
+    const payload = eventPayload(rec);
+    const message = asRecord(payload.message) ?? payload;
+    const content = message.content ?? payload.content ?? rec.content;
+    return Array.isArray(content) ? content : [];
+}
+export function historySettledQuestions(events) {
+    for (const event of events) {
+        const rec = asRecord(event);
+        if (rec === undefined)
+            continue;
+        const type = typeof rec.type === 'string' ? rec.type : '';
+        if (type === 'question/resolved' || type === 'question/answered' || type === 'question/cancelled')
+            return true;
+        if ((type === 'tool/result' || type === 'tool-result') && isAskUserTool(toolNameOf(rec)))
+            return true;
+        for (const block of contentBlocks(rec)) {
+            const b = asRecord(block);
+            if (b === undefined)
+                continue;
+            if (b.type !== 'tool-result' && b.type !== 'tool/result')
+                continue;
+            const name = typeof b.toolName === 'string' ? b.toolName : typeof b.name === 'string' ? b.name : '';
+            if (isAskUserTool(name))
+                return true;
+        }
+    }
+    return false;
+}
+export function extractPendingQuestions(events) {
+    const answered = new Set();
+    const requestedIds = [];
+    const pendingByKey = new Map();
+    const pendingOrigins = new Map();
+    const keyOf = (item) => `${item.id}:${item.question}:${item.options.join('|')}`;
+    const dropAnswered = () => {
+        for (const [key, item] of pendingByKey) {
+            const origins = pendingOrigins.get(key) ?? new Set([item.id]);
+            if ([...origins].some(id => answered.has(id)))
+                pendingByKey.delete(key);
+        }
+    };
+    const remember = (items, sourceId) => {
+        if (sourceId !== undefined && sourceId !== '')
+            requestedIds.push(sourceId);
+        for (const item of items) {
+            requestedIds.push(item.id);
+            const key = keyOf(item);
+            const origins = pendingOrigins.get(key) ?? new Set();
+            origins.add(item.id);
+            if (sourceId !== undefined && sourceId !== '')
+                origins.add(sourceId);
+            pendingOrigins.set(key, origins);
+            if ([...origins].some(id => answered.has(id)))
+                continue;
+            pendingByKey.set(key, item);
+        }
+    };
+    const markResolved = (rec) => {
+        const ids = resolvedIdsFrom(rec);
+        if (ids.length === 0) {
+            for (const id of requestedIds)
+                answered.add(id);
+            pendingByKey.clear();
+            return;
+        }
+        for (const id of ids)
+            answered.add(id);
+        dropAnswered();
+    };
+    for (const event of events) {
+        const rec = asRecord(event);
+        if (rec === undefined)
+            continue;
+        const type = typeof rec.type === 'string' ? rec.type : '';
+        const payload = eventPayload(rec);
+        if (type === 'question/resolved' || type === 'question/answered' || type === 'question/cancelled') {
+            markResolved(rec);
+            continue;
+        }
+        if (type === 'question/requested') {
+            const sourceId = callIdOf(rec) || 'question';
+            remember(questionsFromAskArgs(payload.questions !== undefined ? payload : rec, sourceId), sourceId);
+            continue;
+        }
+        if (type === 'tool/result' || type === 'tool-result') {
+            if (isAskUserTool(toolNameOf(rec))) {
+                const id = callIdOf(rec);
+                if (id !== '')
+                    answered.add(id);
+                dropAnswered();
+            }
+        }
+        if ((type === 'tool/call' || type === 'tool-call') && isAskUserTool(toolNameOf(rec))) {
+            const id = callIdOf(rec);
+            if (id === '' || !answered.has(id)) {
+                const args = payload.arguments ?? payload.input ?? payload.params ?? rec.arguments ?? rec.input;
+                remember(questionsFromAskArgs(args, id || ASK_USER_QUESTION_TOOL), id);
+            }
+        }
+        for (const block of contentBlocks(rec)) {
+            const b = asRecord(block);
+            if (b === undefined)
+                continue;
+            if (b.type === 'tool-result' || b.type === 'tool/result') {
+                const name = typeof b.toolName === 'string' ? b.toolName : typeof b.name === 'string' ? b.name : '';
+                if (!isAskUserTool(name))
+                    continue;
+                const id = typeof b.toolCallId === 'string' ? b.toolCallId : typeof b.callID === 'string' ? b.callID : '';
+                if (id !== '')
+                    answered.add(id);
+                dropAnswered();
+                continue;
+            }
+            if (b.type !== 'tool-call' && b.type !== 'tool/call')
+                continue;
+            const name = typeof b.toolName === 'string' ? b.toolName : typeof b.name === 'string' ? b.name : '';
+            if (!isAskUserTool(name))
+                continue;
+            const id = typeof b.toolCallId === 'string' ? b.toolCallId : typeof b.callID === 'string' ? b.callID : typeof b.id === 'string' ? b.id : '';
+            if (id !== '' && answered.has(id))
+                continue;
+            remember(questionsFromAskArgs(b.arguments ?? b.input ?? b.params, id || ASK_USER_QUESTION_TOOL), id);
+        }
+    }
+    return [...pendingByKey.values()];
+}
+export function formatQuestionForWechat(questions) {
+    const parts = [];
+    const hint = questions.length > 1
+        ? '多题时回复如 1-2（第1题第2项），或回复选项原文。'
+        : QUESTION_HINT;
+    questions.forEach((question, questionIndex) => {
+        const title = question.header?.trim() || question.question.trim() || '请选择';
+        parts.push(questions.length > 1 ? `${questionIndex + 1}) ${title}` : title);
+        if (question.header !== undefined && question.question.trim() !== '' && question.question.trim() !== title) {
+            parts.push(question.question.trim());
+        }
+        question.options.forEach((option, index) => {
+            parts.push(`${index + 1}. ${option}`);
+        });
+    });
+    if (questions.length > 0)
+        parts.push(hint);
+    return formatWechatPlain(parts.join('\n'));
+}
+export function parseChoice(userText, questions) {
+    const raw = userText.trim();
+    if (raw === '' || questions.length === 0)
+        return undefined;
+    const pick = (question, optionIndex) => {
+        const label = question?.options[optionIndex];
+        if (question === undefined || label === undefined)
+            return undefined;
+        return { id: question.id, label };
+    };
+    const dotted = raw.match(/^(\d{1,2})[-.．](\d{1,2})$/);
+    if (dotted !== null && questions.length > 1) {
+        return pick(questions[Number(dotted[1]) - 1], Number(dotted[2]) - 1);
+    }
+    const numbered = raw.match(/^(\d{1,2})(?:[.．、。)]\s*)?$/);
+    if (numbered !== null) {
+        if (questions.length !== 1)
+            return undefined;
+        return pick(questions[0], Number(numbered[1]) - 1);
+    }
+    const exact = [];
+    for (const question of questions) {
+        for (const option of question.options) {
+            if (option === raw || option.trim() === raw)
+                exact.push({ id: question.id, label: option });
+        }
+    }
+    return exact.length === 1 ? exact[0] : undefined;
 }
 function unwrapHistoryItem(item) {
     if (typeof item !== 'object' || item === null)
@@ -192,7 +579,7 @@ export function lastAssistantText(events) {
             continue;
         const data = typeof rec.data === 'object' && rec.data !== null ? rec.data : rec;
         const message = typeof data.message === 'object' && data.message !== null ? data.message : data;
-        const chunk = flattenText(message.content ?? data.content ?? rec.content) || (typeof rec.text === 'string' ? rec.text : '');
+        const chunk = flattenVisibleText(message.content ?? data.content ?? rec.content) || (typeof rec.text === 'string' ? stripThinkTags(rec.text) : '');
         if (chunk.trim() !== '')
             text = chunk;
     }
@@ -308,7 +695,7 @@ export function weixinBridgeEnv(opts) {
 async function sleep(ms) {
     await new Promise(resolve => setTimeout(resolve, ms));
 }
-export async function postRpc(baseUrl, method, params) {
+export async function postRpc(baseUrl, method, params, timeoutMs = RPC_TIMEOUT_MS) {
     const url = `${baseUrl.replace(/\/$/, '')}/api/${method}`;
     const envelope = encodeClientRequest(method, params);
     let response;
@@ -317,6 +704,7 @@ export async function postRpc(baseUrl, method, params) {
             method: 'POST',
             headers: { 'content-type': 'application/json' },
             body: JSON.stringify(envelope),
+            signal: AbortSignal.timeout(timeoutMs),
         });
     }
     catch (error) {
@@ -340,10 +728,25 @@ export async function postRpc(baseUrl, method, params) {
 }
 async function ensureWorkspace(rpc, cwd) {
     mkdirSync(cwd, { recursive: true });
-    const created = await rpc('workspace.create', { path: cwd });
-    return extractWorkspaceId(created);
+    try {
+        const created = await rpc('workspace.create', { path: cwd });
+        const id = extractWorkspaceId(created) ?? findWorkspaceId(created, cwd);
+        if (id !== undefined)
+            return id;
+    }
+    catch {
+        // create may 409 / invalid-path; list is the reconnect authority
+    }
+    try {
+        return findWorkspaceId(await rpc('workspace.list', {}), cwd);
+    }
+    catch {
+        return undefined;
+    }
 }
 async function createSession(rpc, cwd, workspaceId) {
+    // Official session.create accepts at most one of workspaceId / cwd.
+    // workspaceId is the one that attachSession-s into the 微信 sidebar.
     const payload = workspaceId !== undefined ? { workspaceId } : { cwd };
     const created = await rpc('session.create', payload);
     const id = extractSessionId(created);
@@ -381,9 +784,111 @@ async function sessionAlive(rpc, sessionId) {
         return false;
     }
 }
-async function waitForAssistant(rpc, sessionId, beforeText, timeoutMs) {
+export function extractArchivedSessionIds(body) {
+    const unwrapped = unwrapRpc(body);
+    if (typeof unwrapped !== 'object' || unwrapped === null)
+        return [];
+    const rec = unwrapped;
+    if (Array.isArray(rec.archivedSessionIds)) {
+        return rec.archivedSessionIds.filter((id) => typeof id === 'string');
+    }
+    if (typeof rec.global === 'object' && rec.global !== null) {
+        const nested = rec.global;
+        if (Array.isArray(nested.archivedSessionIds)) {
+            return nested.archivedSessionIds.filter((id) => typeof id === 'string');
+        }
+    }
+    return [];
+}
+async function tryRpc(rpc, method, params) {
+    try {
+        await rpc(method, params);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/** Stock dsh archives one-way and hides blank sessions. Restore + attach + title. */
+export async function ensureSessionVisible(rpc, sessionId, env = process.env, workspaceId, loopback = true) {
+    await tryRpc(rpc, 'workspace.unarchiveSession', { sessionId });
+    await tryRpc(rpc, 'session.unarchive', { sessionId });
+    if (loopback) {
+        const workspacePath = wechatWorkspaceDir(env);
+        const url = `${webBaseUrl(env)}/api/dsh-rez-suite/weixin/unarchive`;
+        try {
+            await fetch(url, {
+                method: 'POST',
+                headers: { 'content-type': 'application/json' },
+                body: JSON.stringify({ sessionId, workspacePath }),
+                signal: AbortSignal.timeout(3000),
+            });
+        }
+        catch {
+            // web may be down or an older plugin; prompting still works, sidebar may stay hidden
+        }
+    }
+    if (workspaceId !== undefined) {
+        await tryRpc(rpc, 'workspace.attachSession', { workspaceId, sessionId });
+        await tryRpc(rpc, 'workspace.insertSessionBefore', { workspaceId, sessionId });
+    }
+    await tryRpc(rpc, 'session.rename', { sessionId, title: WECHAT_WORKSPACE_NAME });
+}
+async function archiveSession(rpc, sessionId) {
+    await tryRpc(rpc, 'workspace.archiveSession', { sessionId });
+}
+async function abortSessionTurn(rpc, sessionId) {
+    for (const method of ['session.abort', 'session.cancel', 'session.stop', 'session.interrupt']) {
+        if (await tryRpc(rpc, method, { sessionId }))
+            return;
+    }
+}
+async function tryRpcQuick(rpc, method, params, ms = 2000) {
+    let timer;
+    try {
+        await Promise.race([
+            rpc(method, params),
+            new Promise((_, reject) => {
+                timer = setTimeout(() => reject(new Error('timeout')), ms);
+            }),
+        ]);
+        return true;
+    }
+    catch {
+        return false;
+    }
+    finally {
+        if (timer !== undefined)
+            clearTimeout(timer);
+    }
+}
+async function tryAnswerPendingQuestion(rpc, sessionId, choice) {
+    const answer = { answers: [{ id: choice.id, selected: [choice.label] }] };
+    const payloads = [
+        { sessionId, answer },
+        { sessionId, answers: answer.answers },
+    ];
+    for (const method of ['question.respond', 'session.respondQuestion']) {
+        for (const params of payloads) {
+            if (await tryRpcQuick(rpc, method, params))
+                return true;
+        }
+    }
+    return false;
+}
+function composeWechatReply(events, ignorePending) {
+    const ignore = new Set((ignorePending ?? []).map(question => question.id));
+    const pendingQuestions = extractPendingQuestions(events).filter(question => !ignore.has(question.id));
+    const visible = usableAssistantText(lastAssistantText(events));
+    if (pendingQuestions.length > 0) {
+        const combined = [visible, formatQuestionForWechat(pendingQuestions)].filter(part => part.length > 0).join('\n\n');
+        return { text: formatWechatPlain(combined), pendingQuestions };
+    }
+    return { text: visible, pendingQuestions };
+}
+async function waitForAssistant(rpc, sessionId, beforeText, timeoutMs, ignorePending) {
     const deadline = Date.now() + timeoutMs;
-    let last = '';
+    let last = { text: '', pendingQuestions: [] };
     let idleOnce = false;
     while (Date.now() < deadline) {
         let events = [];
@@ -393,21 +898,27 @@ async function waitForAssistant(rpc, sessionId, beforeText, timeoutMs) {
         catch {
             events = [];
         }
-        const text = lastAssistantText(events);
-        if (text !== '')
-            last = text;
+        const composed = composeWechatReply(events, ignorePending);
+        // 旧题（本轮 prompt 前就在的 Selection）不能立刻发回微信；只发新 turn 里新出现的题。
+        if (composed.pendingQuestions.length > 0 && composed.text !== '') {
+            return composed;
+        }
+        if (turnIsBlocked(events))
+            return { text: STUCK_ACK, pendingQuestions: [] };
+        if (composed.text !== '')
+            last = composed;
         const idle = turnIsIdle(events);
         if (idle)
             idleOnce = true;
-        if (idle && text !== '' && text !== beforeText)
-            return text;
-        if (idleOnce && text !== '' && text !== beforeText)
-            return text;
+        if (idle && composed.text !== '' && composed.text !== beforeText)
+            return composed;
+        if (idleOnce && composed.text !== '' && composed.text !== beforeText)
+            return composed;
         await sleep(400);
     }
-    if (last !== '' && last !== beforeText)
+    if (last.text !== '' && last.text !== beforeText)
         return last;
-    throw new Error('等待 dsh web 回复超时。请看网页左侧「微信」文件夹里的会话。');
+    return { text: STUCK_ACK, pendingQuestions: [] };
 }
 export async function runHeadlessViaWeb(opts) {
     const env = opts.env ?? process.env;
@@ -417,12 +928,16 @@ export async function runHeadlessViaWeb(opts) {
     const workspace = wechatWorkspaceDir(env);
     const storeFile = sessionStorePath(env);
     const key = basename(opts.cwd ?? process.cwd()) || 'default';
+    const customRpc = opts.rpc !== undefined;
     const rpc = opts.rpc ?? ((method, params) => postRpc(webBaseUrl(env), method, params));
     const timeoutMs = opts.timeoutMs ?? Number(env.DSH_BRIDGE_TIMEOUT_MS ?? 10 * 60 * 1000);
     const workspaceId = await ensureWorkspace(rpc, workspace);
+    const restart = isRestartCommand(text);
+    const fresh = isFreshBridgeTurn(opts.task) || restart;
     const store = loadSessionStore(storeFile);
+    const storedPending = restart ? undefined : store.sessions[key]?.pendingQuestions;
     let sessionId = store.sessions[key]?.sessionId;
-    const fresh = isFreshBridgeTurn(opts.task);
+    const previousId = sessionId;
     if (sessionId !== undefined && !fresh) {
         const alive = await sessionAlive(rpc, sessionId);
         if (!alive)
@@ -434,20 +949,65 @@ export async function runHeadlessViaWeb(opts) {
     if (sessionId === undefined) {
         sessionId = await createSession(rpc, workspace, workspaceId);
         await maybeSelectModel(rpc, sessionId, env);
+        await ensureSessionVisible(rpc, sessionId, env, workspaceId, !customRpc);
+        if (previousId !== undefined && previousId !== sessionId) {
+            await abortSessionTurn(rpc, previousId);
+            await archiveSession(rpc, previousId);
+        }
     }
-    store.sessions[key] = { sessionId, updatedAt: Date.now() };
-    saveSessionStore(storeFile, store);
+    else {
+        await ensureSessionVisible(rpc, sessionId, env, workspaceId, !customRpc);
+    }
+    const promptText = restart ? RESTART_SEED : text;
     let before = '';
+    let events = [];
     try {
-        before = lastAssistantText(historyEvents(await rpc('session.history', { sessionId, maxMessages: 40 })));
+        events = historyEvents(await rpc('session.history', { sessionId, maxMessages: 40 }));
+        before = usableAssistantText(lastAssistantText(events));
     }
     catch {
         before = '';
     }
-    await rpc('session.prompt', {
+    const pending = extractPendingQuestions(events);
+    const questions = pending.length > 0
+        ? pending
+        : (!restart && storedPending !== undefined && storedPending.length > 0 && !historySettledQuestions(events)
+            ? storedPending
+            : []);
+    let skipUserPrompt = false;
+    if (!restart && questions.length > 0) {
+        const choice = parseChoice(text, questions);
+        if (choice !== undefined) {
+            const answered = await tryAnswerPendingQuestion(rpc, sessionId, choice);
+            if (!answered) {
+                await abortSessionTurn(rpc, sessionId);
+                await rpc('session.prompt', {
+                    sessionId,
+                    mode: 'queue',
+                    content: [{ type: 'text', text: `用户在微信选择了：${choice.label}` }],
+                });
+            }
+            skipUserPrompt = true;
+        }
+    }
+    if (!skipUserPrompt) {
+        if (!turnIsIdle(events) || turnIsBlocked(events)) {
+            await abortSessionTurn(rpc, sessionId);
+        }
+        await rpc('session.prompt', {
+            sessionId,
+            mode: 'queue',
+            content: [{ type: 'text', text: promptText }],
+        });
+    }
+    const reply = await waitForAssistant(rpc, sessionId, before, timeoutMs, questions);
+    store.sessions[key] = {
         sessionId,
-        mode: 'queue',
-        content: [{ type: 'text', text }],
-    });
-    return await waitForAssistant(rpc, sessionId, before, timeoutMs);
+        updatedAt: Date.now(),
+        ...(reply.pendingQuestions.length > 0 ? { pendingQuestions: reply.pendingQuestions } : {}),
+    };
+    saveSessionStore(storeFile, store);
+    if (restart && (reply.text === STUCK_ACK || reply.text === ''))
+        return RESTART_ACK;
+    return reply.text;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rezti/dsh-rez-wechat",
-  "version": "0.1.8",
+  "version": "0.1.12",
   "description": "ReZ-TI WeChat/WeCom bridges. Personal WeChat is QClaw/ClawBot scan-and-chat via dsh-wechat-bridge; WeCom group send uses wecom-mcp.",
   "type": "module",
   "engines": {
@@ -14,15 +14,21 @@
       "default": "./lib/index.js"
     }
   },
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    }
+  },
   "files": [
     "lib/**/*.js",
     "lib/**/*.d.ts",
+    "cordis.patch.yml",
     "README.md"
   ],
   "license": "Apache-2.0",
   "dependencies": {
     "qrcode": "^1.5.4",
-    "@rezti/dsh-rez-sso": "0.1.6"
+    "@rezti/dsh-rez-sso": "0.1.7"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
@@ -37,7 +43,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/kelvinchen1119/deepseek-harness.git",
+    "url": "git+https://github.com/ReZ-TI/deepseek-harness.git",
     "directory": "packages/dsh-rez-wechat"
   },
   "scripts": {