@openclawcity/openclawcity 1.0.11 → 1.0.13

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import type { OpenClawPluginApi } from 'openclaw/plugin-sdk';
+export declare function sanitizeReplyText(text: string): string | null;
 declare const plugin: {
     id: string;
     name: string;

package/dist/index.js

@@ -4072,7 +4072,52 @@ var OpenClawCityAdapter = class {
 
 // .tsc-out/index.js
 var CHANNEL_ID = "openclawcity";
+var DEFAULT_API_BASE = "https://api.openbotcity.com";
+var HEARTBEAT_CACHE_MS = 5 * 60 * 1e3;
+function deriveApiBase(gatewayUrl) {
+  if (!gatewayUrl)
+    return DEFAULT_API_BASE;
+  try {
+    const url = new URL(gatewayUrl);
+    const protocol = url.protocol === "wss:" ? "https:" : "http:";
+    return `${protocol}//${url.host}`;
+  } catch {
+    return DEFAULT_API_BASE;
+  }
+}
+var TOOL_CALL_MARKUP_RE = /<PLHD\d*>[\s\S]*?<PLHD\d*>/g;
+function sanitizeReplyText(text) {
+  let cleaned = text.replace(TOOL_CALL_MARKUP_RE, "");
+  cleaned = cleaned.trim();
+  return cleaned || null;
+}
 var adapters = /* @__PURE__ */ new Map();
+var heartbeatCache = /* @__PURE__ */ new Map();
+async function fetchHeartbeatContext(apiBase, jwt, accountId, log) {
+  const cached = heartbeatCache.get(accountId);
+  const now = Date.now();
+  if (cached && now - cached.fetchedAt < HEARTBEAT_CACHE_MS) {
+    log?.info?.(`[OCC] Heartbeat cache hit (age=${Math.round((now - cached.fetchedAt) / 1e3)}s)`);
+    return cached.data;
+  }
+  try {
+    log?.info?.(`[OCC] Fetching heartbeat context from ${apiBase}/world/heartbeat`);
+    const resp = await fetch(`${apiBase}/world/heartbeat`, {
+      headers: { "Authorization": `Bearer ${jwt}` }
+    });
+    if (!resp.ok) {
+      log?.error?.(`[OCC] Heartbeat fetch failed: ${resp.status} ${resp.statusText}`);
+      return cached?.data ?? null;
+    }
+    const data = await resp.text();
+    heartbeatCache.set(accountId, { data, fetchedAt: now });
+    log?.info?.(`[OCC] Heartbeat fetched (${data.length} bytes)`);
+    return data;
+  } catch (err) {
+    log?.error?.(`[OCC] Heartbeat fetch error: ${String(err)}`);
+    return cached?.data ?? null;
+  }
+}
 var occPlugin = {
   id: CHANNEL_ID,
   meta: {
@@ -4117,10 +4162,13 @@ var occPlugin = {
       if (!adapter) {
         return { ok: false };
       }
+      const text = sanitizeReplyText(ctx.text ?? "");
+      if (!text)
+        return { ok: true };
       const reply = {
         type: "agent_reply",
         action: "dm_reply",
-        text: ctx.text,
+        text,
         conversationId: ctx.to
       };
       adapter.sendReply(reply);
@@ -4142,6 +4190,16 @@ var occPlugin = {
         signal: abortSignal,
         onMessage: async (envelope) => {
           log?.info?.(`[OCC] Event received: ${envelope.id} from=${envelope.sender.name} type=${envelope.metadata.eventType}`);
+          const apiBase = deriveApiBase(account.gatewayUrl);
+          const cityCtx = await fetchHeartbeatContext(apiBase, account.apiKey, accountId, log);
+          if (cityCtx) {
+            envelope.content.text = `[CITY CONTEXT]
+${cityCtx}
+[/CITY CONTEXT]
+
+${envelope.content.text}`;
+            log?.info?.(`[OCC] City context prepended (${cityCtx.length} bytes)`);
+          }
           log?.info?.(`[OCC] Step 1: resolveAgentRoute...`);
           let route;
           try {
@@ -4220,8 +4278,12 @@ var occPlugin = {
               ctx: msgCtx,
               cfg,
               dispatcherOptions: {
-                deliver: async (payload) => {
-                  const text = payload.text;
+                deliver: async (payload, info) => {
+                  if (info.kind === "tool") {
+                    log?.info?.(`[OCC] Deliver callback: skipping tool-kind payload`);
+                    return;
+                  }
+                  const text = sanitizeReplyText(payload.text ?? "");
                   log?.info?.(`[OCC] Deliver callback: text=${text ? text.slice(0, 80) + "..." : "(empty)"}`);
                   if (!text)
                     return;
@@ -4340,5 +4402,6 @@ var plugin = {
 };
 var index_default = plugin;
 export {
-  index_default as default
+  index_default as default,
+  sanitizeReplyText
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclawcity/openclawcity",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "OpenClawCity channel plugin for OpenClaw — live city events for AI agents",
   "type": "module",
   "main": "./dist/index.js",