From 814bf66cf4362386c9ee845b17f641eee1a05a30 Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Sat, 2 May 2026 08:23:30 +0100 Subject: [PATCH] refactor: trim web fetch facade --- src/agents/tools/web-fetch.ts | 2 -- src/commands/models/list.auth-index.ts | 7 ++++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/agents/tools/web-fetch.ts b/src/agents/tools/web-fetch.ts index 63e8b23f12b..a5f00788790 100644 --- a/src/agents/tools/web-fetch.ts +++ b/src/agents/tools/web-fetch.ts @@ -34,8 +34,6 @@ import { writeCache, } from "./web-shared.js"; -export { extractReadableContent } from "../../web-fetch/content-extractors.runtime.js"; - const EXTRACT_MODES = ["markdown", "text"] as const; const DEFAULT_FETCH_MAX_CHARS = 20_000; diff --git a/src/commands/models/list.auth-index.ts b/src/commands/models/list.auth-index.ts index cc042d26aed..468b97ad3cf 100644 --- a/src/commands/models/list.auth-index.ts +++ b/src/commands/models/list.auth-index.ts @@ -12,6 +12,7 @@ import { } from "../../agents/model-auth.js"; import { resolveProviderAuthAliasMap } from "../../agents/provider-auth-aliases.js"; import { normalizeProviderIdForAuth } from "../../agents/provider-id.js"; +import { resolveAgentModelPrimaryValue } from "../../config/model-input.js"; import type { OpenClawConfig } from "../../config/types.openclaw.js"; import { loadPluginRegistrySnapshotWithMetadata } from "../../plugins/plugin-registry.js"; @@ -112,9 +113,9 @@ export function createModelListAuthIndex( addProvider(provider); } } - const defaultModel = params.cfg.agents?.defaults?.model; - const primaryModel = typeof defaultModel === "string" ? defaultModel : defaultModel?.primary; - const primaryModelProvider = primaryModel?.split("/", 1)[0]; + const primaryModelProvider = resolveAgentModelPrimaryValue( + params.cfg.agents?.defaults?.model, + )?.split("/", 1)[0]; if (primaryModelProvider === "openai-codex" || primaryModelProvider === "codex") { addSyntheticProvider("codex"); }