@adhdev/daemon-standalone 0.9.44 → 0.9.46

package/dist/index.js

@@ -28854,6 +28854,8 @@ var require_dist2 = __commonJS({
       if (raw.summaryMetadata !== void 0) normalized.summaryMetadata = raw.summaryMetadata;
       if (Array.isArray(raw.effects)) normalized.effects = raw.effects;
       if (typeof raw.providerSessionId === "string") normalized.providerSessionId = raw.providerSessionId;
+      if (raw.transcriptAuthority === "provider" || raw.transcriptAuthority === "daemon") normalized.transcriptAuthority = raw.transcriptAuthority;
+      if (raw.coverage === "full" || raw.coverage === "tail" || raw.coverage === "current-turn") normalized.coverage = raw.coverage;
       return normalized;
     }
     var VALID_STATUSES;
@@ -29927,7 +29929,8 @@ var require_dist2 = __commonJS({
       ProviderCliAdapter: () => ProviderCliAdapter,
       appendBoundedText: () => appendBoundedText,
       normalizeCliProviderForRuntime: () => normalizeCliProviderForRuntime,
-      sanitizeCliStandardMessageContent: () => sanitizeCliStandardMessageContent
+      sanitizeCliStandardMessageContent: () => sanitizeCliStandardMessageContent,
+      trimLastAssistantEchoForCliMessages: () => trimLastAssistantEchoForCliMessages
     });
     function normalizeComparableTranscriptText(value) {
       return sanitizeTerminalText(String(value || "")).replace(/\s+/g, " ").trim();
@@ -30023,6 +30026,19 @@ var require_dist2 = __commonJS({
       if (content === message.content) return message;
       return { ...message, content };
     }
+    function trimLastAssistantEchoForCliMessages(messages, prompt) {
+      if (!prompt) return;
+      for (let index = messages.length - 1; index >= 0; index -= 1) {
+        const message = messages[index];
+        if (!message || message.role !== "assistant" || typeof message.content !== "string") continue;
+        if ((message.kind || "standard") !== "standard") continue;
+        message.content = trimPromptEchoPrefix(message.content, prompt);
+        if (!message.content.trim()) {
+          messages.splice(index, 1);
+        }
+        return;
+      }
+    }
     var os10;
     var COMMITTED_ACTIVITY_PREFIX_BLOCK_RE;
     var ProviderCliAdapter;
@@ -30222,7 +30238,14 @@ var require_dist2 = __commonJS({
             }
             return null;
           }
+          providerOwnsTranscript() {
+            return this.provider.transcriptAuthority === "provider";
+          }
+          shouldUseFullProviderTranscriptContext() {
+            return this.providerOwnsTranscript() && this.provider.transcriptContext === "full";
+          }
           selectParseBaseMessages(baseMessages) {
+            if (this.shouldUseFullProviderTranscriptContext()) return baseMessages;
             if (baseMessages.length <= _ProviderCliAdapter.PARSE_MESSAGE_TAIL_LIMIT) return baseMessages;
             return baseMessages.slice(-_ProviderCliAdapter.PARSE_MESSAGE_TAIL_LIMIT);
           }
@@ -30705,9 +30728,7 @@ var require_dist2 = __commonJS({
             );
           }
           trimLastAssistantEcho(messages, prompt) {
-            if (!prompt) return;
-            const last = [...messages].reverse().find((m) => m.role === "assistant" && typeof m.content === "string");
-            if (last) last.content = trimPromptEchoPrefix(last.content, prompt);
+            trimLastAssistantEchoForCliMessages(messages, prompt);
           }
           clearAllTimers() {
             if (this.responseTimeout) {
@@ -31561,7 +31582,8 @@ var require_dist2 = __commonJS({
                 title: parsed.title || this.cliName,
                 messages: hydratedMessages,
                 activeModal: parsed.activeModal ?? this.activeModal,
-                providerSessionId: typeof parsed.providerSessionId === "string" ? parsed.providerSessionId : void 0
+                providerSessionId: typeof parsed.providerSessionId === "string" ? parsed.providerSessionId : void 0,
+                ...this.providerOwnsTranscript() ? { transcriptAuthority: "provider", coverage: this.shouldUseFullProviderTranscriptContext() ? "full" : "tail" } : {}
               };
             } else {
               const messages = [...this.committedMessages];
@@ -35857,6 +35879,27 @@ ${cleanBody}`;
         return name.replace(/[^a-zA-Z0-9_-]/g, "_");
       }
     };
+    function pageHistoryRecords(agentType, records, offset = 0, limit = 30, excludeRecentCount = 0, historyBehavior) {
+      const allMessages = records.map((message) => sanitizeHistoryMessage(agentType, message)).filter(Boolean);
+      allMessages.sort((a, b2) => a.receivedAt - b2.receivedAt);
+      const chronological = [];
+      let lastTurn = null;
+      for (const message of allMessages) {
+        const previous = chronological[chronological.length - 1];
+        if (isAdjacentHistoryDuplicate(agentType, previous, message)) continue;
+        if (message.role !== "system" && isAdjacentHistoryDuplicate(agentType, lastTurn, message)) continue;
+        chronological.push(message);
+        if (message.role !== "system") lastTurn = message;
+      }
+      const collapsed = collapseReplayAssistantTurns(chronological, historyBehavior);
+      const boundedLimit = Math.max(1, limit);
+      const boundedOffset = Math.max(0, offset);
+      const boundedExclude = Math.max(0, Math.min(excludeRecentCount, collapsed.length));
+      const endExclusive = Math.max(0, collapsed.length - boundedExclude - boundedOffset);
+      const startInclusive = Math.max(0, endExclusive - boundedLimit);
+      const sliced = collapsed.slice(startInclusive, endExclusive);
+      return { messages: sliced, hasMore: startInclusive > 0 };
+    }
     function readChatHistory(agentType, offset = 0, limit = 30, historySessionId, excludeRecentCount = 0, historyBehavior) {
       try {
         const sanitized = agentType.replace(/[^a-zA-Z0-9_-]/g, "_");
@@ -35882,25 +35925,7 @@ ${cleanBody}`;
             }
           }
         }
-        allMessages.sort((a, b2) => a.receivedAt - b2.receivedAt);
-        const chronological = [];
-        let lastTurn = null;
-        for (const message of allMessages) {
-          const previous = chronological[chronological.length - 1];
-          if (isAdjacentHistoryDuplicate(agentType, previous, message)) continue;
-          if (message.role !== "system" && isAdjacentHistoryDuplicate(agentType, lastTurn, message)) continue;
-          chronological.push(message);
-          if (message.role !== "system") lastTurn = message;
-        }
-        const collapsed = collapseReplayAssistantTurns(chronological, historyBehavior);
-        const boundedLimit = Math.max(1, limit);
-        const boundedOffset = Math.max(0, offset);
-        const boundedExclude = Math.max(0, Math.min(excludeRecentCount, collapsed.length));
-        const endExclusive = Math.max(0, collapsed.length - boundedExclude - boundedOffset);
-        const startInclusive = Math.max(0, endExclusive - boundedLimit);
-        const sliced = collapsed.slice(startInclusive, endExclusive);
-        const hasMore = startInclusive > 0;
-        return { messages: sliced, hasMore };
+        return pageHistoryRecords(agentType, allMessages, offset, limit, excludeRecentCount, historyBehavior);
       } catch {
         return { messages: [], hasMore: false };
       }
@@ -35967,29 +35992,6 @@ ${cleanBody}`;
         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 extractTimestampValue(value) {
-      const numericTimestamp = Number(value || 0);
-      if (Number.isFinite(numericTimestamp) && numericTimestamp > 0) return numericTimestamp;
-      const stringTimestamp = typeof value === "string" ? Date.parse(value) : NaN;
-      if (Number.isFinite(stringTimestamp) && stringTimestamp > 0) return stringTimestamp;
-      return 0;
-    }
     function readExistingSessionStartRecord(agentType, historySessionId) {
       try {
         const dir = path7.join(HISTORY_DIR, agentType);
@@ -36035,232 +36037,193 @@ ${cleanBody}`;
         return false;
       }
     }
