@adhdev/daemon-standalone 0.8.21 → 0.8.23

package/dist/index.js

@@ -27855,7 +27855,8 @@ var require_dist2 = __commonJS({
         providerSettings: isPlainObject2(parsed.providerSettings) ? parsed.providerSettings : {},
         ideSettings: isPlainObject2(parsed.ideSettings) ? parsed.ideSettings : {},
         disableUpstream: asBoolean(parsed.disableUpstream, DEFAULT_CONFIG.disableUpstream ?? false),
-        providerDir: asOptionalString(parsed.providerDir)
+        providerDir: asOptionalString(parsed.providerDir),
+        terminalSizingMode: parsed.terminalSizingMode === "fit" ? "fit" : "measured"
       };
     }
     function generateMachineId() {
@@ -28008,7 +28009,8 @@ var require_dist2 = __commonJS({
           registeredMachineId: void 0,
           providerSettings: {},
           ideSettings: {},
-          disableUpstream: false
+          disableUpstream: false,
+          terminalSizingMode: "measured"
         };
         MACHINE_ID_PREFIX = "mach_";
       }
@@ -28604,6 +28606,53 @@ var require_dist2 = __commonJS({
     function sanitizeTerminalText(str) {
       return stripTerminalNoise(stripAnsi(str));
     }
+    function splitCliScreenLines(text) {
+      return String(text || "").replace(/\u0007/g, "").replace(/\r\n/g, "\n").replace(/\r/g, "\n").split("\n").map((line) => line.replace(/\s+$/, ""));
+    }
+    function isPromptLikeCliLine(line) {
+      const trimmed = String(line || "").trim();
+      if (!trimmed) return false;
+      return /^[❯›>]\s*(?:$|\S.*)$/.test(trimmed);
+    }
+    function buildCliScreenSnapshot(text) {
+      const normalizedText = String(text || "").replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+      const rawLines = splitCliScreenLines(normalizedText);
+      const lines = rawLines.map((line, index, arr) => {
+        const trimmed = String(line || "").trim();
+        return {
+          index,
+          fromTop: index,
+          fromBottom: arr.length - index - 1,
+          text: line,
+          trimmed,
+          isEmpty: trimmed.length === 0
+        };
+      });
+      const nonEmptyLines = lines.filter((line) => !line.isEmpty);
+      const firstNonEmptyLine = nonEmptyLines[0] ?? null;
+      const lastNonEmptyLine = nonEmptyLines[nonEmptyLines.length - 1] ?? null;
+      let promptLineIndex = -1;
+      for (let i = lines.length - 1; i >= 0; i -= 1) {
+        if (isPromptLikeCliLine(lines[i].text)) {
+          promptLineIndex = i;
+          break;
+        }
+      }
+      return {
+        text: normalizedText,
+        lineCount: lines.length,
+        lines,
+        nonEmptyLines,
+        firstNonEmptyLineIndex: firstNonEmptyLine?.index ?? -1,
+        lastNonEmptyLineIndex: lastNonEmptyLine?.index ?? -1,
+        firstNonEmptyLine,
+        lastNonEmptyLine,
+        promptLineIndex,
+        promptLine: promptLineIndex >= 0 ? lines[promptLineIndex] : null,
+        linesAbovePrompt: promptLineIndex >= 0 ? lines.slice(0, promptLineIndex) : [...lines],
+        linesBelowPrompt: promptLineIndex >= 0 ? lines.slice(promptLineIndex + 1) : []
+      };
+    }
     function computeTerminalQueryTail(buffer) {
       const prefixes = ["\x1B[6n", "\x1B[?6n"];
       const maxLength = prefixes.reduce((n, value) => Math.max(n, value.length), 0) - 1;
@@ -28849,7 +28898,9 @@ var require_dist2 = __commonJS({
           ready = false;
           startupBuffer = "";
           startupParseGate = false;
+          startupSettleTimer = null;
           spawnAt = 0;
+          startupFirstOutputAt = 0;
           // PTY I/O
           onPtyDataCallback = null;
           pendingOutputParseBuffer = "";
@@ -28890,6 +28941,7 @@ var require_dist2 = __commonJS({
           statusHistory = [];
           // ─── CLI Scripts (script-based parsing) ───
           cliScripts;
+          runtimeSettings = {};
           /** Full accumulated ANSI-stripped PTY output */
           accumulatedBuffer = "";
           /** Full accumulated raw PTY output (with ANSI) */
@@ -28904,14 +28956,15 @@ var require_dist2 = __commonJS({
           traceSessionId = `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
           static MAX_TRACE_ENTRIES = 250;
           providerResolutionMeta;
-          static IDLE_FINISH_CONFIRM_MS = 900;
+          static IDLE_FINISH_CONFIRM_MS = 2e3;
+          static STATUS_ACTIVITY_HOLD_MS = 2e3;
           static FINISH_RETRY_DELAY_MS = 300;
           static MAX_FINISH_RETRIES = 2;
           syncMessageViews() {
             this.messages = [...this.committedMessages];
             this.structuredMessages = [...this.committedMessages];
           }
-          normalizeParsedMessages(parsedMessages) {
+          hydrateParsedMessages(parsedMessages, scope) {
             const referenceMessages = [...this.committedMessages];
             const usedReferenceIndexes = /* @__PURE__ */ new Set();
             const now = Date.now();
@@ -28944,13 +28997,30 @@ var require_dist2 = __commonJS({
               const content = typeof message.content === "string" ? message.content : String(message.content || "");
               const parsedTimestamp = typeof message.timestamp === "number" && Number.isFinite(message.timestamp) ? message.timestamp : void 0;
               const referenceTimestamp = parsedTimestamp ?? findReferenceTimestamp(role, content, index);
+              const fallbackTimestamp = role === "user" ? scope?.startedAt || now : this.lastOutputAt || scope?.startedAt || now;
+              const timestamp = referenceTimestamp ?? fallbackTimestamp;
               return {
+                ...message,
                 role,
                 content,
-                timestamp: referenceTimestamp ?? now
+                timestamp,
+                receivedAt: typeof message.receivedAt === "number" && Number.isFinite(message.receivedAt) ? message.receivedAt : timestamp
               };
             });
           }
+          normalizeParsedMessages(parsedMessages, scope) {
+            return this.hydrateParsedMessages(parsedMessages, scope).map((message) => ({
+              role: message.role,
+              content: message.content,
+              timestamp: message.timestamp,
+              receivedAt: message.receivedAt,
+              kind: message.kind,
+              id: message.id,
+              index: message.index,
+              meta: message.meta,
+              senderName: message.senderName
+            }));
+          }
           sliceFromOffset(text, start) {
             if (!text) return "";
             if (!Number.isFinite(start) || start <= 0) return text;
@@ -28960,14 +29030,20 @@ var require_dist2 = __commonJS({
           buildParseInput(baseMessages, partialResponse, scope) {
             const buffer = scope ? this.sliceFromOffset(this.accumulatedBuffer, scope.bufferStart) || this.accumulatedBuffer : this.accumulatedBuffer;
             const rawBuffer = scope ? this.sliceFromOffset(this.accumulatedRawBuffer, scope.rawBufferStart) || this.accumulatedRawBuffer : this.accumulatedRawBuffer;
+            const screenText = this.terminalScreen.getText();
+            const recentBuffer = buffer.slice(-1e3) || this.recentOutputBuffer;
             return {
               buffer,
               rawBuffer,
-              recentBuffer: buffer.slice(-1e3) || this.recentOutputBuffer,
-              screenText: this.terminalScreen.getText(),
+              recentBuffer,
+              screenText,
+              screen: buildCliScreenSnapshot(screenText),
+              bufferScreen: buildCliScreenSnapshot(buffer),
+              recentScreen: buildCliScreenSnapshot(recentBuffer),
               messages: [...baseMessages],
               partialResponse,
-              promptText: scope?.prompt || ""
+              promptText: scope?.prompt || "",
+              settings: { ...this.runtimeSettings }
             };
           }
           setStatus(status, trigger) {
@@ -29073,6 +29149,9 @@ var require_dist2 = __commonJS({
             const scriptNames = Object.keys(scripts).filter((k) => typeof scripts[k] === "function");
             LOG2.info("CLI", `[${this.cliType}] CLI scripts injected: [${scriptNames.join(", ")}]`);
           }
+          updateRuntimeSettings(settings) {
+            this.runtimeSettings = { ...settings };
+          }
           // ─── Lifecycle ─────────────────────────────────
           setServerConn(serverConn) {
             this.serverConn = serverConn;
@@ -29109,7 +29188,7 @@ var require_dist2 = __commonJS({
             let shellArgs;
             const useShellUnix = !isWin && (!!spawnConfig.shell || !path7.isAbsolute(binaryPath) || isScriptBinary(binaryPath) || !looksLikeMachOOrElf(binaryPath));
             const isCmdShim = isWin && /\.(cmd|bat)$/i.test(binaryPath);
-            const useShellWin = isCmdShim || !path7.isAbsolute(binaryPath) || isScriptBinary(binaryPath);
+            const useShellWin = !!spawnConfig.shell || isCmdShim || !path7.isAbsolute(binaryPath) || isScriptBinary(binaryPath);
             const useShell = isWin ? useShellWin : useShellUnix;
             if (useShell) {
               if (!spawnConfig.shell && !isWin) {
@@ -29207,6 +29286,11 @@ var require_dist2 = __commonJS({
             this.spawnAt = Date.now();
             this.startupParseGate = true;
             this.startupBuffer = "";
+            this.startupFirstOutputAt = 0;
+            if (this.startupSettleTimer) {
+              clearTimeout(this.startupSettleTimer);
+              this.startupSettleTimer = null;
+            }
             this.terminalScreen.reset(24, 80);
             this.pendingTerminalQueryTail = "";
             this.currentTurnScope = null;
@@ -29220,7 +29304,8 @@ var require_dist2 = __commonJS({
             this.recordTrace("ready", {
               runtimeMeta: this.getRuntimeMetadata()
             });
-            this.setStatus("idle", "pty_ready");
+            this.setStatus("starting", "pty_ready");
+            this.scheduleStartupSettleCheck();
             this.onStatusChange?.();
           }
           // ─── Output Handling ────────────────────────────
@@ -29235,6 +29320,9 @@ var require_dist2 = __commonJS({
               this.lastScreenSnapshot = normalizedScreenSnapshot;
               this.lastScreenChangeAt = now;
             }
+            if (this.startupParseGate && !this.startupFirstOutputAt && (cleanData.trim() || normalizedScreenSnapshot.trim())) {
+              this.startupFirstOutputAt = now;
+            }
             if (this.idleFinishCandidate && (rawData.length > 0 || cleanData.length > 0)) {
               this.clearIdleFinishCandidate("new_output");
             }
@@ -29245,6 +29333,9 @@ var require_dist2 = __commonJS({
               cleanPreview: this.summarizeTraceText(cleanData, 300),
               screenText: this.summarizeTraceText(this.terminalScreen.getText(), 1200)
             });
+            if (this.startupParseGate) {
+              this.scheduleStartupSettleCheck();
+            }
             if (this.isWaitingForResponse && cleanData) {
               this.responseBuffer = (this.responseBuffer + cleanData).slice(-8e3);
             }
@@ -29258,27 +29349,51 @@ var require_dist2 = __commonJS({
             this.recentOutputBuffer = (this.recentOutputBuffer + cleanData).slice(-1e3);
             this.accumulatedBuffer = (this.accumulatedBuffer + cleanData).slice(-_ProviderCliAdapter.MAX_ACCUMULATED_BUFFER);
             this.accumulatedRawBuffer = (this.accumulatedRawBuffer + rawData).slice(-_ProviderCliAdapter.MAX_ACCUMULATED_BUFFER);
-            if (this.startupParseGate) {
-              this.startupBuffer += cleanData;
-              const elapsed = Date.now() - this.spawnAt;
-              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 || !!startupModal && startupStableMs >= 700 || elapsed > 8e3 || this.startupBuffer.length > 12e3;
-              if (isReady) {
-                this.startupParseGate = false;
-                this.ready = true;
-                LOG2.info(
-                  "CLI",
-                  `[${this.cliType}] Startup ready (${elapsed}ms, scriptStatus=${scriptStatus}, prompt=${hasInteractivePrompt}, stableMs=${startupStableMs}) providerDir=${this.providerResolutionMeta.providerDir || "-"} scriptDir=${this.providerResolutionMeta.scriptDir || "-"} scriptsPath=${this.providerResolutionMeta.scriptsPath || "-"}`
-                );
-                this.onStatusChange?.();
-              }
-            }
+            this.resolveStartupState("output");
             this.scheduleSettle();
           }
+          resolveStartupState(trigger) {
+            if (!this.startupParseGate) return;
+            const now = Date.now();
+            const screenText = this.terminalScreen.getText() || "";
+            const normalizedScreen = normalizeScreenSnapshot(screenText);
+            const hasStartupOutput = !!this.startupFirstOutputAt || !!normalizedScreen.trim();
+            if (!hasStartupOutput) return;
+            const stableMs = this.lastScreenChangeAt ? now - this.lastScreenChangeAt : 0;
+            if (stableMs < 2e3) return;
+            const startupModal = this.getStartupConfirmationModal(screenText);
+            this.startupParseGate = false;
+            if (this.startupSettleTimer) {
+              clearTimeout(this.startupSettleTimer);
+              this.startupSettleTimer = null;
+            }
+            this.ready = true;
+            if (startupModal) {
+              this.activeModal = startupModal;
+              this.setStatus("waiting_approval", `startup_ready:${trigger}`);
+            } else {
+              this.setStatus("idle", `startup_ready:${trigger}`);
+            }
+            LOG2.info(
+              "CLI",
+              `[${this.cliType}] Startup settled (${trigger}, stableMs=${stableMs}, modal=${!!startupModal}) providerDir=${this.providerResolutionMeta.providerDir || "-"} scriptDir=${this.providerResolutionMeta.scriptDir || "-"} scriptsPath=${this.providerResolutionMeta.scriptsPath || "-"}`
+            );
+            this.onStatusChange?.();
+          }
+          scheduleStartupSettleCheck() {
+            if (!this.startupParseGate) return;
+            if (this.startupSettleTimer) clearTimeout(this.startupSettleTimer);
+            const now = Date.now();
+            const stableMs = this.lastScreenChangeAt ? now - this.lastScreenChangeAt : 0;
+            const delayMs = Math.max(250, 2050 - stableMs);
+            this.startupSettleTimer = setTimeout(() => {
+              this.startupSettleTimer = null;
+              this.resolveStartupState("startup_timer");
+              if (this.startupParseGate && Date.now() - this.spawnAt < 1e4) {
+                this.scheduleStartupSettleCheck();
+              }
+            }, delayMs);
+          }
           scheduleSettle() {
             if (this.settleTimer) clearTimeout(this.settleTimer);
             const settleEpoch = this.responseEpoch;
@@ -29320,6 +29435,43 @@ 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);
           }
+          findLastMatchingLineIndex(lines, predicate) {
+            for (let index = lines.length - 1; index >= 0; index -= 1) {
+              if (predicate(lines[index])) return index;
+            }
+            return -1;
+          }
+          looksLikeClaudeGeneratingLine(line) {
+            const trimmed = String(line || "").trim();
+            if (!trimmed) return false;
+            if (/esc to (cancel|interrupt|stop)/i.test(trimmed)) return true;
+            if (/^[✻✶✳✢✽⠂⠐⠒⠓⠦⠴⠶⠷⠿]+\s+\S+.*\b(?:thinking|thought for \d+s?)\b/i.test(trimmed)) return true;
+            if (/^[✻✶✳✢✽⠂⠐⠒⠓⠦⠴⠶⠷⠿]+\s+[A-Z][A-Za-z-]{3,}ing\b.*(?:…|\.{3})/u.test(trimmed)) return true;
+            if (/^[⏺•]\s+(?:Reading|Writing|Editing|Searching|Inspecting|Planning|Analyzing|Synthesizing|Drafting|Running|Listing|Scanning|Matching)\b.*(?:…|\.{3})/i.test(trimmed)) {
+              return /ctrl\+o to expand/i.test(trimmed) || /\b\d+\s+(?:file|files|pattern|patterns|director(?:y|ies)|match|matches|result|results)\b/i.test(trimmed);
+            }
+            return false;
+          }
+          detectClaudeGeneratingOverride(screenText, tail) {
+            if (this.cliType !== "claude-cli") return false;
+            const source = sanitizeTerminalText(screenText || tail || "");
+            if (!source.trim()) return false;
+            const allLines = source.split(/\r\n|\n|\r/g).map((line) => line.trim()).filter(Boolean);
+            if (allLines.length === 0) return false;
+            const recentLines = allLines.slice(-12);
+            const promptIndex = this.findLastMatchingLineIndex(recentLines, (line) => /^[❯›>]\s*$/.test(line));
+            const activeRegion = promptIndex >= 0 ? recentLines.slice(Math.max(0, promptIndex - 2), promptIndex) : recentLines;
+            if (activeRegion.length === 0) return false;
+            return activeRegion.some((line) => this.looksLikeClaudeGeneratingLine(line));
+          }
+          refineDetectedStatus(status, tail, screenText) {
+            if (this.startupParseGate) {
+              return this.getStartupConfirmationModal(screenText || "") ? "waiting_approval" : "starting";
+            }
+            if (status === "waiting_approval") return status;
+            if (this.detectClaudeGeneratingOverride(screenText || "", tail)) return "generating";
+            return status;
+          }
           looksLikeVisibleAssistantCandidate(screenText) {
             const lines = sanitizeTerminalText(String(screenText || "")).split(/\r\n|\n|\r/g);
             for (const line of lines) {
@@ -29354,6 +29506,11 @@ var require_dist2 = __commonJS({
             const screenStableMs = this.lastScreenChangeAt ? now - this.lastScreenChangeAt : 0;
             return quietForMs < 1200 || screenStableMs < 1200 || !commitResult.hasAssistant;
           }
+          hasRecentInteractiveActivity(now) {
+            const quietForMs = this.lastNonEmptyOutputAt ? now - this.lastNonEmptyOutputAt : Number.MAX_SAFE_INTEGER;
+            const screenStableMs = this.lastScreenChangeAt ? now - this.lastScreenChangeAt : Number.MAX_SAFE_INTEGER;
+            return quietForMs < _ProviderCliAdapter.STATUS_ACTIVITY_HOLD_MS || screenStableMs < _ProviderCliAdapter.STATUS_ACTIVITY_HOLD_MS;
+          }
           getStartupConfirmationModal(screenText) {
             const text = sanitizeTerminalText(String(screenText || ""));
             if (!text.trim()) return null;
@@ -29381,13 +29538,14 @@ var require_dist2 = __commonJS({
             const startedAt = Date.now();
             let loggedWait = false;
             while (Date.now() - startedAt < maxWaitMs) {
+              this.resolveStartupState("interactive_wait");
               const screenText = this.terminalScreen.getText() || "";
               const hasPrompt = this.looksLikeVisibleIdlePrompt(screenText);
               const stableMs = this.lastScreenChangeAt ? Date.now() - this.lastScreenChangeAt : 0;
               const recentlyOutput = this.lastNonEmptyOutputAt ? Date.now() - this.lastNonEmptyOutputAt : Number.MAX_SAFE_INTEGER;
               const status = this.runDetectStatus(this.recentOutputBuffer) || this.currentStatus;
               const startupLikelyActive = /Welcome back|Tips for getting|Recent activity|Claude Code v\d/i.test(screenText);
-              const interactiveReady = hasPrompt && stableMs >= 700 && recentlyOutput >= 350 && status !== "starting" && status !== "generating";
+              const interactiveReady = hasPrompt && stableMs >= 700 && recentlyOutput >= 350 && status !== "generating";
               if (interactiveReady) {
                 if (loggedWait) {
                   LOG2.info(
@@ -29426,6 +29584,10 @@ var require_dist2 = __commonJS({
             }
             const tail = this.settledBuffer;
             const screenText = this.terminalScreen.getText() || "";
+            this.resolveStartupState("settled");
+            if (this.startupParseGate) {
+              return;
+            }
             const startupModal = this.getStartupConfirmationModal(screenText);
             const modal = this.runParseApproval(tail) || startupModal;
             const rawScriptStatus = this.runDetectStatus(tail);
@@ -29488,6 +29650,28 @@ var require_dist2 = __commonJS({
             } else {
               clearPendingScriptStatus();
             }
+            const recentInteractiveActivity = this.hasRecentInteractiveActivity(now);
+            const shouldHoldGenerating = scriptStatus === "idle" && this.isWaitingForResponse && !modal && recentInteractiveActivity;
+            if (shouldHoldGenerating) {
+              this.clearIdleFinishCandidate("hold_generating_recent_activity");
+              this.setStatus("generating", "recent_activity_hold");
+              if (this.idleTimeout) clearTimeout(this.idleTimeout);
+              this.idleTimeout = setTimeout(() => {
+                if (this.isWaitingForResponse && this.currentStatus !== "waiting_approval") {
+                  this.finishResponse();
+                }
+              }, this.timeouts.generatingIdle);
+              this.recordTrace("hold_generating_recent_activity", {
+                scriptStatus,
+                recentInteractiveActivity,
+                lastNonEmptyOutputAt: this.lastNonEmptyOutputAt,
+                lastScreenChangeAt: this.lastScreenChangeAt,
+                holdMs: _ProviderCliAdapter.STATUS_ACTIVITY_HOLD_MS,
+                ...this.buildTraceParseSnapshot(this.currentTurnScope, this.responseBuffer)
+              });
+              this.onStatusChange?.();
+              return;
+            }
             if (scriptStatus === "waiting_approval") {
               this.clearIdleFinishCandidate("waiting_approval");
               const inCooldown = this.lastApprovalResolvedAt && Date.now() - this.lastApprovalResolvedAt < this.timeouts.approvalCooldown;
@@ -29565,8 +29749,8 @@ var require_dist2 = __commonJS({
                 const screenStableMs = this.lastScreenChangeAt ? now - this.lastScreenChangeAt : 0;
                 const hasAssistantTurn = !!lastParsedAssistant;
                 const assistantLength = lastParsedAssistant?.content?.length || 0;
-                const idleQuietThresholdMs = Math.max(220, this.timeouts.outputSettle);
-                const idleStableThresholdMs = Math.max(120, Math.min(220, this.timeouts.outputSettle));
+                const idleQuietThresholdMs = Math.max(2e3, this.timeouts.outputSettle);
+                const idleStableThresholdMs = 2e3;
                 const idleReady = visibleIdlePrompt && !modal && hasAssistantTurn && quietForMs >= idleQuietThresholdMs && screenStableMs >= idleStableThresholdMs;
                 const candidate = this.idleFinishCandidate;
                 const candidateQuiet = !!candidate && candidate.responseEpoch === this.responseEpoch && candidate.lastOutputAt === this.lastOutputAt && candidate.lastScreenChangeAt === this.lastScreenChangeAt && assistantLength >= candidate.assistantLength && now - candidate.armedAt >= _ProviderCliAdapter.IDLE_FINISH_CONFIRM_MS;
@@ -29680,7 +29864,7 @@ var require_dist2 = __commonJS({
               this.currentTurnScope
             );
             if (parsed && Array.isArray(parsed.messages)) {
-              this.committedMessages = this.normalizeParsedMessages(parsed.messages);
+              this.committedMessages = this.normalizeParsedMessages(parsed.messages, this.currentTurnScope);
               const promptForTrim = this.currentTurnScope?.prompt || getLastUserPromptText(this.committedMessages);
               if (promptForTrim) {
                 const lastAssistantForTrim = [...this.committedMessages].reverse().find((message) => message.role === "assistant");
@@ -29717,11 +29901,15 @@ var require_dist2 = __commonJS({
           runDetectStatus(text) {
             if (!this.cliScripts?.detectStatus) return null;
             try {
-              return this.cliScripts.detectStatus({
+              const screenText = this.terminalScreen.getText();
+              const status = this.cliScripts.detectStatus({
                 tail: text.slice(-500),
-                screenText: this.terminalScreen.getText(),
-                rawBuffer: this.accumulatedRawBuffer
+                screenText,
+                rawBuffer: this.accumulatedRawBuffer,
+                screen: buildCliScreenSnapshot(screenText),
+                tailScreen: buildCliScreenSnapshot(text.slice(-500))
               });
+              return this.refineDetectedStatus(status, text, screenText || "");
             } catch (e) {
               LOG2.warn("CLI", `[${this.cliType}] detectStatus error: ${e.message}`);
               return null;
@@ -29730,11 +29918,16 @@ var require_dist2 = __commonJS({
           runParseApproval(tail) {
             if (!this.cliScripts?.parseApproval) return null;
             try {
+              const screenText = this.terminalScreen.getText();
+              const buffer = screenText || this.accumulatedBuffer;
               return this.cliScripts.parseApproval({
-                buffer: this.terminalScreen.getText() || this.accumulatedBuffer,
-                screenText: this.terminalScreen.getText(),
+                buffer,
+                screenText,
                 rawBuffer: this.accumulatedRawBuffer,
-                tail
+                tail,
+                screen: buildCliScreenSnapshot(screenText),
+                bufferScreen: buildCliScreenSnapshot(buffer),
+                tailScreen: buildCliScreenSnapshot(tail)
               });
             } catch (e) {
               LOG2.warn("CLI", `[${this.cliType}] parseApproval error: ${e.message}`);
@@ -29750,6 +29943,21 @@ var require_dist2 = __commonJS({
               activeModal: this.activeModal
             };
           }
+          seedCommittedMessages(messages) {
+            const normalized = (Array.isArray(messages) ? messages : []).filter((message) => message && (message.role === "user" || message.role === "assistant")).map((message) => ({
+              role: message.role,
+              content: typeof message.content === "string" ? message.content : String(message.content || ""),
+              timestamp: typeof message.timestamp === "number" && Number.isFinite(message.timestamp) ? message.timestamp : void 0,
+              receivedAt: typeof message.receivedAt === "number" && Number.isFinite(message.receivedAt) ? message.receivedAt : void 0,
+              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,
+              meta: message.meta && typeof message.meta === "object" ? { ...message.meta } : void 0,
+              senderName: typeof message.senderName === "string" ? message.senderName : void 0
+            }));
+            this.committedMessages = normalized;
+            this.syncMessageViews();
+          }
           /**
            * Script-based full parse — returns ReadChatResult.
            * Called by command handler / dashboard for rich content rendering.
@@ -29760,12 +29968,20 @@ var require_dist2 = __commonJS({
               this.responseBuffer,
               this.currentTurnScope
             );
+            const shouldPreferCommittedMessages = !this.currentTurnScope && this.currentStatus === "idle" && !this.activeModal;
             if (parsed && Array.isArray(parsed.messages)) {
+              const hydratedMessages = shouldPreferCommittedMessages ? this.committedMessages.map((message, index) => ({
+                ...message,
+                id: message.id || `msg_${index}`,
+                index: typeof message.index === "number" ? message.index : index,
+                kind: message.kind || "standard",
+                receivedAt: typeof message.receivedAt === "number" ? message.receivedAt : message.timestamp
+              })) : this.hydrateParsedMessages(parsed.messages, this.currentTurnScope);
               return {
                 id: parsed.id || "cli_session",
                 status: parsed.status || this.currentStatus,
                 title: parsed.title || this.cliName,
-                messages: parsed.messages,
+                messages: hydratedMessages,
                 activeModal: parsed.activeModal ?? this.activeModal,
                 providerSessionId: typeof parsed.providerSessionId === "string" ? parsed.providerSessionId : void 0
               };
@@ -29786,11 +30002,30 @@ var require_dist2 = __commonJS({
               activeModal: this.activeModal
             };
           }
+          async invokeScript(scriptName, args) {
+            const fn2 = this.cliScripts?.[scriptName];
+            if (typeof fn2 !== "function") {
+              throw new Error(`CLI script '${scriptName}' not available`);
+            }
+            const input = this.buildParseInput(
+              this.committedMessages,
+              this.responseBuffer,
+              this.currentTurnScope
+            );
+            return await Promise.resolve(fn2({
+              ...input,
+              args: args && typeof args === "object" ? { ...args } : {}
+            }));
+          }
           parseCurrentTranscript(baseMessages, partialResponse, scope) {
             if (!this.cliScripts?.parseOutput) return null;
             try {
               const input = this.buildParseInput(baseMessages, partialResponse, scope);
               const parsed = this.cliScripts.parseOutput(input);
+              const refinedStatus = this.refineDetectedStatus(typeof parsed?.status === "string" ? parsed.status : null, input.recentBuffer, input.screenText);
+              if (parsed && refinedStatus && parsed.status !== refinedStatus) {
+                parsed.status = refinedStatus;
+              }
               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");
@@ -29837,12 +30072,23 @@ ${data.message || ""}`.trim();
             if (this.startupParseGate) {
               const deadline = Date.now() + 1e4;
               while (this.startupParseGate && Date.now() < deadline) {
+                this.resolveStartupState("send_wait");
                 await new Promise((resolve9) => setTimeout(resolve9, 50));
               }
             }
+            await this.waitForInteractivePrompt();
+            if (!this.ready) {
+              this.resolveStartupState("send_precheck");
+              const screenText = this.terminalScreen.getText() || "";
+              const hasPrompt = this.looksLikeVisibleIdlePrompt(screenText);
+              if (hasPrompt && this.currentStatus === "idle") {
+                this.ready = true;
+                this.startupParseGate = false;
+                LOG2.info("CLI", `[${this.cliType}] sendMessage recovered idle prompt readiness`);
+              }
+            }
             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`);
@@ -29886,8 +30132,6 @@ ${data.message || ""}`.trim();
             }
             this.responseEpoch += 1;
             this.responseSettleIgnoreUntil = Date.now() + submitDelayMs + this.timeouts.outputSettle + 250;
-            this.setStatus("generating", "sendMessage");
-            this.onStatusChange?.();
             const startResponseTimeout = () => {
               if (this.responseTimeout) clearTimeout(this.responseTimeout);
               this.responseTimeout = setTimeout(() => {
@@ -29906,7 +30150,7 @@ ${data.message || ""}`.trim();
               const retrySubmitIfStuck = (attempt) => {
                 this.submitRetryTimer = null;
                 if (!this.ptyProcess || !this.isWaitingForResponse || this.submitRetryUsed) return;
-                if (this.currentStatus !== "generating") return;
+                if (this.currentStatus === "waiting_approval") return;
                 if ((this.responseBuffer || "").trim()) return;
                 const screenText = this.terminalScreen.getText();
                 if (!promptLikelyVisible(screenText, normalizedPromptSnippet)) return;
@@ -29941,7 +30185,7 @@ ${data.message || ""}`.trim();
               this.submitRetryTimer = setTimeout(() => {
                 this.submitRetryTimer = null;
                 if (!this.ptyProcess || !this.isWaitingForResponse || this.submitRetryUsed) return;
-                if (this.currentStatus !== "generating") return;
+                if (this.currentStatus === "waiting_approval") return;
                 if ((this.responseBuffer || "").trim()) return;
                 const screenText = this.terminalScreen.getText();
                 if (!promptLikelyVisible(screenText, normalizedPromptSnippet)) return;
@@ -32355,198 +32599,93 @@ ${data.message || ""}`.trim();
         }
       }
     };
-    var ExtensionProviderInstance = class {
-      type;
-      category = "extension";
-      provider;
-      context = null;
-      settings = {};
-      events = [];
-      // status
-      currentStatus = "idle";
-      agentStreams = [];
-      messages = [];
-      activeModal = null;
-      currentModel = "";
-      currentMode = "";
-      controlValues = {};
-      lastAgentStatus = "idle";
-      generatingStartedAt = 0;
-      monitor;
-      // meta
-      instanceId;
-      ideType = "";
-      chatId = null;
-      chatTitle = null;
-      agentName = "";
-      extensionId = "";
-      constructor(provider) {
-        this.type = provider.type;
-        this.provider = provider;
-        this.instanceId = crypto.randomUUID();
-        this.monitor = new StatusMonitor();
-      }
-      // ─── Lifecycle ──────────────────────────────────
-      async init(context) {
-        this.context = context;
-        this.settings = context.settings || {};
-        this.monitor.updateConfig({
-          approvalAlert: this.settings.approvalAlert !== false,
-          longGeneratingAlert: this.settings.longGeneratingAlert !== false,
-          longGeneratingThresholdSec: this.settings.longGeneratingThresholdSec || 180
-        });
-      }
-      async onTick() {
-        if (!this.context?.cdp?.isConnected) return;
-      }
-      getState() {
-        return {
-          type: this.type,
-          name: this.provider.name,
-          category: "extension",
-          status: this.currentStatus,
-          activeChat: this.messages.length > 0 ? {
-            id: this.chatId || this.instanceId,
-            title: this.chatTitle || this.agentName || this.provider.name,
-            status: this.currentStatus,
-            messages: this.messages,
-            activeModal: this.activeModal,
-            inputContent: ""
-          } : null,
-          currentModel: this.currentModel || void 0,
-          currentPlan: this.currentMode || void 0,
-          controlValues: this.controlValues,
-          providerControls: this.provider.controls,
-          agentStreams: this.agentStreams,
-          instanceId: this.instanceId,
-          lastUpdated: Date.now(),
-          settings: this.settings,
-          pendingEvents: this.flushEvents()
-        };
-      }
-      onEvent(event, data) {
-        if (event === "stream_update") {
-          if (data?.streams) this.agentStreams = data.streams;
-          if (data?.messages) this.messages = data.messages;
-          if (data?.activeModal !== void 0) this.activeModal = data.activeModal;
-          if (data?.model) this.currentModel = data.model;
-          if (data?.mode) this.currentMode = data.mode;
-          if (data?.controlValues) this.controlValues = data.controlValues;
-          if (typeof data?.sessionId === "string" && data.sessionId.trim()) this.chatId = data.sessionId;
-          if (typeof data?.title === "string" && data.title.trim()) this.chatTitle = data.title;
-          if (typeof data?.agentName === "string" && data.agentName.trim()) this.agentName = data.agentName;
-          if (typeof data?.extensionId === "string" && data.extensionId.trim()) this.extensionId = data.extensionId;
-          if (data?.status) {
-            const newStatus = data.status;
-            this.detectTransition(newStatus, data);
-            this.currentStatus = newStatus;
-          }
-        } else if (event === "stream_reset") {
-          this.resetStreamState();
-        } else if (event === "extension_connected") {
-          this.ideType = data?.ideType || "";
+    function extractProviderControlValues(controls, data) {
+      if (!data || typeof data !== "object") return void 0;
+      const values = {};
+      const explicit = data.controlValues;
+      if (explicit && typeof explicit === "object") {
+        for (const [key, value] of Object.entries(explicit)) {
+          if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+            values[key] = value;
+          }
+        }
+      }
+      for (const ctrl of controls || []) {
+        if (!ctrl.readFrom) continue;
+        const rawValue = data[ctrl.readFrom];
+        if (rawValue === void 0 || rawValue === null) continue;
+        values[ctrl.id] = normalizeControlValue(rawValue);
+      }
+      if (data.model !== void 0 && values.model === void 0) values.model = normalizeControlValue(data.model);
+      if (data.mode !== void 0 && values.mode === void 0) values.mode = normalizeControlValue(data.mode);
+      return Object.keys(values).length > 0 ? values : void 0;
+    }
+    function normalizeProviderEffects(data) {
+      const rawEffects = Array.isArray(data?.effects) ? data.effects : [];
+      const effects = [];
+      for (const raw of rawEffects) {
+        if (!raw || typeof raw !== "object") continue;
+        const type = raw.type;
+        if (type === "message" && raw.message && typeof raw.message === "object") {
+          const content = raw.message.content;
+          if (typeof content !== "string" && !Array.isArray(content)) continue;
+          effects.push({
+            type: "message",
+            id: typeof raw.id === "string" ? raw.id : void 0,
+            when: raw.when === "turn_completed" ? "turn_completed" : "immediate",
+            persist: raw.persist !== false,
+            message: {
+              role: raw.message.role === "assistant" || raw.message.role === "user" ? raw.message.role : "system",
+              content,
+              kind: typeof raw.message.kind === "string" ? raw.message.kind : void 0,
+              senderName: typeof raw.message.senderName === "string" ? raw.message.senderName : void 0
+            }
+          });
+          continue;
         }
-      }
-      dispose() {
-        this.agentStreams = [];
-        this.messages = [];
-        this.monitor.reset();
-      }
-      /** Query UUID instanceId */
-      getInstanceId() {
-        return this.instanceId;
-      }
-      // ─── status transition detect ──────────────────────────────
-      detectTransition(newStatus, data) {
-        const now = Date.now();
-        const agentStatus = newStatus === "streaming" || newStatus === "generating" ? "generating" : newStatus === "waiting_approval" ? "waiting_approval" : "idle";
-        const lastMsg = Array.isArray(data?.messages) && data.messages.length > 0 ? data.messages[data.messages.length - 1] : null;
-        const progressFingerprint = agentStatus === "generating" ? `${lastMsg?.role || ""}:${typeof lastMsg?.content === "string" ? lastMsg.content : JSON.stringify(lastMsg?.content || "")}`.slice(-2e3) : void 0;
-        if (agentStatus !== this.lastAgentStatus) {
-          if (this.lastAgentStatus === "idle" && agentStatus === "generating") {
-            this.generatingStartedAt = now;
-            this.pushEvent({
-              event: "agent:generating_started",
-              chatTitle: this.resolveChatTitle(data),
-              timestamp: now,
-              ideType: this.ideType || this.type,
-              agentType: this.type,
-              agentName: this.agentName || this.provider.name,
-              extensionId: this.extensionId || this.type
-            });
-          } else if (agentStatus === "waiting_approval") {
-            if (!this.generatingStartedAt) this.generatingStartedAt = now;
-            this.pushEvent({
-              event: "agent:waiting_approval",
-              chatTitle: this.resolveChatTitle(data),
-              timestamp: now,
-              ideType: this.ideType || this.type,
-              agentType: this.type,
-              agentName: this.agentName || this.provider.name,
-              extensionId: this.extensionId || this.type,
-              modalMessage: data?.activeModal?.message,
-              modalButtons: data?.activeModal?.buttons
-            });
-          } else if (agentStatus === "idle" && (this.lastAgentStatus === "generating" || this.lastAgentStatus === "waiting_approval")) {
-            const duration3 = this.generatingStartedAt ? Math.round((now - this.generatingStartedAt) / 1e3) : 0;
-            this.pushEvent({
-              event: "agent:generating_completed",
-              chatTitle: this.resolveChatTitle(data),
-              duration: duration3,
-              timestamp: now,
-              ideType: this.ideType || this.type,
-              agentType: this.type,
-              agentName: this.agentName || this.provider.name,
-              extensionId: this.extensionId || this.type
-            });
-            this.generatingStartedAt = 0;
-          }
-          this.lastAgentStatus = agentStatus;
+        if (type === "toast" && raw.toast && typeof raw.toast.message === "string") {
+          effects.push({
+            type: "toast",
+            id: typeof raw.id === "string" ? raw.id : void 0,
+            when: raw.when === "turn_completed" ? "turn_completed" : "immediate",
+            persist: raw.persist !== false,
+            toast: {
+              level: raw.toast.level === "success" || raw.toast.level === "warning" ? raw.toast.level : "info",
+              message: raw.toast.message
+            }
+          });
+          continue;
         }
-        const agentKey = `${this.type}:ext`;
-        const monitorEvents = this.monitor.check(agentKey, agentStatus, now, progressFingerprint);
-        for (const me of monitorEvents) {
-          this.pushEvent({ event: me.type, agentKey: me.agentKey, message: me.message, elapsedSec: me.elapsedSec, timestamp: me.timestamp });
+        if (type === "notification" && raw.notification && typeof raw.notification.body === "string") {
+          effects.push({
+            type: "notification",
+            id: typeof raw.id === "string" ? raw.id : void 0,
+            when: raw.when === "turn_completed" ? "turn_completed" : "immediate",
+            persist: raw.persist !== false,
+            notification: {
+              title: typeof raw.notification.title === "string" ? raw.notification.title : void 0,
+              body: raw.notification.body,
+              level: raw.notification.level === "success" || raw.notification.level === "warning" ? raw.notification.level : "info",
+              channels: Array.isArray(raw.notification.channels) ? raw.notification.channels.filter((channel) => channel === "bubble" || channel === "toast" || channel === "browser") : void 0,
+              preferenceKey: raw.notification.preferenceKey === "disconnect" || raw.notification.preferenceKey === "completion" || raw.notification.preferenceKey === "approval" || raw.notification.preferenceKey === "browser" ? raw.notification.preferenceKey : void 0,
+              bubbleContent: typeof raw.notification.bubbleContent === "string" || Array.isArray(raw.notification.bubbleContent) ? raw.notification.bubbleContent : void 0
+            }
+          });
         }
       }
-      pushEvent(event) {
-        this.events.push(event);
-        if (this.events.length > 50) this.events = this.events.slice(-50);
-      }
-      flushEvents() {
-        const events = [...this.events];
-        this.events = [];
-        return events;
-      }
-      resolveChatTitle(data) {
-        const title = typeof data?.title === "string" && data.title.trim() ? data.title.trim() : this.chatTitle;
-        return title || this.agentName || this.provider.name;
+      return effects;
+    }
+    function normalizeControlValue(value) {
+      if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+        return value;
       }
-      resetStreamState() {
-        if (this.currentStatus !== "idle") {
-          this.detectTransition("idle", {
-            title: this.chatTitle,
-            agentName: this.agentName,
-            extensionId: this.extensionId,
-            messages: this.messages
-          });
-        }
-        this.agentStreams = [];
-        this.messages = [];
-        this.activeModal = null;
-        this.currentModel = "";
-        this.currentMode = "";
-        this.controlValues = {};
-        this.currentStatus = "idle";
-        this.chatId = null;
-        this.chatTitle = null;
-        this.agentName = "";
-        this.extensionId = "";
-        this.lastAgentStatus = "idle";
-        this.generatingStartedAt = 0;
-        this.monitor.reset();
+      if (value && typeof value === "object") {
+        if (typeof value.label === "string") return value.label;
+        if (typeof value.name === "string") return value.name;
+        if (typeof value.id === "string") return value.id;
       }
-    };
+      return String(value);
+    }
     var fs32 = __toESM2(require("fs"));
     var path52 = __toESM2(require("path"));
     var os52 = __toESM2(require("os"));
@@ -32797,28 +32936,355 @@ ${data.message || ""}`.trim();
               if (parsed.role !== "system" && parsed.content.trim()) preview = parsed.content.trim();
             }
           }
-          if (messageCount === 0 || !lastMessageAt) continue;
-          summaries.push({
-            historySessionId,
-            sessionTitle: sessionTitle || void 0,
-            messageCount,
-            firstMessageAt,
-            lastMessageAt,
-            preview: preview || void 0
+          if (messageCount === 0 || !lastMessageAt) continue;
+          summaries.push({
+            historySessionId,
+            sessionTitle: sessionTitle || void 0,
+            messageCount,
+            firstMessageAt,
+            lastMessageAt,
+            preview: preview || void 0
+          });
+        }
+        summaries.sort((a, b2) => b2.lastMessageAt - a.lastMessageAt);
+        const offset = Math.max(0, options.offset || 0);
+        const limit = Math.max(1, options.limit || 30);
+        const sliced = summaries.slice(offset, offset + limit);
+        return {
+          sessions: sliced,
+          hasMore: summaries.length > offset + limit
+        };
+      } catch {
+        return { sessions: [], hasMore: false };
+      }
+    }
+    var ExtensionProviderInstance = class {
+      type;
+      category = "extension";
+      provider;
+      context = null;
+      settings = {};
+      events = [];
+      // status
+      currentStatus = "idle";
+      agentStreams = [];
+      messages = [];
+      activeModal = null;
+      currentModel = "";
+      currentMode = "";
+      controlValues = {};
+      appliedEffectKeys = /* @__PURE__ */ new Set();
+      runtimeMessages = [];
+      lastAgentStatus = "idle";
+      generatingStartedAt = 0;
+      monitor;
+      historyWriter;
+      // meta
+      instanceId;
+      ideType = "";
+      chatId = null;
+      chatTitle = null;
+      agentName = "";
+      extensionId = "";
+      constructor(provider) {
+        this.type = provider.type;
+        this.provider = provider;
+        this.instanceId = crypto.randomUUID();
+        this.monitor = new StatusMonitor();
+        this.historyWriter = new ChatHistoryWriter();
+      }
+      // ─── Lifecycle ──────────────────────────────────
+      async init(context) {
+        this.context = context;
+        this.settings = context.settings || {};
+        this.monitor.updateConfig({
+          approvalAlert: this.settings.approvalAlert !== false,
+          longGeneratingAlert: this.settings.longGeneratingAlert !== false,
+          longGeneratingThresholdSec: this.settings.longGeneratingThresholdSec || 180
+        });
+      }
+      async onTick() {
+        if (!this.context?.cdp?.isConnected) return;
+      }
+      getState() {
+        return {
+          type: this.type,
+          name: this.provider.name,
+          category: "extension",
+          status: this.currentStatus,
+          activeChat: this.messages.length > 0 || this.runtimeMessages.length > 0 ? {
+            id: this.chatId || this.instanceId,
+            title: this.chatTitle || this.agentName || this.provider.name,
+            status: this.currentStatus,
+            messages: this.mergeConversationMessages(this.messages),
+            activeModal: this.activeModal,
+            inputContent: ""
+          } : null,
+          currentModel: this.currentModel || void 0,
+          currentPlan: this.currentMode || void 0,
+          controlValues: this.controlValues,
+          providerControls: this.provider.controls,
+          agentStreams: this.agentStreams,
+          instanceId: this.instanceId,
+          lastUpdated: Date.now(),
+          settings: this.settings,
+          pendingEvents: this.flushEvents()
+        };
+      }
+      onEvent(event, data) {
+        if (event === "stream_update") {
+          if (data?.streams) this.agentStreams = data.streams;
+          if (data?.messages) this.messages = data.messages;
+          if (data?.activeModal !== void 0) this.activeModal = data.activeModal;
+          if (data?.model) this.currentModel = data.model;
+          if (data?.mode) this.currentMode = data.mode;
+          const controlValues = extractProviderControlValues(this.provider.controls, data) || data?.controlValues;
+          if (controlValues) this.controlValues = controlValues;
+          if (typeof data?.sessionId === "string" && data.sessionId.trim()) this.chatId = data.sessionId;
+          if (typeof data?.title === "string" && data.title.trim()) this.chatTitle = data.title;
+          if (typeof data?.agentName === "string" && data.agentName.trim()) this.agentName = data.agentName;
+          if (typeof data?.extensionId === "string" && data.extensionId.trim()) this.extensionId = data.extensionId;
+          if (data?.status) {
+            const newStatus = data.status;
+            this.detectTransition(newStatus, data);
+            this.currentStatus = newStatus;
+          }
+        } else if (event === "stream_reset") {
+          this.resetStreamState();
+        } else if (event === "extension_connected") {
+          this.ideType = data?.ideType || "";
+        } else if (event === "provider_state_patch" && data && typeof data === "object") {
+          this.applyProviderResponse(data, { phase: "immediate" });
+        }
+      }
+      dispose() {
+        this.agentStreams = [];
+        this.messages = [];
+        this.monitor.reset();
+        this.appliedEffectKeys.clear();
+        this.runtimeMessages = [];
+      }
+      updateSettings(newSettings) {
+        this.settings = { ...newSettings };
+        this.monitor.updateConfig({
+          approvalAlert: this.settings.approvalAlert !== false,
+          longGeneratingAlert: this.settings.longGeneratingAlert !== false,
+          longGeneratingThresholdSec: this.settings.longGeneratingThresholdSec || 180
+        });
+      }
+      /** Query UUID instanceId */
+      getInstanceId() {
+        return this.instanceId;
+      }
+      // ─── status transition detect ──────────────────────────────
+      detectTransition(newStatus, data) {
+        const now = Date.now();
+        const agentStatus = newStatus === "streaming" || newStatus === "generating" ? "generating" : newStatus === "waiting_approval" ? "waiting_approval" : "idle";
+        const lastMsg = Array.isArray(data?.messages) && data.messages.length > 0 ? data.messages[data.messages.length - 1] : null;
+        const progressFingerprint = agentStatus === "generating" ? `${lastMsg?.role || ""}:${typeof lastMsg?.content === "string" ? lastMsg.content : JSON.stringify(lastMsg?.content || "")}`.slice(-2e3) : void 0;
+        const previousStatus = this.lastAgentStatus;
+        if (agentStatus !== this.lastAgentStatus) {
+          if (this.lastAgentStatus === "idle" && agentStatus === "generating") {
+            this.generatingStartedAt = now;
+            this.pushEvent({
+              event: "agent:generating_started",
+              chatTitle: this.resolveChatTitle(data),
+              timestamp: now,
+              ideType: this.ideType || this.type,
+              agentType: this.type,
+              agentName: this.agentName || this.provider.name,
+              extensionId: this.extensionId || this.type
+            });
+          } else if (agentStatus === "waiting_approval") {
+            if (!this.generatingStartedAt) this.generatingStartedAt = now;
+            this.pushEvent({
+              event: "agent:waiting_approval",
+              chatTitle: this.resolveChatTitle(data),
+              timestamp: now,
+              ideType: this.ideType || this.type,
+              agentType: this.type,
+              agentName: this.agentName || this.provider.name,
+              extensionId: this.extensionId || this.type,
+              modalMessage: data?.activeModal?.message,
+              modalButtons: data?.activeModal?.buttons
+            });
+          } else if (agentStatus === "idle" && (this.lastAgentStatus === "generating" || this.lastAgentStatus === "waiting_approval")) {
+            const duration3 = this.generatingStartedAt ? Math.round((now - this.generatingStartedAt) / 1e3) : 0;
+            this.pushEvent({
+              event: "agent:generating_completed",
+              chatTitle: this.resolveChatTitle(data),
+              duration: duration3,
+              timestamp: now,
+              ideType: this.ideType || this.type,
+              agentType: this.type,
+              agentName: this.agentName || this.provider.name,
+              extensionId: this.extensionId || this.type
+            });
+            this.generatingStartedAt = 0;
+          }
+          this.lastAgentStatus = agentStatus;
+        }
+        this.applyProviderResponse(data, {
+          phase: agentStatus === "idle" && (previousStatus === "generating" || previousStatus === "waiting_approval") ? "turn_completed" : "immediate"
+        });
+        const agentKey = `${this.type}:ext`;
+        const monitorEvents = this.monitor.check(agentKey, agentStatus, now, progressFingerprint);
+        for (const me of monitorEvents) {
+          this.pushEvent({ event: me.type, agentKey: me.agentKey, message: me.message, elapsedSec: me.elapsedSec, timestamp: me.timestamp });
+        }
+      }
+      pushEvent(event) {
+        this.events.push(event);
+        if (this.events.length > 50) this.events = this.events.slice(-50);
+      }
+      applyProviderResponse(data, options) {
+        if (!data || typeof data !== "object") return;
+        const controlValues = extractProviderControlValues(this.provider.controls, data);
+        if (controlValues) this.controlValues = { ...this.controlValues, ...controlValues };
+        const effects = normalizeProviderEffects(data);
+        for (const effect of effects) {
+          const effectWhen = effect.when || "immediate";
+          if (effectWhen === "turn_completed" && options.phase !== "turn_completed") continue;
+          if (effectWhen === "immediate" && options.phase === "turn_completed") continue;
+          const effectKey = this.getEffectDedupKey(effect);
+          if (this.appliedEffectKeys.has(effectKey)) continue;
+          this.appliedEffectKeys.add(effectKey);
+          if (effect.persist !== false) {
+            const persisted = this.getPersistedEffectContent(effect);
+            if (persisted) this.appendRuntimeSystemMessage(persisted, effectKey);
+          }
+          if (effect.type === "message" && effect.message) {
+            this.pushEvent({
+              event: "provider:message",
+              timestamp: Date.now(),
+              content: typeof effect.message.content === "string" ? effect.message.content : JSON.stringify(effect.message.content),
+              role: effect.message.role || "system",
+              kind: effect.message.kind,
+              senderName: effect.message.senderName
+            });
+          } else if (effect.type === "toast" && effect.toast) {
+            this.pushEvent({
+              event: "provider:toast",
+              effectId: effect.id || effectKey,
+              timestamp: Date.now(),
+              message: effect.toast.message,
+              level: effect.toast.level || "info"
+            });
+          } else if (effect.type === "notification" && effect.notification) {
+            this.pushEvent({
+              event: "provider:notification",
+              effectId: effect.id || effectKey,
+              timestamp: Date.now(),
+              title: effect.notification.title,
+              message: effect.notification.body,
+              content: typeof effect.notification.bubbleContent === "string" ? effect.notification.bubbleContent : effect.notification.body,
+              level: effect.notification.level || "info",
+              channels: effect.notification.channels || ["toast"],
+              preferenceKey: effect.notification.preferenceKey
+            });
+          }
+        }
+      }
+      appendRuntimeSystemMessage(content, dedupKey, receivedAt = Date.now()) {
+        const normalizedContent = String(content || "").trim();
+        if (!normalizedContent) return;
+        if (this.runtimeMessages.some((entry) => entry.key === dedupKey)) return;
+        this.runtimeMessages.push({
+          key: dedupKey,
+          message: {
+            role: "system",
+            senderName: "System",
+            content: normalizedContent,
+            receivedAt,
+            timestamp: receivedAt
+          }
+        });
+        if (this.runtimeMessages.length > 50) this.runtimeMessages = this.runtimeMessages.slice(-50);
+        this.historyWriter.appendNewMessages(
+          this.type,
+          [{
+            role: "system",
+            senderName: "System",
+            content: normalizedContent,
+            kind: "system",
+            receivedAt,
+            historyDedupKey: dedupKey
+          }],
+          this.chatTitle || this.agentName || this.provider.name,
+          this.instanceId,
+          this.chatId || this.instanceId
+        );
+      }
+      mergeConversationMessages(messages) {
+        if (this.runtimeMessages.length === 0) return messages;
+        return [...messages, ...this.runtimeMessages.map((entry) => entry.message)].map((message, index) => ({ message, index })).sort((a, b2) => {
+          const aTime = a.message.receivedAt || a.message.timestamp || 0;
+          const bTime = b2.message.receivedAt || b2.message.timestamp || 0;
+          if (aTime !== bTime) return aTime - bTime;
+          return a.index - b2.index;
+        }).map((entry) => entry.message);
+      }
+      getPersistedEffectContent(effect) {
+        if (effect.type === "message") {
+          return typeof effect.message?.content === "string" ? effect.message.content : JSON.stringify(effect.message?.content || "");
+        }
+        if (effect.type === "toast") {
+          return effect.toast?.message || null;
+        }
+        if (effect.type === "notification") {
+          if (typeof effect.notification?.bubbleContent === "string") return effect.notification.bubbleContent;
+          if (typeof effect.notification?.title === "string" && effect.notification.title.trim()) {
+            return `${effect.notification.title}
+${effect.notification.body || ""}`.trim();
+          }
+          return effect.notification?.body || null;
+        }
+        return null;
+      }
+      getEffectDedupKey(effect) {
+        if (effect.id) return `provider_effect:${effect.id}`;
+        if (effect.type === "message") {
+          return `provider_effect:message:${typeof effect.message?.content === "string" ? effect.message.content : JSON.stringify(effect.message?.content || "")}`;
+        }
+        if (effect.type === "notification") {
+          return `provider_effect:notification:${effect.notification?.title || ""}:${effect.notification?.body || ""}`;
+        }
+        return `provider_effect:toast:${effect.toast?.message || ""}`;
+      }
+      flushEvents() {
+        const events = [...this.events];
+        this.events = [];
+        return events;
+      }
+      resolveChatTitle(data) {
+        const title = typeof data?.title === "string" && data.title.trim() ? data.title.trim() : this.chatTitle;
+        return title || this.agentName || this.provider.name;
+      }
+      resetStreamState() {
+        if (this.currentStatus !== "idle") {
+          this.detectTransition("idle", {
+            title: this.chatTitle,
+            agentName: this.agentName,
+            extensionId: this.extensionId,
+            messages: this.messages
           });
         }
-        summaries.sort((a, b2) => b2.lastMessageAt - a.lastMessageAt);
-        const offset = Math.max(0, options.offset || 0);
-        const limit = Math.max(1, options.limit || 30);
-        const sliced = summaries.slice(offset, offset + limit);
-        return {
-          sessions: sliced,
-          hasMore: summaries.length > offset + limit
-        };
-      } catch {
-        return { sessions: [], hasMore: false };
+        this.agentStreams = [];
+        this.messages = [];
+        this.activeModal = null;
+        this.currentModel = "";
+        this.currentMode = "";
+        this.controlValues = {};
+        this.currentStatus = "idle";
+        this.chatId = null;
+        this.chatTitle = null;
+        this.agentName = "";
+        this.extensionId = "";
+        this.lastAgentStatus = "idle";
+        this.generatingStartedAt = 0;
+        this.monitor.reset();
       }
-    }
+    };
     init_logger();
     var IdeProviderInstance = class {
       type;
@@ -32837,6 +33303,8 @@ ${data.message || ""}`.trim();
       monitor;
       historyWriter;
       autoApproveBusy = false;
+      appliedEffectKeys = /* @__PURE__ */ new Set();
+      runtimeMessages = [];
       // IDE meta
       ideVersion = "";
       instanceId;
@@ -32897,7 +33365,7 @@ ${data.message || ""}`.trim();
             id: this.cachedChat.id || "active_session",
             title: this.cachedChat.title || this.type,
             status: this.cachedChat.status || this.currentStatus,
-            messages: this.cachedChat.messages || [],
+            messages: this.mergeConversationMessages(this.cachedChat.messages || []),
             activeModal: this.cachedChat.activeModal || null,
             inputContent: this.cachedChat.inputContent || ""
           } : null,
@@ -32937,6 +33405,13 @@ ${data.message || ""}`.trim();
           for (const ext of this.extensions.values()) {
             ext.onEvent("stream_reset");
           }
+        } else if (event === "provider_state_patch" && data && typeof data === "object") {
+          const extType = typeof data.extensionType === "string" ? data.extensionType : "";
+          if (extType && this.extensions.has(extType)) {
+            this.extensions.get(extType).onEvent("provider_state_patch", data);
+          } else {
+            this.applyProviderResponse(data, { phase: "immediate" });
+          }
         }
       }
       dispose() {
@@ -32944,11 +33419,21 @@ ${data.message || ""}`.trim();
         this.lastAgentStatuses.clear();
         this.generatingStartedAt.clear();
         this.monitor.reset();
+        this.appliedEffectKeys.clear();
+        this.runtimeMessages = [];
         for (const ext of this.extensions.values()) {
           ext.dispose();
         }
         this.extensions.clear();
       }
+      updateSettings(newSettings) {
+        this.settings = { ...newSettings };
+        this.monitor.updateConfig({
+          approvalAlert: this.settings.approvalAlert !== false,
+          longGeneratingAlert: this.settings.longGeneratingAlert !== false,
+          longGeneratingThresholdSec: this.settings.longGeneratingThresholdSec || 180
+        });
+      }
       // ─── Extension manage ─────────────────────────────
       /** Extension Instance add */
       async addExtension(provider, settings) {
@@ -33061,6 +33546,8 @@ ${data.message || ""}`.trim();
               raw.messages = raw.messages.filter((m) => !hiddenKinds.has(m.kind));
             }
           }
+          const controlValues = extractProviderControlValues(this.provider.controls, raw);
+          if (controlValues) raw.controlValues = controlValues;
           this.cachedChat = { ...raw, activeModal };
           this.detectAgentTransitions(raw, now);
           if (raw.messages?.length > 0) {
@@ -33127,6 +33614,9 @@ ${data.message || ""}`.trim();
           }
           this.lastAgentStatuses.set(agentKey, agentStatus);
         }
+        this.applyProviderResponse(chatData, {
+          phase: agentStatus === "idle" && (lastStatus === "generating" || lastStatus === "waiting_approval") ? "turn_completed" : "immediate"
+        });
         if (agentStatus === "waiting_approval" && this.settings.autoApprove && !this.autoApproveBusy) {
           this.autoApproveViaScript(chatData);
         }
@@ -33139,6 +33629,136 @@ ${data.message || ""}`.trim();
         this.events.push(event);
         if (this.events.length > 50) this.events = this.events.slice(-50);
       }
+      applyProviderResponse(data, options) {
+        if (!data || typeof data !== "object") return;
+        const controlValues = extractProviderControlValues(this.provider.controls, data);
+        if (controlValues) {
+          this.cachedChat = {
+            ...this.cachedChat || {},
+            ...data,
+            controlValues: { ...this.cachedChat?.controlValues || {}, ...controlValues }
+          };
+        }
+        const effects = normalizeProviderEffects(data);
+        for (const effect of effects) {
+          const effectWhen = effect.when || "immediate";
+          if (effectWhen === "turn_completed" && options.phase !== "turn_completed") continue;
+          if (effectWhen === "immediate" && options.phase === "turn_completed") continue;
+          const effectKey = this.getEffectDedupKey(effect);
+          if (this.appliedEffectKeys.has(effectKey)) continue;
+          this.appliedEffectKeys.add(effectKey);
+          if (effect.persist !== false) {
+            const persisted = this.getPersistedEffectContent(effect);
+            if (persisted) this.appendRuntimeSystemMessage(persisted, effectKey);
+          }
+          if (effect.type === "message" && effect.message) {
+            this.pushEvent({
+              event: "provider:message",
+              timestamp: Date.now(),
+              content: typeof effect.message.content === "string" ? effect.message.content : JSON.stringify(effect.message.content),
+              role: effect.message.role || "system",
+              kind: effect.message.kind,
+              senderName: effect.message.senderName
+            });
+          } else if (effect.type === "toast" && effect.toast) {
+            this.pushEvent({
+              event: "provider:toast",
+              effectId: effect.id || effectKey,
+              timestamp: Date.now(),
+              message: effect.toast.message,
+              level: effect.toast.level || "info"
+            });
+          } else if (effect.type === "notification" && effect.notification) {
+            this.pushEvent({
+              event: "provider:notification",
+              effectId: effect.id || effectKey,
+              timestamp: Date.now(),
+              title: effect.notification.title,
+              message: effect.notification.body,
+              content: typeof effect.notification.bubbleContent === "string" ? effect.notification.bubbleContent : effect.notification.body,
+              level: effect.notification.level || "info",
+              channels: effect.notification.channels || ["toast"],
+              preferenceKey: effect.notification.preferenceKey
+            });
+          }
+        }
+      }
+      appendRuntimeSystemMessage(content, dedupKey, receivedAt = Date.now()) {
+        const normalizedContent = String(content || "").trim();
+        if (!normalizedContent) return;
+        if (this.runtimeMessages.some((entry) => entry.key === dedupKey)) return;
+        if (!this.cachedChat) {
+          this.cachedChat = {
+            id: "active_session",
+            title: this.provider.name,
+            status: this.currentStatus,
+            messages: [],
+            activeModal: null,
+            inputContent: ""
+          };
+        }
+        this.runtimeMessages.push({
+          key: dedupKey,
+          message: {
+            role: "system",
+            senderName: "System",
+            content: normalizedContent,
+            receivedAt,
+            timestamp: receivedAt
+          }
+        });
+        if (this.runtimeMessages.length > 50) this.runtimeMessages = this.runtimeMessages.slice(-50);
+        this.historyWriter.appendNewMessages(
+          this.type,
+          [{
+            role: "system",
+            senderName: "System",
+            content: normalizedContent,
+            kind: "system",
+            receivedAt,
+            historyDedupKey: dedupKey
+          }],
+          this.cachedChat?.title || this.provider.name,
+          this.instanceId,
+          this.cachedChat?.id || this.instanceId
+        );
+      }
+      mergeConversationMessages(messages) {
+        if (this.runtimeMessages.length === 0) return messages;
+        return [...messages, ...this.runtimeMessages.map((entry) => entry.message)].map((message, index) => ({ message, index })).sort((a, b2) => {
+          const aTime = a.message.receivedAt || a.message.timestamp || 0;
+          const bTime = b2.message.receivedAt || b2.message.timestamp || 0;
+          if (aTime !== bTime) return aTime - bTime;
+          return a.index - b2.index;
+        }).map((entry) => entry.message);
+      }
+      getPersistedEffectContent(effect) {
+        if (effect.type === "message") {
+          return typeof effect.message?.content === "string" ? effect.message.content : JSON.stringify(effect.message?.content || "");
+        }
+        if (effect.type === "toast") {
+          return effect.toast?.message || null;
+        }
+        if (effect.type === "notification") {
+          if (typeof effect.notification?.bubbleContent === "string") return effect.notification.bubbleContent;
+          if (typeof effect.notification?.title === "string" && effect.notification.title.trim()) {
+            return `${effect.notification.title}
+${effect.notification.body || ""}`.trim();
+          }
+          return effect.notification?.body || null;
+        }
+        return null;
+      }
+      getEffectDedupKey(effect) {
+        if (effect.id) return `provider_effect:${effect.id}`;
+        if (effect.type === "message") {
+          return `provider_effect:message:${typeof effect.message?.content === "string" ? effect.message.content : JSON.stringify(effect.message?.content || "")}`;
+        }
+        if (effect.type === "notification") {
+          return `provider_effect:notification:${effect.notification?.title || ""}:${effect.notification?.body || ""}`;
+        }
+        return `provider_effect:toast:${effect.toast?.message || ""}`;
+      }
       flushEvents() {
         const events = [...this.events];
         this.events = [];
@@ -34009,6 +34629,24 @@ ${data.message || ""}`.trim();
       recentSendByTarget.set(key, now);
       return false;
     }
+    function parseMaybeJson(value) {
+      if (typeof value !== "string") return value;
+      try {
+        return JSON.parse(value);
+      } catch {
+        return value;
+      }
+    }
+    function didProviderConfirmSend(result) {
+      const parsed = parseMaybeJson(result);
+      if (parsed === true) return true;
+      if (typeof parsed === "string") {
+        const normalized = parsed.trim().toLowerCase();
+        return normalized === "ok" || normalized === "sent" || normalized === "success" || normalized === "true";
+      }
+      if (!parsed || typeof parsed !== "object") return false;
+      return parsed.sent === true || parsed.success === true || parsed.ok === true || parsed.submitted === true || parsed.dispatched === true;
+    }
     async function handleChatHistory(h, args) {
       const { agentType, offset, limit } = args;
       const historySessionId = getHistorySessionId(h, args);
@@ -34191,14 +34829,8 @@ ${data.message || ""}`.trim();
         try {
           const evalResult = await h.evaluateProviderScript("sendMessage", { MESSAGE: text }, 3e4);
           if (evalResult?.result) {
-            let parsed = evalResult.result;
-            if (typeof parsed === "string") {
-              try {
-                parsed = JSON.parse(parsed);
-              } catch {
-              }
-            }
-            if (parsed?.sent) {
+            const parsed = parseMaybeJson(evalResult.result);
+            if (didProviderConfirmSend(parsed)) {
               _log(`Extension script sent OK`);
               return _logSendSuccess("extension-script");
             }
@@ -34230,14 +34862,8 @@ ${data.message || ""}`.trim();
       if (sendScript) {
         try {
           const result = await targetCdp.evaluate(sendScript, 3e4);
-          let parsed = result;
-          if (typeof result === "string") {
-            try {
-              parsed = JSON.parse(result);
-            } catch {
-            }
-          }
-          if (parsed?.sent) {
+          const parsed = parseMaybeJson(result);
+          if (didProviderConfirmSend(parsed)) {
             _log(`sendMessage script OK`);
             return _logSendSuccess("script");
           }
@@ -34282,14 +34908,8 @@ ${data.message || ""}`.trim();
                 const matchText = provider.webviewMatchText;
                 const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
                 const wvResult = await targetCdp.evaluateInWebviewFrame(webviewScript, matchFn);
-                let wvParsed = wvResult;
-                if (typeof wvResult === "string") {
-                  try {
-                    wvParsed = JSON.parse(wvResult);
-                  } catch {
-                  }
-                }
-                if (wvParsed?.sent) {
+                const wvParsed = parseMaybeJson(wvResult);
+                if (didProviderConfirmSend(wvParsed)) {
                   _log(`webviewSendMessage OK`);
                   return _logSendSuccess("webview-script");
                 }
@@ -34311,14 +34931,8 @@ ${data.message || ""}`.trim();
             const matchText = provider.webviewMatchText;
             const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
             const wvResult = await targetCdp.evaluateInWebviewFrame(webviewScript, matchFn);
-            let wvParsed = wvResult;
-            if (typeof wvResult === "string") {
-              try {
-                wvParsed = JSON.parse(wvResult);
-              } catch {
-              }
-            }
-            if (wvParsed?.sent) {
+            const wvParsed = parseMaybeJson(wvResult);
+            if (didProviderConfirmSend(wvParsed)) {
               _log(`webviewSendMessage OK`);
               return _logSendSuccess("webview-script");
             }
@@ -35200,7 +35814,56 @@ ${data.message || ""}`.trim();
       }
       return { success: false, error: `Failed to set ${providerType}.${key} \u2014 invalid key, value, or not a public setting` };
     }
-    async function handleExtensionScript(h, args, scriptName) {
+    function normalizeProviderScriptArgs(args) {
+      const normalizedArgs = { ...args || {} };
+      for (const key of ["mode", "model", "message", "action", "button", "text", "sessionId", "value"]) {
+        if (key in normalizedArgs && !(key.toUpperCase() in normalizedArgs)) {
+          normalizedArgs[key.toUpperCase()] = normalizedArgs[key];
+        }
+      }
+      return normalizedArgs;
+    }
+    function parseScriptResult(result) {
+      if (typeof result === "string") {
+        try {
+          const parsed = JSON.parse(result);
+          if (parsed && typeof parsed === "object" && parsed.success === false) {
+            return { success: false, payload: parsed };
+          }
+          return { success: true, payload: parsed };
+        } catch {
+          return { success: true, payload: { result } };
+        }
+      }
+      if (result && typeof result === "object" && result.success === false) {
+        return { success: false, payload: result };
+      }
+      return { success: true, payload: result };
+    }
+    function getCliScriptCommand(payload) {
+      if (!payload || typeof payload !== "object") return null;
+      if (typeof payload.sendMessage === "string" && payload.sendMessage.trim()) {
+        return { type: "send_message", text: payload.sendMessage.trim() };
+      }
+      const command = payload.command;
+      if (!command || typeof command !== "object") return null;
+      if (command.type !== "send_message") return null;
+      const text = typeof command.text === "string" ? command.text.trim() : typeof command.message === "string" ? command.message.trim() : "";
+      if (!text) return null;
+      return { type: "send_message", text };
+    }
+    function applyProviderPatch(h, args, payload) {
+      if (!payload || typeof payload !== "object") return;
+      const targetSessionId = typeof args?.targetSessionId === "string" ? args.targetSessionId.trim() : "";
+      const targetSession = targetSessionId ? h.ctx.sessionRegistry?.get(targetSessionId) : void 0;
+      const instanceKey = targetSession?.instanceKey || targetSessionId;
+      if (!instanceKey) return;
+      h.ctx.instanceManager?.sendEvent(instanceKey, "provider_state_patch", {
+        ...payload,
+        extensionType: targetSession?.transport === "cdp-webview" ? targetSession.providerType : void 0
+      });
+    }
+    async function executeProviderScript(h, args, scriptName) {
       const { agentType, ideType } = args || {};
       if (!agentType) return { success: false, error: "agentType is required" };
       const loader = h.ctx.providerLoader;
@@ -35213,13 +35876,29 @@ ${data.message || ""}`.trim();
       if (!provider.scripts?.[actualScriptName]) {
         return { success: false, error: `Script '${actualScriptName}' not available for ${agentType}` };
       }
-      const scriptFn = provider.scripts[actualScriptName];
-      const normalizedArgs = { ...args };
-      for (const key of ["mode", "model", "message", "action", "button", "text", "sessionId"]) {
-        if (key in normalizedArgs && !(key.toUpperCase() in normalizedArgs)) {
-          normalizedArgs[key.toUpperCase()] = normalizedArgs[key];
+      const normalizedArgs = normalizeProviderScriptArgs(args);
+      if (provider.category === "cli") {
+        const adapter = h.getCliAdapter(args?.targetSessionId || agentType);
+        if (!adapter?.invokeScript) {
+          return { success: false, error: `CLI adapter does not support script '${actualScriptName}'` };
+        }
+        try {
+          const raw = await adapter.invokeScript(actualScriptName, normalizedArgs);
+          const parsed = parseScriptResult(raw);
+          if (!parsed.success) {
+            return { success: false, ...parsed.payload || {} };
+          }
+          const cliCommand = getCliScriptCommand(parsed.payload);
+          if (cliCommand?.type === "send_message" && cliCommand.text) {
+            await adapter.sendMessage(cliCommand.text);
+          }
+          applyProviderPatch(h, args, parsed.payload);
+          return { success: true, ...parsed.payload && typeof parsed.payload === "object" ? parsed.payload : { result: parsed.payload } };
+        } catch (e) {
+          return { success: false, error: `Script execution failed: ${e.message}` };
         }
       }
+      const scriptFn = provider.scripts[actualScriptName];
       const scriptCode = scriptFn(normalizedArgs);
       if (!scriptCode) return { success: false, error: `Script '${actualScriptName}' returned null` };
       const cdpKey = provider.category === "ide" ? h.currentSession?.cdpManagerKey || h.currentManagerKey || agentType : h.currentSession?.cdpManagerKey || h.currentManagerKey || ideType;
@@ -35273,16 +35952,29 @@ ${data.message || ""}`.trim();
         if (typeof result === "string") {
           try {
             const parsed = JSON.parse(result);
+            applyProviderPatch(h, args, parsed);
+            if (parsed && typeof parsed === "object" && parsed.success === false) {
+              return { success: false, ...parsed };
+            }
             return { success: true, ...parsed };
           } catch {
             return { success: true, result };
           }
         }
+        applyProviderPatch(h, args, result);
         return { success: true, result };
       } catch (e) {
         return { success: false, error: `Script execution failed: ${e.message}` };
       }
     }
+    async function handleExtensionScript(h, args, scriptName) {
+      return executeProviderScript(h, args, scriptName);
+    }
+    async function handleProviderScript(h, args) {
+      const scriptName = typeof args?.scriptName === "string" ? args.scriptName.trim() : "";
+      if (!scriptName) return { success: false, error: "scriptName is required" };
+      return executeProviderScript(h, args, scriptName);
+    }
     function handleGetIdeExtensions(h, args) {
       const { ideType } = args || {};
       const loader = h.ctx.providerLoader;
@@ -35778,6 +36470,8 @@ ${data.message || ""}`.trim();
           case "set_ide_extension":
             return handleSetIdeExtension(this, args);
           // ─── Extension Model / Mode Control (stream-commands.ts) ──────────
+          case "invoke_provider_script":
+            return handleProviderScript(this, args);
           case "list_extension_models":
             return handleExtensionScript(this, args, "listModels");
           case "set_extension_model":
@@ -35950,6 +36644,8 @@ ${data.message || ""}`.trim();
       generatingDebounceTimer = null;
       generatingDebouncePending = null;
       lastApprovalEventAt = 0;
+      controlValues = {};
+      appliedEffectKeys = /* @__PURE__ */ new Set();
       historyWriter;
       runtimeMessages = [];
       instanceId;
@@ -35962,6 +36658,7 @@ ${data.message || ""}`.trim();
       async init(context) {
         this.context = context;
         this.settings = context.settings || {};
+        this.adapter.updateRuntimeSettings?.(this.settings);
         this.monitor.updateConfig({
           approvalAlert: this.settings.approvalAlert !== false,
           longGeneratingAlert: this.settings.longGeneratingAlert !== false,
@@ -35977,6 +36674,21 @@ ${data.message || ""}`.trim();
           this.detectStatusTransition();
         });
         await this.adapter.spawn();
+        if (this.providerSessionId) {
+          const restoredHistory = readChatHistory(this.type, 0, 200, this.providerSessionId);
+          if (restoredHistory.messages.length > 0) {
+            this.adapter.seedCommittedMessages(
+              restoredHistory.messages.map((message) => ({
+                role: message.role,
+                content: message.content,
+                timestamp: message.receivedAt,
+                receivedAt: message.receivedAt,
+                kind: message.kind,
+                senderName: message.senderName
+              }))
+            );
+          }
+        }
         if (this.providerSessionId && this.launchMode === "resume") {
           const resumedAt = Date.now();
           this.historyWriter.appendSystemMarker(
@@ -36057,6 +36769,12 @@ ${data.message || ""}`.trim();
         }
         const runtime = this.adapter.getRuntimeMetadata();
         const parsedMessages = Array.isArray(parsedStatus?.messages) ? parsedStatus.messages : [];
+        const controlValues = extractProviderControlValues(this.provider.controls, parsedStatus);
+        if (controlValues) {
+          this.controlValues = controlValues;
+        } else if (Object.keys(this.controlValues).length > 0) {
+          this.controlValues = {};
+        }
         const mergedMessages = this.mergeConversationMessages(parsedMessages);
         const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
         if (parsedMessages.length > 0) {
@@ -36077,6 +36795,7 @@ ${data.message || ""}`.trim();
             );
           }
         }
+        this.applyProviderResponse(parsedStatus, { phase: "immediate" });
         return {
           type: this.type,
           name: this.provider.name,
@@ -36106,8 +36825,7 @@ ${data.message || ""}`.trim();
             attachedClients: runtime.attachedClients || []
           } : void 0,
           resume: this.provider.resume,
-          controlValues: void 0,
-          // CLI controls not yet wired from stream
+          controlValues: this.controlValues,
           providerControls: this.provider.controls
         };
       }
@@ -36118,6 +36836,15 @@ ${data.message || ""}`.trim();
       getPresentationMode() {
         return this.presentationMode;
       }
+      updateSettings(newSettings) {
+        this.settings = { ...newSettings };
+        this.adapter.updateRuntimeSettings?.(this.settings);
+        this.monitor.updateConfig({
+          approvalAlert: this.settings.approvalAlert !== false,
+          longGeneratingAlert: this.settings.longGeneratingAlert !== false,
+          longGeneratingThresholdSec: this.settings.longGeneratingThresholdSec || 180
+        });
+      }
       onEvent(event, data) {
         if (event === "send_message" && data?.text) {
           void this.adapter.sendMessage(data.text).catch((e) => {
@@ -36129,22 +36856,27 @@ ${data.message || ""}`.trim();
           void this.adapter.resolveAction(data).catch((e) => {
             LOG2.warn("CLI", `[${this.type}] resolve_action failed: ${e?.message || e}`);
           });
+        } else if (event === "provider_state_patch" && data && typeof data === "object") {
+          this.applyProviderResponse(data, { phase: "immediate" });
         }
       }
       dispose() {
         this.adapter.shutdown();
         this.monitor.reset();
+        this.appliedEffectKeys.clear();
       }
       completedDebounceTimer = null;
       completedDebouncePending = null;
       detectStatusTransition() {
         const now = Date.now();
         const adapterStatus = this.adapter.getStatus();
+        const parsedStatus = this.adapter.getScriptParsedStatus?.() || null;
         const newStatus = adapterStatus.status;
         const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
         const chatTitle = `${this.provider.name} \xB7 ${dirName}`;
         const partial2 = this.adapter.getPartialResponse();
         const progressFingerprint = newStatus === "generating" ? `${partial2 || ""}::${adapterStatus.messages.at(-1)?.content || ""}`.slice(-2e3) : void 0;
+        const previousStatus = this.lastStatus;
         if (newStatus !== this.lastStatus) {
           LOG2.info("CLI", `[${this.type}] status: ${this.lastStatus} \u2192 ${newStatus}`);
           if (this.lastStatus === "idle" && newStatus === "generating") {
@@ -36237,6 +36969,9 @@ ${data.message || ""}`.trim();
           }
           this.lastStatus = newStatus;
         }
+        this.applyProviderResponse(parsedStatus, {
+          phase: newStatus === "idle" && (previousStatus === "generating" || previousStatus === "waiting_approval") ? "turn_completed" : "immediate"
+        });
         const agentKey = `${this.type}:cli`;
         const monitorEvents = this.monitor.check(agentKey, newStatus, now, progressFingerprint);
         for (const me of monitorEvents) {
@@ -36252,6 +36987,88 @@ ${data.message || ""}`.trim();
         this.events = [];
         return events;
       }
+      applyProviderResponse(data, options) {
+        if (!data || typeof data !== "object") return;
+        const controlValues = extractProviderControlValues(this.provider.controls, data);
+        if (controlValues) {
+          this.controlValues = { ...this.controlValues, ...controlValues };
+        }
+        const effects = normalizeProviderEffects(data);
+        for (const effect of effects) {
+          const effectWhen = effect.when || "immediate";
+          if (effectWhen === "turn_completed" && options.phase !== "turn_completed") continue;
+          if (effectWhen === "immediate" && options.phase === "turn_completed") continue;
+          const effectKey = this.getEffectDedupKey(effect);
+          if (this.appliedEffectKeys.has(effectKey)) continue;
+          this.appliedEffectKeys.add(effectKey);
+          if (effect.persist !== false) {
+            const persisted = this.getPersistedEffectContent(effect);
+            if (persisted) this.appendRuntimeSystemMessage(persisted, effectKey);
+          }
+          if (effect.type === "message" && effect.message) {
+            const content = typeof effect.message.content === "string" ? effect.message.content : JSON.stringify(effect.message.content);
+            this.pushEvent({
+              event: "provider:message",
+              timestamp: Date.now(),
+              content,
+              role: effect.message.role || "system",
+              kind: effect.message.kind,
+              senderName: effect.message.senderName
+            });
+          } else if (effect.type === "toast" && effect.toast) {
+            this.pushEvent({
+              event: "provider:toast",
+              effectId: effect.id || effectKey,
+              timestamp: Date.now(),
+              message: effect.toast.message,
+              level: effect.toast.level || "info"
+            });
+          } else if (effect.type === "notification" && effect.notification) {
+            this.pushEvent({
+              event: "provider:notification",
+              effectId: effect.id || effectKey,
+              timestamp: Date.now(),
+              title: effect.notification.title,
+              message: effect.notification.body,
+              content: typeof effect.notification.bubbleContent === "string" ? effect.notification.bubbleContent : effect.notification.body,
+              level: effect.notification.level || "info",
+              channels: effect.notification.channels || ["toast"],
+              preferenceKey: effect.notification.preferenceKey
+            });
+          }
+        }
+        if (this.appliedEffectKeys.size > 200) {
+          this.appliedEffectKeys = new Set(Array.from(this.appliedEffectKeys).slice(-100));
+        }
+      }
+      getEffectDedupKey(effect) {
+        if (effect.id) return `provider_effect:${effect.id}`;
+        if (effect.type === "message") {
+          const content = typeof effect.message?.content === "string" ? effect.message.content : JSON.stringify(effect.message?.content || "");
+          return `provider_effect:message:${content}`;
+        }
+        if (effect.type === "notification") {
+          return `provider_effect:notification:${effect.notification?.title || ""}:${effect.notification?.body || ""}`;
+        }
+        return `provider_effect:toast:${effect.toast?.message || ""}`;
+      }
+      getPersistedEffectContent(effect) {
+        if (effect.type === "message") {
+          return typeof effect.message?.content === "string" ? effect.message.content : JSON.stringify(effect.message?.content || "");
+        }
+        if (effect.type === "toast") {
+          return effect.toast?.message || null;
+        }
+        if (effect.type === "notification") {
+          if (typeof effect.notification?.bubbleContent === "string") return effect.notification.bubbleContent;
+          if (typeof effect.notification?.title === "string" && effect.notification.title.trim()) {
+            return `${effect.notification.title}
+${effect.notification.body || ""}`.trim();
+          }
+          return effect.notification?.body || null;
+        }
+        return null;
+      }
       // ─── Adapter access (backward compat) ──────────────────
       getAdapter() {
         return this.adapter;
@@ -39010,6 +39827,22 @@ Run 'adhdev doctor' for detailed diagnostics.`
     function getWinProcessNames() {
       return getProviderLoader().getWinProcessNames();
     }
+    function getProviderMeta(ideId) {
+      return getProviderLoader().getMeta(ideId);
+    }
+    function getPreferredLaunchMethod(ideId, platform9) {
+      const prefer = getProviderMeta(ideId)?.launch?.prefer;
+      const value = prefer?.[platform9];
+      return value === "cli" || value === "app" || value === "auto" ? value : "auto";
+    }
+    function getCdpStartupTimeoutMs(ideId) {
+      const value = getProviderMeta(ideId)?.launch?.cdpStartupTimeoutMs;
+      if (typeof value !== "number" || !Number.isFinite(value)) return 15e3;
+      return Math.max(1e3, Math.floor(value));
+    }
+    function escapeForAppleScript(value) {
+      return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+    }
     async function findFreePort(ports) {
       for (const port2 of ports) {
         const free = await checkPortFree(port2);
@@ -39062,12 +39895,12 @@ Run 'adhdev doctor' for detailed diagnostics.`
       try {
         if (plat === "darwin" && appName) {
           try {
-            (0, import_child_process6.execSync)(`osascript -e 'tell application "${appName}" to quit' 2>/dev/null`, {
+            (0, import_child_process6.execSync)(`osascript -e 'tell application "${escapeForAppleScript(appName)}" to quit' 2>/dev/null`, {
               timeout: 5e3
             });
           } catch {
             try {
-              (0, import_child_process6.execSync)(`pkill -f "${appName}" 2>/dev/null`);
+              (0, import_child_process6.execSync)(`pkill -x "${appName}" 2>/dev/null`, { timeout: 5e3 });
             } catch {
             }
           }
@@ -39097,7 +39930,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
         }
         if (plat === "darwin" && appName) {
           try {
-            (0, import_child_process6.execSync)(`pkill -9 -f "${appName}" 2>/dev/null`);
+            (0, import_child_process6.execSync)(`pkill -9 -x "${appName}" 2>/dev/null`, { timeout: 5e3 });
           } catch {
           }
         } else if (plat === "win32" && winProcesses) {
@@ -39120,8 +39953,23 @@ Run 'adhdev doctor' for detailed diagnostics.`
         if (plat === "darwin") {
           const appName = getMacAppIdentifiers()[ideId];
           if (!appName) return false;
-          const result = (0, import_child_process6.execSync)(`pgrep -f "${appName}" 2>/dev/null`, { encoding: "utf-8" });
-          return result.trim().length > 0;
+          try {
+            const result = (0, import_child_process6.execSync)(`pgrep -x "${appName}" 2>/dev/null`, {
+              encoding: "utf-8",
+              timeout: 3e3
+            });
+            return result.trim().length > 0;
+          } catch {
+            const result = (0, import_child_process6.execSync)(
+              `osascript -e 'tell application "System Events" to count (every process whose name is "${escapeForAppleScript(appName)}")'`,
+              {
+                encoding: "utf-8",
+                timeout: 3e3,
+                stdio: ["pipe", "pipe", "pipe"]
+              }
+            );
+            return Number.parseInt(result.trim() || "0", 10) > 0;
+          }
         } else if (plat === "win32") {
           const winProcesses = getWinProcessNames()[ideId];
           if (!winProcesses) return false;
@@ -39270,7 +40118,8 @@ Run 'adhdev doctor' for detailed diagnostics.`
           await launchLinux(targetIde, port, workspace, options.newWindow);
         }
         let cdpReady = false;
-        for (let i = 0; i < 30; i++) {
+        const waitDeadline = Date.now() + getCdpStartupTimeoutMs(targetIde.id);
+        while (Date.now() < waitDeadline) {
           await new Promise((r) => setTimeout(r, 500));
           if (await isCdpActive(port)) {
             cdpReady = true;
@@ -39299,14 +40148,18 @@ Run 'adhdev doctor' for detailed diagnostics.`
     }
     async function launchMacOS(ide, port, workspace, newWindow) {
       const appName = getMacAppIdentifiers()[ide.id];
+      const preferredMethod = getPreferredLaunchMethod(ide.id, "darwin");
       const args = ["--remote-debugging-port=" + port];
       if (newWindow) args.push("--new-window");
       if (workspace) args.push(workspace);
-      if (appName) {
+      const canUseCli = !!ide.cliCommand;
+      const canUseAppLauncher = !!appName;
+      const useAppLauncher = preferredMethod === "app" ? canUseAppLauncher : preferredMethod === "cli" ? false : !canUseCli && canUseAppLauncher;
+      if (!useAppLauncher && ide.cliCommand) {
+        (0, import_child_process6.spawn)(ide.cliCommand, args, { detached: true, stdio: "ignore" }).unref();
+      } else if (appName) {
         const openArgs = ["-a", appName, "--args", ...args];
         (0, import_child_process6.spawn)("open", openArgs, { detached: true, stdio: "ignore" }).unref();
-      } else if (ide.cliCommand) {
-        (0, import_child_process6.spawn)(ide.cliCommand, args, { detached: true, stdio: "ignore" }).unref();
       } else {
         throw new Error(`No app identifier or CLI for ${ide.displayName}`);
       }
@@ -39609,6 +40462,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
         workspaces: wsState.workspaces,
         defaultWorkspaceId: wsState.defaultWorkspaceId,
         defaultWorkspacePath: wsState.defaultWorkspacePath,
+        terminalSizingMode: cfg.terminalSizingMode || "measured",
         recentLaunches: buildRecentLaunches(recentActivity),
         terminalBackend,
         availableProviders: buildAvailableProviders(options.providerLoader)
@@ -40444,19 +41298,10 @@ Run 'adhdev doctor' for detailed diagnostics.`
             mode: data.mode,
             activeModal: data.activeModal
           };
-          if (this.provider.controls?.length) {
-            const cv = {};
-            for (const ctrl of this.provider.controls) {
-              if (!ctrl.readFrom) continue;
-              const val = data[ctrl.readFrom];
-              if (val !== void 0 && val !== null) {
-                cv[ctrl.id] = typeof val === "object" ? val.name || val.id || String(val) : val;
-              }
-            }
-            if (data.model && !cv["model"]) cv["model"] = data.model;
-            if (data.mode && !cv["mode"]) cv["mode"] = data.mode;
-            if (Object.keys(cv).length > 0) state.controlValues = cv;
-          }
+          const controlValues = extractProviderControlValues(this.provider.controls, data);
+          if (controlValues) state.controlValues = controlValues;
+          const effects = normalizeProviderEffects(data);
+          if (effects.length > 0) state.effects = effects;
           if (state.messages.length > 0) {
             this.lastSuccessState = state;
           }
@@ -40976,6 +41821,8 @@ Run 'adhdev doctor' for detailed diagnostics.`
           activeModal: stream.activeModal || null,
           model: stream.model || void 0,
           mode: stream.mode || void 0,
+          controlValues: stream.controlValues || void 0,
+          effects: stream.effects || void 0,
           sessionId: stream.sessionId || stream.instanceId || void 0,
           title: stream.title || stream.agentName || void 0,
           agentType: stream.agentType || void 0,