refactor: simplify core conversions

steipete · steipete · commit d85b2a0e8148 · 2026-04-11T01:17:51.000+01:00
diff --git a/extensions/imessage/src/config-accessors.ts b/extensions/imessage/src/config-accessors.ts
@@ -16,6 +16,6 @@ export function resolveIMessageConfigDefaultTo(params: {
   if (defaultTo == null) {
     return undefined;
   }
-  const normalized = String(defaultTo).trim();
+  const normalized = defaultTo.trim();
   return normalized || undefined;
 }
diff --git a/extensions/imessage/src/monitor/monitor-provider.ts b/extensions/imessage/src/monitor/monitor-provider.ts
@@ -385,10 +385,10 @@ export async function monitorIMessageProvider(opts: MonitorIMessageOpts = {}): P
     });
 
     if (shouldLogVerbose()) {
-      const preview = truncateUtf16Safe(String(ctxPayload.Body ?? ""), 200).replace(/\n/g, "\\n");
+      const preview = truncateUtf16Safe(ctxPayload.Body ?? "", 200).replace(/\n/g, "\\n");
       logVerbose(
         `imessage inbound: chatId=${chatId ?? "unknown"} from=${ctxPayload.From} len=${
-          String(ctxPayload.Body ?? "").length
+          (ctxPayload.Body ?? "").length
         } preview="${preview}"`,
       );
     }
diff --git a/extensions/imessage/src/send.ts b/extensions/imessage/src/send.ts
@@ -80,7 +80,7 @@ function resolveMessageId(result: Record<string, unknown> | null | undefined): s
     (typeof result.guid === "string" && result.guid.trim()) ||
     (typeof result.message_id === "number" ? String(result.message_id) : null) ||
     (typeof result.id === "number" ? String(result.id) : null);
