@adhdev/daemon-core 0.9.40 → 0.9.42

package/dist/index.js

@@ -1843,6 +1843,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
   })));
@@ -1976,6 +1980,8 @@ function resolveCliSpawnPlan(options) {
     shellCmd = binaryPath;
     shellArgs = allArgs;
   }
+  const env = buildCliSpawnEnv(process.env, spawnConfig.env);
+  env.TERMINAL_CWD = workingDir;
   return {
     binaryPath,
     allArgs,
@@ -1987,7 +1993,7 @@ function resolveCliSpawnPlan(options) {
       cols: import_session_host_core2.DEFAULT_SESSION_HOST_COLS,
       rows: import_session_host_core2.DEFAULT_SESSION_HOST_ROWS,
       cwd: workingDir,
-      env: buildCliSpawnEnv(process.env, spawnConfig.env)
+      env
     }
   };
 }
@@ -2283,7 +2289,7 @@ var init_provider_cli_adapter = __esm({
       }
       getFreshParsedStatusCache() {
         const cached = this.parsedStatusCache;
-        if (cached && cached.committedMessagesRef === this.committedMessages && cached.responseBuffer === this.responseBuffer && cached.currentTurnScope === this.currentTurnScope && cached.recentOutputBuffer === this.recentOutputBuffer && cached.accumulatedBuffer === this.accumulatedBuffer && cached.accumulatedRawBuffer === this.accumulatedRawBuffer && cached.screenText === this.lastScreenText && cached.currentStatus === this.currentStatus && cached.activeModal === this.activeModal && cached.cliName === this.cliName && cached.lastOutputAt === this.lastOutputAt) {
+        if (cached && cached.committedMessagesRef === this.committedMessages && cached.responseBuffer === this.responseBuffer && cached.currentTurnScope === this.currentTurnScope && cached.recentOutputBuffer === this.recentOutputBuffer && cached.accumulatedBuffer === this.accumulatedBuffer && cached.screenText === this.lastScreenText && cached.currentStatus === this.currentStatus && cached.activeModal === this.activeModal && cached.cliName === this.cliName) {
           return cached.result;
         }
         return null;
@@ -3455,6 +3461,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
         }));
@@ -3484,6 +3494,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
           };
@@ -3520,6 +3534,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
           });
         });
@@ -3531,7 +3549,7 @@ var init_provider_cli_adapter = __esm({
       getScriptParsedStatus() {
         const screenText = this.readTerminalScreenText();
         const cached = this.parsedStatusCache;
-        if (cached && cached.committedMessagesRef === this.committedMessages && cached.responseBuffer === this.responseBuffer && cached.currentTurnScope === this.currentTurnScope && cached.recentOutputBuffer === this.recentOutputBuffer && cached.accumulatedBuffer === this.accumulatedBuffer && cached.accumulatedRawBuffer === this.accumulatedRawBuffer && cached.screenText === screenText && cached.currentStatus === this.currentStatus && cached.activeModal === this.activeModal && cached.cliName === this.cliName && cached.lastOutputAt === this.lastOutputAt) {
+        if (cached && cached.committedMessagesRef === this.committedMessages && cached.responseBuffer === this.responseBuffer && cached.currentTurnScope === this.currentTurnScope && cached.recentOutputBuffer === this.recentOutputBuffer && cached.accumulatedBuffer === this.accumulatedBuffer && cached.screenText === screenText && cached.currentStatus === this.currentStatus && cached.activeModal === this.activeModal && cached.cliName === this.cliName) {
           return cached.result;
         }
         const parsed = this.parseCurrentTranscript(
@@ -3650,12 +3668,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;
@@ -8521,6 +8537,15 @@ var ExtensionProviderInstance = class {
       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;
@@ -8987,6 +9012,23 @@ var IdeProviderInstance = class {
       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") {
@@ -13651,6 +13693,18 @@ var CliProviderInstance = class {
       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);
@@ -14378,6 +14432,18 @@ var AcpProviderInstance = class {
       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) => {
@@ -21260,6 +21326,29 @@ var ProviderInstanceManager = class {
     }
     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
   */