@mobcode/openclaw-plugin 0.1.16 → 0.1.18

package/package.json

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

package/src/gateway-methods.js

@@ -122,6 +122,35 @@ export function registerMobcodeGatewayMethods({
     });
   });
 
+  api.registerGatewayMethod("mobcode.tool_result.get", async ({ params, respond }) => {
+    const sessionKey = typeof params?.sessionKey === "string" ? params.sessionKey.trim() : "";
+    const toolCallId = typeof params?.toolCallId === "string" ? params.toolCallId.trim() : "";
+    if (!sessionKey || !toolCallId) {
+      respond(false, { error: "sessionKey and toolCallId are required" });
+      return;
+    }
+    const timeoutMs =
+      typeof params?.waitMs === "number"
+        ? params.waitMs
+        : typeof params?.timeoutMs === "number"
+          ? params.timeoutMs
+          : 0;
+    const result = await store.waitForToolResult(sessionKey, toolCallId, {
+      timeoutMs,
+    });
+    if (!result?.message) {
+      respond(false, { error: "tool result not found" });
+      return;
+    }
+    respond(true, {
+      ok: true,
+      sessionKey,
+      toolCallId,
+      messageId: result.messageId,
+      message: result.message,
+    });
+  });
+
   api.registerGatewayMethod("mobcode.client.register", async ({ params, respond }) => {
     const clientId = typeof params?.clientId === "string" ? params.clientId.trim() : "";
     if (!clientId) {

package/src/state-store.js

@@ -157,122 +157,6 @@ function decodeMobcodePayload(value) {
   return null;
 }
 
-function extractMobcodeContentBlocksFromToolResult(rawResult) {
-  const payload = decodeMobcodePayload(rawResult);
-  if (!payload || typeof payload !== "object" || Array.isArray(payload)) {
-    return [];
-  }
-  return Array.isArray(payload.content_blocks)
-    ? cloneJson(payload.content_blocks) ?? []
-    : [];
-}
-
-function timelineTextPreview(timeline) {
-  if (!Array.isArray(timeline) || timeline.length === 0) {
-    return "";
-  }
-  const parts = [];
-  for (const item of timeline) {
-    if (!item || typeof item !== "object") continue;
-    const kind = String(item.kind ?? "").trim().toLowerCase();
-    if (kind === "text") {
-      const text = String(item.text ?? "");
-      if (text.trim()) parts.push(text);
-      continue;
-    }
-    if (kind === "step") {
-      const title = String(item.title ?? "");
-      const detail = String(item.detail ?? "");
-      if (title.trim()) parts.push(title);
-      if (detail.trim()) parts.push(detail);
-      continue;
-    }
-    if (kind === "artifact") {
-      const title = String(item?.block?.title ?? "");
-      if (title.trim()) parts.push(title);
-      continue;
-    }
-    if (kind === "question") {
-      const title = String(item.title ?? item?.payload?.title ?? "");
-      if (title.trim()) parts.push(title);
-    }
-  }
-  return parts.join("\n");
-}
-
-function stableId(prefix, seed) {
-  const digest = crypto.createHash("sha1").update(`${prefix}\n${seed}`).digest("hex");
-  return `${prefix}-${digest.slice(0, 12)}`;
-}
-
-function createTextTimelineItem({ id, text, status = "done" }) {
-  return {
-    id,
-    kind: "text",
-    status,
-    text,
-  };
-}
-
-function createToolTimelineItem({ id, toolCall }) {
-  const status = toolCall.isError
-    ? "error"
-    : toolCall.phase === "result"
-      ? "done"
-      : "streaming";
-  return {
-    id,
-    kind: "tool",
-    status,
-    toolCallId: toolCall.toolCallId,
-    ...(toolCall.approvalId ? { approvalId: toolCall.approvalId } : {}),
-    name: toolCall.name,
-    args: cloneJson(toolCall.args),
-    result: cloneJson(toolCall.result),
-    isError: toolCall.isError === true,
-    phase: toolCall.phase,
-  };
-}
-
-function timelineItemFromContentBlock(block, seed) {
-  if (!block || typeof block !== "object") {
-    return null;
-  }
-  const type = String(block.type ?? "").trim().toLowerCase();
-  if (type === "text") {
-    const text = String(block.text ?? "");
-    if (!text.trim()) return null;
-    return createTextTimelineItem({
-      id: stableId("timeline-text", `${seed}\n${text}`),
-      text,
-      status: "done",
-    });
-  }
-  if (type === "artifact_ref") {
-    return {
-      id: stableId("timeline-artifact", `${seed}\n${JSON.stringify(block)}`),
-      kind: "artifact",
-      status: "done",
-      block: cloneJson(block),
-    };
-  }
-  if (type === "question") {
-    return {
-      id: stableId("timeline-question", `${seed}\n${JSON.stringify(block)}`),
-      kind: "question",
-      status: "done",
-      payload: cloneJson(block),
-      ...cloneJson(block),
-    };
-  }
-  return {
-    id: stableId("timeline-unknown", `${seed}\n${JSON.stringify(block)}`),
-    kind: "unknown",
-    status: "error",
-    block: cloneJson(block),
-  };
-}
-
 function extractArtifactDocumentFromMessage(message) {
   if (!message || typeof message !== "object" || Array.isArray(message)) {
     return null;
@@ -295,273 +179,6 @@ function extractArtifactDocumentFromMessage(message) {
   return null;
 }
 
-function createConversationMessage({ id, role, text = "", replyToId = null, replyPreview = null }) {
-  return {
-    id,
-    role,
-    text,
-    status: "done",
-    toolCalls: [],
-    contentBlocks: [],
-    timeline: [],
-    ...(replyToId ? { replyToId } : {}),
-    ...(replyPreview ? { replyPreview } : {}),
-  };
-}
-
-function upsertToolCall(message, toolCall, seed) {
-  const toolCalls = Array.isArray(message.toolCalls) ? [...message.toolCalls] : [];
-  const toolIndex = toolCalls.findIndex((item) => item?.toolCallId === toolCall.toolCallId);
-  if (toolIndex >= 0) {
-    toolCalls[toolIndex] = { ...toolCalls[toolIndex], ...cloneJson(toolCall) };
-  } else {
-    toolCalls.push(cloneJson(toolCall));
-  }
-
-  const timeline = Array.isArray(message.timeline) ? [...message.timeline] : [];
-  const timelineIndex = timeline.findIndex(
-    (item) => item?.kind === "tool" && item?.toolCallId === toolCall.toolCallId,
-  );
-  const toolItem = createToolTimelineItem({
-    id: timelineIndex >= 0 ? timeline[timelineIndex].id : stableId("timeline-tool", seed),
-    toolCall,
-  });
-  if (timelineIndex >= 0) {
-    timeline[timelineIndex] = toolItem;
-  } else {
-    timeline.push(toolItem);
-  }
-
-  return {
-    ...message,
-    toolCalls,
-    timeline,
-    text: timelineTextPreview(timeline) || message.text || "",
-  };
-}
-
-function appendAssistantTextSegment(message, text, seed) {
-  if (!String(text ?? "").trim()) {
-    return message;
-  }
-  const normalizedText = String(text);
-  const timeline = Array.isArray(message.timeline) ? [...message.timeline] : [];
-  const last = timeline.length > 0 ? timeline[timeline.length - 1] : null;
-  if (last?.kind === "text" && last?.status === "streaming") {
-    timeline[timeline.length - 1] = {
-      ...last,
-      text: `${String(last.text ?? "")}${normalizedText}`,
-      status: "done",
-    };
-  } else {
-    timeline.push(
-      createTextTimelineItem({
-        id: stableId("timeline-text", `${seed}\n${timeline.length}`),
-        text: normalizedText,
-        status: "done",
-      }),
-    );
-  }
-  return {
-    ...message,
-    timeline,
-    text: timelineTextPreview(timeline) || message.text || "",
-  };
-}
-
-function appendToolResult(message, { toolCallId, result, isError }, seed) {
-  const existingTool =
-    (Array.isArray(message.toolCalls)
-      ? message.toolCalls.find((item) => item?.toolCallId === toolCallId)
-      : null) ?? {
-      toolCallId,
-      name: "unknown",
-      phase: "result",
-      result: null,
-      isError: false,
-    };
-  let next = upsertToolCall(
-    message,
-    {
-      ...existingTool,
-      result: cloneJson(result),
-      isError: isError === true,
-      phase: "result",
-    },
-    `${seed}\n${toolCallId}`,
-  );
-
-  const blocks = extractMobcodeContentBlocksFromToolResult(result);
-  if (blocks.length === 0) {
-    return next;
-  }
-
-  const contentBlocks = Array.isArray(next.contentBlocks) ? [...next.contentBlocks] : [];
-  const timeline = Array.isArray(next.timeline) ? [...next.timeline] : [];
-  const seenBlockKeys = new Set(contentBlocks.map((block) => JSON.stringify(block)));
-  const seenTimelineKeys = new Set(timeline.map((item) => JSON.stringify(item)));
-  for (const block of blocks) {
-    const blockKey = JSON.stringify(block);
-    if (!seenBlockKeys.has(blockKey)) {
-      seenBlockKeys.add(blockKey);
-      contentBlocks.push(cloneJson(block));
-    }
-    const item = timelineItemFromContentBlock(block, `${seed}\n${blockKey}`);
-    if (!item) continue;
-    const timelineKey = JSON.stringify(item);
-    if (!seenTimelineKeys.has(timelineKey)) {
-      seenTimelineKeys.add(timelineKey);
-      timeline.push(item);
-    }
-  }
-  return {
-    ...next,
-    contentBlocks,
-    timeline,
-    text: timelineTextPreview(timeline) || next.text || "",
-  };
-}
-
-function appendAssistantTranscriptContent(message, content, seed) {
-  if (!Array.isArray(content)) {
-    return appendAssistantTextSegment(
-      message,
-      textToDisplayForAssistant(extractMessageText({ content })),
-      seed,
-    );
-  }
-
-  let next = { ...message };
-  for (const rawBlock of content) {
-    if (!rawBlock || typeof rawBlock !== "object") continue;
-    const block = cloneJson(rawBlock) ?? {};
-    const type = String(block.type ?? "").trim().toLowerCase();
-    if (type === "text" || type === "output_text" || type === "input_text") {
-      next = appendAssistantTextSegment(
-        next,
-        textToDisplayForAssistant(String(block.text ?? block.content ?? "")),
-        `${seed}\ntext`,
-      );
-      continue;
-    }
-    if (type === "toolcall" || type === "tool_call") {
-      const toolCallId = String(block.id ?? "").trim();
-      if (!toolCallId) continue;
-      next = upsertToolCall(
-        next,
-        {
-          toolCallId,
-          approvalId: String(block.approvalId ?? block.approval_id ?? "").trim() || null,
-          name: String(block.name ?? "unknown"),
-          args: cloneJson(block.arguments ?? block.args),
-          result: null,
-          isError: false,
-          phase: "start",
-        },
-        `${seed}\n${toolCallId}`,
-      );
-      continue;
-    }
-    if (type === "toolresult" || type === "tool_result") {
-      const toolCallId = String(block.toolCallId ?? block.tool_call_id ?? "").trim();
-      if (!toolCallId) continue;
-      next = appendToolResult(
-        next,
-        {
-          toolCallId,
-          result: block.content ?? block.result ?? block.output,
-          isError: block.isError === true || block.is_error === true,
-        },
-        `${seed}\n${toolCallId}`,
-      );
-      continue;
-    }
-  }
-  return next;
-}
-
-function projectConversationMessages(rawMessages, sessionKey) {
-  const projected = [];
-  const assistantIndexByRunId = new Map();
-
-  for (const rawMessage of rawMessages) {
-    const message = normalizeMessageObject(rawMessage, rawMessage?.id ?? null);
-    const role = String(message?.role ?? "").trim().toLowerCase();
-    const runId = String(message?.runId ?? message?.run_id ?? "").trim();
-    const messageId =
-      String(message?.id ?? "").trim() ||
-      stableId("message", `${sessionKey}\n${role}\n${JSON.stringify(message)}`);
-
-    if (role === "user" || role === "system") {
-      projected.push(
-        createConversationMessage({
-          id: messageId,
-          role,
-          text: extractMessageText(message),
-        }),
-      );
-      continue;
-    }
-
-    if (role === "assistant") {
-      const assistantIndex = runId ? assistantIndexByRunId.get(runId) : undefined;
-      const current =
-        assistantIndex == null
-          ? createConversationMessage({
-              id: messageId,
-              role: "assistant",
-              text: "",
-            })
-          : projected[assistantIndex];
-      let next = appendAssistantTranscriptContent(
-        {
-          ...current,
-          thinking: extractThinkingText(message) ?? current.thinking ?? null,
-        },
-        message.content,
-        `${sessionKey}\n${messageId}`,
-      );
-      if (assistantIndex == null) {
-        projected.push(next);
-        if (runId) {
-          assistantIndexByRunId.set(runId, projected.length - 1);
-        }
-      } else {
-        projected[assistantIndex] = next;
-      }
-      continue;
-    }
-
-    if (role === "toolresult" || role === "tool_result") {
-      const toolCallId = String(message?.toolCallId ?? message?.tool_call_id ?? "").trim();
-      if (!toolCallId) {
-        continue;
-      }
-      const assistantIndex = runId
-        ? assistantIndexByRunId.get(runId)
-        : projected.map((item) => item.role).lastIndexOf("assistant");
-      if (assistantIndex == null || assistantIndex < 0) {
-        continue;
-      }
-      projected[assistantIndex] = appendToolResult(
-        projected[assistantIndex],
-        {
-          toolCallId,
-          result: decodeMobcodePayload(message.content) ?? message.content,
-          isError: message.isError === true || message.is_error === true,
-        },
-        `${sessionKey}\n${messageId}`,
-      );
-    }
-  }
-
-  return projected.map((item) => ({
-    ...item,
-    status: "done",
-    text: timelineTextPreview(item.timeline) || item.text || "",
-  }));
-}
-
 function createMessageSourceKey(sessionKey, messageId, normalizedMessage) {
   if (messageId) {
     return `mid:${sessionKey}:${messageId}`;
@@ -1150,15 +767,14 @@ export class MobcodeStateStore {
     const normalizedBeforeId =
       typeof beforeId === "number" && Number.isFinite(beforeId) ? beforeId : null;
     const transcriptMessages = await this.pageTranscriptMessages(normalizedSessionKey);
-    const projected = projectConversationMessages(transcriptMessages, normalizedSessionKey);
     this.logger?.info?.(
-      `[mobcode-store] pageSessionMessages session=${normalizedSessionKey} transcriptMessages=${transcriptMessages.length} projectedMessages=${projected.length} limit=${normalizedLimit} beforeId=${normalizedBeforeId ?? "-"}`
+      `[mobcode-store] pageSessionMessages session=${normalizedSessionKey} transcriptMessages=${transcriptMessages.length} limit=${normalizedLimit} beforeId=${normalizedBeforeId ?? "-"}`
     );
     const endExclusive = normalizedBeforeId == null
-      ? projected.length
-      : Math.max(0, Math.min(projected.length, normalizedBeforeId - 1));
+      ? transcriptMessages.length
+      : Math.max(0, Math.min(transcriptMessages.length, normalizedBeforeId - 1));
     const start = Math.max(0, endExclusive - normalizedLimit);
-    const items = projected.slice(start, endExclusive);
+    const items = transcriptMessages.slice(start, endExclusive);
     const hasMore = start > 0;
     const nextBeforeId = hasMore ? start + 1 : null;
 
@@ -1168,7 +784,7 @@ export class MobcodeStateStore {
       rawMessages: transcriptMessages,
       nextBeforeId,
       hasMore,
-      total: projected.length,
+      total: transcriptMessages.length,
     };
   }
 
@@ -1177,6 +793,67 @@ export class MobcodeStateStore {
     return page.items;
   }
 
+  async readToolResult(sessionKey, toolCallId) {
+    const normalizedSessionKey = String(sessionKey ?? "").trim();
+    const normalizedToolCallId = String(toolCallId ?? "").trim();
+    if (!normalizedSessionKey || !normalizedToolCallId) {
+      return null;
+    }
+    const row = this._db()
+      .prepare(
+        `SELECT message_id, raw_json
+           FROM messages
+          WHERE session_key=?
+            AND role='toolResult'
+          ORDER BY id DESC`,
+      )
+      .all(normalizedSessionKey)
+      .find((candidate) => {
+        const message = fromJson(candidate.raw_json, null);
+        return (
+          message &&
+          typeof message === "object" &&
+          !Array.isArray(message) &&
+          String(message.toolCallId ?? message.tool_call_id ?? "").trim() ===
+            normalizedToolCallId
+        );
+      });
+    if (!row) {
+      return null;
+    }
+    const message = fromJson(row.raw_json, null);
+    if (!message || typeof message !== "object" || Array.isArray(message)) {
+      return null;
+    }
+    return {
+      messageId:
+        typeof row.message_id === "string" && row.message_id.trim()
+          ? row.message_id.trim()
+          : null,
+      message,
+    };
+  }
+
+  async waitForToolResult(sessionKey, toolCallId, { timeoutMs = 0, pollMs = 75 } = {}) {
+    const normalizedTimeout = Math.max(0, Number(timeoutMs) || 0);
+    const normalizedPoll = Math.max(25, Number(pollMs) || 75);
+    const deadline = Date.now() + normalizedTimeout;
+    while (true) {
+      const found = await this.readToolResult(sessionKey, toolCallId);
+      if (found) {
+        return found;
+      }
+      if (Date.now() >= deadline) {
+        return null;
+      }
+      const sleepMs = Math.min(normalizedPoll, Math.max(0, deadline - Date.now()));
+      if (sleepMs <= 0) {
+        return null;
+      }
+      await new Promise((resolve) => setTimeout(resolve, sleepMs));
+    }
+  }
+
   async recordApprovalRequested(payload) {
     const request = payload?.request && typeof payload.request === "object" ? payload.request : {};
     const approvalId = String(payload?.id ?? "").trim();