-  return raw ? String(raw).trim() : null;
+  return raw ? raw.trim() : null;
 }
 
 function resolveDeliveredIMessageText(text: string, mediaContentType?: string): string {
diff --git a/extensions/nostr/src/gateway.ts b/extensions/nostr/src/gateway.ts
@@ -169,7 +169,7 @@ export const startNostrGatewayAccount: NostrGatewayStart = async (ctx) => {
         deliver: async (payload) => {
           const outboundText =
             payload && typeof payload === "object" && "text" in payload
-              ? String((payload as { text?: string }).text ?? "")
+              ? ((payload as { text?: string }).text ?? "")
               : "";
           if (!outboundText.trim()) {
             return;
diff --git a/extensions/qa-channel/src/inbound.ts b/extensions/qa-channel/src/inbound.ts
@@ -94,7 +94,7 @@ export async function handleQaInbound(params: {
     deliver: async (payload) => {
       const text =
         payload && typeof payload === "object" && "text" in payload
-          ? String((payload as { text?: string }).text ?? "")
+          ? ((payload as { text?: string }).text ?? "")
           : "";
       if (!text.trim()) {
         return;
diff --git a/src/agents/auth-profiles/oauth.ts b/src/agents/auth-profiles/oauth.ts
@@ -308,7 +308,7 @@ async function refreshOAuthTokenWithLock(params: {
 
     const oauthCreds: Record<string, OAuthCredentials> = { [cred.provider]: cred };
     const result =
-      String(cred.provider) === "chutes"
+      cred.provider === "chutes"
         ? await (async () => {
             const newCredentials = await refreshChutesTokens({
               credential: cred,
diff --git a/src/agents/pi-auth-credentials.ts b/src/agents/pi-auth-credentials.ts
@@ -57,7 +57,7 @@ export function convertAuthProfileCredentialToPi(cred: AuthProfileCredential): P
 export function resolvePiCredentialMapFromStore(store: AuthProfileStore): PiCredentialMap {
   const credentials: PiCredentialMap = {};
   for (const credential of Object.values(store.profiles)) {
-    const provider = normalizeProviderId(String(credential.provider ?? ""));
+    const provider = normalizeProviderId(credential.provider ?? "");
     if (!provider || credentials[provider]) {
       continue;
     }
diff --git a/src/agents/pi-embedded-utils.ts b/src/agents/pi-embedded-utils.ts
@@ -214,7 +214,7 @@ export function splitThinkingTaggedText(text: string): ThinkTaggedSplitBlock[] |
 
   for (const match of text.matchAll(scanRe)) {
     const index = match.index ?? 0;
-    const isClose = Boolean(match[1]?.includes("/"));
+    const isClose = match[1]?.includes("/") ?? false;
 
     if (!inThinking && !isClose) {
       pushText(text.slice(cursor, index));
diff --git a/src/agents/pi-tools.read.ts b/src/agents/pi-tools.read.ts
@@ -653,7 +653,7 @@ export function createOpenClawReadTool(
         signal,
         maxBytes: resolveAdaptiveReadMaxBytes(options),
       });
-      const filePath = typeof record?.path === "string" ? String(record.path) : "<unknown>";
+      const filePath = typeof record?.path === "string" ? record.path : "<unknown>";
       const strippedDetailsResult = stripReadTruncationContentDetails(result);
       const normalizedResult = await normalizeReadImageResult(strippedDetailsResult, filePath);
       return sanitizeToolResultImages(
diff --git a/src/agents/system-prompt.ts b/src/agents/system-prompt.ts
@@ -459,7 +459,7 @@ export function buildAgentSystemPrompt(params: {
   const runtimeChannel = normalizeOptionalLowercaseString(runtimeInfo?.channel);
   const runtimeCapabilities = runtimeInfo?.capabilities ?? [];
   const runtimeCapabilitiesLower = new Set(
-    runtimeCapabilities.map((cap) => normalizeLowercaseStringOrEmpty(String(cap))).filter(Boolean),
+    runtimeCapabilities.map((cap) => normalizeLowercaseStringOrEmpty(cap)).filter(Boolean),
   );
   const inlineButtonsEnabled = runtimeCapabilitiesLower.has("inlinebuttons");
   const messageChannelOptions = listDeliverableMessageChannels().join("|");
diff --git a/src/auto-reply/reply/bash-command.stop.test.ts b/src/auto-reply/reply/bash-command.stop.test.ts
@@ -147,10 +147,10 @@ describe("handleBashChatCommand stop", () => {
         sandboxed: true,
         toolPolicy: {
           allow: [],
-          deny: [],
+          deny: ["bash"],
           sources: {
-            allow: { source: "default", key: "sandbox.tools.allow" },
-            deny: { source: "default", key: "sandbox.tools.deny" },
+            allow: { source: "default", key: "agents.defaults.tools.sandbox.tools.allow" },
+            deny: { source: "default", key: "agents.defaults.tools.sandbox.tools.deny" },
           },
         },
       });
diff --git a/src/commands/doctor/shared/legacy-config-migrations.runtime.gateway.ts b/src/commands/doctor/shared/legacy-config-migrations.runtime.gateway.ts
@@ -84,7 +84,7 @@ export const LEGACY_CONFIG_MIGRATIONS_RUNTIME_GATEWAY: LegacyConfigMigrationSpec
       gateway.controlUi = { ...controlUi, allowedOrigins: origins };
       raw.gateway = gateway;
       changes.push(
-        `Seeded gateway.controlUi.allowedOrigins ${JSON.stringify(origins)} for bind=${String(bind)}. ` +
+        `Seeded gateway.controlUi.allowedOrigins ${JSON.stringify(origins)} for bind=${bind}. ` +
           "Required since v2026.2.26. Add other machine origins to gateway.controlUi.allowedOrigins if needed.",
       );
     },
diff --git a/src/commands/models/shared.ts b/src/commands/models/shared.ts
@@ -133,7 +133,7 @@ export function buildAllowlistSet(cfg: OpenClawConfig): Set<string> {
   const allowed = new Set<string>();
   const models = cfg.agents?.defaults?.models ?? {};
   for (const raw of Object.keys(models)) {
-    const parsed = parseModelRef(String(raw ?? ""), DEFAULT_PROVIDER);
+    const parsed = parseModelRef(raw, DEFAULT_PROVIDER);
     if (!parsed) {
       continue;
     }
diff --git a/src/gateway/session-utils.ts b/src/gateway/session-utils.ts
@@ -494,7 +494,7 @@ export function pruneLegacyStoreKeys(params: {
 }) {
   const keysToDelete = new Set<string>();
   for (const candidate of params.candidates) {
-    const trimmed = normalizeOptionalString(String(candidate ?? "")) ?? "";
+    const trimmed = normalizeOptionalString(candidate ?? "") ?? "";
     if (!trimmed) {
       continue;
     }
diff --git a/src/infra/heartbeat-summary.ts b/src/infra/heartbeat-summary.ts
@@ -54,7 +54,7 @@ export function resolveHeartbeatIntervalMs(
   if (!raw) {
     return null;
   }
-  const trimmed = normalizeOptionalString(String(raw)) ?? "";
+  const trimmed = normalizeOptionalString(raw) ?? "";
   if (!trimmed) {
     return null;
   }
diff --git a/src/infra/machine-name.ts b/src/infra/machine-name.ts
@@ -13,7 +13,7 @@ async function tryScutil(key: "ComputerName" | "LocalHostName") {
       timeout: 1000,
       windowsHide: true,
     });
-    const value = normalizeOptionalString(String(stdout ?? "")) ?? "";
+    const value = normalizeOptionalString(stdout ?? "") ?? "";
     return value.length > 0 ? value : null;
   } catch {
     return null;
diff --git a/src/infra/node-shell.ts b/src/infra/node-shell.ts
@@ -1,7 +1,7 @@
 import { normalizeLowercaseStringOrEmpty } from "../shared/string-coerce.js";
 
 export function buildNodeShellCommand(command: string, platform?: string | null) {
-  const normalized = normalizeLowercaseStringOrEmpty(String(platform ?? "").trim());
+  const normalized = normalizeLowercaseStringOrEmpty((platform ?? "").trim());
   if (normalized.startsWith("win")) {
     return ["cmd.exe", "/d", "/s", "/c", command];
   }
diff --git a/src/media/pdf-extract.ts b/src/media/pdf-extract.ts
@@ -60,7 +60,7 @@ export async function extractPdfContent(params: {
     const page = await pdf.getPage(pageNum);
     const textContent = await page.getTextContent();
     const pageText = textContent.items
-      .map((item) => ("str" in item ? String(item.str) : ""))
+      .map((item) => ("str" in item ? item.str : ""))
       .filter(Boolean)
       .join(" ");
     if (pageText) {
diff --git a/src/memory-host-sdk/host/backend-config.ts b/src/memory-host-sdk/host/backend-config.ts
@@ -375,8 +375,9 @@ export function resolveMemoryBackendConfig(params: {
   const mergedExtraCollections = [
     ...(params.cfg.agents?.defaults?.memorySearch?.qmd?.extraCollections ?? []),
     ...(agentEntry?.memorySearch?.qmd?.extraCollections ?? []),
-  ].filter((value): value is MemoryQmdIndexPath =>
-    Boolean(value && typeof value === "object" && typeof value.path === "string"),
+  ].filter(
+    (value): value is MemoryQmdIndexPath =>
+      value !== null && typeof value === "object" && typeof value.path === "string",
   );
 
   // Combine QMD-specific paths with extraPaths and per-agent cross-agent collections.
diff --git a/src/plugins/provider-auth-input.ts b/src/plugins/provider-auth-input.ts
@@ -216,7 +216,7 @@ export async function ensureApiKeyFromEnvOrPrompt(params: {
     message: params.promptMessage,
     validate: params.validate,
   });
-  const apiKey = params.normalize(String(key ?? ""));
+  const apiKey = params.normalize(key ?? "");
   await params.setCredential(apiKey, selectedMode);
   return apiKey;
 }
diff --git a/src/terminal/theme.ts b/src/terminal/theme.ts
@@ -24,7 +24,7 @@ export const theme = {
   option: hex(LOBSTER_PALETTE.warn),
 } as const;
 
-export const isRich = () => Boolean(baseChalk.level > 0);
+export const isRich = () => baseChalk.level > 0;
 
 export const colorize = (rich: boolean, color: (value: string) => string, value: string) =>
   rich ? color(value) : value;

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@ export function resolveIMessageConfigDefaultTo(params: {`
`16`	`16`	`if (defaultTo == null) {`
`17`	`17`	`return undefined;`
`18`	`18`	`}`
`19`		`- const normalized = String(defaultTo).trim();`
	`19`	`+ const normalized = defaultTo.trim();`
`20`	`20`	`return normalized \|\| undefined;`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ function resolveMessageId(result: Record<string, unknown> \| null \| undefined): s`
`80`	`80`	`(typeof result.guid === "string" && result.guid.trim()) \|\|`
`81`	`81`	`(typeof result.message_id === "number" ? String(result.message_id) : null) \|\|`
`82`	`82`	`(typeof result.id === "number" ? String(result.id) : null);`
`83`		`- return raw ? String(raw).trim() : null;`
	`83`	`+ return raw ? raw.trim() : null;`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`function resolveDeliveredIMessageText(text: string, mediaContentType?: string): string {`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ export function convertAuthProfileCredentialToPi(cred: AuthProfileCredential): P`
`57`	`57`	`export function resolvePiCredentialMapFromStore(store: AuthProfileStore): PiCredentialMap {`
`58`	`58`	`const credentials: PiCredentialMap = {};`
`59`	`59`	`for (const credential of Object.values(store.profiles)) {`
`60`		`- const provider = normalizeProviderId(String(credential.provider ?? ""));`
	`60`	`+ const provider = normalizeProviderId(credential.provider ?? "");`
`61`	`61`	`if (!provider \|\| credentials[provider]) {`
`62`	`62`	`continue;`
`63`	`63`	`}`