adhdev 0.9.45 → 0.9.46

package/dist/index.js

@@ -4145,29 +4145,6 @@ function listSavedHistorySessions(agentType, options = {}, historyBehavior) {
     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);
@@ -4213,569 +4190,77 @@ function rewriteCanonicalSavedHistory(agentType, historySessionId, records) {
     return false;
   }
 }
-function buildHermesNativeHistoryRecords(historySessionId) {
-  const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId);
-  if (!normalizedSessionId) return null;
-  try {
-    const sessionFilePath = path7.join(os5.homedir(), ".hermes", "sessions", `session_${normalizedSessionId}.json`);
-    if (!fs3.existsSync(sessionFilePath)) return null;
-    const raw = JSON.parse(fs3.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;
-  try {
-    const sessionFilePath = path7.join(os5.homedir(), ".hermes", "sessions", `session_${normalizedSessionId}.json`);
-    if (!fs3.existsSync(sessionFilePath)) return false;
-    const raw = JSON.parse(fs3.readFileSync(sessionFilePath, "utf-8"));
-    const canonicalMessages = Array.isArray(raw.messages) ? raw.messages : [];
-    const dir = path7.join(HISTORY_DIR, "hermes-cli");
-    fs3.mkdirSync(dir, { recursive: true });
-    const existingSessionStart = 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);
-  } catch {
-    return false;
-  }
-}
-function resolveClaudeProjectTranscriptPath(historySessionId, workspace) {
-  const claudeProjectsDir = path7.join(os5.homedir(), ".claude", "projects");
-  if (!fs3.existsSync(claudeProjectsDir)) return null;
-  const normalizedWorkspace = typeof workspace === "string" ? workspace.trim() : "";
-  if (normalizedWorkspace) {
-    const directPath = path7.join(claudeProjectsDir, normalizedWorkspace.replace(/[\\/]/g, "-"), `${historySessionId}.jsonl`);
-    if (fs3.existsSync(directPath)) return directPath;
-  }
-  const stack = [claudeProjectsDir];
-  while (stack.length > 0) {
-    const current = stack.pop();
-    if (!current) continue;
-    for (const entry of fs3.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;
-      }
-    }
-  }
-  return null;
+function getNativeHistoryScriptName(canonicalHistory, key) {
+  const configured = canonicalHistory?.scripts?.[key];
+  if (typeof configured === "string" && configured.trim()) return configured.trim();
+  return key === "readSession" ? "readNativeHistory" : "listNativeHistory";
 }
-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" });
-    }
-  }
-  return parts;
+function getProviderNativeHistoryScript(scripts, canonicalHistory, key) {
+  if (!canonicalHistory?.scripts) return null;
+  const fn = scripts?.[getNativeHistoryScriptName(canonicalHistory, key)];
+  return typeof fn === "function" ? fn : null;
 }
