fix

Author: icecrasher321

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

@@ -113,7 +113,6 @@ const AGENT_RAW_PROVIDER_ERROR_INPUT_PATHS: readonly ResolvedSecretInputPath[] =
   ['promptCaching'],
   ['previousInteractionId'],
 ]
-const AGENT_MEMORY_ERROR_INPUT_PATHS: readonly ResolvedSecretInputPath[] = [['conversationId']]
 
 interface IndexedToolInput {
   tool: ToolInput
@@ -411,30 +410,14 @@ export class AgentBlockHandler implements BlockHandler {
       if (this.isStreamingExecution(result)) {
         const streamingResult = result as StreamingExecution
         streamingResult.diagnosticResolvedSecretTraceRegistry = providerErrorRegistry
-        const memoryErrorRegistry = settledInputRegistry?.forkForInputPaths(
-          AGENT_MEMORY_ERROR_INPUT_PATHS
-        )
         if (filteredInputs.memoryType && filteredInputs.memoryType !== 'none') {
-          return this.wrapStreamForMemoryPersistence(
-            ctx,
-            filteredInputs,
-            streamingResult,
-            memoryErrorRegistry
-          )
+          return this.wrapStreamForMemoryPersistence(ctx, filteredInputs, streamingResult)
         }
         return streamingResult
       }
 
       if (filteredInputs.memoryType && filteredInputs.memoryType !== 'none') {
-        const memoryErrorRegistry = settledInputRegistry?.forkForInputPaths(
-          AGENT_MEMORY_ERROR_INPUT_PATHS
-        )
-        await this.persistResponseToMemory(
-          ctx,
-          filteredInputs,
-          result as BlockOutput,
-          memoryErrorRegistry
-        )
+        await this.persistResponseToMemory(ctx, filteredInputs, result as BlockOutput)
       }
 
       return result
@@ -2484,8 +2467,7 @@ export class AgentBlockHandler implements BlockHandler {
   private wrapStreamForMemoryPersistence(
     ctx: ExecutionContext,
     inputs: AgentInputs,
-    streamingExec: StreamingExecution,
-    diagnosticRegistry?: ResolvedSecretTraceRegistry
+    streamingExec: StreamingExecution
   ): StreamingExecution {
     return {
       ...streamingExec,
@@ -2494,17 +2476,10 @@ export class AgentBlockHandler implements BlockHandler {
         try {
           await memoryService.appendToMemory(ctx, inputs, { role: 'assistant', content })
         } catch (error) {
-          const memoryErrorRegistry = this.createErrorRegistry(
-            diagnosticRegistry,
-            ctx.resolvedSecretTraceRegistry
-          )
-          const diagnosticCtx = memoryErrorRegistry
-            ? { ...ctx, resolvedSecretTraceRegistry: memoryErrorRegistry }
-            : ctx
           logger.error(
             'Failed to persist streaming response',
             projectAgentDiagnosticMetadata(
-              diagnosticCtx,
+              ctx,
               getErrorDiagnosticMetadata(error),
               getErrorDiagnosticFallback(error)
             )
@@ -2517,8 +2492,7 @@ export class AgentBlockHandler implements BlockHandler {
   private async persistResponseToMemory(
     ctx: ExecutionContext,
     inputs: AgentInputs,
-    result: BlockOutput,
-    diagnosticRegistry?: ResolvedSecretTraceRegistry
+    result: BlockOutput
   ): Promise<void> {
     const content = (result as any)?.content
     if (!content || typeof content !== 'string') {
@@ -2531,17 +2505,10 @@ export class AgentBlockHandler implements BlockHandler {
         workflowId: ctx.workflowId,
       })
     } catch (error) {
-      const memoryErrorRegistry = this.createErrorRegistry(
-        diagnosticRegistry,
-        ctx.resolvedSecretTraceRegistry
-      )
-      const diagnosticCtx = memoryErrorRegistry
-        ? { ...ctx, resolvedSecretTraceRegistry: memoryErrorRegistry }
-        : ctx
       logger.error(
         'Failed to persist response to memory',
         projectAgentDiagnosticMetadata(
-          diagnosticCtx,
+          ctx,
           getErrorDiagnosticMetadata(error),
           getErrorDiagnosticFallback(error)
         )

apps/sim/executor/handlers/mothership/mothership-handler.test.ts

@@ -912,7 +912,7 @@ describe('MothershipBlockHandler', () => {
     expect(logged).not.toContain('__sim_')
   })
 
-  it('retains exact provenance when a resolved conversation ID is echoed to output', async () => {
+  it('does not treat conversation IDs as secret-bearing result content', async () => {
     const registry = new ResolvedSecretTraceRegistry([
       { name: 'CONVERSATION_ID', plaintext: 'x', encryptedValue: 'encrypted-conversation-id' },
     ])
@@ -936,38 +936,14 @@ describe('MothershipBlockHandler', () => {
     expect(JSON.parse(String(options.body)).chatId).toBe('x')
     expect(result).toMatchObject({ conversationId: 'x' })
     expect(inputs.conversationId).toBe('x')
-    expect(context.resolvedSecretTraceRegistry?.getActiveMatches()).toEqual([
-      { plaintext: 'x', replacement: '{{CONVERSATION_ID}}' },
-    ])
+    expect(context.resolvedSecretTraceRegistry?.getActiveMatches()).toEqual([])
     expect(context.resolvedSecretTraceRegistry?.exportCommittedProvenanceForValue(result)).toEqual({
       version: 1,
       complete: true,
-      entries: [{ name: 'CONVERSATION_ID', encryptedValue: 'encrypted-conversation-id' }],
+      entries: [],
     })
   })
 
-  it('does not carry a low-entropy conversation ID into terminal error provenance', async () => {
-    const registry = new ResolvedSecretTraceRegistry([
-      { name: 'CONVERSATION_ID', plaintext: 'x', encryptedValue: 'encrypted-conversation-id' },
-    ])
-    registry.recordResolvedAtInputPath('CONVERSATION_ID', 'x', ['conversationId'])
-    registry.recordResolvedInputProjection(['conversationId'], 'x', '{{CONVERSATION_ID}}')
-    context.resolvedSecretTraceRegistry = registry
-    mockGenerateId.mockReturnValueOnce('message-uuid').mockReturnValueOnce('request-uuid')
-    mockExtractAPIErrorMessage.mockResolvedValueOnce('Box')
-    fetchMock.mockResolvedValue(new Response(JSON.stringify({ error: 'Box' }), { status: 500 }))
-
-    await expect(
-      handler.execute(context, block, {
-        prompt: 'Continue this thread',
-        conversationId: 'x',
-      })
-    ).rejects.toThrow('Sim execution failed: Box')
-
-    expect(context.resolvedSecretTraceRegistry?.getActiveMatches()).toEqual([])
-    expect(context.errorResolvedSecretTraceRegistry?.getActiveMatches()).toEqual([])
-  })
-
   it('forwards only enabled MCP tools and selected skills', async () => {
     mockGenerateId
       .mockReturnValueOnce('chat-uuid')

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

@@ -505,7 +505,6 @@ function createMothershipStreamingExecution(
   options: {
     onCancel?: (reason?: unknown) => void
     onDone?: () => void
-    onSuccess?: () => void
     registry?: ResolvedSecretTraceRegistry
   } = {}
 ): StreamingExecution {
@@ -588,10 +587,7 @@ function createMothershipStreamingExecution(
           throw new Error('Sim execution stream ended without a final result')
         }
 
-        if (!cancelled) {
-          options.onSuccess?.()
-          controller.close()
-        }
+        if (!cancelled) controller.close()
       } catch (error) {
         if (!cancelled) {
           controller.error(error)
@@ -830,16 +826,6 @@ export class MothershipBlockHandler implements BlockHandler {
       ...(ctx.executionId ? { executionId: ctx.executionId } : {}),
     }
 
-    const settledInputRegistry = ctx.resolvedSecretTraceRegistry
-    const conversationRegistry = settledInputRegistry?.forkForInputPaths(
-      providedConversationId ? [['conversationId']] : []
-    )
-    const commitConversationProvenance = (): void => {
-      if (resultRegistry && conversationRegistry) {
-        resultRegistry.mergeToolCallRegistry(conversationRegistry)
-      }
-    }
-
     logger.info('Executing Mothership block', {
       blockId: block.id,
       messageId,
@@ -933,7 +919,6 @@ export class MothershipBlockHandler implements BlockHandler {
             }
           },
           onDone: cleanupAbortListeners,
-          onSuccess: commitConversationProvenance,
           registry: resultRegistry,
         })
         streamingExecution.diagnosticResolvedSecretTraceRegistry = resultRegistry
@@ -944,7 +929,6 @@ export class MothershipBlockHandler implements BlockHandler {
 
       const result = await readMothershipExecuteResponse(response, resultRegistry)
       const output = formatMothershipBlockOutput(result, chatId)
-      commitConversationProvenance()
       if (resultRegistry) ctx.resolvedSecretTraceRegistry = resultRegistry
       return output
     } catch (error) {