mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-09 04:37:40 +00:00
chore: Enable "curly" rule to avoid single-statement if confusion/errors.
This commit is contained in:
@@ -48,7 +48,9 @@ function resolveDefaultModelRef(cfg?: OpenClawConfig): {
|
||||
}
|
||||
|
||||
function hasAuthForProvider(params: { provider: string; agentDir: string }): boolean {
|
||||
if (resolveEnvApiKey(params.provider)?.apiKey) return true;
|
||||
if (resolveEnvApiKey(params.provider)?.apiKey) {
|
||||
return true;
|
||||
}
|
||||
const store = ensureAuthProfileStore(params.agentDir, {
|
||||
allowKeychainPrompt: false,
|
||||
});
|
||||
@@ -89,8 +91,12 @@ export function resolveImageModelConfigForTool(params: {
|
||||
const fallbacks: string[] = [];
|
||||
const addFallback = (modelRef: string | null) => {
|
||||
const ref = (modelRef ?? "").trim();
|
||||
if (!ref) return;
|
||||
if (fallbacks.includes(ref)) return;
|
||||
if (!ref) {
|
||||
return;
|
||||
}
|
||||
if (fallbacks.includes(ref)) {
|
||||
return;
|
||||
}
|
||||
fallbacks.push(ref);
|
||||
};
|
||||
|
||||
@@ -117,8 +123,12 @@ export function resolveImageModelConfigForTool(params: {
|
||||
}
|
||||
|
||||
if (preferred?.trim()) {
|
||||
if (openaiOk) addFallback("openai/gpt-5-mini");
|
||||
if (anthropicOk) addFallback("anthropic/claude-opus-4-5");
|
||||
if (openaiOk) {
|
||||
addFallback("openai/gpt-5-mini");
|
||||
}
|
||||
if (anthropicOk) {
|
||||
addFallback("anthropic/claude-opus-4-5");
|
||||
}
|
||||
// Don't duplicate primary in fallbacks.
|
||||
const pruned = fallbacks.filter((ref) => ref !== preferred);
|
||||
return {
|
||||
@@ -129,7 +139,9 @@ export function resolveImageModelConfigForTool(params: {
|
||||
|
||||
// Cross-provider fallback when we can't pair with the primary provider.
|
||||
if (openaiOk) {
|
||||
if (anthropicOk) addFallback("anthropic/claude-opus-4-5");
|
||||
if (anthropicOk) {
|
||||
addFallback("anthropic/claude-opus-4-5");
|
||||
}
|
||||
return {
|
||||
primary: "openai/gpt-5-mini",
|
||||
...(fallbacks.length ? { fallbacks } : {}),
|
||||
@@ -305,7 +317,9 @@ export function createImageTool(options?: {
|
||||
cfg: options?.config,
|
||||
agentDir,
|
||||
});
|
||||
if (!imageModelConfig) return null;
|
||||
if (!imageModelConfig) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// If model has native vision, images in the prompt are auto-injected
|
||||
// so this tool is only needed when image wasn't provided in the prompt
|
||||
@@ -329,7 +343,9 @@ export function createImageTool(options?: {
|
||||
const imageRaw = imageRawInput.startsWith("@")
|
||||
? imageRawInput.slice(1).trim()
|
||||
: imageRawInput;
|
||||
if (!imageRaw) throw new Error("image required");
|
||||
if (!imageRaw) {
|
||||
throw new Error("image required");
|
||||
}
|
||||
|
||||
// The tool accepts file paths, file/data URLs, or http(s) URLs. In some
|
||||
// agent/model contexts, images can be referenced as pseudo-URIs like
|
||||
@@ -371,8 +387,12 @@ export function createImageTool(options?: {
|
||||
}
|
||||
|
||||
const resolvedImage = (() => {
|
||||
if (sandboxRoot) return imageRaw;
|
||||
if (imageRaw.startsWith("~")) return resolveUserPath(imageRaw);
|
||||
if (sandboxRoot) {
|
||||
return imageRaw;
|
||||
}
|
||||
if (imageRaw.startsWith("~")) {
|
||||
return resolveUserPath(imageRaw);
|
||||
}
|
||||
return imageRaw;
|
||||
})();
|
||||
const resolvedPathInfo: { resolved: string; rewrittenFrom?: string } = isDataUrl
|
||||
|
||||
Reference in New Issue
Block a user