@agentic-kit/metering 0.3.0 → 0.4.0

package/esm/gateway.d.ts

@@ -3,7 +3,7 @@
  *
  * `agentic-server` speaks OpenAI's `/v1/chat/completions`, so routing a harness
  * through it needs no custom streaming code — only an endpoint whose `baseUrl` is
- * the gateway and whose headers carry the run's identity. Every harness worth
+ * the gateway's OpenAI api root and whose headers carry the run's identity. Every harness worth
  * adapting can already talk to an OpenAI-compatible endpoint, which is why this
  * resolution is neutral and only the registration is vendor-specific: an adapter
  * turns `MeteredGateway` into whatever its harness calls a provider.
@@ -35,7 +35,7 @@ export interface MeteredModelSpec {
     cost?: MeteredModelCost;
 }
 export interface MeteredGatewayOptions {
-    /** Gateway root, e.g. `https://agentic.example.com` — not a `/v1` path. */
+    /** Gateway root, e.g. `https://agentic.example.com`; a trailing `/v1` is tolerated. */
     gatewayUrl: string;
     identity: MeteredIdentity;
     models: readonly MeteredModelSpec[];
@@ -72,8 +72,22 @@ export interface MeteredModel {
     contextWindow: number;
     maxTokens: number;
 }
-/** Normalize the gateway root: absolute http(s), no trailing slash, no `/v1`. */
+/**
+ * Normalize the gateway root: absolute http(s), no trailing slash, no `/v1`.
+ *
+ * A caller who names the api root instead is answered the root it hangs under,
+ * so a deployment that spells its gateway either way reaches the same routes
+ * rather than one of them 404ing on the first model turn.
+ */
 export declare function normalizeGatewayUrl(gatewayUrl: string): string;
+/**
+ * The OpenAI api root under a gateway root.
+ *
+ * An `openai-completions` client (pi-ai, the OpenAI SDKs, any harness built on
+ * either) appends `/chat/completions` to its `baseUrl` and nothing else, so the
+ * `/v1` belongs here rather than in the caller's environment.
+ */
+export declare function completionsBaseUrl(gatewayUrl: string): string;
 export declare function resolveMeteredModel(spec: MeteredModelSpec): MeteredModel;
 /**
  * Resolve the gateway endpoint for a run.

package/esm/gateway.js

@@ -3,7 +3,7 @@
  *
  * `agentic-server` speaks OpenAI's `/v1/chat/completions`, so routing a harness
  * through it needs no custom streaming code — only an endpoint whose `baseUrl` is
- * the gateway and whose headers carry the run's identity. Every harness worth
+ * the gateway's OpenAI api root and whose headers carry the run's identity. Every harness worth
  * adapting can already talk to an OpenAI-compatible endpoint, which is why this
  * resolution is neutral and only the registration is vendor-specific: an adapter
  * turns `MeteredGateway` into whatever its harness calls a provider.
@@ -14,7 +14,13 @@ export const GATEWAY_API = 'openai-completions';
 /** Default provider name; also the prefix a model picker shows. */
 export const DEFAULT_PROVIDER_NAME = 'constructive-gateway';
 const ZERO_COST = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
-/** Normalize the gateway root: absolute http(s), no trailing slash, no `/v1`. */
+/**
+ * Normalize the gateway root: absolute http(s), no trailing slash, no `/v1`.
+ *
+ * A caller who names the api root instead is answered the root it hangs under,
+ * so a deployment that spells its gateway either way reaches the same routes
+ * rather than one of them 404ing on the first model turn.
+ */
 export function normalizeGatewayUrl(gatewayUrl) {
     const raw = gatewayUrl?.trim();
     if (!raw)
@@ -29,14 +35,19 @@ export function normalizeGatewayUrl(gatewayUrl) {
     if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {
         throw new Error(`metered model: gatewayUrl must be http(s), got ${parsed.protocol}`);
     }
-    const path = parsed.pathname.replace(/\/+$/, '');
-    // An OpenAI-compatible client appends `/v1/chat/completions`, so a baseUrl that
-    // already ends in `/v1` would request `/v1/v1/chat/completions` and 404 at the
-    // first model turn.
-    if (/\/v1$/.test(path))
-        throw new Error(`metered model: gatewayUrl must be the gateway root, not ${raw} (drop the /v1)`);
+    const path = parsed.pathname.replace(/\/+$/, '').replace(/\/v1$/, '');
     return `${parsed.origin}${path}`;
 }
+/**
+ * The OpenAI api root under a gateway root.
+ *
+ * An `openai-completions` client (pi-ai, the OpenAI SDKs, any harness built on
+ * either) appends `/chat/completions` to its `baseUrl` and nothing else, so the
+ * `/v1` belongs here rather than in the caller's environment.
+ */
+export function completionsBaseUrl(gatewayUrl) {
+    return `${normalizeGatewayUrl(gatewayUrl)}/v1`;
+}
 export function resolveMeteredModel(spec) {
     if (!spec.id?.trim())
         throw new Error('metered model: model id is required');
@@ -64,7 +75,7 @@ export function resolveMeteredGateway(options) {
     return {
         providerName: options.providerName ?? DEFAULT_PROVIDER_NAME,
         displayName: options.displayName ?? 'Constructive (metered)',
-        baseUrl: normalizeGatewayUrl(options.gatewayUrl),
+        baseUrl: completionsBaseUrl(options.gatewayUrl),
         api: GATEWAY_API,
         headers,
         // Harnesses typically require an apiKey once models are declared; the gateway

package/esm/identity.d.ts

@@ -1,10 +1,12 @@
 /**
- * Who a metered request belongs to.
+ * Who a metered request belongs to, and which task it is a cost of.
  *
- * These are exactly the headers `agentic-server` reads (`X-Database-Id`,
- * `X-Entity-Id`, `X-Actor-Id`) — the same identity lane the platform's own
- * clients use — so a pi session lands in `inference_log` beside every other
- * metered call rather than in a parallel accounting scheme.
+ * These are exactly the headers `agentic-server` reads — identity
+ * (`X-Database-Id`, `X-Entity-Id`, `X-Actor-Id`) plus task correlation
+ * (`X-Invocation-Id`, `X-Job-Id`, `X-Attempt`, `X-Run-Id`) — the same lane the
+ * platform's own clients use, so a pi session lands in `inference_log` beside
+ * every other metered call rather than in a parallel accounting scheme, and its
+ * tokens join the invocation the customer was actually charged for.
  *
  * Headers are only trustworthy where the gateway is not reachable by the
  * untrusted party: in-cluster, or behind an authenticated ingress that pins the
@@ -18,6 +20,14 @@ export interface MeteredIdentity {
     entityId?: string;
     /** The actor on whose behalf the run executes. */
     actorId?: string;
+    /** Invocation the run is executing, when the platform dispatched it. */
+    invocationId?: string;
+    /** Queue job id for that invocation; decimal digits only. */
+    jobId?: string;
+    /** Attempt number of that job; a non-negative integer. */
+    attempt?: number;
+    /** The agent run itself. */
+    runId?: string;
     /**
      * Bearer token for the gateway's ingress — run-scoped, not an account token.
      * Sent as `Authorization: Bearer <token>`.
@@ -27,6 +37,10 @@ export interface MeteredIdentity {
 export declare const DATABASE_ID_HEADER = "X-Database-Id";
 export declare const ENTITY_ID_HEADER = "X-Entity-Id";
 export declare const ACTOR_ID_HEADER = "X-Actor-Id";
+export declare const INVOCATION_ID_HEADER = "X-Invocation-Id";
+export declare const JOB_ID_HEADER = "X-Job-Id";
+export declare const ATTEMPT_HEADER = "X-Attempt";
+export declare const RUN_ID_HEADER = "X-Run-Id";
 /**
  * Build the identity headers for a metered request.
  *

package/esm/identity.js

@@ -1,10 +1,12 @@
 /**
- * Who a metered request belongs to.
+ * Who a metered request belongs to, and which task it is a cost of.
  *
- * These are exactly the headers `agentic-server` reads (`X-Database-Id`,
- * `X-Entity-Id`, `X-Actor-Id`) — the same identity lane the platform's own
- * clients use — so a pi session lands in `inference_log` beside every other
- * metered call rather than in a parallel accounting scheme.
+ * These are exactly the headers `agentic-server` reads — identity
+ * (`X-Database-Id`, `X-Entity-Id`, `X-Actor-Id`) plus task correlation
+ * (`X-Invocation-Id`, `X-Job-Id`, `X-Attempt`, `X-Run-Id`) — the same lane the
+ * platform's own clients use, so a pi session lands in `inference_log` beside
+ * every other metered call rather than in a parallel accounting scheme, and its
+ * tokens join the invocation the customer was actually charged for.
  *
  * Headers are only trustworthy where the gateway is not reachable by the
  * untrusted party: in-cluster, or behind an authenticated ingress that pins the
@@ -14,6 +16,10 @@
 export const DATABASE_ID_HEADER = 'X-Database-Id';
 export const ENTITY_ID_HEADER = 'X-Entity-Id';
 export const ACTOR_ID_HEADER = 'X-Actor-Id';
+export const INVOCATION_ID_HEADER = 'X-Invocation-Id';
+export const JOB_ID_HEADER = 'X-Job-Id';
+export const ATTEMPT_HEADER = 'X-Attempt';
+export const RUN_ID_HEADER = 'X-Run-Id';
 /**
  * Build the identity headers for a metered request.
  *
@@ -32,6 +38,24 @@ export function buildIdentityHeaders(identity) {
     const actorId = identity.actorId?.trim();
     if (actorId)
         headers[ACTOR_ID_HEADER] = actorId;
+    const invocationId = identity.invocationId?.trim();
+    if (invocationId)
+        headers[INVOCATION_ID_HEADER] = invocationId;
+    const jobId = identity.jobId?.trim();
+    if (jobId) {
+        if (!/^\d+$/.test(jobId))
+            throw new Error(`metered model: identity.jobId must be decimal digits, got "${jobId}"`);
+        headers[JOB_ID_HEADER] = jobId;
+    }
+    if (identity.attempt !== undefined) {
+        if (!Number.isInteger(identity.attempt) || identity.attempt < 0) {
+            throw new Error(`metered model: identity.attempt must be a non-negative integer, got ${identity.attempt}`);
+        }
+        headers[ATTEMPT_HEADER] = String(identity.attempt);
+    }
+    const runId = identity.runId?.trim();
+    if (runId)
+        headers[RUN_ID_HEADER] = runId;
     const runToken = identity.runToken?.trim();
     if (runToken)
         headers.Authorization = `Bearer ${runToken}`;

package/esm/index.d.ts

@@ -7,7 +7,7 @@
  * No harness SDK is imported here. An adapter registers `MeteredGateway` with
  * its own harness and feeds `toUsageReport()` from its own message events.
  */
-export { DEFAULT_PROVIDER_NAME, GATEWAY_API, type MeteredGateway, type MeteredGatewayOptions, type MeteredModel, type MeteredModelCost, type MeteredModelSpec, normalizeGatewayUrl, resolveMeteredGateway, resolveMeteredModel } from './gateway';
-export { ACTOR_ID_HEADER, buildIdentityHeaders, DATABASE_ID_HEADER, ENTITY_ID_HEADER, type MeteredIdentity } from './identity';
+export { completionsBaseUrl, DEFAULT_PROVIDER_NAME, GATEWAY_API, type MeteredGateway, type MeteredGatewayOptions, type MeteredModel, type MeteredModelCost, type MeteredModelSpec, normalizeGatewayUrl, resolveMeteredGateway, resolveMeteredModel } from './gateway';
+export { ACTOR_ID_HEADER, ATTEMPT_HEADER, buildIdentityHeaders, DATABASE_ID_HEADER, ENTITY_ID_HEADER, INVOCATION_ID_HEADER, JOB_ID_HEADER, type MeteredIdentity, RUN_ID_HEADER } from './identity';
 export { httpUsageSink, type HttpUsageSinkOptions, UsageReporter, type UsageReporterOptions, type UsageSink } from './reporter';
 export { type AssistantUsageMessage, isAssistantMessage, toUsageReport, type ToUsageReportOptions, type UsageReport } from './usage-report';

package/esm/index.js

@@ -7,7 +7,7 @@
  * No harness SDK is imported here. An adapter registers `MeteredGateway` with
  * its own harness and feeds `toUsageReport()` from its own message events.
  */
-export { DEFAULT_PROVIDER_NAME, GATEWAY_API, normalizeGatewayUrl, resolveMeteredGateway, resolveMeteredModel } from './gateway';
-export { ACTOR_ID_HEADER, buildIdentityHeaders, DATABASE_ID_HEADER, ENTITY_ID_HEADER } from './identity';
+export { completionsBaseUrl, DEFAULT_PROVIDER_NAME, GATEWAY_API, normalizeGatewayUrl, resolveMeteredGateway, resolveMeteredModel } from './gateway';
+export { ACTOR_ID_HEADER, ATTEMPT_HEADER, buildIdentityHeaders, DATABASE_ID_HEADER, ENTITY_ID_HEADER, INVOCATION_ID_HEADER, JOB_ID_HEADER, RUN_ID_HEADER } from './identity';
 export { httpUsageSink, UsageReporter } from './reporter';
 export { isAssistantMessage, toUsageReport } from './usage-report';

package/gateway.d.ts

@@ -3,7 +3,7 @@
  *
  * `agentic-server` speaks OpenAI's `/v1/chat/completions`, so routing a harness
  * through it needs no custom streaming code — only an endpoint whose `baseUrl` is
- * the gateway and whose headers carry the run's identity. Every harness worth
+ * the gateway's OpenAI api root and whose headers carry the run's identity. Every harness worth
  * adapting can already talk to an OpenAI-compatible endpoint, which is why this
  * resolution is neutral and only the registration is vendor-specific: an adapter
  * turns `MeteredGateway` into whatever its harness calls a provider.
@@ -35,7 +35,7 @@ export interface MeteredModelSpec {
     cost?: MeteredModelCost;
 }
 export interface MeteredGatewayOptions {
-    /** Gateway root, e.g. `https://agentic.example.com` — not a `/v1` path. */
+    /** Gateway root, e.g. `https://agentic.example.com`; a trailing `/v1` is tolerated. */
     gatewayUrl: string;
     identity: MeteredIdentity;
     models: readonly MeteredModelSpec[];
@@ -72,8 +72,22 @@ export interface MeteredModel {
     contextWindow: number;
     maxTokens: number;
 }
-/** Normalize the gateway root: absolute http(s), no trailing slash, no `/v1`. */
+/**
+ * Normalize the gateway root: absolute http(s), no trailing slash, no `/v1`.
+ *
+ * A caller who names the api root instead is answered the root it hangs under,
+ * so a deployment that spells its gateway either way reaches the same routes
+ * rather than one of them 404ing on the first model turn.
+ */
 export declare function normalizeGatewayUrl(gatewayUrl: string): string;
+/**
+ * The OpenAI api root under a gateway root.
+ *
+ * An `openai-completions` client (pi-ai, the OpenAI SDKs, any harness built on
+ * either) appends `/chat/completions` to its `baseUrl` and nothing else, so the
+ * `/v1` belongs here rather than in the caller's environment.
+ */
+export declare function completionsBaseUrl(gatewayUrl: string): string;
 export declare function resolveMeteredModel(spec: MeteredModelSpec): MeteredModel;
 /**
  * Resolve the gateway endpoint for a run.

package/gateway.js

@@ -4,7 +4,7 @@
  *
  * `agentic-server` speaks OpenAI's `/v1/chat/completions`, so routing a harness
  * through it needs no custom streaming code — only an endpoint whose `baseUrl` is
- * the gateway and whose headers carry the run's identity. Every harness worth
+ * the gateway's OpenAI api root and whose headers carry the run's identity. Every harness worth
  * adapting can already talk to an OpenAI-compatible endpoint, which is why this
  * resolution is neutral and only the registration is vendor-specific: an adapter
  * turns `MeteredGateway` into whatever its harness calls a provider.
@@ -12,6 +12,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_PROVIDER_NAME = exports.GATEWAY_API = void 0;
 exports.normalizeGatewayUrl = normalizeGatewayUrl;
+exports.completionsBaseUrl = completionsBaseUrl;
 exports.resolveMeteredModel = resolveMeteredModel;
 exports.resolveMeteredGateway = resolveMeteredGateway;
 const identity_1 = require("./identity");
@@ -20,7 +21,13 @@ exports.GATEWAY_API = 'openai-completions';
 /** Default provider name; also the prefix a model picker shows. */
 exports.DEFAULT_PROVIDER_NAME = 'constructive-gateway';
 const ZERO_COST = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
-/** Normalize the gateway root: absolute http(s), no trailing slash, no `/v1`. */
+/**
+ * Normalize the gateway root: absolute http(s), no trailing slash, no `/v1`.
+ *
+ * A caller who names the api root instead is answered the root it hangs under,
+ * so a deployment that spells its gateway either way reaches the same routes
+ * rather than one of them 404ing on the first model turn.
+ */
 function normalizeGatewayUrl(gatewayUrl) {
     const raw = gatewayUrl?.trim();
     if (!raw)
@@ -35,14 +42,19 @@ function normalizeGatewayUrl(gatewayUrl) {
     if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {
         throw new Error(`metered model: gatewayUrl must be http(s), got ${parsed.protocol}`);
     }
-    const path = parsed.pathname.replace(/\/+$/, '');
-    // An OpenAI-compatible client appends `/v1/chat/completions`, so a baseUrl that
-    // already ends in `/v1` would request `/v1/v1/chat/completions` and 404 at the
-    // first model turn.
-    if (/\/v1$/.test(path))
-        throw new Error(`metered model: gatewayUrl must be the gateway root, not ${raw} (drop the /v1)`);
+    const path = parsed.pathname.replace(/\/+$/, '').replace(/\/v1$/, '');
     return `${parsed.origin}${path}`;
 }
+/**
+ * The OpenAI api root under a gateway root.
+ *
+ * An `openai-completions` client (pi-ai, the OpenAI SDKs, any harness built on
+ * either) appends `/chat/completions` to its `baseUrl` and nothing else, so the
+ * `/v1` belongs here rather than in the caller's environment.
+ */
+function completionsBaseUrl(gatewayUrl) {
+    return `${normalizeGatewayUrl(gatewayUrl)}/v1`;
+}
 function resolveMeteredModel(spec) {
     if (!spec.id?.trim())
         throw new Error('metered model: model id is required');
@@ -70,7 +82,7 @@ function resolveMeteredGateway(options) {
     return {
         providerName: options.providerName ?? exports.DEFAULT_PROVIDER_NAME,
         displayName: options.displayName ?? 'Constructive (metered)',
-        baseUrl: normalizeGatewayUrl(options.gatewayUrl),
+        baseUrl: completionsBaseUrl(options.gatewayUrl),
         api: exports.GATEWAY_API,
         headers,
         // Harnesses typically require an apiKey once models are declared; the gateway

package/identity.d.ts

@@ -1,10 +1,12 @@
 /**
- * Who a metered request belongs to.
+ * Who a metered request belongs to, and which task it is a cost of.
  *
- * These are exactly the headers `agentic-server` reads (`X-Database-Id`,
- * `X-Entity-Id`, `X-Actor-Id`) — the same identity lane the platform's own
- * clients use — so a pi session lands in `inference_log` beside every other
- * metered call rather than in a parallel accounting scheme.
+ * These are exactly the headers `agentic-server` reads — identity
+ * (`X-Database-Id`, `X-Entity-Id`, `X-Actor-Id`) plus task correlation
+ * (`X-Invocation-Id`, `X-Job-Id`, `X-Attempt`, `X-Run-Id`) — the same lane the
+ * platform's own clients use, so a pi session lands in `inference_log` beside
+ * every other metered call rather than in a parallel accounting scheme, and its
+ * tokens join the invocation the customer was actually charged for.
  *
  * Headers are only trustworthy where the gateway is not reachable by the
  * untrusted party: in-cluster, or behind an authenticated ingress that pins the
@@ -18,6 +20,14 @@ export interface MeteredIdentity {
     entityId?: string;
     /** The actor on whose behalf the run executes. */
     actorId?: string;
+    /** Invocation the run is executing, when the platform dispatched it. */
+    invocationId?: string;
+    /** Queue job id for that invocation; decimal digits only. */
+    jobId?: string;
+    /** Attempt number of that job; a non-negative integer. */
+    attempt?: number;
+    /** The agent run itself. */
+    runId?: string;
     /**
      * Bearer token for the gateway's ingress — run-scoped, not an account token.
      * Sent as `Authorization: Bearer <token>`.
@@ -27,6 +37,10 @@ export interface MeteredIdentity {
 export declare const DATABASE_ID_HEADER = "X-Database-Id";
 export declare const ENTITY_ID_HEADER = "X-Entity-Id";
 export declare const ACTOR_ID_HEADER = "X-Actor-Id";
+export declare const INVOCATION_ID_HEADER = "X-Invocation-Id";
+export declare const JOB_ID_HEADER = "X-Job-Id";
+export declare const ATTEMPT_HEADER = "X-Attempt";
+export declare const RUN_ID_HEADER = "X-Run-Id";
 /**
  * Build the identity headers for a metered request.
  *

package/identity.js

@@ -1,11 +1,13 @@
 "use strict";
 /**
- * Who a metered request belongs to.
+ * Who a metered request belongs to, and which task it is a cost of.
  *
- * These are exactly the headers `agentic-server` reads (`X-Database-Id`,
- * `X-Entity-Id`, `X-Actor-Id`) — the same identity lane the platform's own
- * clients use — so a pi session lands in `inference_log` beside every other
- * metered call rather than in a parallel accounting scheme.
+ * These are exactly the headers `agentic-server` reads — identity
+ * (`X-Database-Id`, `X-Entity-Id`, `X-Actor-Id`) plus task correlation
+ * (`X-Invocation-Id`, `X-Job-Id`, `X-Attempt`, `X-Run-Id`) — the same lane the
+ * platform's own clients use, so a pi session lands in `inference_log` beside
+ * every other metered call rather than in a parallel accounting scheme, and its
+ * tokens join the invocation the customer was actually charged for.
  *
  * Headers are only trustworthy where the gateway is not reachable by the
  * untrusted party: in-cluster, or behind an authenticated ingress that pins the
@@ -13,11 +15,15 @@
  * ingress do the pinning.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ACTOR_ID_HEADER = exports.ENTITY_ID_HEADER = exports.DATABASE_ID_HEADER = void 0;
+exports.RUN_ID_HEADER = exports.ATTEMPT_HEADER = exports.JOB_ID_HEADER = exports.INVOCATION_ID_HEADER = exports.ACTOR_ID_HEADER = exports.ENTITY_ID_HEADER = exports.DATABASE_ID_HEADER = void 0;
 exports.buildIdentityHeaders = buildIdentityHeaders;
 exports.DATABASE_ID_HEADER = 'X-Database-Id';
 exports.ENTITY_ID_HEADER = 'X-Entity-Id';
 exports.ACTOR_ID_HEADER = 'X-Actor-Id';
+exports.INVOCATION_ID_HEADER = 'X-Invocation-Id';
+exports.JOB_ID_HEADER = 'X-Job-Id';
+exports.ATTEMPT_HEADER = 'X-Attempt';
+exports.RUN_ID_HEADER = 'X-Run-Id';
 /**
  * Build the identity headers for a metered request.
  *
@@ -36,6 +42,24 @@ function buildIdentityHeaders(identity) {
     const actorId = identity.actorId?.trim();
     if (actorId)
         headers[exports.ACTOR_ID_HEADER] = actorId;
+    const invocationId = identity.invocationId?.trim();
+    if (invocationId)
+        headers[exports.INVOCATION_ID_HEADER] = invocationId;
+    const jobId = identity.jobId?.trim();
+    if (jobId) {
+        if (!/^\d+$/.test(jobId))
+            throw new Error(`metered model: identity.jobId must be decimal digits, got "${jobId}"`);
+        headers[exports.JOB_ID_HEADER] = jobId;
+    }
+    if (identity.attempt !== undefined) {
+        if (!Number.isInteger(identity.attempt) || identity.attempt < 0) {
+            throw new Error(`metered model: identity.attempt must be a non-negative integer, got ${identity.attempt}`);
+        }
+        headers[exports.ATTEMPT_HEADER] = String(identity.attempt);
+    }
+    const runId = identity.runId?.trim();
+    if (runId)
+        headers[exports.RUN_ID_HEADER] = runId;
     const runToken = identity.runToken?.trim();
     if (runToken)
         headers.Authorization = `Bearer ${runToken}`;

package/index.d.ts

@@ -7,7 +7,7 @@
  * No harness SDK is imported here. An adapter registers `MeteredGateway` with
  * its own harness and feeds `toUsageReport()` from its own message events.
  */
-export { DEFAULT_PROVIDER_NAME, GATEWAY_API, type MeteredGateway, type MeteredGatewayOptions, type MeteredModel, type MeteredModelCost, type MeteredModelSpec, normalizeGatewayUrl, resolveMeteredGateway, resolveMeteredModel } from './gateway';
-export { ACTOR_ID_HEADER, buildIdentityHeaders, DATABASE_ID_HEADER, ENTITY_ID_HEADER, type MeteredIdentity } from './identity';
+export { completionsBaseUrl, DEFAULT_PROVIDER_NAME, GATEWAY_API, type MeteredGateway, type MeteredGatewayOptions, type MeteredModel, type MeteredModelCost, type MeteredModelSpec, normalizeGatewayUrl, resolveMeteredGateway, resolveMeteredModel } from './gateway';
+export { ACTOR_ID_HEADER, ATTEMPT_HEADER, buildIdentityHeaders, DATABASE_ID_HEADER, ENTITY_ID_HEADER, INVOCATION_ID_HEADER, JOB_ID_HEADER, type MeteredIdentity, RUN_ID_HEADER } from './identity';
 export { httpUsageSink, type HttpUsageSinkOptions, UsageReporter, type UsageReporterOptions, type UsageSink } from './reporter';
 export { type AssistantUsageMessage, isAssistantMessage, toUsageReport, type ToUsageReportOptions, type UsageReport } from './usage-report';

package/index.js

@@ -9,8 +9,9 @@
  * its own harness and feeds `toUsageReport()` from its own message events.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toUsageReport = exports.isAssistantMessage = exports.UsageReporter = exports.httpUsageSink = exports.ENTITY_ID_HEADER = exports.DATABASE_ID_HEADER = exports.buildIdentityHeaders = exports.ACTOR_ID_HEADER = exports.resolveMeteredModel = exports.resolveMeteredGateway = exports.normalizeGatewayUrl = exports.GATEWAY_API = exports.DEFAULT_PROVIDER_NAME = void 0;
+exports.toUsageReport = exports.isAssistantMessage = exports.UsageReporter = exports.httpUsageSink = exports.RUN_ID_HEADER = exports.JOB_ID_HEADER = exports.INVOCATION_ID_HEADER = exports.ENTITY_ID_HEADER = exports.DATABASE_ID_HEADER = exports.buildIdentityHeaders = exports.ATTEMPT_HEADER = exports.ACTOR_ID_HEADER = exports.resolveMeteredModel = exports.resolveMeteredGateway = exports.normalizeGatewayUrl = exports.GATEWAY_API = exports.DEFAULT_PROVIDER_NAME = exports.completionsBaseUrl = void 0;
 var gateway_1 = require("./gateway");
+Object.defineProperty(exports, "completionsBaseUrl", { enumerable: true, get: function () { return gateway_1.completionsBaseUrl; } });
 Object.defineProperty(exports, "DEFAULT_PROVIDER_NAME", { enumerable: true, get: function () { return gateway_1.DEFAULT_PROVIDER_NAME; } });
 Object.defineProperty(exports, "GATEWAY_API", { enumerable: true, get: function () { return gateway_1.GATEWAY_API; } });
 Object.defineProperty(exports, "normalizeGatewayUrl", { enumerable: true, get: function () { return gateway_1.normalizeGatewayUrl; } });
@@ -18,9 +19,13 @@ Object.defineProperty(exports, "resolveMeteredGateway", { enumerable: true, get:
 Object.defineProperty(exports, "resolveMeteredModel", { enumerable: true, get: function () { return gateway_1.resolveMeteredModel; } });
 var identity_1 = require("./identity");
 Object.defineProperty(exports, "ACTOR_ID_HEADER", { enumerable: true, get: function () { return identity_1.ACTOR_ID_HEADER; } });
+Object.defineProperty(exports, "ATTEMPT_HEADER", { enumerable: true, get: function () { return identity_1.ATTEMPT_HEADER; } });
 Object.defineProperty(exports, "buildIdentityHeaders", { enumerable: true, get: function () { return identity_1.buildIdentityHeaders; } });
 Object.defineProperty(exports, "DATABASE_ID_HEADER", { enumerable: true, get: function () { return identity_1.DATABASE_ID_HEADER; } });
 Object.defineProperty(exports, "ENTITY_ID_HEADER", { enumerable: true, get: function () { return identity_1.ENTITY_ID_HEADER; } });
+Object.defineProperty(exports, "INVOCATION_ID_HEADER", { enumerable: true, get: function () { return identity_1.INVOCATION_ID_HEADER; } });
+Object.defineProperty(exports, "JOB_ID_HEADER", { enumerable: true, get: function () { return identity_1.JOB_ID_HEADER; } });
+Object.defineProperty(exports, "RUN_ID_HEADER", { enumerable: true, get: function () { return identity_1.RUN_ID_HEADER; } });
 var reporter_1 = require("./reporter");
 Object.defineProperty(exports, "httpUsageSink", { enumerable: true, get: function () { return reporter_1.httpUsageSink; } });
 Object.defineProperty(exports, "UsageReporter", { enumerable: true, get: function () { return reporter_1.UsageReporter; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentic-kit/metering",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "author": "Constructive <developers@constructive.io>",
   "description": "harness-neutral metering for an agent run — the Constructive gateway as a model endpoint, run identity headers, and usage reporting",
   "main": "index.js",
@@ -35,5 +35,5 @@
     "gateway",
     "constructive"
   ],
-  "gitHead": "b5b6b9f05276b7e9cbd3d1f4acd31dd315c353ea"
+  "gitHead": "cc30249ddf84bc8c410d9681adb15f98228ab591"
 }