mirror of
https://github.com/openclaw/openclaw.git
synced 2026-03-29 21:48:03 +02:00
* fix: make cleanup "keep" persist subagent sessions indefinitely * feat: expose subagent session metadata in sessions list * fix: include status and timing in sessions_list tool * fix: hide injected timestamp prefixes in chat ui * feat: push session list updates over websocket * feat: expose child subagent sessions in subagents list * feat: add admin http endpoint to kill sessions * Emit session.message websocket events for transcript updates * Estimate session costs in sessions list * Add direct session history HTTP and SSE endpoints * Harden dashboard session events and history APIs * Add session lifecycle gateway methods * Add dashboard session API improvements * Add dashboard session model and parent linkage support * fix: tighten dashboard session API metadata * Fix dashboard session cost metadata * Persist accumulated session cost * fix: stop followup queue drain cfg crash * Fix dashboard session create and model metadata * fix: stop guessing session model costs * Gateway: cache OpenRouter pricing for configured models * Gateway: add timeout session status * Fix subagent spawn test config loading * Gateway: preserve operator scopes without device identity * Emit user message transcript events and deduplicate plugin warnings * feat: emit sessions.changed lifecycle event on subagent spawn Adds a session-lifecycle-events module (similar to transcript-events) that emits create events when subagents are spawned. The gateway server.impl.ts listens for these events and broadcasts sessions.changed with reason=create to SSE subscribers, so dashboards can pick up new subagent sessions without polling. * Gateway: allow persistent dashboard orchestrator sessions * fix: preserve operator scopes for token-authenticated backend clients Backend clients (like agent-dashboard) that authenticate with a valid gateway token but don't present a device identity were getting their scopes stripped. The scope-clearing logic ran before checking the device identity decision, so even when evaluateMissingDeviceIdentity returned 'allow' (because roleCanSkipDeviceIdentity passed for token-authed operators), scopes were already cleared. Fix: also check decision.kind before clearing scopes, so token-authenticated operators keep their requested scopes. * Gateway: allow operator-token session kills * Fix stale active subagent status after follow-up runs * Fix dashboard image attachments in sessions send * Fix completed session follow-up status updates * feat: stream session tool events to operator UIs * Add sessions.steer gateway coverage * Persist subagent timing in session store * Fix subagent session transcript event keys * Fix active subagent session status in gateway * bump session label max to 512 * Fix gateway send session reactivation * fix: publish terminal session lifecycle state * feat: change default session reset to effectively never - Change DEFAULT_RESET_MODE from "daily" to "idle" - Change DEFAULT_IDLE_MINUTES from 60 to 0 (0 = disabled/never) - Allow idleMinutes=0 through normalization (don't clamp to 1) - Treat idleMinutes=0 as "no idle expiry" in evaluateSessionFreshness - Default behavior: mode "idle" + idleMinutes 0 = sessions never auto-reset - Update test assertion for new default mode * fix: prep session management followups (#50101) (thanks @clay-datacurve) --------- Co-authored-by: Tyler Yust <TYTYYUST@YAHOO.COM>
227 lines
5.4 KiB
TypeScript
227 lines
5.4 KiB
TypeScript
import fs from "node:fs/promises";
|
|
import os from "node:os";
|
|
import path from "node:path";
|
|
import { afterEach, beforeEach, describe, expect, it } from "vitest";
|
|
import type { OpenClawConfig } from "../config/config.js";
|
|
import {
|
|
__resetGatewayModelPricingCacheForTest,
|
|
__setGatewayModelPricingForTest,
|
|
} from "../gateway/model-pricing-cache.js";
|
|
import {
|
|
__resetUsageFormatCachesForTest,
|
|
estimateUsageCost,
|
|
formatTokenCount,
|
|
formatUsd,
|
|
resolveModelCostConfig,
|
|
} from "./usage-format.js";
|
|
|
|
describe("usage-format", () => {
|
|
const originalAgentDir = process.env.OPENCLAW_AGENT_DIR;
|
|
let agentDir: string;
|
|
|
|
beforeEach(async () => {
|
|
agentDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-usage-format-"));
|
|
process.env.OPENCLAW_AGENT_DIR = agentDir;
|
|
__resetUsageFormatCachesForTest();
|
|
__resetGatewayModelPricingCacheForTest();
|
|
});
|
|
|
|
afterEach(async () => {
|
|
if (originalAgentDir === undefined) {
|
|
delete process.env.OPENCLAW_AGENT_DIR;
|
|
} else {
|
|
process.env.OPENCLAW_AGENT_DIR = originalAgentDir;
|
|
}
|
|
__resetUsageFormatCachesForTest();
|
|
__resetGatewayModelPricingCacheForTest();
|
|
await fs.rm(agentDir, { recursive: true, force: true });
|
|
});
|
|
|
|
it("formats token counts", () => {
|
|
expect(formatTokenCount(999)).toBe("999");
|
|
expect(formatTokenCount(1234)).toBe("1.2k");
|
|
expect(formatTokenCount(12000)).toBe("12k");
|
|
expect(formatTokenCount(999_499)).toBe("999k");
|
|
expect(formatTokenCount(999_500)).toBe("1.0m");
|
|
expect(formatTokenCount(2_500_000)).toBe("2.5m");
|
|
});
|
|
|
|
it("formats USD values", () => {
|
|
expect(formatUsd(1.234)).toBe("$1.23");
|
|
expect(formatUsd(0.5)).toBe("$0.50");
|
|
expect(formatUsd(0.0042)).toBe("$0.0042");
|
|
});
|
|
|
|
it("resolves model cost config and estimates usage cost", () => {
|
|
const config = {
|
|
models: {
|
|
providers: {
|
|
test: {
|
|
models: [
|
|
{
|
|
id: "m1",
|
|
cost: { input: 1, output: 2, cacheRead: 0.5, cacheWrite: 0 },
|
|
},
|
|
],
|
|
},
|
|
},
|
|
},
|
|
} as unknown as OpenClawConfig;
|
|
|
|
const cost = resolveModelCostConfig({
|
|
provider: "test",
|
|
model: "m1",
|
|
config,
|
|
});
|
|
|
|
expect(cost).toEqual({
|
|
input: 1,
|
|
output: 2,
|
|
cacheRead: 0.5,
|
|
cacheWrite: 0,
|
|
});
|
|
|
|
const total = estimateUsageCost({
|
|
usage: { input: 1000, output: 500, cacheRead: 2000 },
|
|
cost,
|
|
});
|
|
|
|
expect(total).toBeCloseTo(0.003);
|
|
});
|
|
|
|
it("returns undefined when model pricing is not configured", () => {
|
|
expect(
|
|
resolveModelCostConfig({
|
|
provider: "anthropic",
|
|
model: "claude-sonnet-4-6",
|
|
}),
|
|
).toBeUndefined();
|
|
|
|
expect(
|
|
resolveModelCostConfig({
|
|
provider: "openai-codex",
|
|
model: "gpt-5.4",
|
|
}),
|
|
).toBeUndefined();
|
|
});
|
|
|
|
it("prefers models.json pricing over openclaw config and cached pricing", async () => {
|
|
const config = {
|
|
models: {
|
|
providers: {
|
|
openai: {
|
|
models: [
|
|
{
|
|
id: "gpt-5.4",
|
|
cost: { input: 20, output: 21, cacheRead: 22, cacheWrite: 23 },
|
|
},
|
|
],
|
|
},
|
|
},
|
|
},
|
|
} as unknown as OpenClawConfig;
|
|
|
|
await fs.writeFile(
|
|
path.join(agentDir, "models.json"),
|
|
JSON.stringify(
|
|
{
|
|
providers: {
|
|
openai: {
|
|
models: [
|
|
{
|
|
id: "gpt-5.4",
|
|
cost: { input: 10, output: 11, cacheRead: 12, cacheWrite: 13 },
|
|
},
|
|
],
|
|
},
|
|
},
|
|
},
|
|
null,
|
|
2,
|
|
),
|
|
"utf8",
|
|
);
|
|
|
|
__setGatewayModelPricingForTest([
|
|
{
|
|
provider: "openai",
|
|
model: "gpt-5.4",
|
|
pricing: { input: 30, output: 31, cacheRead: 32, cacheWrite: 33 },
|
|
},
|
|
]);
|
|
|
|
expect(
|
|
resolveModelCostConfig({
|
|
provider: "openai",
|
|
model: "gpt-5.4",
|
|
config,
|
|
}),
|
|
).toEqual({
|
|
input: 10,
|
|
output: 11,
|
|
cacheRead: 12,
|
|
cacheWrite: 13,
|
|
});
|
|
});
|
|
|
|
it("falls back to openclaw config pricing when models.json is absent", () => {
|
|
const config = {
|
|
models: {
|
|
providers: {
|
|
anthropic: {
|
|
models: [
|
|
{
|
|
id: "claude-sonnet-4-6",
|
|
cost: { input: 9, output: 19, cacheRead: 0.9, cacheWrite: 1.9 },
|
|
},
|
|
],
|
|
},
|
|
},
|
|
},
|
|
} as unknown as OpenClawConfig;
|
|
|
|
__setGatewayModelPricingForTest([
|
|
{
|
|
provider: "anthropic",
|
|
model: "claude-sonnet-4-6",
|
|
pricing: { input: 3, output: 4, cacheRead: 0.3, cacheWrite: 0.4 },
|
|
},
|
|
]);
|
|
|
|
expect(
|
|
resolveModelCostConfig({
|
|
provider: "anthropic",
|
|
model: "claude-sonnet-4-6",
|
|
config,
|
|
}),
|
|
).toEqual({
|
|
input: 9,
|
|
output: 19,
|
|
cacheRead: 0.9,
|
|
cacheWrite: 1.9,
|
|
});
|
|
});
|
|
|
|
it("falls back to cached gateway pricing when no configured cost exists", () => {
|
|
__setGatewayModelPricingForTest([
|
|
{
|
|
provider: "openai-codex",
|
|
model: "gpt-5.4",
|
|
pricing: { input: 2.5, output: 15, cacheRead: 0.25, cacheWrite: 0 },
|
|
},
|
|
]);
|
|
|
|
expect(
|
|
resolveModelCostConfig({
|
|
provider: "openai-codex",
|
|
model: "gpt-5.4",
|
|
}),
|
|
).toEqual({
|
|
input: 2.5,
|
|
output: 15,
|
|
cacheRead: 0.25,
|
|
cacheWrite: 0,
|
|
});
|
|
});
|
|
});
|