@openviking/openclaw-plugin 2026.5.10-dev.3 → 2026.5.21

package/process-manager.ts

@@ -1,98 +1,3 @@
-import { Socket } from "node:net";
-
-type ChildLike = {
-  killed?: boolean;
-  exitCode?: number | null;
-  signalCode?: string | null;
-  off?: (event: string, listener: (...args: any[]) => void) => void;
-  once: (event: string, listener: (...args: any[]) => void) => void;
-};
-
-export function waitForHealth(baseUrl: string, timeoutMs: number, intervalMs: number): Promise<void> {
-  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: { status?: string }) => {
-          if (body?.status === "ok") {
-            resolve();
-            return;
-          }
-          setTimeout(tick, intervalMs);
-        })
-        .catch(() => setTimeout(tick, intervalMs));
-    };
-    tick();
-  });
-}
-
-export function waitForHealthOrExit(
-  baseUrl: string,
-  timeoutMs: number,
-  intervalMs: number,
-  child: ChildLike,
-): Promise<void> {
-  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: unknown) => {
-      if (settled) {
-        return;
-      }
-      settled = true;
-      cleanup();
-      reject(err instanceof Error ? err : new Error(String(err)));
-    };
-
-    const onError = (err: Error) => {
-      finishReject(err);
-    };
-
-    const onExit = (code: number | null, signal: string | null) => {
-      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<T>(promise: Promise<T>, timeoutMs: number, timeoutMessage: string): Promise<T> {
   return new Promise((resolve, reject) => {
     const timer = setTimeout(() => reject(new Error(timeoutMessage)), timeoutMs);
@@ -109,30 +14,6 @@ export function withTimeout<T>(promise: Promise<T>, timeoutMs: number, timeoutMe
   });
 }
 
-export function quickTcpProbe(host: string, port: number, timeoutMs: number): Promise<boolean> {
-  return new Promise((resolve) => {
-    const socket = new Socket();
-    let done = false;
-    const finish = (ok: boolean) => {
-      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: string, timeoutMs: number): Promise<boolean> {
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), timeoutMs);
@@ -162,8 +43,3 @@ export async function quickRecallPrecheck(
   }
   return { ok: false, reason: "health check failed" };
 }
-
-export interface ProcessLogger {
-  info?: (msg: string) => void;
-  warn?: (msg: string) => void;
-}

package/runtime-utils.ts

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

package/skills/install-openviking-memory/SKILL.md

@@ -13,7 +13,7 @@ description: >
   The user does NOT need to know any CLI commands — the agent runs everything and only asks for a few values.
   This skill assumes the OpenViking server is already running. If the server is not ready, the skill
   tells the user to contact their admin or set it up via the OpenViking docs — it does NOT install the server.
-version: 2.0.0
+version: 2.0.1
 metadata:
   openclaw:
     requires:
@@ -231,7 +231,7 @@ Tell the user:
 Run:
 
 ```bash
-openclaw plugins install @openclaw/openviking
+openclaw plugins install clawhub:@openviking/openclaw-plugin
 ```
 
 Trigger fallback to Path B only if the output contains any of these strings:
@@ -245,7 +245,7 @@ Trigger fallback to Path B only if the output contains any of these strings:
 Before falling back, also try the explicit registry prefix once:
 
 ```bash
-openclaw plugins install clawhub:@openclaw/openviking
+openclaw plugins install clawhub:@openviking/openclaw-plugin
 ```
 
 If the install **succeeds**, jump to STEP 7.
@@ -256,8 +256,8 @@ If both attempts fail with one of the fallback-eligible errors above, go to Path
 
 Tell the user:
 
-> (CN) ClawHub 现在好像被限流、不可用，或者当前账号不能安装。我改用备用路径，直接从 GitHub 下载插件源码安装。
-> (EN) ClawHub looks rate-limited, unavailable, or blocked for this account. I'll use the backup path and install the plugin source directly from GitHub.
+> (CN) ClawHub 现在好像被限流、不可用，或者当前账号不能安装。我改用备用路径，通过 npm 下载并部署插件包。
+> (EN) ClawHub looks rate-limited, unavailable, or blocked for this account. I'll use the backup path and install the plugin package from npm.
 
 Run the installer with `npx` (no global install needed):
 
@@ -273,11 +273,11 @@ Build the flag list according to what the user gave you:
 - `--account-id` / `--user-id` only if the root-key path requires them.
 
 `ov-install` will, in one shot:
-1. Download plugin sources from `raw.githubusercontent.com` into the OpenClaw `extensions/` dir.
-2. Run `npm install --omit=dev` inside the staging dir.
+1. Download the `@openviking/openclaw-plugin` package from npm into a temporary staging dir.
+2. Copy the package into the OpenClaw `extensions/` dir and install plugin dependencies.
 3. Register the plugin in `openclaw.json` (via `openclaw plugins enable` or direct write).
-4. Run `openclaw openviking setup --json --base-url … [--api-key …] --force-slot` for the user.
-5. Fall back to direct config write if `setup --json` fails.
+4. Run `openclaw openviking setup --json --base-url … [--api-key …]` for the user.
+5. Return a non-zero exit if setup needs explicit `--allow-offline` or `--force-slot` consent.
 
 This means **STEP 7 is effectively done by `ov-install`**. After `ov-install` exits 0, jump straight to **STEP 9** (gateway restart) and **STEP 10** (verify).
 

package/text-utils.ts

@@ -27,8 +27,6 @@ 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: string): number {
   return CJK_CHAR_REGEX.test(text) ? 4 : 10;
 }
@@ -274,21 +272,6 @@ export function extractTextsFromUserMessages(messages: unknown[]): string[] {
   return texts;
 }
 
-function formatToolUseBlock(b: Record<string, unknown>): string {
-  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: unknown): string {
   if (typeof content === "string") return content.trim();
   if (Array.isArray(content)) {
@@ -311,39 +294,6 @@ function formatToolResultContent(content: unknown): string {
   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: unknown): string {
-  if (!msg || typeof msg !== "object") return "";
-  const m = msg as Record<string, unknown>;
-  const role = m.role as string;
-  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: string[] = [];
-    for (const block of content) {
-      const b = block as Record<string, unknown>;
-      if (b?.type === "text" && typeof b.text === "string") {
-        parts.push((b.text as string).trim());
-      } else if (b?.type === "toolUse") {
-        parts.push(formatToolUseBlock(b));
-      }
-    }
-    return parts.join("\n");
-  }
-  return "";
-}
-
 /**
  * 提取消息中的一个 part 的文本内容，并清理时间戳等噪音
  */
@@ -367,7 +317,7 @@ function extractPartText(content: unknown): string {
 /**
  * 结构化消息类型 - 用于 afterTurn 发送到 OpenViking
  */
-export type ExtractedMessage = {
+type ExtractedMessage = {
   role: "user" | "assistant";
   parts: Array<{
     type: "text";
@@ -459,7 +409,6 @@ export function extractNewTurnMessages(
     }
 
     // user/assistant -> type: "text"
-    // 统一 role 为 user
     const content = msg.content;
     const text = extractPartText(content);
 
@@ -477,6 +426,40 @@ export function extractNewTurnMessages(
           }],
         });
       }
+    } else {
+      /// 如果原始消息有 toolCall，提取所有工具名并生成占位符
+      if (role === "assistant" && Array.isArray(content)) {
+        const toolNames: string[] = [];
+        
+        // 收集所有 toolCall 的 tool_name
+        for (const block of content) {
+          const b = block as Record<string, unknown>;
+          const blockType = b?.type as string;
+          if (
+            blockType === "toolCall" ||
+            blockType === "toolUse" ||
+            blockType === "tool_use" ||
+            blockType === "tool_call"
+          ) {
+            const name = b?.name as string || b?.toolName as string;
+            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}]`,
+            }],
+          });
+        }
+      }
     }
   }