vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-17 12:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: dedupe agent lowercase helpers

Browse Source
This commit is contained in:
Peter Steinberger
2026-04-07 17:15:44 +01:00
parent d56fe040b4
commit d40dc8f025
23 changed files with 116 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/agents/bash-tools.exec.ts
View File

@@ -17,7 +17,11 @@ import {
} from "../infra/shell-env.js";
import { logInfo } from "../logger.js";
import { parseAgentSessionKey, resolveAgentIdFromSessionKey } from "../routing/session-key.js";
import { normalizeOptionalString } from "../shared/string-coerce.js";
import {
normalizeLowercaseStringOrEmpty,
normalizeOptionalLowercaseString,
normalizeOptionalString,
} from "../shared/string-coerce.js";
import { splitShellArgs } from "../utils/shell-argv.js";
import { markBackgrounded } from "./bash-process-registry.js";
import { processGatewayAllowlist } from "./bash-tools.exec-host-gateway.js";
@@ -109,7 +113,7 @@ function isEnvExecutableToken(token: string | undefined): boolean {
if (!token) {
return false;
}
const base = token.split(/[\\/]/u).at(-1)?.toLowerCase() ?? "";
const base = normalizeOptionalLowercaseString(token.split(/[\\/]/u).at(-1)) ?? "";
const normalizedBase = base.endsWith(".exe") ? base.slice(0, -4) : base;
return normalizedBase === "env";
}
@@ -158,7 +162,7 @@ function findFirstPythonScriptArg(tokens: string[]): string | null {
const token = tokens[i];
if (token === "--") {
const next = tokens[i + 1];
return next?.toLowerCase().endsWith(".py") ? next : null;
return normalizeLowercaseStringOrEmpty(next).endsWith(".py") ? next : null;
}
if (token === "-") {
return null;
@@ -176,7 +180,7 @@ function findFirstPythonScriptArg(tokens: string[]): string | null {
if (token.startsWith("-")) {
continue;
}
return token.toLowerCase().endsWith(".py") ? token : null;
return normalizeLowercaseStringOrEmpty(token).endsWith(".py") ? token : null;
}
return null;
}
@@ -191,7 +195,7 @@ function findNodeScriptArgs(tokens: string[]): string[] {
if (token === "--") {
if (!hasInlineEvalOrPrint && !entryScript) {
const next = tokens[i + 1];
if (next?.toLowerCase().endsWith(".js")) {
if (normalizeLowercaseStringOrEmpty(next).endsWith(".js")) {
entryScript = next;
}
}
@@ -214,7 +218,7 @@ function findNodeScriptArgs(tokens: string[]): string[] {
}
if (optionsWithSeparateValue.has(token)) {
const next = tokens[i + 1];
if (next?.toLowerCase().endsWith(".js")) {
if (normalizeLowercaseStringOrEmpty(next).endsWith(".js")) {
preloadScripts.push(next);
}
i += 1;
@@ -228,7 +232,7 @@ function findNodeScriptArgs(tokens: string[]): string[] {
const inlineValue = token.startsWith("-r")
? token.slice(2)
: token.slice(token.indexOf("=") + 1);
if (inlineValue.toLowerCase().endsWith(".js")) {
if (normalizeLowercaseStringOrEmpty(inlineValue).endsWith(".js")) {
preloadScripts.push(inlineValue);
}
continue;
@@ -236,7 +240,11 @@ function findNodeScriptArgs(tokens: string[]): string[] {
if (token.startsWith("-")) {
continue;
}
if (!hasInlineEvalOrPrint && !entryScript && token.toLowerCase().endsWith(".js")) {
if (
!hasInlineEvalOrPrint &&
!entryScript &&
normalizeLowercaseStringOrEmpty(token).endsWith(".js")
) {
entryScript = token;
}
break;
@@ -258,7 +266,7 @@ function extractInterpreterScriptTargetFromArgv(
while (commandIdx < argv.length && /^[A-Za-z_][A-Za-z0-9_]*=.*$/u.test(argv[commandIdx])) {
commandIdx += 1;
}
const executable = argv[commandIdx]?.toLowerCase();
const executable = normalizeOptionalLowercaseString(argv[commandIdx]);
if (!executable) {
return null;
}
@@ -550,7 +558,8 @@ function hasUnquotedScriptHint(raw: string): boolean {
let token = "";
const flushToken = (): boolean => {
if (token.toLowerCase().endsWith(".py") || token.toLowerCase().endsWith(".js")) {
const normalizedToken = normalizeLowercaseStringOrEmpty(token);
if (normalizedToken.endsWith(".py") || normalizedToken.endsWith(".js")) {
return true;
}
token = "";
@@ -627,7 +636,7 @@ function resolveLeadingShellSegmentExecutable(rawSegment: string): string | unde
) {
commandIdx += 1;
}
return normalizedArgv[commandIdx]?.toLowerCase();
return normalizeOptionalLowercaseString(normalizedArgv[commandIdx]);
}
function analyzeInterpreterHeuristicsFromUnquoted(raw: string): {
@@ -666,7 +675,7 @@ function extractShellWrappedCommandPayload(
if (!executable) {
return null;
}
const executableBase = executable.split(/[\\/]/u).at(-1)?.toLowerCase() ?? "";
const executableBase = normalizeOptionalLowercaseString(executable.split(/[\\/]/u).at(-1)) ?? "";
const normalizedExecutable = executableBase.endsWith(".exe")
? executableBase.slice(0, -4)
: executableBase;
@@ -724,7 +733,7 @@ function shouldFailClosedInterpreterPreflight(command: string): {
) {
commandIdx += 1;
}
const directExecutable = argv?.[commandIdx]?.toLowerCase();
const directExecutable = normalizeOptionalLowercaseString(argv?.[commandIdx]);
const args = argv ? argv.slice(commandIdx + 1) : [];
const isDirectPythonExecutable = Boolean(
@@ -770,7 +779,7 @@ function shouldFailClosedInterpreterPreflight(command: string): {
) {
commandIdx += 1;
}
const executable = normalizedArgv[commandIdx]?.toLowerCase();
const executable = normalizeOptionalLowercaseString(normalizedArgv[commandIdx]);
if (!executable) {
return false;
}
@@ -988,9 +997,9 @@ function parseExecApprovalShellCommand(raw: string): ParsedExecApprovalCommand |
return {
approvalId: match[1],
decision:
match[2].toLowerCase() === "always"
normalizeLowercaseStringOrEmpty(match[2]) === "always"
? "allow-always"
: (match[2].toLowerCase() as ParsedExecApprovalCommand["decision"]),
: (normalizeLowercaseStringOrEmpty(match[2]) as ParsedExecApprovalCommand["decision"]),
};
}