@mobcode/openclaw-plugin 0.1.7 → 0.1.10

package/package.json

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

package/src/openclaw-session-reader.js

@@ -1,92 +1,17 @@
-import { requestThroughOperatorApprovalsGateway } from "./openclaw-gateway-runtime.js";
-
-async function tryImport(modulePath) {
-  try {
-    return await import(modulePath);
-  } catch {
-    return null;
-  }
-}
-
-async function loadSessionUtilsRuntime() {
-  return (
-    (await tryImport("../../openclaw/src/gateway/session-utils.js")) ??
-    (await tryImport("../openclaw/src/gateway/session-utils.js"))
-  );
-}
-
-async function readSessionTranscriptMessagesFromInternals(sessionKey) {
-  const runtime = await loadSessionUtilsRuntime();
-  if (!runtime?.loadSessionEntry || !runtime?.readSessionMessages) {
-    return [];
-  }
-
-  const normalizedSessionKey = String(sessionKey ?? "").trim();
-  if (!normalizedSessionKey) {
-    return [];
-  }
-
-  const loaded = runtime.loadSessionEntry(normalizedSessionKey);
-  const entry = loaded?.entry;
-  const storePath = loaded?.storePath;
-  const sessionId =
-    typeof entry?.sessionId === "string" && entry.sessionId.trim()
-      ? entry.sessionId.trim()
-      : "";
-  if (!sessionId) {
-    return [];
-  }
-
-  const rawMessages = runtime.readSessionMessages(sessionId, storePath, entry?.sessionFile);
-  return Array.isArray(rawMessages) ? rawMessages : [];
-}
-
-async function readSessionMessagesThroughChatHistory(config, sessionKey, logger) {
-  const normalizedSessionKey = String(sessionKey ?? "").trim();
-  if (!normalizedSessionKey) {
-    return [];
-  }
-  logger?.info?.(
-    `[mobcode-history] chat.history request session=${normalizedSessionKey} limit=1000`,
-  );
-  const payload = await requestThroughOperatorApprovalsGateway({
-    config,
-    method: "chat.history",
-    requestParams: {
-      sessionKey: normalizedSessionKey,
-      limit: 1000,
-    },
-    clientDisplayName: "MobCode History Backfill",
+import { readSessionMessagesFromRuntime } from "./session-transcript-runtime.js";
+
+export async function readSessionTranscriptMessages(runtime, _config, sessionKey, logger) {
+  const runtimeMessages = await readSessionMessagesFromRuntime({
+    runtime,
+    config: runtime?.config?.loadConfig?.(),
+    sessionKey,
+    logger,
   });
-  const messages = payload?.messages;
-  logger?.info?.(
-    `[mobcode-history] chat.history response session=${normalizedSessionKey} sessionId=${String(payload?.sessionId ?? "").trim() || "-"} thinkingLevel=${String(payload?.thinkingLevel ?? "").trim() || "-"} fastMode=${String(payload?.fastMode ?? "").trim() || "-"} verboseLevel=${String(payload?.verboseLevel ?? "").trim() || "-"} messages=${Array.isArray(messages) ? messages.length : 0}`,
-  );
-  return Array.isArray(messages) ? messages : [];
-}
-
-export async function readSessionTranscriptMessages(config, sessionKey, logger) {
-  try {
-    const gatewayMessages = await readSessionMessagesThroughChatHistory(
-      config,
-      sessionKey,
-      logger,
-    );
-    if (gatewayMessages.length > 0) {
-      return gatewayMessages;
-    }
-  } catch (error) {
-    logger?.warn?.(
-      `[mobcode-history] chat.history failed session=${String(sessionKey ?? "").trim()}: ${error instanceof Error ? error.message : String(error)}`,
-    );
-    // Fall back to adjacent-source runtime imports for development checkouts.
+  if (runtimeMessages.length > 0) {
+    return runtimeMessages;
   }
   logger?.info?.(
-    `[mobcode-history] falling back to internal transcript reader session=${String(sessionKey ?? "").trim()}`,
-  );
-  const internalMessages = await readSessionTranscriptMessagesFromInternals(sessionKey);
-  logger?.info?.(
-    `[mobcode-history] internal fallback session=${String(sessionKey ?? "").trim()} messages=${internalMessages.length}`,
+    `[mobcode-history] no transcript history resolved session=${String(sessionKey ?? "").trim()}`,
   );
-  return internalMessages;
+  return [];
 }

package/src/plugin-definition.js

@@ -37,6 +37,7 @@ export function createMobcodePluginDefinition() {
         ensureSessionMessages: async (sessionKey) => {
           await store.ensureSessionIndexed(sessionKey, async () =>
             readSessionTranscriptMessages(
+              api.runtime,
               api.runtime.config.loadConfig(),
               sessionKey,
               api.logger,

package/src/session-transcript-runtime.js

@@ -0,0 +1,160 @@
+import fs from "node:fs";
+import path from "node:path";
+
+function trim(value) {
+  return typeof value === "string" ? value.trim() : "";
+}
+
+function parseAgentId(sessionKey, config) {
+  const raw = trim(sessionKey).toLowerCase();
+  if (raw.startsWith("agent:")) {
+    const parts = raw.split(":");
+    if (parts.length >= 3 && parts[1]) {
+      return parts[1];
+    }
+  }
+  const configuredAgents = Array.isArray(config?.agents?.list) ? config.agents.list : [];
+  const defaultAgentId =
+    configuredAgents.find((agent) => agent?.default)?.id ??
+    configuredAgents[0]?.id ??
+    "main";
+  return trim(defaultAgentId) || "main";
+}
+
+function resolveStoreCandidates(runtime, config, sessionKey) {
+  const parsedAgentId = parseAgentId(sessionKey, config);
+  const configuredAgents = Array.isArray(config?.agents?.list) ? config.agents.list : [];
+  const ids = new Set([parsedAgentId]);
+  for (const agent of configuredAgents) {
+    const id = trim(agent?.id);
+    if (id) {
+      ids.add(id);
+    }
+  }
+  const candidates = [];
+  for (const agentId of ids) {
+    try {
+      const storePath = runtime.agent.session.resolveStorePath(config?.session?.store, { agentId });
+      if (trim(storePath)) {
+        candidates.push({
+          agentId,
+          storePath,
+        });
+      }
+    } catch {
+      // Ignore invalid store path resolutions and continue scanning other agents.
+    }
+  }
+  return candidates;
+}
+
+function attachTranscriptMeta(message, meta) {
+  if (!message || typeof message !== "object" || Array.isArray(message)) {
+    return message;
+  }
+  const record = message;
+  const existing =
+    record.__openclaw && typeof record.__openclaw === "object" && !Array.isArray(record.__openclaw)
+      ? record.__openclaw
+      : {};
+  return {
+    ...record,
+    __openclaw: {
+      ...existing,
+      ...meta,
+    },
+  };
+}
+
+function readTranscriptMessages(filePath) {
+  if (!trim(filePath) || !fs.existsSync(filePath)) {
+    return [];
+  }
+  const lines = fs.readFileSync(filePath, "utf-8").split(/\r?\n/);
+  const messages = [];
+  let seq = 0;
+  for (const line of lines) {
+    if (!trim(line)) {
+      continue;
+    }
+    try {
+      const parsed = JSON.parse(line);
+      if (parsed?.message) {
+        seq += 1;
+        messages.push(
+          attachTranscriptMeta(parsed.message, {
+            ...(trim(parsed?.id) ? { id: trim(parsed.id) } : {}),
+            seq,
+          }),
+        );
+        continue;
+      }
+      if (parsed?.type === "compaction") {
+        seq += 1;
+        messages.push({
+          role: "system",
+          content: [{ type: "text", text: "Compaction" }],
+          __openclaw: {
+            kind: "compaction",
+            ...(trim(parsed?.id) ? { id: trim(parsed.id) } : {}),
+            seq,
+          },
+        });
+      }
+    } catch {
+      // Ignore malformed transcript lines.
+    }
+  }
+  return messages;
+}
+
+export async function readSessionMessagesFromRuntime({ runtime, config, sessionKey, logger }) {
+  const normalizedSessionKey = trim(sessionKey);
+  if (!normalizedSessionKey || !runtime?.agent?.session) {
+    return [];
+  }
+  const candidates = resolveStoreCandidates(runtime, config, normalizedSessionKey);
+  logger?.info?.(
+    `[mobcode-history] runtime reader start session=${normalizedSessionKey} storeCandidates=${candidates.map((candidate) => `${candidate.agentId}:${candidate.storePath}`).join(",") || "-"}`,
+  );
+  for (const candidate of candidates) {
+    try {
+      const store = runtime.agent.session.loadSessionStore(candidate.storePath, {
+        skipCache: true,
+      });
+      const entry = store?.[normalizedSessionKey];
+      if (!entry) {
+        logger?.info?.(
+          `[mobcode-history] runtime reader miss session=${normalizedSessionKey} agentId=${candidate.agentId} storePath=${candidate.storePath}`,
+        );
+        continue;
+      }
+      const sessionId = trim(entry?.sessionId);
+      if (!sessionId) {
+        logger?.warn?.(
+          `[mobcode-history] runtime reader invalid_entry session=${normalizedSessionKey} agentId=${candidate.agentId} storePath=${candidate.storePath} reason=missing_session_id`,
+        );
+        continue;
+      }
+      const transcriptFile = trim(entry?.sessionFile)
+        ? path.resolve(trim(entry.sessionFile))
+        : runtime.agent.session.resolveSessionFilePath(sessionId, entry, {
+            sessionsDir: path.dirname(candidate.storePath),
+            agentId: candidate.agentId,
+          });
+      const messages = readTranscriptMessages(transcriptFile);
+      logger?.info?.(
+        `[mobcode-history] runtime reader hit session=${normalizedSessionKey} agentId=${candidate.agentId} storePath=${candidate.storePath} transcriptFile=${transcriptFile} messages=${messages.length}`,
+      );
+      return messages;
+    } catch (error) {
+      logger?.warn?.(
+        `[mobcode-history] runtime reader error session=${normalizedSessionKey} agentId=${candidate.agentId} storePath=${candidate.storePath}: ${error instanceof Error ? error.message : String(error)}`,
+      );
+    }
+  }
+  logger?.warn?.(
+    `[mobcode-history] runtime reader unresolved session=${normalizedSessionKey}`,
+  );
+  return [];
+}

package/src/state-store.js

@@ -811,17 +811,23 @@ export class MobcodeStateStore {
           LIMIT 1`,
       )
       .get(normalizedSessionKey);
+    const messageCountRow = this._db()
+      .prepare(`SELECT COUNT(*) AS count FROM messages WHERE session_key=?`)
+      .get(normalizedSessionKey);
+    const messageRows = Number(messageCountRow?.count ?? 0);
     const alreadyBackfilled =
       typeof existing?.last_backfill_at === "string" && existing.last_backfill_at.trim().length > 0;
-    if (alreadyBackfilled) {
-      const messageCountRow = this._db()
-        .prepare(`SELECT COUNT(*) AS count FROM messages WHERE session_key=?`)
-        .get(normalizedSessionKey);
+    if (alreadyBackfilled && messageRows > 0) {
       this.logger?.info?.(
-        `[mobcode-store] ensureSessionIndexed skip session=${normalizedSessionKey} reason=already_backfilled lastBackfillAt=${existing?.last_backfill_at ?? "-"} messageRows=${Number(messageCountRow?.count ?? 0)}`,
+        `[mobcode-store] ensureSessionIndexed skip session=${normalizedSessionKey} reason=already_backfilled lastBackfillAt=${existing?.last_backfill_at ?? "-"} messageRows=${messageRows}`,
       );
       return;
     }
+    if (alreadyBackfilled && messageRows <= 0) {
+      this.logger?.warn?.(
+        `[mobcode-store] ensureSessionIndexed retry session=${normalizedSessionKey} reason=stale_backfill_marker lastBackfillAt=${existing?.last_backfill_at ?? "-"} messageRows=${messageRows}`,
+      );
+    }
     this.logger?.info?.(
       `[mobcode-store] ensureSessionIndexed start session=${normalizedSessionKey}`,
     );