Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix: apply prompt-bridge credential rules from the persisted provider
Alfredo Lopez2052f2d90170
diff --git a/control-api/package-lock.json b/control-api/package-lock.jsonindex 62ec1ae47..aeaf96298 100644--- a/control-api/package-lock.json+++ b/control-api/package-lock.json@@ -1,12 +1,12 @@{"name": "clerum-control-api",- "version": "0.1.525",+ "version": "0.1.526","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-control-api",- "version": "0.1.525",+ "version": "0.1.526","dependencies": {"@clerum/display-field": "file:../packages/display-field","@clerum/image-policy": "file:../packages/image-policy",diff --git a/control-api/package.json b/control-api/package.jsonindex 0d1304ce4..872bcf041 100644--- a/control-api/package.json+++ b/control-api/package.json@@ -1,6 +1,6 @@{"name": "clerum-control-api",- "version": "0.1.525",+ "version": "0.1.526","description": "Internal Clerum control plane REST API + UI for managing CRDs and secrets","main": "dist/main.js","engines": {diff --git a/control-api/src/services/pluginWorkloadSdkFinalization.ts b/control-api/src/services/pluginWorkloadSdkFinalization.tsindex 1330f170b..bf45da245 100644--- a/control-api/src/services/pluginWorkloadSdkFinalization.ts+++ b/control-api/src/services/pluginWorkloadSdkFinalization.ts@@ -80,6 +80,40 @@ function isOauthBrokerProvider(provider: string): boolean {return isLlmProviderId(provider) && PROVIDER_AUTH_MODE[provider] === 'oauth-broker'}+function validateUsageFields(usage: PromptBridgeFinalizationUsage): void {+ requireNonEmpty(usage.callerRef, 'usage.callerRef')+ if (!Number.isInteger(usage.attemptCount) || usage.attemptCount < 1 || usage.attemptCount > 4) {+ throw new PromptBridgeFinalizationError('invalid_request', 'usage.attemptCount is invalid', 400)+ }+ if (+ !Number.isInteger(usage.inputTokens) ||+ usage.inputTokens < 0 ||+ !Number.isInteger(usage.outputTokens) ||+ usage.outputTokens < 0+ ) {+ throw new PromptBridgeFinalizationError(+ 'invalid_request',+ 'usage token counts must be non-negative integers',+ 400+ )+ }+}++/**+ * Credential-slot and secret-name emptiness follow the persisted attempt+ * provider. The request body must not choose whether those checks run.+ */+function assertPersistedAuthModeCredentialRules(+ persistedProvider: string,+ input: PromptBridgeFinalizationInput+): void {+ if (isOauthBrokerProvider(persistedProvider)) return+ requireNonEmpty(input.target.credentialSlot, 'target.credentialSlot')+ if (input.usage) {+ requireNonEmpty(input.usage.llmSecretName, 'usage.llmSecretName')+ }+}+function validateInput(input: PromptBridgeFinalizationInput): void {requireUuid(input.invocationId, 'invocationId')requireUuid(input.providerAttemptId, 'providerAttemptId')@@ -100,41 +134,15 @@ function validateInput(input: PromptBridgeFinalizationInput): void {requireNonEmpty(input.target.targetRef, 'target.targetRef')requireNonEmpty(input.target.provider, 'target.provider')requireNonEmpty(input.target.model, 'target.model')- if (!isOauthBrokerProvider(input.target.provider)) {- requireNonEmpty(input.target.credentialSlot, 'target.credentialSlot')- }+ if (input.usage) validateUsageFields(input.usage)if (input.status === 'complete') {- const usage = input.usage- if (!usage) {+ if (!input.usage) {throw new PromptBridgeFinalizationError('invalid_request','complete finalization requires exact usage',400)}- if (!isOauthBrokerProvider(input.target.provider)) {- requireNonEmpty(usage.llmSecretName, 'usage.llmSecretName')- }- requireNonEmpty(usage.callerRef, 'usage.callerRef')- if (!Number.isInteger(usage.attemptCount) || usage.attemptCount < 1 || usage.attemptCount > 4) {- throw new PromptBridgeFinalizationError(- 'invalid_request',- 'usage.attemptCount is invalid',- 400- )- }- if (- !Number.isInteger(usage.inputTokens) ||- usage.inputTokens < 0 ||- !Number.isInteger(usage.outputTokens) ||- usage.outputTokens < 0- ) {- throw new PromptBridgeFinalizationError(- 'invalid_request',- 'usage token counts must be non-negative integers',- 400- )- }} else if (input.usage) {throw new PromptBridgeFinalizationError('invalid_request',@@ -173,7 +181,7 @@ function replayOutcomeCompatible(input: PromptBridgeFinalizationInput,row: SpendOutcomeRow): boolean {- const oauthBroker = isOauthBrokerProvider(input.target.provider)+ const oauthBroker = isOauthBrokerProvider(row.provider)if (!oauthBroker) {const expectedOutcome =input.status === 'complete' ? 'exact' : input.status === 'failed' ? 'not_executed' : 'unknown'@@ -212,6 +220,7 @@ function mapExistingOutcome(row: SpendOutcomeRow,input: PromptBridgeFinalizationInput): PromptBridgeFinalizationResult {+ assertPersistedAuthModeCredentialRules(row.provider, input)if (row.invocation_id !== input.invocationId ||row.recipe_namespace !== input.recipeNamespace ||@@ -237,7 +246,7 @@ function mapExistingOutcome(status: input.status,outcome: row.outcome,idempotent: true,- usageAccepted: row.outcome === 'exact' && !isOauthBrokerProvider(input.target.provider),+ usageAccepted: row.outcome === 'exact' && !isOauthBrokerProvider(row.provider),}}@@ -343,6 +352,7 @@ export async function finalizePromptBridgeInTransaction(403)}+ assertPersistedAuthModeCredentialRules(String(providerAttempt.provider), input)const expectedStatus = input.statusconst currentInvocationStatus = String(invocation.status)@@ -374,7 +384,7 @@ export async function finalizePromptBridgeInTransaction()}- const oauthBroker = isOauthBrokerProvider(input.target.provider)+ const oauthBroker = isOauthBrokerProvider(String(providerAttempt.provider))const linkedCodex = oauthBroker? await loadLlmProviderAttemptBySdkAttemptId(db, input.providerAttemptId): null@@ -400,7 +410,7 @@ export async function finalizePromptBridgeInTransaction([input.invocationId, expectedStatus, input.attemptGeneration])- if (input.status === 'complete' && input.target.provider !== 'codex-subscription') {+ if (input.status === 'complete' && !oauthBroker) {const usage = input.usage!const event = {request_id: input.providerAttemptId,diff --git a/control-api/test/services.pluginWorkloadSdkFinalization.test.ts b/control-api/test/services.pluginWorkloadSdkFinalization.test.tsindex 07d58a7f0..0722cc96d 100644--- a/control-api/test/services.pluginWorkloadSdkFinalization.test.ts+++ b/control-api/test/services.pluginWorkloadSdkFinalization.test.ts@@ -636,4 +636,120 @@ describe('Plugin Workload SDK promptBridge finalization', () => {usageAccepted: false,})})++ it('rejects empty static-key credential material from the persisted provider', async () => {+ await expect(+ finalizePromptBridgeInTransaction(+ {+ ...inputBase,+ target: { ...inputBase.target, credentialSlot: '' },+ status: 'complete',+ usage: {+ llmSecretName: '',+ callerRef: 'scanner',+ fallbackUsed: false,+ attemptCount: 1,+ inputTokens: 1,+ outputTokens: 1,+ },+ },+ dbWithRows(+ [],+ [],+ {+ id: IDS.invocation,+ recipe_namespace: inputBase.recipeNamespace,+ recipe_name: inputBase.recipeName,+ method: 'promptBridge',+ status: 'in_progress',+ attempt_generation: 1,+ },+ {+ invocation_id: IDS.invocation,+ recipe_namespace: inputBase.recipeNamespace,+ recipe_name: inputBase.recipeName,+ attempt_generation: 1,+ method: 'promptBridge',+ status: 'in_progress',+ },+ {+ id: IDS.providerAttempt,+ invocation_id: IDS.invocation,+ recipe_namespace: inputBase.recipeNamespace,+ recipe_name: inputBase.recipeName,+ attempt_generation: 1,+ attempt_index: 1,+ target_ref: inputBase.target.targetRef,+ provider: inputBase.target.provider,+ model: inputBase.target.model,+ credential_slot: '',+ status: 'in_progress',+ }+ ) as never+ )+ ).rejects.toMatchObject({+ code: 'invalid_request',+ httpStatus: 400,+ })+ })++ it('does not let a request-claimed oauth provider skip a static-key binding', async () => {+ await expect(+ finalizePromptBridgeInTransaction(+ {+ ...inputBase,+ target: {+ ...inputBase.target,+ provider: 'codex-subscription',+ credentialSlot: '',+ },+ status: 'complete',+ usage: {+ llmSecretName: '',+ callerRef: 'scanner',+ fallbackUsed: false,+ attemptCount: 1,+ inputTokens: 1,+ outputTokens: 1,+ },+ },+ dbWithRows(+ [],+ [],+ {+ id: IDS.invocation,+ recipe_namespace: inputBase.recipeNamespace,+ recipe_name: inputBase.recipeName,+ method: 'promptBridge',+ status: 'in_progress',+ attempt_generation: 1,+ },+ {+ invocation_id: IDS.invocation,+ recipe_namespace: inputBase.recipeNamespace,+ recipe_name: inputBase.recipeName,+ attempt_generation: 1,+ method: 'promptBridge',+ status: 'in_progress',+ },+ {+ id: IDS.providerAttempt,+ invocation_id: IDS.invocation,+ recipe_namespace: inputBase.recipeNamespace,+ recipe_name: inputBase.recipeName,+ attempt_generation: 1,+ attempt_index: 1,+ target_ref: inputBase.target.targetRef,+ provider: inputBase.target.provider,+ model: inputBase.target.model,+ credential_slot: inputBase.target.credentialSlot,+ status: 'in_progress',+ }+ ) as never+ )+ ).rejects.toMatchObject({+ code: 'binding_mismatch',+ httpStatus: 403,+ })+ })})