adp-openclaw 0.0.70 → 0.0.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adp-openclaw",
-  "version": "0.0.70",
+  "version": "0.0.71",
   "description": "ADP-OpenClaw demo channel plugin (Go WebSocket backend)",
   "type": "module",
   "dependencies": {

package/src/channel.ts

@@ -9,8 +9,22 @@ import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/core";
 import { adpOpenclawSetupWizard } from "./onboarding.js";
 import { getActiveWebSocket } from "./runtime.js";
 
-// Default WebSocket URL for ADP OpenClaw
-const DEFAULT_WS_URL = "wss://wss.lke.cloud.tencent.com/bot/gateway/conn";
+// WebSocket URLs for ADP OpenClaw (domestic vs international)
+const WS_URL_DOMESTIC = "wss://wss.lke.cloud.tencent.com/bot/gateway/conn";
+const WS_URL_INTL = "wss://wss.lke.tencentcloud.com/bot/gateway/conn";
+
+/**
+ * Resolve WebSocket URL based on clientToken prefix.
+ * - Domestic token: sk-adp-{part1}-{part2}  → WS_URL_DOMESTIC
+ * - International token: sk-adp_intl-{part1}-{part2} → WS_URL_INTL
+ * - Fallback: domestic URL
+ */
+function resolveWsUrlFromToken(clientToken?: string): string {
+  if (clientToken?.startsWith("sk-adp_intl-")) {
+    return WS_URL_INTL;
+  }
+  return WS_URL_DOMESTIC;
+}
 
 // Channel-level config type (from channels["adp-openclaw"])
 export type AdpOpenclawChannelConfig = {
@@ -35,29 +49,29 @@ function resolveAdpOpenclawCredentials(channelCfg?: AdpOpenclawChannelConfig): {
   clientToken: string;
   signKey: string;
 } | null {
-  // Get wsUrl from config or env (has default value)
-  let wsUrl = channelCfg?.wsUrl?.trim();
-  if (!wsUrl) {
-    wsUrl = process.env.ADP_OPENCLAW_WS_URL || DEFAULT_WS_URL;
-  }
-
   // Get clientToken from config or env
   let clientToken = channelCfg?.clientToken?.trim();
   if (!clientToken) {
     clientToken = process.env.ADP_OPENCLAW_CLIENT_TOKEN || "";
   }
 
+  // clientToken is required for configured status
+  if (!clientToken) {
+    return null;
+  }
+
+  // Get wsUrl: explicit config > env var > auto-detect from clientToken prefix
+  let wsUrl = channelCfg?.wsUrl?.trim();
+  if (!wsUrl) {
+    wsUrl = process.env.ADP_OPENCLAW_WS_URL || resolveWsUrlFromToken(clientToken);
+  }
+
   // Get signKey from config or env (default: ADPOpenClaw)
   let signKey = channelCfg?.signKey?.trim();
   if (!signKey) {
     signKey = process.env.ADP_OPENCLAW_SIGN_KEY || "ADPOpenClaw";
   }
 
-  // clientToken is required for configured status (wsUrl has default)
-  if (!clientToken) {
-    return null;
-  }
-
   return { wsUrl, clientToken, signKey };
 }
 
@@ -71,7 +85,7 @@ function resolveAccount(cfg: OpenClawConfig, accountId?: string): ResolvedAdpOpe
     name: "ADP OpenClaw",
     enabled,
     configured: Boolean(creds),
-    wsUrl: creds?.wsUrl || DEFAULT_WS_URL,
+    wsUrl: creds?.wsUrl || resolveWsUrlFromToken(creds?.clientToken),
     clientToken: creds?.clientToken || "",
     signKey: creds?.signKey || "ADPOpenClaw",
   };
@@ -107,7 +121,7 @@ export const adpOpenclawPlugin: ChannelPlugin<ResolvedAdpOpenclawAccount> = {
       additionalProperties: false,
       properties: {
         enabled: { type: "boolean" },
-        wsUrl: { type: "string" }, // WebSocket URL (optional, default: wss://wss.lke.cloud.tencent.com/bot/gateway/conn)
+        wsUrl: { type: "string" }, // WebSocket URL (optional, auto-detected from clientToken prefix)
         clientToken: { type: "string" },
         signKey: { type: "string" },
       },

package/src/config-schema.ts

@@ -2,7 +2,7 @@ import { z } from "zod";
 
 export const AdpOpenclawConfigSchema = z.object({
   enabled: z.boolean().optional(),
-  wsUrl: z.string().optional(), // WebSocket URL (optional, default: wss://wss.lke.cloud.tencent.com/bot/gateway/conn)
+  wsUrl: z.string().optional(), // WebSocket URL (optional, auto-detected from clientToken prefix: sk-adp- → domestic, sk-adp_intl- → international)
   clientToken: z.string().optional(),
   signKey: z.string().optional(),
 });

package/src/session-history.ts

@@ -191,20 +191,46 @@ function resolveSessionTranscriptCandidates(
   return candidates;
 }
 
+/**
+ * Sanitize string to ensure it's valid for JSON serialization.
+ * Removes or replaces characters that could cause JSON parsing issues.
+ */
+function sanitizeForJson(str: string): string {
+  if (!str) return str;
+  
+  let result = str;
+  
+  // Remove EXTERNAL_UNTRUSTED_CONTENT blocks which often contain binary garbage (e.g., images as text)
+  // These blocks are from web_fetch and contain external webpage content that may have encoding issues
+  result = result.replace(
+    /<<<EXTERNAL_UNTRUSTED_CONTENT>>>[\s\S]*?<<<\/EXTERNAL_UNTRUSTED_CONTENT>>>/g,
+    "[External content removed]"
+  );
+  
+  // Remove null characters and other control characters (except common whitespace)
+  // Control characters: 0x00-0x1F (except 0x09 tab, 0x0A newline, 0x0D carriage return)
+  // Also remove 0x7F (DEL) and other problematic chars
+  result = result.replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/g, "");
+  
+  return result;
+}
+
 /**
  * Extract text content from message content (handles both string and array formats)
  */
 function extractMessageContent(content: string | Array<{ type: string; text?: string }>): string {
+  let text: string;
   if (typeof content === "string") {
-    return content;
-  }
-  if (Array.isArray(content)) {
-    return content
+    text = content;
+  } else if (Array.isArray(content)) {
+    text = content
       .filter((part) => part.type === "text" && part.text)
       .map((part) => part.text)
       .join("\n");
+  } else {
+    text = String(content);
   }
-  return String(content);
+  return sanitizeForJson(text);
 }
 
 /**
@@ -857,27 +883,55 @@ export async function getOpenClawChatHistoryViaCli(
     );
     
     // Parse JSON result
+    // OpenClaw CLI returns messages with content that can be:
+    // - string: plain text content
+    // - array: mixed content parts including text, toolCall, etc.
+    // Timestamp can be either number (ms) or ISO string
     const parsed = JSON.parse(result) as {
       messages?: Array<{
         role: string;
-        content: string | Array<{ type: string; text?: string }>;
+        content: string | Array<{ type: string; text?: string; [key: string]: unknown }>;
         id?: string;
-        timestamp?: string;
+        timestamp?: string | number;
       }>;
       sessionId?: string;  // OpenClaw may return the current sessionId
     };
     
-    let messages: OpenClawMessage[] = (parsed.messages ?? []).map((msg) => ({
-      role: msg.role as "user" | "assistant" | "system",
-      content: typeof msg.content === "string"
-        ? msg.content
-        : msg.content
-            .filter((p) => p.type === "text" && p.text)
-            .map((p) => p.text)
-            .join("\n"),
-      id: msg.id,
-      timestamp: msg.timestamp ? new Date(msg.timestamp).getTime() : undefined,
-    }));
+    let messages: OpenClawMessage[] = (parsed.messages ?? []).map((msg) => {
+      // Extract text content from message
+      let textContent: string;
+      if (typeof msg.content === "string") {
+        textContent = msg.content;
+      } else if (Array.isArray(msg.content)) {
+        // Filter for text parts only (skip toolCall, toolResult, etc.)
+        textContent = msg.content
+          .filter((p): p is { type: string; text: string } => 
+            p.type === "text" && typeof p.text === "string"
+          )
+          .map((p) => p.text)
+          .join("\n");
+      } else {
+        textContent = String(msg.content ?? "");
+      }
+      
+      // Sanitize content to remove invalid characters that break JSON serialization
+      textContent = sanitizeForJson(textContent);
+      
+      // Handle timestamp: can be number (ms) or ISO string
+      let timestamp: number | undefined;
+      if (typeof msg.timestamp === "number") {
+        timestamp = msg.timestamp;
+      } else if (typeof msg.timestamp === "string") {
+        timestamp = new Date(msg.timestamp).getTime();
+      }
+      
+      return {
+        role: msg.role as "user" | "assistant" | "system",
+        content: textContent,
+        id: msg.id,
+        timestamp,
+      };
+    });
     
     log?.info?.(`[session-history] Got ${messages.length} messages via CLI`);