@aexol/spectral 0.9.251 → 0.9.255

package/dist/memory/hooks/compaction-trigger.js

@@ -1,4 +1,4 @@
-import { DEFAULT_COMPACTION_POLICY } from "../../sdk/coding-agent/core/compaction/index.js";
+import { AUTO_COMPACTION_WINDOW_RATIO, DEFAULT_COMPACTION_POLICY, } from "../../sdk/coding-agent/core/compaction/index.js";
 import { rawTokensSinceLastCompaction } from "../branch.js";
 /**
  * Regex matching spectral's internal retryable error detection.
@@ -9,8 +9,35 @@ const RETRYABLE_ERROR_RE = /overloaded|provider.?returned.?error|rate.?limit|too
 function getCompactionPolicy(ctx) {
     return ctx.settingsManager?.getCompactionPolicy?.() ?? DEFAULT_COMPACTION_POLICY;
 }
-function getPostRunCompactionThresholdTokens(runtime, policy) {
-    return Math.max(runtime.config.compactionThresholdTokens, policy.autoOlderHistory.minRawTokens);
+/**
+ * Resolve the active model's context window. Prefers the live usage report,
+ * falls back to the model definition; returns undefined when unknown.
+ */
+export function getContextWindow(ctx) {
+    try {
+        const usage = ctx.getContextUsage();
+        if (usage && typeof usage.contextWindow === "number" && usage.contextWindow > 0) {
+            return usage.contextWindow;
+        }
+    }
+    catch {
+        // getContextUsage is optional in some headless harnesses.
+    }
+    const modelWindow = ctx.model?.contextWindow;
+    return typeof modelWindow === "number" && modelWindow > 0 ? modelWindow : undefined;
+}
+/**
+ * Effective post-run compaction threshold: the configured/policy floor, capped
+ * at AUTO_COMPACTION_WINDOW_RATIO × the model context window when the window
+ * is known. An unknown window (0/undefined, e.g. synthetic/proxy models) keeps
+ * the uncapped formula.
+ */
+export function getPostRunCompactionThresholdTokens(runtime, policy, contextWindow) {
+    const uncapped = Math.max(runtime.config.compactionThresholdTokens, policy.autoOlderHistory.minRawTokens);
+    if (typeof contextWindow !== "number" || !Number.isFinite(contextWindow) || contextWindow <= 0) {
+        return uncapped;
+    }
+    return Math.min(uncapped, Math.floor(contextWindow * AUTO_COMPACTION_WINDOW_RATIO));
 }
 export function registerCompactionTrigger(ext, runtime) {
     ext.on("agent_end", (event, ctx) => {
@@ -34,7 +61,7 @@ export function registerCompactionTrigger(ext, runtime) {
         }
         const entries = ctx.sessionManager.getBranch();
         const tokens = rawTokensSinceLastCompaction(entries);
-        const thresholdTokens = getPostRunCompactionThresholdTokens(runtime, policy);
+        const thresholdTokens = getPostRunCompactionThresholdTokens(runtime, policy, getContextWindow(ctx));
         if (tokens < thresholdTokens)
             return;
         // Capture ctx properties synchronously — the setTimeout + async work below

package/dist/relay/dispatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dispatcher.d.ts","sourceRoot":"","sources":["../../src/relay/dispatcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dispatcher.d.ts","sourceRoot":"","sources":["../../src/relay/dispatcher.ts"],"names":[],"mappings":"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"}

package/dist/relay/dispatcher.js

@@ -130,8 +130,6 @@ async function emitChunkedSessionReady(relay, sessionId, history, attachResult,
             intervalMinutes: attachResult.intervalMinutes,
             intervalNextTickAt: attachResult.intervalNextTickAt,
             intervalLaunchCount: attachResult.intervalLaunchCount,
-            intervalHasLoop: attachResult.intervalHasLoop || undefined,
-            intervalGoal: attachResult.intervalGoal,
             runState: attachResult.runState,
         },
     });
@@ -227,19 +225,16 @@ export async function handleClientMessage(frame, deps) {
         return;
     }
     // Interval scheduler control (sent as a content-less user_message).
-    const loopControl = message.loopControl;
-    if (loopControl === "stop") {
+    const intervalControl = message.intervalControl;
+    if (intervalControl === "stop") {
         manager.stopInterval(sessionId);
         return;
     }
-    if (loopControl === "run_now") {
+    if (intervalControl === "run_now") {
         manager.triggerIntervalNow(sessionId);
         return;
     }
     const content = message.content;
-    const isLoop = message.loop === true;
-    const loopMaxIterations = message.loopMaxIterations;
-    const loopGoal = message.loopGoal;
     // Rejected attachments (oversize inline base64, missing url+data, ...) are
     // surfaced to the client instead of silently vanishing from the turn.
     //
@@ -288,14 +283,6 @@ export async function handleClientMessage(frame, deps) {
         });
         return;
     }
-    // Set autonomous iterative loop state before firing the prompt.
-    // loop:true  → start/renew loop with the current content as original prompt;
-    // loop:false → stop any active loop.
-    // Arm loop state BEFORE any await: for non-reference prompts this is
-    // synchronous, preserving the client_message/subscribe interleave below.
-    // For "@preset:<name>" prompts this returns a promise that we await just
-    // before firing the turn, so the loop replays the EXPANDED prompt.
-    const armed = manager.setLoopActive(sessionId, isLoop, content, loopMaxIterations, loopGoal);
     // 2. Attach (idempotent). On first attach we capture the replay payload
     //    and synthesize a `session_ready` ws_event so the browser sees the
     //    same first frame it would have on a direct WS connection.
@@ -354,40 +341,13 @@ export async function handleClientMessage(frame, deps) {
             });
         }
     }
