diff --git a/src/commands/auth-choice.test.ts b/src/commands/auth-choice.test.ts index 884c5a14598..7a2126dd9c1 100644 --- a/src/commands/auth-choice.test.ts +++ b/src/commands/auth-choice.test.ts @@ -5,6 +5,7 @@ import { resolveAgentDir } from "../agents/agent-scope.js"; import type { OpenClawConfig } from "../config/config.js"; import { resolveAgentModelPrimaryValue } from "../config/model-input.js"; import type { ModelProviderConfig } from "../config/types.models.js"; +import { GOOGLE_GEMINI_DEFAULT_MODEL } from "../plugin-sdk/google.js"; import { MINIMAX_CN_API_BASE_URL } from "../plugin-sdk/minimax.js"; import { ZAI_CODING_CN_BASE_URL, ZAI_CODING_GLOBAL_BASE_URL } from "../plugin-sdk/zai.js"; import { createProviderApiKeyAuthMethod } from "../plugins/provider-api-key-auth.js"; @@ -12,7 +13,6 @@ import { providerApiKeyAuthRuntime } from "../plugins/provider-api-key-auth.runt import type { ProviderAuthMethod, ProviderPlugin } from "../plugins/types.js"; import type { WizardPrompter } from "../wizard/prompts.js"; import { applyAuthChoice, resolvePreferredProviderForAuthChoice } from "./auth-choice.js"; -import { GOOGLE_GEMINI_DEFAULT_MODEL } from "./google-gemini-model-default.js"; import type { AuthChoice } from "./onboard-types.js"; import { authProfilePathForAgent, diff --git a/src/commands/google-gemini-model-default.ts b/src/commands/google-gemini-model-default.ts deleted file mode 100644 index 1b92333824e..00000000000 --- a/src/commands/google-gemini-model-default.ts +++ /dev/null @@ -1,4 +0,0 @@ -export { - applyGoogleGeminiModelDefault, - GOOGLE_GEMINI_DEFAULT_MODEL, -} from "../plugin-sdk/google.js"; diff --git a/src/commands/onboard-non-interactive.provider-auth.test.ts b/src/commands/onboard-non-interactive.provider-auth.test.ts index 615d6ae3b8f..a8a39085ebe 100644 --- a/src/commands/onboard-non-interactive.provider-auth.test.ts +++ b/src/commands/onboard-non-interactive.provider-auth.test.ts @@ -3,6 +3,7 @@ import path from "node:path"; import { setTimeout as delay } from "node:timers/promises"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { MINIMAX_API_BASE_URL, MINIMAX_CN_API_BASE_URL } from "../plugin-sdk/minimax.js"; +import { OPENAI_DEFAULT_MODEL } from "../plugin-sdk/openai.js"; import { ZAI_CODING_CN_BASE_URL, ZAI_CODING_GLOBAL_BASE_URL, @@ -15,7 +16,6 @@ import { readJsonFile, type NonInteractiveRuntime, } from "./onboard-non-interactive.test-helpers.js"; -import { OPENAI_DEFAULT_MODEL } from "./openai-model-default.js"; type OnboardEnv = { configPath: string; @@ -45,7 +45,7 @@ vi.mock("./onboard-non-interactive/local/auth-choice.plugin-providers.js", async import("../plugins/provider-api-key-auth.runtime.js"), import("../plugins/provider-self-hosted-setup.js"), import("./zai-endpoint-detect.js"), - import("./openai-model-default.js"), + import("../plugin-sdk/openai.js"), ]); const ZAI_FALLBACKS = { diff --git a/src/commands/openai-model-default.test.ts b/src/commands/openai-model-default.test.ts index 93570f5e77d..38b724a2f60 100644 --- a/src/commands/openai-model-default.test.ts +++ b/src/commands/openai-model-default.test.ts @@ -1,16 +1,16 @@ import { describe, expect, it, vi } from "vitest"; import type { OpenClawConfig } from "../config/config.js"; -import type { WizardPrompter } from "../wizard/prompts.js"; -import { applyDefaultModelChoice } from "./auth-choice.default-model.js"; import { applyGoogleGeminiModelDefault, GOOGLE_GEMINI_DEFAULT_MODEL, -} from "./google-gemini-model-default.js"; +} from "../plugin-sdk/google.js"; import { applyOpenAIConfig, applyOpenAIProviderConfig, OPENAI_DEFAULT_MODEL, -} from "./openai-model-default.js"; +} from "../plugin-sdk/openai.js"; +import type { WizardPrompter } from "../wizard/prompts.js"; +import { applyDefaultModelChoice } from "./auth-choice.default-model.js"; import { applyOpencodeZenModelDefault, OPENCODE_ZEN_DEFAULT_MODEL, diff --git a/src/commands/openai-model-default.ts b/src/commands/openai-model-default.ts deleted file mode 100644 index 3aded0f316e..00000000000 --- a/src/commands/openai-model-default.ts +++ /dev/null @@ -1,5 +0,0 @@ -export { - applyOpenAIConfig, - applyOpenAIProviderConfig, - OPENAI_DEFAULT_MODEL, -} from "../plugin-sdk/openai.js";