adhdev 0.8.28 → 0.8.30

package/dist/cli/index.js

@@ -649,17 +649,17 @@ function checkPathExists(paths) {
   return null;
 }
 async function detectIDEs(providerLoader) {
-  const os24 = (0, import_os2.platform)();
+  const os25 = (0, import_os2.platform)();
   const results = [];
   for (const def of getMergedDefinitions()) {
     const cliPath = findCliCommand(providerLoader?.getIdeCliCommand(def.id, def.cli) || def.cli);
-    const appPath = checkPathExists(providerLoader?.getIdePathCandidates(def.id, def.paths[os24] || []) || []);
+    const appPath = checkPathExists(providerLoader?.getIdePathCandidates(def.id, def.paths[os25] || []) || []);
     let resolvedCli = cliPath;
-    if (!resolvedCli && appPath && os24 === "darwin") {
+    if (!resolvedCli && appPath && os25 === "darwin") {
       const bundledCli = `${appPath}/Contents/Resources/app/bin/${def.cli}`;
       if ((0, import_fs3.existsSync)(bundledCli)) resolvedCli = bundledCli;
     }
-    if (!resolvedCli && appPath && os24 === "win32") {
+    if (!resolvedCli && appPath && os25 === "win32") {
       const { dirname: dirname9 } = await import("path");
       const appDir = dirname9(appPath);
       const candidates = [
@@ -676,7 +676,7 @@ async function detectIDEs(providerLoader) {
         }
       }
     }
-    const installed = os24 === "darwin" ? !!(resolvedCli || appPath) : !!resolvedCli;
+    const installed = os25 === "darwin" ? !!(resolvedCli || appPath) : !!resolvedCli;
     const version2 = resolvedCli ? getIdeVersion(resolvedCli) : null;
     results.push({
       id: def.id,
@@ -2595,6 +2595,62 @@ var init_control_effects = __esm({
 });
 
 // ../../oss/packages/daemon-core/src/config/chat-history.ts
+function normalizeHistoryComparable(text) {
+  return String(text || "").replace(/\s+/g, " ").trim();
+}
+function cleanupHistoryContent(agentType, role, content) {
+  let value = String(content || "").replace(/\r\n/g, "\n").trim();
+  if (!value) return "";
+  if (agentType === "codex-cli" && role === "assistant") {
+    const filtered = value.split("\n").filter((line) => !CODEX_STARTER_PROMPT_RE.test(line.trim())).join("\n").replace(/\n{3,}/g, "\n\n").trim();
+    value = filtered;
+  }
+  return value;
+}
+function buildHistoryMessageHash(agentType, message) {
+  if (message.historyDedupKey) return message.historyDedupKey;
+  const cleaned = cleanupHistoryContent(agentType, message.role, message.content);
+  return `${message.kind || "standard"}:${message.role}:${message.receivedAt || 0}:${normalizeHistoryComparable(cleaned)}`;
+}
+function buildHistoryMessageSignature(agentType, message) {
+  const cleaned = cleanupHistoryContent(agentType, message.role, message.content);
+  return `${message.kind || "standard"}:${message.role}:${normalizeHistoryComparable(cleaned)}`;
+}
+function isAdjacentHistoryDuplicate(agentType, previous, next) {
+  if (!previous || !next) return false;
+  return buildHistoryMessageSignature(agentType, previous) === buildHistoryMessageSignature(agentType, next);
+}
+function collapseReplayAssistantTurns(agentType, messages) {
+  if (agentType !== "codex-cli") return messages;
+  const collapsed = [];
+  let sawAssistantSinceLastUser = false;
+  for (const message of messages) {
+    if (message.role === "user") {
+      sawAssistantSinceLastUser = false;
+      collapsed.push(message);
+      continue;
+    }
+    if (message.role === "assistant") {
+      if (sawAssistantSinceLastUser) continue;
+      sawAssistantSinceLastUser = true;
+      collapsed.push(message);
+      continue;
+    }
+    collapsed.push(message);
+  }
+  return collapsed;
+}
+function sanitizeHistoryMessage(agentType, message) {
+  if (!message || message.role !== "user" && message.role !== "assistant" && message.role !== "system") {
+    return null;
+  }
+  const content = cleanupHistoryContent(agentType, message.role, message.content);
+  if (!content) return null;
+  return {
+    ...message,
+    content
+  };
+}
 function readChatHistory(agentType, offset = 0, limit = 30, historySessionId) {
   try {
     const sanitized = agentType.replace(/[^a-zA-Z0-9_-]/g, "_");
@@ -2609,23 +2665,37 @@ function readChatHistory(agentType, offset = 0, limit = 30, historySessionId) {
       return true;
     }).sort().reverse();
     const allMessages = [];
-    const needed = offset + limit + 1;
+    const seen = /* @__PURE__ */ new Set();
     for (const file2 of files) {
-      if (allMessages.length >= needed) break;
       const filePath = path7.join(dir, file2);
       const content = fs3.readFileSync(filePath, "utf-8");
       const lines = content.trim().split("\n").filter(Boolean);
-      for (let i = lines.length - 1; i >= 0; i--) {
-        if (allMessages.length >= needed) break;
+      for (let i = 0; i < lines.length; i++) {
         try {
-          allMessages.push(JSON.parse(lines[i]));
+          const parsed = JSON.parse(lines[i]);
+          const sanitizedMessage = sanitizeHistoryMessage(agentType, parsed);
+          if (!sanitizedMessage) continue;
+          const hash2 = buildHistoryMessageHash(agentType, sanitizedMessage);
+          if (seen.has(hash2)) continue;
+          seen.add(hash2);
+          allMessages.push(sanitizedMessage);
         } catch {
         }
       }
     }
-    const sliced = allMessages.slice(offset, offset + limit);
-    const hasMore = allMessages.length > offset + limit;
-    sliced.reverse();
+    allMessages.sort((a, b) => a.receivedAt - b.receivedAt);
+    const chronological = [];
+    let lastTurn = null;
+    for (const message of allMessages) {
+      const previous = chronological[chronological.length - 1];
+      if (isAdjacentHistoryDuplicate(agentType, previous, message)) continue;
+      if (message.role !== "system" && isAdjacentHistoryDuplicate(agentType, lastTurn, message)) continue;
+      chronological.push(message);
+      if (message.role !== "system") lastTurn = message;
+    }
+    const collapsed = collapseReplayAssistantTurns(agentType, chronological);
+    const sliced = collapsed.slice(offset, offset + limit);
+    const hasMore = collapsed.length > offset + limit;
     return { messages: sliced, hasMore };
   } catch {
     return { messages: [], hasMore: false };
@@ -2695,7 +2765,7 @@ function listSavedHistorySessions(agentType, options = {}) {
     return { sessions: [], hasMore: false };
   }
 }
-var fs3, path7, os5, HISTORY_DIR, RETAIN_DAYS, ChatHistoryWriter;
+var fs3, path7, os5, HISTORY_DIR, RETAIN_DAYS, CODEX_STARTER_PROMPT_RE, ChatHistoryWriter;
 var init_chat_history = __esm({
   "../../oss/packages/daemon-core/src/config/chat-history.ts"() {
     "use strict";
@@ -2704,11 +2774,16 @@ var init_chat_history = __esm({
     os5 = __toESM(require("os"));
     HISTORY_DIR = path7.join(os5.homedir(), ".adhdev", "history");
     RETAIN_DAYS = 30;
+    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;
     ChatHistoryWriter = class {
       /** Last seen message count per agent (deduplication) */
       lastSeenCounts = /* @__PURE__ */ new Map();
       /** Last seen message hash per agent (deduplication) */
       lastSeenHashes = /* @__PURE__ */ new Map();
+      /** Last appended normalized message signature per agent/session */
+      lastSeenSignatures = /* @__PURE__ */ new Map();
+      /** Last appended normalized non-system turn signature per agent/session */
+      lastSeenTurnSignatures = /* @__PURE__ */ new Map();
       rotated = false;
       /**
       * Append new messages to history
@@ -2730,14 +2805,36 @@ var init_chat_history = __esm({
           }
           const newMessages = [];
           for (const msg of messages) {
-            const hash2 = msg.historyDedupKey || `${msg.kind || "standard"}:${msg.role}:${(msg.content || "").slice(0, 50)}`;
+            const role = msg.role;
+            if (role !== "user" && role !== "assistant" && role !== "system") continue;
+            const content = cleanupHistoryContent(agentType, role, msg.content || "");
+            if (!content) continue;
+            const receivedAt = msg.receivedAt || Date.now();
+            const hash2 = buildHistoryMessageHash(agentType, {
+              role,
+              content,
+              receivedAt,
+              kind: typeof msg.kind === "string" ? msg.kind : void 0,
+              historyDedupKey: msg.historyDedupKey
+            });
+            const signature = buildHistoryMessageSignature(agentType, {
+              role,
+              content,
+              kind: typeof msg.kind === "string" ? msg.kind : void 0
+            });
             if (seenHashes.has(hash2)) continue;
+            if (this.lastSeenSignatures.get(dedupKey) === signature) continue;
+            if (role !== "system" && this.lastSeenTurnSignatures.get(dedupKey) === signature) continue;
             seenHashes.add(hash2);
+            this.lastSeenSignatures.set(dedupKey, signature);
+            if (role !== "system") {
+              this.lastSeenTurnSignatures.set(dedupKey, signature);
+            }
             newMessages.push({
-              ts: new Date(msg.receivedAt || Date.now()).toISOString(),
-              receivedAt: msg.receivedAt || Date.now(),
-              role: msg.role,
-              content: msg.content || "",
+              ts: new Date(receivedAt).toISOString(),
+              receivedAt,
+              role,
+              content,
               kind: typeof msg.kind === "string" ? msg.kind : void 0,
               senderName: typeof msg.senderName === "string" ? msg.senderName : void 0,
               agent: agentType,
@@ -2757,6 +2854,8 @@ var init_chat_history = __esm({
           const prevCount = this.lastSeenCounts.get(dedupKey) || 0;
           if (messages.length < prevCount * 0.5 && prevCount > 3) {
             seenHashes.clear();
+            this.lastSeenSignatures.delete(dedupKey);
+            this.lastSeenTurnSignatures.delete(dedupKey);
             for (const msg of messages) {
               seenHashes.add(msg.historyDedupKey || `${msg.kind || "standard"}:${msg.role}:${(msg.content || "").slice(0, 50)}`);
             }
@@ -2770,6 +2869,54 @@ var init_chat_history = __esm({
         } catch {
         }
       }
+      seedSessionHistory(agentType, messages = [], historySessionId, instanceId) {
+        const effectiveHistoryKey = historySessionId || instanceId;
+        const dedupKey = effectiveHistoryKey ? `${agentType}:${effectiveHistoryKey}` : agentType;
+        const seenHashes = /* @__PURE__ */ new Set();
+        for (const raw of messages) {
+          const role = raw?.role;
+          if (role !== "user" && role !== "assistant" && role !== "system") continue;
+          const content = cleanupHistoryContent(agentType, role, raw?.content || "");
+          if (!content) continue;
+          seenHashes.add(buildHistoryMessageHash(agentType, {
+            role,
+            content,
+            receivedAt: raw?.receivedAt || 0,
+            kind: typeof raw?.kind === "string" ? raw.kind : void 0,
+            historyDedupKey: raw?.historyDedupKey
+          }));
+        }
+        this.lastSeenHashes.set(dedupKey, seenHashes);
+        this.lastSeenCounts.set(dedupKey, messages.length);
+        const lastMessage = [...messages].reverse().find((raw) => {
+          const role = raw?.role;
+          if (role !== "user" && role !== "assistant" && role !== "system") return false;
+          return !!cleanupHistoryContent(agentType, role, raw?.content || "");
+        });
+        const lastTurnMessage = [...messages].reverse().find((raw) => {
+          const role = raw?.role;
+          if (role !== "user" && role !== "assistant") return false;
+          return !!cleanupHistoryContent(agentType, role, raw?.content || "");
+        });
+        if (lastMessage) {
+          this.lastSeenSignatures.set(dedupKey, buildHistoryMessageSignature(agentType, {
+            role: lastMessage.role,
+            content: lastMessage.content,
+            kind: typeof lastMessage.kind === "string" ? lastMessage.kind : void 0
+          }));
+        } else {
+          this.lastSeenSignatures.delete(dedupKey);
+        }
+        if (lastTurnMessage) {
+          this.lastSeenTurnSignatures.set(dedupKey, buildHistoryMessageSignature(agentType, {
+            role: lastTurnMessage.role,
+            content: lastTurnMessage.content,
+            kind: typeof lastTurnMessage.kind === "string" ? lastTurnMessage.kind : void 0
+          }));
+        } else {
+          this.lastSeenTurnSignatures.delete(dedupKey);
+        }
+      }
       appendSystemMarker(agentType, content, options = {}) {
         this.appendNewMessages(
           agentType,
@@ -2800,6 +2947,16 @@ var init_chat_history = __esm({
             this.lastSeenHashes.set(toDedupKey, nextHashes);
             this.lastSeenHashes.delete(fromDedupKey);
           }
+          const fromSignature = this.lastSeenSignatures.get(fromDedupKey);
+          if (fromSignature) {
+            this.lastSeenSignatures.set(toDedupKey, fromSignature);
+            this.lastSeenSignatures.delete(fromDedupKey);
+          }
+          const fromTurnSignature = this.lastSeenTurnSignatures.get(fromDedupKey);
+          if (fromTurnSignature) {
+            this.lastSeenTurnSignatures.set(toDedupKey, fromTurnSignature);
+            this.lastSeenTurnSignatures.delete(fromDedupKey);
+          }
           const fromCount = this.lastSeenCounts.get(fromDedupKey);
           if (typeof fromCount === "number") {
             this.lastSeenCounts.set(toDedupKey, Math.max(fromCount, this.lastSeenCounts.get(toDedupKey) || 0));
@@ -2841,10 +2998,61 @@ var init_chat_history = __esm({
         } catch {
         }
       }
+      compactHistorySession(agentType, historySessionId) {
+        const sessionId = String(historySessionId || "").trim();
+        if (!sessionId) return;
+        try {
+          const dir = path7.join(HISTORY_DIR, this.sanitize(agentType));
+          if (!fs3.existsSync(dir)) return;
+          const prefix = `${this.sanitize(sessionId)}_`;
+          const files = fs3.readdirSync(dir).filter((file2) => file2.startsWith(prefix) && file2.endsWith(".jsonl")).sort();
+          const seen = /* @__PURE__ */ new Set();
+          for (const file2 of files) {
+            const filePath = path7.join(dir, file2);
+            const lines = fs3.readFileSync(filePath, "utf-8").split("\n").filter(Boolean);
+            const next = [];
+            for (const line of lines) {
+              let parsed = null;
+              try {
+                parsed = JSON.parse(line);
+              } catch {
+                parsed = null;
+              }
+              if (!parsed || parsed.historySessionId !== sessionId) continue;
+              const sanitized = sanitizeHistoryMessage(agentType, parsed);
+              if (!sanitized) continue;
+              const hash2 = buildHistoryMessageHash(agentType, sanitized);
+              if (seen.has(hash2)) continue;
+              seen.add(hash2);
+              next.push(sanitized);
+            }
+            next.sort((a, b) => a.receivedAt - b.receivedAt);
+            const dedupedAdjacent = [];
+            let lastTurn = null;
+            for (const entry of next) {
+              const previous = dedupedAdjacent[dedupedAdjacent.length - 1];
+              if (isAdjacentHistoryDuplicate(agentType, previous, entry)) continue;
+              if (entry.role !== "system" && isAdjacentHistoryDuplicate(agentType, lastTurn, entry)) continue;
+              dedupedAdjacent.push(entry);
+              if (entry.role !== "system") lastTurn = entry;
+            }
+            const collapsed = collapseReplayAssistantTurns(agentType, dedupedAdjacent);
+            if (collapsed.length === 0) {
+              fs3.unlinkSync(filePath);
+              continue;
+            }
+            fs3.writeFileSync(filePath, `${collapsed.map((entry) => JSON.stringify(entry)).join("\n")}
+`, "utf-8");
+          }
+        } catch {
+        }
+      }
       /** Called when agent session is explicitly changed */
       onSessionChange(agentType) {
         this.lastSeenHashes.delete(agentType);
         this.lastSeenCounts.delete(agentType);
+        this.lastSeenSignatures.delete(agentType);
+        this.lastSeenTurnSignatures.delete(agentType);
       }
       /** Delete history files older than 30 days */
       async rotateOldFiles() {
@@ -3232,6 +3440,59 @@ ${effect.notification.body || ""}`.trim();
   }
 });
 
+// ../../oss/packages/daemon-core/src/providers/approval-utils.ts
+function normalizeApprovalLabel(value) {
+  return String(value || "").toLowerCase().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) : [];
+  return customHints.length > 0 ? customHints : DEFAULT_APPROVAL_POSITIVE_HINTS;
+}
+function pickApprovalButton(buttons, provider) {
+  const labels = (buttons || []).map((button) => String(button || "").trim()).filter(Boolean);
+  if (labels.length === 0) {
+    return { index: 0, label: "Approve" };
+  }
+  const normalizedButtons = labels.map((label) => normalizeApprovalLabel(label));
+  const hints = getApprovalPositiveHints(provider);
+  for (const hint of hints) {
+    const exactIndex = normalizedButtons.findIndex((label) => label === hint);
+    if (exactIndex >= 0) return { index: exactIndex, label: labels[exactIndex] };
+    const prefixIndex = normalizedButtons.findIndex((label) => label.startsWith(hint));
+    if (prefixIndex >= 0) return { index: prefixIndex, label: labels[prefixIndex] };
+    const includeIndex = normalizedButtons.findIndex((label) => label.includes(hint));
+    if (includeIndex >= 0) return { index: includeIndex, label: labels[includeIndex] };
+  }
+  return { index: 0, label: labels[0] };
+}
+function formatAutoApprovalMessage(modalMessage, buttonLabel) {
+  const lines = [`Auto-approved${buttonLabel ? `: ${buttonLabel}` : ""}`];
+  const cleanMessage = String(modalMessage || "").trim();
+  if (cleanMessage) lines.push(cleanMessage);
+  return lines.join("\n");
+}
+var DEFAULT_APPROVAL_POSITIVE_HINTS;
+var init_approval_utils = __esm({
+  "../../oss/packages/daemon-core/src/providers/approval-utils.ts"() {
+    "use strict";
+    DEFAULT_APPROVAL_POSITIVE_HINTS = [
+      "run",
+      "approve",
+      "accept",
+      "allow once",
+      "always allow",
+      "allow",
+      "yes",
+      "proceed",
+      "continue",
+      "confirm",
+      "save",
+      "ok",
+      "trust"
+    ];
+  }
+});
+
 // ../../oss/packages/daemon-core/src/providers/ide-provider-instance.ts
 var crypto2, IdeProviderInstance;
 var init_ide_provider_instance = __esm({
@@ -3243,6 +3504,7 @@ var init_ide_provider_instance = __esm({
     init_chat_history();
     init_logger();
     init_control_effects();
+    init_approval_utils();
     IdeProviderInstance = class {
       type;
       category = "ide";
@@ -3309,6 +3571,8 @@ var init_ide_provider_instance = __esm({
       }
       getState() {
         const cdp = this.context?.cdp;
+        const autoApproveActive = (this.currentStatus === "waiting_approval" || this.cachedChat?.status === "waiting_approval") && this.canAutoApprove();
+        const visibleStatus = autoApproveActive ? "generating" : this.currentStatus;
         const extensionStates = [];
         for (const ext of this.extensions.values()) {
           extensionStates.push(ext.getState());
@@ -3317,13 +3581,13 @@ var init_ide_provider_instance = __esm({
           type: this.type,
           name: this.provider.name,
           category: "ide",
-          status: this.currentStatus,
+          status: visibleStatus,
           activeChat: this.cachedChat ? {
             id: this.cachedChat.id || "active_session",
             title: this.cachedChat.title || this.type,
-            status: this.cachedChat.status || this.currentStatus,
+            status: autoApproveActive && this.cachedChat.status === "waiting_approval" ? "generating" : this.cachedChat.status || visibleStatus,
             messages: this.mergeConversationMessages(this.cachedChat.messages || []),
-            activeModal: this.cachedChat.activeModal || null,
+            activeModal: autoApproveActive ? null : this.cachedChat.activeModal || null,
             inputContent: this.cachedChat.inputContent || ""
           } : null,
           workspace: this.workspace || null,
@@ -3542,7 +3806,9 @@ var init_ide_provider_instance = __esm({
         const chatStatus = chatData?.status;
         if (!chatStatus) return;
         const agentKey = `${this.type}:native`;
-        const agentStatus = chatStatus === "streaming" || chatStatus === "generating" ? "generating" : chatStatus === "waiting_approval" ? "waiting_approval" : "idle";
+        const rawAgentStatus = chatStatus === "streaming" || chatStatus === "generating" ? "generating" : chatStatus === "waiting_approval" ? "waiting_approval" : "idle";
+        const autoApproveActive = rawAgentStatus === "waiting_approval" && this.canAutoApprove();
+        const agentStatus = autoApproveActive ? "generating" : rawAgentStatus;
         const lastMsg = Array.isArray(chatData?.messages) && chatData.messages.length > 0 ? chatData.messages[chatData.messages.length - 1] : null;
         const progressFingerprint = agentStatus === "generating" ? `${lastMsg?.role || ""}:${typeof lastMsg?.content === "string" ? lastMsg.content : JSON.stringify(lastMsg?.content || "")}`.slice(-2e3) : void 0;
         this.currentStatus = agentStatus;
@@ -3574,7 +3840,7 @@ var init_ide_provider_instance = __esm({
         this.applyProviderResponse(chatData, {
           phase: agentStatus === "idle" && (lastStatus === "generating" || lastStatus === "waiting_approval") ? "turn_completed" : "immediate"
         });
-        if (agentStatus === "waiting_approval" && this.settings.autoApprove && !this.autoApproveBusy) {
+        if (rawAgentStatus === "waiting_approval" && autoApproveActive && !this.autoApproveBusy) {
           this.autoApproveViaScript(chatData);
         }
         const monitorEvents = this.monitor.check(agentKey, agentStatus, now, progressFingerprint);
@@ -3725,6 +3991,9 @@ ${effect.notification.body || ""}`.trim();
       updateCdp(cdp) {
         if (this.context) this.context.cdp = cdp;
       }
+      canAutoApprove() {
+        return this.settings.autoApprove !== false && typeof this.provider.scripts?.resolveAction === "function" && !!this.context?.cdp?.isConnected;
+      }
       // ─── Auto-approve via CDP script ────────────────────
       async autoApproveViaScript(_chatData) {
         const cdp = this.context?.cdp;
@@ -3736,17 +4005,15 @@ ${effect.notification.body || ""}`.trim();
         }
         this.autoApproveBusy = true;
         try {
-          let targetButton = _chatData?.activeModal?.buttons?.[0] || "Run";
-          const buttons = _chatData?.activeModal?.buttons || [];
-          for (const b of buttons) {
-            const lower = String(b).toLowerCase().replace(/[^\w]/g, "");
-            if (/^(run|approve|accept|yes|allow|always|proceed|save)/.test(lower)) {
-              targetButton = b;
-              break;
-            }
-          }
+          const { label: targetButton } = pickApprovalButton(_chatData?.activeModal?.buttons, this.provider);
           const script = scriptFn({ action: "approve", button: targetButton, buttonText: targetButton });
           if (!script) return;
+          const now = Date.now();
+          this.appendRuntimeSystemMessage(
+            formatAutoApprovalMessage(_chatData?.activeModal?.message, targetButton),
+            `auto_approval:${now}:${targetButton}`,
+            now
+          );
           LOG.info("IdeInstance", `[IdeInstance:${this.type}] autoApprove: executing resolveAction for "${targetButton}"`);
           let rawResult = await cdp.evaluate(script, 1e4);
           if (typeof rawResult === "string") {
@@ -3768,12 +4035,6 @@ ${effect.notification.body || ""}`.trim();
               LOG.warn("IdeInstance", `[IdeInstance:${this.type}] autoApprove: cdp.send() not available for coordinate click`);
             }
           }
-          this.pushEvent({
-            event: "agent:auto_approved",
-            chatTitle: _chatData?.title || this.provider.name,
-            timestamp: Date.now(),
-            ideType: this.type
-          });
         } catch (e) {
           LOG.warn("IdeInstance", `[IdeInstance:${this.type}] autoApprove error: ${e?.message}`);
         } finally {
@@ -4713,6 +4974,46 @@ function didProviderConfirmSend(result) {
   if (!parsed || typeof parsed !== "object") return false;
   return parsed.sent === true || parsed.success === true || parsed.ok === true || parsed.submitted === true || parsed.dispatched === true;
 }
+async function readExtensionChatState(h) {
+  try {
+    const evalResult = await h.evaluateProviderScript("readChat", void 0, 5e4);
+    if (!evalResult?.result) return null;
+    const parsed = parseMaybeJson(evalResult.result);
+    return parsed && typeof parsed === "object" ? parsed : null;
+  } catch {
+    return null;
+  }
+}
+function getStateMessageCount(state) {
+  return Array.isArray(state?.messages) ? state.messages.length : 0;
+}
+function getStateLastSignature(state) {
+  const messages = Array.isArray(state?.messages) ? state.messages : [];
+  const last = messages[messages.length - 1];
+  if (!last) return "";
+  return `${last.role || ""}:${String(last.content || "").replace(/\s+/g, " ").trim()}`;
+}
+async function getStableExtensionBaseline(h) {
+  const first = await readExtensionChatState(h);
+  if (getStateMessageCount(first) > 0 || getStateLastSignature(first)) return first;
+  await new Promise((resolve17) => setTimeout(resolve17, 150));
+  const second = await readExtensionChatState(h);
+  return getStateMessageCount(second) >= getStateMessageCount(first) ? second : first;
+}
+async function verifyExtensionSendObserved(h, before) {
+  const beforeCount = getStateMessageCount(before);
+  const beforeSignature = getStateLastSignature(before);
+  for (let attempt = 0; attempt < 12; attempt += 1) {
+    await new Promise((resolve17) => setTimeout(resolve17, 250));
+    const state = await readExtensionChatState(h);
+    if (state?.status === "waiting_approval") return true;
+    const afterCount = getStateMessageCount(state);
+    const afterSignature = getStateLastSignature(state);
+    if (afterCount > beforeCount) return true;
+    if (afterSignature && afterSignature !== beforeSignature) return true;
+  }
+  return false;
+}
 async function handleChatHistory(h, args) {
   const { agentType, offset, limit } = args;
   const historySessionId = getHistorySessionId(h, args);
@@ -4893,12 +5194,17 @@ async function handleSendChat(h, args) {
   if (isExtensionTransport(transport)) {
     _log(`Extension: ${provider?.type || "unknown_extension"}`);
     try {
+      const beforeState = await getStableExtensionBaseline(h);
       const evalResult = await h.evaluateProviderScript("sendMessage", { message: text }, 3e4);
       if (evalResult?.result) {
         const parsed = parseMaybeJson(evalResult.result);
         if (didProviderConfirmSend(parsed)) {
-          _log(`Extension script sent OK`);
-          return _logSendSuccess("extension-script");
+          const observed = await verifyExtensionSendObserved(h, beforeState);
+          if (observed) {
+            _log(`Extension script sent OK`);
+            return _logSendSuccess("extension-script");
+          }
+          _log(`Extension script reported send but no chat-state change was observed`);
         }
         if (parsed?.needsTypeAndSend) {
           _log(`Extension needsTypeAndSend \u2192 AgentStreamManager`);
@@ -5403,7 +5709,7 @@ async function handleResolveAction(h, args) {
     return { success: true, buttonIndex, button: buttons[buttonIndex] ?? button };
   }
   if (isExtensionTransport(transport) && h.agentStream && h.getCdp() && h.currentSession?.sessionId) {
-    const ok = await h.agentStream.resolveSessionAction(h.getCdp(), h.currentSession.sessionId, action);
+    const ok = await h.agentStream.resolveSessionAction(h.getCdp(), h.currentSession.sessionId, action, button);
     return { success: ok };
   }
   if (transport === "acp") {
@@ -7188,10 +7494,12 @@ function sanitizeSpawnEnv(baseEnv, overrides) {
     env[key] = value;
   }
   for (const key of Object.keys(env)) {
-    if (key === "INIT_CWD" || key === "npm_command" || key === "npm_execpath" || key === "npm_node_execpath" || key.startsWith("npm_") || key.startsWith("npm_config_") || key.startsWith("npm_package_") || key.startsWith("npm_lifecycle_") || key.startsWith("PNPM_") || key.startsWith("YARN_") || key.startsWith("BUN_")) {
+    if (key === "INIT_CWD" || key === "npm_command" || key === "npm_execpath" || key === "npm_node_execpath" || key.startsWith("npm_") || key.startsWith("npm_config_") || key.startsWith("npm_package_") || key.startsWith("npm_lifecycle_") || key.startsWith("PNPM_") || key.startsWith("YARN_") || key.startsWith("BUN_") || key.startsWith("VSCODE_") || key.startsWith("ELECTRON_")) {
       delete env[key];
     }
   }
+  delete env.CODEX_THREAD_ID;
+  delete env.CODEX_INTERNAL_ORIGINATOR_OVERRIDE;
   applyTerminalColorEnv(env);
   return env;
 }
@@ -7209,14 +7517,14 @@ function applyTerminalColorEnv(env) {
 function ensureNodePtySpawnHelperPermissions(logFn) {
   if (os22.platform() === "win32") return;
   try {
-    const fs19 = __require("fs");
+    const fs20 = __require("fs");
     const ptyDir = path32.resolve(path32.dirname(__require.resolve("node-pty")), "..");
     const platformArch = `${os22.platform()}-${os22.arch()}`;
     const helper = path32.join(ptyDir, "prebuilds", platformArch, "spawn-helper");
-    if (fs19.existsSync(helper)) {
-      const stat4 = fs19.statSync(helper);
+    if (fs20.existsSync(helper)) {
+      const stat4 = fs20.statSync(helper);
       if (!(stat4.mode & 73)) {
-        fs19.chmodSync(helper, stat4.mode | 493);
+        fs20.chmodSync(helper, stat4.mode | 493);
         logFn?.(`Fixed spawn-helper permissions: ${helper}`);
       }
     }
@@ -7493,6 +7801,9 @@ var init_dist = __esm({
         state.record.lastActivityAt = Date.now();
         return this.cloneRecord(state.record);
       }
+      deleteSession(sessionId) {
+        return this.sessions.delete(sessionId);
+      }
       requireSession(sessionId) {
         const state = this.sessions.get(sessionId);
         if (!state) throw new Error(`Unknown session: ${sessionId}`);
@@ -7682,8 +7993,8 @@ var init_pty_transport = __esm({
         let cwd = options.cwd;
         if (cwd) {
           try {
-            const fs19 = require("fs");
-            const stat4 = fs19.statSync(cwd);
+            const fs20 = require("fs");
+            const stat4 = fs20.statSync(cwd);
             if (!stat4.isDirectory()) cwd = os8.homedir();
           } catch {
             cwd = os8.homedir();
@@ -7794,12 +8105,12 @@ function findBinary(name) {
 function isScriptBinary(binaryPath) {
   if (!path10.isAbsolute(binaryPath)) return false;
   try {
-    const fs19 = require("fs");
-    const resolved = fs19.realpathSync(binaryPath);
+    const fs20 = require("fs");
+    const resolved = fs20.realpathSync(binaryPath);
     const head = Buffer.alloc(8);
-    const fd = fs19.openSync(resolved, "r");
-    fs19.readSync(fd, head, 0, 8, 0);
-    fs19.closeSync(fd);
+    const fd = fs20.openSync(resolved, "r");
+    fs20.readSync(fd, head, 0, 8, 0);
+    fs20.closeSync(fd);
     let i = 0;
     if (head[0] === 239 && head[1] === 187 && head[2] === 191) i = 3;
     return head[i] === 35 && head[i + 1] === 33;
@@ -7810,12 +8121,12 @@ function isScriptBinary(binaryPath) {
 function looksLikeMachOOrElf(filePath) {
   if (!path10.isAbsolute(filePath)) return false;
   try {
-    const fs19 = require("fs");
-    const resolved = fs19.realpathSync(filePath);
+    const fs20 = require("fs");
+    const resolved = fs20.realpathSync(filePath);
     const buf = Buffer.alloc(8);
-    const fd = fs19.openSync(resolved, "r");
-    fs19.readSync(fd, buf, 0, 8, 0);
-    fs19.closeSync(fd);
+    const fd = fs20.openSync(resolved, "r");
+    fs20.readSync(fd, buf, 0, 8, 0);
+    fs20.closeSync(fd);
     let i = 0;
     if (buf[0] === 239 && buf[1] === 187 && buf[2] === 191) i = 3;
     const b = buf.subarray(i);
@@ -8547,6 +8858,9 @@ var init_provider_cli_adapter = __esm({
       looksLikeVisibleIdlePrompt(screenText) {
         const text = String(screenText || "");
         if (!text.trim()) return false;
+        if (this.cliType === "codex-cli" && /(^|\n)\s*[❯›>]\s+(?:Find and fix a bug in @filename|Improve documentation in @filename|Use \/skills|Write tests for @filename|Explain this codebase|Summarize recent commits|Implement \{feature\}|Run \/review on my current changes)(?:\n|$)/im.test(text)) {
+          return true;
+        }
         return /(^|\n)\s*[❯›>]\s*(?:\n|$)/m.test(text) || /⏎\s+send/i.test(text) || /\?\s*for\s*shortcuts/i.test(text) || /Type your message(?:\s+or\s+@path\/to\/file)?/i.test(text) || /workspace\s*\(\/directory\)/i.test(text) || /for\s*shortcuts/i.test(text);
       }
       findLastMatchingLineIndex(lines, predicate) {
@@ -9732,6 +10046,7 @@ var init_cli_provider_instance = __esm({
     init_chat_history();
     init_logger();
     init_control_effects();
+    init_approval_utils();
     CachedDatabaseSync = null;
     CliProviderInstance = class {
       constructor(provider, workingDir, cliArgs = [], instanceId, transportFactory, options) {
@@ -9765,6 +10080,7 @@ var init_cli_provider_instance = __esm({
       historyWriter;
       runtimeMessages = [];
       instanceId;
+      suppressIdleHistoryReplay = false;
       presentationMode;
       providerSessionId;
       launchMode;
@@ -9792,7 +10108,15 @@ var init_cli_provider_instance = __esm({
         await this.adapter.spawn();
         this.maybeAppendRuntimeRecoveryMessage(this.adapter.getRuntimeMetadata());
         if (this.providerSessionId) {
+          this.historyWriter.compactHistorySession(this.type, this.providerSessionId);
           const restoredHistory = readChatHistory(this.type, 0, 200, this.providerSessionId);
+          this.historyWriter.seedSessionHistory(
+            this.type,
+            restoredHistory.messages,
+            this.providerSessionId,
+            this.instanceId
+          );
+          this.suppressIdleHistoryReplay = restoredHistory.messages.length > 0;
           if (restoredHistory.messages.length > 0) {
             this.adapter.seedCommittedMessages(
               restoredHistory.messages.map((message) => ({
@@ -9836,7 +10160,7 @@ var init_cli_provider_instance = __esm({
           } else if (this.type === "codex-cli") {
             probedSessionId = this.probeSessionIdFromConfig({
               dbPath: "~/.codex/state_5.sqlite",
-              query: "select id from threads where cwd in ({dirs}) and created_at >= ? and archived = 0 order by created_at desc limit 1",
+              query: "select id from threads where cwd in ({dirs}) and updated_at >= ? and archived = 0 order by updated_at desc limit 1",
               timestampFormat: "unix_s"
             });
           } else if (this.type === "goose-cli") {
@@ -9880,6 +10204,8 @@ var init_cli_provider_instance = __esm({
       getState() {
         const adapterStatus = this.adapter.getStatus();
         const parsedStatus = this.adapter.getScriptParsedStatus?.() || null;
+        const autoApproveActive = adapterStatus.status === "waiting_approval" && this.shouldAutoApprove();
+        const visibleStatus = autoApproveActive ? "generating" : adapterStatus.status;
         const parsedProviderSessionId = typeof parsedStatus?.providerSessionId === "string" ? parsedStatus.providerSessionId.trim() : "";
         if (parsedProviderSessionId) {
           this.promoteProviderSessionId(parsedProviderSessionId);
@@ -9896,6 +10222,7 @@ var init_cli_provider_instance = __esm({
         const mergedMessages = this.mergeConversationMessages(parsedMessages);
         const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
         if (parsedMessages.length > 0) {
+          const shouldSkipReplayPersist = this.suppressIdleHistoryReplay && adapterStatus.status === "idle" && parsedStatus?.status === "idle";
           let messagesToSave = parsedMessages;
           if (parsedStatus?.status === "generating" || parsedStatus?.status === "long_generating") {
             const lastIdx = messagesToSave.length - 1;
@@ -9903,7 +10230,7 @@ var init_cli_provider_instance = __esm({
               messagesToSave = messagesToSave.slice(0, lastIdx);
             }
           }
-          if (messagesToSave.length > 0) {
+          if (!shouldSkipReplayPersist && messagesToSave.length > 0) {
             this.historyWriter.appendNewMessages(
               this.type,
               messagesToSave,
@@ -9918,14 +10245,14 @@ var init_cli_provider_instance = __esm({
           type: this.type,
           name: this.provider.name,
           category: "cli",
-          status: adapterStatus.status,
+          status: visibleStatus,
           mode: this.presentationMode,
           activeChat: {
             id: `${this.type}_${this.workingDir}`,
             title: parsedStatus?.title || dirName,
-            status: parsedStatus?.status || adapterStatus.status,
+            status: autoApproveActive && parsedStatus?.status === "waiting_approval" ? "generating" : parsedStatus?.status || visibleStatus,
             messages: mergedMessages,
-            activeModal: parsedStatus?.activeModal ?? adapterStatus.activeModal,
+            activeModal: autoApproveActive ? null : parsedStatus?.activeModal ?? adapterStatus.activeModal,
             inputContent: ""
           },
           workspace: this.workingDir,
@@ -9989,7 +10316,16 @@ var init_cli_provider_instance = __esm({
         const now = Date.now();
         const adapterStatus = this.adapter.getStatus();
         const parsedStatus = this.adapter.getScriptParsedStatus?.() || null;
-        const newStatus = adapterStatus.status;
+        const rawStatus = adapterStatus.status;
+        const autoApproveActive = rawStatus === "waiting_approval" && this.shouldAutoApprove();
+        if (autoApproveActive) {
+          const { index: buttonIndex, label: buttonLabel } = pickApprovalButton(adapterStatus.activeModal?.buttons, this.provider);
+          this.recordAutoApproval(adapterStatus.activeModal?.message, buttonLabel, now);
+          setTimeout(() => {
+            this.adapter.resolveModal(buttonIndex);
+          }, 0);
+        }
+        const newStatus = autoApproveActive ? "generating" : rawStatus;
         const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
         const chatTitle = `${this.provider.name} \xB7 ${dirName}`;
         const partial2 = this.adapter.getPartialResponse();
@@ -9998,6 +10334,7 @@ var init_cli_provider_instance = __esm({
         if (newStatus !== this.lastStatus) {
           LOG.info("CLI", `[${this.type}] status: ${this.lastStatus} \u2192 ${newStatus}`);
           if (this.lastStatus === "idle" && newStatus === "generating") {
+            this.suppressIdleHistoryReplay = false;
             if (this.completedDebouncePending) {
               LOG.info("CLI", `[${this.type}] cancelled pending completed (resumed generating)`);
               if (this.completedDebounceTimer) {
@@ -10017,6 +10354,7 @@ var init_cli_provider_instance = __esm({
               this.generatingDebounceTimer = null;
             }, 1e3);
           } else if (newStatus === "waiting_approval") {
+            this.suppressIdleHistoryReplay = false;
             if (this.generatingDebouncePending) {
               if (this.generatingDebounceTimer) {
                 clearTimeout(this.generatingDebounceTimer);
@@ -10197,6 +10535,16 @@ ${effect.notification.body || ""}`.trim();
       get cliName() {
         return this.provider.name;
       }
+      shouldAutoApprove() {
+        return this.settings.autoApprove !== false;
+      }
+      recordAutoApproval(modalMessage, buttonLabel, now = Date.now()) {
+        this.appendRuntimeSystemMessage(
+          formatAutoApprovalMessage(modalMessage, buttonLabel),
+          `auto_approval:${now}:${buttonLabel || "approve"}`,
+          now
+        );
+      }
       recordApprovalSelection(buttonText) {
         const cleanButton = String(buttonText || "").trim();
         if (!cleanButton) return;
@@ -10592,10 +10940,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path27) {
-  if (!path27)
+function getElementAtPath(obj, path28) {
+  if (!path28)
     return obj;
-  return path27.reduce((acc, key) => acc?.[key], obj);
+  return path28.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -10907,11 +11255,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path27, issues) {
+function prefixIssues(path28, issues) {
   return issues.map((iss) => {
     var _a2;
     (_a2 = iss).path ?? (_a2.path = []);
-    iss.path.unshift(path27);
+    iss.path.unshift(path28);
     return iss;
   });
 }
@@ -11154,7 +11502,7 @@ function formatError(error48, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error48, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error49, path27 = []) => {
+  const processError = (error49, path28 = []) => {
     var _a2, _b;
     for (const issue2 of error49.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
@@ -11164,7 +11512,7 @@ function treeifyError(error48, mapper = (issue2) => issue2.message) {
       } else if (issue2.code === "invalid_element") {
         processError({ issues: issue2.issues }, issue2.path);
       } else {
-        const fullpath = [...path27, ...issue2.path];
+        const fullpath = [...path28, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -11196,8 +11544,8 @@ function treeifyError(error48, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path27 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path27) {
+  const path28 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path28) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -23961,13 +24309,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path27 = ref.slice(1).split("/").filter(Boolean);
-  if (path27.length === 0) {
+  const path28 = ref.slice(1).split("/").filter(Boolean);
+  if (path28.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path27[0] === defsKey) {
-    const key = path27[1];
+  if (path28[0] === defsKey) {
+    const key = path28[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -27082,8 +27430,10 @@ var init_acp_provider_instance = __esm({
                 input: tc.rawInput ? typeof tc.rawInput === "string" ? tc.rawInput : JSON.stringify(tc.rawInput) : void 0
               });
             }
-            if (this.settings.autoApprove) {
-              this.log.info(`[${this.type}] Auto-approving: ${tc.title || tc.toolCallId}`);
+            if (this.settings.autoApprove !== false) {
+              const toolTitle = tc.title || tc.toolCallId || "tool call";
+              this.log.info(`[${this.type}] Auto-approving: ${toolTitle}`);
+              this.appendSystemMessage(`Auto-approved: ${toolTitle}`);
               const allowOption = params.options.find((o) => o.kind === "allow_once") || params.options.find((o) => o.kind === "allow_always");
               if (allowOption) {
                 return { outcome: { outcome: "selected", optionId: allowOption.optionId } };
@@ -27535,6 +27885,18 @@ var init_acp_provider_instance = __esm({
         this.events.push(event);
         if (this.events.length > 50) this.events = this.events.slice(-50);
       }
+      appendSystemMessage(content, timestamp = Date.now()) {
+        const normalizedContent = String(content || "").trim();
+        if (!normalizedContent) return;
+        this.messages.push({
+          role: "system",
+          content: normalizedContent,
+          timestamp
+        });
+        if (this.messages.length > 200) {
+          this.messages = this.messages.slice(-100);
+        }
+      }
       flushEvents() {
         const events = [...this.events];
         this.events = [];
@@ -27835,8 +28197,8 @@ var init_cli_manager = __esm({
           const spawnCmd = provider.spawn?.command;
           if (spawnCmd) {
             try {
-              const { execSync: execSync7 } = require("child_process");
-              execSync7(`which ${spawnCmd}`, { stdio: "ignore" });
+              const { execSync: execSync8 } = require("child_process");
+              execSync8(`which ${spawnCmd}`, { stdio: "ignore" });
             } catch {
               const installInfo = provider.install || `Install: check ${provider.displayName || provider.name} documentation`;
               throw new Error(
@@ -28060,6 +28422,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
         if (!instanceManager) return 0;
         const sessions = records || await this.deps.listHostedCliRuntimes?.() || [];
         let restored = 0;
+        const restoredBindings = /* @__PURE__ */ new Set();
         for (const record2 of sessions) {
           if (!record2?.runtimeId || !record2?.cliType || !record2?.workspace) continue;
           if (this.adapters.has(record2.runtimeId) || instanceManager.getInstance(record2.runtimeId)) continue;
@@ -28073,6 +28436,18 @@ Run 'adhdev doctor' for detailed diagnostics.`
             record2.cliArgs,
             record2.providerSessionId
           );
+          const bindingKey = [
+            normalizedType,
+            record2.workspace,
+            sessionBinding.providerSessionId || record2.runtimeId
+          ].join("::");
+          if (restoredBindings.has(bindingKey)) {
+            LOG.info(
+              "CLI",
+              `\u21B7 Skipping duplicate hosted runtime restore: ${record2.runtimeKey || record2.runtimeId} (${normalizedType} @ ${record2.workspace}) binding=${sessionBinding.providerSessionId || "runtime"}`
+            );
+            continue;
+          }
           try {
             await this.registerCliInstance(
               record2.runtimeId,
@@ -28088,6 +28463,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
                 launchMode: "manual"
               }
             );
+            restoredBindings.add(bindingKey);
             restored += 1;
             LOG.info("CLI", `\u267B Restored hosted runtime: ${record2.runtimeKey || record2.runtimeId} (${record2.displayName || record2.workspace})`);
           } catch (error48) {
@@ -28376,7 +28752,7 @@ var init_readdirp = __esm({
         this._directoryFilter = normalizeFilter(opts.directoryFilter);
         const statMethod = opts.lstat ? import_promises.lstat : import_promises.stat;
         if (wantBigintFsStats) {
-          this._stat = (path27) => statMethod(path27, { bigint: true });
+          this._stat = (path28) => statMethod(path28, { bigint: true });
         } else {
           this._stat = statMethod;
         }
@@ -28401,8 +28777,8 @@ var init_readdirp = __esm({
             const par = this.parent;
             const fil = par && par.files;
             if (fil && fil.length > 0) {
-              const { path: path27, depth } = par;
-              const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path27));
+              const { path: path28, depth } = par;
+              const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path28));
               const awaited = await Promise.all(slice);
               for (const entry of awaited) {
                 if (!entry)
@@ -28442,20 +28818,20 @@ var init_readdirp = __esm({
           this.reading = false;
         }
       }
-      async _exploreDir(path27, depth) {
+      async _exploreDir(path28, depth) {
         let files;
         try {
-          files = await (0, import_promises.readdir)(path27, this._rdOptions);
+          files = await (0, import_promises.readdir)(path28, this._rdOptions);
         } catch (error48) {
           this._onError(error48);
         }
-        return { files, depth, path: path27 };
+        return { files, depth, path: path28 };
       }
-      async _formatEntry(dirent, path27) {
+      async _formatEntry(dirent, path28) {
         let entry;
         const basename8 = this._isDirent ? dirent.name : dirent;
         try {
-          const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path27, basename8));
+          const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path28, basename8));
           entry = { path: (0, import_node_path.relative)(this._root, fullPath), fullPath, basename: basename8 };
           entry[this._statsProp] = this._isDirent ? dirent : await this._stat(fullPath);
         } catch (err) {
@@ -28512,16 +28888,16 @@ var init_readdirp = __esm({
 });
 
 // ../../oss/packages/daemon-core/node_modules/chokidar/handler.js
-function createFsWatchInstance(path27, options, listener, errHandler, emitRaw) {
+function createFsWatchInstance(path28, options, listener, errHandler, emitRaw) {
   const handleEvent = (rawEvent, evPath) => {
-    listener(path27);
-    emitRaw(rawEvent, evPath, { watchedPath: path27 });
-    if (evPath && path27 !== evPath) {
-      fsWatchBroadcast(sp.resolve(path27, evPath), KEY_LISTENERS, sp.join(path27, evPath));
+    listener(path28);
+    emitRaw(rawEvent, evPath, { watchedPath: path28 });
+    if (evPath && path28 !== evPath) {
+      fsWatchBroadcast(sp.resolve(path28, evPath), KEY_LISTENERS, sp.join(path28, evPath));
     }
   };
   try {
-    return (0, import_node_fs.watch)(path27, {
+    return (0, import_node_fs.watch)(path28, {
       persistent: options.persistent
     }, handleEvent);
   } catch (error48) {
@@ -28870,12 +29246,12 @@ var init_handler2 = __esm({
         listener(val1, val2, val3);
       });
     };
-    setFsWatchListener = (path27, fullPath, options, handlers) => {
+    setFsWatchListener = (path28, fullPath, options, handlers) => {
       const { listener, errHandler, rawEmitter } = handlers;
       let cont = FsWatchInstances.get(fullPath);
       let watcher;
       if (!options.persistent) {
-        watcher = createFsWatchInstance(path27, options, listener, errHandler, rawEmitter);
+        watcher = createFsWatchInstance(path28, options, listener, errHandler, rawEmitter);
         if (!watcher)
           return;
         return watcher.close.bind(watcher);
@@ -28886,7 +29262,7 @@ var init_handler2 = __esm({
         addAndConvert(cont, KEY_RAW, rawEmitter);
       } else {
         watcher = createFsWatchInstance(
-          path27,
+          path28,
           options,
           fsWatchBroadcast.bind(null, fullPath, KEY_LISTENERS),
           errHandler,
@@ -28901,7 +29277,7 @@ var init_handler2 = __esm({
             cont.watcherUnusable = true;
           if (isWindows && error48.code === "EPERM") {
             try {
-              const fd = await (0, import_promises2.open)(path27, "r");
+              const fd = await (0, import_promises2.open)(path28, "r");
               await fd.close();
               broadcastErr(error48);
             } catch (err) {
@@ -28932,7 +29308,7 @@ var init_handler2 = __esm({
       };
     };
     FsWatchFileInstances = /* @__PURE__ */ new Map();
-    setFsWatchFileListener = (path27, fullPath, options, handlers) => {
+    setFsWatchFileListener = (path28, fullPath, options, handlers) => {
       const { listener, rawEmitter } = handlers;
       let cont = FsWatchFileInstances.get(fullPath);
       const copts = cont && cont.options;
@@ -28954,7 +29330,7 @@ var init_handler2 = __esm({
             });
             const currmtime = curr.mtimeMs;
             if (curr.size !== prev.size || currmtime > prev.mtimeMs || currmtime === 0) {
-              foreach(cont.listeners, (listener2) => listener2(path27, curr));
+              foreach(cont.listeners, (listener2) => listener2(path28, curr));
             }
           })
         };
@@ -28984,13 +29360,13 @@ var init_handler2 = __esm({
        * @param listener on fs change
        * @returns closer for the watcher instance
        */
-      _watchWithNodeFs(path27, listener) {
+      _watchWithNodeFs(path28, listener) {
         const opts = this.fsw.options;
-        const directory = sp.dirname(path27);
-        const basename8 = sp.basename(path27);
+        const directory = sp.dirname(path28);
+        const basename8 = sp.basename(path28);
         const parent = this.fsw._getWatchedDir(directory);
         parent.add(basename8);
-        const absolutePath = sp.resolve(path27);
+        const absolutePath = sp.resolve(path28);
         const options = {
           persistent: opts.persistent
         };
@@ -29000,12 +29376,12 @@ var init_handler2 = __esm({
         if (opts.usePolling) {
           const enableBin = opts.interval !== opts.binaryInterval;
           options.interval = enableBin && isBinaryPath(basename8) ? opts.binaryInterval : opts.interval;
-          closer = setFsWatchFileListener(path27, absolutePath, options, {
+          closer = setFsWatchFileListener(path28, absolutePath, options, {
             listener,
             rawEmitter: this.fsw._emitRaw
           });
         } else {
-          closer = setFsWatchListener(path27, absolutePath, options, {
+          closer = setFsWatchListener(path28, absolutePath, options, {
             listener,
             errHandler: this._boundHandleError,
             rawEmitter: this.fsw._emitRaw
@@ -29027,7 +29403,7 @@ var init_handler2 = __esm({
         let prevStats = stats;
         if (parent.has(basename8))
           return;
-        const listener = async (path27, newStats) => {
+        const listener = async (path28, newStats) => {
           if (!this.fsw._throttle(THROTTLE_MODE_WATCH, file2, 5))
             return;
           if (!newStats || newStats.mtimeMs === 0) {
@@ -29041,11 +29417,11 @@ var init_handler2 = __esm({
                 this.fsw._emit(EV.CHANGE, file2, newStats2);
               }
               if ((isMacos || isLinux || isFreeBSD) && prevStats.ino !== newStats2.ino) {
-                this.fsw._closeFile(path27);
+                this.fsw._closeFile(path28);
                 prevStats = newStats2;
                 const closer2 = this._watchWithNodeFs(file2, listener);
                 if (closer2)
-                  this.fsw._addPathCloser(path27, closer2);
+                  this.fsw._addPathCloser(path28, closer2);
               } else {
                 prevStats = newStats2;
               }
@@ -29077,7 +29453,7 @@ var init_handler2 = __esm({
        * @param item basename of this item
        * @returns true if no more processing is needed for this entry.
        */
-      async _handleSymlink(entry, directory, path27, item) {
+      async _handleSymlink(entry, directory, path28, item) {
         if (this.fsw.closed) {
           return;
         }
@@ -29087,7 +29463,7 @@ var init_handler2 = __esm({
           this.fsw._incrReadyCount();
           let linkPath;
           try {
-            linkPath = await (0, import_promises2.realpath)(path27);
+            linkPath = await (0, import_promises2.realpath)(path28);
           } catch (e) {
             this.fsw._emitReady();
             return true;
@@ -29097,12 +29473,12 @@ var init_handler2 = __esm({
           if (dir.has(item)) {
             if (this.fsw._symlinkPaths.get(full) !== linkPath) {
               this.fsw._symlinkPaths.set(full, linkPath);
-              this.fsw._emit(EV.CHANGE, path27, entry.stats);
+              this.fsw._emit(EV.CHANGE, path28, entry.stats);
             }
           } else {
             dir.add(item);
             this.fsw._symlinkPaths.set(full, linkPath);
-            this.fsw._emit(EV.ADD, path27, entry.stats);
+            this.fsw._emit(EV.ADD, path28, entry.stats);
           }
           this.fsw._emitReady();
           return true;
@@ -29132,9 +29508,9 @@ var init_handler2 = __esm({
             return;
           }
           const item = entry.path;
-          let path27 = sp.join(directory, item);
+          let path28 = sp.join(directory, item);
           current.add(item);
-          if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path27, item)) {
+          if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path28, item)) {
             return;
           }
           if (this.fsw.closed) {
@@ -29143,8 +29519,8 @@ var init_handler2 = __esm({
           }
           if (item === target || !target && !previous.has(item)) {
             this.fsw._incrReadyCount();
-            path27 = sp.join(dir, sp.relative(dir, path27));
-            this._addToNodeFs(path27, initialAdd, wh, depth + 1);
+            path28 = sp.join(dir, sp.relative(dir, path28));
+            this._addToNodeFs(path28, initialAdd, wh, depth + 1);
           }
         }).on(EV.ERROR, this._boundHandleError);
         return new Promise((resolve17, reject) => {
@@ -29213,13 +29589,13 @@ var init_handler2 = __esm({
        * @param depth Child path actually targeted for watch
        * @param target Child path actually targeted for watch
        */
-      async _addToNodeFs(path27, initialAdd, priorWh, depth, target) {
+      async _addToNodeFs(path28, initialAdd, priorWh, depth, target) {
         const ready = this.fsw._emitReady;
-        if (this.fsw._isIgnored(path27) || this.fsw.closed) {
+        if (this.fsw._isIgnored(path28) || this.fsw.closed) {
           ready();
           return false;
         }
-        const wh = this.fsw._getWatchHelpers(path27);
+        const wh = this.fsw._getWatchHelpers(path28);
         if (priorWh) {
           wh.filterPath = (entry) => priorWh.filterPath(entry);
           wh.filterDir = (entry) => priorWh.filterDir(entry);
@@ -29235,8 +29611,8 @@ var init_handler2 = __esm({
           const follow = this.fsw.options.followSymlinks;
           let closer;
           if (stats.isDirectory()) {
-            const absPath = sp.resolve(path27);
-            const targetPath = follow ? await (0, import_promises2.realpath)(path27) : path27;
+            const absPath = sp.resolve(path28);
+            const targetPath = follow ? await (0, import_promises2.realpath)(path28) : path28;
             if (this.fsw.closed)
               return;
             closer = await this._handleDir(wh.watchPath, stats, initialAdd, depth, target, wh, targetPath);
@@ -29246,29 +29622,29 @@ var init_handler2 = __esm({
               this.fsw._symlinkPaths.set(absPath, targetPath);
             }
           } else if (stats.isSymbolicLink()) {
-            const targetPath = follow ? await (0, import_promises2.realpath)(path27) : path27;
+            const targetPath = follow ? await (0, import_promises2.realpath)(path28) : path28;
             if (this.fsw.closed)
               return;
             const parent = sp.dirname(wh.watchPath);
             this.fsw._getWatchedDir(parent).add(wh.watchPath);
             this.fsw._emit(EV.ADD, wh.watchPath, stats);
-            closer = await this._handleDir(parent, stats, initialAdd, depth, path27, wh, targetPath);
+            closer = await this._handleDir(parent, stats, initialAdd, depth, path28, wh, targetPath);
             if (this.fsw.closed)
               return;
             if (targetPath !== void 0) {
-              this.fsw._symlinkPaths.set(sp.resolve(path27), targetPath);
+              this.fsw._symlinkPaths.set(sp.resolve(path28), targetPath);
             }
           } else {
             closer = this._handleFile(wh.watchPath, stats, initialAdd);
           }
           ready();
           if (closer)
-            this.fsw._addPathCloser(path27, closer);
+            this.fsw._addPathCloser(path28, closer);
           return false;
         } catch (error48) {
           if (this.fsw._handleError(error48)) {
             ready();
-            return path27;
+            return path28;
           }
         }
       }
@@ -29303,24 +29679,24 @@ function createPattern(matcher) {
   }
   return () => false;
 }
-function normalizePath(path27) {
-  if (typeof path27 !== "string")
+function normalizePath(path28) {
+  if (typeof path28 !== "string")
     throw new Error("string expected");
-  path27 = sp2.normalize(path27);
-  path27 = path27.replace(/\\/g, "/");
+  path28 = sp2.normalize(path28);
+  path28 = path28.replace(/\\/g, "/");
   let prepend = false;
-  if (path27.startsWith("//"))
+  if (path28.startsWith("//"))
     prepend = true;
-  path27 = path27.replace(DOUBLE_SLASH_RE, "/");
+  path28 = path28.replace(DOUBLE_SLASH_RE, "/");
   if (prepend)
-    path27 = "/" + path27;
-  return path27;
+    path28 = "/" + path28;
+  return path28;
 }
 function matchPatterns(patterns, testString, stats) {
-  const path27 = normalizePath(testString);
+  const path28 = normalizePath(testString);
   for (let index = 0; index < patterns.length; index++) {
     const pattern = patterns[index];
-    if (pattern(path27, stats)) {
+    if (pattern(path28, stats)) {
       return true;
     }
   }
@@ -29383,19 +29759,19 @@ var init_chokidar = __esm({
       }
       return str;
     };
-    normalizePathToUnix = (path27) => toUnix(sp2.normalize(toUnix(path27)));
-    normalizeIgnored = (cwd = "") => (path27) => {
-      if (typeof path27 === "string") {
-        return normalizePathToUnix(sp2.isAbsolute(path27) ? path27 : sp2.join(cwd, path27));
+    normalizePathToUnix = (path28) => toUnix(sp2.normalize(toUnix(path28)));
+    normalizeIgnored = (cwd = "") => (path28) => {
+      if (typeof path28 === "string") {
+        return normalizePathToUnix(sp2.isAbsolute(path28) ? path28 : sp2.join(cwd, path28));
       } else {
-        return path27;
+        return path28;
       }
     };
-    getAbsolutePath = (path27, cwd) => {
-      if (sp2.isAbsolute(path27)) {
-        return path27;
+    getAbsolutePath = (path28, cwd) => {
+      if (sp2.isAbsolute(path28)) {
+        return path28;
       }
-      return sp2.join(cwd, path27);
+      return sp2.join(cwd, path28);
     };
     EMPTY_SET = Object.freeze(/* @__PURE__ */ new Set());
     DirEntry = class {
@@ -29460,10 +29836,10 @@ var init_chokidar = __esm({
       dirParts;
       followSymlinks;
       statMethod;
-      constructor(path27, follow, fsw) {
+      constructor(path28, follow, fsw) {
         this.fsw = fsw;
-        const watchPath = path27;
-        this.path = path27 = path27.replace(REPLACER_RE, "");
+        const watchPath = path28;
+        this.path = path28 = path28.replace(REPLACER_RE, "");
         this.watchPath = watchPath;
         this.fullWatchPath = sp2.resolve(watchPath);
         this.dirParts = [];
@@ -29603,20 +29979,20 @@ var init_chokidar = __esm({
         this._closePromise = void 0;
         let paths = unifyPaths(paths_);
         if (cwd) {
-          paths = paths.map((path27) => {
-            const absPath = getAbsolutePath(path27, cwd);
+          paths = paths.map((path28) => {
+            const absPath = getAbsolutePath(path28, cwd);
             return absPath;
           });
         }
-        paths.forEach((path27) => {
-          this._removeIgnoredPath(path27);
+        paths.forEach((path28) => {
+          this._removeIgnoredPath(path28);
         });
         this._userIgnored = void 0;
         if (!this._readyCount)
           this._readyCount = 0;
         this._readyCount += paths.length;
-        Promise.all(paths.map(async (path27) => {
-          const res = await this._nodeFsHandler._addToNodeFs(path27, !_internal, void 0, 0, _origAdd);
+        Promise.all(paths.map(async (path28) => {
+          const res = await this._nodeFsHandler._addToNodeFs(path28, !_internal, void 0, 0, _origAdd);
           if (res)
             this._emitReady();
           return res;
@@ -29638,17 +30014,17 @@ var init_chokidar = __esm({
           return this;
         const paths = unifyPaths(paths_);
         const { cwd } = this.options;
-        paths.forEach((path27) => {
-          if (!sp2.isAbsolute(path27) && !this._closers.has(path27)) {
+        paths.forEach((path28) => {
+          if (!sp2.isAbsolute(path28) && !this._closers.has(path28)) {
             if (cwd)
-              path27 = sp2.join(cwd, path27);
-            path27 = sp2.resolve(path27);
+              path28 = sp2.join(cwd, path28);
+            path28 = sp2.resolve(path28);
           }
-          this._closePath(path27);
-          this._addIgnoredPath(path27);
-          if (this._watched.has(path27)) {
+          this._closePath(path28);
+          this._addIgnoredPath(path28);
+          if (this._watched.has(path28)) {
             this._addIgnoredPath({
-              path: path27,
+              path: path28,
               recursive: true
             });
           }
@@ -29712,38 +30088,38 @@ var init_chokidar = __esm({
        * @param stats arguments to be passed with event
        * @returns the error if defined, otherwise the value of the FSWatcher instance's `closed` flag
        */
-      async _emit(event, path27, stats) {
+      async _emit(event, path28, stats) {
         if (this.closed)
           return;
         const opts = this.options;
         if (isWindows)
-          path27 = sp2.normalize(path27);
+          path28 = sp2.normalize(path28);
         if (opts.cwd)
-          path27 = sp2.relative(opts.cwd, path27);
-        const args = [path27];
+          path28 = sp2.relative(opts.cwd, path28);
+        const args = [path28];
         if (stats != null)
           args.push(stats);
         const awf = opts.awaitWriteFinish;
         let pw;
-        if (awf && (pw = this._pendingWrites.get(path27))) {
+        if (awf && (pw = this._pendingWrites.get(path28))) {
           pw.lastChange = /* @__PURE__ */ new Date();
           return this;
         }
         if (opts.atomic) {
           if (event === EVENTS.UNLINK) {
-            this._pendingUnlinks.set(path27, [event, ...args]);
+            this._pendingUnlinks.set(path28, [event, ...args]);
             setTimeout(() => {
-              this._pendingUnlinks.forEach((entry, path28) => {
+              this._pendingUnlinks.forEach((entry, path29) => {
                 this.emit(...entry);
                 this.emit(EVENTS.ALL, ...entry);
-                this._pendingUnlinks.delete(path28);
+                this._pendingUnlinks.delete(path29);
               });
             }, typeof opts.atomic === "number" ? opts.atomic : 100);
             return this;
           }
-          if (event === EVENTS.ADD && this._pendingUnlinks.has(path27)) {
+          if (event === EVENTS.ADD && this._pendingUnlinks.has(path28)) {
             event = EVENTS.CHANGE;
-            this._pendingUnlinks.delete(path27);
+            this._pendingUnlinks.delete(path28);
           }
         }
         if (awf && (event === EVENTS.ADD || event === EVENTS.CHANGE) && this._readyEmitted) {
@@ -29761,16 +30137,16 @@ var init_chokidar = __esm({
               this.emitWithAll(event, args);
             }
           };
-          this._awaitWriteFinish(path27, awf.stabilityThreshold, event, awfEmit);
+          this._awaitWriteFinish(path28, awf.stabilityThreshold, event, awfEmit);
           return this;
         }
         if (event === EVENTS.CHANGE) {
-          const isThrottled = !this._throttle(EVENTS.CHANGE, path27, 50);
+          const isThrottled = !this._throttle(EVENTS.CHANGE, path28, 50);
           if (isThrottled)
             return this;
         }
         if (opts.alwaysStat && stats === void 0 && (event === EVENTS.ADD || event === EVENTS.ADD_DIR || event === EVENTS.CHANGE)) {
-          const fullPath = opts.cwd ? sp2.join(opts.cwd, path27) : path27;
+          const fullPath = opts.cwd ? sp2.join(opts.cwd, path28) : path28;
           let stats2;
           try {
             stats2 = await (0, import_promises3.stat)(fullPath);
@@ -29801,23 +30177,23 @@ var init_chokidar = __esm({
        * @param timeout duration of time to suppress duplicate actions
        * @returns tracking object or false if action should be suppressed
        */
-      _throttle(actionType, path27, timeout) {
+      _throttle(actionType, path28, timeout) {
         if (!this._throttled.has(actionType)) {
           this._throttled.set(actionType, /* @__PURE__ */ new Map());
         }
         const action = this._throttled.get(actionType);
         if (!action)
           throw new Error("invalid throttle");
-        const actionPath = action.get(path27);
+        const actionPath = action.get(path28);
         if (actionPath) {
           actionPath.count++;
           return false;
         }
         let timeoutObject;
         const clear = () => {
-          const item = action.get(path27);
+          const item = action.get(path28);
           const count = item ? item.count : 0;
-          action.delete(path27);
+          action.delete(path28);
           clearTimeout(timeoutObject);
           if (item)
             clearTimeout(item.timeoutObject);
@@ -29825,7 +30201,7 @@ var init_chokidar = __esm({
         };
         timeoutObject = setTimeout(clear, timeout);
         const thr = { timeoutObject, clear, count: 0 };
-        action.set(path27, thr);
+        action.set(path28, thr);
         return thr;
       }
       _incrReadyCount() {
@@ -29839,44 +30215,44 @@ var init_chokidar = __esm({
        * @param event
        * @param awfEmit Callback to be called when ready for event to be emitted.
        */
-      _awaitWriteFinish(path27, threshold, event, awfEmit) {
+      _awaitWriteFinish(path28, threshold, event, awfEmit) {
         const awf = this.options.awaitWriteFinish;
         if (typeof awf !== "object")
           return;
         const pollInterval = awf.pollInterval;
         let timeoutHandler;
-        let fullPath = path27;
-        if (this.options.cwd && !sp2.isAbsolute(path27)) {
-          fullPath = sp2.join(this.options.cwd, path27);
+        let fullPath = path28;
+        if (this.options.cwd && !sp2.isAbsolute(path28)) {
+          fullPath = sp2.join(this.options.cwd, path28);
         }
         const now = /* @__PURE__ */ new Date();
         const writes = this._pendingWrites;
         function awaitWriteFinishFn(prevStat) {
           (0, import_node_fs2.stat)(fullPath, (err, curStat) => {
-            if (err || !writes.has(path27)) {
+            if (err || !writes.has(path28)) {
               if (err && err.code !== "ENOENT")
                 awfEmit(err);
               return;
             }
             const now2 = Number(/* @__PURE__ */ new Date());
             if (prevStat && curStat.size !== prevStat.size) {
-              writes.get(path27).lastChange = now2;
+              writes.get(path28).lastChange = now2;
             }
-            const pw = writes.get(path27);
+            const pw = writes.get(path28);
             const df = now2 - pw.lastChange;
             if (df >= threshold) {
-              writes.delete(path27);
+              writes.delete(path28);
               awfEmit(void 0, curStat);
             } else {
               timeoutHandler = setTimeout(awaitWriteFinishFn, pollInterval, curStat);
             }
           });
         }
-        if (!writes.has(path27)) {
-          writes.set(path27, {
+        if (!writes.has(path28)) {
+          writes.set(path28, {
             lastChange: now,
             cancelWait: () => {
-              writes.delete(path27);
+              writes.delete(path28);
               clearTimeout(timeoutHandler);
               return event;
             }
@@ -29887,8 +30263,8 @@ var init_chokidar = __esm({
       /**
        * Determines whether user has asked to ignore this path.
        */
-      _isIgnored(path27, stats) {
-        if (this.options.atomic && DOT_RE.test(path27))
+      _isIgnored(path28, stats) {
+        if (this.options.atomic && DOT_RE.test(path28))
           return true;
         if (!this._userIgnored) {
           const { cwd } = this.options;
@@ -29898,17 +30274,17 @@ var init_chokidar = __esm({
           const list = [...ignoredPaths.map(normalizeIgnored(cwd)), ...ignored];
           this._userIgnored = anymatch(list, void 0);
         }
-        return this._userIgnored(path27, stats);
+        return this._userIgnored(path28, stats);
       }
-      _isntIgnored(path27, stat4) {
-        return !this._isIgnored(path27, stat4);
+      _isntIgnored(path28, stat4) {
+        return !this._isIgnored(path28, stat4);
       }
       /**
        * Provides a set of common helpers and properties relating to symlink handling.
        * @param path file or directory pattern being watched
        */
-      _getWatchHelpers(path27) {
-        return new WatchHelper(path27, this.options.followSymlinks, this);
+      _getWatchHelpers(path28) {
+        return new WatchHelper(path28, this.options.followSymlinks, this);
       }
       // Directory helpers
       // -----------------
@@ -29940,63 +30316,63 @@ var init_chokidar = __esm({
        * @param item      base path of item/directory
        */
       _remove(directory, item, isDirectory) {
-        const path27 = sp2.join(directory, item);
-        const fullPath = sp2.resolve(path27);
-        isDirectory = isDirectory != null ? isDirectory : this._watched.has(path27) || this._watched.has(fullPath);
-        if (!this._throttle("remove", path27, 100))
+        const path28 = sp2.join(directory, item);
+        const fullPath = sp2.resolve(path28);
+        isDirectory = isDirectory != null ? isDirectory : this._watched.has(path28) || this._watched.has(fullPath);
+        if (!this._throttle("remove", path28, 100))
           return;
         if (!isDirectory && this._watched.size === 1) {
           this.add(directory, item, true);
         }
-        const wp = this._getWatchedDir(path27);
+        const wp = this._getWatchedDir(path28);
         const nestedDirectoryChildren = wp.getChildren();
-        nestedDirectoryChildren.forEach((nested) => this._remove(path27, nested));
+        nestedDirectoryChildren.forEach((nested) => this._remove(path28, nested));
         const parent = this._getWatchedDir(directory);
         const wasTracked = parent.has(item);
         parent.remove(item);
         if (this._symlinkPaths.has(fullPath)) {
           this._symlinkPaths.delete(fullPath);
         }
-        let relPath = path27;
+        let relPath = path28;
         if (this.options.cwd)
-          relPath = sp2.relative(this.options.cwd, path27);
+          relPath = sp2.relative(this.options.cwd, path28);
         if (this.options.awaitWriteFinish && this._pendingWrites.has(relPath)) {
           const event = this._pendingWrites.get(relPath).cancelWait();
           if (event === EVENTS.ADD)
             return;
         }
-        this._watched.delete(path27);
+        this._watched.delete(path28);
         this._watched.delete(fullPath);
         const eventName = isDirectory ? EVENTS.UNLINK_DIR : EVENTS.UNLINK;
-        if (wasTracked && !this._isIgnored(path27))
-          this._emit(eventName, path27);
-        this._closePath(path27);
+        if (wasTracked && !this._isIgnored(path28))
+          this._emit(eventName, path28);
+        this._closePath(path28);
       }
       /**
        * Closes all watchers for a path
        */
-      _closePath(path27) {
-        this._closeFile(path27);
-        const dir = sp2.dirname(path27);
-        this._getWatchedDir(dir).remove(sp2.basename(path27));
+      _closePath(path28) {
+        this._closeFile(path28);
+        const dir = sp2.dirname(path28);
+        this._getWatchedDir(dir).remove(sp2.basename(path28));
       }
       /**
        * Closes only file-specific watchers
        */
-      _closeFile(path27) {
-        const closers = this._closers.get(path27);
+      _closeFile(path28) {
+        const closers = this._closers.get(path28);
         if (!closers)
           return;
         closers.forEach((closer) => closer());
-        this._closers.delete(path27);
+        this._closers.delete(path28);
       }
-      _addPathCloser(path27, closer) {
+      _addPathCloser(path28, closer) {
         if (!closer)
           return;
-        let list = this._closers.get(path27);
+        let list = this._closers.get(path28);
         if (!list) {
           list = [];
-          this._closers.set(path27, list);
+          this._closers.set(path28, list);
         }
         list.push(closer);
       }
@@ -30656,7 +31032,7 @@ var init_provider_loader = __esm({
           return { updated: false };
         }
         const https = require("https");
-        const { execSync: execSync7 } = require("child_process");
+        const { execSync: execSync8 } = require("child_process");
         const metaPath = path13.join(this.upstreamDir, _ProviderLoader.META_FILE);
         let prevEtag = "";
         let prevTimestamp = 0;
@@ -30721,7 +31097,7 @@ var init_provider_loader = __esm({
           const tmpExtract = path13.join(os12.tmpdir(), `adhdev-providers-extract-${Date.now()}`);
           await this.downloadFile(_ProviderLoader.GITHUB_TARBALL_URL, tmpTar);
           fs6.mkdirSync(tmpExtract, { recursive: true });
-          execSync7(`tar -xzf "${tmpTar}" -C "${tmpExtract}"`, { timeout: 3e4 });
+          execSync8(`tar -xzf "${tmpTar}" -C "${tmpExtract}"`, { timeout: 3e4 });
           const extracted = fs6.readdirSync(tmpExtract);
           const rootDir = extracted.find(
             (d) => fs6.statSync(path13.join(tmpExtract, d)).isDirectory() && d.startsWith("adhdev-providers")
@@ -30864,7 +31240,7 @@ var init_provider_loader = __esm({
       */
       getSettingValue(type, key) {
         const schemaDef = this.getSettingsSchema(type)[key];
-        const defaultVal = schemaDef ? schemaDef.default : void 0;
+        const defaultVal = schemaDef ? key === "autoApprove" && schemaDef.type === "boolean" ? true : schemaDef.default : void 0;
         try {
           const { loadConfig: loadConfig2 } = (init_config(), __toCommonJS(config_exports));
           const config2 = loadConfig2();
@@ -30923,13 +31299,32 @@ var init_provider_loader = __esm({
       getSettingsSchema(type) {
         const provider = this.providers.get(type);
         if (!provider) return {};
-        return {
+        const result = {
           ...this.getSyntheticSettings(type, provider),
           ...provider.settings || {}
         };
+        if (result.autoApprove?.type === "boolean") {
+          result.autoApprove = {
+            ...result.autoApprove,
+            default: true,
+            public: true,
+            label: result.autoApprove.label || "Auto Approve",
+            description: result.autoApprove.description || "Automatically approve actionable prompts without sending approval alerts."
+          };
+        }
+        return result;
       }
       getSyntheticSettings(type, provider) {
         const result = {};
+        if (!provider.settings?.autoApprove) {
+          result.autoApprove = {
+            type: "boolean",
+            default: true,
+            public: true,
+            label: "Auto Approve",
+            description: "Automatically approve actionable prompts without sending approval alerts."
+          };
+        }
         if ((provider.category === "cli" || provider.category === "acp") && provider.spawn?.command && !provider.settings?.executablePath) {
           result.executablePath = {
             type: "string",
@@ -31369,7 +31764,7 @@ function detectCurrentWorkspace(ideId) {
     }
   } else if (plat === "win32") {
     try {
-      const fs19 = require("fs");
+      const fs20 = require("fs");
       const appNameMap = getMacAppIdentifiers();
       const appName = appNameMap[ideId];
       if (appName) {
@@ -31378,8 +31773,8 @@ function detectCurrentWorkspace(ideId) {
           appName,
           "storage.json"
         );
-        if (fs19.existsSync(storagePath)) {
-          const data = JSON.parse(fs19.readFileSync(storagePath, "utf-8"));
+        if (fs20.existsSync(storagePath)) {
+          const data = JSON.parse(fs20.readFileSync(storagePath, "utf-8"));
           const workspaces = data?.openedPathsList?.workspaces3 || data?.openedPathsList?.entries || [];
           if (workspaces.length > 0) {
             const recent = workspaces[0];
@@ -32240,6 +32635,15 @@ var init_router = __esm({
             const record2 = await this.deps.sessionHostControl.forceDetachClient(sessionId, clientId);
             return { success: true, record: record2 };
           }
+          case "session_host_prune_duplicate_sessions": {
+            if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
+            const result = await this.deps.sessionHostControl.pruneDuplicateSessions({
+              providerType: typeof args?.providerType === "string" ? args.providerType : void 0,
+              workspace: typeof args?.workspace === "string" ? args.workspace : void 0,
+              dryRun: args?.dryRun === true
+            });
+            return { success: true, result };
+          }
           case "session_host_acquire_write": {
             if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
             const sessionId = typeof args?.sessionId === "string" ? args.sessionId : "";
@@ -32450,14 +32854,14 @@ var init_router = __esm({
           case "daemon_upgrade": {
             LOG.info("Upgrade", "Remote upgrade requested from dashboard");
             try {
-              const { execSync: execSync7 } = await import("child_process");
+              const { execSync: execSync8 } = await import("child_process");
               const isStandalone = this.deps.packageName === "@adhdev/daemon-standalone" || process.argv[1]?.includes("daemon-standalone");
               const pkgName = isStandalone ? "@adhdev/daemon-standalone" : "adhdev";
-              const latest = execSync7(`npm view ${pkgName} version`, { encoding: "utf-8", timeout: 1e4 }).trim();
+              const latest = execSync8(`npm view ${pkgName} version`, { encoding: "utf-8", timeout: 1e4 }).trim();
               LOG.info("Upgrade", `Latest ${pkgName}: v${latest}`);
               let currentInstalled = null;
               try {
-                const currentJson = execSync7(`npm ls -g ${pkgName} --depth=0 --json`, {
+                const currentJson = execSync8(`npm ls -g ${pkgName} --depth=0 --json`, {
                   encoding: "utf-8",
                   timeout: 1e4,
                   stdio: ["pipe", "pipe", "pipe"]
@@ -32843,6 +33247,51 @@ var init_provider_adapter = __esm({
       isTransportError(reason) {
         return /Session with given id not found/i.test(reason) || /CDP not connected/i.test(reason) || /Target closed/i.test(reason) || /WebSocket not open/i.test(reason) || /not connected/i.test(reason) || /execution context/i.test(reason) || /Cannot find context with specified id/i.test(reason);
       }
+      titlesMatch(actual, expected) {
+        const lhs = actual.trim().toLowerCase();
+        const rhs = expected.trim().toLowerCase();
+        if (!lhs || !rhs) return false;
+        return lhs === rhs || lhs.includes(rhs) || rhs.includes(lhs);
+      }
+      messageCount(state) {
+        return Array.isArray(state?.messages) ? state.messages.length : 0;
+      }
+      lastMessageSignature(state) {
+        const messages = Array.isArray(state?.messages) ? state.messages : [];
+        const last = messages[messages.length - 1];
+        if (!last) return "";
+        return `${last.role || ""}:${String(last.content || "").replace(/\s+/g, " ").trim()}`;
+      }
+      async verifySendOutcome(evaluate, before) {
+        const beforeCount = this.messageCount(before);
+        const beforeSignature = this.lastMessageSignature(before);
+        for (let attempt = 0; attempt < 12; attempt += 1) {
+          await new Promise((resolve17) => setTimeout(resolve17, 250));
+          let state;
+          try {
+            state = await this.readChat(evaluate);
+          } catch {
+            continue;
+          }
+          if (state.status === "waiting_approval") {
+            return true;
+          }
+          const afterCount = this.messageCount(state);
+          const afterSignature = this.lastMessageSignature(state);
+          if (afterCount > beforeCount) return true;
+          if (afterSignature && afterSignature !== beforeSignature) return true;
+        }
+        return false;
+      }
+      async readStableBaselineState(evaluate) {
+        const first = await this.readChat(evaluate);
+        if (this.messageCount(first) > 0 || this.lastMessageSignature(first)) {
+          return first;
+        }
+        await new Promise((resolve17) => setTimeout(resolve17, 150));
+        const second = await this.readChat(evaluate);
+        return this.messageCount(second) >= this.messageCount(first) ? second : first;
+      }
       async readChat(evaluate) {
         const script = this.callScript("readChat");
         if (!script) return this.errorState("readChat script not available");
@@ -32868,6 +33317,9 @@ var init_provider_adapter = __esm({
             mode: data.mode,
             activeModal: data.activeModal
           };
+          if (typeof data.title === "string" && data.title.trim()) {
+            state.title = data.title.trim();
+          }
           const controlValues = extractProviderControlValues(this.provider.controls, data);
           if (controlValues) state.controlValues = controlValues;
           const effects = normalizeProviderEffects(data);
@@ -32891,6 +33343,12 @@ var init_provider_adapter = __esm({
         }
       }
       async sendMessage(evaluate, text) {
+        let beforeState = null;
+        try {
+          beforeState = await this.readStableBaselineState(evaluate);
+        } catch {
+          beforeState = null;
+        }
         const params = { message: text };
         const script = this.callScript("sendMessage", params) || this.callScript("sendMessage", text);
         if (!script) throw new Error(`[${this.agentName}] sendMessage script not available`);
@@ -32908,7 +33366,9 @@ var init_provider_adapter = __esm({
         }
         if (parsed && typeof parsed === "object") {
           if (parsed.sent === true || parsed.success === true || parsed.ok === true || parsed.submitted === true || parsed.dispatched === true) {
-            return;
+            const verified = await this.verifySendOutcome(evaluate, beforeState);
+            if (verified) return;
+            throw new Error(`[${this.agentName}] sendMessage was not observed in chat state`);
           }
           if (typeof parsed.error === "string" && parsed.error.trim()) {
             throw new Error(`[${this.agentName}] sendMessage failed: ${parsed.error}`);
@@ -32919,7 +33379,15 @@ var init_provider_adapter = __esm({
       async resolveAction(evaluate, action, button) {
         const script = this.callScript("resolveAction", { action, button });
         if (!script) return false;
-        return await evaluate(script) === true;
+        const result = await evaluate(script);
+        const parsed = this.parseMaybeJson(result);
+        if (parsed === true) return true;
+        if (typeof parsed === "string") {
+          const normalized = parsed.trim().toLowerCase();
+          return normalized === "ok" || normalized === "success" || normalized === "true" || normalized === "resolved" || normalized === "approved" || normalized === "rejected";
+        }
+        if (!parsed || typeof parsed !== "object") return false;
+        return parsed.resolved === true || parsed.success === true || parsed.ok === true || parsed.found === true;
       }
       async newSession(evaluate) {
         const script = this.callScript("newSession");
@@ -32956,7 +33424,14 @@ var init_provider_adapter = __esm({
           return normalized === "true" || normalized === "ok" || normalized === "switched" || normalized === "success";
         }
         if (data && typeof data === "object") {
-          return data.switched === true || data.success === true || data.ok === true;
+          if (data.switched === true || data.success === true || data.ok === true) return true;
+          if (typeof data.error === "string" && data.error.trim()) return false;
+        }
+        for (let attempt = 0; attempt < 6; attempt += 1) {
+          await new Promise((resolve17) => setTimeout(resolve17, 250));
+          const state = await this.readChat(evaluate);
+          const title = typeof state.title === "string" ? state.title : "";
+          if (this.titlesMatch(title, sessionId)) return true;
         }
         return false;
       }
@@ -33171,7 +33646,7 @@ var init_manager2 = __esm({
           return false;
         }
       }
-      async resolveSessionAction(cdp, sessionId, action) {
+      async resolveSessionAction(cdp, sessionId, action, button) {
         await this.ensureSessionPanelOpen(sessionId);
         const target = this.getSessionTarget(sessionId);
         if (!target?.parentSessionId) return false;
@@ -33181,7 +33656,7 @@ var init_manager2 = __esm({
         if (!agent) return false;
         try {
           const evaluate = (expr, timeout) => cdp.evaluateInSessionFrame(agent.cdpSessionId, expr, timeout);
-          return await agent.adapter.resolveAction(evaluate, action);
+          return await agent.adapter.resolveAction(evaluate, action, button);
         } catch (e) {
           this.logFn(`[AgentStream] resolveAction(${sessionId}) error: ${e.message}`);
           return false;
@@ -33296,6 +33771,7 @@ var init_poller = __esm({
     init_setup();
     init_reconcile();
     init_logger();
+    init_approval_utils();
     AgentStreamPoller = class {
       deps;
       timer = null;
@@ -33426,7 +33902,43 @@ var init_poller = __esm({
           }
           try {
             await agentStreamManager.syncActiveSession(cdp, parentSessionId);
-            const stream = await agentStreamManager.collectActiveSession(cdp, parentSessionId);
+            let stream = await agentStreamManager.collectActiveSession(cdp, parentSessionId);
+            if (stream?.status === "waiting_approval") {
+              const autoApprove = providerLoader.getSettings(stream.agentType).autoApprove !== false;
+              if (autoApprove && resolvedActiveSessionId) {
+                const provider = providerLoader.getMeta(stream.agentType);
+                const { label: buttonLabel } = pickApprovalButton(stream.activeModal?.buttons, provider);
+                const approved = await agentStreamManager.resolveSessionAction(cdp, resolvedActiveSessionId, "approve", buttonLabel);
+                if (approved) {
+                  const effectId = [
+                    "auto_approval",
+                    resolvedActiveSessionId,
+                    String(stream.messages?.length || 0),
+                    buttonLabel,
+                    String(stream.activeModal?.message || "").trim()
+                  ].join(":");
+                  stream = {
+                    ...stream,
+                    status: "streaming",
+                    activeModal: void 0,
+                    effects: [
+                      ...stream.effects || [],
+                      {
+                        type: "message",
+                        id: effectId,
+                        persist: true,
+                        message: {
+                          role: "system",
+                          senderName: "System",
+                          kind: "system",
+                          content: formatAutoApprovalMessage(stream.activeModal?.message, buttonLabel)
+                        }
+                      }
+                    ]
+                  };
+                }
+              }
+            }
             this.deps.onStreamsUpdated?.(ideType, stream ? [stream] : []);
           } catch {
           }
@@ -37592,8 +38104,8 @@ var init_dev_server = __esm({
       }
       getEndpointList() {
         return this.routes.map((r) => {
-          const path27 = typeof r.pattern === "string" ? r.pattern : r.pattern.source.replace(/\\\//g, "/").replace(/\(\[.*?\]\+\)/g, ":type").replace(/[\^$]/g, "");
-          return `${r.method.padEnd(5)} ${path27}`;
+          const path28 = typeof r.pattern === "string" ? r.pattern : r.pattern.source.replace(/\\\//g, "/").replace(/\(\[.*?\]\+\)/g, ":type").replace(/[\^$]/g, "");
+          return `${r.method.padEnd(5)} ${path28}`;
         });
       }
       async start(port = DEV_SERVER_PORT) {
@@ -39484,8 +39996,8 @@ async function installExtension(ide, extension) {
       const res = await fetch(extension.vsixUrl);
       if (res.ok) {
         const buffer = Buffer.from(await res.arrayBuffer());
-        const fs19 = await import("fs");
-        fs19.writeFileSync(vsixPath, buffer);
+        const fs20 = await import("fs");
+        fs20.writeFileSync(vsixPath, buffer);
         return new Promise((resolve17) => {
           const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
           (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error48, _stdout, stderr) => {
@@ -41348,27 +41860,27 @@ var require_process = __commonJS({
 var require_filesystem = __commonJS({
   "../../node_modules/detect-libc/lib/filesystem.js"(exports2, module2) {
     "use strict";
-    var fs19 = require("fs");
+    var fs20 = require("fs");
     var LDD_PATH = "/usr/bin/ldd";
     var SELF_PATH = "/proc/self/exe";
     var MAX_LENGTH = 2048;
-    var readFileSync18 = (path27) => {
-      const fd = fs19.openSync(path27, "r");
+    var readFileSync18 = (path28) => {
+      const fd = fs20.openSync(path28, "r");
       const buffer = Buffer.alloc(MAX_LENGTH);
-      const bytesRead = fs19.readSync(fd, buffer, 0, MAX_LENGTH, 0);
-      fs19.close(fd, () => {
+      const bytesRead = fs20.readSync(fd, buffer, 0, MAX_LENGTH, 0);
+      fs20.close(fd, () => {
       });
       return buffer.subarray(0, bytesRead);
     };
-    var readFile = (path27) => new Promise((resolve17, reject) => {
-      fs19.open(path27, "r", (err, fd) => {
+    var readFile = (path28) => new Promise((resolve17, reject) => {
+      fs20.open(path28, "r", (err, fd) => {
         if (err) {
           reject(err);
         } else {
           const buffer = Buffer.alloc(MAX_LENGTH);
-          fs19.read(fd, buffer, 0, MAX_LENGTH, 0, (_, bytesRead) => {
+          fs20.read(fd, buffer, 0, MAX_LENGTH, 0, (_, bytesRead) => {
             resolve17(buffer.subarray(0, bytesRead));
-            fs19.close(fd, () => {
+            fs20.close(fd, () => {
             });
           });
         }
@@ -41480,11 +41992,11 @@ var require_detect_libc = __commonJS({
       }
       return null;
     };
-    var familyFromInterpreterPath = (path27) => {
-      if (path27) {
-        if (path27.includes("/ld-musl-")) {
+    var familyFromInterpreterPath = (path28) => {
+      if (path28) {
+        if (path28.includes("/ld-musl-")) {
           return MUSL;
-        } else if (path27.includes("/ld-linux-")) {
+        } else if (path28.includes("/ld-linux-")) {
           return GLIBC;
         }
       }
@@ -41531,8 +42043,8 @@ var require_detect_libc = __commonJS({
       cachedFamilyInterpreter = null;
       try {
         const selfContent = await readFile(SELF_PATH);
-        const path27 = interpreterPath(selfContent);
-        cachedFamilyInterpreter = familyFromInterpreterPath(path27);
+        const path28 = interpreterPath(selfContent);
+        cachedFamilyInterpreter = familyFromInterpreterPath(path28);
       } catch (e) {
       }
       return cachedFamilyInterpreter;
@@ -41544,8 +42056,8 @@ var require_detect_libc = __commonJS({
       cachedFamilyInterpreter = null;
       try {
         const selfContent = readFileSync18(SELF_PATH);
-        const path27 = interpreterPath(selfContent);
-        cachedFamilyInterpreter = familyFromInterpreterPath(path27);
+        const path28 = interpreterPath(selfContent);
+        cachedFamilyInterpreter = familyFromInterpreterPath(path28);
       } catch (e) {
       }
       return cachedFamilyInterpreter;
@@ -43264,18 +43776,18 @@ var require_sharp = __commonJS({
       `@img/sharp-${runtimePlatform}/sharp.node`,
       "@img/sharp-wasm32/sharp.node"
     ];
-    var path27;
+    var path28;
     var sharp;
     var errors = [];
-    for (path27 of paths) {
+    for (path28 of paths) {
       try {
-        sharp = require(path27);
+        sharp = require(path28);
         break;
       } catch (err) {
         errors.push(err);
       }
     }
-    if (sharp && path27.startsWith("@img/sharp-linux-x64") && !sharp._isUsingX64V2()) {
+    if (sharp && path28.startsWith("@img/sharp-linux-x64") && !sharp._isUsingX64V2()) {
       const err = new Error("Prebuilt binaries for linux-x64 require v2 microarchitecture");
       err.code = "Unsupported CPU";
       errors.push(err);
@@ -43284,7 +43796,7 @@ var require_sharp = __commonJS({
     if (sharp) {
       module2.exports = sharp;
     } else {
-      const [isLinux2, isMacOs, isWindows2] = ["linux", "darwin", "win32"].map((os24) => runtimePlatform.startsWith(os24));
+      const [isLinux2, isMacOs, isWindows2] = ["linux", "darwin", "win32"].map((os25) => runtimePlatform.startsWith(os25));
       const help = [`Could not load the "sharp" module using the ${runtimePlatform} runtime`];
       errors.forEach((err) => {
         if (err.code !== "MODULE_NOT_FOUND") {
@@ -43301,15 +43813,15 @@ var require_sharp = __commonJS({
           `    Requires ${expected}`
         );
       } else if (prebuiltPlatforms.includes(runtimePlatform)) {
-        const [os24, cpu] = runtimePlatform.split("-");
-        const libc = os24.endsWith("musl") ? " --libc=musl" : "";
+        const [os25, cpu] = runtimePlatform.split("-");
+        const libc = os25.endsWith("musl") ? " --libc=musl" : "";
         help.push(
           "- Ensure optional dependencies can be installed:",
           "    npm install --include=optional sharp",
           "- Ensure your package manager supports multi-platform installation:",
           "    See https://sharp.pixelplumbing.com/install#cross-platform",
           "- Add platform-specific dependencies:",
-          `    npm install --os=${os24.replace("musl", "")}${libc} --cpu=${cpu} sharp`
+          `    npm install --os=${os25.replace("musl", "")}${libc} --cpu=${cpu} sharp`
         );
       } else {
         help.push(
@@ -46184,15 +46696,15 @@ var require_color = __commonJS({
       };
     }
     function wrapConversion(toModel, graph) {
-      const path27 = [graph[toModel].parent, toModel];
+      const path28 = [graph[toModel].parent, toModel];
       let fn = conversions_default[graph[toModel].parent][toModel];
       let cur = graph[toModel].parent;
       while (graph[cur].parent) {
-        path27.unshift(graph[cur].parent);
+        path28.unshift(graph[cur].parent);
         fn = link(conversions_default[graph[cur].parent][cur], fn);
         cur = graph[cur].parent;
       }
-      fn.conversion = path27;
+      fn.conversion = path28;
       return fn;
     }
     function route(fromModel) {
@@ -46809,7 +47321,7 @@ var require_channel = __commonJS({
 var require_output = __commonJS({
   "../../node_modules/sharp/lib/output.js"(exports2, module2) {
     "use strict";
-    var path27 = require("path");
+    var path28 = require("path");
     var is = require_is();
     var sharp = require_sharp();
     var formats = /* @__PURE__ */ new Map([
@@ -46840,9 +47352,9 @@ var require_output = __commonJS({
       let err;
       if (!is.string(fileOut)) {
         err = new Error("Missing output file path");
-      } else if (is.string(this.options.input.file) && path27.resolve(this.options.input.file) === path27.resolve(fileOut)) {
+      } else if (is.string(this.options.input.file) && path28.resolve(this.options.input.file) === path28.resolve(fileOut)) {
         err = new Error("Cannot use same file for input and output");
-      } else if (jp2Regex.test(path27.extname(fileOut)) && !this.constructor.format.jp2k.output.file) {
+      } else if (jp2Regex.test(path28.extname(fileOut)) && !this.constructor.format.jp2k.output.file) {
         err = errJp2Save();
       }
       if (err) {
@@ -48340,6 +48852,12 @@ var init_session_host_controller = __esm({
           payload: { sessionId, clientId }
         });
       }
+      async pruneDuplicateSessions(payload = {}) {
+        return this.request({
+          type: "prune_duplicate_sessions",
+          payload
+        });
+      }
       async acquireWrite(payload) {
         return this.request({
           type: "acquire_write",
@@ -48506,7 +49024,7 @@ var init_adhdev_daemon = __esm({
     import_ws3 = require("ws");
     import_chalk2 = __toESM(require("chalk"));
     init_version();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.28" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.30" });
     DANGEROUS_PATTERNS = [
       /\brm\s+(-[a-z]*f|-[a-z]*r|--force|--recursive)/i,
       /\bsudo\b/i,
@@ -49157,10 +49675,10 @@ async function runWizard(options = {}) {
 }
 async function checkForUpdate() {
   try {
-    const { execSync: execSync7 } = await import("child_process");
+    const { execSync: execSync8 } = await import("child_process");
     let currentVersion = null;
     try {
-      currentVersion = execSync7("adhdev --version", {
+      currentVersion = execSync8("adhdev --version", {
         encoding: "utf-8",
         timeout: 3e3,
         stdio: ["pipe", "pipe", "pipe"]
@@ -49170,7 +49688,7 @@ async function checkForUpdate() {
     }
     let latestVersion = null;
     try {
-      latestVersion = execSync7("npm show adhdev version", {
+      latestVersion = execSync8("npm show adhdev version", {
         encoding: "utf-8",
         timeout: 5e3,
         stdio: ["pipe", "pipe", "pipe"]
@@ -49192,7 +49710,7 @@ async function checkForUpdate() {
     }
     const spinner = (await import("ora")).default("Updating adhdev CLI...").start();
     try {
-      execSync7("npm install -g adhdev@latest", {
+      execSync8("npm install -g adhdev@latest", {
         encoding: "utf-8",
         timeout: 6e4,
         stdio: ["pipe", "pipe", "pipe"]
@@ -49276,16 +49794,16 @@ async function loginFlow() {
   let verificationUrl;
   try {
     const config2 = loadConfig();
-    const os24 = await import("os");
+    const os25 = await import("os");
     const res = await fetch(`${SERVER_URL}/auth/cli/init`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({
         clientMachineId: config2.machineId,
         registeredMachineId: config2.registeredMachineId,
-        hostname: os24.hostname(),
-        platform: os24.platform(),
-        arch: os24.arch()
+        hostname: os25.hostname(),
+        platform: os25.platform(),
+        arch: os25.arch()
       })
     });
     if (!res.ok) {
@@ -49383,20 +49901,20 @@ async function startDaemonFlow() {
   try {
     const { AdhdevDaemon: AdhdevDaemon2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
     const daemon = new AdhdevDaemon2();
-    const { execSync: execSync7 } = await import("child_process");
+    const { execSync: execSync8 } = await import("child_process");
     const { getCurrentDaemonLogPath: getCurrentDaemonLogPath2 } = await Promise.resolve().then(() => (init_src(), src_exports));
     const logPath = getCurrentDaemonLogPath2();
-    const os24 = await import("os");
-    const platform11 = os24.platform();
+    const os25 = await import("os");
+    const platform11 = os25.platform();
     try {
       if (platform11 === "win32") {
-        execSync7("start /B adhdev daemon >NUL 2>&1", {
+        execSync8("start /B adhdev daemon >NUL 2>&1", {
           timeout: 3e3,
           stdio: "ignore",
           shell: "cmd.exe"
         });
       } else {
-        execSync7("nohup adhdev daemon >/dev/null 2>&1 &", {
+        execSync8("nohup adhdev daemon >/dev/null 2>&1 &", {
           timeout: 3e3,
           stdio: "ignore"
         });
@@ -49825,7 +50343,7 @@ var init_supported = __esm({
         "source": "docs/site/data/provider-catalog.mjs"
       },
       "codex-cli": {
-        "status": "unverified",
+        "status": "partial",
         "testedOn": [
           "macOS 26.4"
         ],
@@ -49837,11 +50355,12 @@ var init_supported = __esm({
           "send_chat",
           "read_chat",
           "resume",
+          "reconnect",
           "stop"
         ],
         "lastValidated": "2026-04-09",
-        "notes": "Saved-session resume works locally, but reconnect after daemon or transport disruption is still unverified. Fresh launch still lands in an onboarding-style prompt state often enough that exact-answer send/read validation is not yet trustworthy.",
-        "evidence": "Manual local validation via standalone API on 2026-04-09",
+        "notes": "Fresh launch, live send/read, saved-session resume, daemon-restart reconnect, and stop were validated locally after tightening onboarding-screen parsing, providerSessionId recovery, and history replay dedupe. Some older saved transcripts may still need one-time compaction if they were polluted before the fix.",
+        "evidence": "Manual local validation via standalone API and session-host restart recovery on 2026-04-09",
         "owner": "core",
         "source": "docs/site/data/provider-catalog.mjs"
       },
@@ -49922,11 +50441,14 @@ var init_supported = __esm({
         "validatedFlows": [
           "read_chat",
           "new_session",
-          "send_chat"
+          "send_chat",
+          "list_sessions",
+          "switch_session",
+          "resolve_action"
         ],
-        "lastValidated": "2026-04-09",
-        "notes": "A fresh Codex extension chat could be created and answered correctly inside Antigravity. The current provider surface still does not expose dedicated list_sessions or switch_session scripts, and extension history listing remains empty in local validation.",
-        "evidence": "Manual local validation via standalone API on 2026-04-09",
+        "lastValidated": "2026-04-10",
+        "notes": "Cursor-hosted Codex on macOS now has locale-agnostic read/list/switch handling, approve-path resolve_action, and transcript cleanup for localized timestamps plus stale replay turns. It remains Partial because recent-task history can still collapse to the current chat and some send_chat attempts still fail to materialize as a real turn, even though false-success reporting is now blocked.",
+        "evidence": "Manual local validation via standalone API on 2026-04-10 against Cursor-hosted Codex webview, including recent-task list/switch, approve-path resolve_action, and transcript cleanup verification",
         "owner": "core",
         "source": "docs/site/data/provider-catalog.mjs"
       },
@@ -50352,7 +50874,7 @@ var init_supported = __esm({
       "windsurf": "unverified",
       "aider-cli": "unverified",
       "claude-cli": "partial",
-      "codex-cli": "unverified",
+      "codex-cli": "partial",
       "cursor-cli": "unverified",
       "gemini-cli": "unverified",
       "github-copilot-cli": "unverified",
@@ -50469,7 +50991,7 @@ var init_supported = __esm({
 
 // src/cli/index.ts
 var import_commander = require("commander");
-var import_chalk8 = __toESM(require("chalk"));
+var import_chalk9 = __toESM(require("chalk"));
 init_src();
 
 // src/cli/setup-commands.ts
@@ -50859,7 +51381,7 @@ function registerDaemonCommands(program2, pkgVersion3) {
     });
   });
   program2.command("standalone").description("\u{1F5A5}\uFE0F  Start ADHDev Standalone Server (Local Dashboard & Embedded Daemon)").option("-p, --port <port>", "Local HTTP/WS server port", "3847").option("--host <host>", "Bind to specific host (use 0.0.0.0 for LAN access)").option("--no-open", "Prevent opening browser automatically").option("--token <token>", "Require token authentication").option("--dev", "Enable Dev Mode").action(async (options) => {
-    const { spawn: spawn5, execSync: execSync7 } = await import("child_process");
+    const { spawn: spawn5, execSync: execSync8 } = await import("child_process");
     console.log(import_chalk5.default.cyan("\n  Starting ADHDev Standalone Server..."));
     const args = [];
     if (options.port) args.push("--port", options.port);
@@ -50870,7 +51392,7 @@ function registerDaemonCommands(program2, pkgVersion3) {
     let bin = "npx";
     const npxArgs = ["-y", "@adhdev/daemon-standalone@latest", ...args];
     try {
-      execSync7("adhdev-standalone --help", { stdio: "ignore" });
+      execSync8("adhdev-standalone --help", { stdio: "ignore" });
       bin = "adhdev-standalone";
     } catch {
       console.log(import_chalk5.default.gray("  Standalone server package not found locally."));
@@ -50976,7 +51498,7 @@ function registerDaemonCommands(program2, pkgVersion3) {
 `));
     }
   }));
-  hideCommand(program2.command("daemon:session-host").description("Inspect and control the session host").option("-p, --port <port>", "Local WS server port", "19222").option("--json", "Print raw JSON diagnostics/result").option("--limit <count>", "Number of diagnostics entries to include", "20").option("--session <sessionId>", "Target session ID").option("--restart", "Restart the target session").option("--resume", "Resume the target session").option("--stop", "Stop the target session").option("--signal <signal>", "Send a signal to the target session").option("--detach-client <clientId>", "Force-detach a client from the target session").option("--acquire-write <clientId>", "Force-acquire write ownership for a client").option("--release-write <clientId>", "Release write ownership for a client").option("--owner-type <type>", "ownerType for --acquire-write (user|agent)", "user").action(async (options) => {
+  hideCommand(program2.command("daemon:session-host").description("Inspect and control the session host").option("-p, --port <port>", "Local WS server port", "19222").option("--json", "Print raw JSON diagnostics/result").option("--limit <count>", "Number of diagnostics entries to include", "20").option("--session <sessionId>", "Target session ID").option("--restart", "Restart the target session").option("--resume", "Resume the target session").option("--stop", "Stop the target session").option("--signal <signal>", "Send a signal to the target session").option("--detach-client <clientId>", "Force-detach a client from the target session").option("--prune-duplicates", "Stop and remove duplicate hosted runtimes that share the same provider session binding").option("--acquire-write <clientId>", "Force-acquire write ownership for a client").option("--release-write <clientId>", "Release write ownership for a client").option("--owner-type <type>", "ownerType for --acquire-write (user|agent)", "user").action(async (options) => {
     const sessionId = typeof options.session === "string" ? options.session.trim() : "";
     const limit = Math.max(1, Math.min(200, parseInt(options.limit, 10) || 20));
     const port = parseInt(options.port, 10) || 19222;
@@ -51023,6 +51545,10 @@ function registerDaemonCommands(program2, pkgVersion3) {
         daemonCommand = "session_host_force_detach_client";
         daemonArgs = { sessionId, clientId: String(options.detachClient) };
         directRequest = { type: "force_detach_client", payload: { sessionId, clientId: String(options.detachClient) } };
+      } else if (options.pruneDuplicates) {
+        daemonCommand = "session_host_prune_duplicate_sessions";
+        daemonArgs = {};
+        directRequest = { type: "prune_duplicate_sessions", payload: {} };
       } else if (options.acquireWrite) {
         requireSessionId();
         daemonCommand = "session_host_acquire_write";
@@ -51063,7 +51589,17 @@ function registerDaemonCommands(program2, pkgVersion3) {
         console.log(JSON.stringify(payload, null, 2));
         return;
       }
-      if (options.restart || options.resume || options.stop || options.signal || options.detachClient || options.acquireWrite || options.releaseWrite) {
+      if (options.restart || options.resume || options.stop || options.signal || options.detachClient || options.pruneDuplicates || options.acquireWrite || options.releaseWrite) {
+        if (options.pruneDuplicates) {
+          const result = payload || {};
+          console.log(import_chalk5.default.green("\n  \u2713 Session host duplicate prune completed.\n"));
+          console.log(import_chalk5.default.gray(`  Source:    ${source === "daemon" ? "daemon control plane" : "direct host fallback"}`));
+          console.log(import_chalk5.default.gray(`  Groups:    ${result?.duplicateGroupCount || 0}`));
+          console.log(import_chalk5.default.gray(`  Kept:      ${Array.isArray(result?.keptSessionIds) ? result.keptSessionIds.length : 0}`));
+          console.log(import_chalk5.default.gray(`  Pruned:    ${Array.isArray(result?.prunedSessionIds) ? result.prunedSessionIds.length : 0}`));
+          console.log();
+          return;
+        }
         const record2 = payload;
         console.log(import_chalk5.default.green("\n  \u2713 Session host action completed.\n"));
         console.log(import_chalk5.default.gray(`  Source:    ${source === "daemon" ? "daemon control plane" : "direct host fallback"}`));
@@ -51153,7 +51689,7 @@ function registerDaemonCommands(program2, pkgVersion3) {
   hideCommand(program2.command("daemon:upgrade").description("Upgrade ADHDev to latest version and restart daemon").option("--no-restart", "Upgrade only, skip daemon restart").action(async (options) => {
     const { isDaemonRunning: isDaemonRunning2, stopDaemon: stopDaemon2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
     const { stopSessionHost: stopSessionHost2 } = await Promise.resolve().then(() => (init_session_host(), session_host_exports));
-    const { execSync: execSync7, spawn: spawn5 } = await import("child_process");
+    const { execSync: execSync8, spawn: spawn5 } = await import("child_process");
     const fsMod = await import("fs");
     const pathMod = await import("path");
     console.log(import_chalk5.default.bold("\n  \u{1F504} ADHDev Upgrade\n"));
@@ -51173,10 +51709,10 @@ function registerDaemonCommands(program2, pkgVersion3) {
         while (!fsMod.existsSync(pathMod.join(gitRoot, ".git")) && gitRoot !== "/") {
           gitRoot = pathMod.dirname(gitRoot);
         }
-        execSync7("git pull --rebase", { cwd: gitRoot, stdio: "inherit" });
+        execSync8("git pull --rebase", { cwd: gitRoot, stdio: "inherit" });
         console.log(import_chalk5.default.cyan("\n  Building..."));
-        execSync7("npm run build", { cwd: launcherDir, stdio: "inherit" });
-        execSync7("npm link", { cwd: launcherDir, stdio: "inherit" });
+        execSync8("npm run build", { cwd: launcherDir, stdio: "inherit" });
+        execSync8("npm link", { cwd: launcherDir, stdio: "inherit" });
         console.log(import_chalk5.default.green("\n  \u2713 Build complete"));
       } catch (e) {
         console.log(import_chalk5.default.red(`
@@ -51188,7 +51724,7 @@ function registerDaemonCommands(program2, pkgVersion3) {
       console.log(import_chalk5.default.cyan("\n  Checking for updates..."));
       let latest;
       try {
-        latest = execSync7("npm view adhdev version", { encoding: "utf-8" }).trim();
+        latest = execSync8("npm view adhdev version", { encoding: "utf-8" }).trim();
       } catch (e) {
         console.log(import_chalk5.default.red(`
   \u2717 Failed to check latest version: ${e?.message}
@@ -51857,35 +52393,35 @@ function registerProviderCommands(program2) {
       let osPaths = {};
       let processNames = {};
       if (category === "ide") {
-        const fs19 = await import("fs");
-        const path27 = await import("path");
-        const os24 = await import("os");
-        if (os24.platform() === "darwin") {
+        const fs20 = await import("fs");
+        const path28 = await import("path");
+        const os25 = await import("os");
+        if (os25.platform() === "darwin") {
           while (true) {
             const p = (await rl.question(`macOS Application Path (e.g. /Applications/${defaultName}.app): `)).trim() || `/Applications/${defaultName}.app`;
             if (p === "skip") break;
-            if (!fs19.existsSync(p)) {
+            if (!fs20.existsSync(p)) {
               console.log(import_chalk7.default.red(`  \u2717 Path not found: ${p}`));
               console.log(import_chalk7.default.gray(`    (Please provide the exact absolute path to the .app or binary, or type 'skip')`));
               continue;
             }
             console.log(import_chalk7.default.green(`  \u2713 Path verified: ${p}`));
             osPaths["darwin"] = [p];
-            processNames["darwin"] = path27.basename(p, ".app");
+            processNames["darwin"] = path28.basename(p, ".app");
             break;
           }
-        } else if (os24.platform() === "win32") {
+        } else if (os25.platform() === "win32") {
           while (true) {
             const p = (await rl.question(`Windows Executable Path (e.g. C:\\Program Files\\${defaultName}\\${defaultName}.exe): `)).trim();
             if (!p || p === "skip") break;
-            if (!fs19.existsSync(p)) {
+            if (!fs20.existsSync(p)) {
               console.log(import_chalk7.default.red(`  \u2717 Path not found: ${p}`));
               console.log(import_chalk7.default.gray(`    (Please provide the exact absolute path, or type 'skip')`));
               continue;
             }
             console.log(import_chalk7.default.green(`  \u2713 Path verified: ${p}`));
             osPaths["win32"] = [p];
-            processNames["win32"] = path27.basename(p, ".exe");
+            processNames["win32"] = path28.basename(p, ".exe");
             break;
           }
         }
@@ -52571,8 +53107,8 @@ function registerCdpCommands(program2) {
       }
       const output = typeof result === "string" ? result : JSON.stringify(result, null, 2);
       if (options.output) {
-        const fs19 = await import("fs");
-        fs19.writeFileSync(options.output, output, "utf-8");
+        const fs20 = await import("fs");
+        fs20.writeFileSync(options.output, output, "utf-8");
         console.log(import_chalk7.default.green(`
   \u2713 Saved to ${options.output} (${output.length} chars)
 `));
@@ -52675,8 +53211,8 @@ function registerCdpCommands(program2) {
         ws.on("message", async (data) => {
           const msg = JSON.parse(data.toString());
           if (msg.id === 1 && msg.result?.data) {
-            const fs19 = await import("fs");
-            fs19.writeFileSync(options.output, Buffer.from(msg.result.data, "base64"));
+            const fs20 = await import("fs");
+            fs20.writeFileSync(options.output, Buffer.from(msg.result.data, "base64"));
             console.log(import_chalk7.default.green(`
   \u2713 Screenshot saved to ${options.output}
 `));
@@ -52695,14 +53231,197 @@ function registerCdpCommands(program2) {
   });
 }
 
+// src/cli/service-commands.ts
+var import_node_fs3 = __toESM(require("fs"));
+var import_node_path2 = __toESM(require("path"));
+var import_node_os2 = __toESM(require("os"));
+var import_node_child_process = require("child_process");
+var import_chalk8 = __toESM(require("chalk"));
+var LAUNCHD_LABEL = "dev.adhf.daemon";
+var ADHDEV_DIR = import_node_path2.default.join(import_node_os2.default.homedir(), ".adhdev");
+function getDarwinPlistPath() {
+  return import_node_path2.default.join(import_node_os2.default.homedir(), "Library", "LaunchAgents", `${LAUNCHD_LABEL}.plist`);
+}
+function getWindowsStartupDir() {
+  const appData = process.env.APPDATA || import_node_path2.default.join(import_node_os2.default.homedir(), "AppData", "Roaming");
+  return import_node_path2.default.join(appData, "Microsoft", "Windows", "Start Menu", "Programs", "Startup");
+}
+function getWindowsVbsPath() {
+  return import_node_path2.default.join(getWindowsStartupDir(), "adhdev-daemon.vbs");
+}
+function resolveCliPath() {
+  return import_node_fs3.default.realpathSync(process.argv[1]);
+}
+function ensureDir(dir) {
+  if (!import_node_fs3.default.existsSync(dir)) import_node_fs3.default.mkdirSync(dir, { recursive: true });
+}
+function buildPlist(nodeExe, cliExe) {
+  const outLog = import_node_path2.default.join(ADHDEV_DIR, "daemon-launchd.out");
+  const errLog = import_node_path2.default.join(ADHDEV_DIR, "daemon-launchd.err");
+  const brewPrefix = import_node_fs3.default.existsSync("/opt/homebrew/bin") ? "/opt/homebrew/bin" : "/usr/local/bin";
+  return `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>Label</key>
+    <string>${LAUNCHD_LABEL}</string>
+    <key>ProgramArguments</key>
+    <array>
+        <string>${nodeExe}</string>
+        <string>${cliExe}</string>
+        <string>daemon</string>
+    </array>
+    <key>RunAtLoad</key>
+    <true/>
+    <key>KeepAlive</key>
+    <dict>
+        <key>SuccessfulExit</key>
+        <false/>
+    </dict>
+    <key>ThrottleInterval</key>
+    <integer>10</integer>
+    <key>StandardOutPath</key>
+    <string>${outLog}</string>
+    <key>StandardErrorPath</key>
+    <string>${errLog}</string>
+    <key>EnvironmentVariables</key>
+    <dict>
+        <key>PATH</key>
+        <string>${brewPrefix}:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
+    </dict>
+</dict>
+</plist>`;
+}
+function installDarwin(nodeExe, cliExe) {
+  const plistPath = getDarwinPlistPath();
+  ensureDir(ADHDEV_DIR);
+  ensureDir(import_node_path2.default.dirname(plistPath));
+  import_node_fs3.default.writeFileSync(plistPath, buildPlist(nodeExe, cliExe), "utf-8");
+  console.log(import_chalk8.default.gray(`  Plist: ${plistPath}`));
+  try {
+    (0, import_node_child_process.execSync)(`launchctl unload "${plistPath}" 2>/dev/null`, { stdio: "ignore" });
+  } catch {
+  }
+  try {
+    (0, import_node_child_process.execSync)(`launchctl load -w "${plistPath}"`, { stdio: "ignore" });
+    console.log(import_chalk8.default.green("\n  \u2713 Registered as LaunchAgent \u2014 daemon will start on login."));
+    console.log(import_chalk8.default.gray(`  Logs: ~/.adhdev/daemon-launchd.{out,err}`));
+  } catch (e) {
+    console.log(import_chalk8.default.red(`
+  \u2717 launchctl load failed: ${e.message}`));
+    console.log(import_chalk8.default.gray("  Try: launchctl load -w ~/Library/LaunchAgents/dev.adhf.daemon.plist"));
+  }
+}
+function uninstallDarwin() {
+  const plistPath = getDarwinPlistPath();
+  if (!import_node_fs3.default.existsSync(plistPath)) {
+    console.log(import_chalk8.default.yellow("\n  \u26A0 Service is not installed."));
+    return;
+  }
+  try {
+    (0, import_node_child_process.execSync)(`launchctl unload "${plistPath}" 2>/dev/null`, { stdio: "ignore" });
+  } catch {
+  }
+  import_node_fs3.default.unlinkSync(plistPath);
+  console.log(import_chalk8.default.green("\n  \u2713 Removed LaunchAgent. Daemon will no longer auto-start."));
+}
+function statusDarwin() {
+  const plistPath = getDarwinPlistPath();
+  if (!import_node_fs3.default.existsSync(plistPath)) return "not-installed";
+  return "installed";
+}
+function buildVbs(cliExe) {
+  return `' ADHDev Daemon Auto-Start (generated by adhdev service install)
+Set WshShell = CreateObject("WScript.Shell")
+WshShell.Run "cmd.exe /c ""node"" ""${cliExe.replace(/\\/g, "\\\\")}"" daemon", 0, False
+`;
+}
+function installWindows(cliExe) {
+  const vbsPath = getWindowsVbsPath();
+  ensureDir(ADHDEV_DIR);
+  ensureDir(import_node_path2.default.dirname(vbsPath));
+  import_node_fs3.default.writeFileSync(vbsPath, buildVbs(cliExe), "utf-8");
+  console.log(import_chalk8.default.gray(`  Startup script: ${vbsPath}`));
+  console.log(import_chalk8.default.green("\n  \u2713 Registered in Startup folder \u2014 daemon will start on login (hidden)."));
+  console.log(import_chalk8.default.gray("  To start now without rebooting, run: adhdev daemon"));
+}
+function uninstallWindows() {
+  const vbsPath = getWindowsVbsPath();
+  if (!import_node_fs3.default.existsSync(vbsPath)) {
+    console.log(import_chalk8.default.yellow("\n  \u26A0 Service is not installed."));
+    return;
+  }
+  import_node_fs3.default.unlinkSync(vbsPath);
+  console.log(import_chalk8.default.green("\n  \u2713 Removed Startup script. Daemon will no longer auto-start."));
+  console.log(import_chalk8.default.gray("  Note: a currently running daemon is not affected. Stop with: adhdev daemon:stop"));
+}
+function statusWindows() {
+  return import_node_fs3.default.existsSync(getWindowsVbsPath()) ? "installed" : "not-installed";
+}
+function registerServiceCommands(program2) {
+  const svc = program2.command("service").description("\u{1F50C} Manage ADHDev as an OS background auto-start service");
+  svc.command("install").description("Register ADHDev daemon to start automatically on login").action(async () => {
+    console.log(import_chalk8.default.bold("\n  \u{1F680} Installing ADHDev Background Service"));
+    const platform11 = import_node_os2.default.platform();
+    const nodeExe = process.execPath;
+    const cliExe = resolveCliPath();
+    console.log(import_chalk8.default.gray(`  Node:     ${nodeExe}`));
+    console.log(import_chalk8.default.gray(`  CLI:      ${cliExe}`));
+    console.log(import_chalk8.default.gray(`  Platform: ${platform11}`));
+    if (platform11 === "darwin") {
+      installDarwin(nodeExe, cliExe);
+    } else if (platform11 === "win32") {
+      installWindows(cliExe);
+    } else {
+      console.log(import_chalk8.default.yellow("\n  \u26A0 Auto-start service install is not supported on this platform."));
+      console.log(import_chalk8.default.gray("  On Linux, create a systemd user unit manually:"));
+      console.log(import_chalk8.default.gray("    ~/.config/systemd/user/adhdev-daemon.service"));
+    }
+    console.log();
+  });
+  svc.command("uninstall").description("Remove the OS background service").action(async () => {
+    console.log(import_chalk8.default.bold("\n  \u{1F5D1}\uFE0F  Removing ADHDev Background Service"));
+    const platform11 = import_node_os2.default.platform();
+    if (platform11 === "darwin") {
+      uninstallDarwin();
+    } else if (platform11 === "win32") {
+      uninstallWindows();
+    } else {
+      console.log(import_chalk8.default.yellow("\n  \u26A0 Not supported on this platform."));
+    }
+    console.log();
+  });
+  svc.command("status").description("Check whether the OS background service is installed").action(async () => {
+    const platform11 = import_node_os2.default.platform();
+    let state = "not-installed";
+    if (platform11 === "darwin") {
+      state = statusDarwin();
+    } else if (platform11 === "win32") {
+      state = statusWindows();
+    }
+    if (state === "installed") {
+      console.log(import_chalk8.default.green("\n  \u2713 Service is installed. Daemon auto-starts on login."));
+      if (platform11 === "darwin") {
+        console.log(import_chalk8.default.gray(`  Plist: ${getDarwinPlistPath()}`));
+      } else {
+        console.log(import_chalk8.default.gray(`  Script: ${getWindowsVbsPath()}`));
+      }
+    } else {
+      console.log(import_chalk8.default.gray("\n  \u2717 Service is not installed."));
+      console.log(import_chalk8.default.gray("  Run: adhdev service install"));
+    }
+    console.log();
+  });
+}
+
 // src/cli/index.ts
 init_version();
 var pkgVersion2 = resolvePackageVersion();
 if (process.platform === "win32") {
   const nodeMajor = Number.parseInt(process.versions.node.split(".")[0] || "0", 10);
   if (nodeMajor >= 24) {
-    console.error(import_chalk8.default.red("\n\u2717 Windows is currently unsupported on Node.js 24+ for ADHDev."));
-    console.error(import_chalk8.default.gray("  Install Node.js 22.x on Windows, then retry.\n"));
+    console.error(import_chalk9.default.red("\n\u2717 Windows is currently unsupported on Node.js 24+ for ADHDev."));
+    console.error(import_chalk9.default.gray("  Install Node.js 22.x on Windows, then retry.\n"));
     process.exit(1);
   }
 }
@@ -52717,6 +53436,7 @@ registerDaemonCommands(program, pkgVersion2);
 registerDoctorCommands(program, pkgVersion2);
 registerProviderCommands(program);
 registerCdpCommands(program);
+registerServiceCommands(program);
 void (async () => {
   const helperMode = await maybeRunDaemonUpgradeHelperFromEnv();
   if (helperMode) {
@@ -52725,25 +53445,26 @@ void (async () => {
   if (process.argv.length <= 2) {
     program.outputHelp();
     console.log();
-    console.log(import_chalk8.default.gray("  Quick start:"));
-    console.log(import_chalk8.default.gray("    adhdev setup             \u2014 First-time setup & login"));
-    console.log(import_chalk8.default.gray("    adhdev daemon            \u2014 Start unified daemon (Required)"));
-    console.log(import_chalk8.default.gray("    adhdev standalone        \u2014 Start standalone local dashboard & daemon"));
-    console.log(import_chalk8.default.gray("    adhdev launch cursor     \u2014 Launch IDE with CDP (e.g. cursor, windsurf)"));
-    console.log(import_chalk8.default.gray("    adhdev launch claude     \u2014 Launch CLI agent via the running daemon"));
-    console.log(import_chalk8.default.gray("    adhdev status            \u2014 Check current setup"));
-    console.log(import_chalk8.default.gray("    adhdev doctor            \u2014 Diagnose install & native dependencies"));
-    console.log(import_chalk8.default.gray("    adhdev update            \u2014 Upgrade to latest version"));
+    console.log(import_chalk9.default.gray("  Quick start:"));
+    console.log(import_chalk9.default.gray("    adhdev setup             \u2014 First-time setup & login"));
+    console.log(import_chalk9.default.gray("    adhdev daemon            \u2014 Start unified daemon (Required)"));
+    console.log(import_chalk9.default.gray("    adhdev standalone        \u2014 Start standalone local dashboard & daemon"));
+    console.log(import_chalk9.default.gray("    adhdev launch cursor     \u2014 Launch IDE with CDP (e.g. cursor, windsurf)"));
+    console.log(import_chalk9.default.gray("    adhdev launch claude     \u2014 Launch CLI agent via the running daemon"));
+    console.log(import_chalk9.default.gray("    adhdev status            \u2014 Check current setup"));
+    console.log(import_chalk9.default.gray("    adhdev doctor            \u2014 Diagnose install & native dependencies"));
+    console.log(import_chalk9.default.gray("    adhdev update            \u2014 Upgrade to latest version"));
     console.log();
-    console.log(import_chalk8.default.gray("  Advanced tools:"));
-    console.log(import_chalk8.default.gray("    adhdev provider ...      \u2014 Provider development commands"));
-    console.log(import_chalk8.default.gray("    adhdev cdp ...           \u2014 CDP debugging tools"));
+    console.log(import_chalk9.default.gray("  Advanced tools:"));
+    console.log(import_chalk9.default.gray("    adhdev service           \u2014 Manage OS background auto-start service"));
+    console.log(import_chalk9.default.gray("    adhdev provider ...      \u2014 Provider development commands"));
+    console.log(import_chalk9.default.gray("    adhdev cdp ...           \u2014 CDP debugging tools"));
     console.log();
     return;
   }
   await program.parseAsync(process.argv);
 })().catch((err) => {
-  console.error(import_chalk8.default.red(`
+  console.error(import_chalk9.default.red(`
 \u2717 ${err.message}`));
   process.exit(1);
 });