cartethyia 2.6.7 → 2.7.1

package/src/transport/dispatch/proxy-request.ts

@@ -3,12 +3,7 @@ import type { ProviderDispatchContext, ProviderId, ProviderAdapter } from "../..
 import { GatewayError } from "../../protocol/gateway-error";
 import type { CanonicalEvent } from "../../protocol/canonical-model";
 import { resolveCredentialForAccount } from "../../providers/operations/provider-credential-service";
-import type { OAuthTokenRefresher } from "../../providers/authentication/oauth-refresh-service";
-import type { OAuthRefreshService } from "../../providers/authentication/oauth-refresh-service";
-import type { ValidatedNetworkBindingFactory } from "../../network/pool/resolver";
 import type { ByokUpstreamHost } from "../../providers/operations/provider-catalog-service";
-import type { CartethyiaDatabase } from "../../persistence/db-handle";
-import type { RouteSnapshotService } from "../routing/route-model";
 import { chatAdapter } from "../surface/chat/adapter";
 import { responsesAdapter } from "../surface/responses/adapter";
 import { messagesAdapter } from "../surface/messages/adapter";
@@ -21,10 +16,6 @@ import {
   resolveTenantImageClampMaxBytes,
 } from "../request/tenant-preferences";
 import { metrics } from "../../observability/metrics";
