@adhdev/daemon-core 0.8.72 → 0.8.74

package/dist/index.mjs

@@ -3003,6 +3003,8 @@ ${data.message || ""}`.trim();
       }
       async sendMessage(text) {
         if (!this.ptyProcess) throw new Error(`${this.cliName} is not running`);
+        const allowInputDuringGeneration = this.provider.allowInputDuringGeneration === true;
+        const allowInterventionPrompt = allowInputDuringGeneration && this.isWaitingForResponse && this.currentStatus !== "waiting_approval";
         if (this.startupParseGate) {
           const deadline = Date.now() + 1e4;
           while (this.startupParseGate && Date.now() < deadline) {
@@ -3010,7 +3012,9 @@ ${data.message || ""}`.trim();
             await new Promise((resolve11) => setTimeout(resolve11, 50));
           }
         }
-        await this.waitForInteractivePrompt();
+        if (!allowInterventionPrompt) {
+          await this.waitForInteractivePrompt();
+        }
         if (!this.ready) {
           this.resolveStartupState("send_precheck");
           const screenText = this.terminalScreen.getText() || "";
@@ -3022,7 +3026,7 @@ ${data.message || ""}`.trim();
           }
         }
         if (!this.ready) throw new Error(`${this.cliName} not ready (status: ${this.currentStatus})`);
-        if (this.isWaitingForResponse) {
+        if (this.isWaitingForResponse && !allowInputDuringGeneration) {
           throw new Error(`${this.cliName} is still processing the previous prompt`);
         }
         const blockingModal = this.activeModal || this.getStartupConfirmationModal(this.terminalScreen.getText() || "");
@@ -5921,6 +5925,7 @@ import * as path7 from "path";
 import * as os5 from "os";
 var HISTORY_DIR = path7.join(os5.homedir(), ".adhdev", "history");
 var RETAIN_DAYS = 30;
+var savedHistorySessionCache = /* @__PURE__ */ new Map();
 var CODEX_STARTER_PROMPT_RE = /^(?:[›❯]\s*)?(?:Find and fix a bug in @filename|Improve documentation in @filename|Write tests for @filename|Explain this codebase|Summarize recent commits|Implement \{feature\}|Use \/skills(?: to list available skills)?|Run \/review on my current changes)$/i;
 function normalizeHistoryComparable(text) {
   return String(text || "").replace(/\s+/g, " ").trim();
@@ -5978,6 +5983,85 @@ function sanitizeHistoryMessage(agentType, message) {
     content
   };
 }
+function sanitizeHistoryFileSegment(value) {
+  return String(value || "").replace(/[^a-zA-Z0-9_-]/g, "_");
+}
+function listHistoryFiles(dir, historySessionId) {
+  const sanitizedSessionId = historySessionId ? sanitizeHistoryFileSegment(historySessionId) : "";
+  return fs3.readdirSync(dir).filter((file) => {
+    if (!file.endsWith(".jsonl")) return false;
+    if (sanitizedSessionId) {
+      return file.startsWith(`${sanitizedSessionId}_`);
+    }
+    return true;
+  }).sort().reverse();
+}
+function buildSavedHistoryCacheSignature(dir, files) {
+  return files.map((file) => {
+    try {
+      const stat = fs3.statSync(path7.join(dir, file));
+      return `${file}:${stat.size}:${Math.trunc(stat.mtimeMs)}`;
+    } catch {
+      return `${file}:missing`;
+    }
+  }).join("|");
+}
+function computeSavedHistorySessionSummaries(agentType, dir, files) {
+  const groupedFiles = /* @__PURE__ */ new Map();
+  const filePattern = /^([A-Za-z0-9_-]+)_\d{4}-\d{2}-\d{2}\.jsonl$/;
+  for (const file of files) {
+    const match = file.match(filePattern);
+    if (!match?.[1]) continue;
+    const historySessionId = match[1];
+    const grouped = groupedFiles.get(historySessionId) || [];
+    grouped.push(file);
+    groupedFiles.set(historySessionId, grouped);
+  }
+  const summaries = [];
+  for (const [historySessionId, grouped] of groupedFiles.entries()) {
+    let messageCount = 0;
+    let firstMessageAt = 0;
+    let lastMessageAt = 0;
+    let sessionTitle = "";
+    let preview = "";
+    let workspace = "";
+    for (const file of grouped.sort()) {
+      const filePath = path7.join(dir, file);
+      const content = fs3.readFileSync(filePath, "utf-8");
+      const lines = content.split("\n").filter(Boolean);
+      for (const line of lines) {
+        let parsed = null;
+        try {
+          parsed = JSON.parse(line);
+        } catch {
+          parsed = null;
+        }
+        if (!parsed || parsed.historySessionId !== historySessionId) continue;
+        if (parsed.kind === "session_start") {
+          if (!workspace && parsed.workspace) workspace = parsed.workspace;
+          continue;
+        }
+        messageCount += 1;
+        if (!firstMessageAt || parsed.receivedAt < firstMessageAt) firstMessageAt = parsed.receivedAt;
+        if (!lastMessageAt || parsed.receivedAt > lastMessageAt) lastMessageAt = parsed.receivedAt;
+        if (parsed.sessionTitle) sessionTitle = parsed.sessionTitle;
+        if (parsed.role !== "system" && parsed.content.trim()) preview = parsed.content.trim();
+      }
+    }
+    if (messageCount === 0 || !lastMessageAt) continue;
+    summaries.push({
+      historySessionId,
+      sessionTitle: sessionTitle || void 0,
+      messageCount,
+      firstMessageAt,
+      lastMessageAt,
+      preview: preview || void 0,
+      workspace: workspace || void 0
+    });
+  }
+  summaries.sort((a, b) => b.lastMessageAt - a.lastMessageAt);
+  return summaries;
+}
 var ChatHistoryWriter = class {
   /** Last seen message count per agent (deduplication) */
   lastSeenCounts = /* @__PURE__ */ new Map();
@@ -6306,19 +6390,12 @@ var ChatHistoryWriter = class {
     return name.replace(/[^a-zA-Z0-9_-]/g, "_");
   }
 };
-function readChatHistory(agentType, offset = 0, limit = 30, historySessionId) {
+function readChatHistory(agentType, offset = 0, limit = 30, historySessionId, excludeRecentCount = 0) {
   try {
     const sanitized = agentType.replace(/[^a-zA-Z0-9_-]/g, "_");
     const dir = path7.join(HISTORY_DIR, sanitized);
     if (!fs3.existsSync(dir)) return { messages: [], hasMore: false };
-    const sanitizedInstance = historySessionId?.replace(/[^a-zA-Z0-9_-]/g, "_");
-    const files = fs3.readdirSync(dir).filter((f) => {
-      if (!f.endsWith(".jsonl")) return false;
-      if (sanitizedInstance) {
-        return f.startsWith(`${sanitizedInstance}_`);
-      }
-      return true;
-    }).sort().reverse();
+    const files = listHistoryFiles(dir, historySessionId);
     const allMessages = [];
     const seen = /* @__PURE__ */ new Set();
     for (const file of files) {
@@ -6349,8 +6426,13 @@ function readChatHistory(agentType, offset = 0, limit = 30, historySessionId) {
       if (message.role !== "system") lastTurn = message;
     }
     const collapsed = collapseReplayAssistantTurns(agentType, chronological);
-    const sliced = collapsed.slice(offset, offset + limit);
-    const hasMore = collapsed.length > offset + limit;
+    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 };
   } catch {
     return { messages: [], hasMore: false };
@@ -6360,61 +6442,20 @@ function listSavedHistorySessions(agentType, options = {}) {
   try {
     const sanitized = agentType.replace(/[^a-zA-Z0-9_-]/g, "_");
     const dir = path7.join(HISTORY_DIR, sanitized);
-    if (!fs3.existsSync(dir)) return { sessions: [], hasMore: false };
-    const groupedFiles = /* @__PURE__ */ new Map();
-    const filePattern = /^([A-Za-z0-9_-]+)_\d{4}-\d{2}-\d{2}\.jsonl$/;
-    for (const file of fs3.readdirSync(dir)) {
-      if (!file.endsWith(".jsonl")) continue;
-      const match = file.match(filePattern);
-      if (!match?.[1]) continue;
-      const historySessionId = match[1];
-      const files = groupedFiles.get(historySessionId) || [];
-      files.push(file);
-      groupedFiles.set(historySessionId, files);
-    }
-    const summaries = [];
-    for (const [historySessionId, files] of groupedFiles.entries()) {
-      let messageCount = 0;
-      let firstMessageAt = 0;
-      let lastMessageAt = 0;
-      let sessionTitle = "";
-      let preview = "";
-      let workspace = "";
-      for (const file of files.sort()) {
-        const filePath = path7.join(dir, file);
-        const content = fs3.readFileSync(filePath, "utf-8");
-        const lines = content.split("\n").filter(Boolean);
-        for (const line of lines) {
-          let parsed = null;
-          try {
-            parsed = JSON.parse(line);
-          } catch {
-            parsed = null;
-          }
-          if (!parsed || parsed.historySessionId !== historySessionId) continue;
-          if (parsed.kind === "session_start") {
-            if (!workspace && parsed.workspace) workspace = parsed.workspace;
-            continue;
-          }
-          messageCount += 1;
-          if (!firstMessageAt || parsed.receivedAt < firstMessageAt) firstMessageAt = parsed.receivedAt;
-          if (!lastMessageAt || parsed.receivedAt > lastMessageAt) lastMessageAt = parsed.receivedAt;
-          if (parsed.sessionTitle) sessionTitle = parsed.sessionTitle;
-          if (parsed.role !== "system" && parsed.content.trim()) preview = parsed.content.trim();
-        }
-      }
-      if (messageCount === 0 || !lastMessageAt) continue;
-      summaries.push({
-        historySessionId,
-        sessionTitle: sessionTitle || void 0,
-        messageCount,
-        firstMessageAt,
-        lastMessageAt,
-        preview: preview || void 0,
-        workspace: workspace || void 0
+    if (!fs3.existsSync(dir)) {
+      savedHistorySessionCache.delete(sanitized);
+      return { sessions: [], hasMore: false };
+    }
+    const files = listHistoryFiles(dir);
+    const signature = buildSavedHistoryCacheSignature(dir, files);
+    const cached = savedHistorySessionCache.get(sanitized);
+    const summaries = cached?.signature === signature ? cached.summaries : computeSavedHistorySessionSummaries(agentType, dir, files);
+    if (!cached || cached.signature !== signature) {
+      savedHistorySessionCache.set(sanitized, {
+        signature,
+        summaries
       });
     }
-    summaries.sort((a, b) => b.lastMessageAt - a.lastMessageAt);
     const offset = Math.max(0, options.offset || 0);
     const limit = Math.max(1, options.limit || 30);
     const sliced = summaries.slice(offset, offset + limit);
@@ -6915,22 +6956,22 @@ init_read_chat_contract();
 
 // src/providers/approval-utils.ts
 var DEFAULT_APPROVAL_POSITIVE_HINTS = [
-  "run",
+  "yes",
+  "allow once",
   "approve",
   "accept",
-  "allow once",
-  "always allow",
-  "allow",
-  "yes",
-  "proceed",
   "continue",
+  "run",
+  "proceed",
   "confirm",
   "save",
   "ok",
-  "trust"
+  "trust",
+  "allow",
+  "always allow"
 ];
 function normalizeApprovalLabel(value) {
-  return String(value || "").toLowerCase().replace(/[^\p{L}\p{N}]+/gu, " ").trim();
+  return String(value || "").toLowerCase().replace(/^[\s\[(<{]*\d+(?:\s*[.)\]}>:-]|\s)+/, "").replace(/[^\p{L}\p{N}]+/gu, " ").trim();
 }
 function getApprovalPositiveHints(provider) {
   const customHints = Array.isArray(provider?.approvalPositiveHints) ? provider.approvalPositiveHints.map((hint) => normalizeApprovalLabel(String(hint || ""))).filter(Boolean) : [];
@@ -8708,6 +8749,41 @@ function normalizeReadChatMessages(payload) {
   const messages = Array.isArray(payload.messages) ? payload.messages : [];
   return normalizeChatMessages(messages);
 }
+function buildReadChatReplayCollapseSignature(message) {
+  if (!message) return "";
+  const role = typeof message.role === "string" ? message.role.trim().toLowerCase() : "";
+  const kind = typeof message.kind === "string" ? message.kind.trim().toLowerCase() : "standard";
+  const senderName = typeof message.senderName === "string" ? message.senderName.trim().toLowerCase() : "";
+  const content = flattenContent(message.content || "").replace(/\s+/g, " ").trim();
+  return `${role}:${kind}:${senderName}:${content}`;
+}
+function shouldCollapseReadChatReplayDuplicate(message) {
+  if (!message) return false;
+  const role = typeof message.role === "string" ? message.role.trim().toLowerCase() : "";
+  if (role !== "assistant" && role !== "system") return false;
+  const kind = typeof message.kind === "string" ? message.kind.trim().toLowerCase() : "standard";
+  return kind === "tool" || kind === "terminal" || kind === "thought" || kind === "system";
+}
+function collapseReplayDuplicatesFromReadChat(messages) {
+  const collapsed = [];
+  let lastReplayTurnSignature = "";
+  for (const message of messages) {
+    const signature = buildReadChatReplayCollapseSignature(message);
+    const previous = collapsed[collapsed.length - 1];
+    const previousSignature = buildReadChatReplayCollapseSignature(previous);
+    if (shouldCollapseReadChatReplayDuplicate(message) && signature) {
+      if (previousSignature === signature) continue;
+      if (lastReplayTurnSignature === signature) continue;
+    }
+    collapsed.push(message);
+    if (shouldCollapseReadChatReplayDuplicate(message) && signature) {
+      lastReplayTurnSignature = signature;
+    } else if ((message.role || "").toLowerCase() === "user") {
+      lastReplayTurnSignature = "";
+    }
+  }
+  return collapsed;
+}
 function deriveHistoryDedupKey(message) {
   const unitKey = typeof message._unitKey === "string" ? message._unitKey.trim() : "";
   if (unitKey) return `read_chat:${unitKey}`;
@@ -8783,14 +8859,38 @@ function computeReadChatSync(messages, cursor) {
     lastMessageSignature
   };
 }
+function hasNonEmptyModalButtons(activeModal) {
+  if (!activeModal || typeof activeModal !== "object") return false;
+  const buttons = activeModal.buttons;
+  return Array.isArray(buttons) && buttons.some((button) => typeof button === "string" && button.trim().length > 0);
+}
+function normalizeReadChatCommandStatus(status, activeModal) {
+  const raw = typeof status === "string" ? status.trim() : "";
+  if (!raw) {
+    return hasNonEmptyModalButtons(activeModal) ? "waiting_approval" : "idle";
+  }
+  switch (raw) {
+    case "starting":
+      return hasNonEmptyModalButtons(activeModal) ? "waiting_approval" : "generating";
+    case "stopped":
+    case "disconnected":
+    case "not_monitored":
+      return "error";
+    default:
+      return raw;
+  }
+}
 function buildReadChatCommandResult(payload, args) {
   let validatedPayload;
   try {
-    validatedPayload = validateReadChatResultPayload(payload, "read_chat command result");
+    validatedPayload = validateReadChatResultPayload({
+      ...payload,
+      status: normalizeReadChatCommandStatus(payload?.status, payload?.activeModal)
+    }, "read_chat command result");
   } catch (error) {
     return { success: false, error: error?.message || String(error) };
   }
-  const messages = normalizeReadChatMessages(validatedPayload);
+  const messages = collapseReplayDuplicatesFromReadChat(normalizeReadChatMessages(validatedPayload));
   const cursor = normalizeReadChatCursor(args);
   if (!cursor.knownMessageCount && !cursor.lastMessageSignature && cursor.tailLimit > 0 && messages.length > cursor.tailLimit) {
     const tailMessages = messages.slice(-cursor.tailLimit);
@@ -8872,7 +8972,15 @@ async function handleChatHistory(h, args) {
   try {
     const provider = h.getProvider(agentType);
     const agentStr = provider?.type || agentType || getCurrentProviderType(h);
-    const result = readChatHistory(agentStr, offset || 0, limit || 30, historySessionId);
+    const transport = getTargetTransport(h, provider);
+    let excludeRecentCount = Math.max(0, Number(args?.excludeRecentCount || 0));
+    if (isCliLikeTransport(transport)) {
+      const adapter = getTargetedCliAdapter(h, args, provider?.type);
+      const status = adapter?.getStatus?.();
+      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);
     return { success: true, ...result, agent: agentStr };
   } catch (e) {
     return { success: false, error: e.message };
@@ -10132,13 +10240,6 @@ function getCliScriptCommand(payload) {
 
 // src/commands/stream-commands.ts
 init_logger();
-function getCliPresentationMode(h, targetSessionId) {
-  if (!targetSessionId) return null;
-  const instance = h.ctx.instanceManager?.getInstance(targetSessionId);
-  if (instance?.category !== "cli") return null;
-  const mode = instance.getPresentationMode?.();
-  return mode === "chat" || mode === "terminal" ? mode : null;
-}
 function normalizeOpenPanelCommandResult(result) {
   const payload = Object.prototype.hasOwnProperty.call(result, "result") ? result.result : result;
   if (payload === true) return { opened: true, visible: true, focused: false };
@@ -10211,9 +10312,6 @@ async function handleOpenPanel(h, args) {
 function handlePtyInput(h, args) {
   const { cliType, data, targetSessionId } = args || {};
   if (!data) return { success: false, error: "data required" };
-  if (getCliPresentationMode(h, targetSessionId) === "chat") {
-    return { success: false, error: "CLI session is in chat mode", code: "CLI_VIEW_MODE_NOT_TERMINAL" };
-  }
   const adapter = h.getCliAdapter(targetSessionId || cliType);
   if (!adapter || typeof adapter.writeRaw !== "function") {
     return { success: false, error: `CLI adapter not found: ${targetSessionId || cliType || "unknown"}` };
@@ -10221,24 +10319,10 @@ function handlePtyInput(h, args) {
   adapter.writeRaw(data);
   return { success: true };
 }
-function handlePtyResize(h, args) {
-  const { cliType, cols, rows, force, targetSessionId } = args || {};
+function handlePtyResize(_h, args) {
+  const { cols, rows } = args || {};
   if (!cols || !rows) return { success: false, error: "cols and rows required" };
-  if (getCliPresentationMode(h, targetSessionId) === "chat") {
-    return { success: false, error: "CLI session is in chat mode", code: "CLI_VIEW_MODE_NOT_TERMINAL" };
-  }
-  const adapter = h.getCliAdapter(targetSessionId || cliType);
-  if (!adapter || typeof adapter.resize !== "function") {
-    return { success: false, error: `CLI adapter not found: ${targetSessionId || cliType || "unknown"}` };
-  }
-  const resize = adapter.resize;
-  if (force) {
-    resize(cols - 1, rows);
-    setTimeout(() => resize(cols, rows), 50);
-  } else {
-    resize(cols, rows);
-  }
-  return { success: true };
+  return { success: false, error: "PTY resize temporarily disabled", code: "PTY_RESIZE_DISABLED" };
 }
 function handleGetProviderSettings(h, args) {
   const loader = h.ctx.providerLoader;
@@ -10325,15 +10409,45 @@ function normalizeProviderScriptArgs(args, scriptName) {
 }
 function buildControlScriptResult(scriptName, payload) {
   if (!payload || typeof payload !== "object") return {};
-  if (Array.isArray(payload.options)) {
-    return { controlResult: normalizeControlListResult(payload) };
+  const legacyListPayload = (() => {
+    if (Array.isArray(payload.options)) return payload;
+    if (/^listmodels$/i.test(scriptName) && Array.isArray(payload.models)) {
+      return {
+        options: payload.models,
+        currentValue: payload.currentValue ?? payload.current ?? payload.currentModel,
+        ...typeof payload.error === "string" ? { error: payload.error } : {}
+      };
+    }
+    if (/^listmodes$/i.test(scriptName) && Array.isArray(payload.modes)) {
+      return {
+        options: payload.modes,
+        currentValue: payload.currentValue ?? payload.current ?? payload.currentMode ?? payload.mode,
+        ...typeof payload.error === "string" ? { error: payload.error } : {}
+      };
+    }
+    return null;
+  })();
+  if (legacyListPayload) {
+    return { controlResult: normalizeControlListResult(legacyListPayload) };
   }
-  const looksLikeValueMutation = /^set|^change/i.test(scriptName) || payload.currentValue !== void 0 || payload.value !== void 0;
+  const legacyMutationPayload = (() => {
+    if (typeof payload.ok === "boolean") return payload;
+    if (typeof payload.success === "boolean") {
+      return {
+        ok: payload.success,
+        currentValue: payload.currentValue ?? payload.value ?? payload.model ?? payload.mode ?? payload.selectedModel ?? payload.selectedMode,
+        ...Array.isArray(payload.effects) ? { effects: payload.effects } : {},
+        ...typeof payload.error === "string" ? { error: payload.error } : {}
+      };
+    }
+    return null;
+  })();
+  const looksLikeValueMutation = /^set|^change/i.test(scriptName) || payload.currentValue !== void 0 || payload.value !== void 0 || payload.success !== void 0;
   if (looksLikeValueMutation) {
-    return { controlResult: normalizeControlSetResult(payload) };
+    return { controlResult: normalizeControlSetResult(legacyMutationPayload || payload) };
   }
   if (payload.ok !== void 0 || Array.isArray(payload.effects) || typeof payload.error === "string") {
-    return { controlResult: normalizeControlInvokeResult(payload) };
+    return { controlResult: normalizeControlInvokeResult(legacyMutationPayload || payload) };
   }
   return {};
 }
@@ -10408,7 +10522,7 @@ async function executeProviderScript(h, args, scriptName) {
       }
       const managed = runtimeSessionId ? h.agentStream?.getManagedSession(runtimeSessionId) : null;
       const targetSessionId = managed?.cdpSessionId || null;
-      const IDE_LEVEL_SCRIPTS = provider.type === "claude-code-vscode" ? ["listModes", "setMode"] : ["listModes", "setMode", "listModels", "setModel"];
+      const IDE_LEVEL_SCRIPTS = provider.type === "claude-code-vscode" ? ["listModes", "setMode", "listModels", "setModel", "setModelGui"] : ["listModes", "setMode", "listModels", "setModel"];
       if (IDE_LEVEL_SCRIPTS.includes(scriptName)) {
         if (targetSessionId) {
           try {
@@ -22633,6 +22747,20 @@ var DevServer = class _DevServer {
   async handleReload(_req, res) {
     try {
       this.providerLoader.reload();
+      let refreshedInstances = 0;
+      if (this.instanceManager) {
+        for (const id of this.instanceManager.listInstanceIds()) {
+          const instance = this.instanceManager.getInstance(id);
+          const providerType = typeof instance?.type === "string" ? instance.type : "";
+          if (!providerType) continue;
+          const resolved = this.providerLoader.resolve(providerType);
+          if (!resolved) continue;
+          if (instance && typeof instance === "object" && "provider" in instance) {
+            instance.provider = resolved;
+            refreshedInstances += 1;
+          }
+        }
+      }
       const providers = this.providerLoader.getAll().map((p) => ({
         type: p.type,
         name: p.name,
@@ -22643,7 +22771,7 @@ var DevServer = class _DevServer {
           cdp.clearTargetId();
         }
       }
-      this.json(res, 200, { reloaded: true, providers });
+      this.json(res, 200, { reloaded: true, refreshedInstances, providers });
     } catch (e) {
       this.json(res, 500, { error: e.message });
     }