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

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/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,
@@ -108,6 +154,10 @@ export async function runOpenCodeSdk(prompt, sessionId, workDir, callbacks, opti
             .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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wu529778790/open-im",
-  "version": "1.11.8-beta.3",
+  "version": "1.11.8-beta.4",
   "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",