-    // "@preset:<name>" loop prompts: resolve the preset before the turn fires
-    // (undefined = already armed synchronously — no yield, no reordering).
-    // The arm path resolves to the EXPANDED prompt; `null` means it failed or
-    // was aborted (loop state changed mid-resolution) — fall back to the raw
-    // content in those cases. The promise is caught, not just awaited: serve
-    // calls this handler fire-and-forget, so a rejection (e.g. a sync throw
-    // from teamIdForSession inside the manager) would otherwise surface as an
-    // unhandled rejection instead of a visible error event.
-    let expandedLoopPrompt = null;
-    if (armed instanceof Promise) {
-        try {
-            expandedLoopPrompt = await armed;
-        }
-        catch (err) {
-            const msg = err instanceof Error ? err.message : String(err);
-            logger.error?.(`[dispatcher] loop arming failed for ${sessionId}:`, err);
-            relay.send({
-                kind: "ws_event",
-                sessionId,
-                event: { type: "error", message: humanizeProviderError(msg) },
-            });
-        }
-    }
-    const promptContent = expandedLoopPrompt ?? content;
     // 3. Fire the prompt. `prompt()` resolves on `agent_end`; errors are
     //    converted to `error` events by the manager itself, so we just log.
     //    `modelId` (Phase 3 — Available Models whitelist) is forwarded as
     //    sticky next-prompt selection. The backend has already validated it
     //    against the team-scoped whitelist; the CLI resolves it via spectral's
     //    own model registry inside the manager → bridge.
