@adhdev/daemon-core 0.8.14 → 0.8.16

package/dist/cli-adapters/provider-cli-adapter.d.ts

@@ -66,6 +66,7 @@ export interface CliScriptInput {
     screenText: string;
     messages: CliChatMessage[];
     partialResponse: string;
+    promptText?: string;
 }
 export interface CliTraceEntry {
     id: number;
@@ -172,6 +173,8 @@ export declare class ProviderCliAdapter implements CliAdapter {
     private submitRetryUsed;
     private submitRetryPromptSnippet;
     private idleFinishCandidate;
+    private finishRetryTimer;
+    private finishRetryCount;
     private resizeSuppressUntil;
     private statusHistory;
     private cliScripts;
@@ -190,6 +193,8 @@ export declare class ProviderCliAdapter implements CliAdapter {
     private static readonly MAX_TRACE_ENTRIES;
     private readonly providerResolutionMeta;
     private static readonly IDLE_FINISH_CONFIRM_MS;
+    private static readonly FINISH_RETRY_DELAY_MS;
+    private static readonly MAX_FINISH_RETRIES;
     private syncMessageViews;
     private normalizeParsedMessages;
     private sliceFromOffset;
@@ -220,6 +225,10 @@ export declare class ProviderCliAdapter implements CliAdapter {
     private scheduleSettle;
     private armApprovalExitTimeout;
     private looksLikeVisibleIdlePrompt;
+    private looksLikeVisibleAssistantCandidate;
+    private shouldRetryFinishResponse;
+    private getStartupConfirmationModal;
+    private shouldResolveModalWithEnter;
     private waitForInteractivePrompt;
     private evaluateSettled;
     private finishResponse;

package/dist/daemon/dev-auto-implement.d.ts

@@ -19,6 +19,7 @@ type CliExerciseVerification = {
     lastAssistantMustNotMatchAny?: string[];
     inspectFields?: string[];
     description?: string;
+    focusAreas?: string[];
     fixtureName?: string;
     fixtureNames?: string[];
 };

package/dist/index.js

@@ -705,17 +705,32 @@ var init_terminal_screen = __esm({
   }
 });
 
+// src/cli-adapters/spawn-env.ts
+var import_session_host_core;
+var init_spawn_env = __esm({
+  "src/cli-adapters/spawn-env.ts"() {
+    "use strict";
+    import_session_host_core = require("@adhdev/session-host-core");
+  }
+});
+
 // src/cli-adapters/pty-transport.ts
-var os7, pty, NodePtyRuntimeTransport, NodePtyTransportFactory;
+function loadNodePty() {
+  if (cachedPty !== void 0) return cachedPty;
+  try {
+    cachedPty = require("node-pty");
+    (0, import_session_host_core.ensureNodePtySpawnHelperPermissions)();
+  } catch {
+    cachedPty = null;
+  }
+  return cachedPty;
+}
+var os7, cachedPty, NodePtyRuntimeTransport, NodePtyTransportFactory;
 var init_pty_transport = __esm({
   "src/cli-adapters/pty-transport.ts"() {
     "use strict";
     os7 = __toESM(require("os"));
-    try {
-      pty = require("node-pty");
-    } catch {
-      pty = null;
-    }
+    init_spawn_env();
     NodePtyRuntimeTransport = class {
       constructor(handle) {
         this.handle = handle;
@@ -746,6 +761,7 @@ var init_pty_transport = __esm({
     };
     NodePtyTransportFactory = class {
       spawn(command, args, options) {
+        const pty = loadNodePty();
         if (!pty) throw new Error("node-pty is not installed");
         let cwd = options.cwd;
         if (cwd) {
@@ -770,15 +786,6 @@ var init_pty_transport = __esm({
   }
 });
 
-// src/cli-adapters/spawn-env.ts
-var import_session_host_core;
-var init_spawn_env = __esm({
-  "src/cli-adapters/spawn-env.ts"() {
-    "use strict";
-    import_session_host_core = require("@adhdev/session-host-core");
-  }
-});
-
 // src/cli-adapters/provider-cli-adapter.ts
 var provider_cli_adapter_exports = {};
 __export(provider_cli_adapter_exports, {
@@ -898,6 +905,40 @@ function normalizeScreenSnapshot(text) {
 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") {
@@ -922,7 +963,7 @@ function normalizeCliProviderForRuntime(raw) {
     }
   };
 }
-var os8, path7, import_child_process4, pty2, buildCliSpawnEnv, ProviderCliAdapter;
+var os8, path7, import_child_process4, buildCliSpawnEnv, ProviderCliAdapter;
 var init_provider_cli_adapter = __esm({
   "src/cli-adapters/provider-cli-adapter.ts"() {
     "use strict";
@@ -933,12 +974,6 @@ var init_provider_cli_adapter = __esm({
     init_terminal_screen();
     init_pty_transport();
     init_spawn_env();
-    try {
-      pty2 = require("node-pty");
-      (0, import_session_host_core.ensureNodePtySpawnHelperPermissions)((msg) => LOG.info("CLI", msg));
-    } catch {
-      LOG.error("CLI", "[ProviderCliAdapter] node-pty not found. Terminal features disabled.");
-    }
     buildCliSpawnEnv = import_session_host_core.sanitizeSpawnEnv;
     ProviderCliAdapter = class _ProviderCliAdapter {
       constructor(provider, workingDir, extraArgs = [], transportFactory = new NodePtyTransportFactory()) {
@@ -1040,6 +1075,8 @@ var init_provider_cli_adapter = __esm({
       submitRetryUsed = false;
       submitRetryPromptSnippet = "";
       idleFinishCandidate = null;
+      finishRetryTimer = null;
+      finishRetryCount = 0;
       // Resize redraw suppression
       resizeSuppressUntil = 0;
       // Debug: status transition history
@@ -1061,6 +1098,8 @@ var init_provider_cli_adapter = __esm({
       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];
@@ -1120,7 +1159,8 @@ var init_provider_cli_adapter = __esm({
           recentBuffer: buffer.slice(-1e3) || this.recentOutputBuffer,
           screenText: this.terminalScreen.getText(),
           messages: [...baseMessages],
-          partialResponse
+          partialResponse,
+          promptText: scope?.prompt || ""
         };
       }
       setStatus(status, trigger) {
@@ -1363,6 +1403,11 @@ var init_provider_cli_adapter = __esm({
         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", {
@@ -1409,11 +1454,12 @@ var init_provider_cli_adapter = __esm({
         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;
@@ -1445,7 +1491,9 @@ var init_provider_cli_adapter = __esm({
         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"] };
@@ -1465,6 +1513,63 @@ var init_provider_cli_adapter = __esm({
         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;
@@ -1514,9 +1619,10 @@ var init_provider_cli_adapter = __esm({
         }
         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,
@@ -1711,7 +1817,24 @@ var init_provider_cli_adapter = __esm({
         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;
@@ -1728,11 +1851,16 @@ var init_provider_cli_adapter = __esm({
           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");
@@ -1746,6 +1874,13 @@ var init_provider_cli_adapter = __esm({
         );
         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", {
@@ -1761,7 +1896,15 @@ var init_provider_cli_adapter = __esm({
               `[${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) {
@@ -1840,7 +1983,15 @@ var init_provider_cli_adapter = __esm({
         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) {
           LOG.warn("CLI", `[${this.cliType}] parseOutput error: ${e.message}`);
           return null;
@@ -1885,10 +2036,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,
@@ -2116,6 +2276,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;
@@ -2139,6 +2303,7 @@ ${data.message || ""}`.trim();
           this.ptyOutputFlushTimer = null;
         }
         this.ptyOutputBuffer = "";
+        this.finishRetryCount = 0;
         if (this.ptyProcess) {
           this.ptyProcess.write("");
           setTimeout(() => {
@@ -2169,6 +2334,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;
@@ -2192,6 +2361,7 @@ ${data.message || ""}`.trim();
           this.ptyOutputFlushTimer = null;
         }
         this.ptyOutputBuffer = "";
+        this.finishRetryCount = 0;
         if (this.ptyProcess) {
           try {
             if (typeof this.ptyProcess.detach === "function") {
@@ -2228,6 +2398,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?.();
@@ -2247,10 +2422,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();
@@ -2261,7 +2437,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";
@@ -11673,7 +11851,10 @@ function appendUpgradeLog(message) {
   }
 }
 function getNpmExecutable() {
-  return process.platform === "win32" ? "npm.cmd" : "npm";
+  return "npm";
+}
+function getNpmExecOptions() {
+  return { shell: process.platform === "win32" };
 }
 function killPid(pid) {
   try {
@@ -11735,9 +11916,10 @@ function removeDaemonPidFile() {
   }
 }
 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]);
@@ -11798,7 +11980,8 @@ async function runDaemonUpgradeHelper(payload) {
     {
       encoding: "utf8",
       stdio: "pipe",
-      maxBuffer: 20 * 1024 * 1024
+      maxBuffer: 20 * 1024 * 1024,
+      ...getNpmExecOptions()
     }
   );
   if (installOutput.trim()) {
@@ -15020,6 +15203,53 @@ async function runCliExerciseInternal(ctx, body) {
   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);
@@ -15034,32 +15264,14 @@ async function runCliExerciseInternal(ctx, body) {
     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);
@@ -16055,10 +16267,10 @@ async function handleAutoImplement(ctx, type, req, res) {
     let isPty = false;
     const { spawn: spawnFn } = await import("child_process");
     try {
-      const pty3 = require("node-pty");
+      const pty = require("node-pty");
       ctx.log(`Auto-implement spawn (PTY): ${shellCmd}`);
       const isWin2 = os17.platform() === "win32";
-      child = pty3.spawn(isWin2 ? "cmd.exe" : process.env.SHELL || "/bin/zsh", [isWin2 ? "/c" : "-c", shellCmd], {
+      child = pty.spawn(isWin2 ? "cmd.exe" : process.env.SHELL || "/bin/zsh", [isWin2 ? "/c" : "-c", shellCmd], {
         name: "xterm-256color",
         cols: 120,
         rows: 40,
@@ -16714,6 +16926,13 @@ function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, ref
   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("");