@omnicross/core 0.1.10 → 0.2.1

package/README.md

@@ -8,6 +8,13 @@ Part of the [omnicross](https://github.com/Dumoedss/omnicross) monorepo — see
 npm install @omnicross/core @omnicross/contracts
 ```
 
+The published core runtime remains supported on Node.js `>=20.9`. The monorepo's
+official OpenAI JavaScript SDK contract suite is contributor tooling, uses
+`openai@7.8.x`, and requires Node.js 22 or newer. Run it from the repository root
+with `npm run test:images-sdk-contract`; the command checks the Node major before
+loading the SDK. The SDK is intentionally not a runtime or package-local
+development dependency of `@omnicross/core`.
+
 ## License
 
 [MIT](LICENSE) 

package/dist/{BuiltinToolExecutor-CS2WpXhM.d.cts → BuiltinToolExecutor-BHgH-EaZ.d.cts}

@@ -1,5 +1,6 @@
 import { MCPCallToolResponse, MCPTool } from '@omnicross/contracts/mcp-types';
 import { WebSearchBackend } from './ports/web-search-backend.cjs';
+import { S as SearchRuntime } from './runtime-t8AZacFF.cjs';
 
 /**
  * Core-owned tool-shape types.
@@ -65,10 +66,32 @@ interface McpToolProvider {
 
 declare class BuiltinToolExecutor {
     private webSearch;
-    constructor(webSearch: WebSearchBackend);
+    private runtime?;
+    /**
+     * @param webSearch - the legacy port, still the `web_fetch` URL reader.
+     * @param runtime - the search runtime `web_search` delegates to. Optional so
+     *   the single-argument construction hosts already use keeps compiling; when
+     *   omitted, a default runtime over the builtin HTTP providers is built on
+     *   first use.
+     */
+    constructor(webSearch: WebSearchBackend, runtime?: SearchRuntime | undefined);
     execute(toolName: string, args: Record<string, unknown>): Promise<MCPCallToolResponse>;
     private executeWebSearch;
-    private resolveProviderChain;
+    /** Memoized lazy construction, so concurrent first calls share one runtime. */
+    private runtimeInit?;
+    /**
+     * The runtime `web_search` delegates to.
+     *
+     * Imported lazily so the search stack's transport and HTML parsing stay out
+     * of the module graph of every consumer that only wants the tool definitions
+     * — the same reason `builtin-web-fetch` is loaded on demand below.
+     *
+     * The PROMISE is memoized, not just its result: two concurrent first searches
+     * would otherwise each build a runtime and the later one would win. Harmless
+     * while the default runtime is stateless, but it stops being harmless the
+     * moment one holds a connection pool or a cache.
+     */
+    private getRuntime;
     private executeWebFetch;
 }
 /** Get the built-in MCPTool definitions for web search tools. */

package/dist/{BuiltinToolExecutor-BluWyeob.d.ts → BuiltinToolExecutor-Bi1LmiTP.d.ts}

@@ -1,5 +1,6 @@
 import { MCPCallToolResponse, MCPTool } from '@omnicross/contracts/mcp-types';
 import { WebSearchBackend } from './ports/web-search-backend.js';
+import { S as SearchRuntime } from './runtime-t8AZacFF.js';
 
 /**
  * Core-owned tool-shape types.
@@ -65,10 +66,32 @@ interface McpToolProvider {
 
 declare class BuiltinToolExecutor {
     private webSearch;
-    constructor(webSearch: WebSearchBackend);
+    private runtime?;
+    /**
+     * @param webSearch - the legacy port, still the `web_fetch` URL reader.
+     * @param runtime - the search runtime `web_search` delegates to. Optional so
+     *   the single-argument construction hosts already use keeps compiling; when
+     *   omitted, a default runtime over the builtin HTTP providers is built on
+     *   first use.
+     */
+    constructor(webSearch: WebSearchBackend, runtime?: SearchRuntime | undefined);
     execute(toolName: string, args: Record<string, unknown>): Promise<MCPCallToolResponse>;
     private executeWebSearch;
-    private resolveProviderChain;
+    /** Memoized lazy construction, so concurrent first calls share one runtime. */
+    private runtimeInit?;
+    /**
+     * The runtime `web_search` delegates to.
+     *
+     * Imported lazily so the search stack's transport and HTML parsing stay out
+     * of the module graph of every consumer that only wants the tool definitions
+     * — the same reason `builtin-web-fetch` is loaded on demand below.
+     *
+     * The PROMISE is memoized, not just its result: two concurrent first searches
+     * would otherwise each build a runtime and the later one would win. Harmless
+     * while the default runtime is stateless, but it stops being harmless the
+     * moment one holds a connection pool or a cache.
+     */
+    private getRuntime;
     private executeWebFetch;
 }
 /** Get the built-in MCPTool definitions for web search tools. */

package/dist/{CompletionService-kNA17cfI.d.cts → CompletionService-BniP7j88.d.cts}

@@ -3,8 +3,8 @@ import { LLMProvider } from '@omnicross/contracts/llm-config';
 import { C as CorePaths, U as UsageEventSink } from './usage-event-sink-BX7FE1NL.cjs';
 import { L as Logger } from './logger-4GvQNzhE.cjs';
 import { ProviderConfigSource } from './ports/provider-config-source.cjs';
-import { UsageRecorderImport } from './provider-proxy/types.cjs';
-import { O as OpenAITool, A as AnthropicTool, G as GeminiTools, M as McpToolProvider, B as BuiltinToolExecutor } from './BuiltinToolExecutor-CS2WpXhM.cjs';
+import { U as UsageRecorderImport } from './types-BSIJdsyl.cjs';
+import { O as OpenAITool, A as AnthropicTool, G as GeminiTools, M as McpToolProvider, B as BuiltinToolExecutor } from './BuiltinToolExecutor-BHgH-EaZ.cjs';
 import { C as CompletionOptions, S as StreamCallbacks, a as CompletionResult } from './types-BScIHmPr.cjs';
 import { ApiKeyPoolService } from './completion/ApiKeyPoolService.cjs';
 import { MCPTool } from '@omnicross/contracts/mcp-types';

package/dist/{CompletionService-C3BX0Ovy.d.ts → CompletionService-BqrKPwfA.d.ts}

@@ -3,8 +3,8 @@ import { LLMProvider } from '@omnicross/contracts/llm-config';
 import { C as CorePaths, U as UsageEventSink } from './usage-event-sink-BX7FE1NL.js';
 import { L as Logger } from './logger-4GvQNzhE.js';
 import { ProviderConfigSource } from './ports/provider-config-source.js';
-import { UsageRecorderImport } from './provider-proxy/types.js';
-import { O as OpenAITool, A as AnthropicTool, G as GeminiTools, M as McpToolProvider, B as BuiltinToolExecutor } from './BuiltinToolExecutor-BluWyeob.js';
+import { U as UsageRecorderImport } from './types-By9Tg6-I.js';
+import { O as OpenAITool, A as AnthropicTool, G as GeminiTools, M as McpToolProvider, B as BuiltinToolExecutor } from './BuiltinToolExecutor-Bi1LmiTP.js';
 import { C as CompletionOptions, S as StreamCallbacks, a as CompletionResult } from './types-BScIHmPr.js';
 import { ApiKeyPoolService } from './completion/ApiKeyPoolService.js';
 import { MCPTool } from '@omnicross/contracts/mcp-types';

package/dist/{ProviderProxy-QdwNV6l1.d.cts → ProviderProxy-Bz_nkOwq.d.cts}

@@ -1,4 +1,4 @@
-import { RouteContext, ProviderProxyDeps } from './provider-proxy/types.cjs';
+import { aD as RouteContext, W as ProviderProxyDeps } from './types-BSIJdsyl.cjs';
 
 /**
  * ProviderProxyRouteMap — the per-run `Map<token, RouteContext>` with crypto

package/dist/{ProviderProxy--ROec6VI.d.ts → ProviderProxy-Ckr6oTrE.d.ts}

@@ -1,4 +1,4 @@
-import { RouteContext, ProviderProxyDeps } from './provider-proxy/types.js';
+import { aD as RouteContext, W as ProviderProxyDeps } from './types-By9Tg6-I.js';
 
 /**
  * ProviderProxyRouteMap — the per-run `Map<token, RouteContext>` with crypto

package/dist/auth/GeminiCodeAssistProjectResolver.cjs

@@ -1,13 +1,13 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; } var _class;
 
 
-var _chunkOC6DOOFXcjs = require('../chunk-OC6DOOFX.cjs');
-require('../chunk-RICPANBY.cjs');
+var _chunkVXRTQZF2cjs = require('../chunk-VXRTQZF2.cjs');
+require('../chunk-WX2E2G7H.cjs');
 require('../chunk-77USGNRW.cjs');
-require('../chunk-AOFWNWLT.cjs');
+require('../chunk-IUL4VWNU.cjs');
 
 
-var _chunkRJUONLUQcjs = require('../chunk-RJUONLUQ.cjs');
+var _chunk4Z3ZLLC2cjs = require('../chunk-4Z3ZLLC2.cjs');
 require('../chunk-235MXAGX.cjs');
 require('../chunk-HVBBDBS3.cjs');
 require('../chunk-NKVZ6Z3Y.cjs');
@@ -30,7 +30,7 @@ var GeminiCodeAssistHandshakeError = class extends Error {
 var GeminiCodeAssistProjectResolver = (_class = class {
   // upstream-proxy: the Code Assist handshake is upstream egress → honor the
   // gemini proxy by default (still injectable for tests).
-  constructor(fetchImpl = (url, init) => _chunkRJUONLUQcjs.fetchUpstream.call(void 0, url, init, { providerId: "gemini" })) {;_class.prototype.__init.call(this);_class.prototype.__init2.call(this);
+  constructor(fetchImpl = (url, init) => _chunk4Z3ZLLC2cjs.fetchUpstream.call(void 0, url, init, { providerId: "gemini" })) {;_class.prototype.__init.call(this);_class.prototype.__init2.call(this);
     this.fetchImpl = fetchImpl;
   }
   
@@ -64,7 +64,7 @@ var GeminiCodeAssistProjectResolver = (_class = class {
     return run;
   }
   codeAssistUrl(method) {
-    return `${_chunkOC6DOOFXcjs.resolveCodeAssistEndpoint.call(void 0, )}/${_chunkOC6DOOFXcjs.resolveCodeAssistApiVersion.call(void 0, )}:${method}`;
+    return `${_chunkVXRTQZF2cjs.resolveCodeAssistEndpoint.call(void 0, )}/${_chunkVXRTQZF2cjs.resolveCodeAssistApiVersion.call(void 0, )}:${method}`;
   }
   /** Seed project id from env; reject a purely-numeric value (project NUMBER). */
   seedProjectId() {

package/dist/auth/GeminiCodeAssistProjectResolver.js

@@ -1,13 +1,13 @@
 import {
   resolveCodeAssistApiVersion,
   resolveCodeAssistEndpoint
-} from "../chunk-2UTGX6FM.js";
-import "../chunk-S3DYFEBE.js";
+} from "../chunk-4VVCXVB7.js";
+import "../chunk-R4VCO2CB.js";
 import "../chunk-WYVGULTQ.js";
-import "../chunk-N2EIM2XJ.js";
+import "../chunk-ZLNHPUFA.js";
 import {
   fetchUpstream
-} from "../chunk-RJ5ZGNI3.js";
+} from "../chunk-VL5TUDTM.js";
 import "../chunk-3WD4HTR2.js";
 import "../chunk-MKF46GNZ.js";
 import "../chunk-GL6XM527.js";

package/dist/{chunk-NGYOO5TO.js → chunk-2C3TTBS7.js}

@@ -1,18 +1,18 @@
-import {
-  AnthropicTransformer
-} from "./chunk-HKB656B4.js";
 import {
   GeminiTransformer
-} from "./chunk-55FMGZ3L.js";
+} from "./chunk-HN74IGEO.js";
 import {
   OpenAIResponseTransformer
-} from "./chunk-45FHEOKW.js";
+} from "./chunk-V53ZEFXC.js";
 import {
   OpenAITransformer
-} from "./chunk-CCVRRJOX.js";
+} from "./chunk-7PIUVCKK.js";
+import {
+  AnthropicTransformer
+} from "./chunk-EUZRH544.js";
 import {
   GeminiCodeAssistTransformer
-} from "./chunk-2UTGX6FM.js";
+} from "./chunk-4VVCXVB7.js";
 
 // src/transformer/transformers/index.ts
 var BuiltinTransformers = {

package/dist/{chunk-QUSEZNYS.cjs → chunk-32SRZFFP.cjs}

@@ -84,6 +84,7 @@ var UsageThroughputTracker = (_class = class {
       tokensPerMinute: 0,
       inputTokensPerMinute: 0,
       outputTokensPerMinute: 0,
+      cacheTokensPerMinute: 0,
       costUsdPerMinute: 0,
       complete: this.evictedThroughTs === null || this.evictedThroughTs < startTs
     };
@@ -104,6 +105,7 @@ var UsageThroughputTracker = (_class = class {
     row.tokensPerMinute = row.totalTokens / minutes;
     row.inputTokensPerMinute = row.inputTokens / minutes;
     row.outputTokensPerMinute = row.outputTokens / minutes;
+    row.cacheTokensPerMinute = (row.cacheReadTokens + row.cacheCreationTokens) / minutes;
     row.costUsdPerMinute = row.costUsd / minutes;
     return row;
   }
@@ -113,7 +115,7 @@ var UsageThroughputTracker = (_class = class {
     const startTs = endTs - THROUGHPUT_RETENTION_MS;
     const out = [];
     for (let i = 0; i < THROUGHPUT_BUCKET_COUNT; i += 1) {
-      out.push({ startTs: startTs + i * bucketMs, requests: 0, tokens: 0 });
+      out.push({ startTs: startTs + i * bucketMs, requests: 0, tokens: 0, outputTokens: 0 });
     }
     for (let i = this.head; i < this.samples.length; i += 1) {
       const sample = this.samples[i];
@@ -121,6 +123,7 @@ var UsageThroughputTracker = (_class = class {
       const bucket = out[Math.floor((sample.ts - startTs) / bucketMs)];
       if (!bucket) continue;
       bucket.requests += 1;
+      bucket.outputTokens += sample.outputTokens;
       bucket.tokens += sample.inputTokens + sample.outputTokens + sample.cacheReadTokens + sample.cacheCreationTokens;
     }
     return out;

package/dist/chunk-4JOU54M5.js

@@ -0,0 +1,200 @@
+// src/openai-operation/openAIOperation.ts
+var OPERATIONS = {
+  "chat.completions.create": {
+    id: "chat.completions.create",
+    policyFamily: "chat",
+    routeFamily: "chat",
+    owner: "builtin",
+    bodyKind: "json",
+    requestedModelSource: "request"
+  },
+  "responses.create": {
+    id: "responses.create",
+    policyFamily: "responses",
+    routeFamily: "responses",
+    owner: "builtin",
+    bodyKind: "json",
+    requestedModelSource: "request"
+  },
+  "responses.compact": {
+    id: "responses.compact",
+    policyFamily: "responses",
+    routeFamily: "responses",
+    owner: "extension",
+    bodyKind: "json",
+    requestedModelSource: "request"
+  },
+  "images.generate": {
+    id: "images.generate",
+    policyFamily: "images",
+    routeFamily: "images",
+    owner: "extension",
+    bodyKind: "json",
+    requestedModelSource: "configured"
+  },
+  "images.edit": {
+    id: "images.edit",
+    policyFamily: "images",
+    routeFamily: "images",
+    owner: "extension",
+    bodyKind: "multipart",
+    requestedModelSource: "configured"
+  }
+};
+var MATCH_ORDER = [
+  { id: "responses.compact", suffix: ["responses", "compact"] },
+  { id: "images.generate", suffix: ["images", "generations"] },
+  { id: "images.edit", suffix: ["images", "edits"] },
+  { id: "chat.completions.create", suffix: ["chat", "completions"] },
+  { id: "responses.create", suffix: ["responses"] }
+];
+function getOpenAIOperation(id) {
+  return OPERATIONS[id];
+}
+function pathSegments(url) {
+  const queryIndex = url.indexOf("?");
+  const path = queryIndex >= 0 ? url.slice(0, queryIndex) : url;
+  return path.split("/").filter(Boolean);
+}
+function hasExactSuffix(segments, suffix) {
+  if (segments.length < suffix.length) return false;
+  const offset = segments.length - suffix.length;
+  return suffix.every((segment, index) => segments[offset + index] === segment);
+}
+function classifyOpenAIOperation(method, url) {
+  if (method !== "POST" || !url) return null;
+  const segments = pathSegments(url);
+  for (const candidate of MATCH_ORDER) {
+    if (hasExactSuffix(segments, candidate.suffix)) return OPERATIONS[candidate.id];
+  }
+  return null;
+}
+
+// src/openai-operation/openAIOperationRegistry.ts
+var OpenAIOperationRegistrationError = class extends Error {
+  constructor(code, message) {
+    super(message);
+    this.code = code;
+  }
+  code;
+  name = "OpenAIOperationRegistrationError";
+};
+var OpenAIOperationError = class extends Error {
+  name = "OpenAIOperationError";
+  status;
+  code;
+  retryable;
+  headers;
+  constructor(init) {
+    super(init.message);
+    this.status = init.status;
+    this.code = init.code;
+    this.retryable = init.retryable ?? false;
+    this.headers = init.headers ?? {};
+  }
+};
+var SAFE_LOCAL_ERROR_HEADERS = /* @__PURE__ */ new Set(["retry-after", "x-request-id"]);
+function safeErrorHeaders(headers) {
+  const safe = {};
+  for (const [name, value] of Object.entries(headers)) {
+    if (SAFE_LOCAL_ERROR_HEADERS.has(name.toLowerCase())) safe[name] = value;
+  }
+  return safe;
+}
+function writeOpenAIOperationError(res, error) {
+  if (res.headersSent || res.writableEnded) return false;
+  res.writeHead(error.status, {
+    "Content-Type": "application/json",
+    ...safeErrorHeaders(error.headers)
+  });
+  res.end(JSON.stringify({
+    error: {
+      type: "openai_operation_error",
+      code: error.code,
+      message: error.message,
+      retryable: error.retryable
+    }
+  }));
+  return true;
+}
+function unsupportedOpenAIOperation(operation) {
+  return new OpenAIOperationError({
+    status: 501,
+    code: "unsupported_capability",
+    message: `Operation '${operation.id}' is not available`
+  });
+}
+var OpenAIOperationRegistry = class {
+  handlers = /* @__PURE__ */ new Map();
+  register(operationId, handler) {
+    const operation = getOpenAIOperation(operationId);
+    if (operation.owner !== "extension") {
+      throw new OpenAIOperationRegistrationError(
+        "builtin_operation",
+        `Operation '${operationId}' is owned by a built-in ingress`
+      );
+    }
+    if (this.handlers.has(operationId)) {
+      throw new OpenAIOperationRegistrationError(
+        "duplicate_operation_handler",
+        `Operation '${operationId}' already has a handler`
+      );
+    }
+    this.handlers.set(operationId, handler);
+    let disposed = false;
+    return () => {
+      if (disposed) return;
+      disposed = true;
+      if (this.handlers.get(operationId) === handler) this.handlers.delete(operationId);
+    };
+  }
+  has(operationId) {
+    return this.handlers.has(operationId);
+  }
+  async dispatch(context) {
+    const handler = this.handlers.get(context.operation.id);
+    if (!handler) return false;
+    const controller = new AbortController();
+    const abort = () => {
+      if (!controller.signal.aborted) controller.abort();
+    };
+    const onRequestClose = () => {
+      if (context.request.aborted || !context.request.complete) abort();
+    };
+    const onResponseClose = () => {
+      if (!context.response.writableEnded) abort();
+    };
+    context.request.once("aborted", abort);
+    context.request.once("close", onRequestClose);
+    context.response.once("close", onResponseClose);
+    if (context.request.aborted || context.response.destroyed) abort();
+    try {
+      await handler({ ...context, signal: controller.signal });
+      return true;
+    } catch (error) {
+      const publicError = error instanceof OpenAIOperationError ? error : new OpenAIOperationError({
+        status: 500,
+        code: "operation_handler_failed",
+        message: `Operation '${context.operation.id}' handler failed`
+      });
+      if (!writeOpenAIOperationError(context.response, publicError)) {
+        throw new Error(publicError.message);
+      }
+      return true;
+    } finally {
+      context.request.removeListener("aborted", abort);
+      context.request.removeListener("close", onRequestClose);
+      context.response.removeListener("close", onResponseClose);
+    }
+  }
+};
+
+export {
+  getOpenAIOperation,
+  classifyOpenAIOperation,
+  OpenAIOperationRegistrationError,
+  OpenAIOperationError,
+  writeOpenAIOperationError,
+  unsupportedOpenAIOperation,
+  OpenAIOperationRegistry
+};

package/dist/{chunk-2UTGX6FM.js → chunk-4VVCXVB7.js}

@@ -3,7 +3,7 @@ import {
   transformRequestOut,
   transformResponseIn,
   transformResponseOut
-} from "./chunk-S3DYFEBE.js";
+} from "./chunk-R4VCO2CB.js";
 
 // src/transformer/transformers/GeminiCodeAssistTransformer.ts
 var DEFAULT_CODE_ASSIST_ENDPOINT = "https://cloudcode-pa.googleapis.com";

package/dist/{chunk-RJUONLUQ.cjs → chunk-4Z3ZLLC2.cjs}

@@ -32,6 +32,12 @@ function bumpUpstreamProxyGeneration() {
     }
   }
 }
+function isClientDisconnectAbort(signal) {
+  if (!_optionalChain([signal, 'optionalAccess', _3 => _3.aborted])) return false;
+  const reason = signal.reason;
+  if (!reason || typeof reason !== "object") return false;
+  return reason.code === "client_disconnect";
+}
 function normalizeProxy(cfg) {
   if ("url" in cfg) {
     let u;
@@ -110,7 +116,7 @@ function fetchUpstream(url, init, ctx) {
   const dispatcher = resolveUpstreamDispatcher({ ..._nullishCoalesce(ctx, () => ( {})), url });
   const doFetch = dispatcher ? () => fetch(url, { ...init, dispatcher }) : () => fetch(url, init);
   const doFetchWithAllowanceTap = () => doFetch().then((response) => {
-    if (_optionalChain([ctx, 'optionalAccess', _3 => _3.providerId]) === "codex" && ctx.accountId) {
+    if (_optionalChain([ctx, 'optionalAccess', _4 => _4.providerId]) === "codex" && ctx.accountId) {
       try {
         _chunkHVBBDBS3cjs.getSharedAccountAllowanceStore.call(void 0, ).recordCodexHeaders(ctx.accountId, response.headers);
       } catch (e4) {
@@ -118,10 +124,10 @@ function fetchUpstream(url, init, ctx) {
     }
     return response;
   });
-  const activity = _optionalChain([ctx, 'optionalAccess', _4 => _4.routeActivity]);
-  const activityStartedAt = activity && _optionalChain([ctx, 'optionalAccess', _5 => _5.providerId]) && ctx.accountId ? Date.now() : 0;
+  const activity = _optionalChain([ctx, 'optionalAccess', _5 => _5.routeActivity]);
+  const activityStartedAt = activity && _optionalChain([ctx, 'optionalAccess', _6 => _6.providerId]) && ctx.accountId ? Date.now() : 0;
   const recordActivity = (status) => {
-    if (!activity || !_optionalChain([ctx, 'optionalAccess', _6 => _6.providerId]) || !ctx.accountId) return;
+    if (!activity || !_optionalChain([ctx, 'optionalAccess', _7 => _7.providerId]) || !ctx.accountId) return;
     const record = _chunkNKVZ6Z3Ycjs.getSharedAccountRouteActivity.call(void 0, ).record({
       providerId: ctx.providerId,
       accountId: ctx.accountId,
@@ -134,7 +140,7 @@ function fetchUpstream(url, init, ctx) {
       ts: activityStartedAt
     });
     try {
-      _optionalChain([activity, 'access', _7 => _7.onRecorded, 'optionalCall', _8 => _8(record)]);
+      _optionalChain([activity, 'access', _8 => _8.onRecorded, 'optionalCall', _9 => _9(record)]);
     } catch (e5) {
     }
   };
@@ -144,12 +150,12 @@ function fetchUpstream(url, init, ctx) {
       return response;
     },
     (error) => {
-      recordActivity(0);
+      if (!isClientDisconnectAbort(init.signal)) recordActivity(0);
       throw error;
     }
   );
   const tracePath = _chunk235MXAGXcjs.getUpstreamTracePath.call(void 0, );
-  if (!tracePath || !_optionalChain([ctx, 'optionalAccess', _9 => _9.providerId])) return doFetchWithActivity();
+  if (!tracePath || !_optionalChain([ctx, 'optionalAccess', _10 => _10.providerId])) return doFetchWithActivity();
   const startedAt = Date.now();
   const method = typeof init.method === "string" ? init.method : "GET";
   const requestHeaders = _chunk235MXAGXcjs.redactHeaders.call(void 0, 
@@ -158,7 +164,7 @@ function fetchUpstream(url, init, ctx) {
   const redactBodies = ctx.redactBodies === true;
   const requestBody = redactBodies ? _chunk235MXAGXcjs.REDACTED_BODY : typeof init.body === "string" ? init.body : null;
   const providerId = ctx.providerId;
-  const accountId = ctx.accountId;
+  const accountId = _nullishCoalesce(ctx.traceAccountFingerprint, () => ( ctx.accountId));
   return doFetchWithActivity().then((res) => {
     const clone = res.clone();
     const status = res.status;