adp-openclaw 0.0.61 → 0.0.63

package/package.json

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

package/src/adp-upload-tool.ts

@@ -68,7 +68,7 @@ interface FileMetadata {
 // ==================== 常量配置 ====================
 
 /** 获取临时密钥的接口地址 */
-const CREDENTIAL_API_URL = "https://wss.lke.cloud.tencent.com/test/openclaw/v1/gateway/storage/get_credential";
+const CREDENTIAL_API_URL = "https://wss.lke.cloud.tencent.com/v1/gateway/storage/get_credential";
 
 /** 请求超时时间 (毫秒) */
 const REQUEST_TIMEOUT_MS = 30000;

package/src/channel.ts

@@ -216,6 +216,7 @@ export const adpOpenclawPlugin: ChannelPlugin<ResolvedAdpOpenclawAccount> = {
         abortSignal: ctx.abortSignal,
         log: ctx.log,
         cfg: ctx.cfg,
+        setStatus: ctx.setStatus,
       });
     },
   },

package/src/monitor.ts

@@ -40,6 +40,7 @@ export type MonitorParams = {
   abortSignal?: AbortSignal;
   log?: PluginLogger;
   cfg?: ClawdbotConfig; // OpenClaw config for model settings
+  setStatus?: (next: Record<string, unknown>) => void; // SDK health-monitor status reporter
 };
 
 // WebSocket message types
