fix(channels): preserve command progress detail (#94868) ...

Recent Commits to openclaw:main

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

File tree

- matrix/src/matrix/monitor

Original file line number	Diff line number	Diff line change
`@@ -3057,8 +3057,8 @@ describe("processDiscordMessage draft streaming", () => {`
`3057`	`3057`	`await runProcessDiscordMessage(ctx);`
`3058`	`3058`
`3059`	`3059`	`const lastUpdate = draftStream.update.mock.calls.at(-1)?.[0];`
`3060`		`-expect(lastUpdate).toContain("completed");`
`3061`		`-expect(lastUpdate).not.toContain("install dependencies");`
	`3060`	`+expect(lastUpdate).toContain("install dependencies");`
	`3061`	`+expect(lastUpdate).not.toContain("completed");`
`3062`	`3062`	`});`
`3063`	`3063`
`3064`	`3064`	`it("drops later tool warning finals after progress preview final replies", async () => {`

Original file line number	Diff line number	Diff line change
`@@ -3229,13 +3229,13 @@ describe("matrix monitor handler draft streaming", () => {`
`3229`	`3229`	`expect(editMessageMatrixMock).toHaveBeenCalledWith(`
`3230`	`3230`	`"!room:example.org",`
`3231`	`3231`	`"$draft1",`
`3232`		`-expect.stringContaining("completed"),`
	`3232`	`+expect.stringContaining("Exec"),`
`3233`	`3233`	`expect.any(Object),`
`3234`	`3234`	`);`
`3235`	`3235`	`const recoveredEdit = mockCalls(editMessageMatrixMock, "editMessageMatrix").find(`
`3236`		`-([, eventId, body]) =>`
`3237`		`-eventId === "$draft1" && typeof body === "string" && body.includes("completed"),`
	`3236`	`+([, eventId, body]) => eventId === "$draft1" && typeof body === "string",`
`3238`	`3237`	`);`
	`3238`	`+expect(recoveredEdit?.[2]).not.toContain("completed");`
`3239`	`3239`	`expect(recoveredEdit?.[2]).not.toContain("failed");`
`3240`	`3240`	`expect(recoveredEdit?.[2]).not.toContain("run openclaw cron -> run jq");`
`3241`	`3241`	`});`
`@@ -3293,7 +3293,8 @@ describe("matrix monitor handler draft streaming", () => {`
`3293`	`3293`	`([, eventId, body]) =>`
`3294`	`3294`	`eventId === "$draft1" && typeof body === "string" && body.includes("completed"),`
`3295`	`3295`	`);`
`3296`		`-expect(completedEdit?.[2]).not.toContain("install dependencies");`
	`3296`	`+expect(completedEdit).toBeUndefined();`
	`3297`	`+expect(singleTextMessageBody()).toContain("install dependencies");`
`3297`	`3298`	`});`
`3298`	`3299`
`3299`	`3300`	`it("replaces Matrix patch progress when the patch summary completes", async () => {`

Original file line number	Diff line number	Diff line change
`@@ -454,8 +454,8 @@ describe("createMSTeamsReplyDispatcher", () => {`
`454`	`454`	`});`
`455`	`455`
`456`	`456`	`const lastUpdate = getStreamMock().update.mock.calls.at(-1)?.[0];`
`457`		`-expect(lastUpdate).toContain("completed");`
`458`		`-expect(lastUpdate).not.toContain("install dependencies");`
	`457`	`+expect(lastUpdate).toContain("install dependencies");`
	`458`	`+expect(lastUpdate).not.toContain("completed");`
`459`	`459`	`});`
`460`	`460`
`461`	`461`	`it("replaces reasoning progress snapshots in progress mode", async () => {`

Original file line number	Diff line number	Diff line change
`@@ -2625,10 +2625,10 @@ describe("dispatchTelegramMessage draft streaming", () => {`
`2625`	`2625`	`});`
`2626`	`2626`
`2627`	`2627`	`const lastUpdate = answerDraftStream.updatePreview.mock.calls.at(-1)?.[0];`
`2628`		`-expect(lastUpdate?.text).toContain("completed");`
`2629`		`-expect(lastUpdate?.text).not.toContain("install dependencies");`
	`2628`	`+expect(lastUpdate?.text).toContain("install dependencies");`
	`2629`	`+expect(lastUpdate?.text).not.toContain("completed");`
`2630`	`2630`	`expect(lastUpdate?.richMessage).toEqual({`
`2631`		`-html: "<b>Shelling</b><br><b>🛠️ Exec</b> <code>completed</code>",`
	`2631`	`+html: "<b>Shelling</b><br><b>🛠️ Exec</b> <code>install dependencies</code>",`
`2632`	`2632`	`skip_entity_detection: true,`
`2633`	`2633`	`});`
`2634`	`2634`	`});`

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ describe("buildChannelProgressDraftLine", () => {`
`24`	`24`	`});`
`25`	`25`	`});`
`26`	`26`
`27`		`-it("uses completed status when successful command output has no title", () => {`
	`27`	`+it("uses the tool label when successful command output has no title", () => {`
`28`	`28`	`const line = buildChannelProgressDraftLine({`
`29`	`29`	`event: "command-output",`
`30`	`30`	`phase: "end",`
`@@ -34,10 +34,10 @@ describe("buildChannelProgressDraftLine", () => {`
`34`	`34`
`35`	`35`	`expect(line).toMatchObject({`
`36`	`36`	`kind: "command-output",`
`37`		`-text: "🛠️ completed",`
`38`		`-detail: "completed",`
	`37`	`+text: "🛠️ Exec",`
`39`	`38`	`status: "completed",`
`40`	`39`	`});`
	`40`	`+expect(line?.detail).toBeUndefined();`
`41`	`41`	`});`
`42`	`42`
`43`	`43`	`it("keeps command status and title in raw command progress lines", () => {`

Original file line number	Diff line number	Diff line change
`@@ -411,6 +411,15 @@ function resolveCommandProgressCorrelationKey(input: { toolCallId?: string }): s`
`411`	`411`	return toolCallId ? `command:${toolCallId}` : undefined;
`412`	`412`	`}`
`413`	`413`
	`414`	`+function isTerminalProgressStatus(status: string \| undefined): boolean {`
	`415`	`+const normalized = normalizeOptionalLowercaseString(status);`
	`416`	`+return (`
	`417`	`+normalized === "completed" \|\|`
	`418`	`+normalized === "failed" \|\|`
	`419`	`+normalized?.startsWith("exit ") === true`
	`420`	`+);`
	`421`	`+}`
	`422`	`+`
`414`	`423`	`function isEmptyReasoningProgressItem(`
`415`	`424`	`input: Extract<ChannelProgressDraftLineInput, { event: "item" }>,`
`416`	`425`	`meta: string \| undefined,`
`@@ -444,15 +453,6 @@ function buildCommandOutputProgressLine(`
`444`	`453`	`return line;`
`445`	`454`	`}`
`446`	`455`	`if (status === "completed") {`
`447`		`-if (!line.detail) {`
`448`		`-const statusLine = {`
`449`		`- ...line,`
`450`		`-detail: status,`
`451`		`-text: formatToolAggregate(name, [status], { markdown: options?.markdown }),`
`452`		`-};`
`453`		`-setProgressDraftLineCorrelationKey(statusLine, correlationKey);`
`454`		`-return statusLine;`
`455`		`-}`
`456`	`456`	`return line;`
`457`	`457`	`}`
`458`	`458`	`if (!line.detail \|\| line.detail === status) {`
`@@ -1153,13 +1153,16 @@ function mergeProgressDraftLineUpdate<TLine extends string \| ChannelProgressDraf`
`1153`	`1153`	`if (`
`1154`	`1154`	`line.kind !== "command-output" \|\|`
`1155`	`1155`	`!line.status \|\|`
`1156`		`-line.status === "completed" \|\|`
`1157`	`1156`	`(line.detail && line.detail !== line.status)`
`1158`	`1157`	`) {`
`1159`	`1158`	`return line;`
`1160`	`1159`	`}`
`1161`	`1160`	`const previousDetail = previous.detail?.trim();`
`1162`		`-if (!previousDetail \|\| previousDetail === previous.status) {`
	`1161`	`+if (`
	`1162`	`+!previousDetail \|\|`
	`1163`	`+previousDetail === previous.status \|\|`
	`1164`	`+isTerminalProgressStatus(previous.status)`
	`1165`	`+) {`
`1163`	`1166`	`return line;`
`1164`	`1167`	`}`
`1165`	`1168`	`const replacement = {`

Original file line number	Diff line number	Diff line change
`@@ -601,16 +601,16 @@ describe("channel-streaming", () => {`
`601`	`601`	`expect(updated[0]).toMatchObject({`
`602`	`602`	`id: "tool:call-1-output",`
`603`	`603`	`kind: "command-output",`
`604`		`-detail: "completed",`
	`604`	`+detail: "install dependencies",`
`605`	`605`	`status: "completed",`
`606`		`-text: "🛠️ completed",`
	`606`	`+text: "🛠️ install dependencies",`
`607`	`607`	`});`
`608`	`608`	`expect(`
`609`	`609`	`formatChannelProgressDraftText({`
`610`	`610`	`lines: updated,`
`611`	`611`	`entry: { streaming: { progress: { label: false } } },`
`612`	`612`	`}),`
`613`		`-).toBe("🛠️ completed");`
	`613`	`+).toBe("🛠️ install dependencies");`
`614`	`614`
`615`	`615`	`const recoveredItemLine = buildChannelProgressDraftLine({`
`616`	`616`	`event: "item",`
`@@ -632,19 +632,20 @@ describe("channel-streaming", () => {`
`632`	`632`	`if (!recoveredItemLine \|\| !recoveredCommandLine) {`
`633`	`633`	`throw new Error("expected recovered command progress lines");`
`634`	`634`	`}`
`635`		`-expect(`
`636`		`-mergeChannelProgressDraftLine([recoveredItemLine], recoveredCommandLine, {`
`637`		`-maxLines: 4,`
`638`		`-}),`
`639`		`-).toMatchObject([`
	`635`	`+const recoveredUpdated = mergeChannelProgressDraftLine(`
	`636`	`+[recoveredItemLine],`
	`637`	`+recoveredCommandLine,`
	`638`	`+{ maxLines: 4 },`
	`639`	`+);`
	`640`	`+expect(recoveredUpdated).toMatchObject([`
`640`	`641`	`{`
`641`	`642`	`id: "command-2",`
`642`	`643`	`kind: "command-output",`
`643`		`-detail: "completed",`
`644`	`644`	`status: "completed",`
`645`		`-text: "🛠️ completed",`
	`645`	`+text: "🛠️ Bash",`
`646`	`646`	`},`
`647`	`647`	`]);`
	`648`	`+expect(recoveredUpdated[0]).not.toHaveProperty("detail");`
`648`	`649`	`});`
`649`	`650`
`650`	`651`	`it("starts progress drafts after five seconds or a second work event", async () => {`

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

推荐订阅源

Recent Commits to openclaw:main

File tree