@yvhitxcel/opencode-remote 0.15.1 → 0.16.1

package/dist/weixin/handler.js

@@ -5,19 +5,9 @@ import { isAuthorized, hasOwner } from '../core/auth.js';
 import { registry } from '../core/registry.js';
 import { sendMessage as sendWeixinMessage } from './api.js';
 import { randomBytes } from 'crypto';
-import { detectCommand } from '../core/router.js';
+import { detectCommand, EXPERT_SYSTEM_PROMPT, startTypingPing } from '../core/router.js';
 import { handleCommand, formatTimeAgo, _registerStartLoopCycle } from './commands.js';
 
-const EXPERT_SYSTEM_PROMPT = `你是一个专家角色扮演系统，严格按照 AGENTS.md 中的"专家点评系统"流程执行。
-
-当用户输入包含触发词（z / 叫全部专家 / 叫所有专家 / 呼叫专家点评 / 专家点评 / 专家意见 / call all experts / expert review）时，启动专家评审。
-
-## 规则
-- 严格遵循 AGENTS.md 中定义的 13 位角色和点评流程
-- 言辞必须苛刻犀利，不讨好不委婉
-- 不说客套话
-- 直接指出问题`;
-
 async function startLoopCycle(adapter, ctx, openCodeSessions, session) {
     if (!session.loopMode) return;
 
@@ -61,92 +51,84 @@ async function startLoopCycle(adapter, ctx, openCodeSessions, session) {
 
 _registerStartLoopCycle(startLoopCycle);
 
-async function forwardToOpenCode(adapter, ctx, text, openCodeSessions, session) {
+async function forwardToOpenCode(adapter, ctx, text, openCodeSessions, session, expertPrompt) {
     adapter.sendTypingIndicator(ctx.threadId).catch(() => {});
-    let openCodeSession = openCodeSessions.get(ctx.threadId);
-    if (!openCodeSession) {
-        if (session.opencodeSessionId) {
-            openCodeSession = await resumeSession(session.opencodeSessionId);
-        }
-        if (!openCodeSession && globalThis.__latestOpenCodeSession?.id) {
-            console.log('Connecting to latest OpenCode session...');
-            openCodeSession = await resumeSession(globalThis.__latestOpenCodeSession.id);
-        }
+    let openCodeSession = null;
+
+    // 专家评审每次开独立会话，避免旧历史干扰
+    if (expertPrompt) {
+        openCodeSession = await createSession(`expert-${Date.now()}`, `专家评审 ${Date.now()}`);
         if (!openCodeSession) {
-            const mapping = loadSessionMapping();
-            const saved = mapping[ctx.threadId];
-            if (saved?.opencodeSessionId) {
-                openCodeSession = await resumeSession(saved.opencodeSessionId);
-            }
+            await adapter.reply(ctx.threadId, '❌ 无法创建评审会话');
+            return;
         }
+        console.log(`✅ 新建评审会话: ${openCodeSession.sessionId.slice(0, 8)}`);
+    } else {
+        openCodeSession = openCodeSessions.get(ctx.threadId);
         if (!openCodeSession) {
-            console.log('Creating new WeChat session...');
-            openCodeSession = await createSession(ctx.threadId, `Weixin ${ctx.threadId}`);
+            if (session.opencodeSessionId) openCodeSession = await resumeSession(session.opencodeSessionId);
+            if (!openCodeSession && globalThis.__latestOpenCodeSession?.id) openCodeSession = await resumeSession(globalThis.__latestOpenCodeSession.id);
             if (!openCodeSession) {
-                await adapter.reply(ctx.threadId, '❌ 无法创建 OpenCode 会话');
-                return;
+                const mapping = loadSessionMapping();
+                if (mapping[ctx.threadId]?.opencodeSessionId) openCodeSession = await resumeSession(mapping[ctx.threadId].opencodeSessionId);
+            }
+            if (!openCodeSession) {
+                openCodeSession = await createSession(ctx.threadId, `Weixin ${ctx.threadId}`);
+                if (!openCodeSession) { await adapter.reply(ctx.threadId, '❌ 无法创建 OpenCode 会话'); return; }
             }
-            console.log(`✅ Created new WeChat session: ${openCodeSession.sessionId}`);
+            openCodeSessions.set(ctx.threadId, openCodeSession);
+            session.opencodeSessionId = openCodeSession.sessionId;
+            saveSessionMapping();
         }
-        openCodeSessions.set(ctx.threadId, openCodeSession);
-        session.opencodeSessionId = openCodeSession.sessionId;
-        const key = `weixin:${ctx.threadId}:${ctx.threadId}`;
-        sessionManager.saveSession(key, session).catch(() => {});
-        saveSessionMapping();
     }
 
-    if (session.modelOverride) {
-        openCodeSession.model = session.modelOverride;
-    }
+    if (session.modelOverride) openCodeSession.model = session.modelOverride;
 
     session.taskStartTime = Date.now();
     session.currentTool = null;
-    
-    let lastToolNotified = '';
     const stopHeartbeat = () => {
-        session.taskStartTime = null;
-        session.currentTool = null;
-        if (session.modifiedFiles instanceof Set) {
-            session.modifiedFiles = Array.from(session.modifiedFiles);
-        }
+        session.taskStartTime = null; session.currentTool = null;
+        if (session.modifiedFiles instanceof Set) session.modifiedFiles = Array.from(session.modifiedFiles);
     };
     
     console.log(`📤 Message sent: → ${text}`);
-
     const projectDir = session.projectDir || globalThis.__autoProjectDir;
 
     let scopedText = text;
-    if (session._contextScope) {
-        scopedText = `[上下文范围: ${session._contextScope}]\n\n${text}`;
-    }
+    if (session._contextScope) scopedText = `[上下文范围: ${session._contextScope}]\n\n${text}`;
+    if (projectDir && !scopedText.includes('项目目录')) scopedText = `[当前项目目录: ${projectDir}]\n\n${scopedText}`;
+    if (expertPrompt) scopedText = `${expertPrompt}\n\n${scopedText}`;
 
-    if (projectDir && !scopedText.includes('项目目录')) {
-        scopedText = `[当前项目目录: ${projectDir}]\n\n${scopedText}`;
-    }
-
-    if (session.expertMode && session.systemPrompt) {
-        scopedText = `${session.systemPrompt}\n\n${scopedText}`;
-    }
-    
-    let response = '';
     let hasToolActivity = false;
-    const IDLE_TIMEOUT = session.expertMode ? 120000 : 30000;
+    let toolCount = 0;
+
+    const typingPing = startTypingPing(adapter, ctx.threadId);
 
+    const replyWithTyping = async (text) => {
+        const snippet = text.length > 80 ? text.slice(0, 80) + '...' : text;
+        console.log(`[→发送] ${snippet}`);
+        try { await adapter.reply(ctx.threadId, text); } catch (e) { console.error('[→发送] 失败:', e.message); }
+        adapter.sendTypingIndicator(ctx.threadId).catch(() => {});
+    };
+
+    let contentSent = false;
     const result = await sendToOpenCode(openCodeSession, scopedText, {
+        idleThreshold: expertPrompt ? 30 : 10,
+        onNewContent: (delta) => {
+            const trimmed = delta.trim();
+            if (trimmed) { replyWithTyping(trimmed); typingPing.poke(); contentSent = true; }
+        },
         onEvent: (event) => {
             if (event.type === 'tool.call') {
                 const props = event.properties || {};
                 const toolName = props.name || props.tool_name || 'unknown';
                 const input = props.input || {};
-
-                hasToolActivity = true;
-
-                let toolDesc = `🔧 执行工具: ${toolName}`;
-                if (input.path) toolDesc += `\n📁 ${input.path}`;
-                if (input.command) toolDesc += `\n💻 ${input.command}`;
-
-                adapter.reply(ctx.threadId, toolDesc).catch(() => {});
-
+                hasToolActivity = true; toolCount++;
+                let toolDesc = `🔧 ${toolName}`;
+                if (input.path) toolDesc += ` 📁${input.path}`;
+                if (input.command) toolDesc += ` 💻${input.command}`;
+                replyWithTyping(toolDesc);
+                typingPing.poke();
                 if (input.path) {
                     if (!session.modifiedFiles) session.modifiedFiles = new Set();
                     session.modifiedFiles.add(input.path);
@@ -162,29 +144,20 @@ async function forwardToOpenCode(adapter, ctx, text, openCodeSessions, session)
     });
 
     stopHeartbeat();
-
-    const trimmedResponse = (result || response).trim();
-    if (!trimmedResponse) {
-        console.error(`[forwardToOpenCode] Empty response (race: ${whoWon})`);
-        const msg = whoWon === 'idle' ? '⏰ OpenCode 响应超时，请重试' : 'AI 返回空响应，请重试';
-        await adapter.reply(ctx.threadId, msg);
-        return;
-    }
-
-    if (trimmedResponse.startsWith('⏰') || trimmedResponse.startsWith('❌')) {
-        console.error('[forwardToOpenCode] Error response:', trimmedResponse);
-        await adapter.reply(ctx.threadId, trimmedResponse);
-        return;
-    }
-
-    const responseMsgs = splitMessage(trimmedResponse);
-    for (const m of responseMsgs) {
-        const trimmed = m.trim();
-        if (!trimmed) continue;
-        try {
-            await adapter.reply(ctx.threadId, m);
-        } catch (replyErr) {
-            console.error('[forwardToOpenCode] reply failed:', replyErr.message);
+    typingPing.done();
+
+    // onNewContent 已发过内容就不兜底了，避免重复
+    if (!contentSent) {
+        const finalText = (result || '').trim();
+        if (finalText && !finalText.startsWith('⏰') && !finalText.startsWith('❌')) {
+            const msgs = splitMessage(finalText);
+            for (const m of msgs) {
+                if (m.trim()) adapter.reply(ctx.threadId, m).catch(e => console.error('[reply] 兜底失败:', e.message));
+            }
+        } else if (finalText) {
+            adapter.reply(ctx.threadId, finalText).catch(e => console.error('[reply] 兜底失败:', e.message));
+        } else {
+            adapter.reply(ctx.threadId, '⚠️ AI 返回为空（可能是超时），请重试或 /diagnose').catch(e => console.error('[reply] 失败:', e.message));
         }
     }
 
@@ -197,7 +170,7 @@ async function forwardToOpenCode(adapter, ctx, text, openCodeSessions, session)
             await sendWeixinMessage({
                 baseUrl: adapter._baseUrl,
                 token: adapter._token,
-                body: { msg: { from_user_id: adapter._botId, to_user_id: otherThreadId, client_id: `${Date.now()}-${randomBytes(8).toString('hex')}`, message_type: 2, message_state: 2, context_token: otherContextToken, item_list: [{ type: 1, text_item: { text: `[来自 ${ctx.threadId} 的会话]\n\n${response}` } }] } }
+                body: { msg: { from_user_id: adapter._botId, to_user_id: otherThreadId, client_id: `${Date.now()}-${randomBytes(8).toString('hex')}`, message_type: 2, message_state: 2, context_token: otherContextToken, item_list: [{ type: 1, text_item: { text: `[来自 ${ctx.threadId} 的会话]\n\n${result || ''}` } }] } }
             });
         } catch (e) {
             console.error(`Failed to broadcast to ${otherThreadId}:`, e.message);
@@ -220,29 +193,29 @@ async function forwardToOpenCode(adapter, ctx, text, openCodeSessions, session)
 async function handleMessage(adapter, ctx, text, openCodeSessions) {
     const session = await getOrCreateSession(ctx.threadId, 'weixin');
 
-    const expertTriggers = ['z', '叫全部专家', '叫所有专家', '呼叫专家点评', '专家点评', '专家意见', 'call all experts', 'expert review'];
+    const expertTriggers = ['z', 'Z', '叫全部专家', '叫所有专家', '呼叫专家点评', '专家点评', '专家意见', 'call all experts', 'expert review', '专家会诊', '团队评审', '代码审查', '全员review', 'review all', '请专家', '叫专家', '找专家'];
     const trimmedLower = text.trim().toLowerCase();
+    let expertPrompt = null;
     if (text.startsWith('/z')) {
         const arg = text.slice(2).trim();
         if (arg === 'off' || arg === 'reset' || arg === '关闭') {
-            session.expertMode = false;
-            session.systemPrompt = null;
-            await adapter.reply(ctx.threadId, '⏹️ 专家模式已关闭');
+            await adapter.reply(ctx.threadId, '⏹️ 自定义 prompt 已清除');
             return;
         }
         if (arg) {
-            session.expertMode = true;
-            session.systemPrompt = arg;
-            await adapter.reply(ctx.threadId, `✅ 自定义专家 prompt 已设置 (${arg.length}字)`);
-            return;
-        }
-        if (!session.expertMode) {
-            session.expertMode = true;
-            session.systemPrompt = EXPERT_SYSTEM_PROMPT;
+            expertPrompt = arg;
+            await adapter.reply(ctx.threadId, `✅ 自定义专家 prompt (${arg.length}字)，本消息生效`);
+        } else {
+            expertPrompt = EXPERT_SYSTEM_PROMPT;
+            await adapter.reply(ctx.threadId, '✅ 专家评审已启动');
         }
-        await adapter.reply(ctx.threadId, '✅ 专家模式已启动，直接发送你的问题\n/z off — 关闭\n/z <内容> — 自定义 prompt');
+        // /z 直接走专家模式，不继续向下走
+        await forwardToOpenCode(adapter, ctx, text, openCodeSessions, session, expertPrompt);
         return;
     }
+    if (expertTriggers.some(t => trimmedLower.includes(t))) {
+        expertPrompt = EXPERT_SYSTEM_PROMPT;
+    }
 
     const detected = detectCommand(text);
     if (detected) {
@@ -371,7 +344,7 @@ async function handleMessage(adapter, ctx, text, openCodeSessions) {
                         session.currentTool = null;
                         session.modifiedFiles = null;
                         const key = `weixin:${ctx.userId}:${ctx.threadId}`;
-                        sessionManager.saveSession(key, session).catch(() => {});
+        sessionManager.saveSession(key, session).catch(e => console.error('[session] save failed:', e.message));
                         saveSessionMapping();
                         if (target.directory) {
                             session.projectDir = target.directory;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@yvhitxcel/opencode-remote",
-  "version": "0.15.1",
-  "description": "通过微信/飞书/Telegram 远程控制 AI 编码助手（OpenCode、Claude Code、Codex、Copilot），随时随地审代码、提需求、查状态",
+  "version": "0.16.1",
+  "description": "🤖 AI 专家团队随时待命！只需输入 /z，自动分析项目、诊断问题、给出改进方案。支持微信/飞书/Telegram 远程控制 OpenCode、Claude Code、Codex、Copilot。手机也能搞开发。",
   "type": "module",
   "bin": {
     "opencode-remote": "bin/opencode-remote.js",
@@ -25,7 +25,6 @@
   "dependencies": {
     "@larksuiteoapi/node-sdk": "^1.59.0",
     "@opencode-ai/sdk": "^1.2.27",
-    "express": "^5.2.1",
     "grammy": "^1.30.0",
     "qiniu": "^7.15.2",
     "undici": "^7.24.5"