From 52662d39d663ff8d91b94368132dc7bf74bc3f11 Mon Sep 17 00:00:00 2001 From: Val Alexander Date: Tue, 17 Mar 2026 23:42:13 -0500 Subject: [PATCH] format: sort imports and fix parameter formatting --- extensions/moonshot/index.ts | 2 +- package.json | 2 +- .../pi-embedded-runner-extraparams.test.ts | 6 ++-- .../anthropic-stream-wrappers.ts | 35 ++++++++++++------- src/agents/provider-capabilities.ts | 5 ++- src/agents/tools/web-search.ts | 2 +- 6 files changed, 29 insertions(+), 23 deletions(-) diff --git a/extensions/moonshot/index.ts b/extensions/moonshot/index.ts index 3a8ed52c805..241d53e6014 100644 --- a/extensions/moonshot/index.ts +++ b/extensions/moonshot/index.ts @@ -1,6 +1,6 @@ import { definePluginEntry } from "openclaw/plugin-sdk/core"; -import { buildSingleProviderApiKeyCatalog } from "openclaw/plugin-sdk/provider-catalog"; import { createProviderApiKeyAuthMethod } from "openclaw/plugin-sdk/provider-auth"; +import { buildSingleProviderApiKeyCatalog } from "openclaw/plugin-sdk/provider-catalog"; import { createMoonshotThinkingWrapper, resolveMoonshotThinkingType, diff --git a/package.json b/package.json index ba0c925fded..0058942b042 100644 --- a/package.json +++ b/package.json @@ -543,9 +543,9 @@ "lint:docs": "pnpm dlx markdownlint-cli2", "lint:docs:fix": "pnpm dlx markdownlint-cli2 --fix", "lint:fix": "oxlint --type-aware --fix && pnpm format", + "lint:plugins:no-extension-imports": "node scripts/check-plugin-extension-import-boundary.mjs", "lint:plugins:no-extension-src-imports": "node --import tsx scripts/check-no-extension-src-imports.ts", "lint:plugins:no-extension-test-core-imports": "node --import tsx scripts/check-no-extension-test-core-imports.ts", - "lint:plugins:no-extension-imports": "node scripts/check-plugin-extension-import-boundary.mjs", "lint:plugins:no-monolithic-plugin-sdk-entry-imports": "node --import tsx scripts/check-no-monolithic-plugin-sdk-entry-imports.ts", "lint:plugins:no-register-http-handler": "node scripts/check-no-register-http-handler.mjs", "lint:swift": "swiftlint lint --config .swiftlint.yml && (cd apps/ios && swiftlint lint --config .swiftlint.yml)", diff --git a/src/agents/pi-embedded-runner-extraparams.test.ts b/src/agents/pi-embedded-runner-extraparams.test.ts index b597b0b19a0..dbd95e64d34 100644 --- a/src/agents/pi-embedded-runner-extraparams.test.ts +++ b/src/agents/pi-embedded-runner-extraparams.test.ts @@ -80,10 +80,8 @@ vi.mock("../plugins/provider-runtime.js", async (importOriginal) => { const thinkingLevel = skipReasoningInjection ? undefined : params.context.thinkingLevel; return createOpenRouterSystemCacheWrapper(createOpenRouterWrapper(streamFn, thinkingLevel)); }, - resolveProviderCapabilitiesWithPlugin: (params: { - provider: string; - workspaceDir?: string; - }) => resolveProviderCapabilitiesWithPluginMock(params), + resolveProviderCapabilitiesWithPlugin: (params: { provider: string; workspaceDir?: string }) => + resolveProviderCapabilitiesWithPluginMock(params), }; }); diff --git a/src/agents/pi-embedded-runner/anthropic-stream-wrappers.ts b/src/agents/pi-embedded-runner/anthropic-stream-wrappers.ts index 83a5be8f783..511b70d280d 100644 --- a/src/agents/pi-embedded-runner/anthropic-stream-wrappers.ts +++ b/src/agents/pi-embedded-runner/anthropic-stream-wrappers.ts @@ -89,11 +89,14 @@ function hasOpenAiAnthropicToolPayloadCompatFlag(model: { compat?: unknown }): b ); } -function requiresAnthropicToolPayloadCompatibilityForModel(model: { - api?: unknown; - provider?: unknown; - compat?: unknown; -}, options?: AnthropicToolPayloadResolverOptions): boolean { +function requiresAnthropicToolPayloadCompatibilityForModel( + model: { + api?: unknown; + provider?: unknown; + compat?: unknown; + }, + options?: AnthropicToolPayloadResolverOptions, +): boolean { if (model.api !== "anthropic-messages") { return false; } @@ -107,10 +110,13 @@ function requiresAnthropicToolPayloadCompatibilityForModel(model: { return hasOpenAiAnthropicToolPayloadCompatFlag(model); } -function usesOpenAiFunctionAnthropicToolSchemaForModel(model: { - provider?: unknown; - compat?: unknown; -}, options?: AnthropicToolPayloadResolverOptions): boolean { +function usesOpenAiFunctionAnthropicToolSchemaForModel( + model: { + provider?: unknown; + compat?: unknown; + }, + options?: AnthropicToolPayloadResolverOptions, +): boolean { if ( typeof model.provider === "string" && usesOpenAiFunctionAnthropicToolSchema(model.provider, options) @@ -120,10 +126,13 @@ function usesOpenAiFunctionAnthropicToolSchemaForModel(model: { return hasOpenAiAnthropicToolPayloadCompatFlag(model); } -function usesOpenAiStringModeAnthropicToolChoiceForModel(model: { - provider?: unknown; - compat?: unknown; -}, options?: AnthropicToolPayloadResolverOptions): boolean { +function usesOpenAiStringModeAnthropicToolChoiceForModel( + model: { + provider?: unknown; + compat?: unknown; + }, + options?: AnthropicToolPayloadResolverOptions, +): boolean { if ( typeof model.provider === "string" && usesOpenAiStringModeAnthropicToolChoice(model.provider, options) diff --git a/src/agents/provider-capabilities.ts b/src/agents/provider-capabilities.ts index 0539faf31b8..2fe11666766 100644 --- a/src/agents/provider-capabilities.ts +++ b/src/agents/provider-capabilities.ts @@ -1,6 +1,6 @@ +import type { OpenClawConfig } from "../config/config.js"; import { resolveProviderCapabilitiesWithPlugin } from "../plugins/provider-runtime.js"; import { normalizeProviderId } from "./model-selection.js"; -import type { OpenClawConfig } from "../config/config.js"; export type ProviderCapabilities = { anthropicToolSchemaMode: "native" | "openai-functions"; @@ -125,8 +125,7 @@ export function usesOpenAiStringModeAnthropicToolChoice( options?: ProviderCapabilityLookupOptions, ): boolean { return ( - resolveProviderCapabilities(provider, options).anthropicToolChoiceMode === - "openai-string-modes" + resolveProviderCapabilities(provider, options).anthropicToolChoiceMode === "openai-string-modes" ); } diff --git a/src/agents/tools/web-search.ts b/src/agents/tools/web-search.ts index 340065d0d62..151cfc4e6c4 100644 --- a/src/agents/tools/web-search.ts +++ b/src/agents/tools/web-search.ts @@ -1,8 +1,8 @@ import type { OpenClawConfig } from "../../config/config.js"; import { normalizeResolvedSecretInputString } from "../../config/types.secrets.js"; import { logVerbose } from "../../globals.js"; -import { resolvePluginWebSearchProviders } from "../../plugins/web-search-providers.js"; import type { PluginWebSearchProviderEntry } from "../../plugins/types.js"; +import { resolvePluginWebSearchProviders } from "../../plugins/web-search-providers.js"; import type { RuntimeWebSearchMetadata } from "../../secrets/runtime-web-tools.types.js"; import { normalizeSecretInput } from "../../utils/normalize-secret-input.js"; import type { AnyAgentTool } from "./common.js";