mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-08 07:11:25 +00:00
Update contributing, deduplicate more functions
This commit is contained in:
@@ -35,10 +35,10 @@ type FallbackAttempt = {
|
||||
};
|
||||
|
||||
/**
|
||||
* Strict abort check for model fallback. Only treats explicit AbortError names as user aborts.
|
||||
* Fallback abort check. Only treats explicit AbortError names as user aborts.
|
||||
* Message-based checks (e.g., "aborted") can mask timeouts and skip fallback.
|
||||
*/
|
||||
function isStrictAbortError(err: unknown): boolean {
|
||||
function isFallbackAbortError(err: unknown): boolean {
|
||||
if (!err || typeof err !== "object") {
|
||||
return false;
|
||||
}
|
||||
@@ -50,7 +50,7 @@ function isStrictAbortError(err: unknown): boolean {
|
||||
}
|
||||
|
||||
function shouldRethrowAbort(err: unknown): boolean {
|
||||
return isStrictAbortError(err) && !isTimeoutError(err);
|
||||
return isFallbackAbortError(err) && !isTimeoutError(err);
|
||||
}
|
||||
|
||||
function resolveImageFallbackCandidates(params: {
|
||||
|
||||
@@ -1 +1,17 @@
|
||||
export { isAbortError } from "../../infra/unhandled-rejections.js";
|
||||
/**
|
||||
* Runner abort check. Catches any abort-related message for embedded runners.
|
||||
* More permissive than the core isAbortError since runners need to catch
|
||||
* various abort signals from different sources.
|
||||
*/
|
||||
export function isRunnerAbortError(err: unknown): boolean {
|
||||
if (!err || typeof err !== "object") {
|
||||
return false;
|
||||
}
|
||||
const name = "name" in err ? String(err.name) : "";
|
||||
if (name === "AbortError") {
|
||||
return true;
|
||||
}
|
||||
const message =
|
||||
"message" in err && typeof err.message === "string" ? err.message.toLowerCase() : "";
|
||||
return message.includes("aborted");
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ import { buildSystemPromptParams } from "../../system-prompt-params.js";
|
||||
import { buildSystemPromptReport } from "../../system-prompt-report.js";
|
||||
import { resolveTranscriptPolicy } from "../../transcript-policy.js";
|
||||
import { DEFAULT_BOOTSTRAP_FILENAME } from "../../workspace.js";
|
||||
import { isAbortError } from "../abort.js";
|
||||
import { isRunnerAbortError } from "../abort.js";
|
||||
import { appendCacheTtlTimestamp, isCacheTtlEligibleProvider } from "../cache-ttl.js";
|
||||
import { buildEmbeddedExtensionPaths } from "../extensions.js";
|
||||
import { applyExtraParamsToAgent } from "../extra-params.js";
|
||||
@@ -832,7 +832,7 @@ export async function runEmbeddedAttempt(
|
||||
try {
|
||||
await waitForCompactionRetry();
|
||||
} catch (err) {
|
||||
if (isAbortError(err)) {
|
||||
if (isRunnerAbortError(err)) {
|
||||
if (!promptError) {
|
||||
promptError = err;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user