openclaw-linso 1.0.12 → 1.0.16

package/dist/index.js

@@ -2,8 +2,9 @@
 // 插件入口：注册 channel + 启动 monitor service
 // 和飞书 index.ts 结构完全一致
 import { linsoPlugin } from "./src/channel.js";
-import { monitorLinsoProvider } from "./src/monitor.js";
+import { monitorLinsoProvider, getActiveDeviceIds, getDeviceRunId } from "./src/monitor.js";
 import { setLinsoRuntime } from "./src/runtime.js";
+import { sendToClient } from "./src/store.js";
 export { monitorLinsoProvider } from "./src/monitor.js";
 export { linsoPlugin } from "./src/channel.js";
 const plugin = {
@@ -30,6 +31,37 @@ const plugin = {
                 disconnectFromRelay();
             },
         });
+        // 4. 注册 Tool 调用 hooks — 向所有活跃的 iOS 设备广播 tool_call 事件
+        api.on("before_tool_call", async (event) => {
+            const deviceIds = getActiveDeviceIds();
+            for (const deviceId of deviceIds) {
+                const pluginRunId = getDeviceRunId(deviceId);
+                const runId = pluginRunId ?? event.runId ?? "";
+                console.log(`[Linso] 🔧 before_tool_call tool=${event.toolName} pluginRunId=${pluginRunId ?? "none"} ocRunId=${event.runId ?? "-"} → sending runId=${runId}`);
+                sendToClient(deviceId, {
+                    type: "tool_call",
+                    runId,
+                    status: "start",
+                    toolName: event.toolName,
+                });
+            }
+        });
+        api.on("after_tool_call", async (event) => {
+            const deviceIds = getActiveDeviceIds();
+            for (const deviceId of deviceIds) {
+                const pluginRunId = getDeviceRunId(deviceId);
+                const runId = pluginRunId ?? event.runId ?? "";
+                console.log(`[Linso] 🔧 after_tool_call  tool=${event.toolName} pluginRunId=${pluginRunId ?? "none"} dur=${event.durationMs ?? "-"}ms → sending runId=${runId}`);
+                sendToClient(deviceId, {
+                    type: "tool_call",
+                    runId,
+                    status: "end",
+                    toolName: event.toolName,
+                    durationMs: event.durationMs,
+                    error: event.error,
+                });
+            }
+        });
     },
 };
 export default plugin;

package/dist/src/monitor.d.ts

@@ -4,4 +4,8 @@ export type MonitorLinsoOpts = {
     log?: (...args: unknown[]) => void;
     abortSignal?: AbortSignal;
 };
+/** 返回最近活跃（TTL 内）的所有设备 ID，供 index.ts hook 广播 tool_call 用 */
+export declare function getActiveDeviceIds(): string[];
+/** 获取设备当前活跃的 Plugin runId */
+export declare function getDeviceRunId(deviceId: string): string | undefined;
 export declare function monitorLinsoProvider(opts?: MonitorLinsoOpts): Promise<void>;

package/dist/src/monitor.js

@@ -26,6 +26,22 @@ const DEVICE_PRUNE_INTERVAL_MS = 60 * 60 * 1000;
 function touchDevice(deviceId) {
     deviceLastSeen.set(deviceId, Date.now());
 }
+/** deviceId → 当前正在运行的 Plugin runId，供 index.ts hook 广播 tool_call 用 */
+const deviceActiveRunId = new Map();
+/** 返回最近活跃（TTL 内）的所有设备 ID，供 index.ts hook 广播 tool_call 用 */
+export function getActiveDeviceIds() {
+    const now = Date.now();
+    const result = [];
+    for (const [id, lastSeen] of deviceLastSeen) {
+        if (now - lastSeen <= DEVICE_TTL_MS)
+            result.push(id);
+    }
+    return result;
+}
+/** 获取设备当前活跃的 Plugin runId */
+export function getDeviceRunId(deviceId) {
+    return deviceActiveRunId.get(deviceId);
+}
 function pruneInactiveDevices(log) {
     const now = Date.now();
     let pruned = 0;
@@ -87,6 +103,9 @@ export async function monitorLinsoProvider(opts = {}) {
             log("[Linso] 与 Relay 断开");
         },
         onMessage: (deviceId, msg) => {
+            const type = msg.type ?? "unknown";
+            const text = msg.text;
+            log(`[Linso] ↓ RECV  type=${type} deviceId=${String(deviceId).slice(0, 8)}...${text ? ` text="${String(text).slice(0, 50)}"` : ""}`);
             if (msg.type === "send" && typeof msg.text === "string" && msg.text.trim()) {
                 touchDevice(deviceId); // [Opt #3] 记录活跃时间
                 const text = msg.text.trim();
@@ -397,6 +416,10 @@ async function handleIncomingMessage(deviceId, text, imageUrls, cfg, log) {
             }),
         });
         const runId = `linso-${Date.now()}`;