-    function rebuildHermesSavedHistoryFromCanonicalSession(historySessionId) {
+    function getNativeHistoryScriptName(canonicalHistory, key) {
+      const configured = canonicalHistory?.scripts?.[key];
+      if (typeof configured === "string" && configured.trim()) return configured.trim();
+      return key === "readSession" ? "readNativeHistory" : "listNativeHistory";
+    }
+    function getProviderNativeHistoryScript(scripts, canonicalHistory, key) {
+      if (!canonicalHistory?.scripts) return null;
+      const fn2 = scripts?.[getNativeHistoryScriptName(canonicalHistory, key)];
+      return typeof fn2 === "function" ? fn2 : null;
+    }
+    function normalizeProviderNativeHistoryRecords(agentType, historySessionId, records) {
+      if (!Array.isArray(records)) return [];
+      const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId);
+      return records.map((record2) => sanitizeHistoryMessage(agentType, {
+        ts: typeof record2?.ts === "string" ? record2.ts : new Date(Number(record2?.receivedAt) || Date.now()).toISOString(),
+        receivedAt: Number(record2?.receivedAt) || Date.parse(record2?.ts || "") || Date.now(),
+        role: record2?.role,
+        content: String(record2?.content || ""),
+        kind: record2?.kind || (record2?.role === "system" ? "session_start" : "standard"),
+        senderName: record2?.senderName,
+        agent: agentType,
+        instanceId: record2?.instanceId,
+        historySessionId: normalizeSavedHistorySessionId(record2?.historySessionId || normalizedSessionId),
+        sessionTitle: record2?.sessionTitle,
+        workspace: record2?.workspace
+      })).filter(Boolean);
+    }
+    function callProviderNativeHistoryRead(agentType, canonicalHistory, scripts, historySessionId, workspace) {
+      const fn2 = getProviderNativeHistoryScript(scripts, canonicalHistory, "readSession");
+      if (!fn2) return null;
+      const result = fn2({
+        agentType,
+        sessionId: historySessionId,
+        historySessionId,
+        workspace,
+        format: canonicalHistory?.format,
+        watchPath: canonicalHistory?.watchPath,
+        args: { sessionId: historySessionId, historySessionId, workspace }
+      });
+      if (!result || typeof result !== "object") return null;
+      const records = normalizeProviderNativeHistoryRecords(agentType, historySessionId, result.messages || result.records);
+      if (records.length === 0) return null;
+      return {
+        records,
+        sourcePath: typeof result.sourcePath === "string" ? result.sourcePath : "",
+        sourceMtimeMs: Number(result.sourceMtimeMs) || 0
+      };
+    }
+    function buildNativeHistoryReadResult(agentType, canonicalHistory, scripts, historySessionId, workspace) {
+      const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId || "");
+      if (!canonicalHistory || !normalizedSessionId || !isNativeSourceCanonicalHistory(canonicalHistory)) return null;
+      return callProviderNativeHistoryRead(agentType, canonicalHistory, scripts, normalizedSessionId, workspace);
+    }
+    function materializeNativeHistoryToMirror(agentType, canonicalHistory, historySessionId, workspace, scripts) {
       const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId);
       if (!normalizedSessionId) return false;
