fix(gateway): reject stale lifecycle session updates · op...

Recent Commits to openclaw:main

steipete · 2026-05-31 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -803,6 +803,7 @@ async function agentCommandInternal(`
`803`	`803`	`? { isControlUiVisible: false }`
`804`	`804`	`: {`
`805`	`805`	`sessionKey,`
	`806`	`+ sessionId,`
`806`	`807`	`},`
`807`	`808`	`);`
`808`	`809`	`attemptExecutionRuntime.emitAcpLifecycleStart({ runId, startedAt });`
`@@ -980,7 +981,7 @@ async function agentCommandInternal(`
`980`	`981`
`981`	`982`	`if (sessionKey \|\| suppressVisibleSessionEffects) {`
`982`	`983`	`registerAgentRunContext(runId, {`
`983`		`- ...(sessionKey && !suppressVisibleSessionEffects ? { sessionKey } : {}),`
	`984`	`+ ...(sessionKey && !suppressVisibleSessionEffects ? { sessionKey, sessionId } : {}),`
`984`	`985`	`verboseLevel: resolvedVerboseLevel,`
`985`	`986`	`isControlUiVisible: !suppressVisibleSessionEffects,`
`986`	`987`	`});`

Original file line number	Diff line number	Diff line change
`@@ -1177,6 +1177,7 @@ export async function runMemoryFlushIfNeeded(params: {`
`1177`	`1177`	`if (params.sessionKey) {`
`1178`	`1178`	`memoryDeps.registerAgentRunContext(flushRunId, {`
`1179`	`1179`	`sessionKey: params.sessionKey,`
	`1180`	`+ ...(activeSessionEntry?.sessionId ? { sessionId: activeSessionEntry.sessionId } : {}),`
`1180`	`1181`	`verboseLevel: params.resolvedVerboseLevel,`
`1181`	`1182`	`});`
`1182`	`1183`	`}`

Original file line number	Diff line number	Diff line change
`@@ -2630,6 +2630,69 @@ describe("createFollowupRunner compaction", () => {`
`2630`	`2630`	`expect(embeddedCalls[0]?.extraSystemPrompt).toContain("Read AGENTS.md before replying.");`
`2631`	`2631`	`expect(sessionStore.main?.compactionCount).toBe(2);`
`2632`	`2632`	`});`
	`2633`	`+`
	`2634`	`+it("registers the post-preflight session id for lifecycle event stamping", async () => {`
	`2635`	`+const realAgentEvents = await vi.importActual<typeof import("../../infra/agent-events.js")>(`
	`2636`	`+"../../infra/agent-events.js",`
	`2637`	`+);`
	`2638`	`+realAgentEvents.resetAgentRunContextForTest();`
	`2639`	`+const sessionEntry: SessionEntry = {`
	`2640`	`+sessionId: "old-session",`
	`2641`	`+updatedAt: Date.now(),`
	`2642`	`+sessionFile: "/tmp/old-session.jsonl",`
	`2643`	`+};`
	`2644`	`+const sessionStore: Record<string, SessionEntry> = {`
	`2645`	`+main: sessionEntry,`
	`2646`	`+};`
	`2647`	`+runPreflightCompactionIfNeededMock.mockImplementationOnce(`
	`2648`	`+async (params: {`
	`2649`	`+followupRun: FollowupRun;`
	`2650`	`+sessionEntry?: SessionEntry;`
	`2651`	`+sessionStore?: Record<string, SessionEntry>;`
	`2652`	`+sessionKey?: string;`
	`2653`	`+}) => {`
	`2654`	`+const updatedEntry: SessionEntry = {`
	`2655`	`+ ...(params.sessionEntry ?? sessionEntry),`
	`2656`	`+sessionId: "new-session",`
	`2657`	`+sessionFile: "/tmp/new-session.jsonl",`
	`2658`	`+updatedAt: Date.now(),`
	`2659`	`+};`
	`2660`	`+params.followupRun.run.sessionId = updatedEntry.sessionId;`
	`2661`	`+params.followupRun.run.sessionFile = "/tmp/new-session.jsonl";`
	`2662`	`+if (params.sessionKey && params.sessionStore) {`
	`2663`	`+params.sessionStore[params.sessionKey] = updatedEntry;`
	`2664`	`+}`
	`2665`	`+return updatedEntry;`
	`2666`	`+},`
	`2667`	`+);`
	`2668`	`+`
	`2669`	`+let observedRunId: string \| undefined;`
	`2670`	`+runEmbeddedAgentMock.mockImplementationOnce(`
	`2671`	`+async (params: { runId: string; sessionId?: string }) => {`
	`2672`	`+observedRunId = params.runId;`
	`2673`	`+expect(params.sessionId).toBe("new-session");`
	`2674`	`+return {`
	`2675`	`+payloads: [{ text: "final" }],`
	`2676`	`+meta: { agentMeta: { usage: { input: 1, output: 1 } } },`
	`2677`	`+};`
	`2678`	`+},`
	`2679`	`+);`
	`2680`	`+`
	`2681`	`+const runner = createFollowupRunner({`
	`2682`	`+typing: createMockTypingController(),`
	`2683`	`+typingMode: "instant",`
	`2684`	`+ sessionEntry,`
	`2685`	`+ sessionStore,`
	`2686`	`+sessionKey: "main",`
	`2687`	`+defaultModel: "anthropic/claude-opus-4-6",`
	`2688`	`+});`
	`2689`	`+`
	`2690`	`+await runner(createQueuedRun());`
	`2691`	`+`
	`2692`	`+expect(observedRunId).toBeDefined();`
	`2693`	`+expect(realAgentEvents.getAgentRunContext(observedRunId ?? "")?.sessionId).toBe("new-session");`
	`2694`	`+realAgentEvents.resetAgentRunContextForTest();`
	`2695`	`+});`
`2633`	`2696`	`});`
`2634`	`2697`
`2635`	`2698`	`describe("createFollowupRunner bootstrap warning dedupe", () => {`

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,8 @@ export type AgentConfig = {`
`135`	`135`	`allowAgents?: string[];`
`136`	`136`	`/** Per-agent default model for spawned sub-agents (string or {primary,fallbacks}). */`
`137`	`137`	`model?: AgentModelConfig;`
	`138`	`+/** Per-agent default thinking level for spawned sub-agents. */`
	`139`	`+thinking?: string;`
`138`	`140`	`/** Require explicit agentId in sessions_spawn (no default same-as-caller). */`
`139`	`141`	`requireAgentId?: boolean;`
`140`	`142`	`};`

Original file line number	Diff line number	Diff line change
`@@ -396,6 +396,7 @@ export async function executeCronRun(params: {`
`396`	`396`	`"off";`
`397`	`397`	`registerAgentRunContext(params.cronSession.sessionEntry.sessionId, {`
`398`	`398`	`sessionKey: params.runSessionKey,`
	`399`	`+sessionId: params.cronSession.sessionEntry.sessionId,`
`399`	`400`	`verboseLevel: resolvedVerboseLevel,`
`400`	`401`	`});`
`401`	`402`	`const executor = createCronPromptExecutor({`

Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,9 @@ describe("agent-events sequencing", () => {`
`49`	`49`	`expect(seen.find((evt) => evt.stream === "item")?.sessionId).toBeUndefined();`
`50`	`50`	`});`
`51`	`51`
`52`		`-test("refreshes the stamped sessionId after a mid-run session rotation (#88538)", () => {`
	`52`	`+test("refreshes the stamped sessionId when run context is re-registered (#88538)", () => {`
`53`	`53`	`registerAgentRunContext("run-1", { sessionKey: "main", sessionId: "start-id" });`
`54`		`-// A legitimate compaction rotation re-registers the run with its new session.`
	`54`	`+// Callers that already persisted a rotation can re-register the new owner.`
`55`	`55`	`registerAgentRunContext("run-1", { sessionId: "rotated-id" });`
`56`	`56`	`let stamped: string \| undefined;`
`57`	`57`	`const stop = onAgentEvent((evt) => {`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main