mirror of
https://github.com/openclaw/openclaw.git
synced 2026-04-18 20:51:10 +00: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>
112 lines
3.3 KiB
TypeScript
112 lines
3.3 KiB
TypeScript
import fs from "node:fs";
|
|
import os from "node:os";
|
|
import path from "node:path";
|
|
import { afterEach, describe, expect, it } from "vitest";
|
|
import type { OpenClawConfig } from "../config/config.js";
|
|
import { killSubagentRunAdmin, sendControlledSubagentMessage } from "./subagent-control.js";
|
|
import {
|
|
addSubagentRunForTests,
|
|
getSubagentRunByChildSessionKey,
|
|
resetSubagentRegistryForTests,
|
|
} from "./subagent-registry.js";
|
|
|
|
describe("sendControlledSubagentMessage", () => {
|
|
it("rejects runs controlled by another session", async () => {
|
|
const result = await sendControlledSubagentMessage({
|
|
cfg: {
|
|
channels: { whatsapp: { allowFrom: ["*"] } },
|
|
} as OpenClawConfig,
|
|
controller: {
|
|
controllerSessionKey: "agent:main:subagent:leaf",
|
|
callerSessionKey: "agent:main:subagent:leaf",
|
|
callerIsSubagent: true,
|
|
controlScope: "children",
|
|
},
|
|
entry: {
|
|
runId: "run-foreign",
|
|
childSessionKey: "agent:main:subagent:other",
|
|
requesterSessionKey: "agent:main:main",
|
|
requesterDisplayKey: "main",
|
|
controllerSessionKey: "agent:main:subagent:other-parent",
|
|
task: "foreign run",
|
|
cleanup: "keep",
|
|
createdAt: Date.now() - 5_000,
|
|
startedAt: Date.now() - 4_000,
|
|
endedAt: Date.now() - 1_000,
|
|
outcome: { status: "ok" },
|
|
},
|
|
message: "continue",
|
|
});
|
|
|
|
expect(result).toEqual({
|
|
status: "forbidden",
|
|
error: "Subagents can only control runs spawned from their own session.",
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("killSubagentRunAdmin", () => {
|
|
afterEach(() => {
|
|
resetSubagentRegistryForTests({ persist: false });
|
|
});
|
|
|
|
it("kills a subagent by session key without requester ownership checks", async () => {
|
|
const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-subagent-admin-kill-"));
|
|
const storePath = path.join(tmpDir, "sessions.json");
|
|
const childSessionKey = "agent:main:subagent:worker";
|
|
|
|
fs.writeFileSync(
|
|
storePath,
|
|
JSON.stringify(
|
|
{
|
|
[childSessionKey]: {
|
|
sessionId: "sess-worker",
|
|
updatedAt: Date.now(),
|
|
},
|
|
},
|
|
null,
|
|
2,
|
|
),
|
|
"utf-8",
|
|
);
|
|
|
|
addSubagentRunForTests({
|
|
runId: "run-worker",
|
|
childSessionKey,
|
|
controllerSessionKey: "agent:main:other-controller",
|
|
requesterSessionKey: "agent:main:other-requester",
|
|
requesterDisplayKey: "other-requester",
|
|
task: "do the work",
|
|
cleanup: "keep",
|
|
createdAt: Date.now() - 5_000,
|
|
startedAt: Date.now() - 4_000,
|
|
});
|
|
|
|
const cfg = {
|
|
session: { store: storePath },
|
|
} as OpenClawConfig;
|
|
|
|
const result = await killSubagentRunAdmin({
|
|
cfg,
|
|
sessionKey: childSessionKey,
|
|
});
|
|
|
|
expect(result).toMatchObject({
|
|
found: true,
|
|
killed: true,
|
|
runId: "run-worker",
|
|
sessionKey: childSessionKey,
|
|
});
|
|
expect(getSubagentRunByChildSessionKey(childSessionKey)?.endedAt).toBeTypeOf("number");
|
|
});
|
|
|
|
it("returns found=false when the session key is not tracked as a subagent run", async () => {
|
|
const result = await killSubagentRunAdmin({
|
|
cfg: {} as OpenClawConfig,
|
|
sessionKey: "agent:main:subagent:missing",
|
|
});
|
|
|
|
expect(result).toEqual({ found: false, killed: false });
|
|
});
|
|
});
|