@namzu/cli 36.5.0 → 36.6.0

package/dist/chunks/{chunk-E2OJSRDE.js → chunk-2JVVUMXC.js}

@@ -3500,11 +3500,21 @@ import { dirname, join as join3 } from "node:path";
 import { isDeepStrictEqual } from "node:util";
 
 // ../sdk/dist/types/provider/errors.js
+function shouldRetryHeader(link6) {
+  const headers = link6.headers;
+  if (!headers || typeof headers !== "object")
+    return void 0;
+  const raw = typeof headers.get === "function" ? headers.get("x-should-retry") : headers["x-should-retry"];
+  return typeof raw === "string" && raw.trim().toLowerCase() === "false" ? false : void 0;
+}
+__name(shouldRetryHeader, "shouldRetryHeader");
 function declaredRetryable(err) {
   for (const link6 of causeChain(err)) {
     const declared = link6.retryable;
     if (typeof declared === "boolean")
       return declared;
+    if (shouldRetryHeader(link6) === false)
+      return false;
   }
   return void 0;
 }
@@ -3729,7 +3739,8 @@ function classifyFromProviderRequestError(err, providerId, now) {
   return new ProviderError({
     code: mapped.code,
     message: err.message,
-    retryable: mapped.retryable,
+    // The provider saying "do not resend" beats the kind's own verdict.
+    retryable: candidate.shouldRetry === false ? false : mapped.retryable,
     cause: err,
     ...typeof candidate.providerId === "string" ? { providerId: candidate.providerId } : providerId !== void 0 ? { providerId } : {},
     ...typeof candidate.status === "number" ? { status: candidate.status } : {},
@@ -25645,6 +25656,8 @@ var ProviderRequestError = class extends Error {
    * See {@link vendorDetail} for what is kept and what is scrubbed.
    */
   detail;
+  /** The provider's `x-should-retry` verdict, when it sent one; see {@link ProviderRequestErrorInit.shouldRetry}. */
+  shouldRetry;
   constructor(init) {
     super(buildProviderErrorMessage(init));
     this.name = "ProviderRequestError";
@@ -25659,6 +25672,8 @@ var ProviderRequestError = class extends Error {
       this.retryAfterMs = init.retryAfterMs;
     if (init.detail !== void 0)
       this.detail = init.detail;
+    if (init.shouldRetry !== void 0)
+      this.shouldRetry = init.shouldRetry;
   }
 };
 var DETAIL_MAX = 400;
@@ -25779,6 +25794,10 @@ function bodySaysContextOverflow(body) {
   return OVERFLOW_BODY_PATTERNS.some((re2) => re2.test(body));
 }
 __name(bodySaysContextOverflow, "bodySaysContextOverflow");
+function parseShouldRetry(value) {
+  return value?.trim().toLowerCase() === "false" ? false : void 0;
+}
+__name(parseShouldRetry, "parseShouldRetry");
 function parseRetryAfterMs(headerValue2, now = Date.now()) {
   if (!headerValue2)
     return void 0;
@@ -25931,6 +25950,7 @@ function providerVendorError(input) {
     kind = vendorTypeKind(message) ?? "network";
   }
   const retryAfterMs = parseRetryAfterMs(input.retryAfter ?? vendorRetryAfter(error), input.now ?? Date.now());
+  const shouldRetry = parseShouldRetry(vendorHeader(error, ["x-should-retry"]));
   const fields2 = error;
   const detail = carriesBody(message) ? vendorDetail(message) : structuredVendorDetail({
     message,
@@ -25945,7 +25965,8 @@ function providerVendorError(input) {
     ...exactProviderCode !== void 0 ? { providerCode: exactProviderCode } : {},
     ...status !== void 0 ? { status } : {},
     ...retryAfterMs !== void 0 ? { retryAfterMs } : {},
-    ...detail !== void 0 ? { detail } : {}
+    ...detail !== void 0 ? { detail } : {},
+    ...shouldRetry !== void 0 ? { shouldRetry } : {}
   });
 }
 __name(providerVendorError, "providerVendorError");
@@ -25997,13 +26018,15 @@ function providerHttpError(input) {
     requestId: input.requestId
   }) : vendorDetail(input.body);
   const exactProviderCode = providerCode(input.body);
+  const shouldRetry = parseShouldRetry(input.shouldRetry);
   return new ProviderRequestError({
     kind,
     providerId: input.providerId,
     ...exactProviderCode !== void 0 ? { providerCode: exactProviderCode } : {},
     status: input.status,
     ...retryAfterMs !== void 0 ? { retryAfterMs } : {},
-    ...detail !== void 0 ? { detail } : {}
+    ...detail !== void 0 ? { detail } : {},
+    ...shouldRetry !== void 0 ? { shouldRetry } : {}
   });
 }
 __name(providerHttpError, "providerHttpError");
@@ -32809,7 +32832,7 @@ async function* streamProviderTurn(provider, params, emitEvent, drainPending, tu
   yield* drainPending();
   let id3 = "";
   const model = "";
-  const text9 = new StreamTextAccumulator();
+  let text9 = new StreamTextAccumulator();
   let finishReason = "stop";
   let reportedFinishReason;
   let finishDetail;
@@ -32896,9 +32919,29 @@ async function* streamProviderTurn(provider, params, emitEvent, drainPending, tu
           delayMs: chunk.retry.delayMs,
           code: chunk.retry.code,
           ...chunk.retry.status !== void 0 ? { status: chunk.retry.status } : {},
-          serverDirected: chunk.retry.serverDirected
+          serverDirected: chunk.retry.serverDirected,
+          ...chunk.retry.restart ? { restart: true } : {}
         });
         yield* drainPending();
+        if (chunk.retry.restart) {
+          text9 = new StreamTextAccumulator();
+          reasoningBuckets.clear();
+          citations.length = 0;
+          replayState = void 0;
+          id3 = "";
+          finishReason = "stop";
+          reportedFinishReason = void 0;
+          finishDetail = void 0;
+          streamedLength = 0;
+          lastOutputCall = void 0;
+          usage = {
+            promptTokens: 0,
+            completionTokens: 0,
+            totalTokens: 0,
+            cachedTokens: 0,
+            cacheWriteTokens: 0
+          };
+        }
         continue;
       }
       if (chunk.fallback) {
@@ -35102,6 +35145,11 @@ function backoffWithJitter(attempt, policy, random = Math.random) {
   return Math.round(random() * exponential);
 }
 __name(backoffWithJitter, "backoffWithJitter");
+function backoffProportional(attempt, policy, random = Math.random, ratio = 0.25) {
+  const exponential = Math.min(policy.initialDelayMs * 2 ** attempt, policy.maxDelayMs);
+  return Math.round(exponential + random() * ratio * exponential);
+}
+__name(backoffProportional, "backoffProportional");
 function sleep(ms, signal) {
   if (ms <= 0)
     return Promise.resolve();
@@ -35144,11 +35192,15 @@ function withProviderRetry(provider, options = {}) {
   async function* chatStream(params) {
     for (let attempt = 0; ; attempt++) {
       let produced = false;
+      let acted = false;
       try {
         for await (const chunk of provider.chatStream(params)) {
           const isErrorOnly = chunk.error !== void 0 && !chunk.delta.content && !chunk.delta.toolCalls?.length;
           if (!isErrorOnly)
             produced = true;
+          if (chunk.delta.toolCalls?.length || chunk.delta.toolCallEnd || chunk.delta.hostedTool) {
+            acted = true;
+          }
           if (isErrorOnly && !produced && attempt < config.maxRetries) {
             throw new Error(chunk.error);
           }
@@ -35162,7 +35214,8 @@ function withProviderRetry(provider, options = {}) {
           throw err;
         const classified = classifyProviderError(err, provider.id);
         const exhausted = attempt >= config.maxRetries;
-        if (produced || !classified.retryable || exhausted) {
+        const restartable = produced && config.retryMidStream === true && !acted;
+        if (produced && !restartable || !classified.retryable || exhausted) {
           log?.warn("Provider call failed", {
             [GENAI.SYSTEM]: provider.id,
             "namzu.provider.code": classified.code,
@@ -35186,7 +35239,8 @@ function withProviderRetry(provider, options = {}) {
           });
           throw isProviderRequestError(err) ? err : classified;
         }
-        const delay2 = serverDirected ?? backoffWithJitter(attempt, config, random);
+        const backoff = config.jitter === "proportional" ? backoffProportional(attempt, config, random) : backoffWithJitter(attempt, config, random);
+        const delay2 = serverDirected === void 0 ? backoff : config.retryAfter === "floor" ? Math.max(serverDirected, backoff) : serverDirected;
         log?.warn("Provider call failed \u2014 retrying", {
           [GENAI.SYSTEM]: provider.id,
           "namzu.provider.code": classified.code,
@@ -35194,7 +35248,8 @@ function withProviderRetry(provider, options = {}) {
           "namzu.retry.attempt": attempt + 1,
           "namzu.provider.max_retries": config.maxRetries,
           "namzu.provider.delay_ms": delay2,
-          "namzu.provider.server_directed": serverDirected !== void 0
+          "namzu.provider.server_directed": serverDirected !== void 0,
+          "namzu.provider.restart": restartable
         });
         yield {
           id: "",
@@ -35205,7 +35260,8 @@ function withProviderRetry(provider, options = {}) {
             delayMs: delay2,
             code: classified.code,
             ...classified.status !== void 0 ? { status: classified.status } : {},
-            serverDirected: serverDirected !== void 0
+            serverDirected: serverDirected !== void 0,
+            ...restartable ? { restart: true } : {}
           }
         };
         await doSleep(delay2, params.signal);
@@ -54695,7 +54751,7 @@ async function resolveMcpEra(input) {
 __name(resolveMcpEra, "resolveMcpEra");
 
 // ../sdk/dist/version.js
-var VERSION2 = "51.0.0";
+var VERSION2 = "51.1.0";
 
 // ../sdk/dist/connector/mcp/client.js
 var MAX_LIST_PAGES = 100;
@@ -84763,4 +84819,4 @@ export {
   buildResidentToolEvidenceTools,
   createPalMessagingTools
 };
-//# sourceMappingURL=chunk-E2OJSRDE.js.map
+//# sourceMappingURL=chunk-2JVVUMXC.js.map