From eb9318e9535a672dc3fab9c2b2e1aee0c8ea379f Mon Sep 17 00:00:00 2001 From: Vincent Koc Date: Mon, 22 Jun 2026 09:46:58 +0800 Subject: [PATCH] chore(deadcode): remove stale agent helper reexports --- src/agents/agent-tools.policy.test.ts | 2 +- src/agents/agent-tools.policy.ts | 2 -- src/agents/agent-tools.schema.test.ts | 6 ++---- src/agents/agent-tools.schema.ts | 2 -- src/agents/agent-tools.ts | 2 +- src/agents/tools/cron-tool.schema.test.ts | 2 +- src/agents/web-search-tool-policy.ts | 2 +- src/auto-reply/reply/dispatch-from-config.ts | 2 +- 8 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/agents/agent-tools.policy.test.ts b/src/agents/agent-tools.policy.test.ts index 2a0e6ee6c71..243b7115b46 100644 --- a/src/agents/agent-tools.policy.test.ts +++ b/src/agents/agent-tools.policy.test.ts @@ -11,7 +11,6 @@ import type { OpenClawConfig } from "../config/config.js"; import { createWarnLogCapture } from "../logging/test-helpers/warn-log-capture.js"; import { filterToolsByPolicy, - isToolAllowedByPolicyName, resolveEffectiveToolPolicy, resolveGroupToolPolicy, resolveInheritedToolPolicyForSession, @@ -19,6 +18,7 @@ import { resolveTrustedGroupId, } from "./agent-tools.policy.js"; import { createStubTool } from "./test-helpers/agent-tool-stubs.js"; +import { isToolAllowedByPolicyName } from "./tool-policy-match.js"; vi.mock("../channels/plugins/session-conversation.js", () => ({ resolveSessionConversation: ({ rawId }: { rawId: string }) => ({ diff --git a/src/agents/agent-tools.policy.ts b/src/agents/agent-tools.policy.ts index 4df4852683f..a9017ad342a 100644 --- a/src/agents/agent-tools.policy.ts +++ b/src/agents/agent-tools.policy.ts @@ -570,5 +570,3 @@ export function resolveGroupToolPolicy(params: { }); return pickSandboxToolPolicy(configTools); } - -export { isToolAllowedByPolicies, isToolAllowedByPolicyName } from "./tool-policy-match.js"; diff --git a/src/agents/agent-tools.schema.test.ts b/src/agents/agent-tools.schema.test.ts index 2ce68244483..29aa7f7c373 100644 --- a/src/agents/agent-tools.schema.test.ts +++ b/src/agents/agent-tools.schema.test.ts @@ -7,15 +7,13 @@ import { runAgentLoop, type AgentEvent, type StreamFn } from "openclaw/plugin-sd import { createAssistantMessageEventStream, validateToolArguments } from "openclaw/plugin-sdk/llm"; import { Type, type TSchema } from "typebox"; import { describe, expect, it, vi } from "vitest"; +import { normalizeToolParameterSchema } from "./agent-tools-parameter-schema.js"; import { isToolWrappedWithBeforeToolCallHook, testing as beforeToolCallTesting, wrapToolWithBeforeToolCallHook, } from "./agent-tools.before-tool-call.js"; -import { - normalizeToolParameterSchema, - normalizeToolParameters, -} from "./agent-tools.schema.js"; +import { normalizeToolParameters } from "./agent-tools.schema.js"; import type { AnyAgentTool } from "./agent-tools.types.js"; const TEST_USAGE = { diff --git a/src/agents/agent-tools.schema.ts b/src/agents/agent-tools.schema.ts index fb86c8c29ce..f8f26b645e3 100644 --- a/src/agents/agent-tools.schema.ts +++ b/src/agents/agent-tools.schema.ts @@ -13,8 +13,6 @@ import type { AnyAgentTool } from "./agent-tools.types.js"; import { copyChannelAgentToolMeta } from "./channel-tools.js"; import { copyToolTerminalPresentation } from "./tool-terminal-presentation.js"; -export { normalizeToolParameterSchema }; - function isObjectSchemaWithNoRequiredParams(schema: unknown): boolean { if (!schema || typeof schema !== "object" || Array.isArray(schema)) { return false; diff --git a/src/agents/agent-tools.ts b/src/agents/agent-tools.ts index 94f76fb4285..782e1ca3d19 100644 --- a/src/agents/agent-tools.ts +++ b/src/agents/agent-tools.ts @@ -39,7 +39,6 @@ import { import { applyDeferredFollowupToolDescriptions } from "./agent-tools.deferred-followup.js"; import { filterToolsByMessageProvider } from "./agent-tools.message-provider-policy.js"; import { - isToolAllowedByPolicies, resolveEffectiveToolPolicy, resolveGroupToolPolicy, resolveInheritedToolPolicyForSession, @@ -93,6 +92,7 @@ import { import { createToolFsPolicy, resolveToolFsConfig } from "./tool-fs-policy.js"; import { resolveToolLoopDetectionConfig } from "./tool-loop-detection-config.js"; import { buildDeclaredToolAllowlistContext } from "./tool-policy-declared-context.js"; +import { isToolAllowedByPolicies } from "./tool-policy-match.js"; import { applyToolPolicyPipeline, buildDefaultToolPolicyPipelineSteps, diff --git a/src/agents/tools/cron-tool.schema.test.ts b/src/agents/tools/cron-tool.schema.test.ts index 62bda5d6999..1c407d6e738 100644 --- a/src/agents/tools/cron-tool.schema.test.ts +++ b/src/agents/tools/cron-tool.schema.test.ts @@ -2,7 +2,7 @@ // validation compatibility for cron jobs. import { Value } from "typebox/value"; import { describe, expect, it } from "vitest"; -import { normalizeToolParameterSchema } from "../agent-tools.schema.js"; +import { normalizeToolParameterSchema } from "../agent-tools-parameter-schema.js"; import { createCronToolSchema } from "./cron-tool.js"; /** Walk a TypeBox schema by dot-separated property path and return sorted keys. */ diff --git a/src/agents/web-search-tool-policy.ts b/src/agents/web-search-tool-policy.ts index 1a522d5900d..9e9fc15dea8 100644 --- a/src/agents/web-search-tool-policy.ts +++ b/src/agents/web-search-tool-policy.ts @@ -1,6 +1,5 @@ import type { OpenClawConfig } from "../config/types.openclaw.js"; import { - isToolAllowedByPolicies, resolveEffectiveToolPolicy, resolveGroupToolPolicy, resolveInheritedToolPolicyForSession, @@ -12,6 +11,7 @@ import { isSubagentEnvelopeSession, resolveSubagentCapabilityStore, } from "./subagent-capabilities.js"; +import { isToolAllowedByPolicies } from "./tool-policy-match.js"; import { mergeAlsoAllowPolicy, resolveToolProfilePolicy } from "./tool-policy.js"; export type WebSearchToolPolicyParams = { diff --git a/src/auto-reply/reply/dispatch-from-config.ts b/src/auto-reply/reply/dispatch-from-config.ts index 9fc661c68b4..93ead8a9ce9 100644 --- a/src/auto-reply/reply/dispatch-from-config.ts +++ b/src/auto-reply/reply/dispatch-from-config.ts @@ -17,7 +17,6 @@ import { resolveSessionAgentId, } from "../../agents/agent-scope.js"; import { - isToolAllowedByPolicies, resolveEffectiveToolPolicy, resolveGroupToolPolicy, resolveInheritedToolPolicyForSession, @@ -35,6 +34,7 @@ import { isSubagentEnvelopeSession, resolveSubagentCapabilityStore, } from "../../agents/subagent-capabilities.js"; +import { isToolAllowedByPolicies } from "../../agents/tool-policy-match.js"; import { mergeAlsoAllowPolicy, resolveToolProfilePolicy } from "../../agents/tool-policy.js"; import { resolveConversationBindingRecord,