+        deviceActiveRunId.set(deviceId, runId); // 记录当前活跃 runId
+        let delivered = false; // 是否已发送过内容
+        let deltaCount = 0; // 已发送的 delta 数量
+        let lastSentText = ""; // 上次发送的累计文本，用于计算真实增量
         const { dispatcher, replyOptions, markDispatchIdle } = core.channel.reply.createReplyDispatcherWithTyping({
             deliver: async (payload, info) => {
                 // 检查 stop 标志
@@ -404,27 +427,85 @@ async function handleIncomingMessage(deviceId, text, imageUrls, cfg, log) {
                     log(`[Linso] stop 标志命中，跳过输出: deviceId=${deviceId}`);
                     return;
                 }
-                if (!payload.text || payload.isReasoning)
+                if (payload.isReasoning)
+                    return;
+                if (!payload.text) {
+                    log(`[Linso] deliver 跳过: kind=${info.kind} text=empty`);
+                    return;
+                }
+                // 如果已经通过 onPartialReply 发过 delta，则 final 阶段发 stream_end 而非重复文本
+                if (info.kind === "final" && deltaCount > 0) {
+                    log(`[Linso] deliver final skipped (streamed ${deltaCount} deltas): text="${payload.text.slice(0, 40)}"`);
+                    delivered = true;
+                    sendToClient(deviceId, { type: "stream_end", runId });
                     return;
+                }
+                log(`[Linso] deliver called: kind=${info.kind} text="${payload.text.slice(0, 40)}"`);
+                delivered = true;
                 sendToClient(deviceId, {
                     type: info.kind === "final" ? "final" : "delta",
                     runId,
                     text: payload.text,
                 });
             },
+            onSkip: (payload, info) => {
+                log(`[Linso] ⚠️ deliver SKIPPED: kind=${info.kind} reason=${info.reason}`);
+                if (!delivered) {
+                    delivered = true;
+                    sendToClient(deviceId, { type: "final", runId, text: "😶" });
+                }
+            },
+            onCleanup: () => {
+                log(`[Linso] ⚠️ onCleanup (NO_REPLY or cleanup) runId=${runId} delivered=${delivered}`);
+                if (!delivered) {
+                    delivered = true;
+                    sendToClient(deviceId, { type: "final", runId, text: "😶" });
+                }
+            },
+            onError: (err, info) => {
+                log(`[Linso] ❌ deliver ERROR: kind=${info.kind} err=${String(err)}`);
+            },
         });
         sendToClient(deviceId, { type: "run_start", runId });
