fix(codex): classify streamed subagent messages · opencla...

Recent Commits to openclaw:main

vincentkoc · 2026-06-19 · via Recent Commits to openclaw:main

File tree

extensions/codex/src/app-server

Original file line number	Diff line number	Diff line change
`@@ -347,6 +347,19 @@ describe("CodexNativeSubagentMonitor", () => {`
`347`	`347`	`});`
`348`	`348`
`349`	`349`	`await notifyChildStarted(client);`
	`350`	`+await client.notify({`
	`351`	`+method: "item/started",`
	`352`	`+params: {`
	`353`	`+threadId: "child-thread",`
	`354`	`+turnId: "child-turn",`
	`355`	`+item: {`
	`356`	`+type: "agentMessage",`
	`357`	`+id: "msg-child-final",`
	`358`	`+phase: "final_answer",`
	`359`	`+text: "",`
	`360`	`+},`
	`361`	`+},`
	`362`	`+});`
`350`	`363`	`await client.notify({`
`351`	`364`	`method: "item/agentMessage/delta",`
`352`	`365`	`params: {`
`@@ -398,6 +411,52 @@ describe("CodexNativeSubagentMonitor", () => {`
`398`	`411`	`client.close();`
`399`	`412`	`});`
`400`	`413`
	`414`	`+it("does not deliver a commentary delta when the completion snapshot is absent", async () => {`
	`415`	`+const client = createClient();`
	`416`	`+const runtime = createRuntime();`
	`417`	`+const monitor = new CodexNativeSubagentMonitor(client, runtime);`
	`418`	`+monitor.registerParent({`
	`419`	`+parentThreadId: "parent-thread",`
	`420`	`+requesterSessionKey: "agent:main:discord:channel:C123",`
	`421`	`+taskRuntimeScope: createTaskScope(),`
	`422`	`+agentId: "main",`
	`423`	`+});`
	`424`	`+`
	`425`	`+await notifyChildStarted(client);`
	`426`	`+await client.notify({`
	`427`	`+method: "item/started",`
	`428`	`+params: {`
	`429`	`+threadId: "child-thread",`
	`430`	`+turnId: "child-turn",`
	`431`	`+item: {`
	`432`	`+type: "agentMessage",`
	`433`	`+id: "msg-child-commentary",`
	`434`	`+phase: "commentary",`
	`435`	`+text: "",`
	`436`	`+},`
	`437`	`+},`
	`438`	`+});`
	`439`	`+await client.notify({`
	`440`	`+method: "item/agentMessage/delta",`
	`441`	`+params: {`
	`442`	`+threadId: "child-thread",`
	`443`	`+turnId: "child-turn",`
	`444`	`+itemId: "msg-child-commentary",`
	`445`	`+delta: "checking now",`
	`446`	`+},`
	`447`	`+});`
	`448`	`+await client.notify(childTurnCompletedNotification({ status: "completed" }));`
	`449`	`+`
	`450`	`+expect(runtime.deliverAgentHarnessTaskCompletion).toHaveBeenCalledWith(`
	`451`	`+expect.objectContaining({`
	`452`	`+childSessionId: "child-thread",`
	`453`	`+result: "Codex native subagent completed without a final assistant message.",`
	`454`	`+}),`
	`455`	`+);`
	`456`	`+`
	`457`	`+client.close();`
	`458`	`+});`
	`459`	`+`
`401`	`460`	`it("does not complete commentary-only child messages before a terminal turn", async () => {`
`402`	`461`	`const client = createClient();`
`403`	`462`	`const runtime = createRuntime();`

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ type ChildAssistantMessages = {`
`68`	`68`	`texts: Map<string, string>;`
`69`	`69`	`order: string[];`
`70`	`70`	`commentaryIds: Set<string>;`
	`71`	`+finalMessageIds: Set<string>;`
`71`	`72`	`};`
`72`	`73`
`73`	`74`	`type TranscriptCompletion = CodexNativeSubagentCompletion & {`
`@@ -336,7 +337,7 @@ export class CodexNativeSubagentMonitor {`
`336`	`337`	`}`
`337`	`338`	`return;`
`338`	`339`	`}`
`339`		`-if (notification.method !== "item/completed") {`
	`340`	`+if (notification.method !== "item/started" && notification.method !== "item/completed") {`
`340`	`341`	`return;`
`341`	`342`	`}`
`342`	`343`	`const turnId = readString(params, "turnId");`
`@@ -360,6 +361,8 @@ export class CodexNativeSubagentMonitor {`
`360`	`361`	`const phase = readString(item, "phase");`
`361`	`362`	`if (phase === "commentary") {`
`362`	`363`	`assistantMessages.commentaryIds.add(itemId);`
	`364`	`+} else {`
	`365`	`+assistantMessages.finalMessageIds.add(itemId);`
`363`	`366`	`}`
`364`	`367`	`const text = readString(item, "text");`
`365`	`368`	`if (text) {`
`@@ -408,6 +411,7 @@ export class CodexNativeSubagentMonitor {`
`408`	`411`	`texts: new Map<string, string>(),`
`409`	`412`	`order: [],`
`410`	`413`	`commentaryIds: new Set<string>(),`
	`414`	`+finalMessageIds: new Set<string>(),`
`411`	`415`	`};`
`412`	`416`	`childState.assistantMessagesByTurn.set(turnId, assistantMessages);`
`413`	`417`	`return assistantMessages;`
`@@ -1058,7 +1062,10 @@ function lastChildAssistantMessage(childState: ChildState, turnId: string): stri`
`1058`	`1062`	`}`
`1059`	`1063`	`for (let index = assistantMessages.order.length - 1; index >= 0; index -= 1) {`
`1060`	`1064`	`const itemId = assistantMessages.order[index];`
`1061`		`-if (!assistantMessages.commentaryIds.has(itemId)) {`
	`1065`	`+if (`
	`1066`	`+assistantMessages.finalMessageIds.has(itemId) &&`
	`1067`	`+!assistantMessages.commentaryIds.has(itemId)`
	`1068`	`+) {`
`1062`	`1069`	`const text = normalizeOptionalString(assistantMessages.texts.get(itemId));`
`1063`	`1070`	`if (text) {`
`1064`	`1071`	`return text;`

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

推荐订阅源

Recent Commits to openclaw:main

File tree