From 102f8da561dea8f297779790f39daececc5d8cd8 Mon Sep 17 00:00:00 2001 From: Jaime Abril Date: Mon, 26 Jan 2026 23:43:23 +0100 Subject: [PATCH] style: format cli-backends and model-selection --- src/agents/cli-backends.ts | 26 ++++------------------- src/agents/model-selection.ts | 39 +++++++---------------------------- 2 files changed, 12 insertions(+), 53 deletions(-) diff --git a/src/agents/cli-backends.ts b/src/agents/cli-backends.ts index 93fd86d53..747873d65 100644 --- a/src/agents/cli-backends.ts +++ b/src/agents/cli-backends.ts @@ -54,12 +54,7 @@ const DEFAULT_CLAUDE_BACKEND: CliBackendConfig = { modelAliases: CLAUDE_MODEL_ALIASES, sessionArg: "--session-id", sessionMode: "always", - sessionIdFields: [ - "session_id", - "sessionId", - "conversation_id", - "conversationId", - ], + sessionIdFields: ["session_id", "sessionId", "conversation_id", "conversationId"], systemPromptArg: "--append-system-prompt", systemPromptMode: "append", systemPromptWhen: "first", @@ -69,15 +64,7 @@ const DEFAULT_CLAUDE_BACKEND: CliBackendConfig = { const DEFAULT_CODEX_BACKEND: CliBackendConfig = { command: "codex", - args: [ - "exec", - "--json", - "--color", - "never", - "--sandbox", - "read-only", - "--skip-git-repo-check", - ], + args: ["exec", "--json", "--color", "never", "--sandbox", "read-only", "--skip-git-repo-check"], resumeArgs: [ "exec", "resume", @@ -124,10 +111,7 @@ function pickBackendConfig( return undefined; } -function mergeBackendConfig( - base: CliBackendConfig, - override?: CliBackendConfig, -): CliBackendConfig { +function mergeBackendConfig(base: CliBackendConfig, override?: CliBackendConfig): CliBackendConfig { if (!override) return { ...base }; return { ...base, @@ -135,9 +119,7 @@ function mergeBackendConfig( args: override.args ?? base.args, env: { ...base.env, ...override.env }, modelAliases: { ...base.modelAliases, ...override.modelAliases }, - clearEnv: Array.from( - new Set([...(base.clearEnv ?? []), ...(override.clearEnv ?? [])]), - ), + clearEnv: Array.from(new Set([...(base.clearEnv ?? []), ...(override.clearEnv ?? [])])), sessionIdFields: override.sessionIdFields ?? base.sessionIdFields, sessionArgs: override.sessionArgs ?? base.sessionArgs, resumeArgs: override.resumeArgs ?? base.resumeArgs, diff --git a/src/agents/model-selection.ts b/src/agents/model-selection.ts index c8be1de18..4bb939c02 100644 --- a/src/agents/model-selection.ts +++ b/src/agents/model-selection.ts @@ -9,13 +9,7 @@ export type ModelRef = { model: string; }; -export type ThinkLevel = - | "off" - | "minimal" - | "low" - | "medium" - | "high" - | "xhigh"; +export type ThinkLevel = "off" | "minimal" | "low" | "medium" | "high" | "xhigh"; export type ModelAliasIndex = { byAlias: Map; @@ -44,9 +38,7 @@ export function isCliProvider(provider: string, cfg?: ClawdbotConfig): boolean { if (normalized === "codex-cli") return true; if (normalized === "kiro-cli") return true; const backends = cfg?.agents?.defaults?.cliBackends ?? {}; - return Object.keys(backends).some( - (key) => normalizeProviderId(key) === normalized, - ); + return Object.keys(backends).some((key) => normalizeProviderId(key) === normalized); } function normalizeAnthropicModelId(model: string): string { @@ -64,10 +56,7 @@ function normalizeProviderModelId(provider: string, model: string): string { return model; } -export function parseModelRef( - raw: string, - defaultProvider: string, -): ModelRef | null { +export function parseModelRef(raw: string, defaultProvider: string): ModelRef | null { const trimmed = raw.trim(); if (!trimmed) return null; const slash = trimmed.indexOf("/"); @@ -95,9 +84,7 @@ export function buildModelAliasIndex(params: { for (const [keyRaw, entryRaw] of Object.entries(rawModels)) { const parsed = parseModelRef(String(keyRaw ?? ""), params.defaultProvider); if (!parsed) continue; - const alias = String( - (entryRaw as { alias?: string } | undefined)?.alias ?? "", - ).trim(); + const alias = String((entryRaw as { alias?: string } | undefined)?.alias ?? "").trim(); if (!alias) continue; const aliasKey = normalizeAliasKey(alias); byAlias.set(aliasKey, { alias, ref: parsed }); @@ -135,10 +122,7 @@ export function resolveConfiguredModelRef(params: { defaultModel: string; }): ModelRef { const rawModel = (() => { - const raw = params.cfg.agents?.defaults?.model as - | { primary?: string } - | string - | undefined; + const raw = params.cfg.agents?.defaults?.model as { primary?: string } | string | undefined; if (typeof raw === "string") return raw.trim(); return raw?.primary?.trim() ?? ""; })(); @@ -222,9 +206,7 @@ export function buildAllowedModelSet(params: { defaultModel && params.defaultProvider ? modelKey(params.defaultProvider, defaultModel) : undefined; - const catalogKeys = new Set( - params.catalog.map((entry) => modelKey(entry.provider, entry.id)), - ); + const catalogKeys = new Set(params.catalog.map((entry) => modelKey(entry.provider, entry.id))); if (allowAny) { if (defaultKey) catalogKeys.add(defaultKey); @@ -236,10 +218,7 @@ export function buildAllowedModelSet(params: { } const allowedKeys = new Set(); - const configuredProviders = (params.cfg.models?.providers ?? {}) as Record< - string, - unknown - >; + const configuredProviders = (params.cfg.models?.providers ?? {}) as Record; for (const raw of rawAllowlist) { const parsed = parseModelRef(String(raw), params.defaultProvider); if (!parsed) continue; @@ -299,9 +278,7 @@ export function getModelRefStatus(params: { const key = modelKey(params.ref.provider, params.ref.model); return { key, - inCatalog: params.catalog.some( - (entry) => modelKey(entry.provider, entry.id) === key, - ), + inCatalog: params.catalog.some((entry) => modelKey(entry.provider, entry.id) === key), allowAny: allowed.allowAny, allowed: allowed.allowAny || allowed.allowedKeys.has(key), };