adp-openclaw 0.0.52 → 0.0.53

package/package.json

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

package/src/session-history.ts

@@ -518,6 +518,69 @@ 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 {
+  const trimmed = raw.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.
  * @param subcommands - Array of subcommands, e.g. ["gateway", "call", "chat.history"] or ["sessions"]
@@ -593,7 +656,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));
       }
     });
   });