@cydm/pie 2.7.11 → 2.7.13

package/dist/chunks/{chunk-3NFKVBGY.js → chunk-D7RMNFVM.js}

@@ -7,10 +7,12 @@ import {
   defaultShellKindForPlatform,
   interpretShellExit,
   requestInteraction
-} from "./chunk-XIRBNP2S.js";
+} from "./chunk-CIFC6QVB.js";
 import {
+  EMPTY_ASSISTANT_CONTENT_ERROR,
+  OPENAI_COMPAT_PROTOCOL_ERROR_CODE,
   getLogger
-} from "./chunk-3VEIP2VY.js";
+} from "./chunk-R46YPPTU.js";
 import {
   Type
 } from "./chunk-XXGYUYXI.js";
@@ -128,6 +130,153 @@ function migrateConfigFromAgentDir() {
   }
 }
 
+// src/runtime/retry-policy.ts
+var TRANSIENT_NETWORK_ERROR_PATTERN = /sse stream aborted|sse stream closed before end|sse stream ended before response completed|responses stream ended without a terminal event|(?:read\s+)?ECONNRESET|ETIMEDOUT|EAI_AGAIN|ENOTFOUND|ECONNREFUSED|(?:read\s+|write\s+)?EPIPE|socket hang up|request timeout|websocket upgrade refused|websocket handshake|websocket connection failed|websocket transport failed|connection closed before opening|client network socket disconnected before secure TLS connection was established|connection.?error|connection.?refused|other side closed|fetch failed|upstream.?connect|reset before headers|terminated/i;
+var TLS_VALIDATION_ERROR_PATTERN = /certificate (?:has )?expired|certificate is not yet valid|unable to verify (?:the first certificate|certificate)|unable to get (?:local )?issuer certificate|self[-_ ]signed cert(?:ificate)?|CERT_HAS_EXPIRED|SELF_SIGNED_CERT|does not match certificate's altnames|ERR_TLS_CERT_ALTNAME_INVALID/i;
+var PROVIDER_TRANSIENT_ERROR_PATTERN = /overloaded|rate.?limit|too many requests|\b429\b|\b500\b|\b502\b|\b503\b|\b504\b|service.?unavailable|server error|internal error|retry delay|quota (?:has been |is )?exhausted/i;
+var USER_ABORT_PATTERN = /request was aborted|local abort signal|user abort|user_interrupt|interrupted by user|esc pressed|ctrl\+c/i;
+var AUTH_CONFIG_PATTERN = /missing api key|invalid api key|api key.*invalid|unauthorized|\b401\b|\b403\b|forbidden|authentication failed|no configured model|no models? are configured/i;
+var QUOTA_EXHAUSTED_PATTERN = /insufficient[_ ]quota|exceeded[_ ]current[_ ]quota|exceeded your current quota|billing[_ ]hard[_ ]limit|insufficient[_ ]balance|credit balance is too low|\barrearage\b|余额不足|\b(?:account|monthly|billing) quota (?:has been |is )?exhausted/i;
+var INVALID_FILE_REFERENCE_PATTERN = /not the owner of this file|owner of this file|invalid_authentication_error/i;
+var INVALID_REQUEST_PATTERN = /bad request|\b400\b|invalid request|invalid schema|schema validation|invalid parameter|unsupported parameter|malformed/i;
+var CLI_RETRY_MAX_RETRIES = 3;
+var CLI_RETRY_BASE_DELAY_MS = 2e3;
+var CLI_TRANSIENT_NETWORK_MAX_RETRIES = 10;
+var CLI_RETRY_TOTAL_MAX_RETRIES = 12;
+var CLI_RETRY_MAX_DELAY_MS = 6e4;
+function isCliContextOverflowError(errorMessage) {
+  return /context length exceeded|context_length_exceeded|maximum context length|maximum context size|too many tokens|input.*too long|prompt.*too long|context window|token limit exceeded|exceeds.{0,20}context/i.test(
+    errorMessage
+  );
+}
+function createClassification(kind, message, overrides) {
+  return {
+    kind,
+    message,
+    retryable: false,
+    compactable: false,
+    userAbort: false,
+    terminal: true,
+    ...overrides
+  };
+}
+function classifyCliFailure(context) {
+  const errorMessage = typeof context === "string" ? context : context.errorMessage;
+  const structuredReplayClass = typeof context === "string" ? void 0 : context.message?.role === "assistant" ? context.message.replayClass : void 0;
+  if (isCliContextOverflowError(errorMessage)) {
+    return createClassification("context_overflow", errorMessage, {
+      compactable: true,
+      terminal: false
+    });
+  }
+  if (USER_ABORT_PATTERN.test(errorMessage)) {
+    return createClassification("user_abort", errorMessage, {
+      userAbort: true,
+      terminal: false
+    });
+  }
+  if (INVALID_FILE_REFERENCE_PATTERN.test(errorMessage)) {
+    return createClassification("invalid_file_reference", errorMessage);
+  }
+  if (AUTH_CONFIG_PATTERN.test(errorMessage) || QUOTA_EXHAUSTED_PATTERN.test(errorMessage)) {
+    return createClassification("auth_config", errorMessage);
+  }
+  if (TLS_VALIDATION_ERROR_PATTERN.test(errorMessage)) {
+    return createClassification("tls_config", errorMessage, {
+      retryable: true,
+      terminal: false
+    });
+  }
+  if (structuredReplayClass === "stream_lost" || structuredReplayClass === "stream_lost_partial" || TRANSIENT_NETWORK_ERROR_PATTERN.test(errorMessage)) {
+    return createClassification("transient_network", errorMessage, {
+      retryable: true,
+      terminal: false
+    });
+  }
+  if (errorMessage.includes(EMPTY_ASSISTANT_CONTENT_ERROR)) {
+    return createClassification("provider_transient", errorMessage, {
+      retryable: true,
+      terminal: false
+    });
+  }
+  if (errorMessage.includes(OPENAI_COMPAT_PROTOCOL_ERROR_CODE)) {
+    return createClassification("provider_transient", errorMessage, {
+      retryable: true,
+      terminal: false
+    });
+  }
+  if (PROVIDER_TRANSIENT_ERROR_PATTERN.test(errorMessage)) {
+    return createClassification("provider_transient", errorMessage, {
+      retryable: true,
+      terminal: false
+    });
+  }
+  if (INVALID_REQUEST_PATTERN.test(errorMessage)) {
+    return createClassification("invalid_request", errorMessage);
+  }
+  return createClassification("unknown", errorMessage);
+}
+function isCliRetryableError(errorMessage) {
+  return classifyCliFailure(errorMessage).retryable;
+}
+function getCliRetryBaseDelayMs() {
+  const override = process.env.PIE_TEST_CLI_RETRY_BASE_DELAY_MS;
+  if (!override) {
+    return CLI_RETRY_BASE_DELAY_MS;
+  }
+  const parsed = Number(override);
+  return Number.isFinite(parsed) && parsed >= 0 ? parsed : CLI_RETRY_BASE_DELAY_MS;
+}
+function getCliTransientNetworkMaxRetries() {
+  const override = process.env.PIE_RETRY_TRANSIENT_NETWORK_MAX_RETRIES;
+  if (!override) {
+    return CLI_TRANSIENT_NETWORK_MAX_RETRIES;
+  }
+  const parsed = Number(override);
+  return Number.isFinite(parsed) && parsed >= 0 ? Math.floor(parsed) : CLI_TRANSIENT_NETWORK_MAX_RETRIES;
+}
+function getCliRetryMaxDelayMs() {
+  const override = process.env.PIE_RETRY_MAX_DELAY_MS;
+  if (!override) {
+    return CLI_RETRY_MAX_DELAY_MS;
+  }
+  const parsed = Number(override);
+  return Number.isFinite(parsed) && parsed >= 0 ? parsed : CLI_RETRY_MAX_DELAY_MS;
+}
+function getCliRetryTotalMaxRetries() {
+  const override = process.env.PIE_RETRY_TOTAL_MAX_RETRIES;
+  if (!override) {
+    return CLI_RETRY_TOTAL_MAX_RETRIES;
+  }
+  const parsed = Number(override);
+  return Number.isFinite(parsed) && parsed >= 0 ? Math.floor(parsed) : CLI_RETRY_TOTAL_MAX_RETRIES;
+}
+function createCliRetryPolicy(isRetryableErrorOverride) {
+  return {
+    isRetryableError: isRetryableErrorOverride ?? isCliRetryableError,
+    maxRetries: CLI_RETRY_MAX_RETRIES,
+    baseDelayMs: getCliRetryBaseDelayMs(),
+    maxDelayMs: getCliRetryMaxDelayMs(),
+    maxRetriesForFailure: (failure) => failure.kind === "transient_network" ? getCliTransientNetworkMaxRetries() : failure.replayExempt === true ? getCliTimeoutReplayMaxRetries() : CLI_RETRY_MAX_RETRIES,
+    maxTotalRetries: getCliRetryTotalMaxRetries(),
+    systemicReplayStallLimit: getCliSystemicReplayStallLimit()
+  };
+}
+var CLI_TIMEOUT_REPLAY_MAX_RETRIES = 5;
+function getCliTimeoutReplayMaxRetries() {
+  const override = process.env.PIE_TIMEOUT_REPLAY_MAX_RETRIES;
+  if (!override) return CLI_TIMEOUT_REPLAY_MAX_RETRIES;
+  const parsed = Number(override);
+  return Number.isFinite(parsed) && parsed >= 0 ? Math.floor(parsed) : CLI_TIMEOUT_REPLAY_MAX_RETRIES;
+}
+var CLI_SYSTEMIC_REPLAY_STALL_LIMIT = 3;
+function getCliSystemicReplayStallLimit() {
+  const override = process.env.PIE_SYSTEMIC_REPLAY_STALL_LIMIT;
+  if (!override) return CLI_SYSTEMIC_REPLAY_STALL_LIMIT;
+  const parsed = Number(override);
+  return Number.isFinite(parsed) && parsed >= 1 ? Math.floor(parsed) : CLI_SYSTEMIC_REPLAY_STALL_LIMIT;
+}
+
 // src/runtime/transport-diagnostics.ts
 function numberOrDash(value) {
   return typeof value === "number" ? String(value) : "-";
@@ -1621,6 +1770,11 @@ export {
   setYoloGrantListener,
   cleanupBashOutputArtifacts,
   createBashTool,
+  CLI_RETRY_MAX_RETRIES,
+  isCliContextOverflowError,
+  classifyCliFailure,
+  isCliRetryableError,
+  createCliRetryPolicy,
   formatTransportLifecycle,
   createTransportDiagnosticsStreamFn,
   logTransportLifecycle,

package/dist/chunks/{chunk-XVF6V6Q5.js → chunk-HGUYS5SF.js}

@@ -4,7 +4,27 @@ import {
   disposeModelTransports,
   streamSimple,
   validateToolArguments
-} from "./chunk-3VEIP2VY.js";
+} from "./chunk-R46YPPTU.js";
+
+// ../../packages/agent-core/src/failure.ts
+function getAgentFailureMetadata(error) {
+  if (!error || typeof error !== "object") return {};
+  const source = error;
+  return {
+    ...source.retryable === false ? { retryable: false } : {},
+    ...source.remoteFailure ? { remoteFailure: source.remoteFailure } : {},
+    ...source.replayEligible === true ? { replayEligible: true } : {},
+    ...typeof source.replayClass === "string" ? { replayClass: source.replayClass } : {},
+    ...source.operationFailure ? { operationFailure: source.operationFailure } : {}
+  };
+}
+function createAgentOperationError(error, failure) {
+  return Object.assign(
+    new Error(error instanceof Error ? error.message : String(error), { cause: error }),
+    getAgentFailureMetadata(error),
+    { operationFailure: failure }
+  );
+}
 
 // ../../packages/agent-core/src/agent-loop.ts
 function createLoopErrorMessage(error, config, signal) {
@@ -25,6 +45,7 @@ function createLoopErrorMessage(error, config, signal) {
     },
     stopReason: signal?.aborted ? "aborted" : "error",
     errorMessage: message,
+    ...getAgentFailureMetadata(error),
     timestamp: Date.now()
   };
 }