@@ -165,7 +166,7 @@ async function markSessionAborted(params: {
 }
 
 export async function monitorAdpOpenclaw(params: MonitorParams): Promise<void> {
-  const { wsUrl, clientToken, signKey, abortSignal, log, cfg } = params;
+  const { wsUrl, clientToken, signKey, abortSignal, log, cfg, setStatus } = params;
   const runtime = getAdpOpenclawRuntime();
 
   log?.info(`[adp-openclaw] WebSocket monitor started, connecting to ${wsUrl}`);
@@ -180,6 +181,7 @@ export async function monitorAdpOpenclaw(params: MonitorParams): Promise<void> {
         log,
         runtime,
         cfg,
+        setStatus,
       });
     } catch (err) {
       if (abortSignal?.aborted) break;
@@ -204,10 +206,11 @@ type ConnectParams = {
   log?: PluginLogger;
   runtime: ReturnType<typeof getAdpOpenclawRuntime>;
   cfg?: ClawdbotConfig;
+  setStatus?: (next: Record<string, unknown>) => void;
 };
 
 async function connectAndHandle(params: ConnectParams): Promise<void> {
-  const { wsUrl, clientToken, signKey, abortSignal, log, runtime, cfg } = params;
+  const { wsUrl, clientToken, signKey, abortSignal, log, runtime, cfg, setStatus } = params;
 
   // Dynamic import for WebSocket (works in both Node.js and browser)
   const WebSocket = (await import("ws")).default;
@@ -272,6 +275,10 @@ async function connectAndHandle(params: ConnectParams): Promise<void> {
               authenticated = true;
               log?.info(`[adp-openclaw] Plugin v${PLUGIN_VERSION} authenticated as client ${result.clientId}`);
 
+              // Report connected status to SDK health-monitor
+              const now = Date.now();
+              setStatus?.({ connected: true, lastConnectedAt: now, lastEventAt: now });
+
               // Start ping interval
               pingInterval = setInterval(() => {
                 if (ws.readyState === WebSocket.OPEN) {
@@ -290,12 +297,17 @@ async function connectAndHandle(params: ConnectParams): Promise<void> {
           }
 
           case MsgType.Pong:
-            // Heartbeat response, connection is alive
+            // Heartbeat response — update lastEventAt so health-monitor knows connection is alive
+            setStatus?.({ lastEventAt: Date.now() });
             break;
 
           case MsgType.Inbound: {
             if (!authenticated) break;
 
+            // Report inbound event to SDK health-monitor
+            const inboundAt = Date.now();
+            setStatus?.({ lastEventAt: inboundAt, lastInboundAt: inboundAt });
+
             // Debug: log raw payload to verify recordId is received
             log?.info(`[adp-openclaw] Raw payload: ${JSON.stringify(msg.payload)}`);
             
@@ -326,15 +338,27 @@ async function connectAndHandle(params: ConnectParams): Promise<void> {
 
               // Use resolveAgentRoute to get proper sessionKey (like QQBot does)
               // This ensures session history is correctly associated
-              const peerId = inMsg.conversationId;
+              //
+              // Use "per-channel-peer" so the session key includes the channel name:
+              //   agent:main:adp-openclaw:direct:{userId}
+              // This is critical for cron job delivery inference — inferDeliveryFromSessionKey()
+              // parses the session key to extract channel and target user:
+              //   channel = "adp-openclaw", to = "{userId}"
+              // Without the channel in the key, cron delivery defaults to channel:"last" which
+              // fails when multiple channels (adp-openclaw, wecom, etc.) are configured.
+              //
+              // We use the user identifier (not conversationId) as peerId because:
+              // 1. The outbound delivery target is the userId (inMsg.from), not the conversationId
+              // 2. inferDeliveryFromSessionKey extracts peerId as the delivery "to" field
+              const peerId = userIdentifier;
               const route = runtime.channel.routing.resolveAgentRoute({
                 cfg: {
                   ...(cfg ?? {}),
                   session: {
                     ...(cfg?.session ?? {}),
-                    // Override dmScope to "per-peer" so each user gets their own session
-                    // This prevents all DM users from sharing the same "main" session
-                    dmScope: "per-peer",
+                    // Override dmScope to "per-channel-peer" so session key encodes channel + userId
+                    // Session key format: agent:main:adp-openclaw:direct:{userId}
+                    dmScope: "per-channel-peer",
                   },
                 },
                 channel: "adp-openclaw",
@@ -849,6 +873,8 @@ async function connectAndHandle(params: ConnectParams): Promise<void> {
       abortSignal?.removeEventListener("abort", abortHandler);
       // Clear active WebSocket when connection closes
       setActiveWebSocket(null);
+      // Report disconnected status to SDK health-monitor
+      setStatus?.({ connected: false, lastEventAt: Date.now() });
       log?.info(`[adp-openclaw] WebSocket closed: ${code} ${reason.toString()}`);
       resolve();
     });

package/src/session-history.ts

@@ -517,6 +517,84 @@ function findOpenClawCli(config: SessionFileConfig): string | null {
   
   return null;
 }
+/**
+ * Extract valid JSON from CLI output that may contain TUI decoration characters
+ * (e.g. │, ◇, ◆, spinner frames) mixed into stdout.
+ */
+function extractJsonFromOutput(raw: string): string {
+  // First, filter out TUI decoration lines (box-drawing, UI separators, warnings)
+  const filtered = raw
+    .split("\n")
+    .filter((line) => {
+      // Skip empty lines
+      if (!line.trim()) return false;
+      // Skip lines starting with box-drawing characters
+      if (/^[│├┌┐└┘┤┬┴┼─]/.test(line)) return false;
+      // Skip UI separator lines
+      if (/^[◆◇]/.test(line)) return false;
+      // Skip config warning messages (non-JSON)
+      if (line.startsWith("Config warnings")) return false;
+      return true;
+    })
+    .join("\n");
+
+  const trimmed = filtered.trim();
+
+  // Fast path: already valid JSON
+  if (
+    (trimmed.startsWith("{") && trimmed.endsWith("}")) ||
+    (trimmed.startsWith("[") && trimmed.endsWith("]"))
+  ) {
+    return trimmed;
+  }
+
+  // Try to find the first top-level JSON object or array in the output
+  const jsonStart = trimmed.search(/[\[{]/);
+  if (jsonStart === -1) {
+    return trimmed; // no JSON-like content, return as-is and let caller handle the error
+  }
+
+  const opener = trimmed[jsonStart];
+  const closer = opener === "{" ? "}" : "]";
+
+  // Walk forward tracking brace/bracket depth to find the matching close
+  let depth = 0;
+  let inString = false;
+  let escaped = false;
+
+  for (let i = jsonStart; i < trimmed.length; i++) {
+    const ch = trimmed[i];
+
+    if (escaped) {
+      escaped = false;
+      continue;
+    }
+    if (ch === "\\") {
+      if (inString) escaped = true;
+      continue;
+    }
+    if (ch === '"') {
+      inString = !inString;
+      continue;
+    }
+    if (inString) continue;
+
+    if (ch === opener || ch === (opener === "{" ? "[" : "{")) {
+      // count both kinds of nesting
+      if (ch === "{" || ch === "[") depth++;
+    }
+    if (ch === closer || ch === (closer === "}" ? "]" : "}")) {
+      if (ch === "}" || ch === "]") depth--;
+    }
+
+    if (depth === 0) {
+      return trimmed.slice(jsonStart, i + 1);
+    }
+  }
+
+  // Fallback: return from jsonStart onwards
+  return trimmed.slice(jsonStart);
+}
 
 /**
  * Execute an openclaw CLI command and return the result.
@@ -593,7 +671,7 @@ async function executeClawCommand(
         log?.error?.(`[session-history] CLI exited with code ${code}: ${stderr}`);
         reject(new Error(`CLI exited with code ${code}: ${stderr}`));
       } else {
-        resolve(stdout);
+        resolve(extractJsonFromOutput(stdout));
       }
     });
   });