@openviking/openclaw-plugin 2026.5.8 → 2026.5.21

package/dist/process-manager.js

@@ -1,66 +1,3 @@
-import { Socket } from "node:net";
-export function waitForHealth(baseUrl, timeoutMs, intervalMs) {
-    const deadline = Date.now() + timeoutMs;
-    return new Promise((resolve, reject) => {
-        const tick = () => {
-            if (Date.now() > deadline) {
-                reject(new Error(`OpenViking health check timeout at ${baseUrl}`));
-                return;
-            }
-            fetch(`${baseUrl}/health`)
-                .then((r) => r.json())
-                .then((body) => {
-                if (body?.status === "ok") {
-                    resolve();
-                    return;
-                }
-                setTimeout(tick, intervalMs);
-            })
-                .catch(() => setTimeout(tick, intervalMs));
-        };
-        tick();
-    });
-}
-export function waitForHealthOrExit(baseUrl, timeoutMs, intervalMs, child) {
-    const exited = child.killed || child.exitCode !== null || child.signalCode !== null;
-    if (exited) {
-        return Promise.reject(new Error(`OpenViking subprocess exited before health check ` +
-            `(code=${child.exitCode}, signal=${child.signalCode})`));
-    }
-    return new Promise((resolve, reject) => {
-        let settled = false;
-        const cleanup = () => {
-            child.off?.("error", onError);
-            child.off?.("exit", onExit);
-        };
-        const finishResolve = () => {
-            if (settled) {
-                return;
-            }
-            settled = true;
-            cleanup();
-            resolve();
-        };
-        const finishReject = (err) => {
-            if (settled) {
-                return;
-            }
-            settled = true;
-            cleanup();
-            reject(err instanceof Error ? err : new Error(String(err)));
-        };
-        const onError = (err) => {
-            finishReject(err);
-        };
-        const onExit = (code, signal) => {
-            finishReject(new Error(`OpenViking subprocess exited before health check ` +
-                `(code=${code}, signal=${signal})`));
-        };
-        child.once("error", onError);
-        child.once("exit", onExit);
-        waitForHealth(baseUrl, timeoutMs, intervalMs).then(finishResolve, finishReject);
-    });
-}
 export function withTimeout(promise, timeoutMs, timeoutMessage) {
     return new Promise((resolve, reject) => {
         const timer = setTimeout(() => reject(new Error(timeoutMessage)), timeoutMs);
@@ -73,30 +10,6 @@ export function withTimeout(promise, timeoutMs, timeoutMessage) {
         });
     });
 }
-export function quickTcpProbe(host, port, timeoutMs) {
-    return new Promise((resolve) => {
-        const socket = new Socket();
-        let done = false;
-        const finish = (ok) => {
-            if (done) {
-                return;
-            }
-            done = true;
-            socket.destroy();
-            resolve(ok);
-        };
-        socket.setTimeout(timeoutMs);
-        socket.once("connect", () => finish(true));
-        socket.once("timeout", () => finish(false));
-        socket.once("error", () => finish(false));
-        try {
-            socket.connect(port, host);
-        }
-        catch {
-            finish(false);
-        }
-    });
-}
 export async function quickHealthCheck(baseUrl, timeoutMs) {
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), timeoutMs);

package/dist/runtime-utils.js

@@ -1,7 +1,4 @@
 const _env = globalThis["process"];
-export function sysEnv() {
-    return _env.env;
-}
 export function getEnv(key) {
     return _env.env[key];
 }

package/dist/text-utils.js

@@ -21,7 +21,6 @@ const NON_CONTENT_TEXT_RE = /^[\p{P}\p{S}\s]+$/u;
 const SUBAGENT_CONTEXT_RE = /^\s*\[Subagent Context\]/i;
 const MEMORY_INTENT_RE = /记住|记下|remember|save|store|偏好|preference|规则|rule|事实|fact/i;
 const QUESTION_CUE_RE = /[?？]|\b(?:what|when|where|who|why|how|which|can|could|would|did|does|is|are)\b|^(?:请问|能否|可否|怎么|如何|什么时候|谁|什么|哪|是否)/i;
