chore: remove unused internal barrels

This commit is contained in:
Peter Steinberger
2026-04-29 10:23:38 +01:00
parent fa8a7d70ee
commit 3b10b8cf74
10 changed files with 2 additions and 206 deletions

View File

@@ -1,8 +0,0 @@
export {
isGoogleGemini3FlashModel,
isGoogleGemini3ProModel,
resolveGoogleGemini3ThinkingLevel,
stripInvalidGoogleThinkingBudget,
type GoogleThinkingInputLevel,
type GoogleThinkingLevel,
} from "../plugin-sdk/provider-stream-shared.js";

View File

@@ -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";

View File

@@ -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";

View File

@@ -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,

View File

@@ -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,
}));

View File

@@ -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,
}));

View File

@@ -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({

View File

@@ -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";

View File

@@ -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";

View File

@@ -1,2 +0,0 @@
export * from "./list.list-command.js";
export * from "./list.status-command.js";