mirror of
https://github.com/openclaw/openclaw.git
synced 2026-07-20 20:21:40 +00:00
* refactor: share talk event metric extraction * refactor: reuse shared coercion helpers * refactor: reuse shared primitive guards * refactor: reuse shared record guard * refactor: reuse shared primitive helpers * refactor: reuse shared string guards * refactor: reuse shared non-empty string guard * refactor: share plugin primitive coercion helpers * refactor: reuse plugin coercion helpers * refactor: reuse plugin coercion helpers in more plugins * refactor: reuse channel coercion helpers * refactor: reuse monitor coercion helpers * refactor: reuse provider coercion helpers * refactor: reuse core coercion helpers * refactor: reuse runtime coercion helpers * refactor: reuse helper coercion in codex paths * refactor: reuse helper coercion in runtime paths * refactor: reuse codex app-server coercion helpers * refactor: reuse codex record helpers * refactor: reuse migration and qa record helpers * refactor: reuse feishu and core helper guards * refactor: reuse browser and policy coercion helpers * refactor: reuse memory wiki record helper * refactor: share boolean coercion helpers * refactor: reuse finite number coercion * refactor: reuse trimmed string list helpers * refactor: reuse string list normalization * refactor: reuse remaining string list helpers * refactor: reuse string entry normalizer * refactor: share sorted string helpers * refactor: share string list normalization * test: preserve command registry browser imports * refactor: reuse trimmed list helpers * refactor: reuse string dedupe helpers * refactor: reuse local dedupe helpers * refactor: reuse more string dedupe helpers * refactor: reuse command string dedupe helpers * refactor: dedupe memory path lists with helper * refactor: expose string dedupe helpers to plugins * refactor: reuse core string dedupe helpers * refactor: reuse shared unique value helpers * refactor: reuse unique helpers in agent utilities * refactor: reuse unique helpers in config plumbing * refactor: reuse unique helpers in extensions * refactor: reuse unique helpers in core utilities * refactor: reuse unique helpers in qa plugins * refactor: reuse unique helpers in memory plugins * refactor: reuse unique helpers in channel plugins * refactor: reuse unique helpers in core tails * refactor: reuse unique helper in comfy workflow * refactor: reuse unique helpers in test utilities * refactor: expose unique value helper to plugins * refactor: reuse unique helpers for numeric lists * refactor: replace index dedupe filters * refactor: reuse string entry normalization * refactor: reuse string normalization in plugin helpers * refactor: reuse string normalization in extension helpers * refactor: reuse string normalization in channel parsers * refactor: reuse string normalization in memory search * refactor: reuse string normalization in provider parsers * refactor: reuse string normalization in qa helpers * refactor: reuse string normalization in infra parsers * refactor: reuse string normalization in messaging parsers * refactor: reuse string normalization in core parsers * refactor: reuse string normalization in extension parsers * refactor: reuse string normalization in remaining parsers * refactor: reuse string normalization in final parser spots * refactor: reuse string normalization in qa media helpers * refactor: reuse normalization in provider and media lists * refactor: reuse normalization for remaining set filters * refactor: reuse normalization in policy allowlists * refactor: reuse normalization in session and owner lists * refactor: centralize primitive string lists * refactor: reuse lowercase entry helpers * refactor: reuse sorted string helpers * refactor: reuse unique trimmed helpers * refactor: reuse string normalization helpers * refactor: reuse catalog string helpers * refactor: reuse remaining string helpers * refactor: simplify remaining list normalization * refactor: reuse codex auth order normalization * chore: refresh plugin sdk api baseline * fix: make shared string sorting deterministic * chore: refresh plugin sdk api baseline * fix: align host env security ordering
113 lines
3.6 KiB
TypeScript
113 lines
3.6 KiB
TypeScript
import { normalizeProviderId } from "../agents/provider-id.js";
|
|
import { normalizeGooglePreviewModelId } from "../plugin-sdk/provider-model-id-normalize.js";
|
|
import { isRecord as isPlainRecord } from "../shared/record-coerce.js";
|
|
import {
|
|
normalizeLowercaseStringOrEmpty,
|
|
normalizeOptionalString,
|
|
resolvePrimaryStringValue,
|
|
} from "../shared/string-coerce.js";
|
|
import type { AgentModelConfig, AgentToolModelConfig } from "./types.agents-shared.js";
|
|
|
|
type AgentModelListLike = {
|
|
primary?: string;
|
|
fallbacks?: string[];
|
|
};
|
|
|
|
function modelKeyForConfig(provider: string, model: string): string {
|
|
const providerId = provider.trim();
|
|
const modelId = model.trim();
|
|
if (!providerId) {
|
|
return modelId;
|
|
}
|
|
if (!modelId) {
|
|
return providerId;
|
|
}
|
|
return normalizeLowercaseStringOrEmpty(modelId).startsWith(
|
|
`${normalizeLowercaseStringOrEmpty(providerId)}/`,
|
|
)
|
|
? modelId
|
|
: `${providerId}/${modelId}`;
|
|
}
|
|
|
|
type AgentModelInput = AgentModelConfig | AgentToolModelConfig;
|
|
|
|
export function resolveAgentModelPrimaryValue(model?: AgentModelInput): string | undefined {
|
|
return resolvePrimaryStringValue(model);
|
|
}
|
|
|
|
export function resolveAgentModelFallbackValues(model?: AgentModelInput): string[] {
|
|
if (!model || typeof model !== "object") {
|
|
return [];
|
|
}
|
|
return Array.isArray(model.fallbacks) ? model.fallbacks : [];
|
|
}
|
|
|
|
export function resolveAgentModelTimeoutMsValue(model?: AgentToolModelConfig): number | undefined {
|
|
if (!model || typeof model !== "object") {
|
|
return undefined;
|
|
}
|
|
return typeof model.timeoutMs === "number" &&
|
|
Number.isFinite(model.timeoutMs) &&
|
|
model.timeoutMs > 0
|
|
? Math.floor(model.timeoutMs)
|
|
: undefined;
|
|
}
|
|
|
|
export function toAgentModelListLike(model?: AgentModelConfig): AgentModelListLike | undefined {
|
|
if (typeof model === "string") {
|
|
const primary = normalizeOptionalString(model);
|
|
return primary ? { primary } : undefined;
|
|
}
|
|
if (!model || typeof model !== "object") {
|
|
return undefined;
|
|
}
|
|
return model;
|
|
}
|
|
|
|
const GOOGLE_PROVIDER_IDS = new Set(["google", "google-gemini-cli", "google-vertex"]);
|
|
|
|
export function normalizeAgentModelRefForConfig(model: string): string {
|
|
const trimmed = model.trim();
|
|
const slash = trimmed.indexOf("/");
|
|
if (slash <= 0 || slash >= trimmed.length - 1) {
|
|
return trimmed;
|
|
}
|
|
|
|
const provider = normalizeProviderId(trimmed.slice(0, slash));
|
|
const modelSuffix = trimmed.slice(slash + 1);
|
|
const normalizedModel =
|
|
GOOGLE_PROVIDER_IDS.has(provider) || modelSuffix.startsWith("google/")
|
|
? normalizeGooglePreviewModelId(modelSuffix)
|
|
: modelSuffix;
|
|
return modelKeyForConfig(provider, normalizedModel);
|
|
}
|
|
|
|
function mergeAgentModelEntryForConfig(existing: unknown, incoming: unknown): unknown {
|
|
if (!isPlainRecord(existing) || !isPlainRecord(incoming)) {
|
|
return incoming;
|
|
}
|
|
|
|
const existingParams = isPlainRecord(existing.params) ? existing.params : undefined;
|
|
const incomingParams = isPlainRecord(incoming.params) ? incoming.params : undefined;
|
|
return {
|
|
...existing,
|
|
...incoming,
|
|
...(existingParams || incomingParams
|
|
? { params: { ...existingParams, ...incomingParams } }
|
|
: undefined),
|
|
};
|
|
}
|
|
|
|
export function normalizeAgentModelMapForConfig<T extends Record<string, unknown>>(models: T): T {
|
|
let mutated = false;
|
|
const next: Record<string, unknown> = {};
|
|
for (const [key, entry] of Object.entries(models)) {
|
|
const normalizedKey = normalizeAgentModelRefForConfig(key);
|
|
if (normalizedKey !== key || Object.prototype.hasOwnProperty.call(next, normalizedKey)) {
|
|
mutated = true;
|
|
}
|
|
next[normalizedKey] = mergeAgentModelEntryForConfig(next[normalizedKey], entry);
|
|
}
|
|
return (mutated ? next : models) as T;
|
|
}
|