-export const CAPTURE_LIMIT = 3;
 function resolveCaptureMinLength(text) {
     return CJK_CHAR_REGEX.test(text) ? 4 : 10;
 }
@@ -232,21 +231,6 @@ export function extractTextsFromUserMessages(messages) {
     }
     return texts;
 }
-function formatToolUseBlock(b) {
-    const name = typeof b.name === "string" ? b.name : "unknown";
-    let inputStr = "";
-    if (b.input !== undefined && b.input !== null) {
-        try {
-            inputStr = typeof b.input === "string" ? b.input : JSON.stringify(b.input);
-        }
-        catch {
-            inputStr = String(b.input);
-        }
-    }
-    return inputStr
-        ? `[toolUse: ${name}]\n${inputStr}`
-        : `[toolUse: ${name}]`;
-}
 function formatToolResultContent(content) {
     if (typeof content === "string")
         return content.trim();
@@ -270,40 +254,6 @@ function formatToolResultContent(content) {
     }
     return "";
 }
-/**
- * Extract text from a single message without a `[role]:` prefix.
- * Used by afterTurn to send messages with their actual role.
- */
-export function extractSingleMessageText(msg) {
-    if (!msg || typeof msg !== "object")
-        return "";
-    const m = msg;
-    const role = m.role;
-    if (!role || role === "system")
-        return "";
-    if (role === "toolResult") {
-        const toolName = typeof m.toolName === "string" ? m.toolName : "tool";
-        const resultText = formatToolResultContent(m.content);
-        return resultText ? `[${toolName} result]: ${resultText}` : "";
-    }
-    const content = m.content;
-    if (typeof content === "string")
-        return content.trim();
-    if (Array.isArray(content)) {
-        const parts = [];
-        for (const block of content) {
-            const b = block;
-            if (b?.type === "text" && typeof b.text === "string") {
-                parts.push(b.text.trim());
-            }
-            else if (b?.type === "toolUse") {
-                parts.push(formatToolUseBlock(b));
-            }
-        }
-        return parts.join("\n");
-    }
-    return "";
-}
 /**
  * 提取消息中的一个 part 的文本内容，并清理时间戳等噪音
  */
@@ -394,7 +344,6 @@ export function extractNewTurnMessages(messages, startIndex) {
             continue;
         }
         // user/assistant -> type: "text"
-        // 统一 role 为 user
         const content = msg.content;
         const text = extractPartText(content);
         if (text) {
@@ -412,6 +361,37 @@ export function extractNewTurnMessages(messages, startIndex) {
                 });
             }
         }
+        else {
+            /// 如果原始消息有 toolCall，提取所有工具名并生成占位符
+            if (role === "assistant" && Array.isArray(content)) {
+                const toolNames = [];
+                // 收集所有 toolCall 的 tool_name
+                for (const block of content) {
+                    const b = block;
+                    const blockType = b?.type;
+                    if (blockType === "toolCall" ||
+                        blockType === "toolUse" ||
+                        blockType === "tool_use" ||
+                        blockType === "tool_call") {
+                        const name = b?.name || b?.toolName;
+                        if (name && typeof name === "string" && name.trim()) {
+                            toolNames.push(name.trim());
+                        }
+                    }
+                }
+                // 只有找到 toolCall 时才添加占位符
+                if (toolNames.length > 0) {
+                    const toolNamesStr = toolNames.join(", ");
+                    result.push({
+                        role: "assistant",
+                        parts: [{
+                                type: "text",
+                                text: `[tool: ${toolNamesStr}]`,
+                            }],
+                    });
+                }
+            }
+        }
     }
     return { messages: result, newCount: count };
 }