CERBERUS/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2026-10-21 09:32:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

🧤 feat: Enforce Safe BYOM Tool Approvals (#15503)

Browse source 
* feat: add safe default approvals for BYOM code

* fix: preserve safe BYOM approval baseline
This commit is contained in:
Danny Avila 2026-09-02 08:53:16 -04:00 • committed by GitHub
parent 434fa377c0
commit b1c56239f9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 314 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

29
api/server/controllers/agents/client.js
View file

@ -49,7 +49,10 @@ const {
getAgentCheckpointer,
hasDurableAgentInterruptCheckpoint,
isHITLEnabled,
resolveToolApprovalPolicy,
buildToolApprovalHooks,
collectAttachedCodeEnvironmentAgentIds,
createAttachedCodeEnvironmentPolicyHook,
agentRunUsesCheckpointer,
canAgentGraphPause,
getPluginHookSource,
@ -3786,7 +3789,14 @@ class AgentClient extends BaseClient {
* spending on provider work. */
/** @type {AppConfig['endpoints']['agents']} */
const agentsEConfig = appConfig.endpoints?.[EModelEndpoint.agents];
const resolvedToolApprovalHooks = isHITLEnabled(agentsEConfig?.toolApproval)
const topLevelAgents = [this.options.agent, ...(this.agentConfigs?.values() ?? [])];
const attachedCodeEnvironmentAgentIds =
collectAttachedCodeEnvironmentAgentIds(topLevelAgents);
const effectiveToolApprovalPolicy = resolveToolApprovalPolicy({
endpoint: agentsEConfig?.toolApproval,
attachedCodeEnvironment: attachedCodeEnvironmentAgentIds.size > 0,
});
const resolvedToolApprovalHooks = isHITLEnabled(effectiveToolApprovalPolicy)
? buildToolApprovalHooks({
userId: this.options.req?.user?.id,
conversationId: this.conversationId,
@ -3794,19 +3804,28 @@ class AgentClient extends BaseClient {
appConfig,
})
: undefined;
const topLevelAgents = [this.options.agent, ...(this.agentConfigs?.values() ?? [])];
const admissionToolApprovalHooks = [
...(resolvedToolApprovalHooks ?? []),
...(attachedCodeEnvironmentAgentIds.size > 0
? [
{
hook: createAttachedCodeEnvironmentPolicyHook(attachedCodeEnvironmentAgentIds),
},
]
: []),
];
const askUserQuestionAdminDisabled = isAskUserQuestionAdminDisabled(appConfig);
const runCanPause = canAgentGraphPause({
policy: agentsEConfig?.toolApproval,
policy: effectiveToolApprovalPolicy,
agents: topLevelAgents,
hostGeneratedToolNames:
this.options.subagentTasks == null ? undefined : [Constants.CHECK_BACKGROUND_TASK],
resolvedProgrammaticHooks: resolvedToolApprovalHooks,
resolvedProgrammaticHooks: admissionToolApprovalHooks,
pluginHookSource: getPluginHookSource(),
askUserQuestionAdminDisabled,
});
const runUsesCheckpointer = agentRunUsesCheckpointer({
policy: agentsEConfig?.toolApproval,
policy: effectiveToolApprovalPolicy,
agents: topLevelAgents,
askUserQuestionAdminDisabled,
});