@inkeep/agents-core 0.78.0 → 0.78.1

package/dist/utils/cache-debug-walk.js

@@ -7,12 +7,6 @@ import { deriveCacheState, isProviderSupportedForCaching, resolveCachingProvider
 * `buildCacheDebugQuery` into a chronologically ordered list of `CacheDebugCall`
 * records — each carrying the derived `CacheState`.
 *
-* Per-agent priorSignature tracking (mirrors the per-agent walk in
-* agents-manage-ui/.../[conversationId]/route.ts). A single global cursor
-* cross-contaminates `priorSignature` between sub-agents in multi-agent
-* conversations and reports false MISS-expected / MISS-regression states; the
-* Map<subAgentId, signature> keeps each agent's cursor independent.
-*
 * This is the pure, testable core of the `pnpm cache-debug` CLI. The CLI itself
 * remains a thin shell that fetches from SigNoz and prints these records.
 */
@@ -31,25 +25,16 @@ function getNumber(row, key) {
 	const n = typeof value === "number" ? value : Number(value);
 	return Number.isFinite(n) ? n : 0;
 }
-function subAgentKey(row) {
-	return getString(row, SPAN_KEYS.AI_TELEMETRY_SUB_AGENT_ID) || getString(row, SPAN_KEYS.AGENT_ID) || "_default";
-}
 /**
-* Walk the LLM-span rows chronologically, deriving each call's cache state with
-* a per-agent prior-signature cursor.
+* Walk the LLM-span rows chronologically, deriving each call's cache state.
 *
-* The walk:
-*   1. Sorts rows by `SPAN_KEYS.TIMESTAMP` (ascending).
-*   2. For each row, resolves the sub-agent key via fallback chain
-*      `AI_TELEMETRY_SUB_AGENT_ID -> AGENT_ID -> '_default'`.
-*   3. Looks up that agent's prior signature in `priorSignatureByAgent`.
-*   4. Calls `deriveCacheState` and, if the row's `prefix_signature` is non-empty,
-*      updates the agent's cursor.
+* The walk sorts rows by `SPAN_KEYS.TIMESTAMP` (ascending) and derives each
+* call's `CacheState` from its own attributes (marker count, cache-read tokens,
+* provider support).
 */
 function deriveCacheDebugCalls(rows) {
 	const sorted = [...rows].sort((a, b) => getString(a, SPAN_KEYS.TIMESTAMP).localeCompare(getString(b, SPAN_KEYS.TIMESTAMP)));
 	const calls = [];
-	const priorSignatureByAgent = /* @__PURE__ */ new Map();
 	for (const row of sorted) {
 		const prefixSignature = getString(row, SPAN_KEYS.CACHE_INTENT_PREFIX_SIGNATURE) || null;
 		const cacheReadTokens = getNumber(row, SPAN_KEYS.GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS);
@@ -59,15 +44,11 @@ function deriveCacheDebugCalls(rows) {
 			requestProvider,
 			responseProvider: getString(row, SPAN_KEYS.GEN_AI_RESPONSE_PROVIDER)
 		});
-		const subAgentId = subAgentKey(row);
 		const cacheState = deriveCacheState({
 			markerCount,
-			prefixSignature,
 			cacheRead: cacheReadTokens,
-			priorSignature: priorSignatureByAgent.get(subAgentId) ?? null,
 			providerSupportsCaching: cachingProvider ? isProviderSupportedForCaching(cachingProvider) : true
 		});
-		if (prefixSignature) priorSignatureByAgent.set(subAgentId, prefixSignature);
 		calls.push({
 			spanId: getString(row, SPAN_KEYS.SPAN_ID),
 			timestamp: getString(row, SPAN_KEYS.TIMESTAMP),

package/dist/utils/cache-state.d.ts

@@ -1,5 +1,5 @@
 //#region src/utils/cache-state.d.ts
-type CacheState = 'HIT' | 'MISS-regression' | 'MISS-expected' | 'NOT-ATTEMPTED' | 'NOT-SUPPORTED-BY-PROVIDER';
+type CacheState = 'HIT' | 'MISS' | 'NOT-ATTEMPTED' | 'NOT-SUPPORTED-BY-PROVIDER';
 declare function isProviderSupportedForCaching(provider: string): boolean;
 /**
  * Resolve the provider to use for the caching-support gate.
@@ -20,16 +20,12 @@ declare function resolveCachingProvider({
 }): string;
 interface DeriveCacheStateInput {
   markerCount: number;
-  prefixSignature: string | null;
   cacheRead: number;
-  priorSignature?: string | null;
   providerSupportsCaching?: boolean;
 }
 declare function deriveCacheState({
   markerCount,
-  prefixSignature,
   cacheRead,
-  priorSignature,
   providerSupportsCaching
 }: DeriveCacheStateInput): CacheState;
 //#endregion

package/dist/utils/cache-state.js

@@ -21,12 +21,11 @@ function isProviderSupportedForCaching(provider) {
 function resolveCachingProvider({ requestProvider, responseProvider }) {
 	return (responseProvider || requestProvider || "").trim();
 }
-function deriveCacheState({ markerCount, prefixSignature, cacheRead, priorSignature = null, providerSupportsCaching = true }) {
+function deriveCacheState({ markerCount, cacheRead, providerSupportsCaching = true }) {
 	if (!providerSupportsCaching) return "NOT-SUPPORTED-BY-PROVIDER";
-	if (markerCount <= 0) return "NOT-ATTEMPTED";
 	if (cacheRead > 0) return "HIT";
-	if (priorSignature && prefixSignature && prefixSignature === priorSignature) return "MISS-regression";
-	return "MISS-expected";
+	if (markerCount <= 0) return "NOT-ATTEMPTED";
+	return "MISS";
 }
 
 //#endregion

package/dist/utils/index.d.ts

@@ -34,9 +34,9 @@ import "./third-party-mcp-servers/index.js";
 import { AssembleResult, estimateTokens } from "./token-estimator.js";
 import { flushTraces, getTracer, setSpanWithError, unwrapError } from "./tracer-factory.js";
 import { HashedHeaderValue, SignatureVerificationErrorCode, SignatureVerificationResult, TriggerAuthResult, hashAuthenticationHeaders, hashTriggerHeaderValue, validateTriggerHeaderValue, verifySignatureWithConfig, verifyTriggerAuth } from "./trigger-auth.js";
-import { computePrefixSignature, countCacheMarkers, extractUsageTokens, gatewayCostMiddleware, normalizeModelId } from "./usage-cost-middleware.js";
+import { computePrefixSignature, countCacheMarkers, countHistoryCacheMarkers, extractUsageTokens, gatewayCostMiddleware, normalizeModelId } from "./usage-cost-middleware.js";
 import "./usage-tracker.js";
 import { ValidatePublicKeyResult, validatePublicKey } from "./validate-public-key.js";
 import { _resetWaitUntilCache, getWaitUntil } from "./wait-until.js";
 import { TRUSTED_WORK_APP_MCP_PATHS, isTrustedWorkAppMcpUrl } from "./work-app-mcp.js";
-export { ApiKeyGenerationResult, AppCredentialResult, AssembleResult, CommonCreateErrorResponses, CommonDeleteErrorResponses, CommonGetErrorResponses, CommonUpdateErrorResponses, ComposioAuthResult, CredentialScope, ERROR_DOCS_BASE_URL, ErrorCode, ErrorCodes, ErrorResponse, GenerateInternalServiceTokenParams, GenerateServiceTokenParams, GenerationType, HashedHeaderValue, InternalServiceId, InternalServiceTokenPayload, InternalServices, JsonTransformer, JwtVerifyResult, LLMMessage, LoggerFactoryConfig, McpClient, McpClientOptions, McpOAuthFlowResult, McpSSEConfig, McpServerConfig, McpStreamableHttpConfig, McpTokenExchangeResult, MockLanguageModel, ModelFactory, OAuthConfig, ParsedSSEResponse, PinoLogger, PinoLoggerConfig, PoWError, PoWResult, ProblemDetails, SKILL_ENTRY_FILE_PATH, SentinelError, SentinelVerifyResult, ServiceTokenPayload, SignJwtOptions, SignSlackLinkTokenParams, SignSlackUserTokenParams, SignatureVerificationErrorCode, SignatureVerificationResult, SlackAccessTokenPayload, SlackAccessTokenPayloadSchema, SlackLinkIntent, SlackLinkIntentSchema, SlackLinkTokenPayload, SlackLinkTokenPayloadSchema, TRUSTED_WORK_APP_MCP_PATHS, TempTokenPayload, TriggerAuthResult, ValidatePublicKeyResult, VerifyInternalServiceTokenResult, VerifyJwtOptions, VerifyServiceTokenResult, VerifySlackLinkTokenResult, VerifySlackUserTokenResult, _resetWaitUntilCache, activeMcpClients, buildConversationMetadata, buildConversationUserProperties, commonCreateErrorResponses, commonDeleteErrorResponses, commonGetErrorResponses, commonUpdateErrorResponses, computeNextRunAt, computePrefixSignature, configureComposioMCPServer, convertZodToJsonSchema, convertZodToJsonSchemaWithPreview, countCacheMarkers, createApiError, createMockModel, decodeJwtPayload, deleteComposioConnectedAccount, deriveKidFromPublicKey, deriveRelationId, detectAuthenticationRequired, errorResponseSchema, errorSchemaFactory, estimateTokens, exchangeMcpAuthorizationCode, extractBearerToken, extractComposioServerId, extractPreviewFields, extractPublicId, extractUsageTokens, fetchComposioServers, fetchSingleComposioServer, flushTraces, formatMessagesForLLM, formatMessagesForLLMContext, gatewayCostMiddleware, generateApiKey, generateAppCredential, generateId, generateInternalServiceToken, generateServiceToken, getComposioInstance, getComposioOAuthRedirectUrl, getComposioUserId, getConversationId, getConversationProperties, getConversationUserProperties, getCredentialStoreLookupKeyFromRetrievalParams, getDatabaseErrorLogContext, getInProcessFetch, getJwtSecret, getLogger, getMessageUserProperties, getMetadataFromApiKey, getPoWErrorMessage, getTracer, getWaitUntil, handleApiError, hasIssuer, hashApiKey, hashAuthenticationHeaders, hashTriggerHeaderValue, initiateMcpOAuthFlow, interpolateTemplate, isApiKeyExpired, isComposioMCPServerAuthenticated, isDevelopment, isInternalServiceToken, isPoWEnabled, isProduction, isSentinelEnabled, isSentinelUpstreamUnavailable, isSlackUserToken, isTest, isThirdPartyMCPServerAuthenticated, isTrustedWorkAppMcpUrl, isUniqueConstraintError, isZodSchema, loggerFactory, makeAllPropertiesRequired, maskApiKey, normalizeDataComponentSchema, normalizeDateString, normalizeModelId, parseEmbeddedJson, parseSSEResponse, parseSkillFromMarkdown, preview, problemDetailsSchema, registerAppFetch, retryWithBackoff, runWithLogContext, sanitizeAppConfig, serializeSkillToMarkdown, setSpanWithError, signJwt, signSlackLinkToken, signSlackUserToken, stripUnsupportedConstraints, throwIfUniqueConstraintError, toISODateString, unwrapError, validateApiKey, validateInternalServiceProjectAccess, validateInternalServiceTenantAccess, validateOrigin, validatePublicKey, validateTargetAgent, validateTenantId, validateTriggerHeaderValue, verifyAuthorizationHeader, verifyInternalServiceAuthHeader, verifyInternalServiceToken, verifyJwt, verifyPoW, verifySentinelPayload, verifyServiceToken, verifySignatureWithConfig, verifySlackLinkToken, verifySlackUserToken, verifyTempToken, verifyTriggerAuth };
+export { ApiKeyGenerationResult, AppCredentialResult, AssembleResult, CommonCreateErrorResponses, CommonDeleteErrorResponses, CommonGetErrorResponses, CommonUpdateErrorResponses, ComposioAuthResult, CredentialScope, ERROR_DOCS_BASE_URL, ErrorCode, ErrorCodes, ErrorResponse, GenerateInternalServiceTokenParams, GenerateServiceTokenParams, GenerationType, HashedHeaderValue, InternalServiceId, InternalServiceTokenPayload, InternalServices, JsonTransformer, JwtVerifyResult, LLMMessage, LoggerFactoryConfig, McpClient, McpClientOptions, McpOAuthFlowResult, McpSSEConfig, McpServerConfig, McpStreamableHttpConfig, McpTokenExchangeResult, MockLanguageModel, ModelFactory, OAuthConfig, ParsedSSEResponse, PinoLogger, PinoLoggerConfig, PoWError, PoWResult, ProblemDetails, SKILL_ENTRY_FILE_PATH, SentinelError, SentinelVerifyResult, ServiceTokenPayload, SignJwtOptions, SignSlackLinkTokenParams, SignSlackUserTokenParams, SignatureVerificationErrorCode, SignatureVerificationResult, SlackAccessTokenPayload, SlackAccessTokenPayloadSchema, SlackLinkIntent, SlackLinkIntentSchema, SlackLinkTokenPayload, SlackLinkTokenPayloadSchema, TRUSTED_WORK_APP_MCP_PATHS, TempTokenPayload, TriggerAuthResult, ValidatePublicKeyResult, VerifyInternalServiceTokenResult, VerifyJwtOptions, VerifyServiceTokenResult, VerifySlackLinkTokenResult, VerifySlackUserTokenResult, _resetWaitUntilCache, activeMcpClients, buildConversationMetadata, buildConversationUserProperties, commonCreateErrorResponses, commonDeleteErrorResponses, commonGetErrorResponses, commonUpdateErrorResponses, computeNextRunAt, computePrefixSignature, configureComposioMCPServer, convertZodToJsonSchema, convertZodToJsonSchemaWithPreview, countCacheMarkers, countHistoryCacheMarkers, createApiError, createMockModel, decodeJwtPayload, deleteComposioConnectedAccount, deriveKidFromPublicKey, deriveRelationId, detectAuthenticationRequired, errorResponseSchema, errorSchemaFactory, estimateTokens, exchangeMcpAuthorizationCode, extractBearerToken, extractComposioServerId, extractPreviewFields, extractPublicId, extractUsageTokens, fetchComposioServers, fetchSingleComposioServer, flushTraces, formatMessagesForLLM, formatMessagesForLLMContext, gatewayCostMiddleware, generateApiKey, generateAppCredential, generateId, generateInternalServiceToken, generateServiceToken, getComposioInstance, getComposioOAuthRedirectUrl, getComposioUserId, getConversationId, getConversationProperties, getConversationUserProperties, getCredentialStoreLookupKeyFromRetrievalParams, getDatabaseErrorLogContext, getInProcessFetch, getJwtSecret, getLogger, getMessageUserProperties, getMetadataFromApiKey, getPoWErrorMessage, getTracer, getWaitUntil, handleApiError, hasIssuer, hashApiKey, hashAuthenticationHeaders, hashTriggerHeaderValue, initiateMcpOAuthFlow, interpolateTemplate, isApiKeyExpired, isComposioMCPServerAuthenticated, isDevelopment, isInternalServiceToken, isPoWEnabled, isProduction, isSentinelEnabled, isSentinelUpstreamUnavailable, isSlackUserToken, isTest, isThirdPartyMCPServerAuthenticated, isTrustedWorkAppMcpUrl, isUniqueConstraintError, isZodSchema, loggerFactory, makeAllPropertiesRequired, maskApiKey, normalizeDataComponentSchema, normalizeDateString, normalizeModelId, parseEmbeddedJson, parseSSEResponse, parseSkillFromMarkdown, preview, problemDetailsSchema, registerAppFetch, retryWithBackoff, runWithLogContext, sanitizeAppConfig, serializeSkillToMarkdown, setSpanWithError, signJwt, signSlackLinkToken, signSlackUserToken, stripUnsupportedConstraints, throwIfUniqueConstraintError, toISODateString, unwrapError, validateApiKey, validateInternalServiceProjectAccess, validateInternalServiceTenantAccess, validateOrigin, validatePublicKey, validateTargetAgent, validateTenantId, validateTriggerHeaderValue, verifyAuthorizationHeader, verifyInternalServiceAuthHeader, verifyInternalServiceToken, verifyJwt, verifyPoW, verifySentinelPayload, verifyServiceToken, verifySignatureWithConfig, verifySlackLinkToken, verifySlackUserToken, verifyTempToken, verifyTriggerAuth };

package/dist/utils/index.js

@@ -21,7 +21,7 @@ import { JsonTransformer } from "./JsonTransformer.js";
 import { parseEmbeddedJson } from "./json-parser.js";
 import { McpClient, activeMcpClients } from "./mcp-client.js";
 import { MockLanguageModel, createMockModel } from "./mock-provider.js";
-import { computePrefixSignature, countCacheMarkers, extractUsageTokens, gatewayCostMiddleware, normalizeModelId } from "./usage-cost-middleware.js";
+import { computePrefixSignature, countCacheMarkers, countHistoryCacheMarkers, extractUsageTokens, gatewayCostMiddleware, normalizeModelId } from "./usage-cost-middleware.js";
 import { ModelFactory } from "./model-factory.js";
 import { getPoWErrorMessage, isPoWEnabled, isSentinelEnabled, isSentinelUpstreamUnavailable, verifyPoW, verifySentinelPayload } from "./pow.js";
 import { retryWithBackoff } from "./retry.js";
@@ -38,4 +38,4 @@ import { validatePublicKey } from "./validate-public-key.js";
 import { _resetWaitUntilCache, getWaitUntil } from "./wait-until.js";
 import { TRUSTED_WORK_APP_MCP_PATHS, isTrustedWorkAppMcpUrl } from "./work-app-mcp.js";
 
-export { ERROR_DOCS_BASE_URL, ErrorCode, InternalServices, JsonTransformer, McpClient, MockLanguageModel, ModelFactory, PinoLogger, SKILL_ENTRY_FILE_PATH, SlackAccessTokenPayloadSchema, SlackLinkIntentSchema, SlackLinkTokenPayloadSchema, TRUSTED_WORK_APP_MCP_PATHS, _resetWaitUntilCache, activeMcpClients, buildConversationMetadata, buildConversationUserProperties, commonCreateErrorResponses, commonDeleteErrorResponses, commonGetErrorResponses, commonUpdateErrorResponses, computeNextRunAt, computePrefixSignature, configureComposioMCPServer, convertZodToJsonSchema, convertZodToJsonSchemaWithPreview, countCacheMarkers, createApiError, createMockModel, decodeJwtPayload, deleteComposioConnectedAccount, deriveKidFromPublicKey, deriveRelationId, detectAuthenticationRequired, errorResponseSchema, errorSchemaFactory, estimateTokens, exchangeMcpAuthorizationCode, extractBearerToken, extractComposioServerId, extractPreviewFields, extractPublicId, extractUsageTokens, fetchComposioServers, fetchSingleComposioServer, flushTraces, formatMessagesForLLM, formatMessagesForLLMContext, gatewayCostMiddleware, generateApiKey, generateAppCredential, generateId, generateInternalServiceToken, generateServiceToken, getComposioInstance, getComposioOAuthRedirectUrl, getComposioUserId, getConversationId, getConversationProperties, getConversationUserProperties, getCredentialStoreLookupKeyFromRetrievalParams, getDatabaseErrorLogContext, getInProcessFetch, getJwtSecret, getLogger, getMessageUserProperties, getMetadataFromApiKey, getPoWErrorMessage, getTracer, getWaitUntil, handleApiError, hasIssuer, hashApiKey, hashAuthenticationHeaders, hashTriggerHeaderValue, initiateMcpOAuthFlow, interpolateTemplate, isApiKeyExpired, isComposioMCPServerAuthenticated, isDevelopment, isInternalServiceToken, isPoWEnabled, isProduction, isSentinelEnabled, isSentinelUpstreamUnavailable, isSlackUserToken, isTest, isThirdPartyMCPServerAuthenticated, isTrustedWorkAppMcpUrl, isUniqueConstraintError, isZodSchema, loggerFactory, makeAllPropertiesRequired, maskApiKey, normalizeDataComponentSchema, normalizeDateString, normalizeModelId, parseEmbeddedJson, parseSSEResponse, parseSkillFromMarkdown, preview, problemDetailsSchema, registerAppFetch, retryWithBackoff, runWithLogContext, sanitizeAppConfig, serializeSkillToMarkdown, setSpanWithError, signJwt, signSlackLinkToken, signSlackUserToken, stripUnsupportedConstraints, throwIfUniqueConstraintError, toISODateString, unwrapError, validateApiKey, validateInternalServiceProjectAccess, validateInternalServiceTenantAccess, validateOrigin, validatePublicKey, validateTargetAgent, validateTenantId, validateTriggerHeaderValue, verifyAuthorizationHeader, verifyInternalServiceAuthHeader, verifyInternalServiceToken, verifyJwt, verifyPoW, verifySentinelPayload, verifyServiceToken, verifySignatureWithConfig, verifySlackLinkToken, verifySlackUserToken, verifyTempToken, verifyTriggerAuth };
+export { ERROR_DOCS_BASE_URL, ErrorCode, InternalServices, JsonTransformer, McpClient, MockLanguageModel, ModelFactory, PinoLogger, SKILL_ENTRY_FILE_PATH, SlackAccessTokenPayloadSchema, SlackLinkIntentSchema, SlackLinkTokenPayloadSchema, TRUSTED_WORK_APP_MCP_PATHS, _resetWaitUntilCache, activeMcpClients, buildConversationMetadata, buildConversationUserProperties, commonCreateErrorResponses, commonDeleteErrorResponses, commonGetErrorResponses, commonUpdateErrorResponses, computeNextRunAt, computePrefixSignature, configureComposioMCPServer, convertZodToJsonSchema, convertZodToJsonSchemaWithPreview, countCacheMarkers, countHistoryCacheMarkers, createApiError, createMockModel, decodeJwtPayload, deleteComposioConnectedAccount, deriveKidFromPublicKey, deriveRelationId, detectAuthenticationRequired, errorResponseSchema, errorSchemaFactory, estimateTokens, exchangeMcpAuthorizationCode, extractBearerToken, extractComposioServerId, extractPreviewFields, extractPublicId, extractUsageTokens, fetchComposioServers, fetchSingleComposioServer, flushTraces, formatMessagesForLLM, formatMessagesForLLMContext, gatewayCostMiddleware, generateApiKey, generateAppCredential, generateId, generateInternalServiceToken, generateServiceToken, getComposioInstance, getComposioOAuthRedirectUrl, getComposioUserId, getConversationId, getConversationProperties, getConversationUserProperties, getCredentialStoreLookupKeyFromRetrievalParams, getDatabaseErrorLogContext, getInProcessFetch, getJwtSecret, getLogger, getMessageUserProperties, getMetadataFromApiKey, getPoWErrorMessage, getTracer, getWaitUntil, handleApiError, hasIssuer, hashApiKey, hashAuthenticationHeaders, hashTriggerHeaderValue, initiateMcpOAuthFlow, interpolateTemplate, isApiKeyExpired, isComposioMCPServerAuthenticated, isDevelopment, isInternalServiceToken, isPoWEnabled, isProduction, isSentinelEnabled, isSentinelUpstreamUnavailable, isSlackUserToken, isTest, isThirdPartyMCPServerAuthenticated, isTrustedWorkAppMcpUrl, isUniqueConstraintError, isZodSchema, loggerFactory, makeAllPropertiesRequired, maskApiKey, normalizeDataComponentSchema, normalizeDateString, normalizeModelId, parseEmbeddedJson, parseSSEResponse, parseSkillFromMarkdown, preview, problemDetailsSchema, registerAppFetch, retryWithBackoff, runWithLogContext, sanitizeAppConfig, serializeSkillToMarkdown, setSpanWithError, signJwt, signSlackLinkToken, signSlackUserToken, stripUnsupportedConstraints, throwIfUniqueConstraintError, toISODateString, unwrapError, validateApiKey, validateInternalServiceProjectAccess, validateInternalServiceTenantAccess, validateOrigin, validatePublicKey, validateTargetAgent, validateTenantId, validateTriggerHeaderValue, verifyAuthorizationHeader, verifyInternalServiceAuthHeader, verifyInternalServiceToken, verifyJwt, verifyPoW, verifySentinelPayload, verifyServiceToken, verifySignatureWithConfig, verifySlackLinkToken, verifySlackUserToken, verifyTempToken, verifyTriggerAuth };

package/dist/utils/usage-cost-middleware.d.ts

@@ -10,7 +10,13 @@ declare function extractUsageTokens(usage: any): {
 };
 declare function normalizeModelId(modelId: string): string;
 declare function countCacheMarkers(prompt: readonly any[], callProviderOptions?: Record<string, any>): number;
+/**
+ * Count of part-level (conversation-history / BP2) cache markers only — the distinct BP2 signal.
+ * BP1 (system + tools) is message-level and tracked via the prefix signature; this isolates the
+ * history boundary so cross-turn cache participation can be attributed to it.
+ */
+declare function countHistoryCacheMarkers(prompt: readonly any[]): number;
 declare function computePrefixSignature(prompt: readonly any[], tools?: readonly any[]): string;
 declare const gatewayCostMiddleware: LanguageModelMiddleware;
 //#endregion
-export { computePrefixSignature, countCacheMarkers, extractUsageTokens, gatewayCostMiddleware, normalizeModelId };
+export { computePrefixSignature, countCacheMarkers, countHistoryCacheMarkers, extractUsageTokens, gatewayCostMiddleware, normalizeModelId };

package/dist/utils/usage-cost-middleware.js

@@ -57,9 +57,26 @@ function countCacheMarkers(prompt, callProviderOptions) {
 	let count = 0;
 	const caching = callProviderOptions?.gateway?.caching;
 	if (caching && caching !== "off" && caching !== "disabled") count++;
-	for (const msg of prompt) if (msg.providerOptions?.anthropic?.cacheControl) count++;
+	for (const msg of prompt) {
+		if (msg.providerOptions?.anthropic?.cacheControl) count++;
+		if (Array.isArray(msg.content)) {
+			for (const part of msg.content) if (part?.providerOptions?.anthropic?.cacheControl) count++;
+		}
+	}
 	return Math.min(count, 4);
 }
+/**
+* Count of part-level (conversation-history / BP2) cache markers only — the distinct BP2 signal.
+* BP1 (system + tools) is message-level and tracked via the prefix signature; this isolates the
+* history boundary so cross-turn cache participation can be attributed to it.
+*/
+function countHistoryCacheMarkers(prompt) {
+	let count = 0;
+	for (const msg of prompt) if (Array.isArray(msg.content)) {
+		for (const part of msg.content) if (part?.providerOptions?.anthropic?.cacheControl) count++;
+	}
+	return count;
+}
 function computePrefixSignature(prompt, tools) {
 	const systemParts = [];
 	for (const msg of prompt) {
@@ -88,6 +105,8 @@ function setCacheAttributesOnSpan(params, usage) {
 	activeSpan.setAttribute(SPAN_KEYS.CACHE_INTENT_MARKER_COUNT, markerCount);
 	const prefixSignature = computePrefixSignature(prompt, params.tools);
 	activeSpan.setAttribute(SPAN_KEYS.CACHE_INTENT_PREFIX_SIGNATURE, prefixSignature);
+	const historyMarkerCount = countHistoryCacheMarkers(prompt);
+	activeSpan.setAttribute(SPAN_KEYS.CACHE_INTENT_HISTORY_MARKER_COUNT, historyMarkerCount);
 }
 const gatewayCostMiddleware = {
 	specificationVersion: "v3",
@@ -132,4 +151,4 @@ const gatewayCostMiddleware = {
 };
 
 //#endregion
-export { computePrefixSignature, countCacheMarkers, extractUsageTokens, gatewayCostMiddleware, normalizeModelId };
+export { computePrefixSignature, countCacheMarkers, countHistoryCacheMarkers, extractUsageTokens, gatewayCostMiddleware, normalizeModelId };

package/dist/validation/schemas/skills.d.ts

@@ -1,6 +1,6 @@
 import { z } from "@hono/zod-openapi";
-import * as drizzle_orm_pg_core0 from "drizzle-orm/pg-core";
-import * as drizzle_zod0 from "drizzle-zod";
+import * as drizzle_orm_pg_core1079 from "drizzle-orm/pg-core";
+import * as drizzle_zod15 from "drizzle-zod";
 
 //#region src/validation/schemas/skills.d.ts
 declare const SkillIndexSchema: z.ZodInt;
@@ -27,8 +27,8 @@ declare const SkillFileContentInputSchema: z.ZodObject<{
   filePath: z.ZodString;
   content: z.ZodString;
 }, z.core.$strip>;
-declare const SkillFileSelectSchema: drizzle_zod0.BuildSchema<"select", {
-  createdAt: drizzle_orm_pg_core0.PgColumn<{
+declare const SkillFileSelectSchema: drizzle_zod15.BuildSchema<"select", {
+  createdAt: drizzle_orm_pg_core1079.PgColumn<{
     name: "created_at";
     tableName: "skill_files";
     dataType: "string";
@@ -45,7 +45,7 @@ declare const SkillFileSelectSchema: drizzle_zod0.BuildSchema<"select", {
     identity: undefined;
     generated: undefined;
   }, {}, {}>;
-  updatedAt: drizzle_orm_pg_core0.PgColumn<{
+  updatedAt: drizzle_orm_pg_core1079.PgColumn<{
     name: "updated_at";
     tableName: "skill_files";
     dataType: "string";
@@ -62,7 +62,7 @@ declare const SkillFileSelectSchema: drizzle_zod0.BuildSchema<"select", {
     identity: undefined;
     generated: undefined;
   }, {}, {}>;
-  skillId: drizzle_orm_pg_core0.PgColumn<{
+  skillId: drizzle_orm_pg_core1079.PgColumn<{
     name: "skill_id";
     tableName: "skill_files";
     dataType: "string";
@@ -81,7 +81,7 @@ declare const SkillFileSelectSchema: drizzle_zod0.BuildSchema<"select", {
   }, {}, {
     length: 64;
   }>;
-  filePath: drizzle_orm_pg_core0.PgColumn<{
+  filePath: drizzle_orm_pg_core1079.PgColumn<{
     name: "file_path";
     tableName: "skill_files";
     dataType: "string";
@@ -100,7 +100,7 @@ declare const SkillFileSelectSchema: drizzle_zod0.BuildSchema<"select", {
   }, {}, {
     length: 1024;
   }>;
-  content: drizzle_orm_pg_core0.PgColumn<{
+  content: drizzle_orm_pg_core1079.PgColumn<{
     name: "content";
     tableName: "skill_files";
     dataType: "string";
@@ -117,7 +117,7 @@ declare const SkillFileSelectSchema: drizzle_zod0.BuildSchema<"select", {
     identity: undefined;
     generated: undefined;
   }, {}, {}>;
-  projectId: drizzle_orm_pg_core0.PgColumn<{
+  projectId: drizzle_orm_pg_core1079.PgColumn<{
     name: "project_id";
     tableName: "skill_files";
     dataType: "string";
@@ -136,7 +136,7 @@ declare const SkillFileSelectSchema: drizzle_zod0.BuildSchema<"select", {
   }, {}, {
     length: 256;
   }>;
-  tenantId: drizzle_orm_pg_core0.PgColumn<{
+  tenantId: drizzle_orm_pg_core1079.PgColumn<{
     name: "tenant_id";
     tableName: "skill_files";
     dataType: "string";
@@ -155,7 +155,7 @@ declare const SkillFileSelectSchema: drizzle_zod0.BuildSchema<"select", {
   }, {}, {
     length: 256;
   }>;
-  id: drizzle_orm_pg_core0.PgColumn<{
+  id: drizzle_orm_pg_core1079.PgColumn<{
     name: "id";
     tableName: "skill_files";
     dataType: "string";
@@ -174,8 +174,8 @@ declare const SkillFileSelectSchema: drizzle_zod0.BuildSchema<"select", {
   }, {}, {
     length: 256;
   }>;
-}, drizzle_zod0.BuildRefine<{
-  createdAt: drizzle_orm_pg_core0.PgColumn<{
+}, drizzle_zod15.BuildRefine<{
+  createdAt: drizzle_orm_pg_core1079.PgColumn<{
     name: "created_at";
     tableName: "skill_files";
     dataType: "string";
@@ -192,7 +192,7 @@ declare const SkillFileSelectSchema: drizzle_zod0.BuildSchema<"select", {
     identity: undefined;
     generated: undefined;
   }, {}, {}>;
-  updatedAt: drizzle_orm_pg_core0.PgColumn<{
+  updatedAt: drizzle_orm_pg_core1079.PgColumn<{
     name: "updated_at";
     tableName: "skill_files";
     dataType: "string";
@@ -209,7 +209,7 @@ declare const SkillFileSelectSchema: drizzle_zod0.BuildSchema<"select", {
     identity: undefined;
     generated: undefined;
   }, {}, {}>;
-  skillId: drizzle_orm_pg_core0.PgColumn<{
+  skillId: drizzle_orm_pg_core1079.PgColumn<{
     name: "skill_id";
     tableName: "skill_files";
     dataType: "string";
@@ -228,7 +228,7 @@ declare const SkillFileSelectSchema: drizzle_zod0.BuildSchema<"select", {
   }, {}, {
     length: 64;
   }>;
-  filePath: drizzle_orm_pg_core0.PgColumn<{
+  filePath: drizzle_orm_pg_core1079.PgColumn<{
     name: "file_path";
     tableName: "skill_files";
     dataType: "string";
@@ -247,7 +247,7 @@ declare const SkillFileSelectSchema: drizzle_zod0.BuildSchema<"select", {
   }, {}, {
     length: 1024;
   }>;
-  content: drizzle_orm_pg_core0.PgColumn<{
+  content: drizzle_orm_pg_core1079.PgColumn<{
     name: "content";
     tableName: "skill_files";
     dataType: "string";
@@ -264,7 +264,7 @@ declare const SkillFileSelectSchema: drizzle_zod0.BuildSchema<"select", {
     identity: undefined;
     generated: undefined;
   }, {}, {}>;
-  projectId: drizzle_orm_pg_core0.PgColumn<{
+  projectId: drizzle_orm_pg_core1079.PgColumn<{
     name: "project_id";
     tableName: "skill_files";
     dataType: "string";
@@ -283,7 +283,7 @@ declare const SkillFileSelectSchema: drizzle_zod0.BuildSchema<"select", {
   }, {}, {
     length: 256;
   }>;
-  tenantId: drizzle_orm_pg_core0.PgColumn<{
+  tenantId: drizzle_orm_pg_core1079.PgColumn<{
     name: "tenant_id";
     tableName: "skill_files";
     dataType: "string";
@@ -302,7 +302,7 @@ declare const SkillFileSelectSchema: drizzle_zod0.BuildSchema<"select", {
   }, {}, {
     length: 256;
   }>;
-  id: drizzle_orm_pg_core0.PgColumn<{
+  id: drizzle_orm_pg_core1079.PgColumn<{
     name: "id";
     tableName: "skill_files";
     dataType: "string";
@@ -351,12 +351,12 @@ declare const SkillUpdateSchema: z.ZodObject<{
   }, z.core.$strip>>;
 }, z.core.$strip>;
 declare const SkillApiSelectSchema: z.ZodObject<{
-  name: z.ZodString;
-  description: z.ZodString;
   id: z.ZodString;
-  metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
   createdAt: z.ZodString;
+  name: z.ZodString;
   updatedAt: z.ZodString;
+  description: z.ZodString;
+  metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
   content: z.ZodString;
 }, z.core.$strip>;
 declare const SkillApiInsertSchema: z.ZodPipe<z.ZodPipe<z.ZodObject<{
@@ -413,8 +413,8 @@ declare const SkillFileApiSelectSchema: z.ZodObject<{
   createdAt: z.ZodString;
   updatedAt: z.ZodString;
   content: z.ZodString;
-  filePath: z.ZodString;
   skillId: z.ZodString;
+  filePath: z.ZodString;
 }, z.core.$strip>;
 declare const SkillFileApiInsertSchema: z.ZodObject<{
   filePath: z.ZodString;
@@ -424,20 +424,20 @@ declare const SkillFileApiUpdateSchema: z.ZodObject<{
   content: z.ZodString;
 }, z.core.$strip>;
 declare const SkillWithFilesApiSelectSchema: z.ZodObject<{
-  name: z.ZodString;
-  description: z.ZodString;
   id: z.ZodString;
-  metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
   createdAt: z.ZodString;
+  name: z.ZodString;
   updatedAt: z.ZodString;
+  description: z.ZodString;
+  metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
   content: z.ZodString;
   files: z.ZodArray<z.ZodObject<{
     id: z.ZodString;
     createdAt: z.ZodString;
     updatedAt: z.ZodString;
     content: z.ZodString;
-    filePath: z.ZodString;
     skillId: z.ZodString;
+    filePath: z.ZodString;
   }, z.core.$strip>>;
 }, z.core.$strip>;
 declare const SubAgentSkillSelectSchema: z.ZodObject<{
@@ -514,12 +514,12 @@ declare const SubAgentSkillApiUpdateSchema: z.ZodObject<{
   alwaysLoaded: z.ZodOptional<z.ZodOptional<z.ZodDefault<z.ZodOptional<z.ZodBoolean>>>>;
 }, z.core.$strip>;
 declare const SubAgentSkillWithIndexSchema: z.ZodObject<{
-  name: z.ZodString;
-  description: z.ZodString;
   id: z.ZodString;
-  metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
   createdAt: z.ZodString;
+  name: z.ZodString;
   updatedAt: z.ZodString;
+  description: z.ZodString;
+  metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
   content: z.ZodString;
   subAgentSkillId: z.ZodString;
   subAgentId: z.ZodString;
@@ -532,37 +532,37 @@ declare const SkillFileResponse: z.ZodObject<{
     createdAt: z.ZodString;
     updatedAt: z.ZodString;
     content: z.ZodString;
-    filePath: z.ZodString;
     skillId: z.ZodString;
+    filePath: z.ZodString;
   }, z.core.$strip>;
 }, z.core.$strip>;
 declare const SkillWithFilesResponse: z.ZodObject<{
   data: z.ZodObject<{
-    name: z.ZodString;
-    description: z.ZodString;
     id: z.ZodString;
-    metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
     createdAt: z.ZodString;
+    name: z.ZodString;
     updatedAt: z.ZodString;
+    description: z.ZodString;
+    metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
     content: z.ZodString;
     files: z.ZodArray<z.ZodObject<{
       id: z.ZodString;
       createdAt: z.ZodString;
       updatedAt: z.ZodString;
       content: z.ZodString;
-      filePath: z.ZodString;
       skillId: z.ZodString;
+      filePath: z.ZodString;
     }, z.core.$strip>>;
   }, z.core.$strip>;
 }, z.core.$strip>;
 declare const SkillListResponse: z.ZodObject<{
   data: z.ZodArray<z.ZodObject<{
-    name: z.ZodString;
-    description: z.ZodString;
     id: z.ZodString;
-    metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
     createdAt: z.ZodString;
+    name: z.ZodString;
     updatedAt: z.ZodString;
+    description: z.ZodString;
+    metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
     content: z.ZodString;
   }, z.core.$strip>>;
   pagination: z.ZodObject<{
@@ -585,12 +585,12 @@ declare const SubAgentSkillResponse: z.ZodObject<{
 }, z.core.$strip>;
 declare const SubAgentSkillWithIndexArrayResponse: z.ZodObject<{
   data: z.ZodArray<z.ZodObject<{
-    name: z.ZodString;
-    description: z.ZodString;
     id: z.ZodString;
-    metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
     createdAt: z.ZodString;
+    name: z.ZodString;
     updatedAt: z.ZodString;
+    description: z.ZodString;
+    metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
     content: z.ZodString;
     subAgentSkillId: z.ZodString;
     subAgentId: z.ZodString;