clawvault 2.6.0 → 3.0.0

package/dist/commands/reflect.d.cts

@@ -0,0 +1,11 @@
+import { Command } from 'commander';
+
+interface ReflectCommandOptions {
+    vaultPath?: string;
+    days?: number;
+    dryRun?: boolean;
+}
+declare function reflectCommand(options: ReflectCommandOptions): Promise<void>;
+declare function registerReflectCommand(program: Command): void;
+
+export { type ReflectCommandOptions, reflectCommand, registerReflectCommand };

package/dist/commands/reflect.js

@@ -1,13 +1,15 @@
 import {
   reflectCommand,
   registerReflectCommand
-} from "../chunk-2YDBJS7M.js";
-import "../chunk-YOSEUUNB.js";
-import "../chunk-FHFUXL6G.js";
-import "../chunk-K3CDT7IH.js";
+} from "../chunk-SJSFRIYS.js";
+import "../chunk-H34S76MB.js";
+import "../chunk-E7MFQB6D.js";
+import "../chunk-PAH27GSN.js";
 import "../chunk-MQUJNOHK.js";
 import "../chunk-MXSSG3QU.js";
+import "../chunk-QK3UCXWL.js";
 import "../chunk-Z2XBWN7A.js";
+import "../chunk-3RG5ZIWI.js";
 export {
   reflectCommand,
   registerReflectCommand

package/dist/commands/repair-session.cjs

@@ -0,0 +1,457 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/commands/repair-session.ts
+var repair_session_exports = {};
+__export(repair_session_exports, {
+  formatRepairResult: () => formatRepairResult,
+  listAgentSessions: () => listAgentSessions,
+  repairSessionCommand: () => repairSessionCommand,
+  resolveSession: () => resolveSession
+});
+module.exports = __toCommonJS(repair_session_exports);
+var fs3 = __toESM(require("fs"), 1);
+
+// src/lib/session-utils.ts
+var fs = __toESM(require("fs"), 1);
+var path = __toESM(require("path"), 1);
+var os = __toESM(require("os"), 1);
+function validateEnvPath(envValue) {
+  if (!envValue) return null;
+  const trimmed = envValue.trim();
+  if (!trimmed) return null;
+  const resolved = path.resolve(trimmed);
+  if (!path.isAbsolute(resolved)) return null;
+  return resolved;
+}
+function getOpenClawDir() {
+  const customHome = validateEnvPath(process.env.OPENCLAW_HOME);
+  if (customHome) {
+    return customHome;
+  }
+  return path.join(os.homedir(), ".openclaw");
+}
+function getOpenClawAgentsDir() {
+  const stateDir = validateEnvPath(process.env.OPENCLAW_STATE_DIR);
+  if (stateDir) {
+    return path.join(stateDir, "agents");
+  }
+  return path.join(getOpenClawDir(), "agents");
+}
+function getSessionsDir(agentId) {
+  return path.join(getOpenClawAgentsDir(), agentId, "sessions");
+}
+function getSessionsJsonPath(agentId) {
+  return path.join(getSessionsDir(agentId), "sessions.json");
+}
+function getSessionFilePath(agentId, sessionId) {
+  return path.join(getSessionsDir(agentId), `${sessionId}.jsonl`);
+}
+function listAgents() {
+  const agentsDir = getOpenClawAgentsDir();
+  try {
+    if (!fs.existsSync(agentsDir)) {
+      return [];
+    }
+    const stat = fs.statSync(agentsDir);
+    if (!stat.isDirectory()) {
+      return [];
+    }
+    return fs.readdirSync(agentsDir).filter((name) => {
+      try {
+        const sessionsDir = getSessionsDir(name);
+        return fs.existsSync(sessionsDir) && fs.statSync(sessionsDir).isDirectory();
+      } catch {
+        return false;
+      }
+    });
+  } catch {
+    return [];
+  }
+}
+function loadSessionsStore(agentId) {
+  const sessionsJsonPath = getSessionsJsonPath(agentId);
+  if (!fs.existsSync(sessionsJsonPath)) {
+    return null;
+  }
+  try {
+    const content = fs.readFileSync(sessionsJsonPath, "utf-8");
+    return JSON.parse(content);
+  } catch {
+    return null;
+  }
+}
+function findMainSession(agentId) {
+  const store = loadSessionsStore(agentId);
+  if (!store) return null;
+  const mainKey = `agent:${agentId}:main`;
+  const entry = store[mainKey];
+  if (entry?.sessionId) {
+    const filePath = getSessionFilePath(agentId, entry.sessionId);
+    if (fs.existsSync(filePath)) {
+      return {
+        sessionId: entry.sessionId,
+        sessionKey: mainKey,
+        agentId,
+        filePath,
+        updatedAt: entry.updatedAt
+      };
+    }
+  }
+  return null;
+}
+function findSessionById(agentId, sessionId) {
+  const filePath = getSessionFilePath(agentId, sessionId);
+  if (!fs.existsSync(filePath)) {
+    return null;
+  }
+  const store = loadSessionsStore(agentId);
+  let sessionKey;
+  let updatedAt;
+  if (store) {
+    for (const [key, entry] of Object.entries(store)) {
+      if (entry.sessionId === sessionId) {
+        sessionKey = key;
+        updatedAt = entry.updatedAt;
+        break;
+      }
+    }
+  }
+  return {
+    sessionId,
+    sessionKey: sessionKey || `agent:${agentId}:unknown`,
+    agentId,
+    filePath,
+    updatedAt
+  };
+}
+
+// src/lib/session-repair.ts
+var fs2 = __toESM(require("fs"), 1);
+function parseTranscript(filePath) {
+  const content = fs2.readFileSync(filePath, "utf-8");
+  const lines = content.split("\n").filter((line) => line.trim());
+  const entries = [];
+  for (let i = 0; i < lines.length; i++) {
+    const raw = lines[i];
+    try {
+      const entry = JSON.parse(raw);
+      entries.push({ line: i + 1, entry, raw });
+    } catch {
+      console.warn(`Warning: Could not parse line ${i + 1}`);
+    }
+  }
+  return entries;
+}
+function extractToolUses(entries) {
+  const toolUses = /* @__PURE__ */ new Map();
+  for (const { line, entry } of entries) {
+    if (entry.type !== "message") continue;
+    if (entry.message?.role !== "assistant") continue;
+    const isAborted = entry.message.stopReason === "aborted";
+    const content = entry.message.content || [];
+    for (const block of content) {
+      if (block.type === "toolCall" || block.type === "tool_use" || block.type === "functionCall") {
+        if (block.id) {
+          const isPartial = !!block.partialJson;
+          toolUses.set(block.id, {
+            id: block.id,
+            lineNumber: line,
+            entryId: entry.id,
+            isAborted: isAborted || isPartial,
+            isPartial,
+            name: block.name
+          });
+        }
+      }
+    }
+  }
+  return toolUses;
+}
+function findCorruptedEntries(entries, toolUses) {
+  const corrupted = [];
+  const entriesToRemove = /* @__PURE__ */ new Set();
+  for (const [toolId, info] of toolUses) {
+    if (info.isAborted) {
+      corrupted.push({
+        lineNumber: info.lineNumber,
+        entryId: info.entryId,
+        type: "aborted_tool_use",
+        toolUseId: toolId,
+        description: `Aborted tool_use${info.name ? ` (${info.name})` : ""} with id: ${toolId}`
+      });
+      entriesToRemove.add(info.entryId);
+    }
+  }
+  for (const { line, entry } of entries) {
+    if (entry.type !== "message") continue;
+    if (entry.message?.role !== "toolResult") continue;
+    const content = entry.message.content || [];
+    let toolCallId;
+    const msg = entry.message;
+    toolCallId = msg.toolCallId || msg.toolUseId;
+    if (!toolCallId) {
+      for (const block of content) {
+        if (block.toolCallId || block.toolUseId) {
+          toolCallId = block.toolCallId || block.toolUseId;
+          break;
+        }
+      }
+    }
+    if (!toolCallId) continue;
+    const toolUse = toolUses.get(toolCallId);
+    if (!toolUse || toolUse.isAborted) {
+      corrupted.push({
+        lineNumber: line,
+        entryId: entry.id,
+        type: "orphaned_tool_result",
+        toolUseId: toolCallId,
+        description: toolUse ? `Orphaned tool_result references aborted tool_use: ${toolCallId}` : `Orphaned tool_result references non-existent tool_use: ${toolCallId}`
+      });
+      entriesToRemove.add(entry.id);
+    }
+  }
+  return { corrupted, entriesToRemove };
+}
+function computeParentRelinks(entries, entriesToRemove) {
+  const relinks = [];
+  const entryParents = /* @__PURE__ */ new Map();
+  for (const { entry } of entries) {
+    entryParents.set(entry.id, entry.parentId);
+  }
+  for (const { line, entry } of entries) {
+    if (entriesToRemove.has(entry.id)) continue;
+    if (!entry.parentId) continue;
+    if (!entriesToRemove.has(entry.parentId)) continue;
+    let newParentId = entry.parentId;
+    while (newParentId && entriesToRemove.has(newParentId)) {
+      newParentId = entryParents.get(newParentId) || null;
+    }
+    if (newParentId !== entry.parentId) {
+      relinks.push({
+        lineNumber: line,
+        entryId: entry.id,
+        oldParentId: entry.parentId,
+        newParentId: newParentId || "null"
+      });
+    }
+  }
+  return relinks;
+}
+function analyzeSession(filePath) {
+  const entries = parseTranscript(filePath);
+  const sessionEntry = entries.find((e) => e.entry.type === "session");
+  const sessionId = sessionEntry?.entry.id || "unknown";
+  const toolUses = extractToolUses(entries);
+  const { corrupted, entriesToRemove } = findCorruptedEntries(entries, toolUses);
+  const parentRelinks = computeParentRelinks(entries, entriesToRemove);
+  return {
+    sessionId,
+    totalLines: entries.length,
+    corruptedEntries: corrupted,
+    parentRelinks,
+    removedCount: entriesToRemove.size,
+    relinkedCount: parentRelinks.length,
+    repaired: false
+  };
+}
+function repairSession(filePath, options = {}) {
+  const { backup = true, dryRun = false } = options;
+  const entries = parseTranscript(filePath);
+  const sessionEntry = entries.find((e) => e.entry.type === "session");
+  const sessionId = sessionEntry?.entry.id || "unknown";
+  const toolUses = extractToolUses(entries);
+  const { corrupted, entriesToRemove } = findCorruptedEntries(entries, toolUses);
+  const parentRelinks = computeParentRelinks(entries, entriesToRemove);
+  if (corrupted.length === 0) {
+    return {
+      sessionId,
+      totalLines: entries.length,
+      corruptedEntries: [],
+      parentRelinks: [],
+      removedCount: 0,
+      relinkedCount: 0,
+      repaired: false
+    };
+  }
+  if (dryRun) {
+    return {
+      sessionId,
+      totalLines: entries.length,
+      corruptedEntries: corrupted,
+      parentRelinks,
+      removedCount: entriesToRemove.size,
+      relinkedCount: parentRelinks.length,
+      repaired: false
+    };
+  }
+  let backupPath;
+  if (backup) {
+    const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "").replace("T", "-").slice(0, 15);
+    backupPath = `${filePath}.backup-${timestamp}`;
+    fs2.copyFileSync(filePath, backupPath);
+  }
+  const relinkMap = /* @__PURE__ */ new Map();
+  for (const relink of parentRelinks) {
+    relinkMap.set(relink.entryId, relink.newParentId === "null" ? null : relink.newParentId);
+  }
+  const repairedLines = [];
+  for (const { entry, raw } of entries) {
+    if (entriesToRemove.has(entry.id)) continue;
+    if (relinkMap.has(entry.id)) {
+      const newEntry = { ...entry, parentId: relinkMap.get(entry.id) };
+      repairedLines.push(JSON.stringify(newEntry));
+    } else {
+      repairedLines.push(raw);
+    }
+  }
+  fs2.writeFileSync(filePath, repairedLines.join("\n") + "\n");
+  return {
+    sessionId,
+    totalLines: entries.length,
+    corruptedEntries: corrupted,
+    parentRelinks,
+    removedCount: entriesToRemove.size,
+    relinkedCount: parentRelinks.length,
+    backupPath,
+    repaired: true
+  };
+}
+
+// src/commands/repair-session.ts
+function resolveSession(options) {
+  const { sessionId, agentId } = options;
+  if (sessionId && agentId) {
+    return findSessionById(agentId, sessionId);
+  }
+  if (sessionId) {
+    const agents = listAgents();
+    for (const agent of agents) {
+      const session = findSessionById(agent, sessionId);
+      if (session) return session;
+    }
+    return null;
+  }
+  if (agentId) {
+    return findMainSession(agentId);
+  }
+  const defaultAgent = process.env.OPENCLAW_AGENT_ID || "clawdious";
+  return findMainSession(defaultAgent);
+}
+function formatRepairResult(result, options = {}) {
+  const { dryRun = false } = options;
+  const lines = [];
+  lines.push(`Analyzing session: ${result.sessionId}`);
+  lines.push("");
+  if (result.corruptedEntries.length === 0) {
+    lines.push("\u2705 No corruption detected. Session is clean.");
+    return lines.join("\n");
+  }
+  if (dryRun) {
+    lines.push(`Found ${result.corruptedEntries.length} corrupted entries:`);
+  } else {
+    lines.push(`Found and fixed ${result.corruptedEntries.length} corrupted entries:`);
+  }
+  for (const entry of result.corruptedEntries) {
+    const prefix = entry.type === "aborted_tool_use" ? "Aborted tool_use" : "Orphaned tool_result";
+    lines.push(`  - Line ${entry.lineNumber}: ${prefix} (id: ${entry.toolUseId})`);
+  }
+  if (result.parentRelinks.length > 0) {
+    lines.push("");
+    if (dryRun) {
+      lines.push(`Would relink ${result.parentRelinks.length} parent reference(s):`);
+    } else {
+      lines.push(`Relinked ${result.parentRelinks.length} parent reference(s):`);
+    }
+    for (const relink of result.parentRelinks.slice(0, 5)) {
+      lines.push(`  - Line ${relink.lineNumber}: parentId ${relink.oldParentId.slice(0, 8)}\u2026 \u2192 ${relink.newParentId === "null" ? "null" : relink.newParentId.slice(0, 8)}\u2026`);
+    }
+    if (result.parentRelinks.length > 5) {
+      lines.push(`  ... and ${result.parentRelinks.length - 5} more`);
+    }
+  }
+  lines.push("");
+  if (dryRun) {
+    lines.push(`Would remove ${result.removedCount} entries, relink ${result.relinkedCount} parent references.`);
+  } else {
+    lines.push(`\u2705 Session repaired: removed ${result.removedCount} entries, relinked ${result.relinkedCount} parent references`);
+    if (result.backupPath) {
+      const backupName = result.backupPath.split("/").pop();
+      lines.push(`Backup saved: ${backupName}`);
+    }
+  }
+  return lines.join("\n");
+}
+async function repairSessionCommand(options) {
+  const { backup = true, dryRun = false } = options;
+  const session = resolveSession(options);
+  if (!session) {
+    throw new Error(
+      options.sessionId ? `Session not found: ${options.sessionId}` : options.agentId ? `No main session found for agent: ${options.agentId}` : "No session found. Specify --session or --agent."
+    );
+  }
+  if (!fs3.existsSync(session.filePath)) {
+    throw new Error(`Session file not found: ${session.filePath}`);
+  }
+  if (dryRun) {
+    return analyzeSession(session.filePath);
+  }
+  return repairSession(session.filePath, { backup, dryRun: false });
+}
+function listAgentSessions(agentId) {
+  const agents = agentId ? [agentId] : listAgents();
+  const lines = [];
+  if (agents.length === 0) {
+    return "No agents found in ~/.openclaw/agents/";
+  }
+  for (const agent of agents) {
+    const mainSession = findMainSession(agent);
+    if (mainSession) {
+      lines.push(`${agent}:`);
+      lines.push(`  Main session: ${mainSession.sessionId}`);
+      lines.push(`  File: ${mainSession.filePath}`);
+      if (mainSession.updatedAt) {
+        const date = new Date(mainSession.updatedAt);
+        lines.push(`  Updated: ${date.toISOString()}`);
+      }
+      lines.push("");
+    }
+  }
+  if (lines.length === 0) {
+    return agentId ? `No sessions found for agent: ${agentId}` : "No sessions found.";
+  }
+  return lines.join("\n");
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  formatRepairResult,
+  listAgentSessions,
+  repairSessionCommand,
+  resolveSession
+});

