@adhdev/daemon-standalone 0.8.15 → 0.8.17

package/dist/index.js

@@ -28699,6 +28699,40 @@ var require_dist2 = __commonJS({
     function normalizeComparableMessageContent(text) {
       return String(text || "").replace(/\s+/g, " ").trim();
     }
+    function trimPromptEchoPrefix(text, promptText) {
+      const prompt = normalizeComparableMessageContent(String(promptText || ""));
+      if (!prompt) return String(text || "");
+      const lines = String(text || "").split(/\r\n|\n|\r/g);
+      let dropCount = 0;
+      for (let index = 0; index < Math.min(lines.length, 6); index += 1) {
+        const fragment = normalizeComparableMessageContent(lines[index].replace(/^[.…]+\s*/, ""));
+        if (!fragment) {
+          if (dropCount === index) dropCount = index + 1;
+          continue;
+        }
+        const fragmentWordCount = fragment ? fragment.split(/\s+/).filter(Boolean).length : 0;
+        const canBePromptEcho = fragment.length >= 16 || fragmentWordCount >= 4;
+        if (canBePromptEcho && prompt.includes(fragment)) {
+          dropCount = index + 1;
+          continue;
+        }
+        break;
+      }
+      return lines.slice(dropCount).join("\n").trim();
+    }
+    function getLastUserPromptText(messages) {
+      const items = Array.isArray(messages) ? messages : [];
+      for (let index = items.length - 1; index >= 0; index -= 1) {
+        const message = items[index];
+        if (message?.role === "user" && typeof message.content === "string" && message.content.trim()) {
+          return message.content;
+        }
+      }
+      return "";
+    }
+    function looksLikeConfirmOnlyLabel(label) {
+      return /^(?:continue|confirm|ok|yes|trust|proceed|enter)$/i.test(String(label || "").trim());
+    }
     function parsePatternEntry(x) {
       if (x instanceof RegExp) return x;
       if (x && typeof x === "object" && typeof x.source === "string") {
@@ -28839,6 +28873,8 @@ var require_dist2 = __commonJS({
           submitRetryUsed = false;
           submitRetryPromptSnippet = "";
           idleFinishCandidate = null;
+          finishRetryTimer = null;
+          finishRetryCount = 0;
           // Resize redraw suppression
           resizeSuppressUntil = 0;
           // Debug: status transition history
@@ -28860,6 +28896,8 @@ var require_dist2 = __commonJS({
           static MAX_TRACE_ENTRIES = 250;
           providerResolutionMeta;
           static IDLE_FINISH_CONFIRM_MS = 900;
+          static FINISH_RETRY_DELAY_MS = 300;
+          static MAX_FINISH_RETRIES = 2;
           syncMessageViews() {
             this.messages = [...this.committedMessages];
             this.structuredMessages = [...this.committedMessages];
@@ -28919,7 +28957,8 @@ var require_dist2 = __commonJS({
               recentBuffer: buffer.slice(-1e3) || this.recentOutputBuffer,
               screenText: this.terminalScreen.getText(),
               messages: [...baseMessages],
-              partialResponse
+              partialResponse,
+              promptText: scope?.prompt || ""
             };
           }
           setStatus(status, trigger) {
@@ -29162,6 +29201,11 @@ var require_dist2 = __commonJS({
             this.terminalScreen.reset(24, 80);
             this.pendingTerminalQueryTail = "";
             this.currentTurnScope = null;
+            this.finishRetryCount = 0;
+            if (this.finishRetryTimer) {
+              clearTimeout(this.finishRetryTimer);
+              this.finishRetryTimer = null;
+            }
             this.ready = false;
             await this.ptyProcess.ready;
             this.recordTrace("ready", {
@@ -29208,11 +29252,12 @@ var require_dist2 = __commonJS({
             if (this.startupParseGate) {
               this.startupBuffer += cleanData;
               const elapsed = Date.now() - this.spawnAt;
-              const scriptStatus = this.runDetectStatus(this.startupBuffer);
               const screenText = this.terminalScreen.getText() || "";
+              const startupModal = this.getStartupConfirmationModal(screenText);
+              const scriptStatus = startupModal ? "waiting_approval" : this.runDetectStatus(this.startupBuffer);
               const hasInteractivePrompt = this.looksLikeVisibleIdlePrompt(screenText);
               const startupStableMs = this.lastScreenChangeAt ? now - this.lastScreenChangeAt : 0;
-              const isReady = (scriptStatus === "idle" || scriptStatus === "waiting_approval") && hasInteractivePrompt && startupStableMs >= 700 || elapsed > 8e3 || this.startupBuffer.length > 12e3;
+              const isReady = (scriptStatus === "idle" || scriptStatus === "waiting_approval") && hasInteractivePrompt && startupStableMs >= 700 || !!startupModal && startupStableMs >= 700 || elapsed > 8e3 || this.startupBuffer.length > 12e3;
               if (isReady) {
                 this.startupParseGate = false;
                 this.ready = true;
@@ -29244,7 +29289,9 @@ var require_dist2 = __commonJS({
             this.approvalExitTimeout = setTimeout(() => {
               if (this.currentStatus !== "waiting_approval") return;
               const tail = this.recentOutputBuffer;
-              const modal = this.runParseApproval(tail);
+              const screenText = this.terminalScreen.getText() || "";
+              const startupModal = this.getStartupConfirmationModal(screenText);
+              const modal = this.runParseApproval(tail) || startupModal;
               const stillWaiting = this.runDetectStatus(tail) === "waiting_approval" || !!modal;
               if (stillWaiting) {
                 this.activeModal = modal || this.activeModal || { message: "Approval required", buttons: ["Allow", "Deny"] };
@@ -29264,6 +29311,63 @@ var require_dist2 = __commonJS({
             if (!text.trim()) return false;
             return /(^|\n)\s*[❯›>]\s*(?:\n|$)/m.test(text) || /⏎\s+send/i.test(text) || /\?\s*for\s*shortcuts/i.test(text) || /Type your message(?:\s+or\s+@path\/to\/file)?/i.test(text) || /workspace\s*\(\/directory\)/i.test(text) || /for\s*shortcuts/i.test(text);
           }
+          looksLikeVisibleAssistantCandidate(screenText) {
+            const lines = sanitizeTerminalText(String(screenText || "")).split(/\r\n|\n|\r/g);
+            for (const line of lines) {
+              const trimmed = String(line || "").trim();
+              if (!trimmed) continue;
+              if (/^➜\s+\S+/.test(trimmed)) continue;
+              if (/^Update available!/i.test(trimmed)) continue;
+              if (/Claude Code v\d/i.test(trimmed)) continue;
+              if (/^⏵⏵\s+accept edits on/i.test(trimmed)) continue;
+              if (/^[◐◑◒◓◴◵◶◷◸◹◺◿].*\/effort/i.test(trimmed)) continue;
+              if (/^[✻✶✳✢✽⠂⠐⠒⠓⠦⠴⠶⠷⠿]+$/.test(trimmed)) continue;
+              if (/esc to (cancel|interrupt|stop)/i.test(trimmed)) continue;
+              const assistantMatch = trimmed.match(/^⏺\s+(.+)$/);
+              if (!assistantMatch) continue;
+              const content = assistantMatch[1].trim();
+              if (!content) continue;
+              if (/^(?:Bash|Read|Write|Edit|MultiEdit|Task|Glob|Grep|LS|NotebookEdit)\(/.test(content)) continue;
+              if (/This command requires approval|Do you want to proceed|Allow once|Always allow/i.test(content)) continue;
+              return true;
+            }
+            return false;
+          }
+          shouldRetryFinishResponse(commitResult) {
+            if (!this.currentTurnScope) return false;
+            if (this.currentStatus === "waiting_approval" || this.activeModal) return false;
+            if (this.finishRetryCount >= _ProviderCliAdapter.MAX_FINISH_RETRIES) return false;
+            if (commitResult.hasAssistant && commitResult.assistantContent.trim()) return false;
+            const screenText = this.terminalScreen.getText() || "";
+            if (!this.looksLikeVisibleAssistantCandidate(screenText)) return false;
+            const now = Date.now();
+            const quietForMs = this.lastNonEmptyOutputAt ? now - this.lastNonEmptyOutputAt : Number.MAX_SAFE_INTEGER;
+            const screenStableMs = this.lastScreenChangeAt ? now - this.lastScreenChangeAt : 0;
+            return quietForMs < 1200 || screenStableMs < 1200 || !commitResult.hasAssistant;
+          }
+          getStartupConfirmationModal(screenText) {
+            const text = sanitizeTerminalText(String(screenText || ""));
+            if (!text.trim()) return null;
+            if (this.cliType === "claude-cli") {
+              const hasTrustPrompt = /Quick safety check/i.test(text) || /Is this a project you trust/i.test(text) || /Do you trust (?:this project|the contents of this directory|the files in this folder)/i.test(text);
+              const hasConfirmFooter = /Press Enter to (?:continue|confirm)/i.test(text) || /Enter to confirm/i.test(text) || /Esc to (?:cancel|exit)/i.test(text);
+              if (hasTrustPrompt || hasConfirmFooter && /trust/i.test(text)) {
+                return {
+                  message: "Confirm Claude Code project trust",
+                  buttons: ["Continue"]
+                };
+              }
+            }
+            return null;
+          }
+          shouldResolveModalWithEnter(modal, buttonIndex) {
+            if (!modal || buttonIndex !== 0) return false;
+            const buttons = Array.isArray(modal.buttons) ? modal.buttons : [];
+            if (buttons.length !== 1) return false;
+            const buttonLabel = String(buttons[0] || "").trim();
+            const modalText = `${modal.message || ""} ${buttonLabel}`.trim();
+            return looksLikeConfirmOnlyLabel(buttonLabel) || /Quick safety check|project trust|trust (?:this project|the contents of this directory|the files in this folder)|Enter to confirm/i.test(modalText);
+          }
           async waitForInteractivePrompt(maxWaitMs = 5e3) {
             const startedAt = Date.now();
             let loggedWait = false;
@@ -29313,9 +29417,10 @@ var require_dist2 = __commonJS({
             }
             const tail = this.settledBuffer;
             const screenText = this.terminalScreen.getText() || "";
-            const modal = this.runParseApproval(tail);
+            const startupModal = this.getStartupConfirmationModal(screenText);
+            const modal = this.runParseApproval(tail) || startupModal;
             const rawScriptStatus = this.runDetectStatus(tail);
-            const scriptStatus = rawScriptStatus;
+            const scriptStatus = startupModal ? "waiting_approval" : rawScriptStatus;
             const parsedTranscript = this.parseCurrentTranscript(
               this.committedMessages,
               this.responseBuffer,
@@ -29510,7 +29615,24 @@ var require_dist2 = __commonJS({
             this.recordTrace("finish_response", {
               ...this.buildTraceParseSnapshot(this.currentTurnScope, this.responseBuffer)
             });
-            this.commitCurrentTranscript();
+            const commitResult = this.commitCurrentTranscript();
+            if (this.shouldRetryFinishResponse(commitResult)) {
+              this.finishRetryCount += 1;
+              this.recordTrace("finish_response_retry", {
+                retryCount: this.finishRetryCount,
+                retryDelayMs: _ProviderCliAdapter.FINISH_RETRY_DELAY_MS,
+                assistantContent: this.summarizeTraceText(commitResult.assistantContent, 220),
+                ...this.buildTraceParseSnapshot(this.currentTurnScope, this.responseBuffer)
+              });
+              if (this.finishRetryTimer) clearTimeout(this.finishRetryTimer);
+              this.finishRetryTimer = setTimeout(() => {
+                this.finishRetryTimer = null;
+                if (this.isWaitingForResponse && this.currentStatus !== "waiting_approval") {
+                  this.finishResponse();
+                }
+              }, _ProviderCliAdapter.FINISH_RETRY_DELAY_MS);
+              return;
+            }
             if (this.responseTimeout) {
               clearTimeout(this.responseTimeout);
               this.responseTimeout = null;
@@ -29527,11 +29649,16 @@ var require_dist2 = __commonJS({
               clearTimeout(this.submitRetryTimer);
               this.submitRetryTimer = null;
             }
+            if (this.finishRetryTimer) {
+              clearTimeout(this.finishRetryTimer);
+              this.finishRetryTimer = null;
+            }
             this.responseBuffer = "";
             this.isWaitingForResponse = false;
             this.responseSettleIgnoreUntil = 0;
             this.submitRetryUsed = false;
             this.submitRetryPromptSnippet = "";
+            this.finishRetryCount = 0;
             this.currentTurnScope = null;
             this.activeModal = null;
             this.setStatus("idle", "response_finished");
@@ -29545,6 +29672,13 @@ var require_dist2 = __commonJS({
             );
             if (parsed && Array.isArray(parsed.messages)) {
               this.committedMessages = this.normalizeParsedMessages(parsed.messages);
+              const promptForTrim = this.currentTurnScope?.prompt || getLastUserPromptText(this.committedMessages);
+              if (promptForTrim) {
+                const lastAssistantForTrim = [...this.committedMessages].reverse().find((message) => message.role === "assistant");
+                if (lastAssistantForTrim) {
+                  lastAssistantForTrim.content = trimPromptEchoPrefix(lastAssistantForTrim.content, promptForTrim);
+                }
+              }
               this.syncMessageViews();
               const lastAssistant = [...this.committedMessages].reverse().find((message) => message.role === "assistant");
               this.recordTrace("commit_transcript", {
@@ -29560,7 +29694,15 @@ var require_dist2 = __commonJS({
                   `[${this.cliType}] Commit without assistant turn: prompt=${JSON.stringify(this.currentTurnScope.prompt).slice(0, 140)} responseBuffer=${JSON.stringify(this.summarizeTraceText(this.responseBuffer, 220)).slice(0, 260)} providerDir=${this.providerResolutionMeta.providerDir || "-"} scriptDir=${this.providerResolutionMeta.scriptDir || "-"} scriptsPath=${this.providerResolutionMeta.scriptsPath || "-"}`
                 );
               }
+              return {
+                hasAssistant: !!lastAssistant,
+                assistantContent: lastAssistant?.content || ""
+              };
             }
+            return {
+              hasAssistant: false,
+              assistantContent: ""
+            };
           }
           // ─── Script Execution ──────────────────────────
           runDetectStatus(text) {
@@ -29639,7 +29781,15 @@ var require_dist2 = __commonJS({
             if (!this.cliScripts?.parseOutput) return null;
             try {
               const input = this.buildParseInput(baseMessages, partialResponse, scope);
-              return this.cliScripts.parseOutput(input);
+              const parsed = this.cliScripts.parseOutput(input);
+              const promptForTrim = scope?.prompt || getLastUserPromptText(baseMessages);
+              if (parsed && Array.isArray(parsed.messages) && promptForTrim) {
+                const lastAssistant = [...parsed.messages].reverse().find((message) => message?.role === "assistant" && typeof message.content === "string");
+                if (lastAssistant) {
+                  lastAssistant.content = trimPromptEchoPrefix(lastAssistant.content, promptForTrim);
+                }
+              }
+              return parsed;
             } catch (e) {
               LOG2.warn("CLI", `[${this.cliType}] parseOutput error: ${e.message}`);
               return null;
@@ -29684,10 +29834,19 @@ ${data.message || ""}`.trim();
             if (!this.ready) throw new Error(`${this.cliName} not ready (status: ${this.currentStatus})`);
             if (this.isWaitingForResponse) return;
             await this.waitForInteractivePrompt();
+            const blockingModal = this.activeModal || this.getStartupConfirmationModal(this.terminalScreen.getText() || "");
+            if (blockingModal || this.currentStatus === "waiting_approval") {
+              throw new Error(`${this.cliName} is awaiting confirmation before it can accept a prompt`);
+            }
             this.committedMessages.push({ role: "user", content: text, timestamp: Date.now() });
             this.syncMessageViews();
             this.isWaitingForResponse = true;
             this.responseBuffer = "";
+            this.finishRetryCount = 0;
+            if (this.finishRetryTimer) {
+              clearTimeout(this.finishRetryTimer);
+              this.finishRetryTimer = null;
+            }
             this.clearIdleFinishCandidate("send_message");
             this.currentTurnScope = {
               prompt: text,
@@ -29915,6 +30074,10 @@ ${data.message || ""}`.trim();
               clearTimeout(this.submitRetryTimer);
               this.submitRetryTimer = null;
             }
+            if (this.finishRetryTimer) {
+              clearTimeout(this.finishRetryTimer);
+              this.finishRetryTimer = null;
+            }
             if (this.responseTimeout) {
               clearTimeout(this.responseTimeout);
               this.responseTimeout = null;
@@ -29938,6 +30101,7 @@ ${data.message || ""}`.trim();
               this.ptyOutputFlushTimer = null;
             }
             this.ptyOutputBuffer = "";
+            this.finishRetryCount = 0;
             if (this.ptyProcess) {
               this.ptyProcess.write("");
               setTimeout(() => {
@@ -29968,6 +30132,10 @@ ${data.message || ""}`.trim();
               clearTimeout(this.submitRetryTimer);
               this.submitRetryTimer = null;
             }
+            if (this.finishRetryTimer) {
+              clearTimeout(this.finishRetryTimer);
+              this.finishRetryTimer = null;
+            }
             if (this.responseTimeout) {
               clearTimeout(this.responseTimeout);
               this.responseTimeout = null;
@@ -29991,6 +30159,7 @@ ${data.message || ""}`.trim();
               this.ptyOutputFlushTimer = null;
             }
             this.ptyOutputBuffer = "";
+            this.finishRetryCount = 0;
             if (this.ptyProcess) {
               try {
                 if (typeof this.ptyProcess.detach === "function") {
@@ -30027,6 +30196,11 @@ ${data.message || ""}`.trim();
               this.ptyOutputFlushTimer = null;
             }
             this.ptyOutputBuffer = "";
+            if (this.finishRetryTimer) {
+              clearTimeout(this.finishRetryTimer);
+              this.finishRetryTimer = null;
+            }
+            this.finishRetryCount = 0;
             this.terminalScreen.reset();
             this.ptyProcess?.clearBuffer?.();
             this.onStatusChange?.();
@@ -30046,10 +30220,11 @@ ${data.message || ""}`.trim();
           }
           resolveModal(buttonIndex) {
             if (!this.ptyProcess || this.currentStatus !== "waiting_approval" && !this.activeModal) return;
+            const modal = this.activeModal;
             this.clearIdleFinishCandidate("resolve_modal");
             this.recordTrace("resolve_modal", {
               buttonIndex,
-              activeModal: this.activeModal
+              activeModal: modal
             });
             this.activeModal = null;
             this.lastApprovalResolvedAt = Date.now();
@@ -30060,7 +30235,9 @@ ${data.message || ""}`.trim();
             }
             this.setStatus("generating", "approval_resolved");
             this.onStatusChange?.();
-            if (buttonIndex in this.approvalKeys) {
+            if (this.shouldResolveModalWithEnter(modal, buttonIndex)) {
+              this.ptyProcess.write("\r");
+            } else if (buttonIndex in this.approvalKeys) {
               this.ptyProcess.write(this.approvalKeys[buttonIndex]);
             } else {
               const DOWN = "\x1B[B";
@@ -30236,6 +30413,7 @@ ${data.message || ""}`.trim();
       setLogLevel: () => setLogLevel,
       setupIdeInstance: () => setupIdeInstance,
       shutdownDaemonComponents: () => shutdownDaemonComponents2,
+      spawnDetachedDaemonUpgradeHelper: () => spawnDetachedDaemonUpgradeHelper,
       startDaemonDevSupport: () => startDaemonDevSupport2,
       updateConfig: () => updateConfig,
       upsertSavedProviderSession: () => upsertSavedProviderSession
@@ -39394,7 +39572,10 @@ Run 'adhdev doctor' for detailed diagnostics.`
       }
     }
     function getNpmExecutable() {
-      return process.platform === "win32" ? "npm.cmd" : "npm";
+      return "npm";
+    }
+    function getNpmExecOptions() {
+      return { shell: process.platform === "win32" };
     }
     function killPid2(pid) {
       try {
@@ -39456,9 +39637,10 @@ Run 'adhdev doctor' for detailed diagnostics.`
       }
     }
     function cleanupStaleGlobalInstallDirs(pkgName) {
-      const npmRoot = (0, import_child_process7.execFileSync)(getNpmExecutable(), ["root", "-g"], { encoding: "utf8" }).trim();
+      const npmExecOpts = getNpmExecOptions();
+      const npmRoot = (0, import_child_process7.execFileSync)(getNpmExecutable(), ["root", "-g"], { encoding: "utf8", ...npmExecOpts }).trim();
       if (!npmRoot) return;
-      const npmPrefix = (0, import_child_process7.execFileSync)(getNpmExecutable(), ["prefix", "-g"], { encoding: "utf8" }).trim();
+      const npmPrefix = (0, import_child_process7.execFileSync)(getNpmExecutable(), ["prefix", "-g"], { encoding: "utf8", ...npmExecOpts }).trim();
       const binDir = process.platform === "win32" ? npmPrefix : path13.join(npmPrefix, "bin");
       const packageBaseName = pkgName.startsWith("@") ? pkgName.split("/")[1] : pkgName;
       const binNames = /* @__PURE__ */ new Set([packageBaseName]);
@@ -39519,7 +39701,8 @@ Run 'adhdev doctor' for detailed diagnostics.`
         {
           encoding: "utf8",
           stdio: "pipe",
-          maxBuffer: 20 * 1024 * 1024
+          maxBuffer: 20 * 1024 * 1024,
+          ...getNpmExecOptions()
         }
       );
       if (installOutput.trim()) {
@@ -42711,6 +42894,53 @@ async (params) => {
       let lastModalKey = "";
       let idleSince = 0;
       let sawBusy = false;
+      const noteStatus = (status) => {
+        if (status !== lastStatus) {
+          statusesSeen.push(status);
+          lastStatus = status;
+        }
+      };
+      const resolveActiveModalIfNeeded = (status, modal) => {
+        if (!autoResolveApprovals || status !== "waiting_approval" || !modal || !Array.isArray(modal.buttons) || modal.buttons.length === 0) {
+          return false;
+        }
+        const clampedIndex = Math.max(0, Math.min(Number(approvalButtonIndex) || 0, modal.buttons.length - 1));
+        const modalKey = JSON.stringify({
+          message: modal.message || "",
+          buttons: modal.buttons,
+          index: clampedIndex
+        });
+        if (modalKey === lastModalKey || typeof bundle?.adapter?.resolveModal !== "function") {
+          return false;
+        }
+        lastModalKey = modalKey;
+        approvalsResolved.push({
+          at: Date.now(),
+          buttonIndex: clampedIndex,
+          label: modal.buttons[clampedIndex] || null
+        });
+        bundle.adapter.resolveModal(clampedIndex);
+        return true;
+      };
+      const preflightStartedAt = Date.now();
+      while (Date.now() - preflightStartedAt < Math.max(1e3, readyTimeoutMs)) {
+        bundle = getCliTargetBundle(ctx, type, bundle.target.instanceId);
+        if (!bundle) {
+          throw new Error("CLI instance disappeared before exercise send");
+        }
+        const debug = typeof bundle.adapter.getDebugState === "function" ? bundle.adapter.getDebugState() : null;
+        const trace = typeof bundle.adapter.getTraceState === "function" ? bundle.adapter.getTraceState(traceLimit) : null;
+        const status = String(debug?.status || bundle.target.status || "unknown");
+        const modal = debug?.activeModal || trace?.activeModal || null;
+        noteStatus(status);
+        if (resolveActiveModalIfNeeded(status, modal)) {
+          await sleep(150);
+          continue;
+        }
+        const startupParseGate = !!debug?.startupParseGate;
+        if (status === "idle" && !startupParseGate) break;
+        await sleep(150);
+      }
       ctx.instanceManager.sendEvent(bundle.target.instanceId, "send_message", { text });
       while (Date.now() - startAt < Math.max(1e3, timeoutMs)) {
         await sleep(150);
@@ -42725,32 +42955,14 @@ async (params) => {
         const sawSendMessage = traceEntries.some((entry) => entry?.type === "send_message");
         const sawSubmitWrite = traceEntries.some((entry) => entry?.type === "submit_write");
         const hasTurnStarted = sawSendMessage || sawSubmitWrite || !!debug?.currentTurnScope;
-        if (status !== lastStatus) {
-          statusesSeen.push(status);
-          lastStatus = status;
-        }
+        noteStatus(status);
         if (status === "generating" || status === "waiting_approval") {
           sawBusy = true;
           idleSince = 0;
         }
         const modal = debug?.activeModal || trace?.activeModal || null;
-        if (autoResolveApprovals && status === "waiting_approval" && modal && Array.isArray(modal.buttons) && modal.buttons.length > 0) {
-          const clampedIndex = Math.max(0, Math.min(Number(approvalButtonIndex) || 0, modal.buttons.length - 1));
-          const modalKey = JSON.stringify({
-            message: modal.message || "",
-            buttons: modal.buttons,
-            index: clampedIndex
-          });
-          if (modalKey !== lastModalKey && typeof bundle.adapter.resolveModal === "function") {
-            lastModalKey = modalKey;
-            approvalsResolved.push({
-              at: Date.now(),
-              buttonIndex: clampedIndex,
-              label: modal.buttons[clampedIndex] || null
-            });
-            bundle.adapter.resolveModal(clampedIndex);
-            continue;
-          }
+        if (resolveActiveModalIfNeeded(status, modal)) {
+          continue;
         }
         const traceCount = Number(trace?.entryCount || 0);
         const hasProgress = hasTurnStarted && (traceCount > preTraceCount || statusesSeen.length > 1 || approvalsResolved.length > 0);
@@ -44403,6 +44615,13 @@ async (params) => {
       lines.push("19. Literal string checks are allowed only for stable proper nouns or exact product chrome that cannot be expressed safely as a broader pattern. Everything else should generalize.");
       lines.push("20. When a bug comes from noisy PTY text, first normalize and classify the line family; do NOT just append another special-case substring to the parser.");
       lines.push("");
+      if (verification?.focusAreas?.length) {
+        lines.push("## Provider-Specific Focus Areas");
+        for (const area of verification.focusAreas) {
+          lines.push(`- ${area}`);
+        }
+        lines.push("");
+      }
       lines.push("## Task");
       lines.push(`Edit files in \`${providerDir}\` to implement: **${functions.join(", ")}**`);
       lines.push("");