@@ -182,6 +203,11 @@ async function runLoop(currentContext, newMessages, config, signal, stream, stre
         }
       }
       stream.push({ type: "turn_end", message, toolResults });
+      if (hasMoreToolCalls && config.beforeToolContinuation) {
+        const replacement = await config.beforeToolContinuation(signal);
+        if (signal?.aborted) throw new Error("Request was aborted");
+        if (replacement) currentContext.messages = replacement.slice();
+      }
       if (steeringAfterTools && steeringAfterTools.length > 0) {
         pendingMessages = steeringAfterTools;
         steeringAfterTools = null;
@@ -444,7 +470,22 @@ function isUserContentBlock(value) {
     return false;
   }
   const type = value.type;
-  return type === "text" || type === "image" || type === "audio" || type === "video" || type === "fileRef";
+  return type === "text" || type === "image" || type === "audio" || type === "video" || type === "fileRef" || type === "hostContext";
+}
+async function awaitToolContinuation(handler, signal) {
+  let onAbort;
+  const cancelled = new Promise((_resolve, reject) => {
+    onAbort = () => reject(new Error("Request was aborted"));
+    signal.addEventListener("abort", onAbort, { once: true });
+  });
+  try {
+    await Promise.race([Promise.resolve().then(() => {
+      if (signal.aborted) throw new Error("Request was aborted");
+      return handler(signal);
+    }), cancelled]);
+  } finally {
+    signal.removeEventListener("abort", onAbort);
+  }
 }
 var Agent = class {
   _state;
@@ -467,6 +508,7 @@ var Agent = class {
   _thinkingBudgets;
   _maxRetryDelayMs;
   hooks;
+  beforeToolContinuation;
   /** Stable identity for this agent instance, bound onto every run signal
    *  handed to tools (signals themselves are per-run; see tool-caller-identity.ts). */
   toolCallerIdentity = createToolCallerIdentity();
@@ -559,6 +601,15 @@ var Agent = class {
   setHooks(hooks) {
     this.hooks = hooks;
   }
+  /** Single session-policy owner. Runs after the complete tool turn has been
+   * published to observers; replaceMessages here also updates the active loop.
+   * Removal does not detach a callback already captured by an active run. */
+  setBeforeToolContinuation(handler) {
+    this.beforeToolContinuation = handler;
+    return () => {
+      if (this.beforeToolContinuation === handler) this.beforeToolContinuation = void 0;
+    };
+  }
   replaceMessages(ms) {
     this.releaseTransport();
     this._state.messages = ms.slice();
@@ -648,6 +699,7 @@ var Agent = class {
     this._state.error = void 0;
     this.steeringQueue = [];
     this.followUpQueue = [];
+    this.resolveRunningPrompt?.();
     this.runningPrompt = void 0;
     this.resolveRunningPrompt = void 0;
     this.updateStatusSnapshot({
@@ -670,6 +722,7 @@ var Agent = class {
     this._state.error = void 0;
     this.steeringQueue = [];
     this.followUpQueue = [];
+    this.resolveRunningPrompt?.();
     this.runningPrompt = void 0;
     this.resolveRunningPrompt = void 0;
     this.abortController = void 0;
@@ -784,6 +837,8 @@ var Agent = class {
       tools: this._state.tools
     };
     let skipInitialSteeringPoll = options?.skipInitialSteeringPoll === true;
+    const beforeToolContinuation = this.beforeToolContinuation;
+    let acknowledgeToolTurn;
     const config = {
       model,
       reasoning,
@@ -794,6 +849,16 @@ var Agent = class {
       maxRetryDelayMs: this._maxRetryDelayMs,
       convertToLlm: this.convertToLlm,
       transformContext: this.transformContext,
+      beforeToolContinuation: beforeToolContinuation ? async () => {
+        await new Promise((resolve) => {
+          acknowledgeToolTurn = resolve;
+        });
+        acknowledgeToolTurn = void 0;
+        if (!ownsRun() || runController.signal.aborted) throw new Error("Request was aborted");
+        await awaitToolContinuation(beforeToolContinuation, runController.signal);
+        if (!ownsRun() || runController.signal.aborted) throw new Error("Request was aborted");
+        return this._state.messages.slice();
+      } : void 0,
       getApiKey: this.getApiKey,
       hooks: this.hooks,
       getSteeringMessages: async () => {
@@ -855,6 +920,7 @@ var Agent = class {
             break;
         }
         this.emit(event, ownsRun);
+        if (event.type === "turn_end") acknowledgeToolTurn?.();
       }
       if (ownsRun() && partial && partial.role === "assistant" && partial.content?.length > 0) {
         const onlyEmpty = !partial.content.some(
@@ -889,6 +955,7 @@ var Agent = class {
       this._state.error = err?.message || String(err);
       this.emit({ type: "agent_end", messages: [errorMsg] }, ownsRun);
     } finally {
+      acknowledgeToolTurn?.();
       if (ownsRun()) {
         this._state.isStreaming = false;
         this._state.streamMessage = null;
@@ -1086,6 +1153,8 @@ var Agent = class {
 };
 
 export {
+  getAgentFailureMetadata,
+  createAgentOperationError,
   agentLoop,
   agentLoopContinue,
   createToolCallerIdentity,

package/dist/chunks/{chunk-3VEIP2VY.js → chunk-R46YPPTU.js}

@@ -1519,6 +1519,9 @@ function getSystemIO() {
   }
   return CS.System.IO;
 }
+function looksLikeBase64(value) {
+  return value.length > 0 && value.length % 4 === 0 && /^[A-Za-z0-9+/]+={0,2}$/.test(value);
+}
 function getPieFileBridge() {
   if (typeof CS === "undefined" || !CS?.Pie?.PieFileBridge) {
     throw new Error("CS.Pie.PieFileBridge not available - runtime file bridge is missing");
@@ -1667,11 +1670,15 @@ var PuerTSFileSystem = class {
     }
     if (encoding === "base64") {
       if (typeof bridge.ReadAllBytesBase64Async === "function") {
-        const content3 = await taskToPromise(bridge.ReadAllBytesBase64Async(normalizedPath));
-        return String(content3 ?? "");
+        const content2 = await taskToPromise(bridge.ReadAllBytesBase64Async(normalizedPath));
+        if (typeof content2 === "string" && looksLikeBase64(content2)) {
+          return content2;
+        }
+        console.warn(
+          `[pie] async base64 file bridge returned an empty/invalid result for '${path}'; falling back to a synchronous read.`
+        );
       }
-      const content2 = CS.System.Convert.ToBase64String(IO.File.ReadAllBytes(normalizedPath));
-      return String(content2 ?? "");
+      return this.readBinaryAsBase64Sync(normalizedPath);
     }
     const content = await taskToPromise(bridge.ReadAllTextAsync(normalizedPath));
     return String(content ?? "");
@@ -1683,10 +1690,18 @@ var PuerTSFileSystem = class {
       throw new Error(`ENOENT: no such file or directory, open '${path}'`);
     }
     if (encoding === "base64") {
-      return String(CS.System.Convert.ToBase64String(IO.File.ReadAllBytes(normalizedPath)) ?? "");
+      return this.readBinaryAsBase64Sync(normalizedPath);
     }
     return IO.File.ReadAllText(normalizedPath);
   }
+  readBinaryAsBase64Sync(normalizedPath) {
+    const bridge = typeof CS !== "undefined" && CS?.Pie?.PieFileBridge ? CS.Pie.PieFileBridge : null;
+    if (bridge && typeof bridge.ReadAllBytesBase64 === "function") {
+      return String(bridge.ReadAllBytesBase64(normalizedPath) ?? "");
+    }
+    const IO = getSystemIO();
+    return String(CS.System.Convert.ToBase64String(IO.File.ReadAllBytes(normalizedPath)) ?? "");
+  }
   async readFilePrefix(path, maxBytes) {
     const IO = getSystemIO();
     const bridge = getPieFileBridge();
@@ -3113,19 +3128,10 @@ var FileSystemGateway = class {
         return;
       }
       if (CS.System.IO.File.Exists(destination)) {
-        const staged = `${destination}.pie-replace-${Date.now()}.tmp`;
-        CS.System.IO.File.Copy(source, staged, false);
-        CS.System.IO.File.Delete(destination);
-        try {
-          CS.System.IO.File.Move(staged, destination);
-        } catch (error) {
-          try {
-            CS.System.IO.File.Move(staged, destination);
-          } catch {
-          }
-          throw error;
+        if (typeof CS.System.IO.File.Replace !== "function") {
+          throw new Error("File.Replace is unavailable; refusing unsafe file replacement");
         }
-        CS.System.IO.File.Delete(source);
+        CS.System.IO.File.Replace(source, destination, null);
         return;
       }
       CS.System.IO.File.Move(source, destination);
@@ -3402,33 +3408,33 @@ function isPuertsReparsePoint(path) {
 }
 function containsPuertsReparsePoint(directory) {
   const slashed = directory.replace(/\\/g, "/");
-  const trimmed = slashed.replace(/\/+$/, "");
-  if (!trimmed || trimmed === "/") return false;
-  const unc = /^\/\/([^/]+)\/([^/]+)/.exec(trimmed);
+  if (!slashed) return false;
+  const unc = /^\/\/([^/]+)\/([^/]+)/.exec(slashed);
   let prefix;
   let rest;
   if (unc) {
     prefix = unc[0];
-    rest = trimmed.slice(prefix.length);
+    rest = slashed.slice(prefix.length);
   } else {
-    const driveRoot = /^([a-zA-Z]:)\//.exec(trimmed);
+    const driveRoot = /^([a-zA-Z]:)\//.exec(slashed);
     if (driveRoot) {
       prefix = `${driveRoot[1]}/`;
-      rest = trimmed.slice(prefix.length);
+      rest = slashed.slice(prefix.length);
     } else {
-      const bareDrive = /^[a-zA-Z]:$/.test(trimmed);
+      const bareDrive = /^[a-zA-Z]:$/.test(slashed);
       if (bareDrive) {
-        return isPuertsReparsePoint(trimmed);
+        return isPuertsReparsePoint(slashed);
       }
-      if (trimmed.startsWith("/")) {
+      if (slashed.startsWith("/")) {
         prefix = "/";
-        rest = trimmed.slice(1);
+        rest = slashed.slice(1);
       } else {
         prefix = "";
-        rest = trimmed;
+        rest = slashed;
       }
     }
   }
+  if (prefix && isPuertsReparsePoint(prefix)) return true;
   let current = prefix;
   for (const part of rest.split("/").filter((segment) => segment.length > 0 && segment !== ".")) {
     current = current ? current.endsWith("/") ? `${current}${part}` : `${current}/${part}` : part;
@@ -6123,6 +6129,13 @@ function nextLocalRequestId(prefix = "req") {
   localRequestCounter += 1;
   return `${prefix}-${localRequestCounter}-${Math.random().toString(36).slice(2, 8)}`;
 }
+function timeoutSuffix(budgetMs, lagMs) {
+  const budget = budgetMs && budgetMs > 0 ? ` (budget ${Math.round(budgetMs / 1e3)}s)` : "";
+  if (lagMs > 1e3) {
+    return `${budget} \u2014 timer fired ${Math.round(lagMs / 1e3)}s late (system sleep or suspended process)`;
+  }
+  return budget;
+}
 function monotonicNow() {
   const perf = globalThis.performance;
   return typeof perf?.now === "function" ? perf.now() : Date.now();
@@ -6410,7 +6423,9 @@ function streamResponsesSSE(model, context, options) {
         internalTimeout = adapterTimeoutKind === "first_byte" ? "first_response" : "stream_idle";
       }
       const protocolFailure = !endedWithoutTerminal && (error instanceof ResponsesProtocolError || error instanceof SyntaxError || !transportLost && error instanceof TypeError);
-      message.errorMessage = providerErrorMessage ?? (internalTimeout && !protocolFailure ? `Responses request timeout (${internalTimeout}) after ${Math.round(monotonicNow() - startedAt)}ms` : error instanceof Error ? error.message : JSON.stringify(error));
+      const adapterBudgetMs = internalTimeout === "first_response" ? budgets?.firstResponseTimeoutMs : internalTimeout === "stream_idle" ? budgets?.streamIdleTimeoutMs : void 0;
+      const adapterAgeMs = Math.round(monotonicNow() - startedAt);
+      message.errorMessage = providerErrorMessage ?? (internalTimeout && !protocolFailure ? `Responses request timeout (${internalTimeout}) after ${adapterAgeMs}ms${timeoutSuffix(adapterBudgetMs, 0)}` : error instanceof Error ? error.message : JSON.stringify(error));
       const compat = getResponsesCompat(model);
       const streamLost = (endedWithoutTerminal || transportLost) && !protocolFailure && !internalTimeout && submitted && !localFailure && !providerRejected && message.stopReason === "error";
       if (internalTimeout && !message.remoteFailure && !protocolFailure && submitted && !providerRejected && !localFailure && !userAborted && compat.timeoutReplay) {
@@ -6668,6 +6683,8 @@ function streamResponsesWS(model, context, options) {
     let terminalEvents = [];
     let fallback = false;
     let timedOut;
+    let timedOutBudgetMs;
+    let timedOutLagMs;
     let providerRejected = false;
     let localFailure = true;
     let transportLost = false;
@@ -6782,17 +6799,25 @@ function streamResponsesWS(model, context, options) {
         if (timer !== void 0) clearTimeout(timer);
       }
     };
+    let phaseTimerInfo;
     const armPhaseTimer = (kind, timeoutMs) => {
       if (requestTimer !== void 0) {
         clearTimeout(requestTimer);
         requestTimer = void 0;
       }
-      if (timeoutMs === void 0 || timeoutMs <= 0 || finished) return;
+      if (timeoutMs === void 0 || timeoutMs <= 0 || finished) {
+        phaseTimerInfo = void 0;
+        return;
+      }
       const generation = requestGeneration;
+      phaseTimerInfo = { kind, budgetMs: timeoutMs, armedAt: monotonicNow() };
       requestTimer = setTimeout(() => {
         requestTimer = void 0;
         if (generation !== requestGeneration || finished || requestAbort.signal.aborted) return;
+        const info = phaseTimerInfo;
         timedOut = kind;
+        timedOutBudgetMs = info?.budgetMs;
+        timedOutLagMs = info ? Math.max(0, monotonicNow() - info.armedAt - info.budgetMs) : 0;
         retryDecision = sent ? "not_retryable_after_submission" : "not_submitted";
         lifecycle("timeout", {
           timeoutKind: kind,
@@ -6983,7 +7008,7 @@ function streamResponsesWS(model, context, options) {
             armPhaseTimer("stream_idle", budgets.streamIdleTimeoutMs);
             if (receivedMessageCount === 1) lifecycle("first_application_message");
             if (state.abort.signal.aborted || requestAbort.signal.aborted) {
-              throw new Error(timedOut ? `Responses request timeout (${timedOut})` : "Request aborted");
+              throw new Error(timedOut ? `Responses request timeout (${timedOut})${timeoutSuffix(timedOutBudgetMs, timedOutLagMs ?? 0)}` : "Request aborted");
             }
             let events;
             try {
@@ -7067,7 +7092,7 @@ function streamResponsesWS(model, context, options) {
         message.stopReason = userAborted || ownerDisposed ? "aborted" : "error";
         if (userAborted || ownerDisposed) delete message.remoteFailure;
         const protocolFailure = !endedWithoutTerminal && (error instanceof ResponsesProtocolError || error instanceof SyntaxError || !transportLost && error instanceof TypeError || error instanceof WebSocketTransportError && (error.kind === "protocol" || error.kind === "overflow"));
-        const cause = providerRejected && error instanceof WebSocketTransportError ? `${error.message} (HTTP status ${error.status})` : timedOut && !protocolFailure ? `Responses request timeout (${timedOut}) after ${ageMs()}ms` : error instanceof Error ? error.message : String(error);
+        const cause = providerRejected && error instanceof WebSocketTransportError ? `${error.message} (HTTP status ${error.status})` : timedOut && !protocolFailure ? `Responses request timeout (${timedOut}) after ${ageMs()}ms${timeoutSuffix(timedOutBudgetMs, timedOutLagMs ?? 0)}` : error instanceof Error ? error.message : String(error);
         message.errorMessage = cause;
         const streamLost = (endedWithoutTerminal || transportLost) && !protocolFailure && !localFailure && sent && !timedOut && !providerRejected && message.stopReason === "error";
         if (timedOut && timedOut !== "connect" && !message.remoteFailure && !protocolFailure && !localFailure && sent && !providerRejected && !userAborted && !ownerDisposed && compat.timeoutReplay) {

package/dist/chunks/{src-2RCV3I3P.js → src-5JJZZ5H7.js}

@@ -4,10 +4,12 @@ import {
   agentLoop,
   agentLoopContinue,
   bindToolCallerIdentity,
+  createAgentOperationError,
   createToolCallerIdentity,
+  getAgentFailureMetadata,
   getToolCallerIdentity
-} from "./chunk-XVF6V6Q5.js";
-import "./chunk-3VEIP2VY.js";
+} from "./chunk-HGUYS5SF.js";
+import "./chunk-R46YPPTU.js";
 import "./chunk-XXGYUYXI.js";
 import "./chunk-LZQXQOPJ.js";
 export {
@@ -15,6 +17,8 @@ export {
   agentLoop,
   agentLoopContinue,
   bindToolCallerIdentity,
+  createAgentOperationError,
   createToolCallerIdentity,
+  getAgentFailureMetadata,
   getToolCallerIdentity
 };

package/dist/chunks/{test-stream-Y2S3H7DK.js → test-stream-ZBTSPU7J.js}

@@ -1,7 +1,7 @@
 import { createRequire as __createRequire } from "node:module"; const require = __createRequire(import.meta.url);
 import {
   EventStream
-} from "./chunk-3VEIP2VY.js";
+} from "./chunk-R46YPPTU.js";
 import "./chunk-XXGYUYXI.js";
 import "./chunk-LZQXQOPJ.js";