-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 buildClaudeNativeHistoryRecords(historySessionId, workspace) {
+function normalizeProviderNativeHistoryRecords(agentType, historySessionId, records) {
+  if (!Array.isArray(records)) return [];
   const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId);
-  if (!normalizedSessionId) return null;
-  try {
-    const transcriptPath = resolveClaudeProjectTranscriptPath(normalizedSessionId, workspace);
-    if (!transcriptPath) return null;
-    const lines = fs3.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;
-  try {
-    const transcriptPath = resolveClaudeProjectTranscriptPath(normalizedSessionId, workspace);
-    if (!transcriptPath) return false;
-    const lines = fs3.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 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 = fs3.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(os5.homedir(), ".codex", "sessions");
-  if (!fs3.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 = fs3.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 = fs3.statSync(entryPath).mtimeMs;
-      } catch {
-      }
-      candidates.push({
-        path: entryPath,
-        mtimeMs,
-        workspaceMatches: !!normalizedWorkspace && metaWorkspace === normalizedWorkspace,
-        metaMatches: metaSessionId === normalizedSessionId
-      });
-    }
-  }
-  candidates.sort((a, b) => Number(b.workspaceMatches) - Number(a.workspaceMatches) || Number(b.metaMatches) - Number(a.metaMatches) || b.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 "";
-  }
+  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 fn = getProviderNativeHistoryScript(scripts, canonicalHistory, "readSession");
+  if (!fn) return null;
+  const result = fn({
+    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 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 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 buildCodexNativeHistoryRecords(historySessionId, workspace) {
+function materializeNativeHistoryToMirror(agentType, canonicalHistory, historySessionId, workspace, scripts) {
   const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId);
-  if (!normalizedSessionId || !isUuidLikeSessionId(normalizedSessionId)) return null;
-  try {
-    const transcriptPath = resolveCodexSessionTranscriptPath(normalizedSessionId, workspace);
-    if (!transcriptPath) return null;
-    const lines = fs3.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;
-  }
+  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 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 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;
@@ -4783,21 +4268,15 @@ function isNativeSourceCanonicalHistory(canonicalHistory) {
   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" };
+    const nativeResult = buildNativeHistoryReadResult(agentType, options.canonicalHistory, options.scripts, options.historySessionId, options.workspace);
+    if (!nativeResult) 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"
+      ...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 {
@@ -4830,68 +4309,64 @@ function buildNativeSessionSummary(agentType, historySessionId, records, sourceP
     sourceMtimeMs
   };
 }
-function listFilesRecursive(root, predicate) {
-  if (!fs3.existsSync(root)) return [];
-  const results = [];
-  const stack = [root];
-  while (stack.length > 0) {
-    const current = stack.pop();
-    if (!current) continue;
-    let entries = [];
-    try {
-      entries = fs3.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 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 collectNativeHistorySessionSummaries(agentType, canonicalHistory) {
+function collectProviderScriptNativeHistorySessionSummaries(agentType, canonicalHistory, scripts) {
+  const fn = getProviderNativeHistoryScript(scripts, canonicalHistory, "listSessions");
+  if (!fn) return null;
+  const result = fn({
+    agentType,
+    format: canonicalHistory.format,
+    watchPath: canonicalHistory.watchPath,
+    args: {}
+  });
+  if (!result || typeof result !== "object") return [];
+  const sessions = Array.isArray(result.sessions) ? result.sessions : [];
   const summaries = [];
-  if (canonicalHistory.format === "hermes-json") {
-    const root = path7.join(os5.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(os5.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(os5.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();
+  for (const item of sessions) {
+    if (Array.isArray(item?.messages || item?.records)) {
+      const historySessionId = normalizeSavedHistorySessionId(item?.historySessionId || item?.sessionId || "");
       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);
+      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);
+      }
+      continue;
     }
+    const summary = normalizeProviderNativeHistorySessionSummary(agentType, item);
+    if (summary) summaries.push(summary);
   }
   return sortSavedHistorySessionSummaries(summaries);
 }
+function collectNativeHistorySessionSummaries(agentType, canonicalHistory, scripts) {
+  return collectProviderScriptNativeHistorySessionSummaries(agentType, canonicalHistory, scripts) || [];
+}
 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);
+    const summaries = collectNativeHistorySessionSummaries(agentType, options.canonicalHistory, options.scripts);
     return {
       sessions: summaries.slice(offset, offset + limit),
       hasMore: offset + limit < summaries.length,
@@ -8183,7 +7658,8 @@ async function handleChatHistory(h, args) {
       offset: offset || 0,
       limit: limit || 30,
       excludeRecentCount,
-      historyBehavior: provider?.historyBehavior
+      historyBehavior: provider?.historyBehavior,
+      scripts: provider?.scripts
     });
     return { success: true, ...result, agent: agentStr };
   } catch (e) {
@@ -14839,13 +14315,8 @@ var init_cli_provider_instance = __esm({
       historyWriter;
       runtimeMessages = [];
       lastPersistedHistoryMessages = [];
-      lastCanonicalHermesSyncMtimeMs = 0;
-      lastCanonicalHermesExistCheckAt = 0;
-      lastCanonicalHermesWatchPath = void 0;
-      lastCanonicalClaudeRebuildMtimeMs = 0;
-      lastCanonicalClaudeCheckAt = 0;
-      lastCanonicalCodexRebuildMtimeMs = 0;
-      lastCanonicalCodexCheckAt = 0;
+      lastNativeSourceCanonicalCheckAt = 0;
+      lastNativeSourceCanonicalCacheKey = void 0;
       cachedSqliteDb = null;
       cachedSqliteDbPath = null;
       cachedSqliteDbMissingUntil = 0;
@@ -15546,76 +15017,44 @@ ${effect.notification.body || ""}`.trim();
         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
+            historyBehavior: this.provider.historyBehavior,
+            scripts: this.provider.scripts
           });
-          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
-          }));
+          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(/^~/, os13.homedir()).replace("{{sessionId}}", this.providerSessionId);
-            const now = Date.now();
-            if (watchPath !== this.lastCanonicalHermesWatchPath || now - this.lastCanonicalHermesExistCheckAt >= 2e3) {
-              this.lastCanonicalHermesWatchPath = watchPath;
-              this.lastCanonicalHermesExistCheckAt = now;
-              if (!fs5.existsSync(watchPath)) return false;
-            } else if (this.lastCanonicalHermesSyncMtimeMs === 0) {
-              if (!fs5.existsSync(watchPath)) return false;
-            }
-            const stat4 = fs5.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(os13.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 = fs5.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();
-          } 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 = fs5.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();
+          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,
@@ -15638,7 +15077,8 @@ ${effect.notification.body || ""}`.trim();
           workspace: this.workingDir,
           offset: 0,
           limit: Number.MAX_SAFE_INTEGER,
-          historyBehavior: this.provider.historyBehavior
+          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);
@@ -34175,10 +33615,10 @@ var init_readdirp = __esm({
       }
       async _formatEntry(dirent, path28) {
         let entry;
-        const basename10 = this._isDirent ? dirent.name : dirent;
+        const basename9 = this._isDirent ? dirent.name : dirent;
         try {
-          const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path28, basename10));
-          entry = { path: (0, import_node_path.relative)(this._root, fullPath), fullPath, basename: basename10 };
+          const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path28, basename9));
+          entry = { path: (0, import_node_path.relative)(this._root, fullPath), fullPath, basename: basename9 };
           entry[this._statsProp] = this._isDirent ? dirent : await this._stat(fullPath);
         } catch (err) {
           this._onError(err);
@@ -34709,9 +34149,9 @@ var init_handler2 = __esm({
       _watchWithNodeFs(path28, listener) {
         const opts = this.fsw.options;
         const directory = sp.dirname(path28);
-        const basename10 = sp.basename(path28);
+        const basename9 = sp.basename(path28);
         const parent = this.fsw._getWatchedDir(directory);
-        parent.add(basename10);
+        parent.add(basename9);
         const absolutePath = sp.resolve(path28);
         const options = {
           persistent: opts.persistent
@@ -34721,7 +34161,7 @@ var init_handler2 = __esm({
         let closer;
         if (opts.usePolling) {
           const enableBin = opts.interval !== opts.binaryInterval;
-          options.interval = enableBin && isBinaryPath(basename10) ? opts.binaryInterval : opts.interval;
+          options.interval = enableBin && isBinaryPath(basename9) ? opts.binaryInterval : opts.interval;
           closer = setFsWatchFileListener(path28, absolutePath, options, {
             listener,
             rawEmitter: this.fsw._emitRaw
@@ -34744,10 +34184,10 @@ var init_handler2 = __esm({
           return;
         }
         const dirname10 = sp.dirname(file2);
-        const basename10 = sp.basename(file2);
+        const basename9 = sp.basename(file2);
         const parent = this.fsw._getWatchedDir(dirname10);
         let prevStats = stats;
-        if (parent.has(basename10))
+        if (parent.has(basename9))
           return;
         const listener = async (path28, newStats) => {
           if (!this.fsw._throttle(THROTTLE_MODE_WATCH, file2, 5))
@@ -34772,9 +34212,9 @@ var init_handler2 = __esm({
                 prevStats = newStats2;
               }
             } catch (error48) {
-              this.fsw._remove(dirname10, basename10);
+              this.fsw._remove(dirname10, basename9);
             }
-          } else if (parent.has(basename10)) {
+          } else if (parent.has(basename9)) {
             const at = newStats.atimeMs;
             const mt = newStats.mtimeMs;
             if (!at || at <= mt || mt !== prevStats.mtimeMs) {
@@ -35787,6 +35227,7 @@ function validateProviderDefinition(raw) {
     warnings.push("Extension providers should have extensionId");
   }
   validateCapabilities(provider, controls, errors);
+  validateCanonicalHistory(provider.canonicalHistory, errors);
   for (const control of controls) {
     validateControl(control, errors);
   }
@@ -35844,6 +35285,39 @@ function validateCapabilities(provider, controls, errors) {
     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");
@@ -39129,7 +38603,8 @@ var init_router = __esm({
               canonicalHistory: providerMeta?.canonicalHistory,
               offset,
               limit,
-              historyBehavior: providerMeta?.historyBehavior
+              historyBehavior: providerMeta?.historyBehavior,
+              scripts: providerMeta?.scripts
             });
             const state = loadState();
             const savedSessions = getSavedProviderSessions(state, { providerType, kind });
@@ -39155,7 +38630,10 @@ var init_router = __esm({
                   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,
@@ -47844,6 +47322,7 @@ var init_server_connection = __esm({
       iceServers = null;
       planLimits = null;
       compatBlocked = false;
+      fatalAuthRejectedReason = null;
       get authTimeoutMs() {
         return Math.max(1, this.options.authTimeoutMs ?? 15e3);
       }
@@ -47960,6 +47439,7 @@ var init_server_connection = __esm({
             this.clearAuthTimeout();
             this.reconnectAttempts = 0;
             this.compatBlocked = false;
+            this.fatalAuthRejectedReason = null;
             const payload = message.payload;
             this.userPlan = payload.plan || "free";
             this.iceServers = payload.iceServers || null;
@@ -47973,8 +47453,20 @@ var init_server_connection = __esm({
             this.startHeartbeat();
           } else if (message.type === "auth_error") {
             this.clearAuthTimeout();
-            LOG.error("Server", `Auth failed: ${message.payload.reason}`);
+            const payload = message.payload;
+            const reason = String(payload.reason || "Authentication failed");
+            this.fatalAuthRejectedReason = reason;
+            LOG.error("Server", `Auth failed: ${reason}`);
+            if (reason === "machine_limit_exceeded") {
+              LOG.error("Server", `[ServerConn] ${payload.message || "Machine limit exceeded. Remove an unused machine in the dashboard or upgrade your plan."}`);
+            } else {
+              LOG.error("Server", `[ServerConn] Saved machine credentials were rejected. Run 'adhdev setup --force' to re-authenticate, then restart the daemon.`);
+            }
             this.setState("error");
+            try {
+              this.ws?.close(1e3, "Authentication rejected");
+            } catch {
+            }
             return;
           } else if (message.type === "version_mismatch") {
             const p = message.payload;
@@ -48007,6 +47499,18 @@ var init_server_connection = __esm({
         LOG.info("Server", `[ServerConn] WebSocket closed: ${code} ${reason}`);
         this.clearTimers();
         this.ws = null;
+        if (code === 4001 || this.fatalAuthRejectedReason) {
+          const authReason = this.fatalAuthRejectedReason;
+          const reasonText = authReason ? `: ${authReason}` : "";
+          LOG.error("Server", `[ServerConn] Authentication rejected${reasonText}. Not reconnecting with the same credentials.`);
+          if (authReason === "machine_limit_exceeded") {
+            LOG.error("Server", `[ServerConn] Remove an unused machine in the dashboard or upgrade your plan, then restart the daemon.`);
+          } else {
+            LOG.error("Server", `[ServerConn] Run 'adhdev setup --force', then 'adhdev daemon:restart'.`);
+          }
+          this.setState("disconnected");
+          return;
+        }
         if (code === 4011) {
           LOG.info("Server", `[ServerConn] \u26A0 Evicted by another machine. Not reconnecting.`);
           LOG.info("Server", `[ServerConn] This connection was released because another machine connected.`);
@@ -57410,7 +56914,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.45" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.46" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;