-    //
-    //    When `loop: true`, loop state is set before prompting; the normal
-    //    model is used — loop replay is handled by session-stream on agent_end.
-    manager.prompt(sessionId, promptContent, modelId, validImages, reasoningEffort).catch((err) => {
+    manager.prompt(sessionId, content, modelId, validImages, reasoningEffort).catch((err) => {
         logger.error?.(`[dispatcher] manager.prompt failed for ${sessionId}:`, err);
     });
     // Arm the interval scheduler after the first (immediate) launch.
@@ -395,9 +355,6 @@ export async function handleClientMessage(frame, deps) {
     if (typeof intervalMinutes === "number" && intervalMinutes > 0) {
         manager.armInterval(sessionId, {
             prompt: content,
-            loop: isLoop,
-            loopMaxIterations,
-            loopGoal,
             modelId,
             reasoningEffort,
             images: validImages,

package/dist/relay/routing.d.ts

@@ -20,7 +20,7 @@ import { type WizardLoginResult } from "./wizard-login.js";
  * `id` is populated when the route had an `:id` placeholder.
  */
 interface RouteMatch {
-    route: "list_projects" | "create_project" | "update_project" | "delete_project" | "bind_studio" | "unbind_studio" | "get_project_observations" | "list_project_sessions" | "cleanup_project_sessions" | "cleanup_all_sessions" | "create_session" | "get_session" | "get_session_active_agent" | "update_session_active_agent" | "get_session_messages" | "update_session" | "delete_session" | "get_session_memory" | "get_session_memory_details" | "compact_session" | "remember_and_delete_session" | "fork_session" | "list_path_autocomplete" | "list_directory" | "get_home_directory" | "create_directory" | "search_project_files" | "enqueue_prompt" | "get_prompt_queue" | "remove_prompt" | "clear_prompt_queue" | "list_mcp_status" | "reload_mcp_config" | "refresh_native_extensions" | "refresh_cloud_agents" | "get_settings" | "put_settings" | "get_agent_settings" | "put_agent_settings" | "get_prompt_mutation_settings" | "put_prompt_mutation_settings" | "wizard_login" | "list_agents" | "list_dev_processes" | "start_dev_process" | "kill_dev_process" | "restart_dev_process" | "scan_dev_servers" | "kill_dev_server" | "list_secrets" | "create_secret" | "delete_secret";
+    route: "list_projects" | "create_project" | "update_project" | "delete_project" | "bind_studio" | "unbind_studio" | "get_project_observations" | "list_project_sessions" | "cleanup_project_sessions" | "cleanup_all_sessions" | "create_session" | "get_session" | "get_session_active_agent" | "update_session_active_agent" | "get_session_messages" | "update_session" | "delete_session" | "get_session_memory" | "get_session_memory_details" | "compact_session" | "remember_and_delete_session" | "fork_session" | "list_path_autocomplete" | "list_directory" | "get_home_directory" | "create_directory" | "search_project_files" | "enqueue_prompt" | "get_prompt_queue" | "remove_prompt" | "clear_prompt_queue" | "list_mcp_status" | "reload_mcp_config" | "start_mcp_auth" | "refresh_native_extensions" | "refresh_cloud_agents" | "get_settings" | "put_settings" | "get_agent_settings" | "put_agent_settings" | "get_prompt_mutation_settings" | "put_prompt_mutation_settings" | "wizard_login" | "list_agents" | "list_dev_processes" | "start_dev_process" | "kill_dev_process" | "restart_dev_process" | "scan_dev_servers" | "kill_dev_server" | "list_secrets" | "create_secret" | "delete_secret";
     id?: string;
     /** Parsed query params, if the path carried a `?...` suffix. */
     query?: URLSearchParams;

package/dist/relay/routing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/relay/routing.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/relay/routing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAMvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAmDzD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAczD,OAAO,EAAoB,KAAK,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAqB7E;;;GAGG;AACH,UAAU,UAAU;IAClB,KAAK,EACD,eAAe,GACf,gBAAgB,GAChB,gBAAgB,GAChB,gBAAgB,GAChB,aAAa,GACb,eAAe,GACf,0BAA0B,GAC1B,uBAAuB,GACvB,0BAA0B,GAC1B,sBAAsB,GACtB,gBAAgB,GAChB,aAAa,GACb,0BAA0B,GAC1B,6BAA6B,GAC7B,sBAAsB,GACtB,gBAAgB,GAChB,gBAAgB,GAChB,oBAAoB,GACpB,4BAA4B,GAC5B,iBAAiB,GACjB,6BAA6B,GAC7B,cAAc,GACd,wBAAwB,GACxB,gBAAgB,GAChB,oBAAoB,GACpB,kBAAkB,GAClB,sBAAsB,GACtB,gBAAgB,GAChB,kBAAkB,GAClB,eAAe,GACf,oBAAoB,GACpB,iBAAiB,GACjB,mBAAmB,GACnB,gBAAgB,GAChB,2BAA2B,GAC3B,sBAAsB,GACtB,cAAc,GACd,cAAc,GACd,oBAAoB,GACpB,oBAAoB,GACpB,8BAA8B,GAC9B,8BAA8B,GAC9B,cAAc,GACd,aAAa,GACb,oBAAoB,GACpB,mBAAmB,GACnB,kBAAkB,GAClB,qBAAqB,GACrB,kBAAkB,GAClB,iBAAiB,GACjB,cAAc,GACd,eAAe,GACf,eAAe,CAAC;IACpB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,gEAAgE;IAChE,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,sEAAsE;IACtE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,yEAAyE;IACzE,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,GACX,UAAU,GAAG,IAAI,CAgSnB;AAMD;;;;;;;;;GASG;AACH,MAAM,MAAM,gBAAgB,GAAG,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAC;AAE1D,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,YAAY,CAAC;IACpB,OAAO,EAAE,oBAAoB,CAAC;IAC9B,6FAA6F;IAC7F,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,uGAAuG;IACvG,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,MAAM,CAAC,EAAE;QACP,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;QACrC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;KACrC,CAAC;IACF;;;;OAIG;IACH,QAAQ,CAAC,EAAE,iBAAiB,CAAC;IAC7B,wEAAwE;IACxE,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC;;;;;;;;;OASG;IACH,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,uBAAuB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1D,gBAAgB,CAAC,EAAE,MAAM,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACrD;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CACjC,KAAK,EAAE,UAAU,EACjB,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC,OAAO,CAAC,CA4ZlB"}

package/dist/relay/routing.js

@@ -11,6 +11,7 @@
  */
 import { homedir } from "node:os";
 import { BadRequestError } from "../server/handlers/errors.js";
+import { handleStartMcpAuth } from "../server/handlers/mcp-auth.js";
 import { handleListMcpStatus } from "../server/handlers/mcp-status.js";
 import { handleReloadMcpConfig } from "../server/handlers/mcp-reload.js";
 import { handlePathAutocomplete } from "../server/handlers/paths-autocomplete.js";
@@ -68,6 +69,11 @@ export function matchRoute(method, path) {
             return { route: "reload_mcp_config" };
         return null;
     }
+    if (cleanPath === "/api/mcp-auth") {
+        if (method === "POST")
+            return { route: "start_mcp_auth" };
+        return null;
+    }
     if (cleanPath === "/api/native-extensions/refresh") {
         if (method === "POST")
             return { route: "refresh_native_extensions" };
@@ -655,6 +661,9 @@ export async function dispatchRoute(match, body, deps) {
         case "reload_mcp_config": {
             return await handleReloadMcpConfig(deps.mcpState);
         }
+        case "start_mcp_auth": {
+            return await handleStartMcpAuth(deps.mcpState, asObject(body));
+        }
         case "refresh_native_extensions": {
             if (!deps.refreshNativeExtensions) {
                 return { ok: true };

package/dist/sdk/ai/utils/image-source.d.ts

@@ -14,12 +14,19 @@
  *                                as a base64 data URI — OpenRouter's server-side
  *                                media fetcher gets HTTP 400 from S3 on
  *                                presigned urls, so the raw presigned url must
- *                                never reach the provider. If the S3 download
- *                                fails, the presigned url is sent as a fallback
- *                                instead of dropping the image.
+ *                                never reach the provider. If the download
+ *                                fails the image is dropped — a presigned url
+ *                                is never sent as a fallback.
  *                                (`/generated-images/<id>` is what the backend
  *                                returns; it is AUTH-GATED, so handing it to a
  *                                provider only yields a 401)
+ * - `url` S3 presigned        -> STALE/EXPIRED signatures must never reach the
+ *                                provider ("Failed to fetch media from URL ...
+ *                                parameter=image_url" + 8x retry spam in old
+ *                                sessions): presigned sources are mapped back
+ *                                to the hosted ref (`/generated-images/<id>`)
+ *                                and re-signed fresh, else fetched + inlined
+ *                                directly, else DROPPED.
  * - `url` relative            -> resolved against the backend base url first
  * - `url` local/private       -> fetched and inlined **at send time only**
  *
@@ -85,14 +92,6 @@ export interface ResolvedImageSource {
      * (inline `data` present, or fetched from a local url).
      */
     data?: string;
-    /**
-     * True when `url` is a presigned url returned by `resolveHostedUrl` (i.e.
-     * it replaced an auth-gated `/generated-images/<id>` reference). Only set
-     * when the presigned url itself is handed to the provider — which only
-     * happens as a fallback when inlining its bytes failed; a successful
-     * download is inlined (`inlined: true`) and the flag stays unset.
-     */
-    hostedResolved?: boolean;
 }
 /**
  * True when `rawUrl` has no scheme, i.e. it is relative and therefore
@@ -104,6 +103,21 @@ export declare function isRelativeImageUrl(rawUrl: string): boolean;
  * url. Absolute urls and missing base urls are returned untouched.
  */
 export declare function resolveImageUrlAgainstBase(rawUrl: string, baseUrl?: string): string;
+/**
+ * True when `rawUrl` is an AWS S3 presigned GET (SigV4): its query string
+ * carries `X-Amz-Algorithm`/`X-Amz-Signature`/`X-Amz-Date` (case-insensitive
+ * per the SigV4 spec). Such urls are short-lived — a stale one sitting in
+ * persisted session history would fail every provider request forever.
+ */
+export declare function isS3PresignedUrl(rawUrl: string): boolean;
+/**
+ * Stable backend-hosted reference (`/generated-images/<uuid>`) for a
+ * presigned S3 url whose key follows the conversation-image convention
+ * (`<ownerPrefix>/images/<uuid>.<ext>`), or `null` when the path does not
+ * match. Resolving the hosted ref lets a request re-sign a FRESH presigned
+ * url — and rewrite the stale/expired signature out of the request entirely.
+ */
+export declare function hostedRefFromPresignedUrl(rawUrl: string): string | null;
 /**
  * True when a provider is unlikely to be able to fetch this URL itself and
  * the image must therefore be inlined as base64 before sending.
@@ -148,6 +162,7 @@ export declare function base64FromImageData(data: string): string;
  * Returns `null` when the block carries neither data nor url (nothing sendable).
  * Local/private urls are fetched and inlined; failures fall back to the raw
  * url so the caller still emits *something* rather than dropping the image.
+ * S3 presigned urls are never sent as-is — see `resolvePresignedSourceImage`.
  */
 export declare function resolveImageForProvider(image: ImageContent, options?: ResolveImageOptions): Promise<ResolvedImageSource | null>;
 /**

package/dist/sdk/ai/utils/image-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"image-source.d.ts","sourceRoot":"","sources":["../../../../src/sdk/ai/utils/image-source.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"image-source.d.ts","sourceRoot":"","sources":["../../../../src/sdk/ai/utils/image-source.ts"],"names":[],"mappings":"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"}

package/dist/sdk/ai/utils/image-source.js

@@ -14,12 +14,19 @@
  *                                as a base64 data URI — OpenRouter's server-side
  *                                media fetcher gets HTTP 400 from S3 on
  *                                presigned urls, so the raw presigned url must
- *                                never reach the provider. If the S3 download
- *                                fails, the presigned url is sent as a fallback
- *                                instead of dropping the image.
+ *                                never reach the provider. If the download
+ *                                fails the image is dropped — a presigned url
+ *                                is never sent as a fallback.
  *                                (`/generated-images/<id>` is what the backend
  *                                returns; it is AUTH-GATED, so handing it to a
  *                                provider only yields a 401)
+ * - `url` S3 presigned        -> STALE/EXPIRED signatures must never reach the
+ *                                provider ("Failed to fetch media from URL ...
+ *                                parameter=image_url" + 8x retry spam in old
+ *                                sessions): presigned sources are mapped back
+ *                                to the hosted ref (`/generated-images/<id>`)
+ *                                and re-signed fresh, else fetched + inlined
+ *                                directly, else DROPPED.
  * - `url` relative            -> resolved against the backend base url first
  * - `url` local/private       -> fetched and inlined **at send time only**
  *
@@ -101,6 +108,77 @@ export function resolveImageUrlAgainstBase(rawUrl, baseUrl) {
         return trimmed;
     }
 }
+/**
+ * Query parameter names AWS SigV4 presigned urls carry in their query string.
+ * A url carrying any of these is a signed S3 GET that stops working the
+ * moment its (typically 3600s) signature expires.
+ */
+const S3_PRESIGNED_QUERY_PARAMS = ["x-amz-algorithm", "x-amz-signature", "x-amz-date"];
+/**
+ * True when `rawUrl` is an AWS S3 presigned GET (SigV4): its query string
+ * carries `X-Amz-Algorithm`/`X-Amz-Signature`/`X-Amz-Date` (case-insensitive
+ * per the SigV4 spec). Such urls are short-lived — a stale one sitting in
+ * persisted session history would fail every provider request forever.
+ */
+export function isS3PresignedUrl(rawUrl) {
+    const trimmed = typeof rawUrl === "string" ? rawUrl.trim() : "";
+    if (!trimmed)
+        return false;
+    let url;
+    try {
+        url = new URL(trimmed);
+    }
+    catch {
+        return false;
+    }
+    if (url.protocol !== "http:" && url.protocol !== "https:")
+        return false;
+    const present = new Set();
+    url.searchParams.forEach((_value, key) => present.add(key.toLowerCase()));
+    return S3_PRESIGNED_QUERY_PARAMS.some((param) => present.has(param));
+}
+/**
+ * Conversation-image key convention on S3:
+ * `<ownerPrefix>/images/<uuid>.<ext>` — the uuid is the final path segment.
+ */
+const PRESIGNED_S3_IMAGE_PATH_RE = /\/images\/([^/?#]+)$/;
+/**
+ * Stable backend-hosted reference (`/generated-images/<uuid>`) for a
+ * presigned S3 url whose key follows the conversation-image convention
+ * (`<ownerPrefix>/images/<uuid>.<ext>`), or `null` when the path does not
+ * match. Resolving the hosted ref lets a request re-sign a FRESH presigned
+ * url — and rewrite the stale/expired signature out of the request entirely.
+ */
+export function hostedRefFromPresignedUrl(rawUrl) {
+    if (typeof rawUrl !== "string")
+        return null;
+    const trimmed = rawUrl.trim();
+    if (!trimmed)
+        return null;
+    let url;
+    try {
+        url = new URL(trimmed);
+    }
+    catch {
+        return null;
+    }
+    const raw = url.pathname.match(PRESIGNED_S3_IMAGE_PATH_RE)?.[1];
+    if (!raw)
+        return null;
+    // Strip an optional extension (`<uuid>.png`) — the id is the first part.
+    const dot = raw.lastIndexOf(".");
+    let id = dot > 0 ? raw.slice(0, dot) : raw;
+    try {
+        id = decodeURIComponent(id);
+    }
+    catch {
+        // Malformed percent-encoding: keep the raw segment.
+    }
+    // Mirror the backend id shape (`HOSTED_IMAGE_ID`): [A-Za-z0-9_-]{1,64}.
+    if (!/^[A-Za-z0-9_-]{1,64}$/.test(id))
+        return null;
+    return `/generated-images/${id}`;
+}
 /**
  * Loopback / unique-local (fc00::/7) / link-local (fe80::/10) IPv6 are
  * unreachable for a provider; every other literal (e.g. `2001:4860::8888`)
@@ -257,12 +335,97 @@ function normalizeMimeType(value, fallback) {
     const base = value.split(";")[0].trim().toLowerCase();
     return base || fallback || "image/png";
 }
+/**
+ * Download `downloadUrl`, apply the size guards and inline the bytes as a
+ * base64 data URI. Throws on any failure — the caller decides whether to
+ * fall back, pass the url through or drop the image.
+ */
+async function fetchAndInlineImage(downloadUrl, image, requestHeaders, options) {
+    const doFetch = options.fetchImpl ?? fetch;
+    const timeoutMs = options.timeoutMs ?? DEFAULT_INLINE_FETCH_TIMEOUT_MS;
+    const maxInlineBytes = options.maxInlineBytes ?? DEFAULT_MAX_INLINE_BYTES;
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), timeoutMs);
+    const onAbort = () => controller.abort();
+    options.signal?.addEventListener("abort", onAbort, { once: true });
+    try {
+        // An already-aborted signal never fires the listener above.
+        if (options.signal?.aborted)
+            throw new Error("aborted");
+        // `requestHeaders` is only set when the url resolves to the backend
+        // origin — a url on any other host is fetched anonymously, so the JWT
+        // cannot leak to a third party.
+        const response = await doFetch(downloadUrl, requestHeaders
+            ? { signal: controller.signal, headers: requestHeaders }
+            : { signal: controller.signal });
+        if (!response.ok)
+            throw new Error(`HTTP ${response.status}`);
+        // Reject oversized payloads from the declared length BEFORE reading
+        // the body — otherwise the whole payload lands in memory first.
+        const declaredLength = response.headers?.get?.("content-length");
+        if (declaredLength !== null && declaredLength !== undefined) {
+            const declared = Number(declaredLength);
+            if (Number.isFinite(declared) && declared > maxInlineBytes) {
+                throw new Error(`image too large to inline (${declared} bytes)`);
+            }
+        }
+        const buffer = await response.arrayBuffer();
+        if (buffer.byteLength > maxInlineBytes) {
+            throw new Error(`image too large to inline (${buffer.byteLength} bytes)`);
+        }
+        const mimeType = normalizeMimeType(response.headers?.get?.("content-type"), image.mimeType);
+        const data = bytesToBase64(new Uint8Array(buffer));
+        return {
+            url: dataUriForImage(data, mimeType),
+            inlined: true,
+            mimeType,
+            data,
+        };
+    }
+    finally {
+        clearTimeout(timer);
+        options.signal?.removeEventListener("abort", onAbort);
+    }
+}
+/**
+ * Resolve an S3 presigned SOURCE url (typically a stale/expired one persisted
+ * in session history). A presigned url must NEVER reach the provider as
+ * `image_url`: once its signature expires every request fails with
+ * "Failed to fetch media from URL ... parameter=image_url" and the agent loop
+ * retries the doomed request 8x per turn. Order of attempts:
+ *
+ * 1. Map back to the stable hosted ref (`/generated-images/<id>`) and run the
+ *    hosted path — it re-signs a FRESH presigned url and inlines the bytes.
+ * 2. Else fetch + inline the presigned bytes directly (the signature may
+ *    still be valid).
+ * 3. Else DROP the image — never fall back to sending the presigned url.
+ */
+async function resolvePresignedSourceImage(url, image, options) {
+    const hostedRef = hostedRefFromPresignedUrl(url);
+    if (hostedRef) {
+        const hosted = await resolveImageForProvider({ type: "image", url: hostedRef, mimeType: image.mimeType }, options);
+        // Only an INLINED result counts: the hosted path can also return the
+        // hosted url verbatim (auth-gated — the provider would get a 401),
+        // which is just as doomed as the expired presigned url.
+        if (hosted?.inlined)
+            return hosted;
+    }
+    try {
+        return await fetchAndInlineImage(url, image, undefined, options);
+    }
+    catch (error) {
+        const reason = error instanceof Error ? error.message : String(error);
+        options.onWarn?.(`Dropping image with stale/expired presigned url (${reason})`);
+        return null;
+    }
+}
 /**
  * Resolve an image block into a provider-sendable url.
  *
  * Returns `null` when the block carries neither data nor url (nothing sendable).
  * Local/private urls are fetched and inlined; failures fall back to the raw
  * url so the caller still emits *something* rather than dropping the image.
+ * S3 presigned urls are never sent as-is — see `resolvePresignedSourceImage`.
  */
 export async function resolveImageForProvider(image, options = {}) {
     if (hasInlineImageData(image)) {
@@ -279,6 +442,12 @@ export async function resolveImageForProvider(image, options = {}) {
     let url = typeof image.url === "string" ? image.url.trim() : "";
     if (!url)
         return null;
+    // A presigned S3 url must NEVER reach the provider as `image_url` — route
+    // it through the hosted-ref path (fresh signature + inline) and drop the
+    // image when that fails too. See `resolvePresignedSourceImage`.
+    if (isS3PresignedUrl(url)) {
+        return resolvePresignedSourceImage(url, image, options);
+    }
     // Resolve the backend base url lazily, and ONLY when the url even looks
     // hosted (path-wise): public cdn urls must not pay for a config/machine
     // store read. The base url doubles as the origin an absolute url has to
@@ -349,59 +518,21 @@ export async function resolveImageForProvider(image, options = {}) {
         return { url, inlined: false, mimeType: image.mimeType };
     }
     const requestHeaders = authenticated ? authHeaders : undefined;
-    const doFetch = options.fetchImpl ?? fetch;
-    const timeoutMs = options.timeoutMs ?? DEFAULT_INLINE_FETCH_TIMEOUT_MS;
-    const maxInlineBytes = options.maxInlineBytes ?? DEFAULT_MAX_INLINE_BYTES;
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), timeoutMs);
-    const onAbort = () => controller.abort();
-    options.signal?.addEventListener("abort", onAbort, { once: true });
     try {
-        // An already-aborted signal never fires the listener above.
-        if (options.signal?.aborted)
-            throw new Error("aborted");
-        // `requestHeaders` is only set when the (possibly rewritten) url still
-        // resolves to the backend origin — a url on any other host is fetched
-        // anonymously, so the JWT cannot leak to a third party.
-        const response = await doFetch(downloadUrl, requestHeaders ? { signal: controller.signal, headers: requestHeaders } : { signal: controller.signal });
-        if (!response.ok)
-            throw new Error(`HTTP ${response.status}`);
-        // Reject oversized payloads from the declared length BEFORE reading
-        // the body — otherwise the whole payload lands in memory first.
-        const declaredLength = response.headers?.get?.("content-length");
-        if (declaredLength !== null && declaredLength !== undefined) {
-            const declared = Number(declaredLength);
-            if (Number.isFinite(declared) && declared > maxInlineBytes) {
-                throw new Error(`image too large to inline (${declared} bytes)`);
-            }
-        }
-        const buffer = await response.arrayBuffer();
-        if (buffer.byteLength > maxInlineBytes) {
-            throw new Error(`image too large to inline (${buffer.byteLength} bytes)`);
-        }
-        const mimeType = normalizeMimeType(response.headers?.get?.("content-type"), image.mimeType);
-        const data = bytesToBase64(new Uint8Array(buffer));
-        return {
-            url: dataUriForImage(data, mimeType),
-            inlined: true,
-            mimeType,
-            data,
-        };
+        return await fetchAndInlineImage(downloadUrl, image, requestHeaders, options);
     }
     catch (error) {
         const reason = error instanceof Error ? error.message : String(error);
         options.onWarn?.(`Could not inline image ${presignedResolved ? downloadUrl : url} (${reason}); sending url as-is${hosted && !presignedResolved ? " — the provider may not be able to fetch it (auth required)" : ""}`);
         if (presignedResolved) {
-            // The S3 download failed — degrade to the old verbatim behavior
-            // (send the presigned url) rather than dropping the image.
-            return { url: downloadUrl, inlined: false, mimeType: image.mimeType, hostedResolved: true };
+            // A presigned url — stale, expired or freshly minted — must NEVER be
+            // handed to the provider: OpenRouter's server-side media fetcher
+            // answers HTTP 400 on presigned urls and the agent loop retries the
+            // doomed request 8x per turn. Drop the image instead.
+            return null;
         }
         return { url, inlined: false, mimeType: image.mimeType };
     }
-    finally {
-        clearTimeout(timer);
-        options.signal?.removeEventListener("abort", onAbort);
-    }
 }
 function inlineImageContentBlock(block, resolved) {
     const image = block;
@@ -525,5 +656,11 @@ export function imageSourceUrlForProvider(image, baseUrl) {
     // something it can never fetch.
     if (isRelativeImageUrl(url))
         return undefined;
+    // A stale/expired S3 presigned url is unfetchable for the provider
+    // (HTTP 400 "parameter=image_url" on every request). The
+    // `resolveImagesForContext` pre-pass should have replaced it with inline
+    // bytes; if one still lands here, drop the block.
+    if (isS3PresignedUrl(url))
+        return undefined;
     return url;
 }

package/dist/sdk/ai/utils/transient-error.d.ts

@@ -23,6 +23,10 @@ export { isRateLimitError } from "./rate-limit-retry.js";
  *
  * Rate limits (429) are intentionally NOT matched here; call sites must
  * check `isRateLimitError` first so they keep their own long schedule.
+ *
+ * Media-fetch failures ("Failed to fetch media from URL ...",
+ * "parameter=image_url") are classified NON-transient: the provider fails
+ * the same way on every retry, so the request must fail fast.
  */
 export declare function isTransientApiError(message: string): boolean;
 //# sourceMappingURL=transient-error.d.ts.map

package/dist/sdk/ai/utils/transient-error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transient-error.d.ts","sourceRoot":"","sources":["../../../../src/sdk/ai/utils/transient-error.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AA8BzD;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAE5D"}
+{"version":3,"file":"transient-error.d.ts","sourceRoot":"","sources":["../../../../src/sdk/ai/utils/transient-error.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAwCzD;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAG5D"}

package/dist/sdk/ai/utils/transient-error.js

@@ -42,6 +42,15 @@ export { isRateLimitError } from "./rate-limit-retry.js";
  * "rate limit" / "too many requests".
  */
 const TRANSIENT_API_ERROR_RE = /overloaded|\b529\b|timeout|timed?.?out|network|econnreset|fetch failed|socket connection was closed|connection.?closed|connection.?reset|connection.?error|connection.?refused|connection.?lost|socket hang up|websocket.?closed|websocket.?error|other side closed|reset before headers|upstream.?connect|http2 request did not get a response|provider.?returned.?error|ended without|stream ended before message_stop|terminated|retry delay|\b5(?:00|02|03|04)\b|unavailable|temporarily|internal.?error|server.?error/i;
+/**
+ * Provider media-fetch failures are PERMANENT, not transient: a provider that
+ * cannot fetch a media url (stale/expired S3 presigned url, 401-gated backend
+ * ref, ...) fails the SAME way on every retry — retrying only burns 8 rounds
+ * per turn ("[Retrying after transient error (N/8): ...]" spam in old/long
+ * sessions). Classified as non-transient so a doomed image request fails
+ * fast once instead of being retried.
+ */
+const NON_TRANSIENT_MEDIA_ERROR_RE = /failed to fetch media|parameter=image_url/i;
 /**
  * Check whether an error message (which may embed a raw provider JSON blob)
  * describes a transient API failure worth retrying — overload, HTTP 5xx,
@@ -49,7 +58,13 @@ const TRANSIENT_API_ERROR_RE = /overloaded|\b529\b|timeout|timed?.?out|network|e
  *
  * Rate limits (429) are intentionally NOT matched here; call sites must
  * check `isRateLimitError` first so they keep their own long schedule.
+ *
+ * Media-fetch failures ("Failed to fetch media from URL ...",
+ * "parameter=image_url") are classified NON-transient: the provider fails
+ * the same way on every retry, so the request must fail fast.
  */
 export function isTransientApiError(message) {
+    if (NON_TRANSIENT_MEDIA_ERROR_RE.test(message))
+        return false;
     return TRANSIENT_API_ERROR_RE.test(message);
 }