@adhdev/daemon-standalone 0.8.73 → 0.8.74

package/dist/index.js

@@ -30851,6 +30851,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) {
@@ -30858,7 +30860,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() || "";
@@ -30870,7 +30874,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() || "");
@@ -33863,6 +33867,7 @@ ${cleanBody}`;
     init_chat_message_normalization();
     var HISTORY_DIR = path7.join(os52.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();
@@ -33920,6 +33925,85 @@ ${cleanBody}`;
         content
       };
     }
+    function sanitizeHistoryFileSegment(value) {
+      return String(value || "").replace(/[^a-zA-Z0-9_-]/g, "_");
+    }
+    function listHistoryFiles(dir, historySessionId) {
+      const sanitizedSessionId = historySessionId ? sanitizeHistoryFileSegment(historySessionId) : "";
+      return fs32.readdirSync(dir).filter((file2) => {
+        if (!file2.endsWith(".jsonl")) return false;
+        if (sanitizedSessionId) {
+          return file2.startsWith(`${sanitizedSessionId}_`);
+        }
+        return true;
+      }).sort().reverse();
+    }
+    function buildSavedHistoryCacheSignature(dir, files) {
+      return files.map((file2) => {
+        try {
+          const stat4 = fs32.statSync(path7.join(dir, file2));
+          return `${file2}:${stat4.size}:${Math.trunc(stat4.mtimeMs)}`;
+        } catch {
+          return `${file2}: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 file2 of files) {
+        const match = file2.match(filePattern);
+        if (!match?.[1]) continue;
+        const historySessionId = match[1];
+        const grouped = groupedFiles.get(historySessionId) || [];
+        grouped.push(file2);
+        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 file2 of grouped.sort()) {
+          const filePath = path7.join(dir, file2);
+          const content = fs32.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, b2) => b2.lastMessageAt - a.lastMessageAt);
+      return summaries;
+    }
     var ChatHistoryWriter = class {
       /** Last seen message count per agent (deduplication) */
       lastSeenCounts = /* @__PURE__ */ new Map();
@@ -34248,19 +34332,12 @@ ${cleanBody}`;
         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 (!fs32.existsSync(dir)) return { messages: [], hasMore: false };
-        const sanitizedInstance = historySessionId?.replace(/[^a-zA-Z0-9_-]/g, "_");
-        const files = fs32.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 file2 of files) {
@@ -34291,8 +34368,13 @@ ${cleanBody}`;
           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 };
@@ -34302,61 +34384,20 @@ ${cleanBody}`;
       try {
         const sanitized = agentType.replace(/[^a-zA-Z0-9_-]/g, "_");
         const dir = path7.join(HISTORY_DIR, sanitized);
-        if (!fs32.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 file2 of fs32.readdirSync(dir)) {
-          if (!file2.endsWith(".jsonl")) continue;
-          const match = file2.match(filePattern);
-          if (!match?.[1]) continue;
-          const historySessionId = match[1];
-          const files = groupedFiles.get(historySessionId) || [];
-          files.push(file2);
-          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 file2 of files.sort()) {
-            const filePath = path7.join(dir, file2);
-            const content = fs32.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 (!fs32.existsSync(dir)) {
+          savedHistorySessionCache.delete(sanitized);
+          return { sessions: [], hasMore: false };
+        }
+        const files = listHistoryFiles(dir);
+        const signature = buildSavedHistoryCacheSignature(dir, files);
+        const cached2 = savedHistorySessionCache.get(sanitized);
+        const summaries = cached2?.signature === signature ? cached2.summaries : computeSavedHistorySessionSummaries(agentType, dir, files);
+        if (!cached2 || cached2.signature !== signature) {
+          savedHistorySessionCache.set(sanitized, {
+            signature,
+            summaries
           });
         }
-        summaries.sort((a, b2) => b2.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);
@@ -34845,22 +34886,22 @@ ${effect.notification.body || ""}`.trim();
     init_logger();
     init_read_chat_contract();
     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) : [];
@@ -36606,6 +36647,41 @@ ${effect.notification.body || ""}`.trim();
       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}`;
@@ -36681,14 +36757,38 @@ ${effect.notification.body || ""}`.trim();
         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 (error48) {
         return { success: false, error: error48?.message || String(error48) };
       }
-      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);
@@ -36770,7 +36870,15 @@ ${effect.notification.body || ""}`.trim();
       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 };
@@ -38020,13 +38128,6 @@ ${effect.notification.body || ""}`.trim();
       return { type: command.type, text };
     }
     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 };
@@ -38099,9 +38200,6 @@ ${effect.notification.body || ""}`.trim();
     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"}` };
@@ -38109,24 +38207,10 @@ ${effect.notification.body || ""}`.trim();
       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;
@@ -38213,15 +38297,45 @@ ${effect.notification.body || ""}`.trim();
     }
     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 {};
     }
@@ -38296,7 +38410,7 @@ ${effect.notification.body || ""}`.trim();
           }
           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 {
@@ -50440,6 +50554,20 @@ data: ${JSON.stringify(msg.data)}
       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,
@@ -50450,7 +50578,7 @@ data: ${JSON.stringify(msg.data)}
               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 });
         }