mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-06 14:10:51 +00:00
fix: gate startup history and model requests (#65365)
This commit is contained in:
@@ -681,6 +681,49 @@ describe("abortChatRun", () => {
|
||||
});
|
||||
|
||||
describe("loadChatHistory", () => {
|
||||
it("retries retryable startup unavailability before showing history", async () => {
|
||||
vi.useFakeTimers();
|
||||
try {
|
||||
const request = vi
|
||||
.fn()
|
||||
.mockRejectedValueOnce(
|
||||
new GatewayRequestError({
|
||||
code: "UNAVAILABLE",
|
||||
message: "chat.history unavailable during gateway startup",
|
||||
details: { method: "chat.history" },
|
||||
retryable: true,
|
||||
retryAfterMs: 250,
|
||||
}),
|
||||
)
|
||||
.mockResolvedValueOnce({
|
||||
messages: [{ role: "assistant", content: [{ type: "text", text: "awake" }] }],
|
||||
thinkingLevel: "low",
|
||||
});
|
||||
const state = createState({
|
||||
connected: true,
|
||||
client: { request } as unknown as ChatState["client"],
|
||||
});
|
||||
|
||||
const load = loadChatHistory(state);
|
||||
await vi.waitFor(() => expect(request).toHaveBeenCalledTimes(1));
|
||||
expect(state.chatLoading).toBe(true);
|
||||
expect(state.lastError).toBeNull();
|
||||
|
||||
await vi.advanceTimersByTimeAsync(250);
|
||||
await load;
|
||||
|
||||
expect(request).toHaveBeenCalledTimes(2);
|
||||
expect(state.chatMessages).toEqual([
|
||||
{ role: "assistant", content: [{ type: "text", text: "awake" }] },
|
||||
]);
|
||||
expect(state.chatThinkingLevel).toBe("low");
|
||||
expect(state.chatLoading).toBe(false);
|
||||
expect(state.lastError).toBeNull();
|
||||
} finally {
|
||||
vi.useRealTimers();
|
||||
}
|
||||
});
|
||||
|
||||
it("filters assistant NO_REPLY messages and keeps user NO_REPLY messages", async () => {
|
||||
const request = vi.fn().mockResolvedValue({
|
||||
messages: [
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { resetToolStream } from "../app-tool-stream.ts";
|
||||
import { extractText } from "../chat/message-extract.ts";
|
||||
import { formatConnectError } from "../connect-error.ts";
|
||||
import type { GatewayBrowserClient } from "../gateway.ts";
|
||||
import { GatewayRequestError, type GatewayBrowserClient } from "../gateway.ts";
|
||||
import { normalizeLowercaseStringOrEmpty } from "../string-coerce.ts";
|
||||
import type { ChatAttachment } from "../ui-types.ts";
|
||||
import { generateUUID } from "../uuid.ts";
|
||||
@@ -13,6 +13,9 @@ import {
|
||||
const SILENT_REPLY_PATTERN = /^\s*NO_REPLY\s*$/;
|
||||
const SYNTHETIC_TRANSCRIPT_REPAIR_RESULT =
|
||||
"[openclaw] missing tool result in session history; inserted synthetic error result for transcript repair.";
|
||||
const STARTUP_CHAT_HISTORY_RETRY_TIMEOUT_MS = 60_000;
|
||||
const STARTUP_CHAT_HISTORY_DEFAULT_RETRY_MS = 500;
|
||||
const STARTUP_CHAT_HISTORY_MAX_RETRY_MS = 5_000;
|
||||
const chatHistoryRequestVersions = new WeakMap<object, number>();
|
||||
|
||||
function beginChatHistoryRequest(state: ChatState): number {
|
||||
@@ -72,6 +75,31 @@ function shouldHideHistoryMessage(message: unknown): boolean {
|
||||
return isAssistantSilentReply(message) || isSyntheticTranscriptRepairToolResult(message);
|
||||
}
|
||||
|
||||
function isRetryableStartupUnavailable(err: unknown, method: string): err is GatewayRequestError {
|
||||
if (!(err instanceof GatewayRequestError)) {
|
||||
return false;
|
||||
}
|
||||
if (err.gatewayCode !== "UNAVAILABLE" || !err.retryable) {
|
||||
return false;
|
||||
}
|
||||
const details = err.details;
|
||||
if (!details || typeof details !== "object") {
|
||||
return true;
|
||||
}
|
||||
const detailMethod = (details as { method?: unknown }).method;
|
||||
return typeof detailMethod !== "string" || detailMethod === method;
|
||||
}
|
||||
|
||||
function resolveStartupRetryDelayMs(err: GatewayRequestError): number {
|
||||
const retryAfterMs =
|
||||
typeof err.retryAfterMs === "number" ? err.retryAfterMs : STARTUP_CHAT_HISTORY_DEFAULT_RETRY_MS;
|
||||
return Math.min(Math.max(retryAfterMs, 100), STARTUP_CHAT_HISTORY_MAX_RETRY_MS);
|
||||
}
|
||||
|
||||
function sleep(ms: number): Promise<void> {
|
||||
return new Promise((resolve) => setTimeout(resolve, ms));
|
||||
}
|
||||
|
||||
export type ChatState = {
|
||||
client: GatewayBrowserClient | null;
|
||||
connected: boolean;
|
||||
@@ -114,16 +142,37 @@ export async function loadChatHistory(state: ChatState) {
|
||||
}
|
||||
const sessionKey = state.sessionKey;
|
||||
const requestVersion = beginChatHistoryRequest(state);
|
||||
const startedAt = Date.now();
|
||||
state.chatLoading = true;
|
||||
state.lastError = null;
|
||||
try {
|
||||
const res = await state.client.request<{ messages?: Array<unknown>; thinkingLevel?: string }>(
|
||||
"chat.history",
|
||||
{
|
||||
sessionKey,
|
||||
limit: 200,
|
||||
},
|
||||
);
|
||||
let res: { messages?: Array<unknown>; thinkingLevel?: string };
|
||||
for (;;) {
|
||||
try {
|
||||
res = await state.client.request<{ messages?: Array<unknown>; thinkingLevel?: string }>(
|
||||
"chat.history",
|
||||
{
|
||||
sessionKey,
|
||||
limit: 200,
|
||||
},
|
||||
);
|
||||
break;
|
||||
} catch (err) {
|
||||
if (!shouldApplyChatHistoryResult(state, requestVersion, sessionKey)) {
|
||||
return;
|
||||
}
|
||||
const withinStartupRetryWindow =
|
||||
Date.now() - startedAt < STARTUP_CHAT_HISTORY_RETRY_TIMEOUT_MS;
|
||||
if (withinStartupRetryWindow && isRetryableStartupUnavailable(err, "chat.history")) {
|
||||
await sleep(resolveStartupRetryDelayMs(err));
|
||||
if (!state.client || !state.connected) {
|
||||
return;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
if (!shouldApplyChatHistoryResult(state, requestVersion, sessionKey)) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -27,24 +27,36 @@ export type GatewayResponseFrame = {
|
||||
id: string;
|
||||
ok: boolean;
|
||||
payload?: unknown;
|
||||
error?: { code: string; message: string; details?: unknown };
|
||||
error?: {
|
||||
code: string;
|
||||
message: string;
|
||||
details?: unknown;
|
||||
retryable?: boolean;
|
||||
retryAfterMs?: number;
|
||||
};
|
||||
};
|
||||
|
||||
export type GatewayErrorInfo = {
|
||||
code: string;
|
||||
message: string;
|
||||
details?: unknown;
|
||||
retryable?: boolean;
|
||||
retryAfterMs?: number;
|
||||
};
|
||||
|
||||
export class GatewayRequestError extends Error {
|
||||
readonly gatewayCode: string;
|
||||
readonly details?: unknown;
|
||||
readonly retryable: boolean;
|
||||
readonly retryAfterMs?: number;
|
||||
|
||||
constructor(error: GatewayErrorInfo) {
|
||||
super(error.message);
|
||||
this.name = "GatewayRequestError";
|
||||
this.gatewayCode = error.code;
|
||||
this.details = error.details;
|
||||
this.retryable = error.retryable === true;
|
||||
this.retryAfterMs = error.retryAfterMs;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -478,6 +490,8 @@ export class GatewayBrowserClient {
|
||||
code: err.gatewayCode,
|
||||
message: err.message,
|
||||
details: err.details,
|
||||
retryable: err.retryable,
|
||||
retryAfterMs: err.retryAfterMs,
|
||||
};
|
||||
} else {
|
||||
this.pendingConnectError = undefined;
|
||||
@@ -555,6 +569,8 @@ export class GatewayBrowserClient {
|
||||
code: res.error?.code ?? "UNAVAILABLE",
|
||||
message: res.error?.message ?? "request failed",
|
||||
details: res.error?.details,
|
||||
retryable: res.error?.retryable,
|
||||
retryAfterMs: res.error?.retryAfterMs,
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user