-        await core.channel.reply.withReplyDispatcher({
+        const dispatchResult = await core.channel.reply.withReplyDispatcher({
             dispatcher,
             onSettled: () => markDispatchIdle(),
             run: () => core.channel.reply.dispatchReplyFromConfig({
                 ctx: inboundCtx,
                 cfg: effectiveCfg,
                 dispatcher,
-                replyOptions,
+                replyOptions: {
+                    ...replyOptions,
+                    onPartialReply: (payload) => {
+                        if (deviceStopFlags.get(deviceId))
+                            return;
+                        if (!payload.text)
+                            return;
+                        // payload.text 是累积完整文本，提取真实增量部分
+                        const fullText = payload.text;
+                        if (fullText.length <= lastSentText.length)
+                            return; // 没有新内容
+                        const increment = fullText.slice(lastSentText.length);
+                        lastSentText = fullText;
+                        deltaCount++;
+                        delivered = true;
+                        sendToClient(deviceId, { type: "delta", runId, text: increment });
+                    },
+                },
             }),
         });
+        log(`[Linso] dispatchResult: ${JSON.stringify(dispatchResult)} delivered=${delivered}`);
+        // 兜底：如果 dispatcher 没有发送过任何内容
+        if (!delivered) {
+            log(`[Linso] ⚠️ 没有内容被 deliver，发送兜底回复`);
+            sendToClient(deviceId, {
+                type: "final",
+                runId,
+                text: "收到啦，但我暂时无法回复这条消息 🤔",
+            });
+        }
         sendToClient(deviceId, { type: "done", runId });
+        deviceActiveRunId.delete(deviceId); // 清理活跃 runId
         log(`[Linso] 回复完成: deviceId=${deviceId}`);
     }
     finally {

package/dist/src/store.js

@@ -4,5 +4,21 @@
 import { sendToRelay } from "./relay-client.js";
 /** 向指定 iOS 设备发送消息（经由 Relay） */
 export function sendToClient(deviceId, msg) {
+    const type = msg.type ?? "unknown";
+    console.log(`[Linso] ↑ SEND  type=${type} deviceId=${String(deviceId).slice(0, 8)}... ${_preview(msg)}`);
     sendToRelay({ ...msg, deviceId });
 }
+function _preview(msg) {
+    const parts = [];
+    if (msg.runId)
+        parts.push(`runId=${String(msg.runId).slice(-6)}`);
+    if (msg.text)
+        parts.push(`text="${String(msg.text).slice(0, 40)}"`);
+    if (msg.toolName)
+        parts.push(`tool=${msg.toolName}`);
+    if (msg.status)
+        parts.push(`status=${msg.status}`);
+    if (msg.error)
+        parts.push(`error=${msg.error}`);
+    return parts.join(" ");
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-linso",
-  "version": "1.0.12",
+  "version": "1.0.16",
   "description": "Linso iOS App channel plugin for OpenClaw — connects via cloud Relay Server",
   "type": "module",
   "main": "./dist/index.js",

package/src/monitor.ts

@@ -43,6 +43,24 @@ function touchDevice(deviceId: string): void {
   deviceLastSeen.set(deviceId, Date.now());
 }
 
+/** deviceId → 当前正在运行的 Plugin runId，供 index.ts hook 广播 tool_call 用 */
+const deviceActiveRunId = new Map<string, string>();
+
+/** 返回最近活跃（TTL 内）的所有设备 ID，供 index.ts hook 广播 tool_call 用 */
+export function getActiveDeviceIds(): string[] {
+  const now = Date.now();
+  const result: string[] = [];
+  for (const [id, lastSeen] of deviceLastSeen) {
+    if (now - lastSeen <= DEVICE_TTL_MS) result.push(id);
+  }
+  return result;
+}
+
+/** 获取设备当前活跃的 Plugin runId */
+export function getDeviceRunId(deviceId: string): string | undefined {
+  return deviceActiveRunId.get(deviceId);
+}
+
 function pruneInactiveDevices(log: (...args: unknown[]) => void): void {
   const now = Date.now();
   let pruned = 0;
@@ -124,6 +142,10 @@ export async function monitorLinsoProvider(opts: MonitorLinsoOpts = {}): Promise
     },
 
     onMessage: (deviceId, msg) => {
+      const type = (msg as Record<string, unknown>).type ?? "unknown";
+      const text = (msg as Record<string, unknown>).text;
+      log(`[Linso] ↓ RECV  type=${type} deviceId=${String(deviceId).slice(0, 8)}...${text ? ` text="${String(text).slice(0, 50)}"` : ""}`);
+
       if (msg.type === "send" && typeof msg.text === "string" && msg.text.trim()) {
         touchDevice(deviceId); // [Opt #3] 记录活跃时间
         const text = msg.text.trim();
@@ -471,6 +493,10 @@ async function handleIncomingMessage(
   });
 
   const runId = `linso-${Date.now()}`;
+  deviceActiveRunId.set(deviceId, runId);  // 记录当前活跃 runId
+  let delivered = false;  // 是否已发送过内容
+  let deltaCount = 0;     // 已发送的 delta 数量
+  let lastSentText = "";  // 上次发送的累计文本，用于计算真实增量
 
   const { dispatcher, replyOptions, markDispatchIdle } =
     core.channel.reply.createReplyDispatcherWithTyping({
@@ -480,18 +506,48 @@ async function handleIncomingMessage(
           log(`[Linso] stop 标志命中，跳过输出: deviceId=${deviceId}`);
           return;
         }
-        if (!payload.text || payload.isReasoning) return;
+        if (payload.isReasoning) return;
+        if (!payload.text) {
+          log(`[Linso] deliver 跳过: kind=${info.kind} text=empty`);
+          return;
+        }
+        // 如果已经通过 onPartialReply 发过 delta，则 final 阶段发 stream_end 而非重复文本
+        if (info.kind === "final" && deltaCount > 0) {
+          log(`[Linso] deliver final skipped (streamed ${deltaCount} deltas): text="${payload.text.slice(0, 40)}"`);
+          delivered = true;
+          sendToClient(deviceId, { type: "stream_end", runId });
+          return;
+        }
+        log(`[Linso] deliver called: kind=${info.kind} text="${payload.text.slice(0, 40)}"`);
+        delivered = true;
         sendToClient(deviceId, {
           type: info.kind === "final" ? "final" : "delta",
           runId,
           text: payload.text,
         });
       },
+      onSkip: (payload, info) => {
+        log(`[Linso] ⚠️ deliver SKIPPED: kind=${info.kind} reason=${info.reason}`);
+        if (!delivered) {
+          delivered = true;
+          sendToClient(deviceId, { type: "final", runId, text: "😶" });
+        }
+      },
+      onCleanup: () => {
+        log(`[Linso] ⚠️ onCleanup (NO_REPLY or cleanup) runId=${runId} delivered=${delivered}`);
+        if (!delivered) {
+          delivered = true;
+          sendToClient(deviceId, { type: "final", runId, text: "😶" });
+        }
+      },
+      onError: (err, info) => {
+        log(`[Linso] ❌ deliver ERROR: kind=${info.kind} err=${String(err)}`);
+      },
     });
 
   sendToClient(deviceId, { type: "run_start", runId });
 
-  await core.channel.reply.withReplyDispatcher({
+  const dispatchResult = await core.channel.reply.withReplyDispatcher({
     dispatcher,
     onSettled: () => markDispatchIdle(),
     run: () =>
@@ -499,11 +555,38 @@ async function handleIncomingMessage(
         ctx: inboundCtx,
         cfg: effectiveCfg,
         dispatcher,
-        replyOptions,
+        replyOptions: {
+          ...replyOptions,
+          onPartialReply: (payload) => {
+            if (deviceStopFlags.get(deviceId)) return;
+            if (!payload.text) return;
+            // payload.text 是累积完整文本，提取真实增量部分
+            const fullText = payload.text;
+            if (fullText.length <= lastSentText.length) return; // 没有新内容
+            const increment = fullText.slice(lastSentText.length);
+            lastSentText = fullText;
+            deltaCount++;
+            delivered = true;
+            sendToClient(deviceId, { type: "delta", runId, text: increment });
+          },
+        },
       }),
   });
 
+  log(`[Linso] dispatchResult: ${JSON.stringify(dispatchResult)} delivered=${delivered}`);
+
+  // 兜底：如果 dispatcher 没有发送过任何内容
+  if (!delivered) {
+    log(`[Linso] ⚠️ 没有内容被 deliver，发送兜底回复`);
+    sendToClient(deviceId, {
+      type: "final",
+      runId,
+      text: "收到啦，但我暂时无法回复这条消息 🤔",
+    });
+  }
+
   sendToClient(deviceId, { type: "done", runId });
+  deviceActiveRunId.delete(deviceId);  // 清理活跃 runId
   log(`[Linso] 回复完成: deviceId=${deviceId}`);
 
   } finally {

package/src/store.ts

@@ -6,5 +6,18 @@ import { sendToRelay } from "./relay-client.js";
 
 /** 向指定 iOS 设备发送消息（经由 Relay） */
 export function sendToClient(deviceId: string, msg: Record<string, unknown>) {
+  const type = msg.type ?? "unknown";
+  console.log(`[Linso] ↑ SEND  type=${type} deviceId=${String(deviceId).slice(0, 8)}... ${_preview(msg)}`);
   sendToRelay({ ...msg, deviceId });
 }
+
+function _preview(msg: Record<string, unknown>): string {
+  const parts: string[] = [];
+  if (msg.runId)    parts.push(`runId=${String(msg.runId).slice(-6)}`);
+  if (msg.text)     parts.push(`text="${String(msg.text).slice(0, 40)}"`);
+  if (msg.toolName) parts.push(`tool=${msg.toolName}`);
+  if (msg.status)   parts.push(`status=${msg.status}`);
+  if (msg.error)    parts.push(`error=${msg.error}`);
+  return parts.join(" ");
+}
+