refactor: dedupe agent lowercase helpers

This commit is contained in:
Peter Steinberger
2026-04-07 12:41:44 +01:00
parent 0cbf99ab42
commit 8e4eaec394
19 changed files with 85 additions and 42 deletions

View File

@@ -11,6 +11,7 @@ import type { CliBackendConfig } from "../../config/types.js";
import { resolvePreferredOpenClawTmpDir } from "../../infra/tmp-openclaw-dir.js";
import { MAX_IMAGE_BYTES } from "../../media/constants.js";
import { extensionForMime } from "../../media/mime.js";
import { normalizeOptionalLowercaseString } from "../../shared/string-coerce.js";
import { buildTtsSystemPromptHint } from "../../tts/tts.js";
import { buildModelAliasLines } from "../model-alias-lines.js";
import { resolveDefaultModelForAgent } from "../model-selection.js";
@@ -28,7 +29,7 @@ export { buildCliSupervisorScopeKey, resolveCliNoOutputTimeoutMs } from "./relia
const CLI_RUN_QUEUE = new KeyedAsyncQueue();
function isClaudeCliProvider(providerId: string): boolean {
return providerId.trim().toLowerCase() === "claude-cli";
return normalizeOptionalLowercaseString(providerId) === "claude-cli";
}
export function enqueueCliRun<T>(key: string, task: () => Promise<T>): Promise<T> {

View File

@@ -1,5 +1,6 @@
import path from "node:path";
import type { CliBackendConfig } from "../../config/types.js";
import { normalizeLowercaseStringOrEmpty } from "../../shared/string-coerce.js";
import {
CLI_FRESH_WATCHDOG_DEFAULTS,
CLI_RESUME_WATCHDOG_DEFAULTS,
@@ -75,11 +76,8 @@ export function buildCliSupervisorScopeKey(params: {
backendId: string;
cliSessionId?: string;
}): string | undefined {
const commandToken = path
.basename(params.backend.command ?? "")
.trim()
.toLowerCase();
const backendToken = params.backendId.trim().toLowerCase();
const commandToken = normalizeLowercaseStringOrEmpty(path.basename(params.backend.command ?? ""));
const backendToken = normalizeLowercaseStringOrEmpty(params.backendId);
const sessionToken = params.cliSessionId?.trim();
if (!sessionToken) {
return undefined;