@prestyj/agent 5.11.0 → 5.12.0

package/dist/index.d.cts

@@ -215,6 +215,22 @@ interface AgentOptions {
     temperature?: number;
     thinking?: StreamOptions["thinking"];
     apiKey?: string;
+    /**
+     * Re-resolve the credential at the start of every turn. A run can span many
+     * minutes, and an OAuth grant refreshed by any process (another app window, a
+     * CLI session, the usage poller) invalidates the access token captured when
+     * the run began — so a pinned `apiKey` goes dead mid-run and every remaining
+     * turn fails with an authentication error. Returning the current credential
+     * here keeps a long run alive across rotations.
+     *
+     * Falls back to `apiKey`/`accountId`/`projectId` when omitted or when the
+     * resolver throws (the provider call then surfaces the real auth error).
+     */
+    resolveCredentials?: () => Promise<{
+        apiKey: string;
+        accountId?: string;
+        projectId?: string;
+    }>;
     baseUrl?: string;
     signal?: AbortSignal;
     accountId?: string;
@@ -374,7 +390,7 @@ declare function isBillingError(err: unknown): boolean;
  * plan running out of usage). Unlike a transient per-minute 429, this does NOT
  * clear with a quick retry — the user must wait for the window to reset — so the
  * loop surfaces it immediately instead of retrying for minutes. Matches the
- * canonical message gg-ai stamps onto the provider error.
+ * canonical message @prestyj/ai stamps onto the provider error.
  */
 declare function isUsageLimitError(err: unknown): boolean;
 declare function agentLoop(messages: Message[], options: AgentOptions): AsyncGenerator<AgentEvent, AgentResult>;

package/dist/index.d.ts

@@ -215,6 +215,22 @@ interface AgentOptions {
     temperature?: number;
     thinking?: StreamOptions["thinking"];
     apiKey?: string;
+    /**
+     * Re-resolve the credential at the start of every turn. A run can span many
+     * minutes, and an OAuth grant refreshed by any process (another app window, a
+     * CLI session, the usage poller) invalidates the access token captured when
+     * the run began — so a pinned `apiKey` goes dead mid-run and every remaining
+     * turn fails with an authentication error. Returning the current credential
+     * here keeps a long run alive across rotations.
+     *
+     * Falls back to `apiKey`/`accountId`/`projectId` when omitted or when the
+     * resolver throws (the provider call then surfaces the real auth error).
+     */
+    resolveCredentials?: () => Promise<{
+        apiKey: string;
+        accountId?: string;
+        projectId?: string;
+    }>;
     baseUrl?: string;
     signal?: AbortSignal;
     accountId?: string;
@@ -374,7 +390,7 @@ declare function isBillingError(err: unknown): boolean;
  * plan running out of usage). Unlike a transient per-minute 429, this does NOT
  * clear with a quick retry — the user must wait for the window to reset — so the
  * loop surfaces it immediately instead of retrying for minutes. Matches the
- * canonical message gg-ai stamps onto the provider error.
+ * canonical message @prestyj/ai stamps onto the provider error.
  */
 declare function isUsageLimitError(err: unknown): boolean;
 declare function agentLoop(messages: Message[], options: AgentOptions): AsyncGenerator<AgentEvent, AgentResult>;

package/dist/index.js

