fix(copilot): thread cursor across content blocks when restoring sim_key tags

Author: TheodoreSpeaks

apps/sim/lib/copilot/chat/sim-key-redaction.test.ts

@@ -120,6 +120,25 @@ describe('sim-key-redaction', () => {
       expect(restoreRevealedSimKeysForMessage(msg, cache)).toBe(msg)
     })
 
+    it('threads the cursor across separate content blocks so each block gets its matching key', () => {
+      const cache = new Map<string, string[]>([['msg-1', ['sk-sim-A', 'sk-sim-B']]])
+      const msg: ChatMessage = {
+        id: 'msg-1',
+        role: 'assistant',
+        content: `first ${redacted} (tool ran) second ${redacted}`,
+        contentBlocks: [
+          { type: 'text', content: `first ${redacted}` },
+          { type: 'tool_call', content: '' },
+          { type: 'text', content: `second ${redacted}` },
+        ],
+      }
+      const restored = restoreRevealedSimKeysForMessage(msg, cache)
+      expect(restored.contentBlocks?.[0].content).toContain('"sk-sim-A"')
+      expect(restored.contentBlocks?.[0].content).not.toContain('"sk-sim-B"')
+      expect(restored.contentBlocks?.[2].content).toContain('"sk-sim-B"')
+      expect(restored.contentBlocks?.[2].content).not.toContain('"sk-sim-A"')
+    })
+
     it('isolates revealed values by message id (multiple keys across messages)', () => {
       const cache = new Map<string, string[]>([
         ['msg-1', ['sk-sim-A']],

apps/sim/lib/copilot/chat/sim-key-redaction.ts

@@ -194,15 +194,17 @@ export function captureRevealedSimKeys(
 
 function restoreInString(
   content: string,
-  revealedValues: string[]
+  revealedValues: string[],
+  startCursor: number
 ): {
   next: string
   changed: boolean
+  cursor: number
 } {
   if (!content.includes('<credential>') || revealedValues.length === 0) {
-    return { next: content, changed: false }
+    return { next: content, changed: false, cursor: startCursor }
   }
-  let cursor = 0
+  let cursor = startCursor
   let changed = false
   const next = content.replace(CREDENTIAL_TAG_PATTERN, (match, body: string) => {
     const parsed = parseCredentialBody(body)
@@ -216,7 +218,7 @@ function restoreInString(
     }
     return match
   })
-  return { next, changed }
+  return { next, changed, cursor }
 }
 
 /**
@@ -239,11 +241,13 @@ export function restoreRevealedSimKeysForMessage(
     return message
   }
 
-  const restoredContent = restoreInString(message.content, revealed)
+  const restoredContent = restoreInString(message.content, revealed, 0)
   let blocksChanged = false
+  let blockCursor = 0
   const nextBlocks: ContentBlock[] | undefined = message.contentBlocks?.map((block) => {
     if (!hasRedactedSimKeyTag(block.content)) return block
-    const restored = restoreInString(block.content as string, revealed)
+    const restored = restoreInString(block.content as string, revealed, blockCursor)
+    blockCursor = restored.cursor
     if (!restored.changed) return block
     blocksChanged = true
     return { ...block, content: restored.next }