@wu529778790/open-im 1.11.8-beta.3 → 1.11.8-beta.5

package/dist/clawbot/client.js

@@ -122,6 +122,17 @@ function startPolling() {
                     const extracted = extractTextContent(msg);
                     if (!extracted)
                         continue;
+                    // Skip echoed bot messages (iLink API echoes bot's own messages as USER type)
+                    // 1) Messages sent by this bot have client_id starting with "open-im:"
+                    if (msg.client_id?.startsWith('open-im:')) {
+                        log.debug(`Skipping echoed bot message: client_id=${msg.client_id}`);
+                        continue;
+                    }
+                    // 2) Bot lifecycle notifications and tool call notifications echoed back
+                    if (isBotNotificationEcho(extracted)) {
+                        log.debug(`Skipping bot notification echo: content="${extracted.substring(0, 80)}"`);
+                        continue;
+                    }
                     const chatId = msg.from_user_id ?? '';
                     const msgId = String(msg.message_id ?? msg.seq ?? '');
                     if (!chatId) {
@@ -313,6 +324,23 @@ async function extractImages(msg) {
     }
     return paths;
 }
+/**
+ * Check if extracted text is a bot notification being echoed back by the iLink API.
+ * Bot notifications have distinctive emoji prefixes that are unlikely in real user messages.
+ */
+function isBotNotificationEcho(text) {
+    const firstLine = text.split('\n')[0]?.trim() ?? '';
+    // Lifecycle/AI info notifications
+    if (firstLine.startsWith('🤖 AI:'))
+        return true;
+    // Service status notifications
+    if (firstLine.startsWith('✅ ') || firstLine.startsWith('🔄 ') || firstLine.startsWith('ℹ️ '))
+        return true;
+    // Tool call notifications (sent by streamUpdate in event-handler)
+    if (firstLine.startsWith('⚙️ '))
+        return true;
+    return false;
+}
 /**
  * Extract text content from an iLink message's item_list.
  * Returns the first text item found, or a placeholder for media types.

package/dist/config/types.d.ts

@@ -26,6 +26,8 @@ export interface Config {
     codexCliPath: string;
     codebuddyCliPath: string;
     opencodeCliPath: string;
+    /** OpenCode SDK 使用的模型（格式: providerID/modelID，如 zhipuai-coding-plan/glm-5.1） */
+    opencodeModel?: string;
     /** Claude 访问 API 的代理（如 http://127.0.0.1:7890） */
     claudeProxy?: string;
     /** Codex 访问 chatgpt.com 的代理（如 http://127.0.0.1:7890） */
@@ -186,6 +188,8 @@ export interface FileToolCodeBuddy {
 }
 export interface FileToolOpenCode {
     cliPath?: string;
+    /** 模型（格式: providerID/modelID） */
+    model?: string;
 }
 export interface FileConfig {
     telegramBotToken?: string;

package/dist/config.js

@@ -226,6 +226,7 @@ export function loadConfig() {
     const codebuddyCliPath = process.env.CODEBUDDY_CLI_PATH ?? tcb.cliPath ?? resolveWindowsCliPath(AI_TOOL_BY_ID.codebuddy.cliDefault ?? 'codebuddy');
     const topencode = file.tools?.opencode ?? {};
     const opencodeCliPath = process.env.OPENCODE_CLI_PATH ?? topencode.cliPath ?? resolveWindowsCliPath(AI_TOOL_BY_ID.opencode.cliDefault ?? 'opencode');
+    const opencodeModel = process.env.OPENCODE_MODEL ?? topencode.model;
     const claudeWorkDir = process.env.CLAUDE_WORK_DIR ?? tc.workDir ?? process.cwd();
     const skipPermissions = process.env.OPEN_IM_SKIP_PERMISSIONS === 'false'
         ? false
@@ -519,6 +520,7 @@ export function loadConfig() {
         codexCliPath,
         codebuddyCliPath,
         opencodeCliPath,
+        opencodeModel,
         claudeProxy,
         codexProxy,
         claudeWorkDir,

package/dist/opencode/sdk-runner.js

@@ -46,9 +46,15 @@ export async function runOpenCodeSdk(prompt, sessionId, workDir, callbacks, opti
     let accumulatedThinking = '';
     const toolStats = {};
     let runSettled = false;
+    let sseConnected = false;
+    // 用于等待 SSE 连接就绪后再发 prompt，避免竞态
+    const sseReadyResolve = () => { sseConnected = true; };
     const subscribeEvents = async () => {
         try {
             const sse = await client.global.event({ signal: abortController.signal });
+            // SSE 连接已建立，通知主流程可以开始 prompt
+            sseReadyResolve();
+            log.debug('SSE stream connected');
             for await (const raw of sse.stream) {
                 const ev = raw;
                 const payload = ev?.payload;
@@ -65,6 +71,16 @@ export async function runOpenCodeSdk(prompt, sessionId, workDir, callbacks, opti
                         }
                         break;
                     }
+                    case 'session.next.text.ended': {
+                        // text.ended 携带完整文本，作为 SSE 流的兜底
+                        const fullText = payload.properties.text;
+                        if (fullText && !accumulatedText) {
+                            accumulatedText = fullText;
+                            callbacks.onText(accumulatedText);
+                            log.debug(`SSE text.ended fallback: got ${fullText.length} chars`);
+                        }
+                        break;
+                    }
                     case 'session.next.reasoning.delta': {
                         const delta = payload.properties.delta;
                         if (delta) {
@@ -73,6 +89,15 @@ export async function runOpenCodeSdk(prompt, sessionId, workDir, callbacks, opti
                         }
                         break;
                     }
+                    case 'session.next.reasoning.ended': {
+                        // reasoning.ended 携带完整推理文本
+                        const fullReasoning = payload.properties.text;
+                        if (fullReasoning && !accumulatedThinking) {
+                            accumulatedThinking = fullReasoning;
+                            callbacks.onThinking?.(accumulatedThinking);
+                        }
+                        break;
+                    }
                     case 'session.next.tool.called': {
                         const tool = payload.properties.tool;
                         if (tool) {
@@ -81,6 +106,9 @@ export async function runOpenCodeSdk(prompt, sessionId, workDir, callbacks, opti
                         }
                         break;
                     }
+                    default:
+                        log.debug(`SSE unhandled event: ${payload.type}`);
+                        break;
                 }
             }
         }
@@ -91,6 +119,24 @@ export async function runOpenCodeSdk(prompt, sessionId, workDir, callbacks, opti
         }
     };
     const background = subscribeEvents();
+    // 等待 SSE 连接就绪（最多 3 秒），避免 prompt 在 SSE 未连接时就开始
+    // 如果 3 秒内 SSE 未连接，仍然继续执行（SSE 可能后续连接并补收事件）
+    const sseReady = new Promise((resolve) => {
+        const check = setInterval(() => {
+            if (sseConnected) {
+                clearInterval(check);
+                resolve();
+            }
+        }, 100);
+        // 3 秒超时：SSE 可能需要重试连接，不等太久
+        setTimeout(() => {
+            clearInterval(check);
+            if (!sseConnected)
+                log.warn('SSE not connected within 3s, proceeding with prompt anyway');
+            resolve();
+        }, 3000);
+    });
+    await sseReady;
     try {
         const result = await client.session.prompt({
             sessionID: currentSessionId,
@@ -98,16 +144,43 @@ export async function runOpenCodeSdk(prompt, sessionId, workDir, callbacks, opti
             parts: [{ type: 'text', text: prompt }],
             ...(options?.model ? { model: parseModel(options.model) } : {}),
         });
+        // 调试：dump SDK 返回值结构
+        log.info(`SDK prompt raw result: hasData=${!!result.data}, hasError=${!!result.error}, keys=${Object.keys(result).join(',')}`);
+        if (result.error) {
+            const errStr = result.error instanceof Error ? result.error.message : JSON.stringify(result.error).substring(0, 500);
+            log.info(`SDK prompt error detail: ${errStr}`);
+        }
+        if (result.data) {
+            const d = result.data;
+            log.info(`SDK prompt data keys: ${Object.keys(d).join(',')}, parts count: ${Array.isArray(d.parts) ? d.parts.length : 'N/A'}, info keys: ${d.info && typeof d.info === 'object' ? Object.keys(d.info).join(',') : 'N/A'}`);
+        }
         abortController.abort();
         await background.catch(() => { });
         runSettled = true;
+        // SDK 返回 { data, error } 二元组；error 存在时 data 为 undefined
+        const sdkError = result.error;
+        if (sdkError) {
+            const errMsg = sdkError instanceof Error ? sdkError.message : JSON.stringify(sdkError);
+            log.error(`SDK prompt returned error: ${errMsg}`);
+            callbacks.onError(errMsg);
+            return { abort: () => { } };
+        }
         const data = result.data;
+        if (!data) {
+            log.error(`SDK prompt returned no data and no error — result keys: ${Object.keys(result).join(',')}`);
+            callbacks.onError('SDK 返回空数据');
+            return { abort: () => { } };
+        }
         const parts = data?.parts ?? [];
         const finalText = parts
             .filter((p) => p.type === 'text' && typeof p.text === 'string')
             .map(p => p.text)
             .join('\n');
         const cost = data?.info?.cost ?? 0;
+        log.info(`SDK prompt completed: accumulatedText=${accumulatedText.length}, finalText=${finalText.length}, parts=${parts.length}, cost=${cost}`);
+        if (!accumulatedText && !finalText) {
+            log.warn(`SDK prompt returned empty output — data keys: ${data ? Object.keys(data).join(',') : 'null'}, parts types: ${parts.map(p => p.type).join(',')}`);
+        }
         callbacks.onComplete({
             success: true,
             result: finalText,

package/dist/shared/ai-task.js

@@ -290,7 +290,9 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
             }, {
                 model: aiCommand === 'claude'
                     ? (sessionManager.getModel(ctx.userId, ctx.threadId) ?? config.claudeModel)
-                    : undefined,
+                    : aiCommand === 'opencode'
+                        ? config.opencodeModel
+                        : undefined,
                 chatId: ctx.chatId,
                 // 默认跳过权限确认，保持全自动执行（可通过 config 或环境变量关闭）
                 skipPermissions: config.skipPermissions ?? true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wu529778790/open-im",
-  "version": "1.11.8-beta.3",
+  "version": "1.11.8-beta.5",
   "description": "Your AI coding assistant, in every chat app. Multi-platform IM bridge for Claude Code, Codex, and CodeBuddy.",
   "type": "module",
   "main": "dist/index.js",