@adhdev/daemon-core 0.8.46 → 0.8.48

package/dist/index.js

@@ -4417,6 +4417,8 @@ var DaemonCdpManager = class {
         allTargets = result?.targetInfos || [];
       }
       const pageWebviewUrls = await this.getCurrentPageWebviewUrls();
+      const pageWebviewOrder = /* @__PURE__ */ new Map();
+      Array.from(pageWebviewUrls).forEach((url, index) => pageWebviewOrder.set(url, index));
       const iframes = allTargets.filter((t) => t.type === "iframe");
       const typeMap = /* @__PURE__ */ new Map();
       for (const t of allTargets) {
@@ -4458,6 +4460,14 @@ var DaemonCdpManager = class {
           }
         }
       }
+      agents.sort((lhs, rhs) => {
+        const leftOrder = pageWebviewOrder.get(lhs.url);
+        const rightOrder = pageWebviewOrder.get(rhs.url);
+        if (leftOrder != null && rightOrder != null) return leftOrder - rightOrder;
+        if (leftOrder != null) return -1;
+        if (rightOrder != null) return 1;
+        return lhs.url.localeCompare(rhs.url);
+      });
       this._lastDiscoveredTargets = new Set(agents.map((a) => a.targetId));
       return agents;
     } catch (e) {
@@ -4596,6 +4606,26 @@ var DaemonCdpManager = class {
   }
   async getCurrentPageWebviewUrls() {
     if (!this.isConnected) return /* @__PURE__ */ new Set();
+    try {
+      const raw = await this.evaluate(
+        `JSON.stringify(Array.from(document.querySelectorAll('iframe,webview'))
+                    .filter((el) => {
+                        const rect = el.getBoundingClientRect();
+                        if (rect.width <= 8 || rect.height <= 8) return false;
+                        const style = window.getComputedStyle(el);
+                        return style.display !== 'none' && style.visibility !== 'hidden';
+                    })
+                    .map((el) => el.src || el.getAttribute('src') || '')
+                    .filter((src) => typeof src === 'string' && src.includes('vscode-webview')))`,
+        5e3
+      );
+      const parsed = typeof raw === "string" ? JSON.parse(raw) : raw;
+      if (Array.isArray(parsed)) {
+        const urls = parsed.filter((src) => typeof src === "string" && src.length > 0);
+        if (urls.length > 0) return new Set(urls);
+      }
+    } catch {
+    }
     try {
       const urls = /* @__PURE__ */ new Set();
       const { frameTree } = await this.sendInternal("Page.getFrameTree", {}, 5e3);
@@ -4607,19 +4637,7 @@ var DaemonCdpManager = class {
         for (const child of node?.childFrames || []) visit(child);
       };
       if (frameTree) visit(frameTree);
-      if (urls.size > 0) return urls;
-    } catch {
-    }
-    try {
-      const raw = await this.evaluate(
-        `JSON.stringify(Array.from(document.querySelectorAll('iframe,webview'))
-                    .map((el) => el.src || el.getAttribute('src') || '')
-                    .filter((src) => typeof src === 'string' && src.includes('vscode-webview')))`,
-        5e3
-      );
-      const parsed = typeof raw === "string" ? JSON.parse(raw) : raw;
-      if (!Array.isArray(parsed)) return /* @__PURE__ */ new Set();
-      return new Set(parsed.filter((src) => typeof src === "string" && src.length > 0));
+      return urls;
     } catch {
       return /* @__PURE__ */ new Set();
     }
@@ -9043,7 +9061,7 @@ async function executeProviderScript(h, args, scriptName) {
       }
       const managed = runtimeSessionId ? h.agentStream?.getManagedSession(runtimeSessionId) : null;
       const targetSessionId = managed?.cdpSessionId || null;
-      const IDE_LEVEL_SCRIPTS = ["listModes", "setMode", "listModels", "setModel"];
+      const IDE_LEVEL_SCRIPTS = provider.type === "claude-code-vscode" ? ["listModes", "setMode"] : ["listModes", "setMode", "listModels", "setModel"];
       if (IDE_LEVEL_SCRIPTS.includes(scriptName)) {
         if (targetSessionId) {
           try {
@@ -9970,14 +9988,18 @@ var CliProviderInstance = class {
     }
     const runtime = this.adapter.getRuntimeMetadata();
     this.maybeAppendRuntimeRecoveryMessage(runtime);
-    const parsedMessages = Array.isArray(parsedStatus?.messages) ? parsedStatus.messages : [];
+    let parsedMessages = Array.isArray(parsedStatus?.messages) ? parsedStatus.messages : [];
+    const historyMessageCount = Number.isFinite(parsedStatus?.historyMessageCount) ? Math.max(0, Number(parsedStatus.historyMessageCount)) : null;
+    if (historyMessageCount !== null) {
+      parsedMessages = historyMessageCount > 0 ? parsedMessages.slice(-historyMessageCount) : [];
+    }
     const controlValues = extractProviderControlValues(this.provider.controls, parsedStatus);
     if (controlValues) {
-      this.controlValues = controlValues;
-    } else if (Object.keys(this.controlValues).length > 0) {
-      this.controlValues = {};
+      this.controlValues = { ...this.controlValues, ...controlValues };
     }
     const mergedMessages = this.mergeConversationMessages(parsedMessages);
+    const currentModel = typeof parsedStatus?.model === "string" && parsedStatus.model.trim() ? parsedStatus.model.trim() : typeof this.controlValues.model === "string" && this.controlValues.model.trim() ? this.controlValues.model.trim() : void 0;
+    const currentPlan = typeof parsedStatus?.mode === "string" && parsedStatus.mode.trim() ? parsedStatus.mode.trim() : typeof this.controlValues.mode === "string" && this.controlValues.mode.trim() ? this.controlValues.mode.trim() : void 0;
     const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
     if (parsedMessages.length > 0) {
       const shouldSkipReplayPersist = this.suppressIdleHistoryReplay && adapterStatus.status === "idle" && parsedStatus?.status === "idle";
@@ -10014,6 +10036,8 @@ var CliProviderInstance = class {
         inputContent: ""
       },
       workspace: this.workingDir,
+      currentModel,
+      currentPlan,
       instanceId: this.instanceId,
       providerSessionId: this.providerSessionId,
       lastUpdated: Date.now(),
@@ -10203,6 +10227,15 @@ var CliProviderInstance = class {
   }
   applyProviderResponse(data, options) {
     if (!data || typeof data !== "object") return;
+    const patchedProviderSessionId = typeof data.providerSessionId === "string" ? data.providerSessionId.trim() : "";
+    if (patchedProviderSessionId) {
+      this.promoteProviderSessionId(patchedProviderSessionId);
+    }
+    if (data.sessionEvent === "new_session") {
+      this.runtimeMessages = [];
+      this.suppressIdleHistoryReplay = false;
+      this.adapter.clearHistory();
+    }
     const controlValues = extractProviderControlValues(this.provider.controls, data);
     if (controlValues) {
       this.controlValues = { ...this.controlValues, ...controlValues };