@yvhitxcel/opencode-remote 0.17.0 → 0.18.0

package/dist/weixin/adapter.js

@@ -7,13 +7,35 @@ function createWeixinAdapter(baseUrl, token, botId) {
     const processedMessages = new Map();
     const DEDUP_WINDOW_MS = 30_000;
 
-    function isDuplicate(messageId) {
-        if (!messageId) return false;
-        const seenAt = processedMessages.get(messageId);
-        if (seenAt && Date.now() - seenAt < DEDUP_WINDOW_MS) return true;
-        processedMessages.set(messageId, Date.now());
+    // 定期清理 contextTokens 和 typingTickets，防内存泄漏
+    const CLEANUP_INTERVAL_MS = 30 * 60 * 1000;
+    let cleanupTimer = null;
+    function startCleanup() {
+        if (cleanupTimer) return;
+        cleanupTimer = setInterval(() => {
+            const cutoff = Date.now() - CLEANUP_INTERVAL_MS;
+            for (const [k, v] of contextTokens) { if (typeof v !== 'object' || !v._ts || v._ts < cutoff) contextTokens.delete(k); }
+            for (const [k, v] of typingTickets) { if (typeof v !== 'object' || !v._ts || v._ts < cutoff) typingTickets.delete(k); }
+            if (processedMessages.size > 1000) {
+                const now = Date.now();
+                for (const [id, ts] of processedMessages.entries()) {
+                    if (now - ts > DEDUP_WINDOW_MS) processedMessages.delete(id);
+                }
+            }
+        }, CLEANUP_INTERVAL_MS);
+        if (cleanupTimer.unref) cleanupTimer.unref();
+    }
+    startCleanup();
+
+    function isDuplicate(messageId, contentKey) {
+        // 优先用内容去重: 微信两条消息可能 messageId 不同但内容相同
+        const key = contentKey || messageId;
+        if (!key) return false;
+        const now = Date.now();
+        const seenAt = processedMessages.get(key);
+        if (seenAt && now - seenAt < DEDUP_WINDOW_MS) return true;
+        processedMessages.set(key, now);
         if (processedMessages.size > 1000) {
-            const now = Date.now();
             for (const [id, ts] of processedMessages.entries()) {
                 if (now - ts > DEDUP_WINDOW_MS) processedMessages.delete(id);
             }
@@ -29,7 +51,8 @@ function createWeixinAdapter(baseUrl, token, botId) {
         _token: token,
         _botId: botId,
         async reply(threadId, text) {
-            let contextToken = contextTokens.get(threadId);
+            let entry = contextTokens.get(threadId);
+            let contextToken = entry?.value || entry;
             let retryCount = 0;
             const maxRetries = 2;
 
@@ -40,7 +63,7 @@ function createWeixinAdapter(baseUrl, token, botId) {
                         const r = await getConfig({ baseUrl, token, ilinkUserId: threadId, contextToken: undefined });
                         contextToken = r.context_token || r.typing_ticket;
                         if (contextToken) {
-                            contextTokens.set(threadId, contextToken);
+                            contextTokens.set(threadId, { value: contextToken, _ts: Date.now() });
                             console.log(`[Weixin] Got contextToken: ${contextToken.slice(0, 8)}...`);
                         } else if (r.errcode === -14) {
                             console.log(`[Weixin] Session timeout, retrying with fresh token...`);
@@ -88,24 +111,24 @@ function createWeixinAdapter(baseUrl, token, botId) {
             throw err;
         },
         async sendTypingIndicator(threadId) {
-            const cachedTicket = typingTickets.get(threadId);
-            let ticket = cachedTicket;
+            const entry = typingTickets.get(threadId);
+            let ticket = entry?.value || entry;
             
             if (!ticket) {
                 try {
-                    const r = await getConfig({ baseUrl, token, ilinkUserId: threadId, contextToken: contextTokens.get(threadId) });
+                    const r = await getConfig({ baseUrl, token, ilinkUserId: threadId, contextToken: (contextTokens.get(threadId) || {}).value });
                     if (r.errcode === -14) {
                         contextTokens.delete(threadId);
                         typingTickets.delete(threadId);
                         const freshConfig = await getConfig({ baseUrl, token, ilinkUserId: threadId, contextToken: undefined });
                         ticket = freshConfig.typing_ticket;
                         if (freshConfig.context_token) {
-                            contextTokens.set(threadId, freshConfig.context_token);
+                            contextTokens.set(threadId, { value: freshConfig.context_token, _ts: Date.now() });
                         }
                     } else {
                         ticket = r.typing_ticket;
                     }
-                    if (ticket) typingTickets.set(threadId, ticket);
+                    if (ticket) typingTickets.set(threadId, { value: ticket, _ts: Date.now() });
                 } catch { console.debug('[typing] getConfig failed'); }
             }
             if (ticket) {
@@ -118,7 +141,7 @@ function createWeixinAdapter(baseUrl, token, botId) {
                         try {
                             const freshConfig = await getConfig({ baseUrl, token, ilinkUserId: threadId, contextToken: undefined });
                             if (freshConfig.typing_ticket) {
-                                typingTickets.set(threadId, freshConfig.typing_ticket);
+                                typingTickets.set(threadId, { value: freshConfig.typing_ticket, _ts: Date.now() });
                                 await sendTyping({ baseUrl, token, body: { ilink_user_id: threadId, typing_ticket: freshConfig.typing_ticket, status: 1 } });
                             }
                         } catch { console.debug('[typing] retry getConfig failed'); }
@@ -132,4 +155,3 @@ function createWeixinAdapter(baseUrl, token, botId) {
 }
 
 export { createWeixinAdapter };
-export default createWeixinAdapter;

package/dist/weixin/api.js

@@ -129,26 +129,47 @@ export async function getUpdates(params) {
     }
 }
 /**
- * Send a message
+ * Send a message with rate limit retry
  */
 export async function sendMessage(params) {
-    const rawText = await apiFetch({
-        baseUrl: params.baseUrl,
-        endpoint: 'ilink/bot/sendmessage',
-        body: JSON.stringify({
-            ...params.body,
-            base_info: { channel_version: '1.0.0' },
-        }),
-        token: params.token,
-        timeoutMs: params.timeoutMs ?? DEFAULT_API_TIMEOUT_MS,
-        label: 'sendMessage',
-    });
-    try {
-        JSON.parse(rawText);
-    }
-    catch (e) {
-        console.debug('[api] Non-JSON response:', e.message);
+    const MAX_ATTEMPTS = 3;
+    let lastErr;
+    for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
+        try {
+            const rawText = await apiFetch({
+                baseUrl: params.baseUrl,
+                endpoint: 'ilink/bot/sendmessage',
+                body: JSON.stringify({
+                    ...params.body,
+                    base_info: { channel_version: '1.0.0' },
+                }),
+                token: params.token,
+                timeoutMs: params.timeoutMs ?? DEFAULT_API_TIMEOUT_MS,
+                label: 'sendMessage',
+            });
+            // 微信返回限流错误码时，rawText 含 errcode，重试
+            try {
+                const j = JSON.parse(rawText);
+                if (j && typeof j.errcode === 'number' && (j.errcode === -1001 || j.errcode === -1002 || j.errcode === 45009 || j.errcode === 45047)) {
+                    const backoff = 1000 * attempt;
+                    console.warn(`[sendMessage] rate-limited (errcode=${j.errcode}), retry in ${backoff}ms (${attempt}/${MAX_ATTEMPTS})`);
+                    await new Promise(r => setTimeout(r, backoff));
+                    continue;
+                }
+            } catch (e) { console.debug('[sendMessage] parse error:', e.message); }
+            return;
+        } catch (err) {
+            lastErr = err;
+            if (attempt < MAX_ATTEMPTS && /AbortError|fetch failed|ECONNRESET/i.test(err.message || '')) {
+                const backoff = 1000 * attempt;
+                console.warn(`[sendMessage] transient error, retry in ${backoff}ms: ${err.message}`);
+                await new Promise(r => setTimeout(r, backoff));
+                continue;
+            }
+            throw err;
+        }
     }
+    throw lastErr;
 }
 /**
  * Get bot config (includes typing_ticket)

package/dist/weixin/bot.js

@@ -9,8 +9,22 @@ import { DEFAULT_BASE_URL } from './types.js';
 import { createWeixinAdapter } from './adapter.js';
 import { handleMessage } from './handler.js';
 import { userAdapterMap } from './user-adapter-map.js';
+import { initState } from '../core/state.js';
+import { initLogger, cleanOldLogs, logger } from '../core/log.js';
+import { LRUSessionMap } from '../core/lru.js';
+import { encryptCredential, decryptCredential } from '../core/crypto.js';
 export { COMMAND_ALIASES, detectCommand } from '../core/router.js';
 
+let _initialized = false;
+function initBot() {
+    if (_initialized) return;
+    _initialized = true;
+    initLogger();
+    cleanOldLogs();
+    initState();
+    logger.info('Bot starting', { ts: new Date().toISOString() });
+}
+
 const CONFIG_DIR = join(homedir(), '.opencode-remote');
 const WEIXIN_DIR = join(CONFIG_DIR, 'weixin');
 const CREDENTIALS_DIR = join(WEIXIN_DIR, 'credentials');
@@ -18,7 +32,6 @@ const INSTANCE_ID = process.env.OPENCODE_INSTANCE_ID || 'default';
 const CREDENTIALS_FILE = INSTANCE_ID === 'default'
     ? join(WEIXIN_DIR, 'credentials.json')
     : join(WEIXIN_DIR, `credentials-${INSTANCE_ID}.json`);
-const RESTART_NOTIFY_FILE = join(WEIXIN_DIR, 'restart-notify.json');
 
 const botInstances = [];
 
@@ -62,7 +75,16 @@ export function loadAllCredentials() {
         const files = readdirSync(CREDENTIALS_DIR).filter(f => f.endsWith('.json'));
         if (files.length > 0) {
             return files.map(f => {
-                try { return JSON.parse(readFileSync(join(CREDENTIALS_DIR, f), 'utf-8')); }
+                try {
+                    const raw = readFileSync(join(CREDENTIALS_DIR, f), 'utf-8');
+                    const obj = JSON.parse(raw);
+                    // 检测是否加密信封 → 解密
+                    if (obj && obj.v === 1 && obj.enc) {
+                        const decrypted = decryptCredential(obj.enc);
+                        if (decrypted) return JSON.parse(decrypted);
+                    }
+                    return obj;
+                }
                 catch (e) { console.debug('[credentials] Failed to parse:', f, e.message); return null; }
             }).filter(Boolean);
         }
@@ -81,7 +103,10 @@ export function loadWeixinCredentials() {
 export function saveWeixinCredentials(creds) {
     ensureDirs();
     const filePath = join(CREDENTIALS_DIR, `credentials-${creds.accountId}.json`);
-    writeFileSync(filePath, JSON.stringify({ ...creds, savedAt: new Date().toISOString() }, null, 2), 'utf-8');
+    const plain = JSON.stringify({ ...creds, savedAt: new Date().toISOString() }, null, 2);
+    const enc = encryptCredential(plain);
+    const envelope = { v: 1, enc, savedAt: new Date().toISOString() };
+    writeFileSync(filePath, JSON.stringify(envelope, null, 2), 'utf-8');
     try { const s = statSync(filePath); chmodSync(filePath, (s.mode & 0o777) | 0o600); } catch (e) { console.warn('[credentials] chmod failed:', e.message); }
 }
 
@@ -108,9 +133,9 @@ async function runPollingLoop(adapter, baseUrl, token, openCodeSessions, signal)
                 if (!fromUserId || !text) continue;
                 userAdapterMap.set(fromUserId, adapter);
                 const messageId = msg.message_id?.toString();
-                if (adapter.isDuplicate(messageId)) continue;
-                if (msg.context_token) adapter.contextTokens.set(fromUserId, msg.context_token);
-                handleMessage(adapter, { platform: 'weixin', threadId: fromUserId, userId: fromUserId, messageId }, text, openCodeSessions).catch(e => console.error('Handle error:', e));
+                if (adapter.isDuplicate(messageId, `${fromUserId}:${text}`)) continue;
+                if (msg.context_token) adapter.contextTokens.set(fromUserId, { value: msg.context_token, _ts: Date.now() });
+                try { await handleMessage(adapter, { platform: 'weixin', threadId: fromUserId, userId: fromUserId, messageId }, text, openCodeSessions); } catch (e) { console.error('Handle error:', e); }
             }
         } catch (e) {
             if (signal.aborted) break;
@@ -142,6 +167,9 @@ export function addBotInstance(creds, openCodeSessions) {
 }
 
 export async function startWeixinBot(botConfig, restartFn) {
+    // 仅在子进程启动时初始化日志和状态 (不在父进程 import 时)
+    initBot();
+    process.on('unhandledRejection', (reason) => { console.error('[bot] Unhandled Rejection:', reason); });
     if (restartFn) _restartCallback = restartFn;
     console.log('');
     console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
@@ -160,25 +188,32 @@ export async function startWeixinBot(botConfig, restartFn) {
     }
     const firstCreds = credentialsList[0];
     console.log(`Using account: ${firstCreds.accountId}${credentialsList.length > 1 ? ` (+${credentialsList.length - 1} more)` : ''}`);
-    const openCodeSessions = new Map();
-
-    try { await initOpenCode(); console.log('OpenCode ready'); } catch (e) { console.error('Failed to init OpenCode:', e); }
+    const openCodeSessions = new LRUSessionMap({ maxSize: 100, ttlMs: 30 * 60 * 1000, name: 'opencode-sessions' });
+    // 定期清理过期 session (每 5 分钟)
+    setInterval(() => openCodeSessions.cleanup(), 5 * 60 * 1000).unref();
 
+    let opencodeServer = null;
     try {
         const opencode = await initOpenCode();
         if (opencode) {
+            opencodeServer = opencode.server;
+            globalThis.__opencodeServer = opencode.server;
+            console.log('OpenCode ready');
             const result = await opencode.client.session.list();
             if (!result.error && result.data && result.data.length > 0) {
                 const sorted = result.data.sort((a, b) => (b.updated_at || 0) - (a.updated_at || 0));
                 const latest = sorted[0];
                 console.log(`Latest OpenCode session: ${latest.title || 'Untitled'} (${latest.id.slice(0, 8)}...)`);
                 if (latest.directory) {
-                    console.log(`Project directory: ${latest.directory}`);
-                    globalThis.__autoProjectDir = latest.directory;
+                    // resume 的目录可能指向 bot 自身而非 openchat 项目
+                    // 如果 resume 目录没 lab.mjs，尝试 fallback 到 openchat 项目
+                    const projectDir = existsSync(`${latest.directory}/bridge/bin/lab.mjs`) ? latest.directory : (existsSync('F:\\openchat\\bridge\\bin\\lab.mjs') ? 'F:\\openchat' : latest.directory);
+                    console.log(`Project directory: ${projectDir}`);
+                    globalThis.__autoProjectDir = projectDir;
                 }
             }
         }
-    } catch (e) { console.warn('⚠️ Auto-resume failed:', e.message); }
+    } catch (e) { console.error('Failed to init OpenCode:', e); }
 
     if (!getAuthStatus().weixin) {
         console.log('\n🔒 Bot not secured! First user to send /start becomes owner.\n');
@@ -189,16 +224,9 @@ export async function startWeixinBot(botConfig, restartFn) {
         addBotInstance(creds, openCodeSessions);
     }
 
-    const firstAdapter = botInstances[0]?.adapter;
-    try {
-        if (existsSync(RESTART_NOTIFY_FILE)) {
-            const data = JSON.parse(readFileSync(RESTART_NOTIFY_FILE, 'utf8'));
-            if (data.threadId && Date.now() - data.time < 60000 && firstAdapter) {
-                await firstAdapter.reply(data.threadId, '✅ Bot 重启完成！');
-            }
-            unlinkSync(RESTART_NOTIFY_FILE);
-        }
-    } catch (e) { console.warn('[restart-notify] Failed to read restart file:', e.message); }
+    // IPC 心跳：每 30s 通知父进程还活着
+    const hbTimer = setInterval(() => { try { process.send?.({ type: 'heartbeat', ts: Date.now() }); } catch {} }, 30_000);
+    if (hbTimer.unref) hbTimer.unref();
 
     let shouldRestart = false;
     const shutdown = (restart = false) => {
@@ -207,7 +235,8 @@ export async function startWeixinBot(botConfig, restartFn) {
         for (const instance of botInstances) {
             try { instance.abortController.abort(); } catch (e) { }
         }
-        for (const [, s] of openCodeSessions.entries()) { try { s.server?.shutdown?.(); } catch (e) { console.warn('[shutdown] Server shutdown error:', e.message); } }
+        // 关掉 opencode server 进程，防重启后端口冲突
+        try { globalThis.__opencodeServer?.kill?.(); } catch (e) { console.warn('[shutdown] Server kill error:', e.message); }
         openCodeSessions.clear();
     };
 
@@ -216,6 +245,7 @@ export async function startWeixinBot(botConfig, restartFn) {
 
     if (process.env.OPENCODE_RESTART === '1') {
         try {
+            const firstAdapter = botInstances[0]?.adapter;
             const restartInfoPath = join(process.env.HOME || process.cwd(), '.opencode-remote', '.restart_user.json');
             if (existsSync(restartInfoPath)) {
                 const restartInfo = JSON.parse(readFileSync(restartInfoPath, 'utf8'));
@@ -231,12 +261,17 @@ export async function startWeixinBot(botConfig, restartFn) {
     }
 
     console.log(`✅ ${botInstances.length} bot instance(s) running`);
+    console.log('📡 Listening for WeChat messages...');
 
     await new Promise(resolve => {
         globalThis.__weixinBotShutdownAndExit = (restart) => {
             shutdown(restart);
             resolve();
         };
+        // 收到信号时清理 opencode server 后再退出
+        const handleSignal = () => { shutdown(false); resolve(); };
+        process.on('SIGINT', handleSignal);
+        process.on('SIGTERM', handleSignal);
     });
 
     if (shouldRestart) {

package/dist/weixin/commands.js

@@ -4,10 +4,14 @@ import { abortSession, initOpenCode, listProviders, getThreadModel, setThreadMod
 import { claimOwnership, hasOwner } from '../core/auth.js';
 import { registry } from '../core/registry.js';
 import { deleteFromQiniu } from '../core/qiniu.js';
+import { formatInfo, incr, incrKey } from '../core/stats.js';
+import { listAgentProcesses } from '../core/agent-registry.js';
+import { threadHistory } from '../core/state.js';
 import { join } from 'path';
 import { existsSync } from 'fs';
 import { homedir } from 'os';
 import { DEFAULT_BASE_URL } from './types.js';
+import { threadAgent } from '../core/state.js';
 import { userAdapterMap } from './user-adapter-map.js';
 
 // 共享会话
@@ -27,7 +31,7 @@ export function removeSharedMember(threadId) {
 }
 
 // 线程级活跃 agent 追踪
-export const threadAgent = new Map();
+export { threadAgent };
 
 async function handleAgentSwitch(adapter, ctx, agentName, prompt) {
     const agent = registry.findAgent(agentName);
@@ -65,12 +69,21 @@ async function handleAgentSwitch(adapter, ctx, agentName, prompt) {
         threadAgent.set(ctx.threadId, agentName);
     }
 
-    await adapter.sendTyping?.(ctx.threadId, true);
+    // 兼容旧版 -c 前缀（清理历史中残留的 -c）
+    const cleanPrompt = prompt.replace(/^-c\s+/, '').trim();
+
+    adapter.sendTypingIndicator(ctx.threadId).catch(() => {});
+
+    // 传入 threadHistory 让对话有上下文
+    const history = threadHistory.get(ctx.threadId) || [];
+    const recentHistory = history.slice(-20);
 
     try {
-        const response = await agent.sendPrompt(agentName, prompt, [], { projectDir: globalThis.__autoProjectDir });
+        const response = await agent.sendPrompt(agentName, cleanPrompt, recentHistory, { projectDir: globalThis.__autoProjectDir, threadId: ctx.threadId });
 
-        await adapter.sendTyping?.(ctx.threadId, false);
+        // 更新历史（用清理后的 prompt）
+        history.push({ role: 'user', content: cleanPrompt }, { role: 'assistant', content: response || '' });
+        threadHistory.set(ctx.threadId, history);
 
         const chunks = splitMessage(response || '无响应');
         for (const chunk of chunks) {
@@ -85,11 +98,15 @@ async function handleAgentSwitch(adapter, ctx, agentName, prompt) {
     return true;
 }
 
-async function handleCommand(adapter, ctx, command, arg, openCodeSessions) {
+async function handleCommand(adapter, ctx, platform, command, arg, openCodeSessions) {
+    // Count this command invocation
+    incr('messagesSent');
+    incrKey('commandsByType', command);
+
     const session = {};
     switch (command) {
         case 'start': {
-            const result = claimOwnership('weixin', ctx.userId);
+            const result = claimOwnership(platform, ctx.userId);
             if (result.success) {
                 if (result.message === 'claimed') {
                     await adapter.reply(ctx.threadId, `🔐 安全设置完成！你是此 bot 的唯一所有者。\n\n发送消息给 OpenCode 开始工作\n/help 查看指令`);
@@ -107,6 +124,8 @@ async function handleCommand(adapter, ctx, command, arg, openCodeSessions) {
         case 'restart': {
             console.log('[bot] restart command received');
             await adapter.reply(ctx.threadId, '🔄 正在重启 bot...');
+            // 关掉 opencode server，防新子进程端口冲突
+            try { globalThis.__opencodeServer?.kill?.(); } catch {}
             const fs = await import('fs');
             const remoteDir = join(process.env.HOME || process.cwd(), '.opencode-remote');
             if (!fs.existsSync(remoteDir)) {
@@ -131,6 +150,73 @@ async function handleCommand(adapter, ctx, command, arg, openCodeSessions) {
             return true;
         }
 
+        case 'esc': {
+            const session = openCodeSessions?.get(ctx.threadId);
+            const parts = [];
+            // 1. 杀 CLI 进程 (cc/cx/copilot 模式)
+            const { killAgentProcess, getAgentProcess } = await import('../core/agent-registry.js');
+            const ap = getAgentProcess(ctx.threadId);
+            if (ap) {
+                const r = killAgentProcess(ctx.threadId);
+                parts.push(`🛑 ${r.agentName} 子进程已终止 (pid ${ap.process.pid})`);
+            }
+            // 2. 中断 OpenCode SDK session
+            if (session) {
+                const ok = await abortSession(session);
+                parts.push(ok ? '🛑 OpenCode session 已中断' : '⚠️ OpenCode session 中断失败');
+            }
+            if (parts.length === 0) {
+                await adapter.reply(ctx.threadId, '⚠️ 没有活跃任务');
+                return true;
+            }
+            await adapter.reply(ctx.threadId, parts.join('\n'));
+            return true;
+        }
+
+        case 'status': {
+            const session = openCodeSessions?.get(ctx.threadId);
+            if (!session) {
+                await adapter.reply(ctx.threadId, '⚠️ 当前线程无 session\n发送任意消息创建 session');
+                return true;
+            }
+            try {
+                const r = await session.client.session.status();
+                const all = r.data || {};
+                const s = all[session.sessionId];
+                if (!s) {
+                    await adapter.reply(ctx.threadId, `📊 Session: ${session.sessionId.slice(0, 8)}\n状态: unknown (server 未返回)`);
+                    return true;
+                }
+                const icon = s.type === 'idle' ? '🟢' : s.type === 'busy' ? '🔴' : '🟡';
+                const label = s.type === 'idle' ? '待命' : s.type === 'busy' ? '活跃' : `重试中 (attempt ${s.attempt})`;
+                let msg = `${icon} ${label}\nSession: ${session.sessionId.slice(0, 8)}`;
+                if (s.type === 'retry' && s.next) {
+                    const wait = Math.max(0, Math.round((s.next - Date.now()) / 1000));
+                    msg += `\n下次重试: ${wait}s 后`;
+                }
+                await adapter.reply(ctx.threadId, msg);
+            } catch (e) {
+                await adapter.reply(ctx.threadId, `❌ 状态查询失败: ${e.message}`);
+            }
+            return true;
+        }
+
+        case 'info': {
+            try {
+                const agentChildren = listAgentProcesses().length;
+                const activeThreads = threadHistory.size;
+                const msg = formatInfo({
+                    version: process.env.npm_package_version || 'dev',
+                    activeThreads,
+                    agentChildren,
+                });
+                await adapter.reply(ctx.threadId, msg);
+            } catch (e) {
+                await adapter.reply(ctx.threadId, `❌ /info 失败: ${e.message}`);
+            }
+            return true;
+        }
+
         case 'delete': {
             const keyToDelete = arg ? arg.trim() : null;
 
@@ -335,7 +421,7 @@ async function handleCommand(adapter, ctx, command, arg, openCodeSessions) {
 
         case 'share': {
             const val = arg?.trim().toLowerCase();
-            const isOwner = hasOwner('weixin') && claimOwnership('weixin', ctx.userId);
+            const isOwner = hasOwner(platform) && claimOwnership(platform, ctx.userId);
 
             if (!val || val === 'status') {
                 const members = [...sharedRoom.members].join(', ') || '无';
@@ -501,10 +587,48 @@ async function handleCommand(adapter, ctx, command, arg, openCodeSessions) {
             return true;
         }
 
+        case 'lab': {
+            const { spawnSync } = await import('child_process');
+            const { existsSync } = await import('fs');
+            const projectDir = globalThis.__autoProjectDir || process.cwd();
+            if (!existsSync(`${projectDir}/bridge/bin/lab.mjs`)) {
+                await adapter.reply(ctx.threadId, '❌ 此指令仅在 openchat 项目下可用');
+                return true;
+            }
+            const subCmd = ctx.arg || 'status';
+            // Whitelist: only alnum + - and _ allowed. Defense-in-depth even though
+            // spawnSync with shell:false would block shell injection on its own.
+            if (!/^[a-zA-Z0-9_-]+$/.test(subCmd)) {
+                await adapter.reply(ctx.threadId, `❌ /lab 子命令非法: "${subCmd}"\n仅允许字母数字 + -_`);
+                return true;
+            }
+            try {
+                // spawnSync with shell:false — user input is passed as argv element,
+                // never interpreted by cmd.exe. lab.mjs validates the cmd via its
+                // own if/else chain and falls through to showUsage() for unknown cmds.
+                const result = spawnSync('node', ['bridge/bin/lab.mjs', subCmd], {
+                    cwd: projectDir,
+                    encoding: 'utf8',
+                    timeout: 15000,
+                    maxBuffer: 2048 * 1024,
+                    shell: false,
+                });
+                if (result.error) throw result.error;
+                const out = result.stdout || '';
+                // 格式化输出
+                const formatted = formatLabOutput(out, subCmd);
+                await adapter.reply(ctx.threadId, `📋 Lab ${subCmd}\n${formatted}`);
+            } catch (e) {
+                const errMsg = e.stderr || e.message || String(e);
+                await adapter.reply(ctx.threadId, `❌ Lab 错误: ${errMsg.slice(0, 500)}`);
+            }
+            return true;
+        }
+
         case 'deploy': {
             const { gitPush } = await import('../core/git-push.js');
             await adapter.reply(ctx.threadId, '📤 正在推送代码...');
-            const result = gitPush({ message: ctx.arg || undefined });
+            const result = gitPush({ message: ctx.arg || undefined, branch: undefined });
             if (result.ok) {
                 await adapter.reply(ctx.threadId, `✅ 推送成功: ${result.successUrl}`);
             } else {
@@ -519,4 +643,6 @@ async function handleCommand(adapter, ctx, command, arg, openCodeSessions) {
     }
 }
 
+import { formatLabOutput } from '../core/handler.js';
+
 export { handleAgentSwitch, handleCommand };