@yvhitxcel/opencode-remote 0.15.1 → 0.16.0

package/dist/opencode/client.js

@@ -172,6 +172,9 @@ export async function initFetchConfig() {
 }
 let opencodeInstance = null;
 let opencodeServer = null;
+let lastStdoutTime = 0;
+let lastStdoutLine = '';
+let lastReportedStatus = '';
 const PORTS_TO_TRY = [4096, 4097, 4098];
 
 // TCP-level port probe: true = occupied, false = free
@@ -241,8 +244,9 @@ export async function initOpenCode() {
                 windowsHide: isWindows,
             });
             opencodeServer.stdout.on('data', (d) => {
+                lastStdoutTime = Date.now();
                 const msg = d.toString().trim();
-                if (msg) console.log(`[opencode] ${msg}`);
+                if (msg) { lastStdoutLine = msg.slice(0, 120); console.log(`[opencode] ${msg}`); }
             });
             opencodeServer.stderr.on('data', (d) => {
                 const msg = d.toString().trim();
@@ -389,13 +393,11 @@ export async function sendMessage(session, message, callbacks) {
             body: promptBody,
         });
 
-        // Poll for new response - multi-turn: continue until truly idle
+        // Poll for new response - keep going as long as new content keeps arriving
         const startTime = Date.now();
         let responseText = '';
         let hasToolActivity = false;
-        let lastStatus = '';
-        let idleCycles = 0;
-        const IDLE_THRESHOLD = 3; // Exit after 3 idle polls (no new content, not processing)
+        let idleSince = 0; // 最后一次收到新内容的时间戳
 
         while (Date.now() - startTime < TIMEOUT_MS) {
             await new Promise(r => setTimeout(r, POLL_INTERVAL));
@@ -405,93 +407,61 @@ export async function sendMessage(session, message, callbacks) {
                     path: { id: session.sessionId }
                 });
 
-                if (msgsResult.error) {
-                    console.error('[sendMessage] Messages error:', msgsResult.error);
-                    break;
-                }
-
-                if (!msgsResult.data?.length) {
-                    continue;
-                }
+                if (msgsResult.error) { console.error('[sendMessage] Messages error:', msgsResult.error); break; }
+                if (!msgsResult.data?.length) continue;
 
                 const messages = msgsResult.data;
-                const newMsgCount = messages.length;
-
-                // Check session status
-                const latestMsg = messages[messages.length - 1];
-                const currentStatus = latestMsg?.info?.status;
-                if (currentStatus !== lastStatus) {
-                    lastStatus = currentStatus;
-                    if (lastStatus) {
-                        console.log(`[sendMessage] Session status: ${lastStatus}`);
-                    }
-                }
 
-                // If actively processing, reset idle counter and wait
-                if (lastStatus === 'pending_tool' || lastStatus === 'thinking') {
-                    idleCycles = 0;
-                    continue;
-                }
-
-                // Check if there was tool activity and notify via callback
-                if (newMsgCount > msgCountBefore) {
-                    for (let i = msgCountBefore; i < newMsgCount; i++) {
-                        const msg = messages[i];
-                        if (msg.parts) {
-                            for (const part of msg.parts) {
-                                if (part.type === 'tool_use' || part.type === 'tool_result') {
-                                    hasToolActivity = true;
-                                    callbacks?.onEvent?.({
-                                        type: 'tool.call',
-                                        properties: {
-                                            name: part.name || part.tool_name || 'unknown',
-                                            input: part.input || {}
-                                        }
-                                    });
-                                    break;
-                                }
-                            }
+                // 工具活动
+                for (let i = msgCountBefore; i < messages.length; i++) {
+                    const msg = messages[i];
+                    if (msg.parts) for (const part of msg.parts) {
+                        if (part.type === 'tool_use' || part.type === 'tool_result') {
+                            hasToolActivity = true;
+                            callbacks?.onEvent?.({ type: 'tool.call', properties: { name: part.name || part.tool_name || 'unknown', input: part.input || {} } });
+                            break;
                         }
-                        if (hasToolActivity) break;
                     }
+                    if (hasToolActivity) break;
                 }
 
-                // Find messages after our last message
-                let startIdx = 0;
+                // 收集所有新的 assistant 回复（累加，不丢内容）
                 if (lastMsgId) {
                     const idx = messages.findIndex(m => m.info?.id === lastMsgId);
-                    if (idx >= 0) startIdx = idx + 1;
-                }
-
-                // Collect the latest assistant response text
-                let newText = '';
-                for (let i = messages.length - 1; i >= startIdx; i--) {
-                    const msg = messages[i];
-                    if (msg.info?.role === 'assistant') {
-                        const textParts = msg.parts
-                            ?.filter(p => p.type === 'text' && p.text)
-                            .map(p => p.text) || [];
-
-                        if (textParts.length > 0) {
-                            newText = textParts.join('\n');
-                            break;
+                    const startIdx = idx >= 0 ? idx + 1 : 0;
+                    const newParts = [];
+                    for (let i = startIdx; i < messages.length; i++) {
+                        const msg = messages[i];
+                        if (msg.info?.role === 'assistant' && msg.parts) {
+                            for (const p of msg.parts) {
+                                if (p.type === 'text' && p.text) newParts.push(p.text);
+                            }
                         }
                     }
+                    const fullText = newParts.join('\n');
+                    if (fullText && fullText !== responseText) {
+                        const delta = fullText.slice(responseText.length);
+                        responseText = fullText;
+                        callbacks?.onTextDelta?.(delta);
+                        callbacks?.onNewContent?.(delta);
+                        idleSince = Date.now();
+                        continue;
+                    }
                 }
 
-                if (newText && newText !== responseText) {
-                    const delta = newText.slice(responseText.length);
-                    responseText = newText;
-                    callbacks?.onTextDelta?.(delta);
-                    idleCycles = 0;
+                // 检查 AI 是否还在忙（thinking/pending_tool 说明还没干完）
+                const latestStatus = msgsResult.data?.length ? msgsResult.data[msgsResult.data.length - 1]?.info?.status : '';
+                if (latestStatus === 'thinking' || latestStatus === 'pending_tool') {
+                    idleSince = Date.now();
+                }
+                if (latestStatus && latestStatus !== lastReportedStatus) {
+                    lastReportedStatus = latestStatus;
+                    console.log(`[AI状态] ${latestStatus}`);
                 }
 
-                // Exit only when truly idle: have response, not processing, no new text for N cycles
-                if (responseText && lastStatus !== 'pending_tool' && lastStatus !== 'thinking') {
-                    idleCycles++;
-                    if (idleCycles >= IDLE_THRESHOLD) {
-                        break;
-                    }
+                // 有回复后：等 30 秒无新内容且 AI 不忙才退出
+                if (responseText && Date.now() - idleSince > 30000) {
+                    break;
                 }
             } catch (e) {
                 console.warn('Poll error:', e.message);
@@ -523,7 +493,6 @@ export async function sendMessage(session, message, callbacks) {
         }
         
         callbacks?.onStatusChange?.({ type: 'idle', hasToolActivity });
-        console.log(`💬 Response: ${responseText.slice(0, 100)}...`);
         return responseText;
     }
     catch (error) {

package/dist/telegram/adapter.js

@@ -0,0 +1,55 @@
+import { Bot } from 'grammy';
+import { splitMessage } from '../utils/message-split.js';
+
+export class TelegramAdapter {
+    name = 'telegram';
+    bot = null;
+    config = null;
+    messageHandler = null;
+    isRunning = false;
+    typingIntervals = new Map();
+
+    async start(config) {
+        this.config = config;
+        if (!config.telegramBotToken || config.telegramBotToken === 'your_bot_token_here') {
+            throw new Error('Telegram bot token not configured');
+        }
+        this.bot = new Bot(config.telegramBotToken);
+        this.isRunning = true;
+        console.log('🚀 Telegram adapter started');
+    }
+
+    async stop() {
+        this.isRunning = false;
+        for (const interval of this.typingIntervals.values()) clearInterval(interval);
+        this.typingIntervals.clear();
+        if (this.bot) { await this.bot.stop(); this.bot = null; }
+        console.log('👋 Telegram adapter stopped');
+    }
+
+    onMessage(handler) { this.messageHandler = handler; }
+
+    async sendMessage(threadId, text) {
+        if (!this.bot) throw new Error('Telegram adapter not started');
+        const chunks = splitMessage(text, { maxLength: 4000, addContinuationMarker: false });
+        for (const chunk of chunks) await this.bot.api.sendMessage(threadId, chunk, { parse_mode: 'Markdown' });
+    }
+
+    async sendTyping(threadId, isTyping) {
+        if (!this.bot) return;
+        if (isTyping) {
+            try { await this.bot.api.sendChatAction(threadId, 'typing'); } catch {}
+            const existing = this.typingIntervals.get(threadId);
+            if (existing) clearInterval(existing);
+            const interval = setInterval(async () => {
+                try { await this.bot.api.sendChatAction(threadId, 'typing'); } catch {}
+            }, 4000);
+            this.typingIntervals.set(threadId, interval);
+        } else {
+            const interval = this.typingIntervals.get(threadId);
+            if (interval) { clearInterval(interval); this.typingIntervals.delete(threadId); }
+        }
+    }
+}
+
+export const telegramAdapter = new TelegramAdapter();

package/dist/telegram/bot.js

@@ -1,189 +1,53 @@
-// Telegram Bot adapter with multi-agent support
-import { Bot } from 'grammy';
-import { splitMessage } from '../utils/message-split.js';
 import { registry } from '../core/registry.js';
 import { sessionManager } from '../core/session.js';
 import { initOpenCode, createSession, sendMessage as sendToOpenCode, checkConnection } from '../opencode/client.js';
 import { parseMessage, routeMessage } from '../core/router.js';
+import { telegramAdapter } from './adapter.js';
 
-export class TelegramAdapter {
-    name = 'telegram';
-    bot = null;
-    config = null;
-    messageHandler = null;
-    isRunning = false;
-    typingIntervals = new Map();
-    
-    async start(config) {
-        this.config = config;
-        
-        if (!config.telegramBotToken || config.telegramBotToken === 'your_bot_token_here') {
-            throw new Error('Telegram bot token not configured. Run "opencode-remote config" first.');
-        }
-        
-        this.bot = new Bot(config.telegramBotToken);
-        
-        this.bot.on('message:text', async (ctx) => {
-            console.log('[Telegram] Received message:', ctx.message.text);
-            
-            if (ctx.message.from.is_bot) {
-                console.log('[Telegram] Ignoring bot message');
-                return;
-            }
-            
-            if (!this.messageHandler) {
-                console.log('[Telegram] No message handler registered');
-                return;
-            }
-            
-            try {
-                const message = {
-                    id: ctx.message.message_id.toString(),
-                    threadId: ctx.chat.id.toString(),
-                    userId: ctx.message.from?.id?.toString() || 'unknown',
-                    text: ctx.message.text || '',
-                    timestamp: new Date(ctx.message.date * 1000),
-                    channelId: 'default',
-                };
-                
-                const msgCtx = {
-                    message,
-                    platform: 'telegram',
-                    channelId: 'default',
-                };
-                
-                await this.messageHandler(msgCtx);
-            } catch (err) {
-                console.error('[Telegram] Error in message handler:', err);
-            }
-        });
-        
-        this.bot.start().then(() => {
-            console.log('[Telegram] Bot stopped gracefully');
-        }).catch((err) => {
-            if (this.isRunning) {
-                console.error('[Telegram] Bot polling error:', err);
-            }
-        });
-        
-        this.isRunning = true;
-        console.log('🚀 Telegram adapter started');
-    }
-    
-    async stop() {
-        this.isRunning = false;
-        
-        for (const interval of this.typingIntervals.values()) {
-            clearInterval(interval);
-        }
-        this.typingIntervals.clear();
-        
-        if (this.bot) {
-            await this.bot.stop();
-            this.bot = null;
-        }
-        
-        console.log('👋 Telegram adapter stopped');
-    }
-    
-    onMessage(handler) {
-        this.messageHandler = handler;
-    }
-    
-    async sendMessage(threadId, text) {
-        if (!this.bot) {
-            throw new Error('Telegram adapter not started');
-        }
-        
-        const chunks = splitMessage(text, { maxLength: 4000, addContinuationMarker: false });
-        
-        for (const chunk of chunks) {
-            await this.bot.api.sendMessage(threadId, chunk, { parse_mode: 'Markdown' });
-        }
-    }
-    
-    async sendTyping(threadId, isTyping) {
-        if (!this.bot) {
-            return;
-        }
-        
-        if (isTyping) {
-            try {
-                await this.bot.api.sendChatAction(threadId, 'typing');
-            } catch {
-                // Ignore errors
-            }
-            
-            const existing = this.typingIntervals.get(threadId);
-            if (existing) {
-                clearInterval(existing);
-            }
-            
-            const interval = setInterval(async () => {
-                try {
-                    await this.bot.api.sendChatAction(threadId, 'typing');
-                } catch {
-                    // Ignore errors
-                }
-            }, 4000);
-            
-            this.typingIntervals.set(threadId, interval);
-        } else {
-            const interval = this.typingIntervals.get(threadId);
-            if (interval) {
-                clearInterval(interval);
-                this.typingIntervals.delete(threadId);
-            }
-        }
-    }
-}
-
-export const telegramAdapter = new TelegramAdapter();
-
-// Legacy startBot function for backward compatibility
 export async function startBot() {
     const { loadConfig } = await import('../core/config.js');
     const config = loadConfig();
-    
+
     if (!config.telegramBotToken || config.telegramBotToken === 'your_bot_token_here') {
-        console.log('');
-        console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
-        console.log('  ❌ Telegram Bot Token not configured');
-        console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
-        console.log('');
-        console.log('  To get your bot token:');
-        console.log('  1. Open Telegram app');
-        console.log('  2. Search for @BotFather');
-        console.log('  3. Send: /newbot');
-        console.log('  4. Follow the instructions to create your bot');
-        console.log('  5. Copy the token');
-        console.log('');
-        console.log('  Then run: opencode-remote config');
-        console.log('');
-        console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+        console.log('\n❌ Telegram Bot Token not configured\n');
+        console.log('To get your bot token:');
+        console.log('  1. Open Telegram app, search @BotFather');
+        console.log('  2. Send /newbot and follow instructions');
+        console.log('  3. Then run: opencode-remote config\n');
         process.exit(1);
     }
-    
-    console.log('');
-    console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
-    console.log('  OpenCode Remote Control');
-    console.log('  Control OpenCode from Telegram');
-    console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
-    console.log('');
-    
-    // Initialize session manager
+
     await sessionManager.start();
-    
-    // Load plugins
     await registry.loadBuiltInPlugins();
-    
-    // Initialize Telegram adapter
     await telegramAdapter.start(config);
-    
-    // Set up message handler
+
     let openCodeSessions = new Map();
     let opencodeSessionId = null;
 
+    telegramAdapter.bot.on('message:text', async (ctx) => {
+        if (ctx.message.from.is_bot) return;
+        if (!telegramAdapter.messageHandler) return;
+
+        try {
+            const message = {
+                id: ctx.message.message_id.toString(),
+                threadId: ctx.chat.id.toString(),
+                userId: ctx.message.from?.id?.toString() || 'unknown',
+                text: ctx.message.text || '',
+                timestamp: new Date(ctx.message.date * 1000),
+                channelId: 'default',
+            };
+            const msgCtx = { message, platform: 'telegram', channelId: 'default' };
+            await telegramAdapter.messageHandler(msgCtx);
+        } catch (err) {
+            console.error('[Telegram] Error:', err);
+        }
+    });
+
+    telegramAdapter.bot.start().catch((err) => {
+        if (telegramAdapter.isRunning) console.error('[Telegram] Polling error:', err);
+    });
+
     telegramAdapter.onMessage(async (ctx) => {
         const { message, platform, channelId } = ctx;
 
@@ -198,23 +62,22 @@ export async function startBot() {
                 try {
                     const session = await sessionManager.getExistingSession(platform, channelId, message.threadId);
                     if (session) await sessionManager.resetConversation(platform, channelId, message.threadId);
-                } catch (e) { console.warn('[Telegram] Error resetting session:', e.message); }
+                } catch (e) { console.warn('[Telegram] Reset error:', e.message); }
             }
 
             if (parsed.type === 'default') {
                 const connected = await checkConnection();
                 if (!connected) {
                     await telegramAdapter.sendTyping(message.threadId, false);
-                    await telegramAdapter.sendMessage(message.threadId, '❌ OpenCode 离线，请检查服务是否运行');
+                    await telegramAdapter.sendMessage(message.threadId, '❌ OpenCode 离线');
                     return;
                 }
-
                 let session = openCodeSessions.get(message.threadId);
                 if (!session) {
                     const newSession = await createSession(message.threadId, `Telegram ${message.threadId}`);
                     if (!newSession) {
                         await telegramAdapter.sendTyping(message.threadId, false);
-                        await telegramAdapter.sendMessage(message.threadId, '❌ 无法创建 OpenCode 会话');
+                        await telegramAdapter.sendMessage(message.threadId, '❌ 无法创建会话');
                         return;
                     }
                     session = newSession;
@@ -226,18 +89,15 @@ export async function startBot() {
                     onTextDelta: () => {},
                     onEvent: (event) => {
                         if (event.type === 'tool.call') {
-                            const props = event.properties || {};
-                            const toolName = props.name || 'unknown';
-                            telegramAdapter.sendMessage(message.threadId, `🔧 ${toolName}`).catch(() => {});
+                            const n = event.properties?.name || 'unknown';
+                            telegramAdapter.sendMessage(message.threadId, `🔧 ${n}`).catch(() => {});
                         }
                     },
                 });
 
                 await telegramAdapter.sendTyping(message.threadId, false);
-
                 if (response) {
-                    const chunks = splitMessage(response);
-                    for (const chunk of chunks) {
+                    for (const chunk of splitMessage(response)) {
                         if (chunk.trim()) await telegramAdapter.sendMessage(message.threadId, chunk);
                     }
                 }
@@ -245,44 +105,25 @@ export async function startBot() {
             }
 
             const result = await routeMessage(parsed, {
-                threadId: message.threadId,
-                channelId,
-                platform,
-                defaultAgent: 'opencode',
-                opencodeSessionId,
+                threadId: message.threadId, channelId, platform,
+                defaultAgent: 'opencode', opencodeSessionId,
             });
 
             await telegramAdapter.sendTyping(message.threadId, false);
-
             if (typeof result === 'string') {
                 await telegramAdapter.sendMessage(message.threadId, result);
             } else if (result) {
-                let fullResponse = '';
-                for await (const chunk of result) {
-                    fullResponse += chunk;
-                }
-                if (fullResponse) await telegramAdapter.sendMessage(message.threadId, fullResponse);
+                let full = '';
+                for await (const chunk of result) full += chunk;
+                if (full) await telegramAdapter.sendMessage(message.threadId, full);
             }
         } catch (error) {
-            console.error('Error handling message:', error);
+            console.error('[Telegram] Error:', error);
             await telegramAdapter.sendTyping(message.threadId, false);
-            await telegramAdapter.sendMessage(message.threadId, '❌ 处理失败，请重试。');
+            await telegramAdapter.sendMessage(message.threadId, '❌ 处理失败');
         }
     });
-    
-    console.log('🚀 Starting Telegram bot...');
-    console.log('');
-    console.log('Available commands:');
-    console.log('  /start - Start bot');
-    console.log('  /help - Show all commands');
-    console.log('  /agents - List available agents');
-    console.log('  /new - Start new conversation');
-    console.log('  /reset - Reset session');
-    console.log('  /oc <prompt> - Use OpenCode');
-    console.log('  /cc <prompt> - Use Claude Code');
-    console.log('  /cx <prompt> - Use Codex');
-    console.log('');
-    
-    // Keep process alive
+
+    console.log('🚀 Telegram bot ready');
     await new Promise(() => {});
 }

package/dist/weixin/bot.js

@@ -134,6 +134,7 @@ export async function startWeixinBot(botConfig, restartFn) {
     globalThis.__weixinBotRunning = () => running;
 
     let buf = '';
+    let retryCount = 0;
     console.log('Polling for messages...');
 
     if (process.env.OPENCODE_RESTART === '1') {
@@ -170,8 +171,17 @@ export async function startWeixinBot(botConfig, restartFn) {
             }
         } catch (e) {
             if (!running) break;
-            console.error('Polling error:', e);
-            await new Promise(r => setTimeout(r, 2000));
+            const errMsg = e.message || '';
+            const isConnReset = errMsg.includes('ECONNRESET') || errMsg.includes('fetch failed');
+            if (isConnReset) {
+                retryCount++;
+                const delay = Math.min(2000 * retryCount, 15000);
+                console.error(`[bot] Connection error (${retryCount}), retry in ${delay}ms...`);
+                await new Promise(r => setTimeout(r, delay));
+            } else {
+                console.error('Polling error:', e);
+                await new Promise(r => setTimeout(r, 2000));
+            }
         }
     }
     

package/dist/weixin/commands.js

@@ -1,4 +1,4 @@
-import { detectCommand, COMMAND_ALIASES } from '../core/router.js';
+import { detectCommand, COMMAND_ALIASES, getHelpText } from '../core/router.js';
 import { getOrCreateSession, saveSessionMapping, sessionManager } from '../core/session.js';
 import { splitMessage } from '../core/notifications.js';
 import { initOpenCode, checkConnection, abortSession, resumeSession, revertSessionMessage, unrevertSession, listProviders, updateGlobalModel } from '../opencode/client.js';
@@ -91,36 +91,7 @@ async function handleCommand(adapter, ctx, command, arg, openCodeSessions) {
             return true;
         }
         case 'help':
-            await adapter.reply(ctx.threadId, `📖 指令
-
-🟢 常用:
-/start — 首次认证
-/help — 帮助
-/status — 查看状态
-/reset — 重置会话
-/copy — 复制回复
-/revert — 撤销消息
-
-🔄 任务:
-/loop — 循环执行
-/refresh — 刷新上下文
-/restart — 重启 bot
-/stop — 停止 bot
-
-📂 会话:
-/sessions — 浏览会话
-/delsessions — 删除会话
-
-🤖 AI 模型:
-/model — 切换模型
-/agents — 查看可用 Agent
-/oc — 使用 OpenCode
-/cc — 使用 Claude Code
-
-⬆️ 文件:
-/upload — 上传构建产物
-
-💬 直接发消息给 AI!`);
+            await adapter.reply(ctx.threadId, getHelpText());
             return true;
                 case 'status': {
                     const connected = await checkConnection();
@@ -489,17 +460,6 @@ async function handleCommand(adapter, ctx, command, arg, openCodeSessions) {
             return true;
         }
 
-        case 'stop': {
-            await adapter.reply(ctx.threadId, '🛑 正在停止 bot...');
-            setTimeout(() => {
-                if (globalThis.__weixinBotShutdown) {
-                    globalThis.__weixinBotShutdown(false);
-                }
-                setTimeout(() => process.exit(0), 1000);
-            }, 500);
-            return true;
-        }
-
         case 'upload': {
             const projectDir = session.projectDir || globalThis.__autoProjectDir;