@mobcode/openclaw-plugin 0.1.4 → 0.1.6

package/package.json

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

package/src/runtime-events.js

@@ -1,4 +1,5 @@
 import { tryCreateOperatorApprovalsGatewayClient } from "./openclaw-gateway-runtime.js";
+import { resolveSessionKeyFromTranscriptFile } from "./session-key-resolver.js";
 
 function createPushPayloadFromTranscript(update) {
   return {
@@ -39,17 +40,30 @@ export function registerMobcodeRuntimeObservers({ api, store, pluginConfig }) {
       await store.init();
 
       api.runtime.events.onSessionTranscriptUpdate(async (update) => {
+        let resolvedSessionKey = String(update?.sessionKey ?? "").trim();
+        if (!resolvedSessionKey && update?.sessionFile) {
+          resolvedSessionKey =
+            (await resolveSessionKeyFromTranscriptFile(update.sessionFile, api.logger)) ?? "";
+        }
         api.logger?.info?.(
-          `[mobcode-runtime] transcript update sessionKey=${String(update?.sessionKey ?? "").trim() || "-"} sessionFile=${String(update?.sessionFile ?? "").trim() || "-"} messageId=${String(update?.messageId ?? "").trim() || "-"} hasMessage=${update?.message !== undefined}`,
+          `[mobcode-runtime] transcript update sessionKey=${resolvedSessionKey || "-"} rawSessionKey=${String(update?.sessionKey ?? "").trim() || "-"} sessionFile=${String(update?.sessionFile ?? "").trim() || "-"} messageId=${String(update?.messageId ?? "").trim() || "-"} hasMessage=${update?.message !== undefined}`,
         );
         if (retainMessages && update?.message !== undefined) {
-          const indexed = await store.appendMessage(update);
+          const indexed = await store.appendMessage({
+            ...update,
+            ...(resolvedSessionKey ? { sessionKey: resolvedSessionKey } : {}),
+          });
           api.logger?.info?.(
-            `[mobcode-runtime] transcript indexed sessionKey=${indexed?.sessionKey ?? "-"} total=${String(indexed?.count ?? 0)}`,
+            `[mobcode-runtime] transcript indexed sessionKey=${indexed?.sessionKey ?? "-"} total=${String(indexed?.count ?? 0)} skipped=${indexed?.skipped === true}`,
           );
         }
         if (pushEnabled) {
-          await store.enqueuePush(createPushPayloadFromTranscript(update));
+          await store.enqueuePush(
+            createPushPayloadFromTranscript({
+              ...update,
+              ...(resolvedSessionKey ? { sessionKey: resolvedSessionKey } : {}),
+            }),
+          );
         }
       });
 

package/src/session-key-resolver.js

@@ -0,0 +1,103 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+
+const RESOLVED_SESSION_KEY_CACHE = new Map();
+
+async function resolvePathForComparison(value) {
+  const trimmed = String(value ?? "").trim();
+  if (!trimmed) {
+    return null;
+  }
+  const resolved = path.resolve(trimmed);
+  try {
+    return await fs.realpath(resolved);
+  } catch {
+    return resolved;
+  }
+}
+
+function extractSessionsDir(sessionFile) {
+  const normalized = String(sessionFile ?? "").trim();
+  if (!normalized) {
+    return null;
+  }
+  const sessionsDir = path.dirname(path.resolve(normalized));
+  return path.basename(sessionsDir) === "sessions" ? sessionsDir : null;
+}
+
+async function readSessionStore(storePath) {
+  try {
+    const raw = await fs.readFile(storePath, "utf-8");
+    const parsed = JSON.parse(raw);
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+
+function buildTranscriptCandidates(entry, sessionsDir) {
+  const candidates = [];
+  const rawSessionFile = String(entry?.sessionFile ?? "").trim();
+  if (rawSessionFile) {
+    candidates.push(
+      path.isAbsolute(rawSessionFile)
+        ? rawSessionFile
+        : path.resolve(sessionsDir, rawSessionFile),
+    );
+  }
+  const sessionId = String(entry?.sessionId ?? "").trim();
+  if (sessionId) {
+    candidates.push(path.join(sessionsDir, `${sessionId}.jsonl`));
+  }
+  return candidates;
+}
+
+export async function resolveSessionKeyFromTranscriptFile(sessionFile, logger) {
+  const targetPath = await resolvePathForComparison(sessionFile);
+  if (!targetPath) {
+    return null;
+  }
+
+  const cached = RESOLVED_SESSION_KEY_CACHE.get(targetPath);
+  if (cached) {
+    logger?.info?.(
+      `[mobcode-session-key] cache-hit sessionFile=${targetPath} sessionKey=${cached}`,
+    );
+    return cached;
+  }
+
+  const sessionsDir = extractSessionsDir(targetPath);
+  if (!sessionsDir) {
+    logger?.warn?.(
+      `[mobcode-session-key] unresolved sessionFile=${targetPath} reason=no_sessions_dir`,
+    );
+    return null;
+  }
+
+  const storePath = path.join(sessionsDir, "sessions.json");
+  const store = await readSessionStore(storePath);
+  const entries = Object.entries(store);
+  logger?.info?.(
+    `[mobcode-session-key] lookup sessionFile=${targetPath} storePath=${storePath} entries=${entries.length}`,
+  );
+
+  for (const [sessionKey, entry] of entries) {
+    const candidates = buildTranscriptCandidates(entry, sessionsDir);
+    for (const candidate of candidates) {
+      const candidatePath = await resolvePathForComparison(candidate);
+      if (candidatePath === targetPath) {
+        RESOLVED_SESSION_KEY_CACHE.set(targetPath, sessionKey);
+        logger?.info?.(
+          `[mobcode-session-key] resolved sessionFile=${targetPath} sessionKey=${sessionKey}`,
+        );
+        return sessionKey;
+      }
+    }
+  }
+
+  logger?.warn?.(
+    `[mobcode-session-key] unresolved sessionFile=${targetPath} reason=no_matching_store_entry`,
+  );
+  return null;
+}
+

package/src/state-store.js

@@ -827,6 +827,24 @@ export class MobcodeStateStore {
       `[mobcode-store] ensureSessionIndexed loader_result session=${normalizedSessionKey} messages=${Array.isArray(messages) ? messages.length : 0}`,
     );
     await this.indexSessionMessages(normalizedSessionKey, messages);
+    const indexedCountRow = this._db()
+      .prepare(`SELECT COUNT(*) AS count FROM messages WHERE session_key=?`)
+      .get(normalizedSessionKey);
+    const indexedCount = Number(indexedCountRow?.count ?? 0);
+    if (indexedCount <= 0) {
+      this.logger?.warn?.(
+        `[mobcode-store] ensureSessionIndexed incomplete session=${normalizedSessionKey} reason=no_messages_indexed`,
+      );
+      const now = new Date().toISOString();
+      this._db()
+        .prepare(
+          `INSERT INTO indexed_sessions(session_key, updated_at)
+           VALUES(?, ?)
+           ON CONFLICT(session_key) DO UPDATE SET updated_at=excluded.updated_at`,
+        )
+        .run(normalizedSessionKey, now);
+      return;
+    }
     const now = new Date().toISOString();
     this._db()
       .prepare(
@@ -838,7 +856,7 @@ export class MobcodeStateStore {
       )
       .run(normalizedSessionKey, now, now);
     this.logger?.info?.(
-      `[mobcode-store] ensureSessionIndexed complete session=${normalizedSessionKey}`,
+      `[mobcode-store] ensureSessionIndexed complete session=${normalizedSessionKey} indexedMessages=${indexedCount}`,
     );
   }
 
@@ -947,8 +965,14 @@ export class MobcodeStateStore {
   }
 
   async appendMessage(update) {
-    const sessionKey = normalizeSessionKey(update?.sessionKey, update?.sessionFile);
+    const sessionKey = String(update?.sessionKey ?? "").trim();
     const normalizedMessage = normalizeMessageObject(update?.message, update?.messageId);
+    if (!sessionKey) {
+      this.logger?.warn?.(
+        `[mobcode-store] appendMessage skipped rawSessionKey=${String(update?.sessionKey ?? "").trim() || "-"} sessionFile=${String(update?.sessionFile ?? "").trim() || "-"} messageId=${String(update?.messageId ?? normalizedMessage?.id ?? "").trim() || "-"} reason=missing_session_key`,
+      );
+      return { sessionKey: null, count: 0, skipped: true };
+    }
     this.logger?.info?.(
       `[mobcode-store] appendMessage sessionKey=${sessionKey} rawSessionKey=${String(update?.sessionKey ?? "").trim() || "-"} sessionFile=${String(update?.sessionFile ?? "").trim() || "-"} messageId=${String(update?.messageId ?? normalizedMessage?.id ?? "").trim() || "-"} role=${String(normalizedMessage?.role ?? "").trim() || "-"}`,
     );
@@ -956,7 +980,7 @@ export class MobcodeStateStore {
     const row = this._db()
       .prepare(`SELECT COUNT(*) AS count FROM messages WHERE session_key=?`)
       .get(sessionKey);
-    return { sessionKey, count: Number(row?.count ?? 0) };
+    return { sessionKey, count: Number(row?.count ?? 0), skipped: false };
   }
 
   async pageTranscriptMessages(sessionKey) {