adhdev 0.9.40 → 0.9.42

package/dist/index.js

@@ -4990,6 +4990,15 @@ var init_extension_provider_instance = __esm({
           pendingEvents: this.flushEvents()
         };
       }
+      getSessionModalState(sessionId) {
+        if (sessionId && sessionId !== this.instanceId) return null;
+        return {
+          id: this.instanceId,
+          status: this.currentStatus,
+          title: this.chatTitle || this.agentName || this.provider.name,
+          activeModal: this.activeModal
+        };
+      }
       onEvent(event, data) {
         if (event === "stream_update") {
           if (data?.streams) this.agentStreams = data.streams;
@@ -5617,6 +5626,23 @@ var init_ide_provider_instance = __esm({
           pendingEvents: this.flushEvents()
         };
       }
+      getSessionModalState(sessionId) {
+        if (sessionId && sessionId !== this.instanceId) {
+          for (const ext of this.extensions.values()) {
+            const projected = ext.getSessionModalState?.(sessionId);
+            if (projected?.id === sessionId) return projected;
+          }
+          return null;
+        }
+        const autoApproveActive = (this.currentStatus === "waiting_approval" || this.cachedChat?.status === "waiting_approval") && this.canAutoApprove();
+        const visibleStatus = autoApproveActive ? "generating" : this.currentStatus;
+        return {
+          id: this.instanceId,
+          status: autoApproveActive && this.cachedChat?.status === "waiting_approval" ? "generating" : this.cachedChat?.status || visibleStatus,
+          title: this.cachedChat?.title || this.type,
+          activeModal: autoApproveActive ? null : this.cachedChat?.activeModal || null
+        };
+      }
       onEvent(event, data) {
         if (event === "cdp_connected") {
         } else if (event === "cdp_disconnected") {
@@ -10924,7 +10950,7 @@ function ensureNodePtySpawnHelperPermissions(logFn) {
   } catch {
   }
 }
-var os8, path22, net, import_crypto3, os22, path32, __require, DEFAULT_SESSION_HOST_COLS, DEFAULT_SESSION_HOST_ROWS, SessionHostClient;
+var os8, path22, net, import_crypto3, os22, path32, __require, DEFAULT_SESSION_RING_BUFFER_MAX_BYTES, DEFAULT_SESSION_HOST_COLS, DEFAULT_SESSION_HOST_ROWS, SessionHostClient;
 var init_dist = __esm({
   "../../oss/packages/session-host-core/dist/index.mjs"() {
     "use strict";
@@ -10940,6 +10966,7 @@ var init_dist = __esm({
       if (typeof require !== "undefined") return require.apply(this, arguments);
       throw Error('Dynamic require of "' + x + '" is not supported');
     });
+    DEFAULT_SESSION_RING_BUFFER_MAX_BYTES = 4 * 1024 * 1024;
     DEFAULT_SESSION_HOST_COLS = 80;
     DEFAULT_SESSION_HOST_ROWS = 32;
     SessionHostClient = class {
@@ -11575,6 +11602,10 @@ function normalizeCliParsedMessages(parsedMessages, options) {
     kind: message.kind,
     id: message.id,
     index: message.index,
+    providerUnitKey: message.providerUnitKey,
+    bubbleId: message.bubbleId,
+    bubbleState: message.bubbleState,
+    _turnKey: message._turnKey,
     meta: message.meta,
     senderName: message.senderName
   })));
@@ -11708,6 +11739,8 @@ function resolveCliSpawnPlan(options) {
     shellCmd = binaryPath;
     shellArgs = allArgs;
   }
+  const env3 = buildCliSpawnEnv(process.env, spawnConfig.env);
+  env3.TERMINAL_CWD = workingDir;
   return {
     binaryPath,
     allArgs,
@@ -11719,7 +11752,7 @@ function resolveCliSpawnPlan(options) {
       cols: DEFAULT_SESSION_HOST_COLS,
       rows: DEFAULT_SESSION_HOST_ROWS,
       cwd: workingDir,
-      env: buildCliSpawnEnv(process.env, spawnConfig.env)
+      env: env3
     }
   };
 }
@@ -12015,7 +12048,7 @@ var init_provider_cli_adapter = __esm({
       }
       getFreshParsedStatusCache() {
         const cached2 = this.parsedStatusCache;
-        if (cached2 && cached2.committedMessagesRef === this.committedMessages && cached2.responseBuffer === this.responseBuffer && cached2.currentTurnScope === this.currentTurnScope && cached2.recentOutputBuffer === this.recentOutputBuffer && cached2.accumulatedBuffer === this.accumulatedBuffer && cached2.accumulatedRawBuffer === this.accumulatedRawBuffer && cached2.screenText === this.lastScreenText && cached2.currentStatus === this.currentStatus && cached2.activeModal === this.activeModal && cached2.cliName === this.cliName && cached2.lastOutputAt === this.lastOutputAt) {
+        if (cached2 && cached2.committedMessagesRef === this.committedMessages && cached2.responseBuffer === this.responseBuffer && cached2.currentTurnScope === this.currentTurnScope && cached2.recentOutputBuffer === this.recentOutputBuffer && cached2.accumulatedBuffer === this.accumulatedBuffer && cached2.screenText === this.lastScreenText && cached2.currentStatus === this.currentStatus && cached2.activeModal === this.activeModal && cached2.cliName === this.cliName) {
           return cached2.result;
         }
         return null;
@@ -13187,6 +13220,10 @@ var init_provider_cli_adapter = __esm({
           kind: typeof message.kind === "string" ? message.kind : void 0,
           id: typeof message.id === "string" ? message.id : void 0,
           index: typeof message.index === "number" ? message.index : void 0,
+          providerUnitKey: typeof message.providerUnitKey === "string" ? message.providerUnitKey : void 0,
+          bubbleId: typeof message.bubbleId === "string" ? message.bubbleId : void 0,
+          bubbleState: typeof message.bubbleState === "string" ? message.bubbleState : void 0,
+          _turnKey: typeof message._turnKey === "string" ? message._turnKey : void 0,
           meta: message.meta && typeof message.meta === "object" ? { ...message.meta } : void 0,
           senderName: typeof message.senderName === "string" ? message.senderName : void 0
         }));
@@ -13216,6 +13253,10 @@ var init_provider_cli_adapter = __esm({
             kind: message.kind,
             id: message.id || `msg_${index}`,
             index: typeof message.index === "number" ? message.index : index,
+            providerUnitKey: message.providerUnitKey,
+            bubbleId: message.bubbleId,
+            bubbleState: message.bubbleState,
+            _turnKey: message._turnKey,
             meta: message.meta,
             senderName: message.senderName
           };
@@ -13252,6 +13293,10 @@ var init_provider_cli_adapter = __esm({
             senderName: message.senderName,
             id: message.id || `msg_${index}`,
             index: typeof message.index === "number" ? message.index : index,
+            providerUnitKey: message.providerUnitKey,
+            bubbleId: message.bubbleId,
+            bubbleState: message.bubbleState,
+            _turnKey: message._turnKey,
             receivedAt: typeof message.receivedAt === "number" ? message.receivedAt : message.timestamp
           });
         });
@@ -13263,7 +13308,7 @@ var init_provider_cli_adapter = __esm({
       getScriptParsedStatus() {
         const screenText = this.readTerminalScreenText();
         const cached2 = this.parsedStatusCache;
-        if (cached2 && cached2.committedMessagesRef === this.committedMessages && cached2.responseBuffer === this.responseBuffer && cached2.currentTurnScope === this.currentTurnScope && cached2.recentOutputBuffer === this.recentOutputBuffer && cached2.accumulatedBuffer === this.accumulatedBuffer && cached2.accumulatedRawBuffer === this.accumulatedRawBuffer && cached2.screenText === screenText && cached2.currentStatus === this.currentStatus && cached2.activeModal === this.activeModal && cached2.cliName === this.cliName && cached2.lastOutputAt === this.lastOutputAt) {
+        if (cached2 && cached2.committedMessagesRef === this.committedMessages && cached2.responseBuffer === this.responseBuffer && cached2.currentTurnScope === this.currentTurnScope && cached2.recentOutputBuffer === this.recentOutputBuffer && cached2.accumulatedBuffer === this.accumulatedBuffer && cached2.screenText === screenText && cached2.currentStatus === this.currentStatus && cached2.activeModal === this.activeModal && cached2.cliName === this.cliName) {
           return cached2.result;
         }
         const parsed = this.parseCurrentTranscript(
@@ -13382,12 +13427,10 @@ var init_provider_cli_adapter = __esm({
           currentTurnScope: this.currentTurnScope,
           recentOutputBuffer: this.recentOutputBuffer,
           accumulatedBuffer: this.accumulatedBuffer,
-          accumulatedRawBuffer: this.accumulatedRawBuffer,
           screenText,
           currentStatus: this.currentStatus,
           activeModal: this.activeModal,
           cliName: this.cliName,
-          lastOutputAt: this.lastOutputAt,
           result
         };
         return result;
@@ -14476,6 +14519,18 @@ var init_cli_provider_instance = __esm({
           runtimeRecoveryState: runtime?.recoveryState ?? null
         };
       }
+      getSessionModalState() {
+        const adapterStatus = this.adapter.getStatus({ allowParse: false });
+        const autoApproveActive = adapterStatus.status === "waiting_approval" && this.shouldAutoApprove();
+        const visibleStatus = autoApproveActive ? "generating" : adapterStatus.status;
+        const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
+        return {
+          id: this.instanceId,
+          status: visibleStatus,
+          title: dirName,
+          activeModal: autoApproveActive ? null : adapterStatus.activeModal
+        };
+      }
       updateSettings(newSettings) {
         this.settings = { ...newSettings };
         this.adapter.updateRuntimeSettings?.(this.settings);
@@ -31513,6 +31568,18 @@ var init_acp_provider_instance = __esm({
           this.detectStatusTransition();
         }
       }
+      getSessionModalState() {
+        const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
+        return {
+          id: this.instanceId,
+          status: this.currentStatus,
+          title: `${this.provider.name} \xB7 ${dirName}`,
+          activeModal: this.currentStatus === "waiting_approval" ? {
+            message: this.activeToolCalls.find((t) => t.status === "running")?.name || "Permission requested",
+            buttons: ["Approve", "Reject"]
+          } : null
+        };
+      }
       getState() {
         const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
         const recentMessages = normalizeChatMessages(this.messages.map((m) => {
@@ -40310,6 +40377,29 @@ var init_provider_instance_manager = __esm({
         }
         return sessions;
       }
+      getSessionModalState(sessionId, options = {}) {
+        if (!sessionId) return null;
+        const candidates = [sessionId];
+        if (options.instanceKey && options.instanceKey !== sessionId) {
+          candidates.push(options.instanceKey);
+        }
+        for (const id of candidates) {
+          const instance = this.instances.get(id);
+          if (!instance?.getSessionModalState) continue;
+          try {
+            const projected = instance.getSessionModalState(sessionId);
+            if (!projected?.id) continue;
+            if (projected.id !== sessionId) {
+              LOG.warn("InstanceMgr", `[InstanceManager] Ignoring mismatched session modal projection from ${id}: requested=${sessionId} projected=${projected.id}`);
+              continue;
+            }
+            return projected;
+          } catch (e) {
+            LOG.warn("InstanceMgr", `[InstanceManager] Failed to project session modal metadata from ${id}: ${e.message}`);
+          }
+        }
+        return null;
+      }
       /**
       * Per-category status collect
       */
@@ -56600,7 +56690,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.40" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.42" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -56916,37 +57006,20 @@ var init_adhdev_daemon = __esm({
           async (subscription) => this.buildSessionHostDiagnosticsUpdateForSubscription(subscription)
         );
       }
-      findProviderStateBySessionId(sessionId) {
+      findSessionModalStateBySessionId(sessionId) {
         if (!this.components || !sessionId) return null;
-        const directInstance = this.components.instanceManager.getInstance(sessionId);
-        if (directInstance) {
-          try {
-            return directInstance.getState();
-          } catch (error48) {
-            LOG.warn("P2P", `Failed to collect subscribed session state for ${sessionId}: ${error48?.message || String(error48)}`);
-            return null;
-          }
-        }
-        for (const instance of this.components.instanceManager.getByCategory("ide")) {
-          try {
-            const state = instance.getState();
-            if (state.instanceId === sessionId) return state;
-            if (state.category !== "ide") continue;
-            const child = state.extensions.find((entry) => entry.instanceId === sessionId);
-            if (child) return child;
-          } catch (error48) {
-            LOG.warn("P2P", `Failed to collect IDE child state for ${sessionId}: ${error48?.message || String(error48)}`);
-          }
-        }
-        return null;
+        const target = this.components.sessionRegistry.get(sessionId);
+        return this.components.instanceManager.getSessionModalState(sessionId, {
+          instanceKey: target?.instanceKey
+        });
       }
       buildSessionModalUpdateForSubscription(subscription) {
-        const state = this.findProviderStateBySessionId(subscription.params.targetSessionId);
+        const state = this.findSessionModalStateBySessionId(subscription.params.targetSessionId);
         if (!state) return null;
         const now = Date.now();
-        const activeModal = state.activeChat?.activeModal;
-        const status = String(state.activeChat?.status || state.status || "idle");
-        const title = typeof state.activeChat?.title === "string" ? state.activeChat.title : void 0;
+        const activeModal = state.activeModal;
+        const status = String(state.status || "idle");
+        const title = typeof state.title === "string" ? state.title : void 0;
         const interactionId = this.getSessionInteractionId(subscription.params.targetSessionId);
         const prepared = prepareSessionModalUpdate({
           key: subscription.key,