-import type { NetworkPoolSelector } from "../../network/pool/selector";
-import type { TelemetryBatchBuffer } from "../../observability/telemetry-buffer";
-import { ProxyRequestStateStore } from "../request/state";
-import type { ProxyRequestPreparer } from "../request/preparer";
 import { repriceUsage } from "../../providers/provider-usage";
 import {
   captureProviderExchange,
@@ -40,27 +31,17 @@ import {
   shouldCaptureProviderBodyForRequest,
 } from "./capture-policy";
 import { runAttemptLoop } from "./attempt-loop";
-import { projectForRoute, routeCapabilitiesFor } from "../translation/capabilities";
+import { projectForRoute, routeCapabilitiesFor } from "../../protocol/translation/capabilities";
 import { dispatchStreamingAttempt } from "./streaming/stream";
 import type { ProviderContinuationScope } from "../../providers/provider-contracts";
 import type { PreparedProxyRequest } from "../request/preparer";
 
-export interface ProviderProxyHandlerDeps {
-  readonly db: CartethyiaDatabase;
-  readonly providerAdapters: ReadonlyMap<string, ProviderAdapter>;
-  /** Preferred over `providerAdapters`: resolves an adapter on demand and caches it. */
-  readonly resolveProviderAdapter?: (providerId: string) => Promise<ProviderAdapter | undefined>;
-  readonly stateStore: ProxyRequestStateStore;
-  readonly proxyPreparer?: ProxyRequestPreparer;
-  readonly networkBindingFactory?: ValidatedNetworkBindingFactory;
+import type { GatewayHandlerDeps } from "./handler-deps";
+
+export type ProviderProxyHandlerDeps = GatewayHandlerDeps & {
   /** Live lookup of a provider's SSRF-validated upstream host. */
   readonly byokUpstreamHosts?: { readonly get: (providerId: string) => ByokUpstreamHost | undefined };
-  readonly poolSelector?: NetworkPoolSelector;
-  readonly snapshotService?: RouteSnapshotService;
-  readonly telemetryBuffer?: TelemetryBatchBuffer;
-  readonly resolveOAuthRefresher?: (providerId: string) => Promise<OAuthTokenRefresher | undefined>;
-  readonly oauthRefreshService?: OAuthRefreshService;
-}
+};
 
 /**
  * The continuation scope one dispatch carries.
@@ -200,9 +181,7 @@ export async function handleProviderProxyRequest(
             provider_id: candidate.provider_id as ProviderId,
             credential_kind: "none" as const,
           };
-      const adapter = deps.resolveProviderAdapter
-        ? await deps.resolveProviderAdapter(candidate.provider_id)
-        : deps.providerAdapters.get(candidate.provider_id);
+      const adapter = await deps.resolveProviderAdapter?.(candidate.provider_id);
       if (!adapter)
         throw new GatewayError("admission_unavailable", 503, "provider adapter not registered");
       if (!isBundledProviderId(candidate.provider_id)) {
@@ -284,9 +263,6 @@ export async function handleProviderProxyRequest(
               ),
             }
           : {}),
-        ...(deps.networkBindingFactory
-          ? { outboundWebSocket: deps.networkBindingFactory.webSocket(networkPoolId, prepared.authorization.snapshot.tenant_id) }
-          : {}),
         ...(deps.networkBindingFactory
           ? {
               outboundHttp2: deps.networkBindingFactory.http2Bidi(

package/src/transport/dispatch/responses-compact.ts

@@ -1,18 +1,9 @@
-import type { ProviderAdapter } from "../../providers/provider-contracts";
 import { GatewayError } from "../../protocol/gateway-error";
 import { resolveCredentialForAccount } from "../../providers/operations/provider-credential-service";
-import type { OAuthTokenRefresher, OAuthRefreshService } from "../../providers/authentication/oauth-refresh-service";
-import type { ValidatedNetworkBindingFactory } from "../../network/pool/resolver";
-import type { CartethyiaDatabase } from "../../persistence/db-handle";
-import type { RouteSnapshotService } from "../routing/route-model";
 import { metrics } from "../../observability/metrics";
-import type { NetworkPoolSelector } from "../../network/pool/selector";
-import type { TelemetryBatchBuffer } from "../../observability/telemetry-buffer";
-import { ProxyRequestStateStore } from "../request/state";
-import { ProxyRequestPreparer } from "../request/preparer";
-import { parseThinkingSuffix } from "../translation/thinking";
+import { parseThinkingSuffix } from "../../protocol/translation/thinking";
 import type { CodexCompactAdapter } from "../../providers/integrations/codex/codex";
-import { completeAttempt, estimatedUsage } from "./attempt-finalize";
+import { completeAttempt, estimatedUsage, nativeCompletionBase } from "./attempt-finalize";
 import { repriceUsage, usageFromProvider } from "../../providers/provider-usage";
 import { runAttemptLoop } from "./attempt-loop";
 
@@ -20,20 +11,9 @@ import { runAttemptLoop } from "./attempt-loop";
  * The native Codex compaction route (`POST /v1/responses/compact`) and the
  * dependency surface it needs to drive `runAttemptLoop`.
  */
-export interface ResponsesCompactHandlerDeps {
-  readonly db: CartethyiaDatabase;
-  readonly providerAdapters: ReadonlyMap<string, ProviderAdapter>;
-  /** Preferred over `providerAdapters`: resolves an adapter on demand and caches it. */
-  readonly resolveProviderAdapter?: (providerId: string) => Promise<ProviderAdapter | undefined>;
-  readonly proxyPreparer: ProxyRequestPreparer;
-  readonly stateStore: ProxyRequestStateStore;
-  readonly poolSelector?: NetworkPoolSelector;
-  readonly networkBindingFactory?: ValidatedNetworkBindingFactory;
-  readonly snapshotService?: RouteSnapshotService;
-  readonly telemetryBuffer?: TelemetryBatchBuffer;
-  readonly resolveOAuthRefresher?: (providerId: string) => Promise<OAuthTokenRefresher | undefined>;
-  readonly oauthRefreshService?: OAuthRefreshService;
-}
+import type { GatewayHandlerDeps } from "./handler-deps";
+
+export type ResponsesCompactHandlerDeps = GatewayHandlerDeps;
 
 /**
  * Handles `POST /v1/responses/compact`: the native Codex compaction proxy. The
@@ -72,9 +52,7 @@ export function createResponsesCompactHandler(deps: ResponsesCompactHandlerDeps)
         400,
         "Responses compact does not support streaming",
       );
-    const adapter = (deps.resolveProviderAdapter
-      ? await deps.resolveProviderAdapter("codex")
-      : deps.providerAdapters.get("codex")) as CodexCompactAdapter | undefined;
+    const adapter = (await deps.resolveProviderAdapter?.("codex")) as CodexCompactAdapter | undefined;
     if (!adapter || typeof adapter.compact !== "function")
       throw new GatewayError("admission_unavailable", 503, "Codex compact transport unavailable");
     const prepared = await deps.proxyPreparer.prepareNativeCompact({
@@ -167,22 +145,23 @@ export function createResponsesCompactHandler(deps: ResponsesCompactHandlerDeps)
         );
         await completeAttempt(state, {
           status: "completed",
-          providerId: candidate.provider_id,
-          ...(candidate.provider_account_id ? { accountId: candidate.provider_account_id } : {}),
-          ...(candidate.provider_account_label ? { accountLabel: candidate.provider_account_label } : {}),
-          ...(leases.proxySlot ? { networkPoolId: leases.proxySlot.poolId } : {}),
-          usage,
-          modelId: candidate.model_id,
-          lease: leases.lease,
-          commitUsage: usage,
-          terminal: true,
-          tenantId: prepared.authorization.tenantId,
-          ingressBody: state.ingressBody,
+          ...nativeCompletionBase({
+            providerId: candidate.provider_id,
+            ...(candidate.provider_account_id ? { accountId: candidate.provider_account_id } : {}),
+            ...(candidate.provider_account_label ? { accountLabel: candidate.provider_account_label } : {}),
+            ...(leases.proxySlot ? { networkPoolId: leases.proxySlot.poolId } : {}),
+            usage,
+            modelId: candidate.model_id,
+            lease: leases.lease,
+            commitUsage: usage,
+            tenantId: prepared.authorization.tenantId,
+            ingressBody: state.ingressBody,
+            providerCapture,
+            db: deps.db,
+            ...(deps.telemetryBuffer ? { telemetryBuffer: deps.telemetryBuffer } : {}),
+            ...(deps.snapshotService ? { snapshotService: deps.snapshotService } : {}),
+          }),
           responseBody: null,
-          providerCapture,
-          db: deps.db,
-          ...(deps.telemetryBuffer ? { telemetryBuffer: deps.telemetryBuffer } : {}),
-          ...(deps.snapshotService ? { snapshotService: deps.snapshotService } : {}),
         });
         metrics.proxy_requests_total.inc(1, { status: "completed" });
         return new Response(response.body, {

package/src/transport/dispatch/streaming/finalize.ts

@@ -558,6 +558,9 @@ export class StreamFinalizer {
       // never an upstream-reported error — the upstream path is already
       // covered by the `GatewayError` branch keeping its own origin.
       errorOrigin: terminalOutcome.errorOrigin,
+      ...(terminalOutcome.httpStatus === undefined
+        ? {}
+        : { terminalHttpStatus: terminalOutcome.httpStatus }),
       ...(!cancelled ? { error: streamError } : {}),
       ...(!cancelled
         ? {

package/src/transport/dispatch/streaming/stream.ts

@@ -220,14 +220,6 @@ export async function dispatchStreamingAttempt(input: StreamingDispatchInput): P
     ...(candidate.user_agent === undefined ? {} : { userAgent: candidate.user_agent }),
     ...(wrappedOutboundFetch ? { outboundFetch: wrappedOutboundFetch } : {}),
     ...(outboundFetch ? { outboundAttachmentFetch: outboundFetch } : {}),
-    ...(deps.networkBindingFactory
-      ? {
-          outboundWebSocket: deps.networkBindingFactory.webSocket(
-            networkPoolId,
-            prepared.authorization.snapshot.tenant_id,
-          ),
-        }
-      : {}),
     ...(deps.networkBindingFactory
       ? {
           outboundHttp2: deps.networkBindingFactory.http2Bidi(

package/src/transport/dispatch/systemone.ts

@@ -1,17 +1,9 @@
 import type { ProviderAdapter, ProviderDispatchTarget } from "../../providers/provider-contracts";
 import { GatewayError } from "../../protocol/gateway-error";
 import { resolveCredentialForAccount } from "../../providers/operations/provider-credential-service";
-import type { OAuthTokenRefresher, OAuthRefreshService } from "../../providers/authentication/oauth-refresh-service";
-import type { ValidatedNetworkBindingFactory } from "../../network/pool/resolver";
-import type { CartethyiaDatabase } from "../../persistence/db-handle";
-import type { RouteSnapshotService } from "../routing/route-model";
 import { metrics } from "../../observability/metrics";
-import type { NetworkPoolSelector } from "../../network/pool/selector";
-import type { TelemetryBatchBuffer } from "../../observability/telemetry-buffer";
-import { ProxyRequestStateStore } from "../request/state";
-import { ProxyRequestPreparer } from "../request/preparer";
-import { parseThinkingSuffix } from "../translation/thinking";
-import { completeAttempt, estimatedUsage } from "./attempt-finalize";
+import { parseThinkingSuffix } from "../../protocol/translation/thinking";
+import { completeAttempt, estimatedUsage, nativeCompletionBase } from "./attempt-finalize";
 import { repriceUsage, usageFromProvider } from "../../providers/provider-usage";
 import { runAttemptLoop } from "./attempt-loop";
 
@@ -26,20 +18,9 @@ import { runAttemptLoop } from "./attempt-loop";
  * route. The provider's adapter method (`ProviderAdapter.systemone`) forwards
  * the body untouched.
  */
-export interface SystemoneHandlerDeps {
-  readonly db: CartethyiaDatabase;
-  readonly providerAdapters: ReadonlyMap<string, ProviderAdapter>;
-  /** Preferred over `providerAdapters`: resolves an adapter on demand and caches it. */
-  readonly resolveProviderAdapter?: (providerId: string) => Promise<ProviderAdapter | undefined>;
-  readonly proxyPreparer: ProxyRequestPreparer;
-  readonly stateStore: ProxyRequestStateStore;
-  readonly poolSelector?: NetworkPoolSelector;
-  readonly networkBindingFactory?: ValidatedNetworkBindingFactory;
-  readonly snapshotService?: RouteSnapshotService;
-  readonly telemetryBuffer?: TelemetryBatchBuffer;
-  readonly resolveOAuthRefresher?: (providerId: string) => Promise<OAuthTokenRefresher | undefined>;
-  readonly oauthRefreshService?: OAuthRefreshService;
-}
+import type { GatewayHandlerDeps } from "./handler-deps";
+
+export type SystemoneHandlerDeps = GatewayHandlerDeps;
 
 /** Adapter that can serve a System One decision request. */
 type SystemoneAdapter = ProviderAdapter & {
@@ -117,9 +98,7 @@ export function createSystemoneHandler(deps: SystemoneHandlerDeps) {
               provider_id: candidate.provider_id as ProviderAdapter["provider_id"],
               credential_kind: "none" as const,
             };
-        const adapter = (deps.resolveProviderAdapter
-          ? await deps.resolveProviderAdapter(candidate.provider_id)
-          : deps.providerAdapters.get(candidate.provider_id)) as SystemoneAdapter | undefined;
+        const adapter = (await deps.resolveProviderAdapter?.(candidate.provider_id)) as SystemoneAdapter | undefined;
         if (!adapter || typeof adapter.systemone !== "function")
           throw new GatewayError(
             "capability_unsupported",
@@ -194,22 +173,23 @@ export function createSystemoneHandler(deps: SystemoneHandlerDeps) {
         );
         await completeAttempt(state, {
           status: "completed",
-          providerId: candidate.provider_id,
-          ...(candidate.provider_account_id ? { accountId: candidate.provider_account_id } : {}),
-          ...(candidate.provider_account_label ? { accountLabel: candidate.provider_account_label } : {}),
-          ...(leases.proxySlot ? { networkPoolId: leases.proxySlot.poolId } : {}),
-          usage,
-          modelId: candidate.model_id,
-          lease: leases.lease,
-          commitUsage: usage,
-          terminal: true,
-          tenantId: prepared.authorization.tenantId,
-          ingressBody: state.ingressBody,
+          ...nativeCompletionBase({
+            providerId: candidate.provider_id,
+            ...(candidate.provider_account_id ? { accountId: candidate.provider_account_id } : {}),
+            ...(candidate.provider_account_label ? { accountLabel: candidate.provider_account_label } : {}),
+            ...(leases.proxySlot ? { networkPoolId: leases.proxySlot.poolId } : {}),
+            usage,
+            modelId: candidate.model_id,
+            lease: leases.lease,
+            commitUsage: usage,
+            tenantId: prepared.authorization.tenantId,
+            ingressBody: state.ingressBody,
+            providerCapture,
+            db: deps.db,
+            ...(deps.telemetryBuffer ? { telemetryBuffer: deps.telemetryBuffer } : {}),
+            ...(deps.snapshotService ? { snapshotService: deps.snapshotService } : {}),
+          }),
           responseBody: null,
-          providerCapture,
-          db: deps.db,
-          ...(deps.telemetryBuffer ? { telemetryBuffer: deps.telemetryBuffer } : {}),
-          ...(deps.snapshotService ? { snapshotService: deps.snapshotService } : {}),
         });
         metrics.proxy_requests_total.inc(1, { status: "completed" });
         return new Response(response.body, {

package/src/transport/dispatch/token-count.ts

@@ -37,30 +37,15 @@ import type { ProviderAdapter, ProviderDispatchTarget } from "../../providers/pr
 import { GatewayError } from "../../protocol/gateway-error";
 import { isRecord } from "../../protocol/codecs";
 import { resolveCredentialForAccount } from "../../providers/operations/provider-credential-service";
-import type { OAuthTokenRefresher, OAuthRefreshService } from "../../providers/authentication/oauth-refresh-service";
-import type { ValidatedNetworkBindingFactory } from "../../network/pool/resolver";
-import type { CartethyiaDatabase } from "../../persistence/db-handle";
 import { metrics } from "../../observability/metrics";
-import type { NetworkPoolSelector } from "../../network/pool/selector";
-import type { TelemetryBatchBuffer } from "../../observability/telemetry-buffer";
-import type { ProxyRequestState, ProxyRequestStateStore } from "../request/state";
-import type { ProxyRequestPreparer, PreparedNativeRequest } from "../request/preparer";
-import { completeAttempt, estimatedUsage } from "./attempt-finalize";
+import type { ProxyRequestState } from "../request/state";
+import type { PreparedNativeRequest } from "../request/preparer";
+import { completeAttempt, estimatedUsage, nativeCompletionBase } from "./attempt-finalize";
 import { runAttemptLoop } from "./attempt-loop";
 
-export interface TokenCountHandlerDeps {
-  readonly db: CartethyiaDatabase;
-  readonly providerAdapters: ReadonlyMap<string, ProviderAdapter>;
-  readonly resolveProviderAdapter?: (providerId: string) => Promise<ProviderAdapter | undefined>;
-  readonly proxyPreparer: ProxyRequestPreparer;
-  readonly stateStore: ProxyRequestStateStore;
-  readonly poolSelector?: NetworkPoolSelector;
-  readonly networkBindingFactory?: ValidatedNetworkBindingFactory;
-  readonly snapshotService?: import("../routing/route-model").RouteSnapshotService;
-  readonly telemetryBuffer?: TelemetryBatchBuffer;
-  readonly resolveOAuthRefresher?: (providerId: string) => Promise<OAuthTokenRefresher | undefined>;
-  readonly oauthRefreshService?: OAuthRefreshService;
-}
+import type { GatewayHandlerDeps } from "./handler-deps";
+
+export type TokenCountHandlerDeps = GatewayHandlerDeps;
 
 /** Builds the `POST /v1/messages/count_tokens` handler. */
 export function createTokenCountHandler(deps: TokenCountHandlerDeps) {
@@ -144,9 +129,7 @@ export function createTokenCountHandler(deps: TokenCountHandlerDeps) {
               provider_id: candidate.provider_id as ProviderAdapter["provider_id"],
               credential_kind: "none" as const,
             };
-        const adapter = deps.resolveProviderAdapter
-          ? await deps.resolveProviderAdapter(candidate.provider_id)
-          : deps.providerAdapters.get(candidate.provider_id);
+        const adapter = await deps.resolveProviderAdapter?.(candidate.provider_id);
         if (!adapter) {
           throw new GatewayError("capability_unsupported", 400, "token counting is unavailable for this provider");
         }
@@ -201,22 +184,23 @@ export function createTokenCountHandler(deps: TokenCountHandlerDeps) {
         // quietly stop holding.
         await completeAttempt(state, {
           status: upstream.ok ? "completed" : "failed",
-          providerId: candidate.provider_id,
-          ...(candidate.provider_account_id ? { accountId: candidate.provider_account_id } : {}),
-          ...(candidate.provider_account_label ? { accountLabel: candidate.provider_account_label } : {}),
-          ...(leases.proxySlot ? { networkPoolId: leases.proxySlot.poolId } : {}),
-          usage: estimatedUsage(0, 0),
-          modelId: candidate.model_id,
-          lease: leases.lease,
-          commitUsage: estimatedUsage(0, 0),
-          terminal: true,
-          tenantId: prepared.authorization.tenantId,
-          ingressBody: state.ingressBody,
+          ...nativeCompletionBase({
+            providerId: candidate.provider_id,
+            ...(candidate.provider_account_id ? { accountId: candidate.provider_account_id } : {}),
+            ...(candidate.provider_account_label ? { accountLabel: candidate.provider_account_label } : {}),
+            ...(leases.proxySlot ? { networkPoolId: leases.proxySlot.poolId } : {}),
+            usage: estimatedUsage(0, 0),
+            modelId: candidate.model_id,
+            lease: leases.lease,
+            commitUsage: estimatedUsage(0, 0),
+            tenantId: prepared.authorization.tenantId,
+            ingressBody: state.ingressBody,
+            providerCapture,
+            db: deps.db,
+            ...(deps.telemetryBuffer ? { telemetryBuffer: deps.telemetryBuffer } : {}),
+            ...(deps.snapshotService ? { snapshotService: deps.snapshotService } : {}),
+          }),
           responseBody: null,
-          providerCapture,
-          db: deps.db,
-          ...(deps.telemetryBuffer ? { telemetryBuffer: deps.telemetryBuffer } : {}),
-          ...(deps.snapshotService ? { snapshotService: deps.snapshotService } : {}),
         });
         metrics.proxy_requests_total.inc(1, { status: upstream.ok ? "completed" : "failed" });
 

package/src/transport/dispatch/upstream.ts

@@ -1,5 +1,5 @@
 import type { CanonicalEvent } from "../../protocol/canonical-model";
-import type { AttemptLeaseOwnership, ValidatedOutboundFetch, ValidatedOutboundHttp2Bidi, ValidatedOutboundWebSocket } from "../../providers/provider-contracts";
+import type { AttemptLeaseOwnership, ValidatedOutboundFetch, ValidatedOutboundHttp2Bidi } from "../../providers/provider-contracts";
 import type { ProviderContinuationScope } from "../../providers/provider-contracts";
 import { GATEWAY_SECURITY_HEADERS } from "../../security/outbound-headers";
 
@@ -44,7 +44,6 @@ export function buildUpstreamDispatchContext(input: {
   readonly outboundFetch?: ValidatedOutboundFetch;
   /** Validated attachment egress that must not be wrapped by provider payload capture. */
   readonly outboundAttachmentFetch?: ValidatedOutboundFetch;
-  readonly outboundWebSocket?: ValidatedOutboundWebSocket;
   /** Validated bidirectional HTTP/2 egress bound to the same selected pool. */
   readonly outboundHttp2?: ValidatedOutboundHttp2Bidi;
   /**
@@ -95,7 +94,6 @@ export function buildUpstreamDispatchContext(input: {
     ...(input.outboundAttachmentFetch
       ? { outbound_attachment_fetch: input.outboundAttachmentFetch }
       : {}),
-    ...(input.outboundWebSocket ? { outbound_websocket: input.outboundWebSocket } : {}),
     ...(input.outboundHttp2 ? { outbound_http2: input.outboundHttp2 } : {}),
     ...(input.leaseOwnership ? { lease_ownership: input.leaseOwnership } : {}),
     ...(input.continuationScope ? { continuation_scope: input.continuationScope } : {}),

package/src/transport/dispatch/websearch.ts

@@ -17,32 +17,14 @@
 import type { ProviderAdapter, ProviderDispatchTarget } from "../../providers/provider-contracts";
 import { GatewayError } from "../../protocol/gateway-error";
 import { resolveCredentialForAccount } from "../../providers/operations/provider-credential-service";
-import type { OAuthTokenRefresher, OAuthRefreshService } from "../../providers/authentication/oauth-refresh-service";
-import type { ValidatedNetworkBindingFactory } from "../../network/pool/resolver";
-import type { CartethyiaDatabase } from "../../persistence/db-handle";
-import type { RouteSnapshotService } from "../routing/route-model";
 import { metrics } from "../../observability/metrics";
-import type { NetworkPoolSelector } from "../../network/pool/selector";
-import type { TelemetryBatchBuffer } from "../../observability/telemetry-buffer";
-import { ProxyRequestStateStore } from "../request/state";
-import { ProxyRequestPreparer } from "../request/preparer";
-import { parseThinkingSuffix } from "../translation/thinking";
-import { completeAttempt, estimatedUsage } from "./attempt-finalize";
+import { parseThinkingSuffix } from "../../protocol/translation/thinking";
+import { completeAttempt, estimatedUsage, nativeCompletionBase } from "./attempt-finalize";
 import { runAttemptLoop } from "./attempt-loop";
 
-export interface WebsearchHandlerDeps {
-  readonly db: CartethyiaDatabase;
-  readonly providerAdapters: ReadonlyMap<string, ProviderAdapter>;
-  readonly resolveProviderAdapter?: (providerId: string) => Promise<ProviderAdapter | undefined>;
-  readonly proxyPreparer: ProxyRequestPreparer;
-  readonly stateStore: ProxyRequestStateStore;
-  readonly poolSelector?: NetworkPoolSelector;
-  readonly networkBindingFactory?: ValidatedNetworkBindingFactory;
-  readonly snapshotService?: RouteSnapshotService;
-  readonly telemetryBuffer?: TelemetryBatchBuffer;
-  readonly resolveOAuthRefresher?: (providerId: string) => Promise<OAuthTokenRefresher | undefined>;
-  readonly oauthRefreshService?: OAuthRefreshService;
-}
+import type { GatewayHandlerDeps } from "./handler-deps";
+
+export type WebsearchHandlerDeps = GatewayHandlerDeps;
 
 
 
@@ -122,9 +104,7 @@ export function createWebsearchHandler(deps: WebsearchHandlerDeps) {
               provider_id: candidate.provider_id as ProviderAdapter["provider_id"],
               credential_kind: "none" as const,
             };
-        const adapter = (deps.resolveProviderAdapter
-          ? await deps.resolveProviderAdapter(candidate.provider_id)
-          : deps.providerAdapters.get(candidate.provider_id)) as WebsearchAdapter | undefined;
+        const adapter = (await deps.resolveProviderAdapter?.(candidate.provider_id)) as WebsearchAdapter | undefined;
         if (!adapter || typeof adapter.websearch !== "function")
           throw new GatewayError(
             "capability_unsupported",
@@ -174,22 +154,23 @@ export function createWebsearchHandler(deps: WebsearchHandlerDeps) {
         const usage = estimatedUsage(0, 0);
         await completeAttempt(state, {
           status: "completed",
-          providerId: candidate.provider_id,
-          ...(candidate.provider_account_id ? { accountId: candidate.provider_account_id } : {}),
-          ...(candidate.provider_account_label ? { accountLabel: candidate.provider_account_label } : {}),
-          ...(leases.proxySlot ? { networkPoolId: leases.proxySlot.poolId } : {}),
-          usage,
-          modelId: candidate.model_id,
-          lease: leases.lease,
-          commitUsage: usage,
-          terminal: true,
-          tenantId: prepared.authorization.tenantId,
-          ingressBody: state.ingressBody,
+          ...nativeCompletionBase({
+            providerId: candidate.provider_id,
+            ...(candidate.provider_account_id ? { accountId: candidate.provider_account_id } : {}),
+            ...(candidate.provider_account_label ? { accountLabel: candidate.provider_account_label } : {}),
+            ...(leases.proxySlot ? { networkPoolId: leases.proxySlot.poolId } : {}),
+            usage,
+            modelId: candidate.model_id,
+            lease: leases.lease,
+            commitUsage: usage,
+            tenantId: prepared.authorization.tenantId,
+            ingressBody: state.ingressBody,
+            providerCapture,
+            db: deps.db,
+            ...(deps.telemetryBuffer ? { telemetryBuffer: deps.telemetryBuffer } : {}),
+            ...(deps.snapshotService ? { snapshotService: deps.snapshotService } : {}),
+          }),
           responseBody: payload,
-          providerCapture,
-          db: deps.db,
-          ...(deps.telemetryBuffer ? { telemetryBuffer: deps.telemetryBuffer } : {}),
-          ...(deps.snapshotService ? { snapshotService: deps.snapshotService } : {}),
         });
         metrics.proxy_requests_total.inc(1, { status: "completed" });
         return jsonResponse(payload, 200, state.requestId);