diff --git a/docs/plugins/sdk-overview.md b/docs/plugins/sdk-overview.md index 1e32ce797b9..3a7376d4573 100644 --- a/docs/plugins/sdk-overview.md +++ b/docs/plugins/sdk-overview.md @@ -68,10 +68,8 @@ subpaths is in `scripts/lib/plugin-sdk-entrypoints.json`. | --- | --- | | `plugin-sdk/cli-backend` | CLI backend defaults + watchdog constants | | `plugin-sdk/provider-auth` | `createProviderApiKeyAuthMethod`, `ensureApiKeyFromOptionEnvOrPrompt`, `upsertAuthProfile` | - | `plugin-sdk/provider-models` | Legacy compat provider model aliases; prefer provider-specific subpaths or `plugin-sdk/provider-model-shared` | | `plugin-sdk/provider-model-shared` | `normalizeModelCompat` | | `plugin-sdk/provider-catalog-shared` | `findCatalogTemplate`, `buildSingleProviderApiKeyCatalog` | - | `plugin-sdk/provider-catalog` | Legacy compat provider builder aliases; prefer provider-specific subpaths or `plugin-sdk/provider-catalog-shared` | | `plugin-sdk/provider-usage` | `fetchClaudeUsage` and similar | | `plugin-sdk/provider-stream` | Stream wrapper types | | `plugin-sdk/provider-onboard` | Onboarding config patch helpers | diff --git a/package.json b/package.json index 6acf4ac67d2..ad364a326fb 100644 --- a/package.json +++ b/package.json @@ -740,10 +740,6 @@ "types": "./dist/plugin-sdk/provider-catalog-shared.d.ts", "default": "./dist/plugin-sdk/provider-catalog-shared.js" }, - "./plugin-sdk/provider-catalog": { - "types": "./dist/plugin-sdk/provider-catalog.d.ts", - "default": "./dist/plugin-sdk/provider-catalog.js" - }, "./plugin-sdk/provider-entry": { "types": "./dist/plugin-sdk/provider-entry.d.ts", "default": "./dist/plugin-sdk/provider-entry.js" @@ -756,18 +752,10 @@ "types": "./dist/plugin-sdk/provider-http.d.ts", "default": "./dist/plugin-sdk/provider-http.js" }, - "./plugin-sdk/provider-google": { - "types": "./dist/plugin-sdk/provider-google.d.ts", - "default": "./dist/plugin-sdk/provider-google.js" - }, "./plugin-sdk/provider-model-shared": { "types": "./dist/plugin-sdk/provider-model-shared.d.ts", "default": "./dist/plugin-sdk/provider-model-shared.js" }, - "./plugin-sdk/provider-models": { - "types": "./dist/plugin-sdk/provider-models.d.ts", - "default": "./dist/plugin-sdk/provider-models.js" - }, "./plugin-sdk/provider-moonshot": { "types": "./dist/plugin-sdk/provider-moonshot.d.ts", "default": "./dist/plugin-sdk/provider-moonshot.js" diff --git a/scripts/lib/plugin-sdk-entrypoints.json b/scripts/lib/plugin-sdk-entrypoints.json index a60c80ebeef..8eb48340f2f 100644 --- a/scripts/lib/plugin-sdk-entrypoints.json +++ b/scripts/lib/plugin-sdk-entrypoints.json @@ -175,13 +175,10 @@ "provider-auth-login", "plugin-entry", "provider-catalog-shared", - "provider-catalog", "provider-entry", "provider-env-vars", "provider-http", - "provider-google", "provider-model-shared", - "provider-models", "provider-moonshot", "provider-onboard", "provider-stream", diff --git a/src/plugin-sdk/provider-catalog.ts b/src/plugin-sdk/provider-catalog.ts deleted file mode 100644 index 3bc1056f790..00000000000 --- a/src/plugin-sdk/provider-catalog.ts +++ /dev/null @@ -1,34 +0,0 @@ -// Public provider catalog helpers for provider plugins. - -export type { ProviderCatalogContext, ProviderCatalogResult } from "./provider-catalog-shared.js"; -export { - buildPairedProviderApiKeyCatalog, - buildSingleProviderApiKeyCatalog, - findCatalogTemplate, -} from "./provider-catalog-shared.js"; -export { - ANTHROPIC_VERTEX_DEFAULT_MODEL_ID, - buildAnthropicVertexProvider, -} from "./anthropic-vertex.js"; -export { buildBytePlusCodingProvider, buildBytePlusProvider } from "./byteplus.js"; -export { buildDeepSeekProvider } from "./deepseek.js"; -export { buildHuggingfaceProvider } from "./huggingface.js"; -export { buildKimiCodingProvider } from "./kimi-coding.js"; -export { buildKilocodeProvider, buildKilocodeProviderWithDiscovery } from "./kilocode.js"; -export { buildMinimaxPortalProvider, buildMinimaxProvider } from "./minimax.js"; -export { - MODELSTUDIO_BASE_URL, - MODELSTUDIO_DEFAULT_MODEL_ID, - buildModelStudioProvider, -} from "./modelstudio.js"; -export { buildMoonshotProvider } from "./moonshot.js"; -export { buildNvidiaProvider } from "./nvidia.js"; -export { buildOpenAICodexProvider } from "./openai.js"; -export { buildOpenrouterProvider } from "./openrouter.js"; -export { QIANFAN_BASE_URL, QIANFAN_DEFAULT_MODEL_ID, buildQianfanProvider } from "./qianfan.js"; -export { buildSyntheticProvider } from "./synthetic.js"; -export { buildTogetherProvider } from "./together.js"; -export { buildVeniceProvider } from "./venice.js"; -export { buildVercelAiGatewayProvider } from "./vercel-ai-gateway.js"; -export { buildDoubaoCodingProvider, buildDoubaoProvider } from "./volcengine.js"; -export { XIAOMI_DEFAULT_MODEL_ID, buildXiaomiProvider } from "./xiaomi.js"; diff --git a/src/plugin-sdk/provider-google.ts b/src/plugin-sdk/provider-google.ts deleted file mode 100644 index 15a2fe17959..00000000000 --- a/src/plugin-sdk/provider-google.ts +++ /dev/null @@ -1,2 +0,0 @@ -// Deprecated compat alias. Prefer openclaw/plugin-sdk/google. -export * from "./google.js"; diff --git a/src/plugin-sdk/provider-models.ts b/src/plugin-sdk/provider-models.ts deleted file mode 100644 index fafa037b024..00000000000 --- a/src/plugin-sdk/provider-models.ts +++ /dev/null @@ -1,156 +0,0 @@ -// Public model/catalog helpers for provider plugins. - -export type { - BedrockDiscoveryConfig, - KilocodeModelCatalogEntry, - ModelApi, - ModelDefinitionConfig, - ModelProviderConfig, - ProviderPlugin, -} from "./provider-model-shared.js"; - -export { - DEFAULT_CONTEXT_TOKENS, - applyModelCompatPatch, - cloneFirstTemplateModel, - createMoonshotThinkingWrapper, - hasToolSchemaProfile, - hasNativeWebSearchTool, - matchesExactOrPrefix, - normalizeModelCompat, - normalizeProviderId, - resolveUnsupportedToolSchemaKeywords, - resolveMoonshotThinkingType, - resolveToolCallArgumentsEncoding, -} from "./provider-model-shared.js"; -export { - applyXaiModelCompat, - HTML_ENTITY_TOOL_CALL_ARGUMENTS_ENCODING, - normalizeXaiModelId, - XAI_TOOL_SCHEMA_PROFILE, -} from "../../extensions/xai/api.js"; -export { - isMiniMaxModernModelId, - MINIMAX_DEFAULT_MODEL_ID, - MINIMAX_DEFAULT_MODEL_REF, - MINIMAX_TEXT_MODEL_CATALOG, - MINIMAX_TEXT_MODEL_ORDER, - MINIMAX_TEXT_MODEL_REFS, -} from "./minimax.js"; - -// Deprecated compat aliases. Prefer provider-specific subpaths. -export { applyGoogleGeminiModelDefault, GOOGLE_GEMINI_DEFAULT_MODEL } from "./google.js"; -export { - applyOpenAIConfig, - OPENAI_CODEX_DEFAULT_MODEL, - OPENAI_DEFAULT_AUDIO_TRANSCRIPTION_MODEL, - OPENAI_DEFAULT_EMBEDDING_MODEL, - OPENAI_DEFAULT_IMAGE_MODEL, - OPENAI_DEFAULT_MODEL, - OPENAI_DEFAULT_TTS_MODEL, - OPENAI_DEFAULT_TTS_VOICE, -} from "./openai.js"; -export { OPENCODE_GO_DEFAULT_MODEL_REF, applyOpencodeGoModelDefault } from "./opencode-go.js"; -export { - OPENCODE_ZEN_DEFAULT_MODEL, - OPENCODE_ZEN_DEFAULT_MODEL_REF, - applyOpencodeZenModelDefault, -} from "./opencode.js"; - -export { - buildCloudflareAiGatewayModelDefinition, - CLOUDFLARE_AI_GATEWAY_DEFAULT_MODEL_REF, - resolveCloudflareAiGatewayBaseUrl, -} from "./cloudflare-ai-gateway.js"; -export { resolveAnthropicVertexRegion } from "./anthropic-vertex.js"; -export { - discoverHuggingfaceModels, - HUGGINGFACE_BASE_URL, - HUGGINGFACE_MODEL_CATALOG, - buildHuggingfaceModelDefinition, -} from "./huggingface.js"; -export { discoverKilocodeModels } from "./kilocode.js"; -export { - buildChutesModelDefinition, - CHUTES_BASE_URL, - CHUTES_DEFAULT_MODEL_ID, - CHUTES_DEFAULT_MODEL_REF, - CHUTES_MODEL_CATALOG, - discoverChutesModels, -} from "./chutes.js"; -export { - buildOllamaModelDefinition, - enrichOllamaModelsWithContext, - fetchOllamaModels, - queryOllamaContextWindow, - resolveOllamaApiBase, - type OllamaModelWithContext, - type OllamaTagModel, - type OllamaTagsResponse, -} from "../../extensions/ollama/api.js"; -export { - buildSyntheticModelDefinition, - SYNTHETIC_BASE_URL, - SYNTHETIC_DEFAULT_MODEL_REF, - SYNTHETIC_MODEL_CATALOG, -} from "./synthetic.js"; -export { - buildDeepSeekModelDefinition, - DEEPSEEK_BASE_URL, - DEEPSEEK_MODEL_CATALOG, -} from "./deepseek.js"; -export { - buildTogetherModelDefinition, - TOGETHER_BASE_URL, - TOGETHER_MODEL_CATALOG, -} from "./together.js"; -export { - discoverVeniceModels, - VENICE_BASE_URL, - VENICE_DEFAULT_MODEL_REF, - VENICE_MODEL_CATALOG, - buildVeniceModelDefinition, -} from "./venice.js"; -export { - BYTEPLUS_BASE_URL, - BYTEPLUS_CODING_BASE_URL, - BYTEPLUS_CODING_MODEL_CATALOG, - BYTEPLUS_MODEL_CATALOG, - buildBytePlusModelDefinition, -} from "./byteplus.js"; -export { - DOUBAO_BASE_URL, - DOUBAO_CODING_BASE_URL, - DOUBAO_CODING_MODEL_CATALOG, - DOUBAO_MODEL_CATALOG, - buildDoubaoModelDefinition, -} from "./volcengine.js"; -export { - OLLAMA_DEFAULT_BASE_URL, - OLLAMA_DEFAULT_CONTEXT_WINDOW, - OLLAMA_DEFAULT_COST, - OLLAMA_DEFAULT_MAX_TOKENS, -} from "../../extensions/ollama/api.js"; -export { VLLM_DEFAULT_BASE_URL } from "../../extensions/vllm/api.js"; -export { SGLANG_DEFAULT_BASE_URL } from "../../extensions/sglang/api.js"; -export { - buildKilocodeModelDefinition, - KILOCODE_BASE_URL, - KILOCODE_DEFAULT_CONTEXT_WINDOW, - KILOCODE_DEFAULT_COST, - KILOCODE_DEFAULT_MODEL_REF, - KILOCODE_DEFAULT_MAX_TOKENS, - KILOCODE_DEFAULT_MODEL_ID, - KILOCODE_DEFAULT_MODEL_NAME, - KILOCODE_MODEL_CATALOG, -} from "./kilocode.js"; -export { discoverVercelAiGatewayModels, VERCEL_AI_GATEWAY_BASE_URL } from "./vercel-ai-gateway.js"; -export { - buildModelStudioDefaultModelDefinition, - buildModelStudioModelDefinition, - MODELSTUDIO_CN_BASE_URL, - MODELSTUDIO_DEFAULT_COST, - MODELSTUDIO_DEFAULT_MODEL_ID, - MODELSTUDIO_DEFAULT_MODEL_REF, - MODELSTUDIO_GLOBAL_BASE_URL, -} from "./modelstudio.js"; diff --git a/src/plugin-sdk/subpaths.test.ts b/src/plugin-sdk/subpaths.test.ts index 3f9f97da180..772e53123bc 100644 --- a/src/plugin-sdk/subpaths.test.ts +++ b/src/plugin-sdk/subpaths.test.ts @@ -629,17 +629,6 @@ describe("plugin-sdk subpath exports", () => { "toFormUrlEncoded", ]); expectSourceOmits("core", ["buildOauthProviderAuthResult"]); - expectSourceContract("provider-models", { - mentions: ["applyOpenAIConfig", "buildKilocodeModelDefinition", "discoverHuggingfaceModels"], - omits: [ - "buildMinimaxModelDefinition", - "buildMoonshotProvider", - "QIANFAN_BASE_URL", - "resolveZaiBaseUrl", - ], - }); - expectSourceOmitsSnippet("provider-models", "./xai.js"); - expectSourceOmitsSnippet("provider-models", "./ollama-surface.js"); expectSourceContract("provider-model-shared", { mentions: ["DEFAULT_CONTEXT_TOKENS", "normalizeModelCompat", "cloneFirstTemplateModel"], omits: ["applyOpenAIConfig", "buildKilocodeModelDefinition", "discoverHuggingfaceModels"],