@adhdev/daemon-core 0.8.93 → 0.8.95

package/dist/index.mjs

@@ -2504,7 +2504,7 @@ var init_provider_cli_adapter = __esm({
               `[${this.cliType}] Waiting for interactive prompt: hasPrompt=${hasPrompt} stableMs=${stableMs} recentOutputMs=${recentlyOutput} status=${status} startup=${startupLikelyActive} screen=${JSON.stringify(summarizeCliTraceText(screenText, 220)).slice(0, 260)}`
             );
           }
-          await new Promise((resolve11) => setTimeout(resolve11, 50));
+          await new Promise((resolve12) => setTimeout(resolve12, 50));
         }
         const finalScreenText = this.terminalScreen.getText() || "";
         LOG.warn(
@@ -3092,7 +3092,7 @@ var init_provider_cli_adapter = __esm({
       }
       projectEffectiveStatus(startupModal = null) {
         if (this.parseErrorMessage) return "error";
-        if (startupModal) return "waiting_approval";
+        if (startupModal || this.activeModal) return "waiting_approval";
         if (this.isWaitingForResponse && this.currentTurnScope && this.currentStatus === "idle") return "generating";
         return this.currentStatus;
       }
@@ -3100,12 +3100,24 @@ var init_provider_cli_adapter = __esm({
       getStatus() {
         const screenText = this.terminalScreen.getText() || "";
         const startupModal = this.startupParseGate ? this.getStartupConfirmationModal(screenText) : null;
-        const effectiveStatus = this.projectEffectiveStatus(startupModal);
+        let effectiveStatus = this.projectEffectiveStatus(startupModal);
+        let effectiveModal = startupModal || this.activeModal;
+        if (!startupModal && !effectiveModal && typeof this.cliScripts?.parseOutput === "function") {
+          try {
+            const parsed = this.getScriptParsedStatus();
+            const parsedModal = parsed?.activeModal && Array.isArray(parsed.activeModal.buttons) && parsed.activeModal.buttons.some((button) => typeof button === "string" && button.trim()) ? parsed.activeModal : null;
+            if (parsed?.status === "waiting_approval" && parsedModal) {
+              effectiveStatus = "waiting_approval";
+              effectiveModal = parsedModal;
+            }
+          } catch {
+          }
+        }
         return {
           status: effectiveStatus,
           messages: [...this.committedMessages],
           workingDir: this.workingDir,
-          activeModal: startupModal || this.activeModal,
+          activeModal: effectiveModal,
           errorMessage: this.parseErrorMessage || void 0,
           errorReason: this.parseErrorMessage ? "parse_error" : void 0
         };
@@ -3141,6 +3153,15 @@ var init_provider_cli_adapter = __esm({
           this.currentTurnScope,
           screenText
         );
+        const parsedModal = parsed?.activeModal && Array.isArray(parsed.activeModal.buttons) && parsed.activeModal.buttons.some((button) => typeof button === "string" && button.trim()) ? parsed.activeModal : null;
+        if (parsedModal && parsed?.status === "waiting_approval") {
+          this.activeModal = parsedModal;
+          this.isWaitingForResponse = true;
+          if (this.currentStatus !== "waiting_approval") {
+            this.setStatus("waiting_approval", "parsed_waiting_approval");
+            this.onStatusChange?.();
+          }
+        }
         if (this.maybeCommitVisibleIdleTranscript(parsed)) {
           return this.getScriptParsedStatus();
         }
@@ -3345,7 +3366,7 @@ ${data.message || ""}`.trim();
           const deadline = Date.now() + 1e4;
           while (this.startupParseGate && Date.now() < deadline) {
             this.resolveStartupState("send_wait");
-            await new Promise((resolve11) => setTimeout(resolve11, 50));
+            await new Promise((resolve12) => setTimeout(resolve12, 50));
           }
         }
         if (!allowInterventionPrompt) {
@@ -3437,12 +3458,12 @@ ${data.message || ""}`.trim();
             if (this.isWaitingForResponse) this.finishResponse();
           }, this.timeouts.maxResponse);
         };
-        await new Promise((resolve11) => {
+        await new Promise((resolve12) => {
           let resolved = false;
           const resolveOnce = () => {
             if (resolved) return;
             resolved = true;
-            resolve11();
+            resolve12();
           };
           const submit = () => {
             if (!this.ptyProcess) {
@@ -3616,17 +3637,17 @@ ${data.message || ""}`.trim();
         }
       }
       waitForStopped(timeoutMs) {
-        return new Promise((resolve11) => {
+        return new Promise((resolve12) => {
           const startedAt = Date.now();
           const timer = setInterval(() => {
             if (!this.ptyProcess || this.currentStatus === "stopped") {
               clearInterval(timer);
-              resolve11(true);
+              resolve12(true);
               return;
             }
             if (Date.now() - startedAt >= timeoutMs) {
               clearInterval(timer);
-              resolve11(false);
+              resolve12(false);
             }
           }, 100);
         });
@@ -3791,7 +3812,22 @@ ${data.message || ""}`.trim();
       }
       resolveModal(buttonIndex) {
         const screenText = this.terminalScreen.getText() || "";
-        const modal = this.activeModal || this.getStartupConfirmationModal(screenText);
+        let modal = this.activeModal || this.getStartupConfirmationModal(screenText);
+        if (!modal && typeof this.cliScripts?.parseOutput === "function") {
+          try {
+            const parsed = this.getScriptParsedStatus();
+            const parsedModal = parsed?.activeModal && Array.isArray(parsed.activeModal.buttons) && parsed.activeModal.buttons.some((button) => typeof button === "string" && button.trim()) ? parsed.activeModal : null;
+            if (parsed?.status === "waiting_approval" && parsedModal) {
+              modal = parsedModal;
+              this.activeModal = parsedModal;
+              if (this.currentStatus !== "waiting_approval") {
+                this.setStatus("waiting_approval", "resolve_modal_parse");
+                this.onStatusChange?.();
+              }
+            }
+          } catch {
+          }
+        }
         if (!this.ptyProcess || this.currentStatus !== "waiting_approval" && !modal) return;
         this.clearIdleFinishCandidate("resolve_modal");
         this.recordTrace("resolve_modal", {
@@ -4605,15 +4641,15 @@ function resolveCommandPath(command) {
   return null;
 }
 function execAsync(cmd, timeoutMs = 5e3) {
-  return new Promise((resolve11) => {
+  return new Promise((resolve12) => {
     const child = exec(cmd, { encoding: "utf-8", timeout: timeoutMs }, (err, stdout) => {
       if (err || !stdout?.trim()) {
-        resolve11(null);
+        resolve12(null);
       } else {
-        resolve11(stdout.trim());
+        resolve12(stdout.trim());
       }
     });
-    child.on("error", () => resolve11(null));
+    child.on("error", () => resolve12(null));
   });
 }
 async function detectCLIs(providerLoader, options) {
@@ -4973,7 +5009,7 @@ var DaemonCdpManager = class {
   * Returns multiple entries if multiple IDE windows are open on same port
   */
   static listAllTargets(port) {
-    return new Promise((resolve11) => {
+    return new Promise((resolve12) => {
       const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
@@ -4989,16 +5025,16 @@ var DaemonCdpManager = class {
               (t) => !isNonMain(t.title || "") && t.url?.includes("workbench.html") && !t.url?.includes("agent")
             );
             const fallbackPages = pages.filter((t) => !isNonMain(t.title || ""));
-            resolve11(mainPages.length > 0 ? mainPages : fallbackPages);
+            resolve12(mainPages.length > 0 ? mainPages : fallbackPages);
           } catch {
-            resolve11([]);
+            resolve12([]);
           }
         });
       });
-      req.on("error", () => resolve11([]));
+      req.on("error", () => resolve12([]));
       req.setTimeout(2e3, () => {
         req.destroy();
-        resolve11([]);
+        resolve12([]);
       });
     });
   }
@@ -5038,7 +5074,7 @@ var DaemonCdpManager = class {
     }
   }
   findTargetOnPort(port) {
-    return new Promise((resolve11) => {
+    return new Promise((resolve12) => {
       const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
@@ -5049,7 +5085,7 @@ var DaemonCdpManager = class {
               (t) => (t.type === "page" || t.type === "browser" || t.type === "Page") && t.webSocketDebuggerUrl
             );
             if (pages.length === 0) {
-              resolve11(targets.find((t) => t.webSocketDebuggerUrl) || null);
+              resolve12(targets.find((t) => t.webSocketDebuggerUrl) || null);
               return;
             }
             const titleFilteredPages = pages.filter((t) => !this.isNonMainTitle(t.title || ""));
@@ -5068,25 +5104,25 @@ var DaemonCdpManager = class {
                 this._targetId = selected.target.id;
               }
               this._pageTitle = selected.target.title || "";
-              resolve11(selected.target);
+              resolve12(selected.target);
               return;
             }
             if (previousTargetId) {
               this.log(`[CDP] Target ${previousTargetId} not found in page list`);
-              resolve11(null);
+              resolve12(null);
               return;
             }
             this._pageTitle = list[0]?.title || "";
-            resolve11(list[0]);
+            resolve12(list[0]);
           } catch {
-            resolve11(null);
+            resolve12(null);
           }
         });
       });
-      req.on("error", () => resolve11(null));
+      req.on("error", () => resolve12(null));
       req.setTimeout(2e3, () => {
         req.destroy();
-        resolve11(null);
+        resolve12(null);
       });
     });
   }
@@ -5097,7 +5133,7 @@ var DaemonCdpManager = class {
     this.extensionProviders = providers;
   }
   connectToTarget(wsUrl) {
-    return new Promise((resolve11) => {
+    return new Promise((resolve12) => {
       this.ws = new WebSocket(wsUrl);
       this.ws.on("open", async () => {
         this._connected = true;
@@ -5107,17 +5143,17 @@ var DaemonCdpManager = class {
         }
         this.connectBrowserWs().catch(() => {
         });
-        resolve11(true);
+        resolve12(true);
       });
       this.ws.on("message", (data) => {
         try {
           const msg = JSON.parse(data.toString());
           if (msg.id && this.pending.has(msg.id)) {
-            const { resolve: resolve12, reject } = this.pending.get(msg.id);
+            const { resolve: resolve13, reject } = this.pending.get(msg.id);
             this.pending.delete(msg.id);
             this.failureCount = 0;
             if (msg.error) reject(new Error(msg.error.message));
-            else resolve12(msg.result);
+            else resolve13(msg.result);
           } else if (msg.method === "Runtime.executionContextCreated") {
             this.contexts.add(msg.params.context.id);
           } else if (msg.method === "Runtime.executionContextDestroyed") {
@@ -5140,7 +5176,7 @@ var DaemonCdpManager = class {
       this.ws.on("error", (err) => {
         this.log(`[CDP] WebSocket error: ${err.message}`);
         this._connected = false;
-        resolve11(false);
+        resolve12(false);
       });
     });
   }
@@ -5154,7 +5190,7 @@ var DaemonCdpManager = class {
         return;
       }
       this.log(`[CDP] Connecting browser WS for target discovery...`);
-      await new Promise((resolve11, reject) => {
+      await new Promise((resolve12, reject) => {
         this.browserWs = new WebSocket(browserWsUrl);
         this.browserWs.on("open", async () => {
           this._browserConnected = true;
@@ -5164,16 +5200,16 @@ var DaemonCdpManager = class {
           } catch (e) {
             this.log(`[CDP] setDiscoverTargets failed: ${e.message}`);
           }
-          resolve11();
+          resolve12();
         });
         this.browserWs.on("message", (data) => {
           try {
             const msg = JSON.parse(data.toString());
             if (msg.id && this.browserPending.has(msg.id)) {
-              const { resolve: resolve12, reject: reject2 } = this.browserPending.get(msg.id);
+              const { resolve: resolve13, reject: reject2 } = this.browserPending.get(msg.id);
               this.browserPending.delete(msg.id);
               if (msg.error) reject2(new Error(msg.error.message));
-              else resolve12(msg.result);
+              else resolve13(msg.result);
             }
           } catch {
           }
@@ -5193,31 +5229,31 @@ var DaemonCdpManager = class {
     }
   }
   getBrowserWsUrl() {
-    return new Promise((resolve11) => {
+    return new Promise((resolve12) => {
       const req = http.get(`http://127.0.0.1:${this.port}/json/version`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
         res.on("end", () => {
           try {
             const info = JSON.parse(data);
-            resolve11(info.webSocketDebuggerUrl || null);
+            resolve12(info.webSocketDebuggerUrl || null);
           } catch {
-            resolve11(null);
+            resolve12(null);
           }
         });
       });
-      req.on("error", () => resolve11(null));
+      req.on("error", () => resolve12(null));
       req.setTimeout(3e3, () => {
         req.destroy();
-        resolve11(null);
+        resolve12(null);
       });
     });
   }
   sendBrowser(method, params = {}, timeoutMs = 15e3) {
-    return new Promise((resolve11, reject) => {
+    return new Promise((resolve12, reject) => {
       if (!this.browserWs || !this._browserConnected) return reject(new Error("Browser WS not connected"));
       const id = this.browserMsgId++;
-      this.browserPending.set(id, { resolve: resolve11, reject });
+      this.browserPending.set(id, { resolve: resolve12, reject });
       this.browserWs.send(JSON.stringify({ id, method, params }));
       setTimeout(() => {
         if (this.browserPending.has(id)) {
@@ -5257,11 +5293,11 @@ var DaemonCdpManager = class {
   }
   // ─── CDP Protocol ────────────────────────────────────────
   sendInternal(method, params = {}, timeoutMs = 15e3) {
-    return new Promise((resolve11, reject) => {
+    return new Promise((resolve12, reject) => {
       if (!this.ws || !this._connected) return reject(new Error("CDP not connected"));
       if (this.ws.readyState !== WebSocket.OPEN) return reject(new Error("WebSocket not open"));
       const id = this.msgId++;
-      this.pending.set(id, { resolve: resolve11, reject });
+      this.pending.set(id, { resolve: resolve12, reject });
       this.ws.send(JSON.stringify({ id, method, params }));
       setTimeout(() => {
         if (this.pending.has(id)) {
@@ -5510,7 +5546,7 @@ var DaemonCdpManager = class {
     const browserWs = this.browserWs;
     let msgId = this.browserMsgId;
     const sendWs = (method, params = {}, sessionId) => {
-      return new Promise((resolve11, reject) => {
+      return new Promise((resolve12, reject) => {
         const mid = msgId++;
         this.browserMsgId = msgId;
         const handler = (raw) => {
@@ -5519,7 +5555,7 @@ var DaemonCdpManager = class {
             if (msg.id === mid) {
               browserWs.removeListener("message", handler);
               if (msg.error) reject(new Error(msg.error.message || JSON.stringify(msg.error)));
-              else resolve11(msg.result);
+              else resolve12(msg.result);
             }
           } catch {
           }
@@ -5720,14 +5756,14 @@ var DaemonCdpManager = class {
     if (!ws || ws.readyState !== WebSocket.OPEN) {
       throw new Error("CDP not connected");
     }
-    return new Promise((resolve11, reject) => {
+    return new Promise((resolve12, reject) => {
       const id = getNextId();
       pendingMap.set(id, {
         resolve: (result) => {
           if (result?.result?.subtype === "error") {
             reject(new Error(result.result.description));
           } else {
-            resolve11(result?.result?.value);
+            resolve12(result?.result?.value);
           }
         },
         reject
@@ -5759,10 +5795,10 @@ var DaemonCdpManager = class {
       throw new Error("CDP not connected");
     }
     const sendViaSession = (method, params = {}) => {
-      return new Promise((resolve11, reject) => {
+      return new Promise((resolve12, reject) => {
         const pendingMap = this._browserConnected ? this.browserPending : this.pending;
         const id = this._browserConnected ? this.browserMsgId++ : this.msgId++;
-        pendingMap.set(id, { resolve: resolve11, reject });
+        pendingMap.set(id, { resolve: resolve12, reject });
         ws.send(JSON.stringify({ id, sessionId, method, params }));
         setTimeout(() => {
           if (pendingMap.has(id)) {
@@ -7486,6 +7522,125 @@ function listSavedHistorySessions(agentType, options = {}) {
     return { sessions: [], hasMore: false };
   }
 }
+function normalizeCanonicalHermesMessageContent(content) {
+  if (typeof content === "string") return content.trim();
+  if (content == null) return "";
+  try {
+    return JSON.stringify(content).trim();
+  } catch {
+    return String(content).trim();
+  }
+}
+function extractCanonicalHermesMessageTimestamp(message, fallbackTs) {
+  const numericTimestamp = Number(message.receivedAt || message.timestamp || message.ts || 0);
+  if (Number.isFinite(numericTimestamp) && numericTimestamp > 0) return numericTimestamp;
+  const stringTimestamp = typeof message.ts === "string" ? Date.parse(message.ts) : typeof message.timestamp === "string" ? Date.parse(message.timestamp) : NaN;
+  if (Number.isFinite(stringTimestamp) && stringTimestamp > 0) return stringTimestamp;
+  return fallbackTs;
+}
+function readExistingHermesSessionStartRecord(historySessionId) {
+  try {
+    const dir = path7.join(HISTORY_DIR, "hermes-cli");
+    if (!fs3.existsSync(dir)) return null;
+    const files = listHistoryFiles(dir, historySessionId).sort();
+    for (const file of files) {
+      const lines = fs3.readFileSync(path7.join(dir, file), "utf-8").split("\n").filter(Boolean);
+      for (const line of lines) {
+        try {
+          const parsed = JSON.parse(line);
+          if (parsed.historySessionId !== historySessionId) continue;
+          if (parsed.kind === "session_start" && parsed.role === "system") {
+            return parsed;
+          }
+        } catch {
+        }
+      }
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+function rebuildHermesSavedHistoryFromCanonicalSession(historySessionId) {
+  const normalizedSessionId = normalizeSavedHistorySessionId("hermes-cli", historySessionId);
+  if (!normalizedSessionId) return false;
+  try {
+    const sessionFilePath = path7.join(os5.homedir(), ".hermes", "sessions", `session_${normalizedSessionId}.json`);
+    if (!fs3.existsSync(sessionFilePath)) return false;
+    const raw = JSON.parse(fs3.readFileSync(sessionFilePath, "utf-8"));
+    const canonicalMessages = Array.isArray(raw.messages) ? raw.messages : [];
+    const dir = path7.join(HISTORY_DIR, "hermes-cli");
+    fs3.mkdirSync(dir, { recursive: true });
+    const existingSessionStart = readExistingHermesSessionStartRecord(normalizedSessionId);
+    const records = [];
+    if (existingSessionStart) {
+      records.push({
+        ...existingSessionStart,
+        historySessionId: normalizedSessionId
+      });
+    }
+    let fallbackTs = Date.parse(raw.session_start || raw.last_updated || "") || Date.now();
+    for (const message of canonicalMessages) {
+      const role = String(message.role || "").trim();
+      const content = normalizeCanonicalHermesMessageContent(message.content);
+      if (!content) continue;
+      const receivedAt = extractCanonicalHermesMessageTimestamp(message, fallbackTs);
+      fallbackTs = receivedAt + 1;
+      if (role === "user") {
+        records.push({
+          ts: new Date(receivedAt).toISOString(),
+          receivedAt,
+          role: "user",
+          content,
+          kind: "standard",
+          agent: "hermes-cli",
+          historySessionId: normalizedSessionId
+        });
+        continue;
+      }
+      if (role === "assistant") {
+        records.push({
+          ts: new Date(receivedAt).toISOString(),
+          receivedAt,
+          role: "assistant",
+          content,
+          kind: "standard",
+          agent: "hermes-cli",
+          historySessionId: normalizedSessionId
+        });
+        continue;
+      }
+      if (role === "tool") {
+        records.push({
+          ts: new Date(receivedAt).toISOString(),
+          receivedAt,
+          role: "assistant",
+          content,
+          kind: "tool",
+          senderName: "Tool",
+          agent: "hermes-cli",
+          historySessionId: normalizedSessionId
+        });
+      }
+    }
+    if (records.length === 0) return false;
+    const prefix = `${normalizedSessionId.replace(/[^a-zA-Z0-9_-]/g, "_")}_`;
+    for (const file of fs3.readdirSync(dir)) {
+      if (file.startsWith(prefix) && file.endsWith(".jsonl")) {
+        fs3.unlinkSync(path7.join(dir, file));
+      }
+    }
+    const targetDate = new Date(records[records.length - 1].receivedAt || Date.now()).toISOString().slice(0, 10);
+    const filePath = path7.join(dir, `${prefix}${targetDate}.jsonl`);
+    fs3.writeFileSync(filePath, `${records.map((record) => JSON.stringify(record)).join("\n")}
+`, "utf-8");
+    invalidatePersistedSavedHistoryIndex("hermes-cli", dir);
+    savedHistorySessionCache.delete("hermes-cli");
+    return true;
+  } catch {
+    return false;
+  }
+}
 
 // src/providers/provider-patch-state.ts
 function isControlValue(value) {
@@ -9659,7 +9814,9 @@ function getTargetInstance(h, args) {
   const targetSessionId = typeof args?.targetSessionId === "string" ? args.targetSessionId.trim() : "";
   const sessionId = targetSessionId || h.currentSession?.sessionId || "";
   if (!sessionId) return null;
-  return h.ctx.instanceManager?.getInstance(sessionId) || null;
+  const session = h.ctx.sessionRegistry?.get(sessionId);
+  const instanceKey = session?.adapterKey || session?.instanceKey || sessionId;
+  return h.ctx.instanceManager?.getInstance(instanceKey) || null;
 }
 function getTargetTransport(h, provider) {
   if (h.currentSession?.transport) return h.currentSession.transport;
@@ -9956,7 +10113,7 @@ function getStateLastSignature(state) {
 async function getStableExtensionBaseline(h) {
   const first = await readExtensionChatState(h);
   if (getStateMessageCount(first) > 0 || getStateLastSignature(first)) return first;
-  await new Promise((resolve11) => setTimeout(resolve11, 150));
+  await new Promise((resolve12) => setTimeout(resolve12, 150));
   const second = await readExtensionChatState(h);
   return getStateMessageCount(second) >= getStateMessageCount(first) ? second : first;
 }
@@ -9964,7 +10121,7 @@ async function verifyExtensionSendObserved(h, before) {
   const beforeCount = getStateMessageCount(before);
   const beforeSignature = getStateLastSignature(before);
   for (let attempt = 0; attempt < 12; attempt += 1) {
-    await new Promise((resolve11) => setTimeout(resolve11, 250));
+    await new Promise((resolve12) => setTimeout(resolve12, 250));
     const state = await readExtensionChatState(h);
     if (state?.status === "waiting_approval") return true;
     const afterCount = getStateMessageCount(state);
@@ -10728,10 +10885,17 @@ async function handleResolveAction(h, args) {
       }
     }
     const status = adapter.getStatus();
-    if (status?.status !== "waiting_approval") {
+    const targetInstance = getTargetInstance(h, args);
+    const targetState = targetInstance?.getState?.();
+    const surfacedModal = targetState?.activeChat?.activeModal && Array.isArray(targetState.activeChat.activeModal.buttons) && targetState.activeChat.activeModal.buttons.some((candidate) => typeof candidate === "string" && candidate.trim()) ? targetState.activeChat.activeModal : null;
+    const statusModal = status?.activeModal && Array.isArray(status.activeModal.buttons) && status.activeModal.buttons.some((candidate) => typeof candidate === "string" && candidate.trim()) ? status.activeModal : null;
+    const effectiveModal = statusModal || surfacedModal;
+    const effectiveStatus = status?.status === "waiting_approval" || targetState?.activeChat?.status === "waiting_approval" ? "waiting_approval" : status?.status;
+    LOG.info("Command", `[resolveAction] CLI PTY gate target=${String(args?.targetSessionId || "")} rawStatus=${String(status?.status || "")} effectiveStatus=${String(effectiveStatus || "")} statusModal=${statusModal ? "yes" : "no"} surfacedModal=${surfacedModal ? "yes" : "no"} instance=${targetInstance ? "yes" : "no"}`);
+    if (effectiveStatus !== "waiting_approval" && !effectiveModal) {
       return { success: false, error: "Not in approval state" };
     }
-    const buttons = status.activeModal?.buttons || ["Allow once", "Always allow", "Deny"];
+    const buttons = effectiveModal?.buttons || ["Allow once", "Always allow", "Deny"];
     let buttonIndex = typeof args?.buttonIndex === "number" ? args.buttonIndex : -1;
     if (buttonIndex < 0) {
       const btnLower = button.toLowerCase();
@@ -12184,7 +12348,7 @@ var DaemonCommandHandler = class {
     try {
       const http3 = await import("http");
       const postData = JSON.stringify(body);
-      const result = await new Promise((resolve11, reject) => {
+      const result = await new Promise((resolve12, reject) => {
         const req = http3.request({
           hostname: "127.0.0.1",
           port: 19280,
@@ -12196,9 +12360,9 @@ var DaemonCommandHandler = class {
           res.on("data", (chunk) => data += chunk);
           res.on("end", () => {
             try {
-              resolve11(JSON.parse(data));
+              resolve12(JSON.parse(data));
             } catch {
-              resolve11({ raw: data });
+              resolve12({ raw: data });
             }
           });
         });
@@ -12216,15 +12380,15 @@ var DaemonCommandHandler = class {
     if (!providerType) return { success: false, error: "providerType required" };
     try {
       const http3 = await import("http");
-      const result = await new Promise((resolve11, reject) => {
+      const result = await new Promise((resolve12, reject) => {
         http3.get(`http://127.0.0.1:19280/api/providers/${providerType}/${endpoint}`, (res) => {
           let data = "";
           res.on("data", (chunk) => data += chunk);
           res.on("end", () => {
             try {
-              resolve11(JSON.parse(data));
+              resolve12(JSON.parse(data));
             } catch {
-              resolve11({ raw: data });
+              resolve12({ raw: data });
             }
           });
         }).on("error", reject);
@@ -12238,7 +12402,7 @@ var DaemonCommandHandler = class {
     try {
       const http3 = await import("http");
       const postData = JSON.stringify(args || {});
-      const result = await new Promise((resolve11, reject) => {
+      const result = await new Promise((resolve12, reject) => {
         const req = http3.request({
           hostname: "127.0.0.1",
           port: 19280,
@@ -12250,9 +12414,9 @@ var DaemonCommandHandler = class {
           res.on("data", (chunk) => data += chunk);
           res.on("end", () => {
             try {
-              resolve11(JSON.parse(data));
+              resolve12(JSON.parse(data));
             } catch {
-              resolve11({ raw: data });
+              resolve12({ raw: data });
             }
           });
         });
@@ -12350,7 +12514,7 @@ async function waitForCliAdapterReady(adapter, options) {
     if (status === "stopped") {
       throw new Error("CLI runtime stopped before it became ready");
     }
-    await new Promise((resolve11) => setTimeout(resolve11, pollMs));
+    await new Promise((resolve12) => setTimeout(resolve12, pollMs));
   }
   throw new Error(`CLI runtime did not become ready within ${timeoutMs}ms`);
 }
@@ -12387,6 +12551,7 @@ var CliProviderInstance = class {
   historyWriter;
   runtimeMessages = [];
   lastPersistedHistoryMessages = [];
+  lastCanonicalHermesSyncMtimeMs = 0;
   instanceId;
   suppressIdleHistoryReplay = false;
   errorMessage = void 0;
@@ -12419,34 +12584,7 @@ var CliProviderInstance = class {
     await this.enforceFreshSessionLaunchIfNeeded();
     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.lastPersistedHistoryMessages = restoredHistory.messages.map((message) => ({
-        role: message.role,
-        content: message.content,
-        kind: message.kind,
-        senderName: message.senderName,
-        receivedAt: message.receivedAt
-      }));
-      this.suppressIdleHistoryReplay = restoredHistory.messages.length > 0;
-      if (restoredHistory.messages.length > 0) {
-        this.adapter.seedCommittedMessages(
-          restoredHistory.messages.map((message) => ({
-            role: message.role,
-            content: message.content,
-            timestamp: message.receivedAt,
-            receivedAt: message.receivedAt,
-            kind: message.kind,
-            senderName: message.senderName
-          }))
-        );
-      }
+      this.restorePersistedHistoryFromCurrentSession();
     }
     if (this.providerSessionId && this.launchMode === "resume") {
       const resumedAt = Date.now();
@@ -12555,6 +12693,7 @@ var CliProviderInstance = class {
       parsedMessages = historyMessageCount > 0 ? parsedMessages.slice(-historyMessageCount) : [];
     }
     const mergedMessages = this.mergeConversationMessages(parsedMessages);
+    const canonicalHermesBackedHistory = this.syncCanonicalHermesSavedHistoryIfNeeded();
     const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
     if (parsedMessages.length > 0) {
       const shouldSkipReplayPersist = this.suppressIdleHistoryReplay && adapterStatus.status === "idle" && parsedStatus?.status === "idle";
@@ -12572,7 +12711,7 @@ var CliProviderInstance = class {
         senderName: typeof message.senderName === "string" ? message.senderName : void 0,
         receivedAt: typeof message.receivedAt === "number" ? message.receivedAt : message.timestamp
       }));
-      if (!shouldSkipReplayPersist && normalizedMessagesToSave.length > 0) {
+      if (!canonicalHermesBackedHistory && !shouldSkipReplayPersist && normalizedMessagesToSave.length > 0) {
         const incrementalMessages = buildIncrementalHistoryAppendMessages(this.lastPersistedHistoryMessages, normalizedMessagesToSave);
         this.historyWriter.appendNewMessages(
           this.type,
@@ -12582,7 +12721,9 @@ var CliProviderInstance = class {
           this.providerSessionId
         );
       }
-      this.lastPersistedHistoryMessages = normalizedMessagesToSave;
+      if (!canonicalHermesBackedHistory) {
+        this.lastPersistedHistoryMessages = normalizedMessagesToSave;
+      }
     }
     this.applyProviderResponse(parsedStatus, { phase: "immediate" });
     const surface = resolveProviderStateSurface({
@@ -13039,6 +13180,7 @@ ${effect.notification.body || ""}`.trim();
     this.providerSessionId = nextSessionId;
     this.historyWriter.promoteHistorySession(this.type, previousHistorySessionId, nextSessionId);
     this.historyWriter.writeSessionStart(this.type, nextSessionId, this.workingDir, this.instanceId);
+    this.restorePersistedHistoryFromCurrentSession();
     this.adapter.updateRuntimeMeta({ providerSessionId: nextSessionId });
     this.onProviderSessionResolved?.({
       instanceId: this.instanceId,
@@ -13050,6 +13192,61 @@ ${effect.notification.body || ""}`.trim();
     });
     LOG.info("CLI", `[${this.type}] discovered provider session id: ${nextSessionId}`);
   }
+  syncCanonicalHermesSavedHistoryIfNeeded() {
+    if (this.type !== "hermes-cli" || !this.providerSessionId) return false;
+    try {
+      const canonicalPath = path11.join(os11.homedir(), ".hermes", "sessions", `session_${this.providerSessionId}.json`);
+      if (!fs5.existsSync(canonicalPath)) return false;
+      const stat = fs5.statSync(canonicalPath);
+      if (stat.mtimeMs <= this.lastCanonicalHermesSyncMtimeMs) return true;
+      const rebuilt = rebuildHermesSavedHistoryFromCanonicalSession(this.providerSessionId);
+      if (!rebuilt) return false;
+      this.lastCanonicalHermesSyncMtimeMs = stat.mtimeMs;
+      const restoredHistory = readChatHistory(this.type, 0, 200, this.providerSessionId);
+      this.lastPersistedHistoryMessages = restoredHistory.messages.map((message) => ({
+        role: message.role,
+        content: message.content,
+        kind: message.kind,
+        senderName: message.senderName,
+        receivedAt: message.receivedAt
+      }));
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  restorePersistedHistoryFromCurrentSession() {
+    if (!this.providerSessionId) return;
+    this.syncCanonicalHermesSavedHistoryIfNeeded();
+    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.lastPersistedHistoryMessages = restoredHistory.messages.map((message) => ({
+      role: message.role,
+      content: message.content,
+      kind: message.kind,
+      senderName: message.senderName,
+      receivedAt: message.receivedAt
+    }));
+    this.suppressIdleHistoryReplay = restoredHistory.messages.length > 0;
+    if (restoredHistory.messages.length > 0) {
+      this.adapter.seedCommittedMessages(
+        restoredHistory.messages.map((message) => ({
+          role: message.role,
+          content: message.content,
+          timestamp: message.receivedAt,
+          receivedAt: message.receivedAt,
+          kind: message.kind,
+          senderName: message.senderName
+        }))
+      );
+    }
+  }
   getProbeDirectories() {
     const dirs = /* @__PURE__ */ new Set();
     const addDir = (value) => {
@@ -13659,13 +13856,13 @@ var AcpProviderInstance = class {
         }
         this.currentStatus = "waiting_approval";
         this.detectStatusTransition();
-        const approved = await new Promise((resolve11) => {
-          this.permissionResolvers.push(resolve11);
+        const approved = await new Promise((resolve12) => {
+          this.permissionResolvers.push(resolve12);
           setTimeout(() => {
-            const idx = this.permissionResolvers.indexOf(resolve11);
+            const idx = this.permissionResolvers.indexOf(resolve12);
             if (idx >= 0) {
               this.permissionResolvers.splice(idx, 1);
-              resolve11(false);
+              resolve12(false);
             }
           }, 3e5);
         });
@@ -15207,10 +15404,75 @@ var ProviderLoader = class _ProviderLoader {
   }
   static GITHUB_TARBALL_URL = "https://github.com/vilmire/adhdev-providers/archive/refs/heads/main.tar.gz";
   static META_FILE = ".meta.json";
+  static REPO_PROVIDER_DIRNAME = "adhdev-providers";
+  static SIBLING_MARKER_FILE = ".adhdev-provider-root";
+  static SIBLING_ENV_VAR = "ADHDEV_USE_SIBLING_PROVIDERS";
+  probeStarts = [];
+  siblingLogged = false;
+  userDirSource = "home-default";
+  /** Process-level dedup for stderr sibling-adoption notices (shared across all ProviderLoader instances). */
+  static siblingStderrLogged = /* @__PURE__ */ new Set();
+  static looksLikeProviderRoot(candidate) {
+    try {
+      if (!fs6.existsSync(candidate) || !fs6.statSync(candidate).isDirectory()) return false;
+      return ["ide", "extension", "cli", "acp"].some(
+        (category) => fs6.existsSync(path13.join(candidate, category))
+      );
+    } catch {
+      return false;
+    }
+  }
+  static hasProviderRootMarker(candidate) {
+    try {
+      return fs6.existsSync(path13.join(candidate, _ProviderLoader.SIBLING_MARKER_FILE));
+    } catch {
+      return false;
+    }
+  }
+  detectDefaultUserDir() {
+    const fallback = path13.join(os13.homedir(), ".adhdev", "providers");
+    const envOptIn = process.env[_ProviderLoader.SIBLING_ENV_VAR] === "1";
+    const visited = /* @__PURE__ */ new Set();
+    for (const start of this.probeStarts) {
+      let current = path13.resolve(start);
+      while (!visited.has(current)) {
+        visited.add(current);
+        const siblingCandidate = path13.join(path13.dirname(current), _ProviderLoader.REPO_PROVIDER_DIRNAME);
+        if (_ProviderLoader.looksLikeProviderRoot(siblingCandidate)) {
+          const hasMarker = _ProviderLoader.hasProviderRootMarker(siblingCandidate);
+          if (envOptIn || hasMarker) {
+            const source = hasMarker ? "sibling-marker" : "sibling-env";
+            if (!this.siblingLogged) {
+              this.log(`Using sibling provider checkout (${source}): ${siblingCandidate}`);
+              this.siblingLogged = true;
+            }
+            if (!_ProviderLoader.siblingStderrLogged.has(siblingCandidate)) {
+              _ProviderLoader.siblingStderrLogged.add(siblingCandidate);
+              try {
+                process.stderr.write(
+                  `[adhdev] Using sibling adhdev-providers checkout (${source}): ${siblingCandidate}
+`
+                );
+              } catch {
+              }
+            }
+            return { path: siblingCandidate, source };
+          }
+        }
+        const parent = path13.dirname(current);
+        if (parent === current) break;
+        current = parent;
+      }
+    }
+    return { path: fallback, source: "home-default" };
+  }
   constructor(options) {
     this.logFn = options?.logFn || LOG.forComponent("Provider").asLogFn();
+    this.probeStarts = options?.probeStarts ?? [process.cwd(), __dirname];
     this.defaultProvidersDir = path13.join(os13.homedir(), ".adhdev", "providers");
-    this.userDir = this.defaultProvidersDir;
+    const detected = this.detectDefaultUserDir();
+    this.userDir = detected.path;
+    this.userDirSource = detected.source;
     this.upstreamDir = path13.join(this.defaultProvidersDir, ".upstream");
     this.disableUpstream = false;
     this.applySourceConfig({
@@ -15248,6 +15510,7 @@ var ProviderLoader = class _ProviderLoader {
       disableUpstream: this.disableUpstream,
       explicitProviderDir: this.explicitProviderDir,
       userDir: this.userDir,
+      userDirSource: this.userDirSource,
       upstreamDir: this.upstreamDir,
       providerRoots: this.getProviderRoots()
     };
@@ -15258,7 +15521,14 @@ var ProviderLoader = class _ProviderLoader {
       this.explicitProviderDir = options.userDir?.trim() ? options.userDir : null;
     }
     this.sourceMode = nextSourceMode;
-    this.userDir = this.explicitProviderDir || this.defaultProvidersDir;
+    if (this.explicitProviderDir) {
+      this.userDir = this.explicitProviderDir;
+      this.userDirSource = "explicit";
+    } else {
+      const detected = this.detectDefaultUserDir();
+      this.userDir = detected.path;
+      this.userDirSource = detected.source;
+    }
     this.upstreamDir = path13.join(this.defaultProvidersDir, ".upstream");
     this.disableUpstream = this.sourceMode === "no-upstream";
     if (this.explicitProviderDir) {
@@ -15852,7 +16122,7 @@ var ProviderLoader = class _ProviderLoader {
       return { updated: false };
     }
     try {
-      const etag = await new Promise((resolve11, reject) => {
+      const etag = await new Promise((resolve12, reject) => {
         const options = {
           method: "HEAD",
           hostname: "github.com",
@@ -15870,7 +16140,7 @@ var ProviderLoader = class _ProviderLoader {
               headers: { "User-Agent": "adhdev-launcher" },
               timeout: 1e4
             }, (res2) => {
-              resolve11(res2.headers.etag || res2.headers["last-modified"] || "");
+              resolve12(res2.headers.etag || res2.headers["last-modified"] || "");
             });
             req2.on("error", reject);
             req2.on("timeout", () => {
@@ -15879,7 +16149,7 @@ var ProviderLoader = class _ProviderLoader {
             });
             req2.end();
           } else {
-            resolve11(res.headers.etag || res.headers["last-modified"] || "");
+            resolve12(res.headers.etag || res.headers["last-modified"] || "");
           }
         });
         req.on("error", reject);
@@ -15943,7 +16213,7 @@ var ProviderLoader = class _ProviderLoader {
   downloadFile(url, destPath) {
     const https = __require("https");
     const http3 = __require("http");
-    return new Promise((resolve11, reject) => {
+    return new Promise((resolve12, reject) => {
       const doRequest = (reqUrl, redirectCount = 0) => {
         if (redirectCount > 5) {
           reject(new Error("Too many redirects"));
@@ -15963,7 +16233,7 @@ var ProviderLoader = class _ProviderLoader {
           res.pipe(ws);
           ws.on("finish", () => {
             ws.close();
-            resolve11();
+            resolve12();
           });
           ws.on("error", reject);
         });
@@ -16438,17 +16708,17 @@ async function findFreePort(ports) {
   throw new Error("No free port found");
 }
 function checkPortFree(port) {
-  return new Promise((resolve11) => {
+  return new Promise((resolve12) => {
     const server = net.createServer();
     server.unref();
-    server.on("error", () => resolve11(false));
+    server.on("error", () => resolve12(false));
     server.listen(port, "127.0.0.1", () => {
-      server.close(() => resolve11(true));
+      server.close(() => resolve12(true));
     });
   });
 }
 async function isCdpActive(port) {
-  return new Promise((resolve11) => {
+  return new Promise((resolve12) => {
     const req = __require("http").get(`http://127.0.0.1:${port}/json/version`, {
       timeout: 2e3
     }, (res) => {
@@ -16457,16 +16727,16 @@ async function isCdpActive(port) {
       res.on("end", () => {
         try {
           const info = JSON.parse(data);
-          resolve11(!!info["WebKit-Version"] || !!info["Browser"]);
+          resolve12(!!info["WebKit-Version"] || !!info["Browser"]);
         } catch {
-          resolve11(false);
+          resolve12(false);
         }
       });
     });
-    req.on("error", () => resolve11(false));
+    req.on("error", () => resolve12(false));
     req.on("timeout", () => {
       req.destroy();
-      resolve11(false);
+      resolve12(false);
     });
   });
 }
@@ -17258,7 +17528,7 @@ async function waitForPidExit(pid, timeoutMs) {
   while (Date.now() - start < timeoutMs) {
     try {
       process.kill(pid, 0);
-      await new Promise((resolve11) => setTimeout(resolve11, 250));
+      await new Promise((resolve12) => setTimeout(resolve12, 250));
     } catch {
       return;
     }
@@ -17373,7 +17643,7 @@ async function runDaemonUpgradeHelper(payload) {
     appendUpgradeLog(installOutput.trim());
   }
   if (process.platform === "win32") {
-    await new Promise((resolve11) => setTimeout(resolve11, 500));
+    await new Promise((resolve12) => setTimeout(resolve12, 500));
     cleanupStaleGlobalInstallDirs(payload.packageName);
     appendUpgradeLog("Post-install staging cleanup complete");
   }
@@ -18715,7 +18985,7 @@ var ProviderStreamAdapter = class {
     const beforeCount = this.messageCount(before);
     const beforeSignature = this.lastMessageSignature(before);
     for (let attempt = 0; attempt < 12; attempt += 1) {
-      await new Promise((resolve11) => setTimeout(resolve11, 250));
+      await new Promise((resolve12) => setTimeout(resolve12, 250));
       let state;
       try {
         state = await this.readChat(evaluate);
@@ -18737,7 +19007,7 @@ var ProviderStreamAdapter = class {
     if (this.messageCount(first) > 0 || this.lastMessageSignature(first)) {
       return first;
     }
-    await new Promise((resolve11) => setTimeout(resolve11, 150));
+    await new Promise((resolve12) => setTimeout(resolve12, 150));
     const second = await this.readChat(evaluate);
     return this.messageCount(second) >= this.messageCount(first) ? second : first;
   }
@@ -18888,7 +19158,7 @@ var ProviderStreamAdapter = class {
       if (typeof data.error === "string" && data.error.trim()) return false;
     }
     for (let attempt = 0; attempt < 6; attempt += 1) {
-      await new Promise((resolve11) => setTimeout(resolve11, 250));
+      await new Promise((resolve12) => setTimeout(resolve12, 250));
       const state = await this.readChat(evaluate);
       const title = this.getStateTitle(state);
       if (this.titlesMatch(title, sessionId)) return true;
@@ -21414,7 +21684,7 @@ function getCliTargetBundle(ctx, type, instanceId) {
   return { target, instance, adapter };
 }
 function sleep(ms) {
-  return new Promise((resolve11) => setTimeout(resolve11, ms));
+  return new Promise((resolve12) => setTimeout(resolve12, ms));
 }
 async function waitForCliReady(ctx, type, instanceId, timeoutMs) {
   const startedAt = Date.now();
@@ -23672,15 +23942,15 @@ var DevServer = class _DevServer {
         this.json(res, 500, { error: e.message });
       }
     });
-    return new Promise((resolve11, reject) => {
+    return new Promise((resolve12, reject) => {
       this.server.listen(port, "127.0.0.1", () => {
         this.log(`Dev server listening on http://127.0.0.1:${port}`);
-        resolve11();
+        resolve12();
       });
       this.server.on("error", (e) => {
         if (e.code === "EADDRINUSE") {
           this.log(`Port ${port} in use, skipping dev server`);
-          resolve11();
+          resolve12();
         } else {
           reject(e);
         }
@@ -23762,20 +24032,20 @@ var DevServer = class _DevServer {
       child.stderr?.on("data", (d) => {
         stderr += d.toString().slice(0, 2e3);
       });
-      await new Promise((resolve11) => {
+      await new Promise((resolve12) => {
         const timer = setTimeout(() => {
           child.kill();
-          resolve11();
+          resolve12();
         }, 3e3);
         child.on("exit", () => {
           clearTimeout(timer);
-          resolve11();
+          resolve12();
         });
         child.stdout?.once("data", () => {
           setTimeout(() => {
             child.kill();
             clearTimeout(timer);
-            resolve11();
+            resolve12();
           }, 500);
         });
       });
@@ -24291,14 +24561,14 @@ var DevServer = class _DevServer {
       child.stderr?.on("data", (d) => {
         stderr += d.toString();
       });
-      await new Promise((resolve11) => {
+      await new Promise((resolve12) => {
         const timer = setTimeout(() => {
           child.kill();
-          resolve11();
+          resolve12();
         }, timeout);
         child.on("exit", () => {
           clearTimeout(timer);
-          resolve11();
+          resolve12();
         });
       });
       const elapsed = Date.now() - start;
@@ -24968,14 +25238,14 @@ data: ${JSON.stringify(msg.data)}
     res.end(JSON.stringify(data, null, 2));
   }
   async readBody(req) {
-    return new Promise((resolve11) => {
+    return new Promise((resolve12) => {
       let body = "";
       req.on("data", (chunk) => body += chunk);
       req.on("end", () => {
         try {
-          resolve11(JSON.parse(body));
+          resolve12(JSON.parse(body));
         } catch {
-          resolve11({});
+          resolve12({});
         }
       });
     });
@@ -25488,7 +25758,7 @@ async function waitForReady(endpoint, timeoutMs = STARTUP_TIMEOUT_MS) {
   const deadline = Date.now() + timeoutMs;
   while (Date.now() < deadline) {
     if (await canConnect(endpoint)) return;
-    await new Promise((resolve11) => setTimeout(resolve11, STARTUP_POLL_MS));
+    await new Promise((resolve12) => setTimeout(resolve12, STARTUP_POLL_MS));
   }
   throw new Error(`Session host did not become ready within ${timeoutMs}ms`);
 }
@@ -25666,10 +25936,10 @@ async function installExtension(ide, extension) {
         const buffer = Buffer.from(await res.arrayBuffer());
         const fs15 = await import("fs");
         fs15.writeFileSync(vsixPath, buffer);
-        return new Promise((resolve11) => {
+        return new Promise((resolve12) => {
           const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
           exec2(cmd, { timeout: 6e4 }, (error, _stdout, stderr) => {
-            resolve11({
+            resolve12({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: !error,
@@ -25682,11 +25952,11 @@ async function installExtension(ide, extension) {
     } catch (e) {
     }
   }
-  return new Promise((resolve11) => {
+  return new Promise((resolve12) => {
     const cmd = `"${ide.cliCommand}" --install-extension ${extension.marketplaceId} --force`;
     exec2(cmd, { timeout: 6e4 }, (error, stdout, stderr) => {
       if (error) {
-        resolve11({
+        resolve12({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: false,
@@ -25694,7 +25964,7 @@ async function installExtension(ide, extension) {
           error: stderr || error.message
         });
       } else {
-        resolve11({
+        resolve12({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: true,