adhdev 0.8.98 → 0.8.100

package/dist/cli/index.js

@@ -1259,6 +1259,9 @@ function normalizeProviderSessionId(providerType, providerSessionId) {
   if (normalizedProviderType === "hermes-cli" && !HERMES_SESSION_ID_RE.test(normalizedId)) {
     return "";
   }
+  if (normalizedProviderType === "claude-cli" && !CLAUDE_SESSION_ID_RE.test(normalizedId)) {
+    return "";
+  }
   return normalizedId;
 }
 function isLegacyVolatileSessionReadKey(key) {
@@ -1266,11 +1269,12 @@ function isLegacyVolatileSessionReadKey(key) {
   if (!normalizedKey) return false;
   return normalizedKey.startsWith("provider:codex:vscode-webview://");
 }
-var HERMES_SESSION_ID_RE;
+var HERMES_SESSION_ID_RE, CLAUDE_SESSION_ID_RE;
 var init_provider_session_id = __esm({
   "../../oss/packages/daemon-core/src/providers/provider-session-id.ts"() {
     "use strict";
     HERMES_SESSION_ID_RE = /^\d{8}_\d{6}_[a-z0-9]+$/i;
+    CLAUDE_SESSION_ID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
   }
 });
 
@@ -4677,9 +4681,16 @@ function extractCanonicalHermesMessageTimestamp(message, fallbackTs) {
   if (Number.isFinite(stringTimestamp) && stringTimestamp > 0) return stringTimestamp;
   return fallbackTs;
 }
-function readExistingHermesSessionStartRecord(historySessionId) {
+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, "hermes-cli");
+    const dir = path7.join(HISTORY_DIR, agentType);
     if (!fs3.existsSync(dir)) return null;
     const files = listHistoryFiles(dir, historySessionId).sort();
     for (const file2 of files) {
@@ -4700,6 +4711,28 @@ function readExistingHermesSessionStartRecord(historySessionId) {
     return null;
   }
 }
+function rewriteCanonicalSavedHistory(agentType, historySessionId, records) {
+  if (records.length === 0) return false;
+  try {
+    const dir = path7.join(HISTORY_DIR, agentType);
+    fs3.mkdirSync(dir, { recursive: true });
+    const prefix = `${historySessionId.replace(/[^a-zA-Z0-9_-]/g, "_")}_`;
+    for (const file2 of fs3.readdirSync(dir)) {
+      if (file2.startsWith(prefix) && file2.endsWith(".jsonl")) {
+        fs3.unlinkSync(path7.join(dir, file2));
+      }
+    }
+    const targetDate = new Date(records[records.length - 1].receivedAt || Date.now()).toISOString().slice(0, 10);
+    const filePath = path7.join(dir, `${prefix}${targetDate}.jsonl`);
+    fs3.writeFileSync(filePath, `${records.map((record2) => JSON.stringify(record2)).join("\n")}
+`, "utf-8");
+    invalidatePersistedSavedHistoryIndex(agentType, dir);
+    savedHistorySessionCache.delete(agentType.replace(/[^a-zA-Z0-9_-]/g, "_"));
+    return true;
+  } catch {
+    return false;
+  }
+}
 function rebuildHermesSavedHistoryFromCanonicalSession(historySessionId) {
   const normalizedSessionId = normalizeSavedHistorySessionId("hermes-cli", historySessionId);
   if (!normalizedSessionId) return false;
@@ -4710,7 +4743,7 @@ function rebuildHermesSavedHistoryFromCanonicalSession(historySessionId) {
     const canonicalMessages = Array.isArray(raw.messages) ? raw.messages : [];
     const dir = path7.join(HISTORY_DIR, "hermes-cli");
     fs3.mkdirSync(dir, { recursive: true });
-    const existingSessionStart = readExistingHermesSessionStartRecord(normalizedSessionId);
+    const existingSessionStart = readExistingSessionStartRecord("hermes-cli", normalizedSessionId);
     const records = [];
     if (existingSessionStart) {
       records.push({
@@ -4762,20 +4795,167 @@ function rebuildHermesSavedHistoryFromCanonicalSession(historySessionId) {
         });
       }
     }
-    if (records.length === 0) return false;
-    const prefix = `${normalizedSessionId.replace(/[^a-zA-Z0-9_-]/g, "_")}_`;
-    for (const file2 of fs3.readdirSync(dir)) {
-      if (file2.startsWith(prefix) && file2.endsWith(".jsonl")) {
-        fs3.unlinkSync(path7.join(dir, file2));
+    return rewriteCanonicalSavedHistory("hermes-cli", normalizedSessionId, records);
+  } catch {
+    return false;
+  }
+}
+function resolveClaudeProjectTranscriptPath(historySessionId, workspace) {
+  const claudeProjectsDir = path7.join(os6.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;
       }
     }
-    const targetDate = new Date(records[records.length - 1].receivedAt || Date.now()).toISOString().slice(0, 10);
-    const filePath = path7.join(dir, `${prefix}${targetDate}.jsonl`);
-    fs3.writeFileSync(filePath, `${records.map((record2) => JSON.stringify(record2)).join("\n")}
-`, "utf-8");
-    invalidatePersistedSavedHistoryIndex("hermes-cli", dir);
-    savedHistorySessionCache.delete("hermes-cli");
-    return true;
+  }
+  return null;
+}
+function extractClaudeAssistantContentParts(content) {
+  if (typeof content === "string") {
+    const trimmed = content.trim();
+    return trimmed ? [{ content: trimmed, kind: "standard", role: "assistant" }] : [];
+  }
+  if (!Array.isArray(content)) return [];
+  const parts = [];
+  for (const block of content) {
+    if (!block || typeof block !== "object") continue;
+    const record2 = block;
+    const type = String(record2.type || "").trim();
+    if (type === "text") {
+      const text = String(record2.text || "").trim();
+      if (text) parts.push({ content: text, kind: "standard", role: "assistant" });
+      continue;
+    }
+    if (type === "tool_use") {
+      const name = String(record2.name || "").trim() || "Tool";
+      const input = record2.input && typeof record2.input === "object" ? record2.input : null;
+      const command = input ? String(input.command || "").trim() : "";
+      const summary = command ? `${name}: ${command}` : name;
+      if (summary) parts.push({ content: summary, kind: "tool", senderName: "Tool", role: "assistant" });
+    }
+  }
+  return parts;
+}
+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 rebuildClaudeSavedHistoryFromNativeProject(historySessionId, workspace) {
+  const normalizedSessionId = normalizeSavedHistorySessionId("claude-cli", 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;
   }
@@ -11372,7 +11552,7 @@ var init_dist = __esm({
       }
     };
     DEFAULT_SESSION_HOST_COLS = 80;
-    DEFAULT_SESSION_HOST_ROWS = 48;
+    DEFAULT_SESSION_HOST_ROWS = 32;
     LIVE_LIFECYCLES2 = /* @__PURE__ */ new Set(["starting", "running", "stopping", "interrupted"]);
     SessionHostRegistry = class {
       sessions = /* @__PURE__ */ new Map();
@@ -14657,7 +14837,7 @@ var init_cli_provider_instance = __esm({
           parsedMessages = historyMessageCount > 0 ? parsedMessages.slice(-historyMessageCount) : [];
         }
         const mergedMessages = this.mergeConversationMessages(parsedMessages);
-        const canonicalHermesBackedHistory = this.syncCanonicalHermesSavedHistoryIfNeeded();
+        const canonicalBackedHistory = this.syncCanonicalSavedHistoryIfNeeded();
         const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
         if (parsedMessages.length > 0) {
           const shouldSkipReplayPersist = this.suppressIdleHistoryReplay && adapterStatus.status === "idle" && parsedStatus?.status === "idle";
@@ -14675,7 +14855,7 @@ var init_cli_provider_instance = __esm({
             senderName: typeof message.senderName === "string" ? message.senderName : void 0,
             receivedAt: typeof message.receivedAt === "number" ? message.receivedAt : message.timestamp
           }));
-          if (!canonicalHermesBackedHistory && !shouldSkipReplayPersist && normalizedMessagesToSave.length > 0) {
+          if (!canonicalBackedHistory && !shouldSkipReplayPersist && normalizedMessagesToSave.length > 0) {
             const incrementalMessages = buildIncrementalHistoryAppendMessages(this.lastPersistedHistoryMessages, normalizedMessagesToSave);
             this.historyWriter.appendNewMessages(
               this.type,
@@ -14685,7 +14865,7 @@ var init_cli_provider_instance = __esm({
               this.providerSessionId
             );
           }
-          if (!canonicalHermesBackedHistory) {
+          if (!canonicalBackedHistory) {
             this.lastPersistedHistoryMessages = normalizedMessagesToSave;
           }
         }
@@ -15040,7 +15220,14 @@ ${effect.notification.body || ""}`.trim();
         return this.provider.name;
       }
       shouldAutoApprove() {
-        return this.settings.autoApprove !== false;
+        if (typeof this.settings.autoApprove === "boolean") {
+          return this.settings.autoApprove;
+        }
+        const providerDefault = this.provider.settings?.autoApprove?.default;
+        if (typeof providerDefault === "boolean") {
+          return providerDefault;
+        }
+        return false;
       }
       recordAutoApproval(modalMessage, buttonLabel, now = Date.now()) {
         this.appendRuntimeSystemMessage(
@@ -15162,32 +15349,52 @@ ${effect.notification.body || ""}`.trim();
         });
         LOG.info("CLI", `[${this.type}] discovered provider session id: ${nextSessionId}`);
       }
-      syncCanonicalHermesSavedHistoryIfNeeded() {
-        if (this.type !== "hermes-cli" || !this.providerSessionId) return false;
-        try {
-          const canonicalPath = path12.join(os14.homedir(), ".hermes", "sessions", `session_${this.providerSessionId}.json`);
-          if (!fs5.existsSync(canonicalPath)) return false;
-          const stat4 = fs5.statSync(canonicalPath);
-          if (stat4.mtimeMs <= this.lastCanonicalHermesSyncMtimeMs) return true;
-          const rebuilt = rebuildHermesSavedHistoryFromCanonicalSession(this.providerSessionId);
-          if (!rebuilt) return false;
-          this.lastCanonicalHermesSyncMtimeMs = stat4.mtimeMs;
-          const restoredHistory = readChatHistory(this.type, 0, Number.MAX_SAFE_INTEGER, this.providerSessionId);
-          this.lastPersistedHistoryMessages = restoredHistory.messages.map((message) => ({
-            role: message.role,
-            content: message.content,
-            kind: message.kind,
-            senderName: message.senderName,
-            receivedAt: message.receivedAt
-          }));
-          return true;
-        } catch {
-          return false;
+      syncCanonicalSavedHistoryIfNeeded() {
+        if (!this.providerSessionId) return false;
+        if (this.type === "hermes-cli") {
+          try {
+            const canonicalPath = path12.join(os14.homedir(), ".hermes", "sessions", `session_${this.providerSessionId}.json`);
+            if (!fs5.existsSync(canonicalPath)) return false;
+            const stat4 = fs5.statSync(canonicalPath);
+            if (stat4.mtimeMs <= this.lastCanonicalHermesSyncMtimeMs) return true;
+            const rebuilt = rebuildHermesSavedHistoryFromCanonicalSession(this.providerSessionId);
+            if (!rebuilt) return false;
+            this.lastCanonicalHermesSyncMtimeMs = stat4.mtimeMs;
+            const restoredHistory = readChatHistory(this.type, 0, Number.MAX_SAFE_INTEGER, this.providerSessionId);
+            this.lastPersistedHistoryMessages = restoredHistory.messages.map((message) => ({
+              role: message.role,
+              content: message.content,
+              kind: message.kind,
+              senderName: message.senderName,
+              receivedAt: message.receivedAt
+            }));
+            return true;
+          } catch {
+            return false;
+          }
         }
+        if (this.type === "claude-cli") {
+          try {
+            const rebuilt = rebuildClaudeSavedHistoryFromNativeProject(this.providerSessionId, this.workingDir);
+            if (!rebuilt) return false;
+            const restoredHistory = readChatHistory(this.type, 0, Number.MAX_SAFE_INTEGER, this.providerSessionId);
+            this.lastPersistedHistoryMessages = restoredHistory.messages.map((message) => ({
+              role: message.role,
+              content: message.content,
+              kind: message.kind,
+              senderName: message.senderName,
+              receivedAt: message.receivedAt
+            }));
+            return true;
+          } catch {
+            return false;
+          }
+        }
+        return false;
       }
       restorePersistedHistoryFromCurrentSession() {
         if (!this.providerSessionId) return;
-        this.syncCanonicalHermesSavedHistoryIfNeeded();
+        this.syncCanonicalSavedHistoryIfNeeded();
         this.historyWriter.compactHistorySession(this.type, this.providerSessionId);
         const restoredHistory = readChatHistory(this.type, 0, Number.MAX_SAFE_INTEGER, this.providerSessionId);
         this.historyWriter.seedSessionHistory(
@@ -38921,9 +39128,12 @@ function prepareSessionChatTailUpdate(input) {
 }
 function prepareSessionModalUpdate(input) {
   const { modalMessage, modalButtons } = normalizeSessionModalFields(input.activeModal);
+  const status = normalizeManagedStatus(input.status, {
+    activeModal: modalButtons.length > 0 ? { buttons: modalButtons } : null
+  });
   const deliverySignature = buildSessionModalDeliverySignature({
     sessionId: input.sessionId,
-    status: input.status,
+    status,
     ...input.title ? { title: input.title } : {},
     ...modalMessage ? { modalMessage } : {},
     ...modalButtons.length > 0 ? { modalButtons } : {}
@@ -38943,7 +39153,7 @@ function prepareSessionModalUpdate(input) {
       topic: "session.modal",
       key: input.key,
       sessionId: input.sessionId,
-      status: input.status,
+      status,
       ...input.title ? { title: input.title } : {},
       ...modalMessage ? { modalMessage } : {},
       ...modalButtons.length > 0 ? { modalButtons } : {},
@@ -38957,6 +39167,7 @@ var init_subscription_updates = __esm({
   "../../oss/packages/daemon-core/src/chat/subscription-updates.ts"() {
     "use strict";
     init_chat_signatures();
+    init_normalize();
   }
 });
 
@@ -86850,7 +87061,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.98" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.100" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;