mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-08 02:11:23 +00:00
fix(ci): restore main lint/typecheck after direct merges
This commit is contained in:
@@ -641,7 +641,13 @@ export async function runCronIsolatedAgentTurn(params: {
|
||||
}
|
||||
} catch (err) {
|
||||
if (!deliveryBestEffort) {
|
||||
return withRunSession({ status: "error", summary, outputText, error: String(err), ...telemetry });
|
||||
return withRunSession({
|
||||
status: "error",
|
||||
summary,
|
||||
outputText,
|
||||
error: String(err),
|
||||
...telemetry,
|
||||
});
|
||||
}
|
||||
}
|
||||
} else if (synthesizedText) {
|
||||
@@ -739,7 +745,13 @@ export async function runCronIsolatedAgentTurn(params: {
|
||||
}
|
||||
} catch (err) {
|
||||
if (!deliveryBestEffort) {
|
||||
return withRunSession({ status: "error", summary, outputText, error: String(err), ...telemetry });
|
||||
return withRunSession({
|
||||
status: "error",
|
||||
summary,
|
||||
outputText,
|
||||
error: String(err),
|
||||
...telemetry,
|
||||
});
|
||||
}
|
||||
logWarn(`[cron:${params.job.id}] ${String(err)}`);
|
||||
}
|
||||
|
||||
@@ -8,10 +8,7 @@ vi.mock("../../config/sessions.js", () => ({
|
||||
resolveSessionResetPolicy: vi.fn().mockReturnValue({ mode: "idle", idleMinutes: 60 }),
|
||||
}));
|
||||
|
||||
import {
|
||||
loadSessionStore,
|
||||
evaluateSessionFreshness,
|
||||
} from "../../config/sessions.js";
|
||||
import { loadSessionStore, evaluateSessionFreshness } from "../../config/sessions.js";
|
||||
import { resolveCronSession } from "./session.js";
|
||||
|
||||
describe("resolveCronSession", () => {
|
||||
@@ -153,7 +150,11 @@ describe("resolveCronSession", () => {
|
||||
"webhook:stable-key": {
|
||||
updatedAt: Date.now() - 1000,
|
||||
modelOverride: "some-model",
|
||||
} as any,
|
||||
} as unknown as {
|
||||
sessionId: string;
|
||||
updatedAt: number;
|
||||
modelOverride?: string;
|
||||
},
|
||||
});
|
||||
vi.mocked(evaluateSessionFreshness).mockReturnValue({ fresh: true });
|
||||
|
||||
|
||||
@@ -106,6 +106,10 @@ export async function readCronRunLogEntries(
|
||||
if (jobId && obj.jobId !== jobId) {
|
||||
continue;
|
||||
}
|
||||
const usage =
|
||||
obj.usage && typeof obj.usage === "object"
|
||||
? (obj.usage as Record<string, unknown>)
|
||||
: undefined;
|
||||
const entry: CronRunLogEntry = {
|
||||
ts: obj.ts,
|
||||
jobId: obj.jobId,
|
||||
@@ -117,26 +121,20 @@ export async function readCronRunLogEntries(
|
||||
durationMs: obj.durationMs,
|
||||
nextRunAtMs: obj.nextRunAtMs,
|
||||
model: typeof obj.model === "string" && obj.model.trim() ? obj.model : undefined,
|
||||
provider: typeof obj.provider === "string" && obj.provider.trim() ? obj.provider : undefined,
|
||||
usage:
|
||||
obj.usage && typeof obj.usage === "object"
|
||||
? {
|
||||
input_tokens:
|
||||
typeof (obj.usage as any).input_tokens === "number" ? (obj.usage as any).input_tokens : undefined,
|
||||
output_tokens:
|
||||
typeof (obj.usage as any).output_tokens === "number" ? (obj.usage as any).output_tokens : undefined,
|
||||
total_tokens:
|
||||
typeof (obj.usage as any).total_tokens === "number" ? (obj.usage as any).total_tokens : undefined,
|
||||
cache_read_tokens:
|
||||
typeof (obj.usage as any).cache_read_tokens === "number"
|
||||
? (obj.usage as any).cache_read_tokens
|
||||
: undefined,
|
||||
cache_write_tokens:
|
||||
typeof (obj.usage as any).cache_write_tokens === "number"
|
||||
? (obj.usage as any).cache_write_tokens
|
||||
: undefined,
|
||||
}
|
||||
: undefined,
|
||||
provider:
|
||||
typeof obj.provider === "string" && obj.provider.trim() ? obj.provider : undefined,
|
||||
usage: usage
|
||||
? {
|
||||
input_tokens: typeof usage.input_tokens === "number" ? usage.input_tokens : undefined,
|
||||
output_tokens:
|
||||
typeof usage.output_tokens === "number" ? usage.output_tokens : undefined,
|
||||
total_tokens: typeof usage.total_tokens === "number" ? usage.total_tokens : undefined,
|
||||
cache_read_tokens:
|
||||
typeof usage.cache_read_tokens === "number" ? usage.cache_read_tokens : undefined,
|
||||
cache_write_tokens:
|
||||
typeof usage.cache_write_tokens === "number" ? usage.cache_write_tokens : undefined,
|
||||
}
|
||||
: undefined,
|
||||
};
|
||||
if (typeof obj.sessionId === "string" && obj.sessionId.trim().length > 0) {
|
||||
entry.sessionId = obj.sessionId;
|
||||
|
||||
Reference in New Issue
Block a user