+      const nativeResult = callProviderNativeHistoryRead(agentType, canonicalHistory, scripts, normalizedSessionId, workspace);
+      const nativeRecords = nativeResult?.records || [];
+      if (nativeRecords.length === 0) return false;
+      const normalizedRecords = nativeRecords.map((record2) => ({
+        ...record2,
+        agent: agentType,
+        historySessionId: normalizedSessionId
+      }));
+      const existingSessionStart = readExistingSessionStartRecord(agentType, normalizedSessionId);
+      const records = existingSessionStart && normalizedRecords[0]?.kind !== "session_start" ? [{ ...existingSessionStart, historySessionId: normalizedSessionId, agent: agentType }, ...normalizedRecords] : normalizedRecords;
+      return rewriteCanonicalSavedHistory(agentType, normalizedSessionId, records);
+    }
+    function materializeProviderNativeHistory(agentType, canonicalHistory, historySessionId, workspace, scripts) {
+      if (!canonicalHistory || canonicalHistory.mode !== "materialized-mirror") return false;
+      return materializeNativeHistoryToMirror(agentType, canonicalHistory, historySessionId, workspace, scripts);
+    }
+    function isNativeSourceCanonicalHistory(canonicalHistory) {
+      if (!canonicalHistory) return false;
+      if (canonicalHistory.mode === "disabled") return false;
+      if (canonicalHistory.mode === "materialized-mirror") return false;
+      return true;
+    }
+    function readProviderChatHistory(agentType, options = {}) {
+      if (isNativeSourceCanonicalHistory(options.canonicalHistory) && options.historySessionId) {
+        const nativeResult = buildNativeHistoryReadResult(agentType, options.canonicalHistory, options.scripts, options.historySessionId, options.workspace);
+        if (!nativeResult) return { messages: [], hasMore: false, source: "native-unavailable" };
+        return {
+          ...pageHistoryRecords(agentType, nativeResult.records, options.offset || 0, options.limit || 30, options.excludeRecentCount || 0, options.historyBehavior),
+          source: "provider-native",
+          sourcePath: nativeResult.sourcePath,
+          sourceMtimeMs: nativeResult.sourceMtimeMs
+        };
+      }
+      return {
+        ...readChatHistory(agentType, options.offset || 0, options.limit || 30, options.historySessionId, options.excludeRecentCount || 0, options.historyBehavior),
+        source: "adhdev-mirror"
+      };
+    }
+    function buildNativeSessionSummary(agentType, historySessionId, records, sourcePath) {
+      const visible = pageHistoryRecords(agentType, records, 0, Number.MAX_SAFE_INTEGER).messages;
+      if (visible.length === 0) return null;
+      let sourceMtimeMs = 0;
       try {
-        const sessionFilePath = path7.join(os52.homedir(), ".hermes", "sessions", `session_${normalizedSessionId}.json`);
-        if (!fs32.existsSync(sessionFilePath)) return false;
-        const raw = JSON.parse(fs32.readFileSync(sessionFilePath, "utf-8"));
-        const canonicalMessages = Array.isArray(raw.messages) ? raw.messages : [];
-        const dir = path7.join(HISTORY_DIR, "hermes-cli");
-        fs32.mkdirSync(dir, { recursive: true });
-        const existingSessionStart = readExistingSessionStartRecord("hermes-cli", 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
-            });
-          }
-        }
-        return rewriteCanonicalSavedHistory("hermes-cli", normalizedSessionId, records);
+        sourceMtimeMs = fs32.statSync(sourcePath).mtimeMs;
       } catch {
-        return false;
       }
+      const firstMessageAt = visible[0]?.receivedAt || sourceMtimeMs || Date.now();
+      const lastMessageAt = visible[visible.length - 1]?.receivedAt || firstMessageAt;
+      const lastNonSystem = [...visible].reverse().find((message) => message.role !== "system") || visible[visible.length - 1];
+      const firstSystem = visible.find((message) => message.kind === "session_start");
+      return {
+        historySessionId,
+        sessionTitle: lastNonSystem?.content,
+        messageCount: visible.length,
+        firstMessageAt,
+        lastMessageAt,
+        preview: lastNonSystem?.content,
+        workspace: firstSystem?.workspace || (firstSystem?.kind === "session_start" ? firstSystem.content : void 0),
+        source: "provider-native",
+        sourcePath,
+        sourceMtimeMs
+      };
     }
