Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,10 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
mode,
setMode,
isAborting,
maskCredentialValue,
} = useCopilotStore()

const maskCredentialValue = useCopilotStore((s) => s.maskCredentialValue)

const messageCheckpoints = isUser ? allMessageCheckpoints[message.id] || [] : []
const hasCheckpoints = messageCheckpoints.length > 0 && messageCheckpoints.some((cp) => cp?.id)

Expand Down Expand Up @@ -265,7 +266,7 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
}
return null
})
}, [message.contentBlocks, isActivelyStreaming, parsedTags, isLastMessage, maskCredentialValue])
}, [message.contentBlocks, isActivelyStreaming, parsedTags, isLastMessage])

if (isUser) {
return (
Expand Down
15 changes: 10 additions & 5 deletions apps/sim/stores/panel/copilot/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2737,11 +2737,16 @@ export const useCopilotStore = create<CopilotStore>()(
}))
}

// Load sensitive credential IDs for masking before streaming starts
await get().loadSensitiveCredentialIds()

// Ensure auto-allowed tools are loaded before tool calls arrive
await get().loadAutoAllowedTools()
get()
.loadSensitiveCredentialIds()
.catch((err) => {
logger.warn('[Copilot] Failed to load sensitive credential IDs', err)
})
get()
.loadAutoAllowedTools()
.catch((err) => {
logger.warn('[Copilot] Failed to load auto-allowed tools', err)
})

let newMessages: CopilotMessage[]
if (revertState) {
Expand Down