mirror of
https://github.com/openclaw/openclaw.git
synced 2026-06-07 07:42:55 +00:00
* feat: add core session goals * feat: polish session goals in tui * fix: resolve goal tool session stores * fix: keep get goal read-only * fix: migrate legacy goal session slots * fix: persist goal token accounting * fix: validate goal session rows * refactor: remove unshipped goal legacy handling * fix: handle goal commands in local tui * fix: satisfy goal tool display checks * fix: reset goal budget on overdue resume * feat: surface session goals across control surfaces * test: update gateway protocol test import * test: align goal fixture types with protocol * fix: scope selected global transcript usage fallback * fix: scope selected global web subscriptions * fix: preserve selected global agent during chat dispatch * fix: scope chat inject to selected global agents
864 lines
30 KiB
TypeScript
864 lines
30 KiB
TypeScript
import fs from "node:fs/promises";
|
|
import path from "node:path";
|
|
import { expect, test, vi } from "vitest";
|
|
import { embeddedRunMock, testState, writeSessionStore } from "./test-helpers.js";
|
|
import {
|
|
setupGatewaySessionsTestHarness,
|
|
bootstrapCacheMocks,
|
|
sessionHookMocks,
|
|
beforeResetHookMocks,
|
|
sessionLifecycleHookMocks,
|
|
beforeResetHookState,
|
|
browserSessionTabMocks,
|
|
writeSingleLineSession,
|
|
sessionStoreEntry,
|
|
expectActiveRunCleanup,
|
|
directSessionReq,
|
|
} from "./test/server-sessions.test-helpers.js";
|
|
|
|
const { createSessionStoreDir, seedActiveMainSession } = setupGatewaySessionsTestHarness();
|
|
|
|
type HookEventRecord = Record<string, unknown> & {
|
|
context?: Record<string, unknown> & {
|
|
previousSessionEntry?: { sessionId?: string };
|
|
};
|
|
messages?: Array<{ role?: string; content?: unknown }>;
|
|
};
|
|
|
|
function firstHookCall(mock: { mock: { calls: unknown[][] } }): [HookEventRecord, HookEventRecord] {
|
|
const call = mock.mock.calls.at(0);
|
|
if (!call) {
|
|
throw new Error("Expected hook call");
|
|
}
|
|
return [call[0] as HookEventRecord, call[1] as HookEventRecord];
|
|
}
|
|
|
|
function expectTranscriptResetEvent(params: {
|
|
event: HookEventRecord;
|
|
sessionFile: string;
|
|
content: string;
|
|
}) {
|
|
expect(params.event.sessionFile).toBe(params.sessionFile);
|
|
expect(params.event.reason).toBe("new");
|
|
expect(params.event.messages).toHaveLength(1);
|
|
expect(params.event.messages?.[0]?.role).toBe("user");
|
|
expect(params.event.messages?.[0]?.content).toBe(params.content);
|
|
}
|
|
|
|
function expectMainHookContext(context: HookEventRecord, sessionId: string) {
|
|
expect(context.agentId).toBe("main");
|
|
expect(context.sessionKey).toBe("agent:main:main");
|
|
expect(context.sessionId).toBe(sessionId);
|
|
}
|
|
|
|
function expectStringValue(value: unknown, label: string): string {
|
|
expect(typeof value, label).toBe("string");
|
|
if (typeof value !== "string") {
|
|
throw new Error(`${label} must be a string`);
|
|
}
|
|
return value;
|
|
}
|
|
|
|
function expectStringWithPrefix(value: unknown, prefix: string, label: string): string {
|
|
const text = expectStringValue(value, label);
|
|
expect(text.startsWith(prefix), label).toBe(true);
|
|
expect(text.length, label).toBeGreaterThan(prefix.length);
|
|
return text;
|
|
}
|
|
|
|
test("sessions.reset emits internal command hook with reason", async () => {
|
|
const { dir } = await createSessionStoreDir();
|
|
await writeSingleLineSession(dir, "sess-main", "hello");
|
|
|
|
await writeSessionStore({
|
|
entries: {
|
|
main: sessionStoreEntry("sess-main"),
|
|
},
|
|
});
|
|
|
|
const reset = await directSessionReq<{ ok: true; key: string }>("sessions.reset", {
|
|
key: "main",
|
|
reason: "new",
|
|
});
|
|
expect(reset.ok).toBe(true);
|
|
const resetHookEvents = (
|
|
sessionHookMocks.triggerInternalHook.mock.calls as unknown as Array<[unknown]>
|
|
)
|
|
.map((call) => call[0])
|
|
.filter(
|
|
(
|
|
event,
|
|
): event is {
|
|
type: string;
|
|
action: string;
|
|
sessionKey?: string;
|
|
context?: {
|
|
commandSource?: string;
|
|
previousSessionEntry?: { sessionId?: string };
|
|
};
|
|
} =>
|
|
Boolean(event) &&
|
|
typeof event === "object" &&
|
|
(event as { type?: unknown }).type === "command" &&
|
|
(event as { action?: unknown }).action === "new",
|
|
);
|
|
expect(resetHookEvents).toHaveLength(1);
|
|
const event = resetHookEvents[0];
|
|
if (!event) {
|
|
throw new Error("expected session hook event");
|
|
}
|
|
expect(event.type).toBe("command");
|
|
expect(event.action).toBe("new");
|
|
expect(event.sessionKey).toBe("agent:main:main");
|
|
expect(event.context?.commandSource).toBe("gateway:sessions.reset");
|
|
expect(event.context?.previousSessionEntry?.sessionId).toBe("sess-main");
|
|
});
|
|
|
|
test("sessions.reset emits before_reset hook with transcript context", async () => {
|
|
const { dir } = await createSessionStoreDir();
|
|
const transcriptPath = path.join(dir, "sess-main.jsonl");
|
|
await fs.writeFile(
|
|
transcriptPath,
|
|
`${JSON.stringify({
|
|
type: "message",
|
|
id: "m1",
|
|
message: { role: "user", content: "hello from transcript" },
|
|
})}\n`,
|
|
"utf-8",
|
|
);
|
|
|
|
await writeSessionStore({
|
|
entries: {
|
|
main: {
|
|
sessionId: "sess-main",
|
|
sessionFile: transcriptPath,
|
|
updatedAt: Date.now(),
|
|
},
|
|
},
|
|
});
|
|
|
|
beforeResetHookState.hasBeforeResetHook = true;
|
|
|
|
const reset = await directSessionReq<{ ok: true; key: string }>("sessions.reset", {
|
|
key: "main",
|
|
reason: "new",
|
|
});
|
|
expect(reset.ok).toBe(true);
|
|
expect(beforeResetHookMocks.runBeforeReset).toHaveBeenCalledTimes(1);
|
|
const [event, context] = firstHookCall(beforeResetHookMocks.runBeforeReset);
|
|
expectTranscriptResetEvent({
|
|
event,
|
|
sessionFile: transcriptPath,
|
|
content: "hello from transcript",
|
|
});
|
|
expectMainHookContext(context, "sess-main");
|
|
});
|
|
|
|
test("sessions.reset infers selected global agent from agent-prefixed aliases", async () => {
|
|
const { dir } = await createSessionStoreDir();
|
|
const storeTemplate = path.join(dir, "{agentId}", "sessions.json");
|
|
testState.sessionStorePath = storeTemplate;
|
|
testState.sessionConfig = { scope: "global" };
|
|
await writeSessionStore({
|
|
entries: {},
|
|
storePath: path.join(dir, "prime-sessions.json"),
|
|
});
|
|
const mainStorePath = storeTemplate.replace("{agentId}", "main");
|
|
const workStorePath = storeTemplate.replace("{agentId}", "work");
|
|
await fs.mkdir(path.dirname(mainStorePath), { recursive: true });
|
|
await fs.mkdir(path.dirname(workStorePath), { recursive: true });
|
|
await fs.writeFile(
|
|
mainStorePath,
|
|
JSON.stringify({ global: sessionStoreEntry("sess-main-global") }, null, 2),
|
|
"utf-8",
|
|
);
|
|
await fs.writeFile(
|
|
workStorePath,
|
|
JSON.stringify({ global: sessionStoreEntry("sess-work-global") }, null, 2),
|
|
"utf-8",
|
|
);
|
|
const configPath = expectStringValue(process.env.OPENCLAW_CONFIG_PATH, "OPENCLAW_CONFIG_PATH");
|
|
await fs.writeFile(
|
|
configPath,
|
|
`${JSON.stringify(
|
|
{
|
|
agents: { list: [{ id: "main", default: true }, { id: "work" }] },
|
|
session: { scope: "global", store: storeTemplate },
|
|
},
|
|
null,
|
|
2,
|
|
)}\n`,
|
|
"utf-8",
|
|
);
|
|
const { clearConfigCache, clearRuntimeConfigSnapshot, getRuntimeConfig } =
|
|
await import("../config/config.js");
|
|
const { resolveGatewaySessionStoreTarget } = await import("./session-utils.js");
|
|
clearRuntimeConfigSnapshot();
|
|
clearConfigCache();
|
|
|
|
const { performGatewaySessionReset } = await import("./session-reset-service.js");
|
|
const reset = await performGatewaySessionReset({
|
|
key: "agent:work:main",
|
|
reason: "reset",
|
|
commandSource: "gateway:sessions.reset",
|
|
});
|
|
|
|
expect(reset.ok).toBe(true);
|
|
if (!reset.ok) {
|
|
throw new Error("expected reset to succeed");
|
|
}
|
|
expect(reset.key).toBe("global");
|
|
const resetTarget = resolveGatewaySessionStoreTarget({
|
|
cfg: getRuntimeConfig(),
|
|
key: "agent:work:main",
|
|
agentId: "work",
|
|
});
|
|
expect(resetTarget.storePath).toBe(workStorePath);
|
|
const mainStore = JSON.parse(await fs.readFile(mainStorePath, "utf-8")) as {
|
|
global?: { sessionId?: string };
|
|
};
|
|
const workStore = JSON.parse(await fs.readFile(resetTarget.storePath, "utf-8")) as {
|
|
global?: { sessionId?: string };
|
|
};
|
|
expect(mainStore.global?.sessionId).toBe("sess-main-global");
|
|
expect(workStore.global?.sessionId).toBe(reset.entry.sessionId);
|
|
expect(workStore.global?.sessionId).not.toBe("sess-work-global");
|
|
testState.sessionStorePath = undefined;
|
|
testState.sessionConfig = undefined;
|
|
await fs.writeFile(configPath, "{}\n", "utf-8");
|
|
clearRuntimeConfigSnapshot();
|
|
clearConfigCache();
|
|
});
|
|
|
|
test("sessions.reset rejects selected global agentId conflicts", async () => {
|
|
const { dir } = await createSessionStoreDir();
|
|
const storeTemplate = path.join(dir, "{agentId}", "sessions.json");
|
|
testState.sessionStorePath = storeTemplate;
|
|
testState.sessionConfig = { scope: "global" };
|
|
const configPath = expectStringValue(process.env.OPENCLAW_CONFIG_PATH, "OPENCLAW_CONFIG_PATH");
|
|
await fs.writeFile(
|
|
configPath,
|
|
`${JSON.stringify(
|
|
{
|
|
agents: { list: [{ id: "main", default: true }, { id: "work" }] },
|
|
session: { scope: "global", store: storeTemplate },
|
|
},
|
|
null,
|
|
2,
|
|
)}\n`,
|
|
"utf-8",
|
|
);
|
|
const { clearConfigCache, clearRuntimeConfigSnapshot } = await import("../config/config.js");
|
|
clearRuntimeConfigSnapshot();
|
|
clearConfigCache();
|
|
|
|
const { performGatewaySessionReset } = await import("./session-reset-service.js");
|
|
const reset = await performGatewaySessionReset({
|
|
key: "agent:main:main",
|
|
agentId: "work",
|
|
reason: "reset",
|
|
commandSource: "gateway:sessions.reset",
|
|
});
|
|
|
|
expect(reset.ok).toBe(false);
|
|
if (reset.ok) {
|
|
throw new Error("expected reset to fail");
|
|
}
|
|
expect(reset.error.message).toBe("session key agent does not match agentId");
|
|
testState.sessionStorePath = undefined;
|
|
testState.sessionConfig = undefined;
|
|
await fs.writeFile(configPath, "{}\n", "utf-8");
|
|
clearRuntimeConfigSnapshot();
|
|
clearConfigCache();
|
|
});
|
|
|
|
test("sessions.reset rejects unknown selected global agents", async () => {
|
|
const { dir } = await createSessionStoreDir();
|
|
const storeTemplate = path.join(dir, "{agentId}", "sessions.json");
|
|
const configPath = expectStringValue(process.env.OPENCLAW_CONFIG_PATH, "OPENCLAW_CONFIG_PATH");
|
|
const { clearConfigCache, clearRuntimeConfigSnapshot } = await import("../config/config.js");
|
|
testState.sessionStorePath = storeTemplate;
|
|
testState.sessionConfig = { scope: "global" };
|
|
await fs.writeFile(
|
|
configPath,
|
|
`${JSON.stringify(
|
|
{
|
|
agents: { list: [{ id: "main", default: true }, { id: "work" }] },
|
|
session: { scope: "global", store: storeTemplate },
|
|
},
|
|
null,
|
|
2,
|
|
)}\n`,
|
|
"utf-8",
|
|
);
|
|
clearRuntimeConfigSnapshot();
|
|
clearConfigCache();
|
|
|
|
try {
|
|
const { performGatewaySessionReset } = await import("./session-reset-service.js");
|
|
const reset = await performGatewaySessionReset({
|
|
key: "agent:typo:main",
|
|
reason: "reset",
|
|
commandSource: "gateway:sessions.reset",
|
|
});
|
|
|
|
expect(reset.ok).toBe(false);
|
|
if (reset.ok) {
|
|
throw new Error("expected reset to fail");
|
|
}
|
|
expect(reset.error.message).toBe("Unknown agent id: typo");
|
|
} finally {
|
|
testState.sessionStorePath = undefined;
|
|
testState.sessionConfig = undefined;
|
|
await fs.writeFile(configPath, "{}\n", "utf-8");
|
|
clearRuntimeConfigSnapshot();
|
|
clearConfigCache();
|
|
}
|
|
});
|
|
|
|
test("sessions.reset emits inferred selected global agent scope", async () => {
|
|
const { dir } = await createSessionStoreDir();
|
|
const storeTemplate = path.join(dir, "{agentId}", "sessions.json");
|
|
const workStorePath = storeTemplate.replace("{agentId}", "work");
|
|
const configPath = expectStringValue(process.env.OPENCLAW_CONFIG_PATH, "OPENCLAW_CONFIG_PATH");
|
|
const { clearConfigCache, clearRuntimeConfigSnapshot } = await import("../config/config.js");
|
|
testState.sessionStorePath = storeTemplate;
|
|
testState.sessionConfig = { scope: "global" };
|
|
await fs.mkdir(path.dirname(workStorePath), { recursive: true });
|
|
await fs.writeFile(
|
|
workStorePath,
|
|
JSON.stringify({ global: sessionStoreEntry("sess-work-global") }, null, 2),
|
|
"utf-8",
|
|
);
|
|
await fs.writeFile(
|
|
configPath,
|
|
`${JSON.stringify(
|
|
{
|
|
agents: { list: [{ id: "main", default: true }, { id: "work" }] },
|
|
session: { scope: "global", store: storeTemplate },
|
|
},
|
|
null,
|
|
2,
|
|
)}\n`,
|
|
"utf-8",
|
|
);
|
|
clearRuntimeConfigSnapshot();
|
|
clearConfigCache();
|
|
|
|
try {
|
|
const broadcast = vi.fn();
|
|
const reset = await directSessionReq<{ ok: true; key: string }>(
|
|
"sessions.reset",
|
|
{ key: "agent:work:main", reason: "reset" },
|
|
{
|
|
context: {
|
|
broadcastToConnIds: broadcast,
|
|
getSessionEventSubscriberConnIds: () => new Set(["conn-work"]),
|
|
},
|
|
},
|
|
);
|
|
|
|
expect(reset.ok).toBe(true);
|
|
expect(broadcast.mock.calls[0]?.[0]).toBe("sessions.changed");
|
|
expect(broadcast.mock.calls[0]?.[1]).toEqual(
|
|
expect.objectContaining({
|
|
sessionKey: "global",
|
|
agentId: "work",
|
|
reason: "reset",
|
|
}),
|
|
);
|
|
expect(broadcast.mock.calls[0]?.[2]).toEqual(new Set(["conn-work"]));
|
|
} finally {
|
|
testState.sessionStorePath = undefined;
|
|
testState.sessionConfig = undefined;
|
|
await fs.writeFile(configPath, "{}\n", "utf-8");
|
|
clearRuntimeConfigSnapshot();
|
|
clearConfigCache();
|
|
}
|
|
});
|
|
|
|
test("sessions.reset emits enriched session_end and session_start hooks", async () => {
|
|
const { dir } = await createSessionStoreDir();
|
|
const transcriptPath = path.join(dir, "sess-main.jsonl");
|
|
await fs.writeFile(
|
|
transcriptPath,
|
|
`${JSON.stringify({
|
|
type: "message",
|
|
id: "m1",
|
|
message: { role: "user", content: "hello from transcript" },
|
|
})}\n`,
|
|
"utf-8",
|
|
);
|
|
|
|
await writeSessionStore({
|
|
entries: {
|
|
main: {
|
|
sessionId: "sess-main",
|
|
sessionFile: transcriptPath,
|
|
updatedAt: Date.now(),
|
|
},
|
|
},
|
|
});
|
|
|
|
const reset = await directSessionReq<{ ok: true; key: string }>("sessions.reset", {
|
|
key: "main",
|
|
reason: "new",
|
|
});
|
|
expect(reset.ok).toBe(true);
|
|
expect(sessionLifecycleHookMocks.runSessionEnd).toHaveBeenCalledTimes(1);
|
|
expect(sessionLifecycleHookMocks.runSessionStart).toHaveBeenCalledTimes(1);
|
|
|
|
const [endEvent, endContext] = firstHookCall(sessionLifecycleHookMocks.runSessionEnd);
|
|
const [startEvent, startContext] = firstHookCall(sessionLifecycleHookMocks.runSessionStart);
|
|
|
|
expect(endEvent.sessionId).toBe("sess-main");
|
|
expect(endEvent.sessionKey).toBe("agent:main:main");
|
|
expect(endEvent.reason).toBe("new");
|
|
expect(endEvent.transcriptArchived).toBe(true);
|
|
const realDir = await fs.realpath(dir);
|
|
const archivedSessionFile = expectStringWithPrefix(
|
|
endEvent.sessionFile,
|
|
path.join(realDir, "sess-main.jsonl.reset."),
|
|
"archived session file",
|
|
);
|
|
expect(path.dirname(archivedSessionFile)).toBe(realDir);
|
|
expect(endEvent.nextSessionId).toBe(startEvent.sessionId);
|
|
expectMainHookContext(endContext, "sess-main");
|
|
expect(startEvent.sessionKey).toBe("agent:main:main");
|
|
expect(startEvent.resumedFrom).toBe("sess-main");
|
|
expect(startContext.sessionId).toBe(startEvent.sessionId);
|
|
expect(startContext.sessionKey).toBe("agent:main:main");
|
|
expect(startContext.agentId).toBe("main");
|
|
});
|
|
|
|
test("sessions.reset returns unavailable when active run does not stop", async () => {
|
|
const { dir, storePath } = await seedActiveMainSession();
|
|
const waitCallCountAtSnapshotClear: number[] = [];
|
|
bootstrapCacheMocks.clearBootstrapSnapshot.mockImplementation(() => {
|
|
waitCallCountAtSnapshotClear.push(embeddedRunMock.waitCalls.length);
|
|
});
|
|
|
|
beforeResetHookState.hasBeforeResetHook = true;
|
|
embeddedRunMock.activeIds.add("sess-main");
|
|
embeddedRunMock.waitResults.set("sess-main", false);
|
|
|
|
const reset = await directSessionReq("sessions.reset", {
|
|
key: "main",
|
|
});
|
|
expect(reset.ok).toBe(false);
|
|
expect(reset.error?.code).toBe("UNAVAILABLE");
|
|
expect(reset.error?.message ?? "").toMatch(/still active/i);
|
|
expectActiveRunCleanup("agent:main:main", ["main", "agent:main:main", "sess-main"], "sess-main");
|
|
expect(beforeResetHookMocks.runBeforeReset).not.toHaveBeenCalled();
|
|
expect(waitCallCountAtSnapshotClear).toEqual([1]);
|
|
expect(browserSessionTabMocks.closeTrackedBrowserTabsForSessions).not.toHaveBeenCalled();
|
|
|
|
const store = JSON.parse(await fs.readFile(storePath, "utf-8")) as Record<
|
|
string,
|
|
{ sessionId?: string }
|
|
>;
|
|
expect(store["agent:main:main"]?.sessionId).toBe("sess-main");
|
|
const filesAfterResetAttempt = await fs.readdir(dir);
|
|
expect(
|
|
filesAfterResetAttempt.filter((file) => file.startsWith("sess-main.jsonl.reset.")),
|
|
).toEqual([]);
|
|
});
|
|
|
|
test("sessions.reset emits before_reset for the entry actually reset in the writer slot", async () => {
|
|
const { dir } = await createSessionStoreDir();
|
|
const oldTranscriptPath = path.join(dir, "sess-old.jsonl");
|
|
const newTranscriptPath = path.join(dir, "sess-new.jsonl");
|
|
await fs.writeFile(
|
|
oldTranscriptPath,
|
|
`${JSON.stringify({
|
|
type: "message",
|
|
id: "m-old",
|
|
message: { role: "user", content: "old transcript" },
|
|
})}\n`,
|
|
"utf-8",
|
|
);
|
|
await fs.writeFile(
|
|
newTranscriptPath,
|
|
`${JSON.stringify({
|
|
type: "message",
|
|
id: "m-new",
|
|
message: { role: "user", content: "new transcript" },
|
|
})}\n`,
|
|
"utf-8",
|
|
);
|
|
|
|
await writeSessionStore({
|
|
entries: {
|
|
main: {
|
|
sessionId: "sess-old",
|
|
sessionFile: oldTranscriptPath,
|
|
updatedAt: Date.now(),
|
|
},
|
|
},
|
|
});
|
|
|
|
beforeResetHookState.hasBeforeResetHook = true;
|
|
const [{ getRuntimeConfig }, { resolveGatewaySessionStoreTarget }, { updateSessionStore }] =
|
|
await Promise.all([
|
|
import("../config/config.js"),
|
|
import("./session-utils.js"),
|
|
import("../config/sessions.js"),
|
|
]);
|
|
const gatewayStorePath = resolveGatewaySessionStoreTarget({
|
|
cfg: getRuntimeConfig(),
|
|
key: "main",
|
|
}).storePath;
|
|
|
|
const { performGatewaySessionReset } = await import("./session-reset-service.js");
|
|
await updateSessionStore(gatewayStorePath, (store) => {
|
|
store["agent:main:main"] = sessionStoreEntry("sess-new", {
|
|
sessionFile: newTranscriptPath,
|
|
});
|
|
});
|
|
|
|
const reset = await performGatewaySessionReset({
|
|
key: "main",
|
|
reason: "new",
|
|
commandSource: "gateway:sessions.reset",
|
|
});
|
|
expect(reset.ok).toBe(true);
|
|
const internalEvent = (
|
|
sessionHookMocks.triggerInternalHook.mock.calls as unknown as Array<[unknown]>
|
|
)[0]?.[0] as { context?: { previousSessionEntry?: { sessionId?: string } } } | undefined;
|
|
expect(internalEvent?.context?.previousSessionEntry?.sessionId).toBe("sess-new");
|
|
expect(beforeResetHookMocks.runBeforeReset).toHaveBeenCalledTimes(1);
|
|
const [event, context] = firstHookCall(beforeResetHookMocks.runBeforeReset);
|
|
expectTranscriptResetEvent({ event, sessionFile: newTranscriptPath, content: "new transcript" });
|
|
expectMainHookContext(context, "sess-new");
|
|
});
|
|
|
|
test("sessions.create with emitCommandHooks=true fires command:new hook against parent (#76957)", async () => {
|
|
const { dir } = await createSessionStoreDir();
|
|
await writeSingleLineSession(dir, "sess-parent", "hello from parent");
|
|
|
|
await writeSessionStore({
|
|
entries: {
|
|
main: sessionStoreEntry("sess-parent"),
|
|
},
|
|
});
|
|
|
|
const result = await directSessionReq<{ ok: boolean; key: string }>("sessions.create", {
|
|
parentSessionKey: "main",
|
|
emitCommandHooks: true,
|
|
});
|
|
expect(result.ok).toBe(true);
|
|
|
|
const commandNewEvents = (
|
|
sessionHookMocks.triggerInternalHook.mock.calls as unknown as Array<[unknown]>
|
|
)
|
|
.map((call) => call[0])
|
|
.filter(
|
|
(event): event is { type: string; action: string; context?: { commandSource?: string } } =>
|
|
Boolean(event) &&
|
|
typeof event === "object" &&
|
|
(event as { type?: unknown }).type === "command" &&
|
|
(event as { action?: unknown }).action === "new",
|
|
);
|
|
expect(commandNewEvents).toHaveLength(1);
|
|
expect(commandNewEvents[0]?.type).toBe("command");
|
|
expect(commandNewEvents[0]?.action).toBe("new");
|
|
expect(commandNewEvents[0]?.context?.commandSource).toBe("webchat");
|
|
});
|
|
|
|
test("sessions.create with emitCommandHooks=true emits reset lifecycle hooks against parent (#76957)", async () => {
|
|
const { dir } = await createSessionStoreDir();
|
|
const transcriptPath = path.join(dir, "sess-parent-hooks.jsonl");
|
|
await fs.writeFile(
|
|
transcriptPath,
|
|
`${JSON.stringify({
|
|
type: "message",
|
|
id: "m1",
|
|
message: { role: "user", content: "remember this before new" },
|
|
})}\n`,
|
|
"utf-8",
|
|
);
|
|
|
|
await writeSessionStore({
|
|
entries: {
|
|
main: {
|
|
sessionId: "sess-parent-hooks",
|
|
sessionFile: transcriptPath,
|
|
updatedAt: Date.now(),
|
|
},
|
|
},
|
|
});
|
|
|
|
beforeResetHookState.hasBeforeResetHook = true;
|
|
|
|
const result = await directSessionReq<{ ok: boolean; key: string }>("sessions.create", {
|
|
parentSessionKey: "main",
|
|
emitCommandHooks: true,
|
|
});
|
|
expect(result.ok).toBe(true);
|
|
|
|
expect(beforeResetHookMocks.runBeforeReset).toHaveBeenCalledTimes(1);
|
|
const [beforeResetEvent, beforeResetContext] = firstHookCall(beforeResetHookMocks.runBeforeReset);
|
|
expectTranscriptResetEvent({
|
|
event: beforeResetEvent,
|
|
sessionFile: transcriptPath,
|
|
content: "remember this before new",
|
|
});
|
|
expectMainHookContext(beforeResetContext, "sess-parent-hooks");
|
|
|
|
expect(sessionLifecycleHookMocks.runSessionEnd).toHaveBeenCalledTimes(1);
|
|
expect(sessionLifecycleHookMocks.runSessionStart).toHaveBeenCalledTimes(1);
|
|
const [endEvent] = firstHookCall(sessionLifecycleHookMocks.runSessionEnd);
|
|
const [startEvent] = firstHookCall(sessionLifecycleHookMocks.runSessionStart);
|
|
expect(endEvent.sessionId).toBe("sess-parent-hooks");
|
|
expect(endEvent.sessionKey).toBe("agent:main:main");
|
|
expect(endEvent.reason).toBe("new");
|
|
expect(endEvent.nextSessionId).toBe(startEvent.sessionId);
|
|
expect(endEvent.nextSessionKey).toBe(startEvent.sessionKey);
|
|
expect(startEvent.resumedFrom).toBe("sess-parent-hooks");
|
|
expect(startEvent.sessionId).toBeTypeOf("string");
|
|
expect(startEvent.sessionId).not.toBe("");
|
|
expectStringWithPrefix(startEvent.sessionKey, "agent:main:dashboard:", "created session key");
|
|
});
|
|
|
|
test("sessions.create with emitCommandHooks=true resets parent in place when session.dmScope is 'main' (#77434)", async () => {
|
|
const { dir } = await createSessionStoreDir();
|
|
const transcriptPath = path.join(dir, "sess-parent-dms.jsonl");
|
|
await fs.writeFile(
|
|
transcriptPath,
|
|
`${JSON.stringify({
|
|
type: "message",
|
|
id: "m1",
|
|
message: { role: "user", content: "hello before /new" },
|
|
})}\n`,
|
|
"utf-8",
|
|
);
|
|
|
|
testState.sessionConfig = { dmScope: "main" };
|
|
try {
|
|
await writeSessionStore({
|
|
entries: {
|
|
main: {
|
|
sessionId: "sess-parent-dms",
|
|
sessionFile: transcriptPath,
|
|
updatedAt: Date.now(),
|
|
},
|
|
},
|
|
});
|
|
|
|
const result = await directSessionReq<{
|
|
ok: boolean;
|
|
key: string;
|
|
sessionId: string;
|
|
runStarted: boolean;
|
|
}>("sessions.create", {
|
|
parentSessionKey: "main",
|
|
emitCommandHooks: true,
|
|
});
|
|
expect(result.ok).toBe(true);
|
|
// Reset-in-place: response key matches the parent main key, NOT a dashboard child.
|
|
expect(result.payload?.key).toBe("agent:main:main");
|
|
expect(result.payload?.runStarted).toBe(false);
|
|
expect(result.payload?.sessionId).not.toBe("sess-parent-dms");
|
|
|
|
expect(sessionLifecycleHookMocks.runSessionEnd).toHaveBeenCalledTimes(1);
|
|
expect(sessionLifecycleHookMocks.runSessionStart).toHaveBeenCalledTimes(1);
|
|
const [endEvent] = firstHookCall(sessionLifecycleHookMocks.runSessionEnd);
|
|
const [startEvent] = firstHookCall(sessionLifecycleHookMocks.runSessionStart);
|
|
expect(endEvent.sessionId).toBe("sess-parent-dms");
|
|
expect(endEvent.sessionKey).toBe("agent:main:main");
|
|
expect(endEvent.reason).toBe("new");
|
|
expect(startEvent.sessionKey).toBe("agent:main:main");
|
|
expect(startEvent.resumedFrom).toBe("sess-parent-dms");
|
|
} finally {
|
|
testState.sessionConfig = undefined;
|
|
}
|
|
});
|
|
|
|
test("sessions.create without emitCommandHooks does not fire command:new hook (#76957)", async () => {
|
|
const { dir } = await createSessionStoreDir();
|
|
await writeSingleLineSession(dir, "sess-parent2", "hello from parent 2");
|
|
|
|
await writeSessionStore({
|
|
entries: {
|
|
main: sessionStoreEntry("sess-parent2"),
|
|
},
|
|
});
|
|
|
|
const result = await directSessionReq<{ ok: boolean; key: string }>("sessions.create", {
|
|
parentSessionKey: "main",
|
|
});
|
|
expect(result.ok).toBe(true);
|
|
|
|
const commandNewEvents = (
|
|
sessionHookMocks.triggerInternalHook.mock.calls as unknown as Array<[unknown]>
|
|
)
|
|
.map((call) => call[0])
|
|
.filter(
|
|
(event): event is { type: string; action: string } =>
|
|
Boolean(event) &&
|
|
typeof event === "object" &&
|
|
(event as { type?: unknown }).type === "command" &&
|
|
(event as { action?: unknown }).action === "new",
|
|
);
|
|
expect(commandNewEvents).toHaveLength(0);
|
|
expect(beforeResetHookMocks.runBeforeReset).not.toHaveBeenCalled();
|
|
expect(sessionLifecycleHookMocks.runSessionEnd).not.toHaveBeenCalled();
|
|
expect(sessionLifecycleHookMocks.runSessionStart).not.toHaveBeenCalled();
|
|
});
|
|
|
|
test("sessions.reset drops cli session bindings so the next turn does not --resume the old claude-cli session", async () => {
|
|
const { dir } = await createSessionStoreDir();
|
|
await writeSingleLineSession(dir, "sess-with-binding", "hello");
|
|
|
|
await writeSessionStore({
|
|
entries: {
|
|
main: sessionStoreEntry("sess-with-binding", {
|
|
claudeCliSessionId: "claude-cli-old-session",
|
|
cliSessionBindings: {
|
|
"claude-cli": { sessionId: "claude-cli-old-session" },
|
|
},
|
|
cliSessionIds: { "claude-cli": "claude-cli-old-session" },
|
|
}),
|
|
},
|
|
});
|
|
|
|
const [{ getRuntimeConfig }, { resolveGatewaySessionStoreTarget }, { loadSessionStore }] =
|
|
await Promise.all([
|
|
import("../config/config.js"),
|
|
import("./session-utils.js"),
|
|
import("../config/sessions.js"),
|
|
]);
|
|
const gatewayStorePath = resolveGatewaySessionStoreTarget({
|
|
cfg: getRuntimeConfig(),
|
|
key: "main",
|
|
}).storePath;
|
|
|
|
const reset = await directSessionReq<{ ok: true; key: string }>("sessions.reset", {
|
|
key: "main",
|
|
reason: "new",
|
|
});
|
|
expect(reset.ok).toBe(true);
|
|
|
|
const store = loadSessionStore(gatewayStorePath, { skipCache: true });
|
|
const nextEntry = store["agent:main:main"];
|
|
expect(nextEntry).toBeDefined();
|
|
expect(nextEntry?.sessionId).not.toBe("sess-with-binding");
|
|
expect(nextEntry?.claudeCliSessionId).toBeUndefined();
|
|
expect(nextEntry?.cliSessionBindings).toBeUndefined();
|
|
expect(nextEntry?.cliSessionIds).toBeUndefined();
|
|
});
|
|
|
|
test("sessions.reset clears cli session bindings for parent-linked non-subagent sessions (e.g. dashboard children)", async () => {
|
|
const { dir } = await createSessionStoreDir();
|
|
const dashboardTranscript = path.join(dir, "sess-dashboard-child.jsonl");
|
|
await fs.writeFile(
|
|
dashboardTranscript,
|
|
`${JSON.stringify({
|
|
type: "message",
|
|
id: "m-dashboard",
|
|
message: { role: "user", content: "hello from dashboard child" },
|
|
})}\n`,
|
|
"utf-8",
|
|
);
|
|
|
|
await writeSessionStore({
|
|
entries: {
|
|
"dashboard:child:42": sessionStoreEntry("sess-dashboard-child", {
|
|
sessionFile: dashboardTranscript,
|
|
// parentSessionKey is set but the session key carries no `:subagent:`
|
|
// marker, so this is a user-facing parent-linked session, not a
|
|
// spawned subagent. The tighter predicate should still clear the
|
|
// CLI binding here so /reset matches user intuition.
|
|
parentSessionKey: "agent:main:main",
|
|
claudeCliSessionId: "claude-cli-dashboard-session",
|
|
cliSessionBindings: {
|
|
"claude-cli": { sessionId: "claude-cli-dashboard-session" },
|
|
},
|
|
cliSessionIds: { "claude-cli": "claude-cli-dashboard-session" },
|
|
}),
|
|
},
|
|
});
|
|
|
|
const [{ getRuntimeConfig }, { resolveGatewaySessionStoreTarget }, { loadSessionStore }] =
|
|
await Promise.all([
|
|
import("../config/config.js"),
|
|
import("./session-utils.js"),
|
|
import("../config/sessions.js"),
|
|
]);
|
|
const gatewayStorePath = resolveGatewaySessionStoreTarget({
|
|
cfg: getRuntimeConfig(),
|
|
key: "dashboard:child:42",
|
|
}).storePath;
|
|
|
|
const reset = await directSessionReq<{ ok: true; key: string }>("sessions.reset", {
|
|
key: "dashboard:child:42",
|
|
reason: "new",
|
|
});
|
|
expect(reset.ok).toBe(true);
|
|
|
|
const store = loadSessionStore(gatewayStorePath, { skipCache: true });
|
|
const nextEntry = store["agent:main:dashboard:child:42"];
|
|
expect(nextEntry).toBeDefined();
|
|
expect(nextEntry?.sessionId).not.toBe("sess-dashboard-child");
|
|
expect(nextEntry?.claudeCliSessionId).toBeUndefined();
|
|
expect(nextEntry?.cliSessionBindings).toBeUndefined();
|
|
expect(nextEntry?.cliSessionIds).toBeUndefined();
|
|
});
|
|
|
|
test("sessions.reset preserves cli session bindings for spawned subagents (Tak Hoffman's fa56682b3ced contract)", async () => {
|
|
const { dir } = await createSessionStoreDir();
|
|
const childTranscript = path.join(dir, "sess-spawned-child.jsonl");
|
|
await fs.writeFile(
|
|
childTranscript,
|
|
`${JSON.stringify({
|
|
type: "message",
|
|
id: "m-child",
|
|
message: { role: "user", content: "hello from spawned child" },
|
|
})}\n`,
|
|
"utf-8",
|
|
);
|
|
|
|
await writeSessionStore({
|
|
entries: {
|
|
"subagent:child": sessionStoreEntry("sess-spawned-child", {
|
|
sessionFile: childTranscript,
|
|
parentSessionKey: "agent:main:main",
|
|
spawnedBy: "agent:main:main",
|
|
subagentRole: "orchestrator",
|
|
claudeCliSessionId: "claude-cli-child-session",
|
|
cliSessionBindings: {
|
|
"claude-cli": { sessionId: "claude-cli-child-session" },
|
|
},
|
|
cliSessionIds: { "claude-cli": "claude-cli-child-session" },
|
|
}),
|
|
},
|
|
});
|
|
|
|
const [{ getRuntimeConfig }, { resolveGatewaySessionStoreTarget }, { loadSessionStore }] =
|
|
await Promise.all([
|
|
import("../config/config.js"),
|
|
import("./session-utils.js"),
|
|
import("../config/sessions.js"),
|
|
]);
|
|
const gatewayStorePath = resolveGatewaySessionStoreTarget({
|
|
cfg: getRuntimeConfig(),
|
|
key: "subagent:child",
|
|
}).storePath;
|
|
|
|
const reset = await directSessionReq<{ ok: true; key: string }>("sessions.reset", {
|
|
key: "subagent:child",
|
|
reason: "new",
|
|
});
|
|
expect(reset.ok).toBe(true);
|
|
|
|
const store = loadSessionStore(gatewayStorePath, { skipCache: true });
|
|
const nextEntry = store["agent:main:subagent:child"];
|
|
expect(nextEntry).toBeDefined();
|
|
expect(nextEntry?.sessionId).not.toBe("sess-spawned-child");
|
|
expect(nextEntry?.claudeCliSessionId).toBe("claude-cli-child-session");
|
|
expect(nextEntry?.cliSessionBindings).toEqual({
|
|
"claude-cli": { sessionId: "claude-cli-child-session" },
|
|
});
|
|
expect(nextEntry?.cliSessionIds).toEqual({ "claude-cli": "claude-cli-child-session" });
|
|
});
|