@adhdev/daemon-standalone 0.9.82-rc.134 → 0.9.82-rc.136

package/dist/index.js

@@ -26679,6 +26679,8 @@ Next step: ${nextStep}`;
         recentOutputBuffer,
         terminalScreenText,
         workingDir,
+        providerSessionId,
+        historySessionId,
         baseMessages,
         partialResponse,
         isWaitingForResponse,
@@ -26696,6 +26698,8 @@ Next step: ${nextStep}`;
         screenText,
         workspace: workingDir,
         workingDir,
+        providerSessionId,
+        historySessionId,
         screen: buildCliScreenSnapshot(screenText),
         bufferScreen: buildCliScreenSnapshot(buffer),
         recentScreen: buildCliScreenSnapshot(recentBuffer),
@@ -28248,6 +28252,8 @@ ${lastSnapshot}`;
                 recentOutputBuffer: this.recentOutputBuffer,
                 terminalScreenText: parseScreenText,
                 workingDir: this.workingDir,
+                providerSessionId: this.providerSessionId || void 0,
+                historySessionId: this.providerSessionId || void 0,
                 baseMessages: [],
                 partialResponse: this.responseBuffer,
                 isWaitingForResponse: this.isWaitingForResponse,
@@ -28472,6 +28478,8 @@ ${lastSnapshot}`;
               recentOutputBuffer: this.recentOutputBuffer,
               terminalScreenText: this.getParseScreenText(this.terminalScreen.getText()),
               workingDir: this.workingDir,
+              providerSessionId: this.providerSessionId || void 0,
+              historySessionId: this.providerSessionId || void 0,
               baseMessages: [],
               partialResponse: this.responseBuffer,
               isWaitingForResponse: this.isWaitingForResponse,
