@mobcode/openclaw-plugin 0.1.24 → 0.1.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mobcode/openclaw-plugin",
-  "version": "0.1.24",
+  "version": "0.1.26",
   "description": "MobCode integration plugin for OpenClaw",
   "type": "module",
   "license": "MIT",

package/src/plugin-definition.js

@@ -15,6 +15,10 @@ import { registerMobcodeRuntimeObservers } from "./runtime-events.js";
 import { MobcodeStateStore } from "./state-store.js";
 import { registerMobcodeTools } from "./plugin-tools.js";
 
+function cloneJson(value) {
+  return value === undefined ? undefined : JSON.parse(JSON.stringify(value));
+}
+
 function createSafePluginLogger(api) {
   const pluginLogger = api?.logger;
   return {
@@ -29,6 +33,77 @@ function describeLoggerShape(api) {
   return `info=${typeof api?.logger?.info} warn=${typeof api?.logger?.warn} error=${typeof api?.logger?.error} debug=${typeof api?.logger?.debug}`;
 }
 
+function resolveToolIdentity(event, ctx) {
+  const toolCallId =
+    String(event?.message?.toolCallId ?? "").trim() ||
+    String(event?.toolCallId ?? "").trim() ||
+    String(ctx?.toolCallId ?? "").trim() ||
+    undefined;
+  const toolName =
+    String(event?.message?.toolName ?? "").trim() ||
+    String(event?.toolName ?? "").trim() ||
+    String(ctx?.toolName ?? "").trim() ||
+    undefined;
+  return { toolCallId, toolName };
+}
+
+function buildPersistedToolResultFromAfterToolCall(event, ctx) {
+  const { toolCallId, toolName } = resolveToolIdentity(event, ctx);
+  if (!toolCallId) {
+    return null;
+  }
+
+  const clonedResult = cloneJson(event?.result);
+  if (
+    clonedResult &&
+    typeof clonedResult === "object" &&
+    !Array.isArray(clonedResult) &&
+    String(clonedResult.role ?? "").trim() === "toolResult"
+  ) {
+    return {
+      ...(clonedResult ?? {}),
+      ...(toolCallId ? { toolCallId } : {}),
+      ...(toolName ? { toolName } : {}),
+      id:
+        typeof clonedResult.id === "string" && clonedResult.id.trim()
+          ? clonedResult.id.trim()
+          : toolCallId,
+    };
+  }
+
+  const content = Array.isArray(clonedResult?.content)
+    ? clonedResult.content
+    : [
+        {
+          type: "text",
+          text:
+            typeof clonedResult?.aggregated === "string" && clonedResult.aggregated.trim()
+              ? clonedResult.aggregated
+              : typeof event?.error === "string" && event.error.trim()
+                ? event.error
+                : typeof clonedResult === "string"
+                  ? clonedResult
+                  : JSON.stringify(clonedResult ?? null),
+        },
+      ];
+
+  return {
+    role: "toolResult",
+    toolCallId,
+    ...(toolName ? { toolName } : {}),
+    content,
+    ...(clonedResult && typeof clonedResult === "object" && !Array.isArray(clonedResult)
+      ? { details: clonedResult }
+      : {}),
+    isError:
+      clonedResult?.isError === true ||
+      clonedResult?.is_error === true ||
+      (typeof event?.error === "string" && event.error.trim().length > 0),
+    timestamp: Date.now(),
+    id: toolCallId,
+  };
+}
+
 export function createMobcodePluginDefinition() {
   return {
     id: "mobcode",
@@ -84,51 +159,57 @@ export function createMobcodePluginDefinition() {
         api,
         store,
       });
-      api.on("after_tool_call", (event, ctx) => {
+      api.on("after_tool_call", async (event, ctx) => {
+        const persistedMessage = buildPersistedToolResultFromAfterToolCall(event, ctx);
+        const messageId =
+          typeof persistedMessage?.id === "string" && persistedMessage.id.trim()
+            ? persistedMessage.id.trim()
+            : undefined;
         log.warn(
-          `[mobcode-debug] after_tool_call sessionKey=${String(ctx?.sessionKey ?? "").trim() || "-"} toolCallId=${String(event?.toolCallId ?? "").trim() || "-"} toolName=${String(event?.toolName ?? "").trim() || "-"} durationMs=${typeof event?.durationMs === "number" ? String(event.durationMs) : "-"}`,
+          `[mobcode-debug] after_tool_call sessionKey=${String(ctx?.sessionKey ?? "").trim() || "-"} toolCallId=${String(event?.toolCallId ?? "").trim() || "-"} toolName=${String(event?.toolName ?? "").trim() || "-"} durationMs=${typeof event?.durationMs === "number" ? String(event.durationMs) : "-"} messageId=${messageId ?? "-"}`,
+        );
+        if (!persistedMessage) {
+          return;
+        }
+        console.warn(
+          "[mobcode-direct-debug] after_tool_call store target",
+          "rootDir=",
+          store.rootDir,
+          "databasePath=",
+          store.databasePath,
         );
-      });
-      api.on("tool_result_persist", (event, ctx) => {
-        const toolCallId =
-          String(event?.message?.toolCallId ?? "").trim() ||
-          String(event?.toolCallId ?? "").trim() ||
-          String(ctx?.toolCallId ?? "").trim() ||
-          undefined;
-        const toolName =
-          String(event?.message?.toolName ?? "").trim() ||
-          String(event?.toolName ?? "").trim() ||
-          String(ctx?.toolName ?? "").trim() ||
-          undefined;
-        const messageId =
-          typeof event?.message?.id === "string" && event.message.id.trim()
-            ? event.message.id.trim()
-            : toolCallId;
-        const persistedMessage = {
-          ...(event?.message ?? {}),
-          role: event?.message?.role ?? "toolResult",
-          ...(toolCallId ? { toolCallId } : {}),
-          ...(toolName ? { toolName } : {}),
-          ...(messageId ? { id: messageId } : {}),
-        };
         console.warn(
-          "[mobcode-direct-debug] tool_result_persist enter",
+          "[mobcode-direct-debug] after_tool_call before appendMessage",
           "sessionKey=",
           String(ctx?.sessionKey ?? "").trim() || "-",
           "toolCallId=",
-          toolCallId ?? "-",
+          persistedMessage.toolCallId ?? "-",
           "toolName=",
-          toolName ?? "-",
+          persistedMessage.toolName ?? "-",
           "messageId=",
           messageId ?? "-",
-          "role=",
-          String(persistedMessage.role ?? "").trim() || "-",
-        );
-        log.warn(
-          `[mobcode-debug] tool_result_persist sessionKey=${String(ctx?.sessionKey ?? "").trim() || "-"} toolCallId=${toolCallId ?? "-"} toolName=${toolName ?? "-"} messageId=${messageId ?? "-"}`,
         );
+        try {
+          const appendResult = await store.appendMessage({
+            sessionKey: ctx?.sessionKey,
+            message: persistedMessage,
+            messageId,
+          });
+          console.warn(
+            "[mobcode-direct-debug] after_tool_call appendMessage result",
+            JSON.stringify(appendResult ?? null),
+          );
+        } catch (error) {
+          console.warn(
+            "[mobcode-direct-debug] after_tool_call appendMessage failed",
+            String(error),
+          );
+        }
+      });
+      api.on("tool_result_persist", (event, ctx) => {
+        const { toolCallId, toolName } = resolveToolIdentity(event, ctx);
         console.warn(
-          "[mobcode-direct-debug] before appendMessageSync",
+          "[mobcode-direct-debug] tool_result_persist skip",
           "sessionKey=",
           String(ctx?.sessionKey ?? "").trim() || "-",
           "toolCallId=",
@@ -136,12 +217,9 @@ export function createMobcodePluginDefinition() {
           "toolName=",
           toolName ?? "-",
         );
-        store.appendMessageSync({
-          sessionKey: ctx?.sessionKey,
-          message: persistedMessage,
-          messageId,
-        });
-        console.warn("[mobcode-direct-debug] after appendMessageSync");
+        log.warn(
+          `[mobcode-debug] tool_result_persist skipped sessionKey=${String(ctx?.sessionKey ?? "").trim() || "-"} toolCallId=${toolCallId ?? "-"} toolName=${toolName ?? "-"}`,
+        );
       });
     },
   };