-    function resolveClaudeProjectTranscriptPath(historySessionId, workspace) {
-      const claudeProjectsDir = path7.join(os52.homedir(), ".claude", "projects");
-      if (!fs32.existsSync(claudeProjectsDir)) return null;
-      const normalizedWorkspace = typeof workspace === "string" ? workspace.trim() : "";
-      if (normalizedWorkspace) {
-        const directPath = path7.join(claudeProjectsDir, normalizedWorkspace.replace(/[\\/]/g, "-"), `${historySessionId}.jsonl`);
-        if (fs32.existsSync(directPath)) return directPath;
-      }
-      const stack = [claudeProjectsDir];
-      while (stack.length > 0) {
-        const current = stack.pop();
-        if (!current) continue;
-        for (const entry of fs32.readdirSync(current, { withFileTypes: true })) {
-          const entryPath = path7.join(current, entry.name);
-          if (entry.isDirectory()) {
-            stack.push(entryPath);
-            continue;
-          }
-          if (entry.isFile() && entry.name === `${historySessionId}.jsonl`) {
-            return entryPath;
+    function normalizeProviderNativeHistorySessionSummary(agentType, item) {
+      const historySessionId = normalizeSavedHistorySessionId(item?.historySessionId || item?.sessionId || "");
+      if (!historySessionId) return null;
+      const sourcePath = typeof item?.sourcePath === "string" ? item.sourcePath : "";
+      const sourceMtimeMs = Number(item?.sourceMtimeMs) || 0;
+      const firstMessageAt = Number(item?.firstMessageAt) || sourceMtimeMs || Date.now();
+      const lastMessageAt = Number(item?.lastMessageAt) || firstMessageAt;
+      const messageCount = Math.max(0, Number(item?.messageCount) || 0);
+      return {
+        historySessionId,
+        sessionTitle: typeof item?.sessionTitle === "string" ? item.sessionTitle : void 0,
+        messageCount,
+        firstMessageAt,
+        lastMessageAt,
+        preview: typeof item?.preview === "string" ? item.preview : void 0,
+        workspace: typeof item?.workspace === "string" ? item.workspace : void 0,
+        source: "provider-native",
+        sourcePath,
+        sourceMtimeMs
+      };
+    }
+    function collectProviderScriptNativeHistorySessionSummaries(agentType, canonicalHistory, scripts) {
+      const fn2 = getProviderNativeHistoryScript(scripts, canonicalHistory, "listSessions");
+      if (!fn2) return null;
+      const result = fn2({
+        agentType,
+        format: canonicalHistory.format,
+        watchPath: canonicalHistory.watchPath,
+        args: {}
+      });
+      if (!result || typeof result !== "object") return [];
+      const sessions = Array.isArray(result.sessions) ? result.sessions : [];
+      const summaries = [];
+      for (const item of sessions) {
+        if (Array.isArray(item?.messages || item?.records)) {
+          const historySessionId = normalizeSavedHistorySessionId(item?.historySessionId || item?.sessionId || "");
+          if (!historySessionId) continue;
+          const records = normalizeProviderNativeHistoryRecords(agentType, historySessionId, item.messages || item.records);
+          const summary2 = buildNativeSessionSummary(agentType, historySessionId, records, typeof item?.sourcePath === "string" ? item.sourcePath : "");
+          if (summary2) {
+            if (Number(item?.sourceMtimeMs)) summary2.sourceMtimeMs = Number(item.sourceMtimeMs);
+            summaries.push(summary2);
           }
-        }
-      }
-      return null;
-    }
-    function extractClaudeAssistantContentParts(content) {
-      if (typeof content === "string") {
-        const trimmed = content.trim();
-        return trimmed ? [{ content: trimmed, kind: "standard", role: "assistant" }] : [];
-      }
-      if (!Array.isArray(content)) return [];
-      const parts = [];
-      for (const block of content) {
-        if (!block || typeof block !== "object") continue;
-        const record2 = block;
-        const type = String(record2.type || "").trim();
-        if (type === "text") {
-          const text = String(record2.text || "").trim();
-          if (text) parts.push({ content: text, kind: "standard", role: "assistant" });
           continue;
         }
-        if (type === "tool_use") {
-          const name = String(record2.name || "").trim() || "Tool";
-          const input = record2.input && typeof record2.input === "object" ? record2.input : null;
-          const command = input ? String(input.command || "").trim() : "";
-          const summary = command ? `${name}: ${command}` : name;
-          if (summary) parts.push({ content: summary, kind: "tool", senderName: "Tool", role: "assistant" });
-        }
+        const summary = normalizeProviderNativeHistorySessionSummary(agentType, item);
+        if (summary) summaries.push(summary);
       }
-      return parts;
+      return sortSavedHistorySessionSummaries(summaries);
     }
-    function extractClaudeUserContentParts(content) {
-      if (typeof content === "string") {
-        const trimmed = content.trim();
-        return trimmed ? [{ role: "user", content: trimmed, kind: "standard" }] : [];
-      }
-      if (!Array.isArray(content)) return [];
-      const parts = [];
-      for (const block of content) {
-        if (!block || typeof block !== "object") continue;
-        const record2 = block;
-        const type = String(record2.type || "").trim();
-        if (type === "text") {
-          const text = String(record2.text || "").trim();
-          if (text) parts.push({ role: "user", content: text, kind: "standard" });
-          continue;
-        }
-        if (type === "tool_result") {
-          const rawContent = record2.content;
-          const text = typeof rawContent === "string" ? rawContent.trim() : Array.isArray(rawContent) ? rawContent.map((entry) => {
-            if (typeof entry === "string") return entry.trim();
-            if (!entry || typeof entry !== "object") return "";
-            const nested = entry;
-            if (typeof nested.text === "string") return nested.text.trim();
-            if (typeof nested.content === "string") return nested.content.trim();
-            return "";
-          }).filter(Boolean).join("\n") : "";
-          if (text) parts.push({ role: "assistant", content: text, kind: "tool", senderName: "Tool" });
-        }
-      }
-      return parts;
+    function collectNativeHistorySessionSummaries(agentType, canonicalHistory, scripts) {
+      return collectProviderScriptNativeHistorySessionSummaries(agentType, canonicalHistory, scripts) || [];
     }
-    function rebuildClaudeSavedHistoryFromNativeProject(historySessionId, workspace) {
-      const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId);
-      if (!normalizedSessionId) return false;
-      try {
-        const transcriptPath = resolveClaudeProjectTranscriptPath(normalizedSessionId, workspace);
-        if (!transcriptPath) return false;
-        const lines = fs32.readFileSync(transcriptPath, "utf-8").split("\n").filter(Boolean);
-        const records = [];
-        const existingSessionStart = readExistingSessionStartRecord("claude-cli", normalizedSessionId);
-        if (existingSessionStart) {
-          records.push({
-            ...existingSessionStart,
-            historySessionId: normalizedSessionId
-          });
-        }
-        let fallbackTs = Date.now();
-        for (const line of lines) {
-          let parsed = null;
-          try {
-            parsed = JSON.parse(line);
-          } catch {
-            parsed = null;
-          }
-          if (!parsed) continue;
-          const parsedSessionId = String(parsed.sessionId || "").trim();
-          if (parsedSessionId && parsedSessionId !== normalizedSessionId) continue;
-          const receivedAt = extractTimestampValue(parsed.timestamp) || fallbackTs;
-          fallbackTs = receivedAt + 1;
-          const parsedWorkspace = String(parsed.cwd || workspace || "").trim();
-          if (records.length === 0 && parsedWorkspace) {
-            records.push({
-              ts: new Date(receivedAt).toISOString(),
-              receivedAt,
-              role: "system",
-              kind: "session_start",
-              content: parsedWorkspace,
-              agent: "claude-cli",
-              historySessionId: normalizedSessionId,
-              workspace: parsedWorkspace
-            });
-          }
-          const type = String(parsed.type || "").trim();
-          const message = parsed.message && typeof parsed.message === "object" ? parsed.message : null;
-          if (type === "user" && message) {
-            for (const part of extractClaudeUserContentParts(message.content)) {
-              records.push({
-                ts: new Date(receivedAt).toISOString(),
-                receivedAt,
-                role: part.role,
-                content: part.content,
-                kind: part.kind,
-                senderName: part.senderName,
-                agent: "claude-cli",
-                historySessionId: normalizedSessionId
-              });
-            }
-            continue;
-          }
-          if (type === "assistant" && message) {
-            for (const part of extractClaudeAssistantContentParts(message.content)) {
-              records.push({
-                ts: new Date(receivedAt).toISOString(),
-                receivedAt,
-                role: "assistant",
-                content: part.content,
-                kind: part.kind,
-                senderName: part.senderName,
-                agent: "claude-cli",
-                historySessionId: normalizedSessionId
-              });
-            }
-          }
-        }
-        return rewriteCanonicalSavedHistory("claude-cli", normalizedSessionId, records);
-      } catch {
-        return false;
+    function listProviderHistorySessions(agentType, options = {}) {
+      if (isNativeSourceCanonicalHistory(options.canonicalHistory)) {
+        const offset = Math.max(0, options.offset || 0);
+        const limit = Math.max(1, options.limit || 30);
+        const summaries = collectNativeHistorySessionSummaries(agentType, options.canonicalHistory, options.scripts);
+        return {
+          sessions: summaries.slice(offset, offset + limit),
+          hasMore: offset + limit < summaries.length,
+          source: "provider-native"
+        };
       }
+      return {
+        ...listSavedHistorySessions(agentType, { offset: options.offset, limit: options.limit }, options.historyBehavior),
+        source: "adhdev-mirror"
+      };
     }
     function isControlValue(value) {
       return typeof value === "string" || typeof value === "number" || typeof value === "boolean";
@@ -38829,7 +38792,17 @@ ${effect.notification.body || ""}`.trim();
           const visibleCount = Array.isArray(status?.messages) ? status.messages.length : 0;
           if (visibleCount > excludeRecentCount) excludeRecentCount = visibleCount;
         }
-        const result = readChatHistory(agentStr, offset || 0, limit || 30, historySessionId, excludeRecentCount);
+        const workspace = typeof args?.workspace === "string" ? args.workspace : typeof h.currentSession?.workspace === "string" ? h.currentSession.workspace : void 0;
+        const result = readProviderChatHistory(agentStr, {
+          canonicalHistory: provider?.canonicalHistory,
+          historySessionId,
+          workspace,
+          offset: offset || 0,
+          limit: limit || 30,
+          excludeRecentCount,
+          historyBehavior: provider?.historyBehavior,
+          scripts: provider?.scripts
+        });
         return { success: true, ...result, agent: agentStr };
       } catch (e) {
         return { success: false, error: e.message };
@@ -38854,7 +38827,8 @@ ${effect.notification.body || ""}`.trim();
           }
           const parsedRecord = parsedStatus && typeof parsedStatus === "object" ? parsedStatus : null;
           const adapterStatus = adapter.getStatus();
-          const shouldPreferAdapterMessages = Array.isArray(adapterStatus.messages) && adapterStatus.messages.length > 0 && Array.isArray(parsedRecord?.messages) && adapterStatus.messages.length > parsedRecord.messages.length;
+          const parsedIsProviderAuthoritative = parsedRecord?.transcriptAuthority === "provider" || parsedRecord?.coverage === "full";
+          const shouldPreferAdapterMessages = !parsedIsProviderAuthoritative && Array.isArray(adapterStatus.messages) && adapterStatus.messages.length > 0 && Array.isArray(parsedRecord?.messages) && adapterStatus.messages.length > parsedRecord.messages.length;
           const parsedShowsApproval = hasNonEmptyModalButtons(parsedRecord?.activeModal) && parsedRecord?.status === "waiting_approval";
           const status = parsedRecord ? {
             ...parsedRecord,
@@ -38864,6 +38838,8 @@ ${effect.notification.body || ""}`.trim();
           } : adapterStatus;
           const title = typeof parsedRecord?.title === "string" ? parsedRecord.title : void 0;
           const providerSessionId = typeof parsedRecord?.providerSessionId === "string" ? parsedRecord.providerSessionId : void 0;
+          const transcriptAuthority = parsedRecord?.transcriptAuthority === "provider" || parsedRecord?.transcriptAuthority === "daemon" ? parsedRecord.transcriptAuthority : void 0;
+          const coverage = parsedRecord?.coverage === "full" || parsedRecord?.coverage === "tail" || parsedRecord?.coverage === "current-turn" ? parsedRecord.coverage : void 0;
           if (status) {
             LOG2.debug("Command", `[read_chat] cli-like resolved provider=${adapter.cliType} target=${String(args?.targetSessionId || "")} adapterStatus=${String(adapterStatus.status || "")} parsedStatus=${String(parsedRecord?.status || "")} shouldPreferAdapterMessages=${String(shouldPreferAdapterMessages)} adapterMsgCount=${Array.isArray(adapterStatus.messages) ? adapterStatus.messages.length : 0} parsedMsgCount=${Array.isArray(parsedRecord?.messages) ? parsedRecord.messages.length : 0} returnedMsgCount=${Array.isArray(status.messages) ? status.messages.length : 0}`);
             return buildReadChatCommandResult({
@@ -38882,7 +38858,9 @@ ${effect.notification.body || ""}`.trim();
                 returnedMsgCount: Array.isArray(status.messages) ? status.messages.length : 0
               },
               ...title ? { title } : {},
-              ...providerSessionId ? { providerSessionId } : {}
+              ...providerSessionId ? { providerSessionId } : {},
+              ...transcriptAuthority ? { transcriptAuthority } : {},
+              ...coverage ? { coverage } : {}
             }, args);
           }
         }
@@ -41275,11 +41253,8 @@ ${effect.notification.body || ""}`.trim();
       historyWriter;
       runtimeMessages = [];
       lastPersistedHistoryMessages = [];
-      lastCanonicalHermesSyncMtimeMs = 0;
-      lastCanonicalHermesExistCheckAt = 0;
-      lastCanonicalHermesWatchPath = void 0;
-      lastCanonicalClaudeRebuildMtimeMs = 0;
-      lastCanonicalClaudeCheckAt = 0;
+      lastNativeSourceCanonicalCheckAt = 0;
+      lastNativeSourceCanonicalCacheKey = void 0;
       cachedSqliteDb = null;
       cachedSqliteDbPath = null;
       cachedSqliteDbMissingUntil = 0;
@@ -41979,41 +41954,45 @@ ${effect.notification.body || ""}`.trim();
         if (!this.providerSessionId) return false;
         const canonicalHistory = this.provider.canonicalHistory;
         if (!canonicalHistory) return false;
+        if (isNativeSourceCanonicalHistory(canonicalHistory)) {
+          const cacheKey = [this.type, this.providerSessionId, this.workingDir].join("\0");
+          const now = Date.now();
+          if (cacheKey === this.lastNativeSourceCanonicalCacheKey && now - this.lastNativeSourceCanonicalCheckAt < 2e3) {
+            return true;
+          }
+          this.lastNativeSourceCanonicalCacheKey = cacheKey;
+          this.lastNativeSourceCanonicalCheckAt = now;
+          const restoredHistory = readProviderChatHistory(this.type, {
+            canonicalHistory,
+            historySessionId: this.providerSessionId,
+            workspace: this.workingDir,
+            offset: 0,
+            limit: Number.MAX_SAFE_INTEGER,
+            historyBehavior: this.provider.historyBehavior,
+            scripts: this.provider.scripts
+          });
+          if (restoredHistory.source === "provider-native") {
+            this.lastPersistedHistoryMessages = restoredHistory.messages.map((message) => ({
+              role: message.role,
+              content: message.content,
+              kind: message.kind,
+              senderName: message.senderName,
+              receivedAt: message.receivedAt
+            }));
+          }
+          return true;
+        }
         try {
-          let rebuilt = false;
-          if (canonicalHistory.format === "hermes-json") {
-            const watchPath = canonicalHistory.watchPath.replace(/^~/, os11.homedir()).replace("{{sessionId}}", this.providerSessionId);
-            const now = Date.now();
-            if (watchPath !== this.lastCanonicalHermesWatchPath || now - this.lastCanonicalHermesExistCheckAt >= 2e3) {
-              this.lastCanonicalHermesWatchPath = watchPath;
-              this.lastCanonicalHermesExistCheckAt = now;
-              if (!fs52.existsSync(watchPath)) return false;
-            } else if (this.lastCanonicalHermesSyncMtimeMs === 0) {
-              if (!fs52.existsSync(watchPath)) return false;
-            }
-            const stat4 = fs52.statSync(watchPath);
-            if (stat4.mtimeMs <= this.lastCanonicalHermesSyncMtimeMs) return true;
-            rebuilt = rebuildHermesSavedHistoryFromCanonicalSession(this.providerSessionId);
-            if (rebuilt) this.lastCanonicalHermesSyncMtimeMs = stat4.mtimeMs;
-          } else if (canonicalHistory.format === "claude-jsonl") {
-            const now = Date.now();
-            if (now - this.lastCanonicalClaudeCheckAt < 2e3 && this.lastCanonicalClaudeRebuildMtimeMs !== 0) {
-              return true;
-            }
-            this.lastCanonicalClaudeCheckAt = now;
-            const claudeProjectsDir = path11.join(os11.homedir(), ".claude", "projects");
-            const workspaceSegment = typeof this.workingDir === "string" ? this.workingDir.replace(/[\\/]/g, "-").replace(/^-+/, "") : "";
-            const transcriptFile = path11.join(claudeProjectsDir, workspaceSegment, `${this.providerSessionId}.jsonl`);
-            let transcriptMtime = 0;
-            try {
-              transcriptMtime = fs52.statSync(transcriptFile).mtimeMs;
-            } catch {
-            }
-            if (transcriptMtime > 0 && transcriptMtime <= this.lastCanonicalClaudeRebuildMtimeMs) return true;
-            rebuilt = rebuildClaudeSavedHistoryFromNativeProject(this.providerSessionId, this.workingDir);
-            if (rebuilt) this.lastCanonicalClaudeRebuildMtimeMs = transcriptMtime || Date.now();
+          const cacheKey = [this.type, this.providerSessionId, this.workingDir, canonicalHistory.mode || "materialized-mirror"].join("\0");
+          const now = Date.now();
+          if (cacheKey === this.lastNativeSourceCanonicalCacheKey && now - this.lastNativeSourceCanonicalCheckAt < 2e3) {
+            return true;
+          }
+          this.lastNativeSourceCanonicalCacheKey = cacheKey;
+          this.lastNativeSourceCanonicalCheckAt = now;
+          if (!materializeProviderNativeHistory(this.type, canonicalHistory, this.providerSessionId, this.workingDir, this.provider.scripts)) {
+            return false;
           }
-          if (!rebuilt) return false;
           const restoredHistory = readChatHistory(this.type, 0, Number.MAX_SAFE_INTEGER, this.providerSessionId, 0, this.provider.historyBehavior);
           this.lastPersistedHistoryMessages = restoredHistory.messages.map((message) => ({
             role: message.role,
@@ -42030,8 +42009,18 @@ ${effect.notification.body || ""}`.trim();
       restorePersistedHistoryFromCurrentSession() {
         if (!this.providerSessionId) return;
         this.syncCanonicalSavedHistoryIfNeeded();
-        this.historyWriter.compactHistorySession(this.type, this.providerSessionId, this.provider.historyBehavior);
-        const restoredHistory = readChatHistory(this.type, 0, Number.MAX_SAFE_INTEGER, this.providerSessionId, 0, this.provider.historyBehavior);
+        const restoredHistory = isNativeSourceCanonicalHistory(this.provider.canonicalHistory) ? readProviderChatHistory(this.type, {
+          canonicalHistory: this.provider.canonicalHistory,
+          historySessionId: this.providerSessionId,
+          workspace: this.workingDir,
+          offset: 0,
+          limit: Number.MAX_SAFE_INTEGER,
+          historyBehavior: this.provider.historyBehavior,
+          scripts: this.provider.scripts
+        }) : (() => {
+          this.historyWriter.compactHistorySession(this.type, this.providerSessionId, this.provider.historyBehavior);
+          return readChatHistory(this.type, 0, Number.MAX_SAFE_INTEGER, this.providerSessionId, 0, this.provider.historyBehavior);
+        })();
         this.historyWriter.seedSessionHistory(
           this.type,
           restoredHistory.messages,
@@ -44148,6 +44137,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
         warnings.push("Extension providers should have extensionId");
       }
       validateCapabilities(provider, controls, errors);
+      validateCanonicalHistory(provider.canonicalHistory, errors);
       for (const control of controls) {
         validateControl(control, errors);
       }
@@ -44205,6 +44195,39 @@ Run 'adhdev doctor' for detailed diagnostics.`
         errors.push("providers declaring controls must set capabilities.controls.typedResults=true");
       }
     }
+    function validateCanonicalHistory(raw, errors) {
+      if (raw === void 0) return;
+      if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
+        errors.push("canonicalHistory must be an object");
+        return;
+      }
+      const canonicalHistory = raw;
+      const format = canonicalHistory.format;
+      if (format !== void 0 && (typeof format !== "string" || !format.trim())) {
+        errors.push("canonicalHistory.format must be a non-empty string when provided");
+      }
+      const watchPath = canonicalHistory.watchPath;
+      if (watchPath !== void 0 && (typeof watchPath !== "string" || !watchPath.trim())) {
+        errors.push("canonicalHistory.watchPath must be a non-empty string when provided");
+      }
+      const mode = canonicalHistory.mode;
+      if (mode !== void 0 && !["native-source", "materialized-mirror", "disabled"].includes(String(mode))) {
+        errors.push("canonicalHistory.mode must be one of: native-source, materialized-mirror, disabled");
+      }
+      const scripts = canonicalHistory.scripts;
+      if (scripts === void 0) return;
+      if (!scripts || typeof scripts !== "object" || Array.isArray(scripts)) {
+        errors.push("canonicalHistory.scripts must be an object");
+        return;
+      }
+      const scriptConfig = scripts;
+      for (const key of ["readSession", "listSessions"]) {
+        const value = scriptConfig[key];
+        if (typeof value !== "string" || !value.trim()) {
+          errors.push(`canonicalHistory.scripts.${key} must be a non-empty string`);
+        }
+      }
+    }
     function validateControl(control, errors) {
       if (!control || typeof control !== "object") {
         errors.push("controls: each control must be an object");
@@ -45744,6 +45767,36 @@ Run 'adhdev doctor' for detailed diagnostics.`
         return 0;
       }
     };
+    function normalizeMacAppPath(appPath) {
+      const trimmed = String(appPath || "").trim();
+      if (!trimmed) return null;
+      return trimmed.replace(/\/+$/, "");
+    }
+    function parsePsLine(line) {
+      const match = line.match(/^\s*(\d+)\s+(.+)$/);
+      if (!match) return null;
+      const pid = Number.parseInt(match[1], 10);
+      if (!Number.isFinite(pid)) return null;
+      return { pid, args: match[2] };
+    }
+    function isMacAppProcessArgs(args, appPath) {
+      const normalized = normalizeMacAppPath(appPath);
+      if (!normalized) return false;
+      return String(args || "").startsWith(`${normalized}/`);
+    }
+    function findMacAppProcessPids(psOutput, appPaths) {
+      const normalizedPaths = appPaths.map(normalizeMacAppPath).filter((value) => !!value);
+      if (normalizedPaths.length === 0) return [];
+      const pids = [];
+      for (const line of String(psOutput || "").split(/\r?\n/)) {
+        const parsed = parsePsLine(line);
+        if (!parsed) continue;
+        if (normalizedPaths.some((appPath) => isMacAppProcessArgs(parsed.args, appPath))) {
+          pids.push(parsed.pid);
+        }
+      }
+      return pids;
+    }
     var _providerLoader = null;
     function getProviderLoader() {
       if (!_providerLoader) {
@@ -45779,6 +45832,35 @@ Run 'adhdev doctor' for detailed diagnostics.`
     function escapeForAppleScript(value) {
       return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
     }
+    function getIdePathCandidates(ideId) {
+      return getProviderLoader().getIdePathCandidates(ideId);
+    }
+    function getMacAppProcessPids(ideId) {
+      const appPaths = getIdePathCandidates(ideId);
+      if (appPaths.length === 0) return [];
+      try {
+        const output = (0, import_child_process7.execSync)("ps axww -o pid=,args=", {
+          encoding: "utf-8",
+          timeout: 3e3,
+          stdio: ["pipe", "pipe", "pipe"]
+        });
+        return findMacAppProcessPids(output, appPaths);
+      } catch {
+        return [];
+      }
+    }
+    function killMacAppPathProcesses(ideId, signal) {
+      const pids = getMacAppProcessPids(ideId);
+      let signalled = false;
+      for (const pid of pids) {
+        try {
+          process.kill(pid, signal);
+          signalled = true;
+        } catch {
+        }
+      }
+      return signalled;
+    }
     async function findFreePort(ports) {
       for (const port2 of ports) {
         const free = await checkPortFree(port2);
@@ -45840,6 +45922,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
             } catch {
             }
           }
+          killMacAppPathProcesses(ideId, "SIGTERM");
         } else if (plat === "win32" && winProcesses) {
           for (const proc of winProcesses) {
             try {
@@ -45869,6 +45952,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
             (0, import_child_process7.execSync)(`pkill -9 -x "${appName}" 2>/dev/null`, { timeout: 5e3 });
           } catch {
           }
+          killMacAppPathProcesses(ideId, "SIGKILL");
         } else if (plat === "win32" && winProcesses) {
           for (const proc of winProcesses) {
             try {
@@ -45888,14 +45972,16 @@ Run 'adhdev doctor' for detailed diagnostics.`
       try {
         if (plat === "darwin") {
           const appName = getMacAppIdentifiers()[ideId];
-          if (!appName) return false;
+          if (!appName) return getMacAppProcessPids(ideId).length > 0;
           try {
             const result = (0, import_child_process7.execSync)(`pgrep -x "${appName}" 2>/dev/null`, {
               encoding: "utf-8",
               timeout: 3e3
             });
-            return result.trim().length > 0;
+            if (result.trim().length > 0) return true;
           } catch {
+          }
+          try {
             const result = (0, import_child_process7.execSync)(
               `osascript -e 'tell application "System Events" to count (every process whose name is "${escapeForAppleScript(appName)}")'`,
               {
@@ -45904,8 +45990,10 @@ Run 'adhdev doctor' for detailed diagnostics.`
                 stdio: ["pipe", "pipe", "pipe"]
               }
             );
-            return Number.parseInt(result.trim() || "0", 10) > 0;
+            if (Number.parseInt(result.trim() || "0", 10) > 0) return true;
+          } catch {
           }
+          return getMacAppProcessPids(ideId).length > 0;
         } else if (plat === "win32") {
           const winProcesses = getWinProcessNames()[ideId];
           if (!winProcesses) return false;
@@ -47260,13 +47348,19 @@ Run 'adhdev doctor' for detailed diagnostics.`
             const wantsAll = args?.all === true;
             const offset = wantsAll ? 0 : Math.max(0, Number(args?.offset) || 0);
             const limit = wantsAll ? Number.MAX_SAFE_INTEGER : Math.max(1, Math.min(100, Number(args?.limit) || 30));
-            const { sessions: historySessions, hasMore } = listSavedHistorySessions(providerType, { offset, limit });
+            const providerMeta = this.deps.providerLoader.getMeta(providerType);
+            const { sessions: historySessions, hasMore, source } = listProviderHistorySessions(providerType, {
+              canonicalHistory: providerMeta?.canonicalHistory,
+              offset,
+              limit,
+              historyBehavior: providerMeta?.historyBehavior,
+              scripts: providerMeta?.scripts
+            });
             const state = loadState();
             const savedSessions = getSavedProviderSessions(state, { providerType, kind });
             const recentSessions = getRecentActivity(state, 200).filter((entry) => entry.providerType === providerType && entry.kind === kind && entry.providerSessionId);
             const savedSessionById = new Map(savedSessions.map((entry) => [entry.providerSessionId, entry]));
             const recentSessionById = new Map(recentSessions.map((entry) => [entry.providerSessionId, entry]));
-            const providerMeta = this.deps.providerLoader.getMeta(providerType);
             const canResumeById = supportsExplicitSessionResume(providerMeta?.resume);
             return {
               success: true,
@@ -47286,10 +47380,14 @@ Run 'adhdev doctor' for detailed diagnostics.`
                   messageCount: session.messageCount,
                   firstMessageAt: session.firstMessageAt,
                   lastMessageAt: session.lastMessageAt,
-                  canResume: !!(saved?.workspace || recent?.workspace || session.workspace) && canResumeById
+                  canResume: !!(saved?.workspace || recent?.workspace || session.workspace) && canResumeById,
+                  historySource: session.source,
+                  sourcePath: session.sourcePath,
+                  sourceMtimeMs: session.sourceMtimeMs
                 };
               }),
-              hasMore
+              hasMore,
+              source
             };
           }
           // ─── restart_session: IDE / CLI / ACP unified ───