package/dist/commands/repair-session.d.cts

@@ -0,0 +1,38 @@
+import { SessionInfo } from '../lib/session-utils.cjs';
+import { RepairResult } from '../lib/session-repair.cjs';
+
+/**
+ * repair-session command - Repair corrupted OpenClaw session transcripts
+ *
+ * Fixes issues like:
+ * - Aborted tool calls with partial JSON
+ * - Orphaned tool_result messages referencing non-existent tool_use IDs
+ * - Broken parent chain references
+ */
+
+interface RepairSessionOptions {
+    sessionId?: string;
+    agentId?: string;
+    backup?: boolean;
+    dryRun?: boolean;
+}
+/**
+ * Resolve the session to repair
+ */
+declare function resolveSession(options: RepairSessionOptions): SessionInfo | null;
+/**
+ * Format repair result for CLI output
+ */
+declare function formatRepairResult(result: RepairResult, options?: {
+    dryRun?: boolean;
+}): string;
+/**
+ * Main repair-session command handler
+ */
+declare function repairSessionCommand(options: RepairSessionOptions): Promise<RepairResult>;
+/**
+ * List available sessions for an agent (for --list flag)
+ */
+declare function listAgentSessions(agentId?: string): string;
+
+export { type RepairSessionOptions, formatRepairResult, listAgentSessions, repairSessionCommand, resolveSession };

package/dist/commands/repair-session.js

@@ -7,6 +7,7 @@ import {
   findSessionById,
   listAgents
 } from "../chunk-HRLWZGMA.js";
+import "../chunk-3RG5ZIWI.js";
 
 // src/commands/repair-session.ts
 import * as fs from "fs";