From 3b10b8cf74e3beb4eb509dea6ef77570bacbba5a Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Wed, 29 Apr 2026 10:23:38 +0100 Subject: [PATCH] chore: remove unused internal barrels --- src/agents/google-thinking-compat.ts | 8 ---- src/agents/harness/index.ts | 27 ----------- src/agents/runtime-plan/index.ts | 18 -------- src/cli/capability-cli.test.ts | 4 -- src/cli/models-cli.test.ts | 29 ------------ src/cli/program/routes.test.ts | 8 ---- src/commands/models.list.e2e.test.ts | 67 +--------------------------- src/commands/models.ts | 33 -------------- src/commands/models/list.runtime.ts | 12 ----- src/commands/models/list.ts | 2 - 10 files changed, 2 insertions(+), 206 deletions(-) delete mode 100644 src/agents/google-thinking-compat.ts delete mode 100644 src/agents/harness/index.ts delete mode 100644 src/agents/runtime-plan/index.ts delete mode 100644 src/commands/models.ts delete mode 100644 src/commands/models/list.runtime.ts delete mode 100644 src/commands/models/list.ts diff --git a/src/agents/google-thinking-compat.ts b/src/agents/google-thinking-compat.ts deleted file mode 100644 index 6c7530b5748..00000000000 --- a/src/agents/google-thinking-compat.ts +++ /dev/null @@ -1,8 +0,0 @@ -export { - isGoogleGemini3FlashModel, - isGoogleGemini3ProModel, - resolveGoogleGemini3ThinkingLevel, - stripInvalidGoogleThinkingBudget, - type GoogleThinkingInputLevel, - type GoogleThinkingLevel, -} from "../plugin-sdk/provider-stream-shared.js"; diff --git a/src/agents/harness/index.ts b/src/agents/harness/index.ts deleted file mode 100644 index 6a1d5e9e3af..00000000000 --- a/src/agents/harness/index.ts +++ /dev/null @@ -1,27 +0,0 @@ -export { - clearAgentHarnesses, - disposeRegisteredAgentHarnesses, - getAgentHarness, - getRegisteredAgentHarness, - listAgentHarnessIds, - listRegisteredAgentHarnesses, - registerAgentHarness, - resetRegisteredAgentHarnessSessions, - restoreRegisteredAgentHarnesses, -} from "./registry.js"; -export { - maybeCompactAgentHarnessSession, - runAgentHarnessAttemptWithFallback, - selectAgentHarness, -} from "./selection.js"; -export type { - AgentHarness, - AgentHarnessAttemptParams, - AgentHarnessAttemptResult, - AgentHarnessCompactParams, - AgentHarnessCompactResult, - AgentHarnessResetParams, - AgentHarnessSupport, - AgentHarnessSupportContext, - RegisteredAgentHarness, -} from "./types.js"; diff --git a/src/agents/runtime-plan/index.ts b/src/agents/runtime-plan/index.ts deleted file mode 100644 index 915b122f33d..00000000000 --- a/src/agents/runtime-plan/index.ts +++ /dev/null @@ -1,18 +0,0 @@ -export { buildAgentRuntimeAuthPlan } from "./auth.js"; -export { - buildAgentRuntimeDeliveryPlan, - buildAgentRuntimeOutcomePlan, - buildAgentRuntimePlan, -} from "./build.js"; -export type { - AgentRuntimeAuthPlan, - AgentRuntimeDeliveryPlan, - AgentRuntimeOutcomePlan, - AgentRuntimePlan, - AgentRuntimePromptPlan, - AgentRuntimeResolvedRef, - AgentRuntimeToolPlan, - AgentRuntimeTransportPlan, - BuildAgentRuntimeDeliveryPlanParams, - BuildAgentRuntimePlanParams, -} from "./types.js"; diff --git a/src/cli/capability-cli.test.ts b/src/cli/capability-cli.test.ts index 08cc6813e29..4d2d89d7649 100644 --- a/src/cli/capability-cli.test.ts +++ b/src/cli/capability-cli.test.ts @@ -188,10 +188,6 @@ vi.mock("../commands/models/auth.js", () => ({ modelsAuthLoginCommand: vi.fn(), })); -vi.mock("../commands/models/list.js", () => ({ - modelsStatusCommand: - mocks.modelsStatusCommand as typeof import("../commands/models/list.js").modelsStatusCommand, -})); vi.mock("../commands/models/list.status-command.js", () => ({ modelsStatusCommand: mocks.modelsStatusCommand as typeof import("../commands/models/list.status-command.js").modelsStatusCommand, diff --git a/src/cli/models-cli.test.ts b/src/cli/models-cli.test.ts index 6b46baa3f1a..bea6abc44f3 100644 --- a/src/cli/models-cli.test.ts +++ b/src/cli/models-cli.test.ts @@ -20,35 +20,6 @@ const { modelsStatusCommand, } = mocks; -vi.mock("../commands/models.js", () => ({ - modelsStatusCommand: mocks.modelsStatusCommand, - modelsAliasesAddCommand: mocks.noopAsync, - modelsAliasesListCommand: mocks.noopAsync, - modelsAliasesRemoveCommand: mocks.noopAsync, - modelsAuthAddCommand: mocks.noopAsync, - modelsAuthLoginCommand: mocks.modelsAuthLoginCommand, - modelsAuthOrderClearCommand: mocks.noopAsync, - modelsAuthOrderGetCommand: mocks.noopAsync, - modelsAuthOrderSetCommand: mocks.noopAsync, - modelsAuthPasteTokenCommand: mocks.noopAsync, - modelsAuthSetupTokenCommand: mocks.noopAsync, - modelsFallbacksAddCommand: mocks.noopAsync, - modelsFallbacksClearCommand: mocks.noopAsync, - modelsFallbacksListCommand: mocks.noopAsync, - modelsFallbacksRemoveCommand: mocks.noopAsync, - modelsImageFallbacksAddCommand: mocks.noopAsync, - modelsImageFallbacksClearCommand: mocks.noopAsync, - modelsImageFallbacksListCommand: mocks.noopAsync, - modelsImageFallbacksRemoveCommand: mocks.noopAsync, - modelsListCommand: mocks.noopAsync, - modelsScanCommand: mocks.noopAsync, - modelsSetCommand: mocks.noopAsync, - modelsSetImageCommand: mocks.noopAsync, -})); -vi.mock("../commands/models/list.js", () => ({ - modelsListCommand: mocks.noopAsync, - modelsStatusCommand: mocks.modelsStatusCommand, -})); vi.mock("../commands/models/list.list-command.js", () => ({ modelsListCommand: mocks.noopAsync, })); diff --git a/src/cli/program/routes.test.ts b/src/cli/program/routes.test.ts index a3e11a84eb7..51295dcf247 100644 --- a/src/cli/program/routes.test.ts +++ b/src/cli/program/routes.test.ts @@ -17,14 +17,6 @@ vi.mock("../config-cli.js", () => ({ runConfigUnset: runConfigUnsetMock, })); -vi.mock("../../commands/models.js", () => ({ - modelsListCommand: modelsListCommandMock, - modelsStatusCommand: modelsStatusCommandMock, -})); -vi.mock("../../commands/models/list.js", () => ({ - modelsListCommand: modelsListCommandMock, - modelsStatusCommand: modelsStatusCommandMock, -})); vi.mock("../../commands/models/list.list-command.js", () => ({ modelsListCommand: modelsListCommandMock, })); diff --git a/src/commands/models.list.e2e.test.ts b/src/commands/models.list.e2e.test.ts index 37223f34bd3..a31db341b88 100644 --- a/src/commands/models.list.e2e.test.ts +++ b/src/commands/models.list.e2e.test.ts @@ -10,7 +10,6 @@ const readConfigFileSnapshotForWrite = vi.fn().mockResolvedValue({ writeOptions: {}, }); const setRuntimeConfigSnapshot = vi.fn(); -const ensureOpenClawModelsJson = vi.fn().mockResolvedValue(undefined); const resolveOpenClawAgentDir = vi.fn().mockReturnValue("/tmp/openclaw-agent"); const ensureAuthProfileStore = vi.fn().mockReturnValue({ version: 1, profiles: {} }); const listProfilesForProvider = vi.fn().mockReturnValue([]); @@ -51,66 +50,6 @@ vi.mock("./models/load-config.js", () => ({ }), })); -vi.mock("./models/list.runtime.js", () => { - class MockModelRegistry { - find(provider: string, id: string) { - if (modelRegistryState.findError !== undefined) { - throw modelRegistryState.findError; - } - return ( - modelRegistryState.models.find((model) => model.provider === provider && model.id === id) ?? - null - ); - } - - getAll() { - if (modelRegistryState.getAllError !== undefined) { - throw modelRegistryState.getAllError; - } - return modelRegistryState.models; - } - - getAvailable() { - if (modelRegistryState.getAvailableError !== undefined) { - throw modelRegistryState.getAvailableError; - } - return modelRegistryState.available; - } - - hasConfiguredAuth(model: { provider: string; id: string }) { - return modelRegistryState.available.some( - (available) => available.provider === model.provider && available.id === model.id, - ); - } - } - - return { - ensureAuthProfileStore, - ensureOpenClawModelsJson, - resolveOpenClawAgentDir, - listProfilesForProvider, - resolveEnvApiKey, - resolveAwsSdkEnvVarName, - hasUsableCustomProviderApiKey, - hasProviderStaticCatalogForFilter, - loadModelCatalog, - loadProviderCatalogModelsForList, - discoverAuthStorage: () => ({}) as unknown, - discoverModels: () => new MockModelRegistry() as unknown, - resolveModelWithRegistry: ({ - provider, - modelId, - modelRegistry, - }: { - provider: string; - modelId: string; - modelRegistry: { find: (provider: string, id: string) => unknown }; - }) => { - return modelRegistry.find(provider, modelId); - }, - }; -}); - vi.mock("../agents/agent-paths.js", () => ({ resolveOpenClawAgentDir, })); @@ -251,7 +190,6 @@ beforeEach(() => { getRuntimeConfig.mockReset(); getRuntimeConfig.mockReturnValue({}); listProfilesForProvider.mockReturnValue([]); - ensureOpenClawModelsJson.mockClear(); loadModelCatalog.mockClear(); loadModelCatalog.mockResolvedValue([]); loadProviderCatalogModelsForList.mockReset(); @@ -565,9 +503,9 @@ describe("models list/status", () => { models: { providers: { openai: { apiKey: "sk-resolved-runtime-value" } } }, // pragma: allowlist secret }; - await loadModelRegistry(resolvedConfig as never); + const loaded = await loadModelRegistry(resolvedConfig as never); - expect(ensureOpenClawModelsJson).not.toHaveBeenCalled(); + expect(loaded.models).toEqual([OPENAI_MODEL]); }); it("filters stale spark rows from models list and registry views", async () => { @@ -647,7 +585,6 @@ describe("models list/status", () => { await modelsListCommand({ all: true, json: true }, runtime); - expect(ensureOpenClawModelsJson).not.toHaveBeenCalled(); const payload = parseJsonLog(runtime); expect(payload.models).toEqual([ expect.objectContaining({ diff --git a/src/commands/models.ts b/src/commands/models.ts deleted file mode 100644 index 7be3e6b2268..00000000000 --- a/src/commands/models.ts +++ /dev/null @@ -1,33 +0,0 @@ -export { githubCopilotLoginCommand } from "../plugin-sdk/provider-auth-login.js"; -export { - modelsAliasesAddCommand, - modelsAliasesListCommand, - modelsAliasesRemoveCommand, -} from "./models/aliases.js"; -export { - modelsAuthAddCommand, - modelsAuthLoginCommand, - modelsAuthPasteTokenCommand, - modelsAuthSetupTokenCommand, -} from "./models/auth.js"; -export { - modelsAuthOrderClearCommand, - modelsAuthOrderGetCommand, - modelsAuthOrderSetCommand, -} from "./models/auth-order.js"; -export { - modelsFallbacksAddCommand, - modelsFallbacksClearCommand, - modelsFallbacksListCommand, - modelsFallbacksRemoveCommand, -} from "./models/fallbacks.js"; -export { - modelsImageFallbacksAddCommand, - modelsImageFallbacksClearCommand, - modelsImageFallbacksListCommand, - modelsImageFallbacksRemoveCommand, -} from "./models/image-fallbacks.js"; -export { modelsListCommand, modelsStatusCommand } from "./models/list.js"; -export { modelsScanCommand } from "./models/scan.js"; -export { modelsSetCommand } from "./models/set.js"; -export { modelsSetImageCommand } from "./models/set-image.js"; diff --git a/src/commands/models/list.runtime.ts b/src/commands/models/list.runtime.ts deleted file mode 100644 index 7d0613de45b..00000000000 --- a/src/commands/models/list.runtime.ts +++ /dev/null @@ -1,12 +0,0 @@ -export { loadAuthProfileStoreWithoutExternalProfiles as ensureAuthProfileStore } from "../../agents/auth-profiles/store.js"; -export { resolveOpenClawAgentDir } from "../../agents/agent-paths.js"; -export { listProfilesForProvider } from "../../agents/auth-profiles.js"; -export { - hasUsableCustomProviderApiKey, - resolveAwsSdkEnvVarName, - resolveEnvApiKey, -} from "../../agents/model-auth.js"; -export { loadModelCatalog } from "../../agents/model-catalog.js"; -export { resolveModelWithRegistry } from "../../agents/pi-embedded-runner/model.js"; -export { discoverAuthStorage, discoverModels } from "../../agents/pi-model-discovery.js"; -export { loadProviderCatalogModelsForList } from "./list.provider-catalog.js"; diff --git a/src/commands/models/list.ts b/src/commands/models/list.ts deleted file mode 100644 index 0473476f8b7..00000000000 --- a/src/commands/models/list.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from "./list.list-command.js"; -export * from "./list.status-command.js";