pinokiod 6.0.20 → 6.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "6.0.20",
+  "version": "6.0.21",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/index.js

@@ -6948,31 +6948,38 @@ class Server {
             }
             seenNodes.add(candidate)
             const localCodexHint = inheritedHint || recordHasCodexHint(candidate, 2, 50)
-            const sessionField = findSessionField(candidate)
+            const candidateType = typeof candidate.type === "string" ? candidate.type.toLowerCase() : ""
+            // OpenClaw session logs include many message/tool-call ids. Only treat top-level
+            // session envelopes as resumable session sources.
+            const isOpenClawSessionEnvelope = candidateType === "session" || candidateType === "session_meta"
+            const sessionField = isOpenClawSessionEnvelope ? findSessionField(candidate) : null
             if (sessionField && isCodexFieldAllowed(sessionField, candidate, filePath, localCodexHint)) {
               const sessionId = sessionField.value
               if (!seenIds.has(sessionId)) {
-                seenIds.add(sessionId)
-                const summary = normalizeDiscoveredSessionSummary(buildSessionSummary(candidate) || buildSessionSummary(record))
-                const cwd = extractWorkingDirectory(candidate) || extractWorkingDirectory(record)
-                const timestamp = parseSessionTimestamp(
-                  candidate.timestamp
-                  || candidate.ts
-                  || candidate.updated_at
-                  || candidate.created_at
-                  || record.timestamp
-                  || record.ts
-                  || record.updated_at
-                  || record.created_at
-                )
-                results.push({
-                  id: sessionId,
-                  cwd,
-                  summary,
-                  timestamp,
-                  source: filePath,
-                  metadata: candidate
-                })
+                const cwdValue = extractWorkingDirectory(candidate) || extractWorkingDirectory(record)
+                const cwd = typeof cwdValue === "string" ? cwdValue.trim() : ""
+                if (cwd) {
+                  seenIds.add(sessionId)
+                  const summary = normalizeDiscoveredSessionSummary(buildSessionSummary(candidate) || buildSessionSummary(record))
+                  const timestamp = parseSessionTimestamp(
+                    candidate.timestamp
+                    || candidate.ts
+                    || candidate.updated_at
+                    || candidate.created_at
+                    || record.timestamp
+                    || record.ts
+                    || record.updated_at
+                    || record.created_at
+                  )
+                  results.push({
+                    id: sessionId,
+                    cwd,
+                    summary,
+                    timestamp,
+                    source: filePath,
+                    metadata: candidate
+                  })
+                }
               }
             }
             if (depth >= maxDepth) {
@@ -8257,6 +8264,10 @@ class Server {
         }
 
         return Array.from(discoveredEntries || [])
+          .filter((entry) => {
+            const workingDirectory = entry && typeof entry.cwd === "string" ? entry.cwd.trim() : ""
+            return workingDirectory.length > 0
+          })
           .sort((a, b) => {
             const aOnline = isDiscoveredEntryOnline(a) ? 1 : 0
             const bOnline = isDiscoveredEntryOnline(b) ? 1 : 0
@@ -8311,8 +8322,8 @@ class Server {
             if (entry.provider === "gemini" && typeof entry.source === "string" && entry.source.length > 0) {
               forkCapable = Boolean(entry.fork_capable)
               if (forkCapable) {
-                const geminiForkScript = path.resolve(__dirname, "scripts", "fork_gemini_session.js")
-                const cloneAndResume = `FORK_SESSION_ID=$(node ${JSON.stringify(geminiForkScript)} ${JSON.stringify(entry.source)} ${JSON.stringify(entry.id)}) && ${resumeBaseCommand} --resume "$FORK_SESSION_ID"`
+                const geminiForkResumeScript = path.resolve(__dirname, "scripts", "gemini_fork_and_resume.js")
+                const cloneAndResume = `node ${JSON.stringify(geminiForkResumeScript)} ${JSON.stringify(entry.source)} ${JSON.stringify(entry.id)}`
                 forkCommand = cloneAndResume
               } else {
                 forkCommand = ""

package/server/scripts/gemini_fork_and_resume.js

@@ -0,0 +1,50 @@
+#!/usr/bin/env node
+"use strict";
+
+const path = require("path");
+const { execFileSync, spawn } = require("child_process");
+
+const sourcePath = process.argv[2];
+const expectedSessionId = process.argv[3];
+
+if (!sourcePath) {
+  process.exit(1);
+}
+
+const forkScriptPath = path.resolve(__dirname, "fork_gemini_session.js");
+
+let forkedSessionId = "";
+try {
+  forkedSessionId = execFileSync(
+    process.execPath,
+    [forkScriptPath, sourcePath, expectedSessionId || ""],
+    {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "inherit"]
+    }
+  ).trim();
+} catch (error) {
+  if (typeof error.status === "number") {
+    process.exit(error.status);
+  }
+  process.exit(1);
+}
+
+if (!forkedSessionId) {
+  process.exit(1);
+}
+
+const npxBinary = process.platform === "win32" ? "npx.cmd" : "npx";
+const child = spawn(
+  npxBinary,
+  ["-y", "@google/gemini-cli@latest", "--resume", forkedSessionId],
+  { stdio: "inherit" }
+);
+
+child.on("error", () => {
+  process.exit(1);
+});
+
+child.on("exit", (code) => {
+  process.exit(typeof code === "number" ? code : 1);
+});