fix: ignore other codex thread completions · openclaw/openclaw@ead847f

Recent Commits to openclaw:main

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

Original file line number	Diff line number	Diff line change
`@@ -8629,6 +8629,55 @@ describe("runCodexAppServerAttempt", () => {`
`8629`	`8629`	`expect(result.timedOut).toBe(false);`
`8630`	`8630`	`});`
`8631`	`8631`
	`8632`	`+it("ignores turn/completed notifications for other subscribed threads", async () => {`
	`8633`	`+const warn = vi.spyOn(embeddedAgentLog, "warn").mockImplementation(() => undefined);`
	`8634`	`+const harness = createStartedThreadHarness();`
	`8635`	`+const run = runCodexAppServerAttempt(`
	`8636`	`+createParams(path.join(tempDir, "session.jsonl"), path.join(tempDir, "workspace")),`
	`8637`	`+);`
	`8638`	`+let resolved = false;`
	`8639`	`+void run.then(() => {`
	`8640`	`+resolved = true;`
	`8641`	`+});`
	`8642`	`+`
	`8643`	`+await harness.waitForMethod("turn/start");`
	`8644`	`+await harness.notify({`
	`8645`	`+method: "turn/completed",`
	`8646`	`+params: {`
	`8647`	`+threadId: "thread-other",`
	`8648`	`+turn: {`
	`8649`	`+id: "turn-other",`
	`8650`	`+status: "completed",`
	`8651`	`+items: [],`
	`8652`	`+},`
	`8653`	`+},`
	`8654`	`+});`
	`8655`	`+await new Promise<void>((resolve) => setImmediate(resolve));`
	`8656`	`+expect(resolved).toBe(false);`
	`8657`	`+expect(`
	`8658`	`+warn.mock.calls.some(([message]) =>`
	`8659`	`+String(message).includes("turn/completed did not match active turn"),`
	`8660`	`+),`
	`8661`	`+).toBe(false);`
	`8662`	`+`
	`8663`	`+await harness.notify({`
	`8664`	`+method: "turn/completed",`
	`8665`	`+params: {`
	`8666`	`+threadId: "thread-1",`
	`8667`	`+turn: {`
	`8668`	`+id: "turn-1",`
	`8669`	`+status: "completed",`
	`8670`	`+items: [{ type: "agentMessage", id: "msg-right", text: "final completion" }],`
	`8671`	`+},`
	`8672`	`+},`
	`8673`	`+});`
	`8674`	`+`
	`8675`	`+const result = await run;`
	`8676`	`+expect(result.assistantTexts).toEqual(["final completion"]);`
	`8677`	`+expect(result.aborted).toBe(false);`
	`8678`	`+expect(result.timedOut).toBe(false);`
	`8679`	`+});`
	`8680`	`+`
`8632`	`8681`	`it("releases completion and native hook relay state when Codex raw-events an interrupted turn marker", async () => {`
`8633`	`8682`	`const harness = createStartedThreadHarness();`
`8634`	`8683`	`const run = runCodexAppServerAttempt(`

Original file line number	Diff line number	Diff line change
`@@ -2409,10 +2409,20 @@ export async function runCodexAppServerAttempt(`
`2409`	`2409`	`});`
`2410`	`2410`	`embeddedAgentLog.debug("codex app-server raw notification received", correlation);`
`2411`	`2411`	`if (notification.method === "turn/completed" && correlation.matchesActiveTurn === false) {`
`2412`		`-embeddedAgentLog.warn(`
`2413`		`-"codex app-server turn/completed did not match active turn",`
`2414`		`-correlation,`
`2415`		`-);`
	`2412`	`+if (correlation.matchesActiveThread) {`
	`2413`	`+embeddedAgentLog.warn(`
	`2414`	`+"codex app-server turn/completed did not match active turn",`
	`2415`	`+correlation,`
	`2416`	`+);`
	`2417`	`+} else {`
	`2418`	`+embeddedAgentLog.debug(`
	`2419`	`+"codex app-server turn/completed ignored for other subscribed thread",`
	`2420`	`+correlation,`
	`2421`	`+);`
	`2422`	`+}`
	`2423`	`+}`
	`2424`	`+if (isCodexNotificationOutsideActiveRun(correlation)) {`
	`2425`	`+return Promise.resolve();`
`2416`	`2426`	`}`
`2417`	`2427`	`if (!projector \|\| !turnId) {`
`2418`	`2428`	`userInputBridge?.handleNotification(notification);`
`@@ -5024,6 +5034,20 @@ function isTurnNotification(`
`5024`	`5034`	`return isCodexNotificationForTurn(value, threadId, turnId);`
`5025`	`5035`	`}`
`5026`	`5036`
	`5037`	`+function isCodexNotificationOutsideActiveRun(`
	`5038`	`+correlation: ReturnType<typeof describeCodexNotificationCorrelation>,`
	`5039`	`+): boolean {`
	`5040`	`+const hasThreadScope = Boolean(correlation.threadId \|\| correlation.nestedTurnThreadId);`
	`5041`	`+if (!hasThreadScope) {`
	`5042`	`+return false;`
	`5043`	`+}`
	`5044`	`+if (!correlation.matchesActiveThread) {`
	`5045`	`+return true;`
	`5046`	`+}`
	`5047`	`+const hasTurnScope = Boolean(correlation.turnId \|\| correlation.nestedTurnId);`
	`5048`	`+return hasTurnScope && correlation.matchesActiveTurn === false;`
	`5049`	`+}`
	`5050`	`+`
`5027`	`5051`	`function isCurrentThreadTurnRequestParams(`
`5028`	`5052`	`value: JsonValue \| undefined,`
`5029`	`5053`	`threadId: string,`

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

推荐订阅源

Recent Commits to openclaw:main