@superblocksteam/vite-plugin-file-sync 2.0.130-next.2 → 2.0.130-next.4

package/dist/ai-service/llm/stream/idle-monitor.js

@@ -6,11 +6,16 @@ export class IdleMonitor {
     firstChunkTimeoutMs;
     onStallCallback;
     onServerCompactionStart;
+    shouldPause;
+    onPauseCallback;
     timer = null;
     stallError = null;
     stallCallbacks = [];
     subscribed = false;
     hasReceivedChunk = false;
+    // True once a local-wait suppression stretch has fired its onPause event;
+    // reset by real activity (chunk/step/retry) so each stretch logs exactly once.
+    pausedThisStretch = false;
     compactionTextBlockIds = new Set();
     // The budget snapshot used when the live timer was armed. fireStall() reports
     // this rather than re-resolving, so the logged budget always matches the timer
@@ -26,6 +31,8 @@ export class IdleMonitor {
             options.firstChunkTimeoutMs ?? options.maxIdleTimeMs;
         this.onStallCallback = options.onStall;
         this.onServerCompactionStart = options.onServerCompactionStart;
+        this.shouldPause = options.shouldPause;
+        this.onPauseCallback = options.onPause;
     }
     resolveBudget(budget) {
         return typeof budget === "function" ? budget() : budget;
@@ -51,6 +58,7 @@ export class IdleMonitor {
     start() {
         this.stallError = null;
         this.hasReceivedChunk = false;
+        this.pausedThisStretch = false;
         this.compactionTextBlockIds.clear();
         this.session.resetActivityTimer();
         this.subscribeToEvents();
@@ -109,12 +117,14 @@ export class IdleMonitor {
         }
         this.stallError = null;
         this.stallCallbacks = [];
+        this.pausedThisStretch = false;
         this.armTimer();
     };
     handleStepStart = () => {
         this.hasReceivedChunk = false;
         this.compactionTextBlockIds.clear();
         this.stallError = null;
+        this.pausedThisStretch = false;
         this.session.resetActivityTimer();
         this.armTimer();
     };
@@ -123,6 +133,7 @@ export class IdleMonitor {
         this.compactionTextBlockIds.clear();
         this.stallError = null;
         this.stallCallbacks = [];
+        this.pausedThisStretch = false;
         this.session.resetActivityTimer();
         this.armTimer();
     };
@@ -164,8 +175,59 @@ export class IdleMonitor {
         if (!this.session.isPending()) {
             return;
         }
+        // The timer fired on a wall-clock budget, but the gap may be local work —
+        // a running tool, a step boundary, or the consumer holding the stream —
+        // rather than the provider going silent. Re-check at fire time (state can
+        // flip between arming and firing): if we're in a local wait, leave
+        // stallError null and any waitForStall() promise pending, and just re-arm
+        // so the managed stream stays blocked on the same upstream read instead of
+        // surfacing a useless provider retry. A genuine provider silence that
+        // follows the local wait still fires on a later tick. See APPS-4605.
+        //
+        // There is no cap on how long this can keep re-arming: a healthy slow tool
+        // is allowed to run for as long as it takes. A tool that hangs forever is
+        // bounded externally instead — the parent abortSignal (the dev server
+        // request's own timeout / the user navigating away) cascades to
+        // "session:abort", which stops the monitor and tears the stream down. The
+        // onPause event below makes the long wait observable while it is happening.
+        //
+        // Guard the callback like the others below: fireStall() runs from a
+        // setTimeout, so a throw here would escape as an unhandled exception, the
+        // timer would never re-arm, and stall detection would be dead for the rest
+        // of the session. On error, fall through and fire the stall — a real stall
+        // surfacing is safer than one being silently swallowed.
+        let shouldPause = false;
+        try {
+            shouldPause = this.shouldPause?.() ?? false;
+        }
+        catch {
+            // A shouldPause failure must not break stall monitoring.
+        }
+        if (shouldPause) {
+            // Emit one onPause event at the start of each suppression stretch so a
+            // long local wait (e.g. a tool that never returns) is observable, without
+            // logging on every re-arm. The flag clears on the next real chunk/step/
+            // retry, so a later stuck stretch emits again.
+            if (!this.pausedThisStretch) {
+                this.pausedThisStretch = true;
+                try {
+                    this.onPauseCallback?.();
+                }
+                catch {
+                    // A callback/logging failure must not break stall monitoring.
+                }
+            }
+            this.armTimer();
+            return;
+        }
         const idleTime = this.session.getTimeSinceLastActivity();
         this.stallError = new StallTimeoutError(idleTime, this.armedBudget.timeoutMs, this.armedBudget.budgetKind);
+        // Invariant: run onStallCallback before resolving stallCallbacks. Both are
+        // synchronous, so both observe session state as it was at the instant of
+        // the stall — before the rejected waitForStall() promise propagates (a
+        // microtask) into the managed stream's catch and mutates that state. The
+        // stall_reason classifier (orchestrator onStall) relies on this to read
+        // session.isAwaitingUpstream() while it still reflects the stalled await.
         try {
             this.onStallCallback?.(this.stallError);
         }

package/dist/ai-service/llm/stream/idle-monitor.js.map

@@ -1 +1 @@
-{"version":3,"file":"idle-monitor.js","sourceRoot":"","sources":["../../../../src/ai-service/llm/stream/idle-monitor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"idle-monitor.js","sourceRoot":"","sources":["../../../../src/ai-service/llm/stream/idle-monitor.ts"],"names":[],"mappings":"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"}

package/dist/ai-service/llm/stream/managed-stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"managed-stream.d.ts","sourceRoot":"","sources":["../../../../src/ai-service/llm/stream/managed-stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,IAAI,CAAC;AAE9D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAExD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,mBAAmB,CACjC,CAAC,SAAS,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,EAE9C,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC,EAC9B,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,WAAW,GACvB,mBAAmB,CAAC,CAAC,CAAC,CAwHxB"}
+{"version":3,"file":"managed-stream.d.ts","sourceRoot":"","sources":["../../../../src/ai-service/llm/stream/managed-stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,IAAI,CAAC;AAE9D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAExD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,mBAAmB,CACjC,CAAC,SAAS,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,EAE9C,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC,EAC9B,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,WAAW,GACvB,mBAAmB,CAAC,CAAC,CAAC,CAkIxB"}

package/dist/ai-service/llm/stream/managed-stream.js

@@ -31,7 +31,6 @@ export function createManagedStream(source, session, idleMonitor) {
                 controller.close();
                 return;
             }
-            session.recordPull();
             // Loop over raw chunks (provider SSE keep-alives / message metadata):
             // these exist only to feed IdleMonitor during thinking silences so the
             // watchdog doesn't stall a healthy stream. For each raw chunk we:
@@ -51,7 +50,17 @@ export function createManagedStream(source, session, idleMonitor) {
             //     chunk arrives. See APPS-3460.
             while (true) {
                 try {
+                    // Stamp each iteration so ms_since_last_pull stays fresh across
+                    // keep-alive loops for stall-log triage.
+                    session.recordPull();
+                    // We are now blocked on upstream. If the idle monitor fires while
+                    // this await is pending, the stall is "network-dark"; once a chunk
+                    // arrives and we hand off to the consumer, a subsequent stall is
+                    // "consumer-blocked" (the consumer is holding the stream without
+                    // pulling). See orchestrator onStall + session.isAwaitingUpstream.
+                    session.setAwaitingUpstream(true);
                     const result = await raceWithStallDetection(iterator.next(), idleMonitor);
+                    session.setAwaitingUpstream(false);
                     if (result.done) {
                         closed = true;
                         session.finalize("complete");
@@ -101,12 +110,13 @@ export function createManagedStream(source, session, idleMonitor) {
                         controller.error(chunkError);
                         return;
                     }
-                    session.recordChunk();
+                    session.recordChunk(result.value.type);
                     void session.events.emit("chunk", result.value, session);
                     controller.enqueue(result.value);
                     return;
                 }
                 catch (error) {
+                    session.setAwaitingUpstream(false);
                     closed = true;
                     // no finalization, let wrapWithRetry handle it
                     controller.error(error);

package/dist/ai-service/llm/stream/managed-stream.js.map

@@ -1 +1 @@
-{"version":3,"file":"managed-stream.js","sourceRoot":"","sources":["../../../../src/ai-service/llm/stream/managed-stream.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"managed-stream.js","sourceRoot":"","sources":["../../../../src/ai-service/llm/stream/managed-stream.ts"],"names":[],"mappings":"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"}

package/dist/ai-service/llm/stream/orchestrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../../../src/ai-service/llm/stream/orchestrator.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAGxD,OAAO,KAAK,EACV,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAIhD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAMpD,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,MAAM,EAAE,YAAY,CAAC;IACrB,SAAS,CAAC,EAAE,cAAc,EAAE,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;CACnC;AAED,MAAM,MAAM,6BAA6B,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,IAC1E,iBAAiB,CAAC,KAAK,CAAC,GAAG;IACzB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,CAAC;AA+DJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqB;IAC9C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAe;IACtC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAmB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAA2B;gBAEvC,OAAO,EAAE,yBAAyB;IAUxC,OAAO,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,EAC9C,OAAO,EAAE,6BAA6B,CAAC,KAAK,CAAC,GAC5C,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;IA2LnC,OAAO,CAAC,qBAAqB;IA4B7B,OAAO,CAAC,wBAAwB;IAiChC;;;;;;;;OAQG;IACH,OAAO,CAAC,aAAa;IAqErB;;;OAGG;YACW,mBAAmB;YA0EnB,oBAAoB;IAqElC,OAAO,CAAC,cAAc;YA6BR,WAAW;IAkFzB;;;;;;OAMG;IACH,OAAO,CAAC,oBAAoB;IA+B5B,OAAO,CAAC,aAAa;IA2DrB;;;;;;OAMG;IACH,OAAO,CAAC,sBAAsB;IAuE9B,OAAO,CAAC,iBAAiB;IAQzB;;;;;;;OAOG;YACW,cAAc;IAuC5B,OAAO,CAAC,KAAK;CAmBd"}
+{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../../../src/ai-service/llm/stream/orchestrator.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAGxD,OAAO,KAAK,EACV,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAQhD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAMpD,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,MAAM,EAAE,YAAY,CAAC;IACrB,SAAS,CAAC,EAAE,cAAc,EAAE,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;CACnC;AAED,MAAM,MAAM,6BAA6B,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,IAC1E,iBAAiB,CAAC,KAAK,CAAC,GAAG;IACzB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,CAAC;AA+NJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqB;IAC9C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAe;IACtC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAmB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAA2B;gBAEvC,OAAO,EAAE,yBAAyB;IAUxC,OAAO,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,EAC9C,OAAO,EAAE,6BAA6B,CAAC,KAAK,CAAC,GAC5C,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;IA2SnC,OAAO,CAAC,qBAAqB;IA4B7B,OAAO,CAAC,wBAAwB;IAiChC;;;;;;;;OAQG;IACH,OAAO,CAAC,aAAa;IAuErB;;;OAGG;YACW,mBAAmB;YA6EnB,oBAAoB;IAuElC,OAAO,CAAC,cAAc;YA6BR,WAAW;IAkFzB;;;;;;OAMG;IACH,OAAO,CAAC,oBAAoB;IAsC5B,OAAO,CAAC,aAAa;IA2DrB;;;;;;OAMG;IACH,OAAO,CAAC,sBAAsB;IAuE9B,OAAO,CAAC,iBAAiB;IAQzB;;;;;;;OAOG;YACW,cAAc;IAuC5B,OAAO,CAAC,KAAK;CAmBd"}

package/dist/ai-service/llm/stream/orchestrator.js

@@ -1,13 +1,142 @@
+import { metrics } from "@opentelemetry/api";
 import { getErrorMeta, } from "../../../util/logger.js";
 import { buildThinkingProviderOptions } from "../../util/llm-config-utils.js";
 import { LLMProviderError } from "../error.js";
 import { getServerCompactionTextBlockUpdate } from "./compaction-text-block.js";
-import { AbortedError, RetriesExhaustedError } from "./errors.js";
+import { AbortedError, RetriesExhaustedError, ToolExecutionTimeoutError, } from "./errors.js";
 import { IdleMonitor } from "./idle-monitor.js";
 import { createManagedStream } from "./managed-stream.js";
 import { RetryEngine } from "./retry-engine.js";
 import { StreamSession } from "./session.js";
 import { WaitStateTracker } from "./wait-state-tracker.js";
+const DEFAULT_TOOL_EXECUTION_TIMEOUT_MS = 60_000;
+const METER_NAME = "superblocks.clark.tool_execution";
+const TOOL_EXECUTION_TIMEOUTS_METRIC = "superblocks.clark.tool.execution.timeouts_total";
+const TOOL_EXECUTION_DURATION_METRIC = "superblocks.clark.tool.execution.duration_seconds";
+let cachedMeter;
+let cachedMetrics;
+function resolveToolExecutionMetrics() {
+    const meter = metrics.getMeter(METER_NAME);
+    if (meter === cachedMeter && cachedMetrics) {
+        return cachedMetrics;
+    }
+    cachedMeter = meter;
+    cachedMetrics = {
+        durationHistogram: meter.createHistogram(TOOL_EXECUTION_DURATION_METRIC, {
+            description: "Duration of Clark tool executions guarded by the stream orchestrator.",
+            unit: "s",
+        }),
+        timeoutCounter: meter.createCounter(TOOL_EXECUTION_TIMEOUTS_METRIC, {
+            description: "Number of Clark tool executions that reached their orchestrator timeout.",
+            unit: "{timeout}",
+        }),
+    };
+    return cachedMetrics;
+}
+function recordToolExecutionDuration(toolName, outcome, durationMs) {
+    resolveToolExecutionMetrics().durationHistogram.record(durationMs / 1000, {
+        outcome,
+        tool_name: toolName,
+    });
+}
+function recordToolExecutionTimeout(toolName) {
+    resolveToolExecutionMetrics().timeoutCounter.add(1, {
+        tool_name: toolName,
+    });
+}
+function getToolExecutionTimeoutMs(tool) {
+    // Treat non-positive, non-finite, or absent values as "use default".
+    return typeof tool.timeoutMs === "number" &&
+        Number.isFinite(tool.timeoutMs) &&
+        tool.timeoutMs > 0
+        ? tool.timeoutMs
+        : DEFAULT_TOOL_EXECUTION_TIMEOUT_MS;
+}
+async function executeToolWithTimeout(name, tool, execute, input, executeOptions, logger) {
+    const timeoutMs = getToolExecutionTimeoutMs(tool);
+    const startedAtMs = Date.now();
+    const baseAttributes = {
+        timeout_ms: timeoutMs,
+        tool_call_id: executeOptions.toolCallId,
+        tool_name: name,
+    };
+    let timeoutId;
+    const toolAbortController = new AbortController();
+    const parentAbortSignal = executeOptions.abortSignal;
+    let removeParentAbortListener;
+    if (parentAbortSignal?.aborted) {
+        toolAbortController.abort();
+    }
+    else if (parentAbortSignal) {
+        const onParentAbort = () => toolAbortController.abort();
+        parentAbortSignal.addEventListener("abort", onParentAbort, { once: true });
+        removeParentAbortListener = () => parentAbortSignal.removeEventListener("abort", onParentAbort);
+    }
+    const timeout = new Promise((_, reject) => {
+        timeoutId = setTimeout(() => {
+            toolAbortController.abort();
+            reject(new ToolExecutionTimeoutError(name, timeoutMs, input));
+        }, timeoutMs);
+    });
+    const optionsWithTimeoutSignal = {
+        ...executeOptions,
+        abortSignal: toolAbortController.signal,
+    };
+    logger.info("[orchestrator] Tool execution started", {
+        ...baseAttributes,
+        event: "clark_tool_execution_start",
+    });
+    try {
+        const result = await Promise.race([
+            execute(input, optionsWithTimeoutSignal),
+            timeout,
+        ]);
+        const durationMs = Date.now() - startedAtMs;
+        recordToolExecutionDuration(name, "success", durationMs);
+        logger.info("[orchestrator] Tool execution completed", {
+            ...baseAttributes,
+            duration_ms: durationMs,
+            event: "clark_tool_execution_complete",
+        });
+        return result;
+    }
+    catch (error) {
+        const durationMs = Date.now() - startedAtMs;
+        const outcome = error instanceof ToolExecutionTimeoutError ? "timeout" : "error";
+        recordToolExecutionDuration(name, outcome, durationMs);
+        if (error instanceof ToolExecutionTimeoutError) {
+            recordToolExecutionTimeout(name);
+        }
+        const attributes = {
+            ...baseAttributes,
+            duration_ms: durationMs,
+            error_kind: error instanceof Error ? error.name : "unknown",
+            event: error instanceof ToolExecutionTimeoutError
+                ? "clark_tool_execution_timeout"
+                : "clark_tool_execution_error",
+        };
+        if (error instanceof ToolExecutionTimeoutError) {
+            logger.warn("[orchestrator] Tool execution timed out", attributes);
+        }
+        else {
+            logger.warn("[orchestrator] Tool execution failed", attributes);
+            logger.error("[orchestrator] Tool execution failed", {
+                ...attributes,
+                error: {
+                    kind: error instanceof Error ? error.name : "unknown",
+                    message: "Tool execution failed; raw error details omitted",
+                },
+            });
+        }
+        throw error;
+    }
+    finally {
+        removeParentAbortListener?.();
+        if (timeoutId) {
+            clearTimeout(timeoutId);
+        }
+    }
+}
 /**
  * Tracks the in-flight provider attempt for a single execute() call so a
  * superseded attempt can be cut off the instant we decide to retry.
@@ -175,6 +304,91 @@ export class StreamOrchestrator {
                     firstChunkTimeoutMs: this.config.retry.budgetForModel(session.provider.model).firstChunkTimeoutMs,
                 });
             },
+            shouldPause: () => {
+                // Reads only plain in-memory state, so it should never throw. Guard it
+                // anyway and log if it does: a silent failure here would let a false
+                // stall through and rotate the provider — the exact bug this prevents —
+                // with no signal for oncall to find it. On error, return false so the
+                // stall still fires (failing safe toward surfacing a real stall).
+                try {
+                    // Only a genuine wait on the provider's next byte should count toward
+                    // a stall. If a tool is running or we're between steps, the gap is
+                    // local work — not the model going silent — so pause instead of
+                    // firing a false stall that would pointlessly rotate providers. See
+                    // APPS-4605.
+                    const waitState = waitStateTracker.getWaitState();
+                    if (waitState.state === "tool" ||
+                        waitState.state === "step-boundary") {
+                        return true;
+                    }
+                    // isAwaitingUpstream() is true only while the managed stream is
+                    // blocked waiting for the provider's next chunk. False means the
+                    // consumer took a chunk and hasn't asked for the next one yet (e.g.
+                    // it's busy on its own downstream call), so the silence is on the
+                    // consumer's side, not the provider's. Require at least one chunk to
+                    // have arrived first: before that the gap is real provider silence
+                    // (and the flag may not be set yet because the read happens lazily),
+                    // so it must never be mistaken for the consumer holding the stream.
+                    //
+                    // Trade-off: if the provider connection drops while the consumer is
+                    // holding a chunk, the dead connection is invisible until the
+                    // consumer pulls again, since we suppress the stall for the whole
+                    // consumer-hold window. That is acceptable because a slow consumer is
+                    // the intended case and the consumer (the dev server request) carries
+                    // its own request timeout that aborts the stream if it never resumes.
+                    return (!session.isAwaitingUpstream() && session.metrics.chunkCount > 0);
+                }
+                catch (err) {
+                    this.logger.error("[orchestrator] shouldPause check failed", {
+                        error: {
+                            kind: err instanceof Error ? err.name : "unknown",
+                            message: err instanceof Error ? err.message : String(err),
+                            stack: err instanceof Error ? err.stack : undefined,
+                        },
+                    });
+                    return false;
+                }
+            },
+            onPause: () => {
+                // One structured event at the start of each local-wait stretch (a tool
+                // running, a step gap, or the consumer holding the stream past the idle
+                // budget). No stream_stall fires for these, so without this a hung tool
+                // would be invisible to the stream layer until the request aborts. The
+                // idle monitor fires this once per stretch, so a healthy slow tool logs
+                // once, not once per re-arm. See APPS-4605.
+                const waitState = waitStateTracker.getWaitState();
+                const message = `[orchestrator] Local wait suppressed idle stall`;
+                const attributes = {
+                    event: "stream_local_wait",
+                    session_id: session.id,
+                    provider: session.provider.name,
+                    model: session.provider.model,
+                    attempt: session.attempt,
+                    elapsed_ms: session.getElapsedMs(),
+                    chunks_received: session.metrics.chunkCount,
+                    // "tool"/"step-boundary" come from the wait tracker; "consumer" is the
+                    // remaining case (consumer holding the stream), which the tracker
+                    // reports as "provider" since it does not track consumer-pull state.
+                    wait_state: waitState.state === "provider" ? "consumer" : waitState.state,
+                };
+                if (waitState.state === "tool") {
+                    attributes.tool_name = waitState.toolName;
+                    attributes.tool_call_id = waitState.toolCallId;
+                    attributes.pending_tool_count = waitState.pendingToolCount;
+                }
+                if (session.organizationId) {
+                    attributes.organization_id = session.organizationId;
+                }
+                if (session.applicationId) {
+                    attributes.application_id = session.applicationId;
+                }
+                if (this.logger.warnStructured) {
+                    this.logger.warnStructured(message, attributes);
+                }
+                else {
+                    this.logger.warn(message, attributes);
+                }
+            },
             onStall: (error) => {
                 // budgetKind is the keepalive-vs-content discriminator: "first-chunk"
                 // means the model never sent content (only silence/keep-alives) before
@@ -182,6 +396,27 @@ export class StreamOrchestrator {
                 // It is carried on the error (set when the timer armed) because budgets
                 // are now per-model and can't be re-derived by numeric comparison.
                 const budgetKind = error.budgetKind;
+                const msSinceLastPull = session.getTimeSinceLastPull();
+                // Discriminate network-dark vs consumer-blocked (APPS-4729). The
+                // managed stream flips isAwaitingUpstream() around its
+                // `await iterator.next()`: true means the stall fired while we were
+                // blocked reading upstream (the wire went dark); false means the
+                // consumer is holding the stream without pulling (e.g. blocked on a
+                // downstream RPC). A boolean rather than an ms_since_last_pull
+                // comparison, which is unreliable near the idle-budget boundary. The
+                // flag read here is consistent because IdleMonitor runs this onStall
+                // callback synchronously, before the rejected waitForStall() propagates
+                // into the managed stream's catch and clears the flag (see idle-monitor).
+                //
+                // A first-chunk stall is upstream silence by definition: no chunk was
+                // delivered, so the consumer cannot be holding the stream. Force
+                // "network-dark" rather than trusting the flag — pull() is lazy, so a
+                // first-chunk timer can fire before the loop's first await ever set it.
+                // budget_kind still separates a first-chunk network-dark from an
+                // inter-chunk one.
+                const stallReason = budgetKind === "first-chunk" || session.isAwaitingUpstream()
+                    ? "network-dark"
+                    : "consumer-blocked";
                 const message = `[orchestrator] Idle timeout exceeded, triggering retry`;
                 // Emit as structured attributes (OTel log attributes -> Datadog facets)
                 // so stalls are queryable by provider/model/attempt and chartable,
@@ -190,7 +425,6 @@ export class StreamOrchestrator {
                 // awaiting-user.ts). budget_ms + budget_kind already capture which idle
                 // budget applied and its value, so the static config constants are not
                 // re-emitted per stall. See APPS-4643.
-                const msSinceLastPull = session.getTimeSinceLastPull();
                 // wait_state says what the stall was stuck on: "provider" = the model
                 // went silent, "tool" = a local tool was still running (a slow tool,
                 // not the model), "step-boundary" = it was between steps.
@@ -210,6 +444,7 @@ export class StreamOrchestrator {
                     budget_ms: error.maxIdleTimeMs,
                     elapsed_ms: session.getElapsedMs(),
                     chunks_received: session.metrics.chunkCount,
+                    stall_reason: stallReason,
                     wait_state: waitState.state,
                     raw_reset_count: waitStateTracker.getRawResetCount(),
                 };
@@ -218,9 +453,9 @@ export class StreamOrchestrator {
                     attributes.tool_call_id = waitState.toolCallId;
                     attributes.pending_tool_count = waitState.pendingToolCount;
                 }
-                // Stale pull => the consumer stopped reading (e.g. blocked on an
-                // awaited RPC); recent pull + no chunks => the wire went dark. Absence
-                // means the consumer never made a productive pull.
+                // Supporting numeric signal: how long since the consumer last pulled.
+                // stall_reason is the primary discriminator; this aids triage. Absent
+                // when the consumer never made a productive pull.
                 if (msSinceLastPull !== undefined) {
                     attributes.ms_since_last_pull = msSinceLastPull;
                 }
@@ -240,13 +475,13 @@ export class StreamOrchestrator {
                 }
             },
         });
-        const result = await this.startStreamWithRetry(optionsWithAbort, session, retryEngine, attempts);
+        const result = await this.startStreamWithRetry(optionsWithAbort, session, retryEngine, attempts, waitStateTracker);
         // Start monitoring now that the stream is active
         idleMonitor.start();
         // wrapper order matters here. managed stream throws errors (error chunks), retry wrapper catches them.
         // Pass the idle monitor so it can interrupt hung streams.
         const managedStream = createManagedStream(result.fullStream, session, idleMonitor);
-        const retryableFullStream = this.wrapWithRetry(managedStream, (r) => createManagedStream(r.fullStream, session, idleMonitor), optionsWithAbort, session, retryEngine, internalAbortController, attempts);
+        const retryableFullStream = this.wrapWithRetry(managedStream, (r) => createManagedStream(r.fullStream, session, idleMonitor), optionsWithAbort, session, retryEngine, internalAbortController, attempts, waitStateTracker);
         // `tee()` preserves the public contract that fullStream and textStream can
         // be consumed independently; the slower branch may buffer response chunks.
         const [fullStream, textSourceStream] = retryableFullStream.tee();
@@ -310,7 +545,7 @@ export class StreamOrchestrator {
      * retries will silently fail (the new stream will close immediately because
      * session.isPending() returns false).
      */
-    wrapWithRetry(initialStream, getNewStream, options, session, retryEngine, abortController, attempts) {
+    wrapWithRetry(initialStream, getNewStream, options, session, retryEngine, abortController, attempts, waitStateTracker) {
         const handleRetry = this.handleRetryDecision.bind(this);
         let currentStream = initialStream;
         async function* createRetryIterator() {
@@ -326,7 +561,7 @@ export class StreamOrchestrator {
                     return;
                 }
                 catch (error) {
-                    const retryResult = await handleRetry(error, options, session, retryEngine, attempts);
+                    const retryResult = await handleRetry(error, options, session, retryEngine, attempts, waitStateTracker);
                     if (!retryResult.shouldRetry) {
                         // abort the internal signal so any in-flight stream processing stops.
                         // without this, tools keep getting called in the background since the stream is not closed.
@@ -363,8 +598,8 @@ export class StreamOrchestrator {
      * Handle an error by making a retry decision. Returns either a new result to continue
      * with, or the final error to throw.
      */
-    async handleRetryDecision(error, options, session, retryEngine, attempts) {
-        const decision = retryEngine.getRetryDecision(error, session, options.abortSignal);
+    async handleRetryDecision(error, options, session, retryEngine, attempts, waitStateTracker) {
+        const decision = retryEngine.getRetryDecision(error, session, options.abortSignal, waitStateTracker.getWaitState());
         if (!decision.shouldRetry) {
             this.logger.warn(`[orchestrator] Not retrying: reason=${decision.reason}`, getErrorMeta(error));
             session.finalize("error", error);
@@ -381,18 +616,18 @@ export class StreamOrchestrator {
             await this.switchProvider(session, decision.newProvider, decision.fastFallback === true, error);
         }
         session.recordRetry(decision.delayMs);
-        this.logger.warn(`[orchestrator] Retrying in ${decision.delayMs}ms (attempt ${session.attempt})`, getErrorMeta(error));
+        this.logger.warn(`[orchestrator] Retrying in ${decision.delayMs}ms (attempt ${session.attempt}) reason=${decision.reason ?? "retry"}`, getErrorMeta(error));
         await this.delay(decision.delayMs, options.abortSignal);
-        const newResult = await this.startStreamWithRetry(options, session, retryEngine, attempts);
+        const newResult = await this.startStreamWithRetry(options, session, retryEngine, attempts, waitStateTracker);
         return { shouldRetry: true, newResult };
     }
-    async startStreamWithRetry(options, session, retryEngine, attempts) {
+    async startStreamWithRetry(options, session, retryEngine, attempts, waitStateTracker) {
         while (true) {
             try {
                 return await this.startStream(options, session, attempts);
             }
             catch (error) {
-                const decision = retryEngine.getRetryDecision(error, session, options.abortSignal);
+                const decision = retryEngine.getRetryDecision(error, session, options.abortSignal, waitStateTracker.getWaitState());
                 if (!decision.shouldRetry) {
                     this.logger.error(`[orchestrator] Startup error, not retrying: reason=${decision.reason}`, {
                         error: {
@@ -411,7 +646,7 @@ export class StreamOrchestrator {
                     await this.switchProvider(session, decision.newProvider, decision.fastFallback === true, error);
                 }
                 session.recordRetry(decision.delayMs);
-                this.logger.info(`[orchestrator] Startup retry in ${decision.delayMs}ms (attempt ${session.attempt})`);
+                this.logger.info(`[orchestrator] Startup retry in ${decision.delayMs}ms (attempt ${session.attempt}) reason=${decision.reason ?? "retry"}`);
                 await this.delay(decision.delayMs, options.abortSignal);
             }
         }
@@ -509,7 +744,7 @@ export class StreamOrchestrator {
                     if (!isCurrent()) {
                         throw new AbortedError();
                     }
-                    return execute(input, executeOptions);
+                    return executeToolWithTimeout(name, tool, execute, input, executeOptions, this.logger);
                 },
             };
         }