updates

Author: Sg312

apps/sim/executor/handlers/agent/agent-handler.ts

@@ -1238,6 +1238,7 @@ export class AgentBlockHandler implements BlockHandler {
           : ('catalog' as const),
       credentialMode: customModelConfig?.credentials.mode,
       providerOptions: customModelConfig?.providerOptions,
+      providerModel: customModelConfig?.deployment,
       previousInteractionId: inputs.previousInteractionId,
       /** Agent-events remains the opt-in for exposing thinking and tool lifecycle events. */
       agentEvents: streaming && ctx.metadata?.agentEvents === true,

apps/sim/lib/copilot/tools/server/workflow/edit-workflow/operations.test.ts

@@ -17,6 +17,7 @@ vi.mock('@/blocks/registry', () => ({
       subBlocks: [
         { id: 'systemPrompt', type: 'long-input' },
         { id: 'model', type: 'combobox' },
+        { id: 'customModelConfig', type: 'code' },
       ],
     },
     {
@@ -41,6 +42,7 @@ vi.mock('@/blocks/registry', () => ({
         subBlocks: [
           { id: 'systemPrompt', type: 'long-input' },
           { id: 'model', type: 'combobox' },
+          { id: 'customModelConfig', type: 'code' },
         ],
       },
       function: {
@@ -561,3 +563,126 @@ describe('forward-reference connections (pending resolution)', () => {
     expect(state.blocks[BLOCK_A].data?.pendingConnections).toBeUndefined()
   })
 })
+
+describe('custom model credential round trips', () => {
+  const existingSecret = 'sk-existing-custom-secret'
+
+  function makeCustomAgentWorkflow(includeConfig = true) {
+    const customModelConfig = JSON.stringify({
+      provider: 'openai',
+      model: 'gpt-5.6-terra',
+      parameters: { reasoningEffort: 'medium', temperature: 0.2 },
+      credentials: { mode: 'explicit', apiKey: existingSecret },
+      providerOptions: {},
+    })
+
+    return {
+      blocks: {
+        'agent-1': {
+          id: 'agent-1',
+          type: 'agent',
+          name: 'Agent 1',
+          position: { x: 0, y: 0 },
+          enabled: true,
+          subBlocks: {
+            model: { id: 'model', type: 'combobox', value: 'sim-custom' },
+            ...(includeConfig
+              ? {
+                  customModelConfig: {
+                    id: 'customModelConfig',
+                    type: 'code',
+                    value: customModelConfig,
+                  },
+                }
+              : {}),
+          },
+          outputs: {},
+          data: {},
+        },
+      },
+      edges: [] as any[],
+      loops: {},
+      parallels: {},
+    }
+  }
+
+  it('restores the existing literal key when an edit round-trips the VFS placeholder', () => {
+    const result = applyOperationsToWorkflowState(makeCustomAgentWorkflow(), [
+      {
+        operation_type: 'edit',
+        block_id: 'agent-1',
+        params: {
+          inputs: {
+            customModelConfig: {
+              provider: 'openai',
+              model: 'gpt-5.6-sol',
+              parameters: { reasoningEffort: 'high', temperature: 0.1 },
+              credentials: { mode: 'explicit', apiKey: '<redacted>' },
+              providerOptions: {},
+            },
+          },
+        },
+      },
+    ])
+
+    expect(result.validationErrors).toHaveLength(0)
+    const stored = JSON.parse(
+      result.state.blocks['agent-1'].subBlocks.customModelConfig.value as string
+    )
+    expect(stored).toMatchObject({
+      provider: 'openai',
+      model: 'gpt-5.6-sol',
+      parameters: { reasoningEffort: 'high', temperature: 0.1 },
+      credentials: { mode: 'explicit', apiKey: existingSecret },
+    })
+  })
+
+  it('rejects the placeholder on a provider change without overwriting the stored config', () => {
+    const workflow = makeCustomAgentWorkflow()
+    const original = workflow.blocks['agent-1'].subBlocks.customModelConfig.value
+    const result = applyOperationsToWorkflowState(workflow, [
+      {
+        operation_type: 'edit',
+        block_id: 'agent-1',
+        params: {
+          inputs: {
+            customModelConfig: {
+              provider: 'xai',
+              model: 'grok-4.5',
+              credentials: { mode: 'explicit', apiKey: '<redacted>' },
+              providerOptions: {},
+            },
+          },
+        },
+      },
+    ])
+
+    expect(result.validationErrors).toHaveLength(1)
+    expect(result.validationErrors[0]?.error).toContain('when changing providers')
+    expect(result.state.blocks['agent-1'].subBlocks.customModelConfig.value).toBe(original)
+    expect(JSON.stringify(result.validationErrors)).not.toContain(existingSecret)
+  })
+
+  it('rejects the placeholder when the existing block has no key to preserve', () => {
+    const result = applyOperationsToWorkflowState(makeCustomAgentWorkflow(false), [
+      {
+        operation_type: 'edit',
+        block_id: 'agent-1',
+        params: {
+          inputs: {
+            customModelConfig: {
+              provider: 'openai',
+              model: 'gpt-5.6-terra',
+              credentials: { mode: 'explicit', apiKey: '<redacted>' },
+              providerOptions: {},
+            },
+          },
+        },
+      },
+    ])
+
+    expect(result.validationErrors).toHaveLength(1)
+    expect(result.validationErrors[0]?.error).toContain('without an existing stored key')
+    expect(result.state.blocks['agent-1'].subBlocks).not.toHaveProperty('customModelConfig')
+  })
+})

apps/sim/lib/copilot/tools/server/workflow/edit-workflow/operations.ts

@@ -201,7 +201,8 @@ function mergeNestedNodesForParent(
         const childValidation = validateInputsForBlock(
           existingBlock.type,
           childBlock.inputs,
-          existingId
+          existingId,
+          { existingSubBlocks: existingBlock.subBlocks }
         )
         validationErrors.push(...childValidation.errors)
 
@@ -426,7 +427,9 @@ export function handleEditOperation(op: EditWorkflowOperation, ctx: OperationCon
     if (!block.subBlocks) block.subBlocks = {}
 
     // Validate inputs against block configuration
-    const validationResult = validateInputsForBlock(block.type, params.inputs, block_id)
+    const validationResult = validateInputsForBlock(block.type, params.inputs, block_id, {
+      existingSubBlocks: block.subBlocks,
+    })
     validationErrors.push(...validationResult.errors)
 
     Object.entries(validationResult.validInputs).forEach(([inputKey, value]) => {
@@ -898,7 +901,9 @@ export function handleInsertIntoSubflowOperation(
     // Update inputs if provided (with validation)
     if (params.inputs) {
       // Validate inputs against block configuration
-      const validationResult = validateInputsForBlock(existingBlock.type, params.inputs, block_id)
+      const validationResult = validateInputsForBlock(existingBlock.type, params.inputs, block_id, {
+        existingSubBlocks: existingBlock.subBlocks,
+      })
       validationErrors.push(...validationResult.errors)
 
       Object.entries(validationResult.validInputs).forEach(([key, value]) => {

apps/sim/lib/copilot/tools/server/workflow/edit-workflow/validation.ts

@@ -40,6 +40,11 @@ import { SELECTOR_TYPES } from './types'
 
 const validationLogger = createLogger('EditWorkflowValidation')
 const agentToolLintLogger = createLogger('EditWorkflowAgentToolLint')
+const REDACTED_CUSTOM_MODEL_API_KEY = '<redacted>'
+
+interface ValidateInputsForBlockOptions {
+  existingSubBlocks?: Record<string, { value?: unknown } | undefined>
+}
 
 /**
  * Detect privileged Agent custom-model writes anywhere in an edit operation,
@@ -80,7 +85,8 @@ export function findBlockWithDuplicateNormalizedName(
 export function validateInputsForBlock(
   blockType: string,
   inputs: Record<string, any>,
-  blockId: string
+  blockId: string,
+  options?: ValidateInputsForBlockOptions
 ): ValidationResult {
   const errors: ValidationError[] = []
 
@@ -175,7 +181,8 @@ export function validateInputsForBlock(
       value,
       key,
       blockType,
-      blockId
+      blockId,
+      options?.existingSubBlocks?.[key]?.value
     )
     if (validationResult.valid) {
       validatedInputs[key] = validationResult.value
@@ -307,7 +314,8 @@ export function validateValueForSubBlockType(
   value: any,
   fieldName: string,
   blockType: string,
-  blockId: string
+  blockId: string,
+  existingValue?: unknown
 ): ValueValidationResult {
   const { type } = subBlockConfig
 
@@ -538,6 +546,38 @@ export function validateValueForSubBlockType(
           // subblock persists text. Accept the object Mothership naturally
           // produces, validate it now, and store one canonical JSON string.
           const parsed = parseCustomModelConfig(value)
+
+          if (parsed.credentials.apiKey === REDACTED_CUSTOM_MODEL_API_KEY) {
+            if (existingValue === undefined || existingValue === null) {
+              throw new Error(
+                'credentials.apiKey cannot be "<redacted>" without an existing stored key; provide an environment-variable reference or a new key'
+              )
+            }
+
+            const existing = parseCustomModelConfig(existingValue)
+            if (existing.provider !== parsed.provider) {
+              throw new Error(
+                'credentials.apiKey cannot remain "<redacted>" when changing providers; provide the new provider key or an environment-variable reference'
+              )
+            }
+
+            const existingApiKey = existing.credentials.apiKey
+            if (
+              existing.credentials.mode !== 'explicit' ||
+              !existingApiKey ||
+              existingApiKey === REDACTED_CUSTOM_MODEL_API_KEY
+            ) {
+              throw new Error(
+                'credentials.apiKey cannot be "<redacted>" because no usable stored key exists; provide an environment-variable reference or a new key'
+              )
+            }
+
+            // `<redacted>` is a read-view sentinel, never a credential. Restore
+            // the existing value only after the provider identity is proven to
+            // match, so a model/parameter edit cannot destroy or misroute it.
+            parsed.credentials.apiKey = existingApiKey
+          }
+
           return { valid: true, value: JSON.stringify(parsed, null, 2) }
         } catch (error) {
           return {

apps/sim/providers/cost-policy.ts

@@ -185,6 +185,10 @@ export interface ModelUsage {
   cacheRead?: number
   /** Tokens written to the cache, each bucket at its own premium. */
   cacheWrites?: CacheWriteUsage[]
+  /** Whole provider prompt for long-context selection when input is split into cache buckets. */
+  contextInputTokens?: number
+  /** Effective processing tier reported by the provider, or requested when no response field exists. */
+  serviceTier?: 'default' | 'priority'
 }
 
 /**
@@ -210,10 +214,30 @@ export function priceModelUsage(
   }
 
   const multiplier = policy.multiplier
-  const base = calculateCost(model, usage.input, usage.output, false, multiplier, multiplier)
-
   const cacheRead = usage.cacheRead ?? 0
-  const read = cacheRead > 0 ? calculateCost(model, cacheRead, 0, true, multiplier, 0) : undefined
+  const cacheWriteTokens = (usage.cacheWrites ?? []).reduce(
+    (total, write) => total + Math.max(0, write.tokens),
+    0
+  )
+  const contextInputTokens = usage.contextInputTokens ?? usage.input + cacheRead + cacheWriteTokens
+  const pricingOptions = {
+    contextInputTokens,
+    serviceTier: usage.serviceTier,
+  }
+  const base = calculateCost(
+    model,
+    usage.input,
+    usage.output,
+    false,
+    multiplier,
+    multiplier,
+    pricingOptions
+  )
+
+  const read =
+    cacheRead > 0
+      ? calculateCost(model, cacheRead, 0, true, multiplier, 0, pricingOptions)
+      : undefined
 
   let writeInputCost = 0
   for (const write of usage.cacheWrites ?? []) {
@@ -224,7 +248,8 @@ export function priceModelUsage(
       0,
       false,
       multiplier * write.inputRateMultiplier,
-      0
+      0,
+      pricingOptions
     ).input
   }