@@ -29029,6 +29037,10 @@ ${lastSnapshot}`;
             return this.ptyProcess.getMetadata();
           }
           updateRuntimeMeta(meta3, replace = false) {
+            const nextProviderSessionId = typeof meta3?.providerSessionId === "string" ? meta3.providerSessionId.trim() : "";
+            if (nextProviderSessionId) {
+              this.providerSessionId = nextProviderSessionId;
+            }
             if (!this.ptyProcess || typeof this.ptyProcess.updateMeta !== "function") return;
             this.ptyProcess.updateMeta(meta3, replace);
           }
@@ -29196,6 +29208,9 @@ ${lastSnapshot}`;
             await this.writeToPty(data);
           }
           resolveModal(buttonIndex) {
+            if (this.lastApprovalResolvedAt && Date.now() - this.lastApprovalResolvedAt < this.timeouts.approvalCooldown) {
+              return;
+            }
             let modal = this.activeModal || this.runParseApproval(this.recentOutputBuffer);
             if (!modal && typeof this.cliScripts?.parseSession === "function") {
               try {
@@ -29237,6 +29252,10 @@ ${lastSnapshot}`;
               this.ptyProcess.write(keys);
             }
           }
+          /** Returns true if an approval was resolved within the adapter's cooldown window. */
+          isApprovalRecentlyResolved() {
+            return !!(this.lastApprovalResolvedAt && Date.now() - this.lastApprovalResolvedAt < this.timeouts.approvalCooldown);
+          }
           resize(cols, rows) {
             if (this.ptyProcess) {
               try {
@@ -37160,6 +37179,19 @@ ${effect.notification.body || ""}`.trim();
       if (cleanMessage) lines.push(cleanMessage);
       return lines.join("\n");
     }
+    function looksLikeActiveApprovalPromptText(content) {
+      const text = content.trim();
+      if (!text || text.length > 2e3) return false;
+      const hasApprovalQuestion = /do you want to (?:proceed|allow|run|make this edit|create)/i.test(text) || /this command requires approval/i.test(text) || /quick safety check/i.test(text) || /is this a project you trust/i.test(text);
+      const hasNumberedChoices = /^\s*[❯›>]?\s*1[.)]\s+(?:yes|allow|proceed|run)/im.test(text) || /^\s*1[.)]\s+yes\b/im.test(text);
+      if (hasApprovalQuestion && hasNumberedChoices) return true;
+      const lastLines = text.split(/\r?\n/).slice(-12).join("\n");
+      const hasDontAskAgain = /yes.*don'?t ask again/i.test(lastLines) || /yes.*always allow/i.test(lastLines);
+      const hasNoOption = /^\s*[❯›>]?\s*\d+[.)]\s+no\b/im.test(lastLines);
+      if (hasDontAskAgain && hasNoOption) return true;
+      if (/what do you want to do\?/i.test(text) && /^\s*\d+[.)]\s+\S/m.test(text)) return true;
+      return false;
+    }
     async function withTimeout(promise2, timeoutMs, label) {
       let timer = null;
       try {
@@ -41135,6 +41167,10 @@ ${effect.notification.body || ""}`.trim();
         if (buttonIndex < 0) {
           return { success: false, error: "Approval action did not match any visible button" };
         }
+        if (typeof adapter.isApprovalRecentlyResolved === "function" && adapter.isApprovalRecentlyResolved()) {
+          LOG2.info("Command", `[resolveAction] CLI PTY \u2192 stale_prompt (already resolved within cooldown)`);
+          return { success: true, stalePrompt: true, buttonIndex, button: buttons[buttonIndex] ?? button };
+        }
         if (typeof adapter.resolveModal === "function") {
           adapter.resolveModal(buttonIndex);
         } else {
@@ -42917,6 +42953,9 @@ ${effect.notification.body || ""}`.trim();
         this.launchMode = options?.launchMode || "new";
         this.onProviderSessionResolved = options?.onProviderSessionResolved;
         this.adapter = new ProviderCliAdapter(provider, workingDir, cliArgs, options?.extraEnv || {}, transportFactory);
+        if (this.providerSessionId) {
+          this.adapter.updateRuntimeMeta({ providerSessionId: this.providerSessionId });
+        }
         this.monitor = new StatusMonitor();
         this.historyWriter = new ChatHistoryWriter();
       }
@@ -43310,7 +43349,9 @@ ${effect.notification.body || ""}`.trim();
         const lastVisible = visibleMessages[visibleMessages.length - 1];
         const role = typeof lastVisible?.role === "string" ? lastVisible.role.trim().toLowerCase() : "";
         const content = lastVisible ? flattenContent(lastVisible.content).trim() : "";
-        return role === "assistant" && !!content;
+        if (role !== "assistant" || !content) return false;
+        if (looksLikeActiveApprovalPromptText(content)) return false;
+        return true;
       }
       buildCompletedFinalizationDiagnostic(args) {
         let parsed = null;
@@ -43398,6 +43439,16 @@ ${effect.notification.body || ""}`.trim();
         }
         if (parsed?.activeModal || parsed?.modal) return { reason: "parsed_modal_active", terminal: true };
         if (!this.completionHasFinalAssistantMessage(parsed?.messages)) return { reason: "missing_final_assistant" };
+        try {
+          const screenText = typeof this.adapter.getScreenText === "function" ? String(this.adapter.getScreenText() || "") : "";
+          if (screenText) {
+            const tailLines = screenText.split(/\r?\n/).slice(-16).join("\n");
+            if (looksLikeActiveApprovalPromptText(tailLines)) {
+              return { reason: "screen_shows_approval_prompt", terminal: false };
+            }
+          }
+        } catch {
+        }
         return null;
       }
       scheduleCompletedDebounceFlush(delayMs) {
@@ -45696,7 +45747,9 @@ ${rawInput}` : rawInput;
             providerSessionId,
             attachExisting
           );
-          return new ProviderCliAdapter(resolvedProvider, workingDir, cliArgs, extraEnv || {}, transportFactory);
+          const adapter = new ProviderCliAdapter(resolvedProvider, workingDir, cliArgs, extraEnv || {}, transportFactory);
+          if (providerSessionId) adapter.updateRuntimeMeta({ providerSessionId });
+          return adapter;
         }
         throw new Error(`No CLI provider found for '${cliType}'. Create a provider.js in providers/cli/${cliType}/`);
       }