github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-08 09:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: centralize message-provider tool filtering

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-26 04:22:44 +01:00
parent 7af6849c2f
commit e35fe7888b
3 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/agents/pi-tools.ts
View File

@@ -67,6 +67,31 @@ function isOpenAIProvider(provider?: string) {
return normalized === "openai" || normalized === "openai-codex";
}
const TOOL_DENY_BY_MESSAGE_PROVIDER: Readonly<Record<string, readonly string[]>> = {
voice: ["tts"],
};
function normalizeMessageProvider(messageProvider?: string): string | undefined {
const normalized = messageProvider?.trim().toLowerCase();
return normalized && normalized.length > 0 ? normalized : undefined;
}
function applyMessageProviderToolPolicy(
tools: AnyAgentTool[],
messageProvider?: string,
): AnyAgentTool[] {
const normalizedProvider = normalizeMessageProvider(messageProvider);
if (!normalizedProvider) {
return tools;
}
const deniedTools = TOOL_DENY_BY_MESSAGE_PROVIDER[normalizedProvider];
if (!deniedTools || deniedTools.length === 0) {
return tools;
}
const deniedSet = new Set(deniedTools);
return tools.filter((tool) => !deniedSet.has(tool.name));
}
function isApplyPatchAllowedForModel(params: {
modelProvider?: string;
modelId?: string;
@@ -217,8 +242,6 @@ export function createOpenClawCodingTools(options?: {
/** Whether the sender is an owner (required for owner-only tools). */
senderIsOwner?: boolean;
}): AnyAgentTool[] {
const rawMessageProvider = options?.messageProvider?.trim().toLowerCase();
const isVoiceMessageProvider = rawMessageProvider === "voice";
const execToolName = "exec";
const sandbox = options?.sandbox?.enabled ? options.sandbox : undefined;
const {
@@ -482,9 +505,7 @@ export function createOpenClawCodingTools(options?: {
senderIsOwner: options?.senderIsOwner,
}),
];
const toolsForMessageProvider = isVoiceMessageProvider
? tools.filter((tool) => tool.name !== "tts")
: tools;
const toolsForMessageProvider = applyMessageProviderToolPolicy(tools, options?.messageProvider);
// Security: treat unknown/undefined as unauthorized (opt-in, not opt-out)
const senderIsOwner = options?.senderIsOwner === true;
const toolsByAuthorization = applyOwnerOnlyToolPolicy(toolsForMessageProvider, senderIsOwner);