@adhdev/daemon-standalone 0.9.43 → 0.9.45

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;
@@ -29926,7 +29928,9 @@ var require_dist2 = __commonJS({
     __export2(provider_cli_adapter_exports, {
       ProviderCliAdapter: () => ProviderCliAdapter,
       appendBoundedText: () => appendBoundedText,
-      normalizeCliProviderForRuntime: () => normalizeCliProviderForRuntime
+      normalizeCliProviderForRuntime: () => normalizeCliProviderForRuntime,
+      sanitizeCliStandardMessageContent: () => sanitizeCliStandardMessageContent,
+      trimLastAssistantEchoForCliMessages: () => trimLastAssistantEchoForCliMessages
     });
     function normalizeComparableTranscriptText(value) {
       return sanitizeTerminalText(String(value || "")).replace(/\s+/g, " ").trim();
@@ -29966,7 +29970,77 @@ var require_dist2 = __commonJS({
       if (current.length <= keepFromCurrent) return current + chunk;
       return current.slice(-keepFromCurrent) + chunk;
     }
+    function isLikelyCommittedActivityPrefixContinuation(line) {
+      const trimmed = String(line || "").trim();
+      if (!trimmed) return false;
+      if (COMMITTED_ACTIVITY_PREFIX_BLOCK_RE.test(trimmed)) return false;
+      if (/\s/.test(trimmed)) return false;
+      if (/[가-힣]/.test(trimmed)) return false;
+      if (trimmed.length > 96) return false;
+      return /^[A-Za-z0-9_./:@+%=-]+$/.test(trimmed);
+    }
+    function parseCommittedActivityPrefixBlock(lines, index) {
+      const first = String(lines[index] || "").trim();
+      if (!COMMITTED_ACTIVITY_PREFIX_BLOCK_RE.test(first)) return null;
+      const parts = [first];
+      let nextIndex = index + 1;
+      while (nextIndex < lines.length && isLikelyCommittedActivityPrefixContinuation(lines[nextIndex])) {
+        parts.push(String(lines[nextIndex] || "").trim());
+        nextIndex += 1;
+      }
+      return { label: parts.join(""), nextIndex };
+    }
+    function sanitizeCliStandardMessageContent(content) {
+      const source = String(content || "").trim();
+      if (!source) return "";
+      const lines = source.split(/\r?\n/);
+      if (lines.length < 4) return source;
+      const counts = /* @__PURE__ */ new Map();
+      for (let index = 0; index < lines.length; index += 1) {
+        const block = parseCommittedActivityPrefixBlock(lines, index);
+        if (!block) continue;
+        counts.set(block.label, (counts.get(block.label) || 0) + 1);
+        index = block.nextIndex - 1;
+      }
+      const repeatedLabels = new Set(
+        Array.from(counts.entries()).filter(([, count]) => count >= 3).map(([label]) => label)
+      );
+      if (repeatedLabels.size === 0) return source;
+      const stripped = [];
+      let removed = 0;
+      for (let index = 0; index < lines.length; index += 1) {
+        const block = parseCommittedActivityPrefixBlock(lines, index);
+        if (block && repeatedLabels.has(block.label)) {
+          removed += 1;
+          index = block.nextIndex - 1;
+          continue;
+        }
+        stripped.push(lines[index]);
+      }
+      const next = stripped.join("\n").replace(/\n{3,}/g, "\n\n").trim();
+      return removed >= 3 && next.length >= 80 ? next : source;
+    }
+    function sanitizeCommittedMessageForDisplay(message) {
+      if (!message || message.role !== "assistant" || (message.kind || "standard") !== "standard") return message;
+      const content = sanitizeCliStandardMessageContent(message.content);
+      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;
     var init_provider_cli_adapter = __esm2({
       "src/cli-adapters/provider-cli-adapter.ts"() {
@@ -29983,6 +30057,7 @@ var require_dist2 = __commonJS({
         init_provider_cli_config();
         init_provider_cli_runtime();
         init_provider_cli_shared();
+        COMMITTED_ACTIVITY_PREFIX_BLOCK_RE = /^(?:📖|💻|🔎|📚|📋|✏️|📝|🔧|🛠️|⚙️)\s+(.+)$/;
         ProviderCliAdapter = class _ProviderCliAdapter {
           constructor(provider, workingDir, extraArgs = [], transportFactory = new NodePtyTransportFactory()) {
             this.extraArgs = extraArgs;
@@ -30163,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);
           }
@@ -30194,7 +30276,10 @@ var require_dist2 = __commonJS({
             const tailFirst = parseBaseMessages[0];
             if (tailFirst && this.messagesComparable(parsedFirst, tailFirst)) {
               const prefixLength = fullBaseMessages.length - parseBaseMessages.length;
-              return [...fullBaseMessages.slice(0, prefixLength), ...parsedMessages];
+              const prefix = fullBaseMessages.slice(0, prefixLength);
+              const shouldSanitizePrefix = !!this.currentTurnScope || this.currentStatus !== "idle" || !!this.activeModal;
+              const nextPrefix = shouldSanitizePrefix ? prefix.map((message) => sanitizeCommittedMessageForDisplay(message)) : prefix;
+              return [...nextPrefix, ...parsedMessages];
             }
             return [...fullBaseMessages, ...parsedMessages];
           }
@@ -30643,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) {
@@ -31393,10 +31476,12 @@ var require_dist2 = __commonJS({
           }
           buildCommittedChatMessages() {
             return this.committedMessages.map((message, index) => {
-              const contentValue = message.content;
+              const rawContentValue = message.content;
+              const rawContent = typeof rawContentValue === "string" ? rawContentValue : String(rawContentValue || "");
+              const content = message.role === "assistant" && (message.kind || "standard") === "standard" ? sanitizeCliStandardMessageContent(rawContent) : rawContent;
               return buildChatMessage({
                 role: message.role,
-                content: typeof contentValue === "string" ? contentValue : String(contentValue || ""),
+                content,
                 timestamp: message.timestamp,
                 kind: message.kind,
                 meta: message.meta,
@@ -31497,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];
@@ -35793,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, "_");
@@ -35818,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 };
       }
@@ -35971,6 +36060,52 @@ ${cleanBody}`;
         return false;
       }
     }
+    function buildHermesNativeHistoryRecords(historySessionId) {
+      const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId);
+      if (!normalizedSessionId) return null;
+      try {
+        const sessionFilePath = path7.join(os52.homedir(), ".hermes", "sessions", `session_${normalizedSessionId}.json`);
+        if (!fs32.existsSync(sessionFilePath)) return null;
+        const raw = JSON.parse(fs32.readFileSync(sessionFilePath, "utf-8"));
+        const canonicalMessages = Array.isArray(raw.messages) ? raw.messages : [];
+        const records = [];
+        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" || role === "assistant") {
+            records.push({
+              ts: new Date(receivedAt).toISOString(),
+              receivedAt,
+              role,
+              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 records;
+      } catch {
+        return null;
+      }
+    }
     function rebuildHermesSavedHistoryFromCanonicalSession(historySessionId) {
       const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId);
       if (!normalizedSessionId) return false;
@@ -36120,6 +36255,77 @@ ${cleanBody}`;
       }
       return parts;
     }
+    function buildClaudeNativeHistoryRecords(historySessionId, workspace) {
+      const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId);
+      if (!normalizedSessionId) return null;
+      try {
+        const transcriptPath = resolveClaudeProjectTranscriptPath(normalizedSessionId, workspace);
+        if (!transcriptPath) return null;
+        const lines = fs32.readFileSync(transcriptPath, "utf-8").split("\n").filter(Boolean);
+        const records = [];
+        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 records;
+      } catch {
+        return null;
+      }
+    }
     function rebuildClaudeSavedHistoryFromNativeProject(historySessionId, workspace) {
       const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId);
       if (!normalizedSessionId) return false;
@@ -36198,6 +36404,352 @@ ${cleanBody}`;
         return false;
       }
     }
+    function isUuidLikeSessionId(sessionId) {
+      return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(sessionId);
+    }
+    function readCodexSessionMeta(filePath) {
+      try {
+        const firstLine = fs32.readFileSync(filePath, "utf-8").split("\n").find(Boolean);
+        if (!firstLine) return null;
+        const parsed = JSON.parse(firstLine);
+        if (String(parsed.type || "") !== "session_meta") return null;
+        const payload = parsed.payload && typeof parsed.payload === "object" ? parsed.payload : null;
+        return payload;
+      } catch {
+        return null;
+      }
+    }
+    function resolveCodexSessionTranscriptPath(historySessionId, workspace) {
+      const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId);
+      if (!normalizedSessionId || !isUuidLikeSessionId(normalizedSessionId)) return null;
+      const sessionsDir = path7.join(os52.homedir(), ".codex", "sessions");
+      if (!fs32.existsSync(sessionsDir)) return null;
+      const normalizedWorkspace = typeof workspace === "string" ? workspace.trim() : "";
+      const candidates = [];
+      const stack = [sessionsDir];
+      while (stack.length > 0) {
+        const current = stack.pop();
+        if (!current) continue;
+        let entries = [];
+        try {
+          entries = fs32.readdirSync(current, { withFileTypes: true });
+        } catch {
+          continue;
+        }
+        for (const entry of entries) {
+          const entryPath = path7.join(current, entry.name);
+          if (entry.isDirectory()) {
+            stack.push(entryPath);
+            continue;
+          }
+          if (!entry.isFile() || !entry.name.endsWith(".jsonl") || !entry.name.includes(normalizedSessionId)) continue;
+          const meta3 = readCodexSessionMeta(entryPath);
+          const metaSessionId = String(meta3?.id || "").trim();
+          if (metaSessionId && metaSessionId !== normalizedSessionId) continue;
+          const metaWorkspace = String(meta3?.cwd || "").trim();
+          let mtimeMs = 0;
+          try {
+            mtimeMs = fs32.statSync(entryPath).mtimeMs;
+          } catch {
+          }
+          candidates.push({
+            path: entryPath,
+            mtimeMs,
+            workspaceMatches: !!normalizedWorkspace && metaWorkspace === normalizedWorkspace,
+            metaMatches: metaSessionId === normalizedSessionId
+          });
+        }
+      }
+      candidates.sort((a, b2) => Number(b2.workspaceMatches) - Number(a.workspaceMatches) || Number(b2.metaMatches) - Number(a.metaMatches) || b2.mtimeMs - a.mtimeMs);
+      return candidates[0]?.path || null;
+    }
+    function flattenCodexContent(content) {
+      if (typeof content === "string") return content.trim();
+      if (content == null) return "";
+      if (Array.isArray(content)) {
+        return content.map((entry) => flattenCodexContent(entry)).filter(Boolean).join("\n").trim();
+      }
+      if (typeof content === "object") {
+        const record2 = content;
+        if (typeof record2.text === "string") return record2.text.trim();
+        if (typeof record2.content === "string" || Array.isArray(record2.content)) return flattenCodexContent(record2.content);
+        if (typeof record2.output === "string") return record2.output.trim();
+        if (typeof record2.message === "string") return record2.message.trim();
+      }
+      return "";
+    }
+    function summarizeCodexToolCall(payload) {
+      const name = String(payload.name || payload.type || "tool").trim() || "tool";
+      const rawArguments = payload.arguments ?? payload.input;
+      let argumentValue = "";
+      if (typeof rawArguments === "string") {
+        const trimmed = rawArguments.trim();
+        try {
+          const parsed = JSON.parse(trimmed);
+          argumentValue = summarizeCodexToolArguments(parsed);
+        } catch {
+          argumentValue = trimmed;
+        }
+      } else {
+        argumentValue = summarizeCodexToolArguments(rawArguments);
+      }
+      return argumentValue ? `${name}: ${argumentValue}` : name;
+    }
+    function summarizeCodexToolArguments(value) {
+      if (typeof value === "string") return value.trim();
+      if (Array.isArray(value)) return value.map((entry) => String(entry)).join(" ").trim();
+      if (!value || typeof value !== "object") return "";
+      const record2 = value;
+      const direct = record2.command || record2.cmd || record2.query || record2.path || record2.prompt;
+      if (typeof direct === "string") return direct.trim();
+      if (Array.isArray(direct)) return direct.map((entry) => String(entry)).join(" ").trim();
+      try {
+        return JSON.stringify(record2).trim();
+      } catch {
+        return "";
+      }
+    }
+    function codexToolOutputContent(payload) {
+      const output = payload.output ?? payload.result ?? payload.content;
+      const text = flattenCodexContent(output);
+      if (text) return text;
+      if (output && typeof output === "object") {
+        try {
+          return JSON.stringify(output).trim();
+        } catch {
+          return "";
+        }
+      }
+      return "";
+    }
+    function buildCodexNativeHistoryRecords(historySessionId, workspace) {
+      const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId);
+      if (!normalizedSessionId || !isUuidLikeSessionId(normalizedSessionId)) return null;
+      try {
+        const transcriptPath = resolveCodexSessionTranscriptPath(normalizedSessionId, workspace);
+        if (!transcriptPath) return null;
+        const lines = fs32.readFileSync(transcriptPath, "utf-8").split("\n").filter(Boolean);
+        const records = [];
+        let fallbackTs = Date.now();
+        for (const line of lines) {
+          let parsed = null;
+          try {
+            parsed = JSON.parse(line);
+          } catch {
+            parsed = null;
+          }
+          if (!parsed) continue;
+          const receivedAt = extractTimestampValue(parsed.timestamp) || fallbackTs;
+          fallbackTs = receivedAt + 1;
+          const type = String(parsed.type || "").trim();
+          const payload = parsed.payload && typeof parsed.payload === "object" ? parsed.payload : null;
+          if (!payload) continue;
+          if (type === "session_meta") {
+            const parsedSessionId = String(payload.id || "").trim();
+            if (parsedSessionId && parsedSessionId !== normalizedSessionId) return null;
+            const parsedWorkspace = String(payload.cwd || workspace || "").trim();
+            if (records.length === 0 && parsedWorkspace) {
+              records.push({
+                ts: new Date(receivedAt).toISOString(),
+                receivedAt,
+                role: "system",
+                kind: "session_start",
+                content: parsedWorkspace,
+                agent: "codex-cli",
+                historySessionId: normalizedSessionId,
+                workspace: parsedWorkspace
+              });
+            }
+            continue;
+          }
+          if (type !== "response_item") continue;
+          const payloadType = String(payload.type || "").trim();
+          if (payloadType === "message") {
+            const role = String(payload.role || "").trim();
+            if (role !== "user" && role !== "assistant") continue;
+            const content = flattenCodexContent(payload.content);
+            if (!content) continue;
+            records.push({
+              ts: new Date(receivedAt).toISOString(),
+              receivedAt,
+              role,
+              content,
+              kind: "standard",
+              agent: "codex-cli",
+              historySessionId: normalizedSessionId
+            });
+            continue;
+          }
+          if (payloadType === "function_call" || payloadType === "custom_tool_call") {
+            const content = summarizeCodexToolCall(payload);
+            if (!content) continue;
+            records.push({
+              ts: new Date(receivedAt).toISOString(),
+              receivedAt,
+              role: "assistant",
+              content,
+              kind: "tool",
+              senderName: "Tool",
+              agent: "codex-cli",
+              historySessionId: normalizedSessionId
+            });
+            continue;
+          }
+          if (payloadType === "function_call_output" || payloadType === "custom_tool_call_output") {
+            const content = codexToolOutputContent(payload);
+            if (!content) continue;
+            records.push({
+              ts: new Date(receivedAt).toISOString(),
+              receivedAt,
+              role: "assistant",
+              content,
+              kind: "tool",
+              senderName: "Tool",
+              agent: "codex-cli",
+              historySessionId: normalizedSessionId
+            });
+          }
+        }
+        return records;
+      } catch {
+        return null;
+      }
+    }
+    function rebuildCodexSavedHistoryFromNativeSession(historySessionId, workspace) {
+      const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId);
+      if (!normalizedSessionId || !isUuidLikeSessionId(normalizedSessionId)) return false;
+      const records = buildCodexNativeHistoryRecords(normalizedSessionId, workspace);
+      if (!records || records.length === 0) return false;
+      const existingSessionStart = readExistingSessionStartRecord("codex-cli", normalizedSessionId);
+      const recordsToWrite = existingSessionStart && records[0]?.kind !== "session_start" ? [{ ...existingSessionStart, historySessionId: normalizedSessionId }, ...records] : records;
+      return rewriteCanonicalSavedHistory("codex-cli", normalizedSessionId, recordsToWrite);
+    }
+    function isNativeSourceCanonicalHistory(canonicalHistory) {
+      if (!canonicalHistory) return false;
+      if (canonicalHistory.mode === "disabled") return false;
+      if (canonicalHistory.mode === "materialized-mirror") return false;
+      return true;
+    }
+    function buildNativeHistoryRecords(canonicalHistory, historySessionId, workspace) {
+      const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId || "");
+      if (!canonicalHistory || !normalizedSessionId || !isNativeSourceCanonicalHistory(canonicalHistory)) return null;
+      if (canonicalHistory.format === "hermes-json") return buildHermesNativeHistoryRecords(normalizedSessionId);
+      if (canonicalHistory.format === "claude-jsonl") return buildClaudeNativeHistoryRecords(normalizedSessionId, workspace);
+      if (canonicalHistory.format === "codex-jsonl") return buildCodexNativeHistoryRecords(normalizedSessionId, workspace);
+      return null;
+    }
+    function readProviderChatHistory(agentType, options = {}) {
+      if (isNativeSourceCanonicalHistory(options.canonicalHistory) && options.historySessionId) {
+        const records = buildNativeHistoryRecords(options.canonicalHistory, options.historySessionId, options.workspace);
+        if (!records) return { messages: [], hasMore: false, source: "native-unavailable" };
+        return {
+          ...pageHistoryRecords(agentType, records, options.offset || 0, options.limit || 30, options.excludeRecentCount || 0, options.historyBehavior),
+          source: "provider-native"
+        };
+      }
+      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 {
+        sourceMtimeMs = fs32.statSync(sourcePath).mtimeMs;
+      } catch {
+      }
+      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 listFilesRecursive(root, predicate) {
+      if (!fs32.existsSync(root)) return [];
+      const results = [];
+      const stack = [root];
+      while (stack.length > 0) {
+        const current = stack.pop();
+        if (!current) continue;
+        let entries = [];
+        try {
+          entries = fs32.readdirSync(current, { withFileTypes: true });
+        } catch {
+          continue;
+        }
+        for (const entry of entries) {
+          const entryPath = path7.join(current, entry.name);
+          if (entry.isDirectory()) {
+            stack.push(entryPath);
+            continue;
+          }
+          if (predicate(entryPath, entry)) results.push(entryPath);
+        }
+      }
+      return results;
+    }
+    function collectNativeHistorySessionSummaries(agentType, canonicalHistory) {
+      const summaries = [];
+      if (canonicalHistory.format === "hermes-json") {
+        const root = path7.join(os52.homedir(), ".hermes", "sessions");
+        for (const filePath of listFilesRecursive(root, (_entryPath, entry) => entry.isFile() && /^session_.+\.json$/.test(entry.name))) {
+          const fileName = path7.basename(filePath);
+          const historySessionId = fileName.replace(/^session_/, "").replace(/\.json$/, "");
+          const records = buildHermesNativeHistoryRecords(historySessionId);
+          const summary = records ? buildNativeSessionSummary(agentType, historySessionId, records, filePath) : null;
+          if (summary) summaries.push(summary);
+        }
+      } else if (canonicalHistory.format === "claude-jsonl") {
+        const root = path7.join(os52.homedir(), ".claude", "projects");
+        for (const filePath of listFilesRecursive(root, (_entryPath, entry) => entry.isFile() && entry.name.endsWith(".jsonl"))) {
+          const historySessionId = path7.basename(filePath, ".jsonl");
+          const records = buildClaudeNativeHistoryRecords(historySessionId);
+          const summary = records ? buildNativeSessionSummary(agentType, historySessionId, records, filePath) : null;
+          if (summary) summaries.push(summary);
+        }
+      } else if (canonicalHistory.format === "codex-jsonl") {
+        const root = path7.join(os52.homedir(), ".codex", "sessions");
+        const uuidPattern = /([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/i;
+        for (const filePath of listFilesRecursive(root, (_entryPath, entry) => entry.isFile() && entry.name.endsWith(".jsonl"))) {
+          const meta3 = readCodexSessionMeta(filePath);
+          const historySessionId = String(meta3?.id || path7.basename(filePath).match(uuidPattern)?.[1] || "").trim();
+          if (!historySessionId) continue;
+          const records = buildCodexNativeHistoryRecords(historySessionId, String(meta3?.cwd || "").trim() || void 0);
+          const summary = records ? buildNativeSessionSummary(agentType, historySessionId, records, filePath) : null;
+          if (summary) summaries.push(summary);
+        }
+      }
+      return sortSavedHistorySessionSummaries(summaries);
+    }
+    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);
+        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";
     }
@@ -38765,7 +39317,16 @@ ${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
+        });
         return { success: true, ...result, agent: agentStr };
       } catch (e) {
         return { success: false, error: e.message };
@@ -38790,7 +39351,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,
@@ -38800,6 +39362,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({
@@ -38818,7 +39382,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);
           }
         }
@@ -41216,6 +41782,8 @@ ${effect.notification.body || ""}`.trim();
       lastCanonicalHermesWatchPath = void 0;
       lastCanonicalClaudeRebuildMtimeMs = 0;
       lastCanonicalClaudeCheckAt = 0;
+      lastCanonicalCodexRebuildMtimeMs = 0;
+      lastCanonicalCodexCheckAt = 0;
       cachedSqliteDb = null;
       cachedSqliteDbPath = null;
       cachedSqliteDbMissingUntil = 0;
@@ -41915,6 +42483,25 @@ ${effect.notification.body || ""}`.trim();
         if (!this.providerSessionId) return false;
         const canonicalHistory = this.provider.canonicalHistory;
         if (!canonicalHistory) return false;
+        if (isNativeSourceCanonicalHistory(canonicalHistory)) {
+          const restoredHistory = readProviderChatHistory(this.type, {
+            canonicalHistory,
+            historySessionId: this.providerSessionId,
+            workspace: this.workingDir,
+            offset: 0,
+            limit: Number.MAX_SAFE_INTEGER,
+            historyBehavior: this.provider.historyBehavior
+          });
+          if (restoredHistory.source !== "provider-native") return false;
+          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") {
@@ -41948,6 +42535,23 @@ ${effect.notification.body || ""}`.trim();
             if (transcriptMtime > 0 && transcriptMtime <= this.lastCanonicalClaudeRebuildMtimeMs) return true;
             rebuilt = rebuildClaudeSavedHistoryFromNativeProject(this.providerSessionId, this.workingDir);
             if (rebuilt) this.lastCanonicalClaudeRebuildMtimeMs = transcriptMtime || Date.now();
+          } else if (canonicalHistory.format === "codex-jsonl") {
+            const now = Date.now();
+            if (now - this.lastCanonicalCodexCheckAt < 2e3 && this.lastCanonicalCodexRebuildMtimeMs !== 0) {
+              return true;
+            }
+            this.lastCanonicalCodexCheckAt = now;
+            const transcriptFile = resolveCodexSessionTranscriptPath(this.providerSessionId, this.workingDir);
+            let transcriptMtime = 0;
+            if (transcriptFile) {
+              try {
+                transcriptMtime = fs52.statSync(transcriptFile).mtimeMs;
+              } catch {
+              }
+            }
+            if (transcriptMtime > 0 && transcriptMtime <= this.lastCanonicalCodexRebuildMtimeMs) return true;
+            rebuilt = rebuildCodexSavedHistoryFromNativeSession(this.providerSessionId, this.workingDir);
+            if (rebuilt) this.lastCanonicalCodexRebuildMtimeMs = transcriptMtime || Date.now();
           }
           if (!rebuilt) return false;
           const restoredHistory = readChatHistory(this.type, 0, Number.MAX_SAFE_INTEGER, this.providerSessionId, 0, this.provider.historyBehavior);
@@ -41966,8 +42570,17 @@ ${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
+        }) : (() => {
+          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,
@@ -45680,6 +46293,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) {
@@ -45715,6 +46358,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);
@@ -45776,6 +46448,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
             } catch {
             }
           }
+          killMacAppPathProcesses(ideId, "SIGTERM");
         } else if (plat === "win32" && winProcesses) {
           for (const proc of winProcesses) {
             try {
@@ -45805,6 +46478,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 {
@@ -45824,14 +46498,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)}")'`,
               {
@@ -45840,8 +46516,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;
@@ -47196,13 +47874,18 @@ 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
+            });
             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,
@@ -47225,7 +47908,8 @@ Run 'adhdev doctor' for detailed diagnostics.`
                   canResume: !!(saved?.workspace || recent?.workspace || session.workspace) && canResumeById
                 };
               }),
-              hasMore
+              hasMore,
+              source
             };
           }
           // ─── restart_session: IDE / CLI / ACP unified ───