@@ -57,7 +57,13 @@ function isContextOverflow(err) {
   if (overflowStatus === 402) return false;
   if (isBillingError(err)) return false;
   const msg = err.message.toLowerCase();
-  return msg.includes("prompt is too long") || msg.includes("prompt too long") || msg.includes("input is too long") || msg.includes("context_length_exceeded") || msg.includes("context_window_exceeded") || msg.includes("maximum context length") || msg.includes("exceeds model context window") || msg.includes("exceeds the context window") || msg.includes("content_too_large") || msg.includes("request_too_large") || msg.includes("reduce the length") || msg.includes("please shorten") || msg.includes("token") && msg.includes("exceed");
+  if (msg.includes("prompt is too long") || msg.includes("prompt too long") || msg.includes("input is too long") || msg.includes("context_length_exceeded") || msg.includes("context_window_exceeded") || msg.includes("maximum context length") || msg.includes("exceeds model context window") || msg.includes("exceeds the context window") || msg.includes("content_too_large") || msg.includes("request_too_large") || msg.includes("reduce the length") || msg.includes("please shorten")) {
+    return true;
+  }
+  const rateLimited = overflowStatus === 429 || msg.includes("rate limit") || msg.includes("rate_limit") || msg.includes("too many requests");
+  const perUnitTime = msg.includes("per min") || msg.includes("/min") || msg.includes("per minute") || msg.includes("per hour") || msg.includes("per day") || msg.includes("tpm") || msg.includes("rpm");
+  if (rateLimited && perUnitTime) return false;
+  return msg.includes("token") && msg.includes("exceed");
 }
 function parseOverflowNumber(value) {
   return Number(value.replace(/[,_\s]/g, ""));
@@ -170,6 +176,17 @@ function isMalformedStream(err) {
   const msg = err.message;
   return /\bin JSON at position \d+/i.test(msg);
 }
+var TIMEOUT_NAMES = /* @__PURE__ */ new Set(["TimeoutError", "ConnectTimeoutError", "HeadersTimeoutError"]);
+var TIMEOUT_MESSAGES = [
+  /^request timed out\.?$/i,
+  /\brequest to [\w .-]+ timed out\b/i,
+  /\b(?:connection|socket|headers|stream) timed out\b/i
+];
+function isBareTimeout(e) {
+  if (typeof e.name === "string" && TIMEOUT_NAMES.has(e.name)) return true;
+  if (typeof e.message !== "string") return false;
+  return TIMEOUT_MESSAGES.some((re) => re.test(e.message));
+}
 function isTransportFailure(err) {
   const codes = /* @__PURE__ */ new Set([
     "ECONNRESET",
@@ -206,6 +223,8 @@ function isTransportFailure(err) {
     if (typeof e.message === "string") {
       for (const re of messages) if (re.test(e.message)) return true;
     }
+    const clientError = typeof e.status === "number" && e.status >= 400 && e.status < 500;
+    if (!clientError && isBareTimeout(e)) return true;
     cur = e.cause;
   }
   return false;
@@ -431,6 +450,21 @@ async function* agentLoop(messages, options) {
         diag("stream_call", { nonStreaming: useNonStreamingFallback });
         streamCallStart = Date.now();
         providerAttemptStartedAt = streamCallStart;
+        let liveApiKey = options.apiKey;
+        let liveAccountId = options.accountId;
+        let liveProjectId = options.projectId;
+        if (options.resolveCredentials) {
+          try {
+            const fresh = await options.resolveCredentials();
+            liveApiKey = fresh.apiKey;
+            if (fresh.accountId !== void 0) liveAccountId = fresh.accountId;
+            if (fresh.projectId !== void 0) liveProjectId = fresh.projectId;
+          } catch (credErr) {
+            diag("credential_refresh_failed", {
+              error: (credErr instanceof Error ? credErr.message : String(credErr)).slice(0, 200)
+            });
+          }
+        }
         const result = stream({
           provider: options.provider,
           model: options.model,
@@ -442,12 +476,12 @@ async function* agentLoop(messages, options) {
           maxTokens: options.maxTokens,
           temperature: options.temperature,
           thinking: options.thinking,
-          apiKey: options.apiKey,
+          apiKey: liveApiKey,
           baseUrl: options.baseUrl,
           signal: streamController.signal,
-          accountId: options.accountId,
+          accountId: liveAccountId,
           transportSessionId: options.transportSessionId,
-          projectId: options.projectId,
+          projectId: liveProjectId,
           cacheRetention: options.cacheRetention,
           promptCacheKey: options.promptCacheKey,
           serviceTier: options.serviceTier,