adhdev 0.8.94 → 0.8.95

package/dist/cli/index.js

@@ -4661,6 +4661,125 @@ function listSavedHistorySessions(agentType, options = {}) {
     return { sessions: [], hasMore: false };
   }
 }
+function normalizeCanonicalHermesMessageContent(content) {
+  if (typeof content === "string") return content.trim();
+  if (content == null) return "";
+  try {
+    return JSON.stringify(content).trim();
+  } catch {
+    return String(content).trim();
+  }
+}
+function extractCanonicalHermesMessageTimestamp(message, fallbackTs) {
+  const numericTimestamp = Number(message.receivedAt || message.timestamp || message.ts || 0);
+  if (Number.isFinite(numericTimestamp) && numericTimestamp > 0) return numericTimestamp;
+  const stringTimestamp = typeof message.ts === "string" ? Date.parse(message.ts) : typeof message.timestamp === "string" ? Date.parse(message.timestamp) : NaN;
+  if (Number.isFinite(stringTimestamp) && stringTimestamp > 0) return stringTimestamp;
+  return fallbackTs;
+}
+function readExistingHermesSessionStartRecord(historySessionId) {
+  try {
+    const dir = path7.join(HISTORY_DIR, "hermes-cli");
+    if (!fs3.existsSync(dir)) return null;
+    const files = listHistoryFiles(dir, historySessionId).sort();
+    for (const file2 of files) {
+      const lines = fs3.readFileSync(path7.join(dir, file2), "utf-8").split("\n").filter(Boolean);
+      for (const line of lines) {
+        try {
+          const parsed = JSON.parse(line);
+          if (parsed.historySessionId !== historySessionId) continue;
+          if (parsed.kind === "session_start" && parsed.role === "system") {
+            return parsed;
+          }
+        } catch {
+        }
+      }
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+function rebuildHermesSavedHistoryFromCanonicalSession(historySessionId) {
+  const normalizedSessionId = normalizeSavedHistorySessionId("hermes-cli", historySessionId);
+  if (!normalizedSessionId) return false;
+  try {
+    const sessionFilePath = path7.join(os6.homedir(), ".hermes", "sessions", `session_${normalizedSessionId}.json`);
+    if (!fs3.existsSync(sessionFilePath)) return false;
+    const raw = JSON.parse(fs3.readFileSync(sessionFilePath, "utf-8"));
+    const canonicalMessages = Array.isArray(raw.messages) ? raw.messages : [];
+    const dir = path7.join(HISTORY_DIR, "hermes-cli");
+    fs3.mkdirSync(dir, { recursive: true });
+    const existingSessionStart = readExistingHermesSessionStartRecord(normalizedSessionId);
+    const records = [];
+    if (existingSessionStart) {
+      records.push({
+        ...existingSessionStart,
+        historySessionId: normalizedSessionId
+      });
+    }
+    let fallbackTs = Date.parse(raw.session_start || raw.last_updated || "") || Date.now();
+    for (const message of canonicalMessages) {
+      const role = String(message.role || "").trim();
+      const content = normalizeCanonicalHermesMessageContent(message.content);
+      if (!content) continue;
+      const receivedAt = extractCanonicalHermesMessageTimestamp(message, fallbackTs);
+      fallbackTs = receivedAt + 1;
+      if (role === "user") {
+        records.push({
+          ts: new Date(receivedAt).toISOString(),
+          receivedAt,
+          role: "user",
+          content,
+          kind: "standard",
+          agent: "hermes-cli",
+          historySessionId: normalizedSessionId
+        });
+        continue;
+      }
+      if (role === "assistant") {
+        records.push({
+          ts: new Date(receivedAt).toISOString(),
+          receivedAt,
+          role: "assistant",
+          content,
+          kind: "standard",
+          agent: "hermes-cli",
+          historySessionId: normalizedSessionId
+        });
+        continue;
+      }
+      if (role === "tool") {
+        records.push({
+          ts: new Date(receivedAt).toISOString(),
+          receivedAt,
+          role: "assistant",
+          content,
+          kind: "tool",
+          senderName: "Tool",
+          agent: "hermes-cli",
+          historySessionId: normalizedSessionId
+        });
+      }
+    }
+    if (records.length === 0) return false;
+    const prefix = `${normalizedSessionId.replace(/[^a-zA-Z0-9_-]/g, "_")}_`;
+    for (const file2 of fs3.readdirSync(dir)) {
+      if (file2.startsWith(prefix) && file2.endsWith(".jsonl")) {
+        fs3.unlinkSync(path7.join(dir, file2));
+      }
+    }
+    const targetDate = new Date(records[records.length - 1].receivedAt || Date.now()).toISOString().slice(0, 10);
+    const filePath = path7.join(dir, `${prefix}${targetDate}.jsonl`);
+    fs3.writeFileSync(filePath, `${records.map((record2) => JSON.stringify(record2)).join("\n")}
+`, "utf-8");
+    invalidatePersistedSavedHistoryIndex("hermes-cli", dir);
+    savedHistorySessionCache.delete("hermes-cli");
+    return true;
+  } catch {
+    return false;
+  }
+}
 var fs3, path7, os6, HISTORY_DIR, RETAIN_DAYS, SAVED_HISTORY_INDEX_VERSION, SAVED_HISTORY_INDEX_FILE, SAVED_HISTORY_INDEX_LOCK_SUFFIX, SAVED_HISTORY_INDEX_LOCK_WAIT_MS, SAVED_HISTORY_INDEX_LOCK_STALE_MS, SAVED_HISTORY_INDEX_LOCK_POLL_MS, SAVED_HISTORY_ROLLUP_THRESHOLD_BYTES, savedHistorySessionCache, savedHistoryFileSummaryCache, savedHistoryBackgroundRefresh, savedHistoryRollupInFlight, CODEX_STARTER_PROMPT_RE, ChatHistoryWriter;
 var init_chat_history = __esm({
   "../../oss/packages/daemon-core/src/config/chat-history.ts"() {
@@ -14354,6 +14473,7 @@ var init_cli_provider_instance = __esm({
       historyWriter;
       runtimeMessages = [];
       lastPersistedHistoryMessages = [];
+      lastCanonicalHermesSyncMtimeMs = 0;
       instanceId;
       suppressIdleHistoryReplay = false;
       errorMessage = void 0;
@@ -14386,34 +14506,7 @@ var init_cli_provider_instance = __esm({
         await this.enforceFreshSessionLaunchIfNeeded();
         this.maybeAppendRuntimeRecoveryMessage(this.adapter.getRuntimeMetadata());
         if (this.providerSessionId) {
-          this.historyWriter.compactHistorySession(this.type, this.providerSessionId);
-          const restoredHistory = readChatHistory(this.type, 0, 200, this.providerSessionId);
-          this.historyWriter.seedSessionHistory(
-            this.type,
-            restoredHistory.messages,
-            this.providerSessionId,
-            this.instanceId
-          );
-          this.lastPersistedHistoryMessages = restoredHistory.messages.map((message) => ({
-            role: message.role,
-            content: message.content,
-            kind: message.kind,
-            senderName: message.senderName,
-            receivedAt: message.receivedAt
-          }));
-          this.suppressIdleHistoryReplay = restoredHistory.messages.length > 0;
-          if (restoredHistory.messages.length > 0) {
-            this.adapter.seedCommittedMessages(
-              restoredHistory.messages.map((message) => ({
-                role: message.role,
-                content: message.content,
-                timestamp: message.receivedAt,
-                receivedAt: message.receivedAt,
-                kind: message.kind,
-                senderName: message.senderName
-              }))
-            );
-          }
+          this.restorePersistedHistoryFromCurrentSession();
         }
         if (this.providerSessionId && this.launchMode === "resume") {
           const resumedAt = Date.now();
@@ -14522,6 +14615,7 @@ var init_cli_provider_instance = __esm({
           parsedMessages = historyMessageCount > 0 ? parsedMessages.slice(-historyMessageCount) : [];
         }
         const mergedMessages = this.mergeConversationMessages(parsedMessages);
+        const canonicalHermesBackedHistory = this.syncCanonicalHermesSavedHistoryIfNeeded();
         const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
         if (parsedMessages.length > 0) {
           const shouldSkipReplayPersist = this.suppressIdleHistoryReplay && adapterStatus.status === "idle" && parsedStatus?.status === "idle";
@@ -14539,7 +14633,7 @@ var init_cli_provider_instance = __esm({
             senderName: typeof message.senderName === "string" ? message.senderName : void 0,
             receivedAt: typeof message.receivedAt === "number" ? message.receivedAt : message.timestamp
           }));
-          if (!shouldSkipReplayPersist && normalizedMessagesToSave.length > 0) {
+          if (!canonicalHermesBackedHistory && !shouldSkipReplayPersist && normalizedMessagesToSave.length > 0) {
             const incrementalMessages = buildIncrementalHistoryAppendMessages(this.lastPersistedHistoryMessages, normalizedMessagesToSave);
             this.historyWriter.appendNewMessages(
               this.type,
@@ -14549,7 +14643,9 @@ var init_cli_provider_instance = __esm({
               this.providerSessionId
             );
           }
-          this.lastPersistedHistoryMessages = normalizedMessagesToSave;
+          if (!canonicalHermesBackedHistory) {
+            this.lastPersistedHistoryMessages = normalizedMessagesToSave;
+          }
         }
         this.applyProviderResponse(parsedStatus, { phase: "immediate" });
         const surface = resolveProviderStateSurface({
@@ -15006,6 +15102,7 @@ ${effect.notification.body || ""}`.trim();
         this.providerSessionId = nextSessionId;
         this.historyWriter.promoteHistorySession(this.type, previousHistorySessionId, nextSessionId);
         this.historyWriter.writeSessionStart(this.type, nextSessionId, this.workingDir, this.instanceId);
+        this.restorePersistedHistoryFromCurrentSession();
         this.adapter.updateRuntimeMeta({ providerSessionId: nextSessionId });
         this.onProviderSessionResolved?.({
           instanceId: this.instanceId,
@@ -15017,6 +15114,61 @@ ${effect.notification.body || ""}`.trim();
         });
         LOG.info("CLI", `[${this.type}] discovered provider session id: ${nextSessionId}`);
       }
+      syncCanonicalHermesSavedHistoryIfNeeded() {
+        if (this.type !== "hermes-cli" || !this.providerSessionId) return false;
+        try {
+          const canonicalPath = path12.join(os14.homedir(), ".hermes", "sessions", `session_${this.providerSessionId}.json`);
+          if (!fs5.existsSync(canonicalPath)) return false;
+          const stat4 = fs5.statSync(canonicalPath);
+          if (stat4.mtimeMs <= this.lastCanonicalHermesSyncMtimeMs) return true;
+          const rebuilt = rebuildHermesSavedHistoryFromCanonicalSession(this.providerSessionId);
+          if (!rebuilt) return false;
+          this.lastCanonicalHermesSyncMtimeMs = stat4.mtimeMs;
+          const restoredHistory = readChatHistory(this.type, 0, 200, this.providerSessionId);
+          this.lastPersistedHistoryMessages = restoredHistory.messages.map((message) => ({
+            role: message.role,
+            content: message.content,
+            kind: message.kind,
+            senderName: message.senderName,
+            receivedAt: message.receivedAt
+          }));
+          return true;
+        } catch {
+          return false;
+        }
+      }
+      restorePersistedHistoryFromCurrentSession() {
+        if (!this.providerSessionId) return;
+        this.syncCanonicalHermesSavedHistoryIfNeeded();
+        this.historyWriter.compactHistorySession(this.type, this.providerSessionId);
+        const restoredHistory = readChatHistory(this.type, 0, 200, this.providerSessionId);
+        this.historyWriter.seedSessionHistory(
+          this.type,
+          restoredHistory.messages,
+          this.providerSessionId,
+          this.instanceId
+        );
+        this.lastPersistedHistoryMessages = restoredHistory.messages.map((message) => ({
+          role: message.role,
+          content: message.content,
+          kind: message.kind,
+          senderName: message.senderName,
+          receivedAt: message.receivedAt
+        }));
+        this.suppressIdleHistoryReplay = restoredHistory.messages.length > 0;
+        if (restoredHistory.messages.length > 0) {
+          this.adapter.seedCommittedMessages(
+            restoredHistory.messages.map((message) => ({
+              role: message.role,
+              content: message.content,
+              timestamp: message.receivedAt,
+              receivedAt: message.receivedAt,
+              kind: message.kind,
+              senderName: message.senderName
+            }))
+          );
+        }
+      }
       getProbeDirectories() {
         const dirs = /* @__PURE__ */ new Set();
         const addDir = (value) => {
@@ -86650,7 +86802,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.94" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.95" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;