Keep command text in progress drafts (#93711) · openclaw/openclaw@257d540

Recent Commits to openclaw:main

keshavbotage · 2026-06-17 · via Recent Commits to openclaw:main

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
`@@ -134,7 +134,7 @@ describe("buildSlackProgressDraftBlocks", () => {`
`134`	`134`	`],`
`135`	`135`	`});`
`136`	`136`
`137`		`-expectLegacyLineBlock(blocks?.[1], "• Exec", "command finished · completed");`
	`137`	`+expectLegacyLineBlock(blocks?.[1], "• Exec", "command finished");`
`138`	`138`	`expectLegacyLineBlock(blocks?.[2], "• Exec", "command failed · exit 1");`
`139`	`139`	`});`
`140`	`140`
`@@ -243,7 +243,7 @@ describe("native Slack progress stream chunks", () => {`
`243`	`243`	`}),`
`244`	`244`	`).toEqual([`
`245`	`245`	`planUpdate("Shelling..."),`
`246`		`-taskUpdate("exec_1", "Exec — command finished · completed", "complete"),`
	`246`	`+taskUpdate("exec_1", "Exec — command finished", "complete"),`
`247`	`247`	`taskUpdate("exec_2", "Exec — command failed · exit 1", "error"),`
`248`	`248`	`]);`
`249`	`249`	`});`

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,12 @@ function compactChunkText(value: string): string {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`function lineDetailParts(line: ChannelProgressDraftLine): string[] {`
`62`		`-return [line.detail, line.status && !line.detail?.includes(line.status) ? line.status : undefined]`
	`62`	`+return [`
	`63`	`+line.detail,`
	`64`	`+line.status && line.status !== "completed" && !line.detail?.includes(line.status)`
	`65`	`+ ? line.status`
	`66`	`+ : undefined,`
	`67`	`+]`
`63`	`68`	`.map((part) => part?.trim())`
`64`	`69`	`.filter((part): part is string => Boolean(part));`
`65`	`70`	`}`

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`	`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>install dependencies</code> <i>completed</i>",`
	`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
`@@ -458,7 +458,7 @@ function renderTelegramProgressLine(line: ChannelProgressDraftCompositorLine): s`
`458`	`458`	`parts.push(renderTelegramProgressStringLine(text));`
`459`	`459`	`}`
`460`	`460`	`}`
`461`		`-if (line.status && line.status !== line.detail) {`
	`461`	`+if (line.status && line.status !== "completed" && line.status !== line.detail) {`
`462`	`462`	parts.push(`<i>${escapeTelegramProgressHtml(line.status)}</i>`);
`463`	`463`	`}`
`464`	`464`	`return parts.join(" ");`

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,44 @@ import { describe, expect, it } from "vitest";`
`2`	`2`	`import { buildChannelProgressDraftLine } from "./streaming.js";`
`3`	`3`
`4`	`4`	`describe("buildChannelProgressDraftLine", () => {`
	`5`	`+it("omits generic completed status from successful command output with title", () => {`
	`6`	`+const line = buildChannelProgressDraftLine(`
	`7`	`+{`
	`8`	`+event: "command-output",`
	`9`	`+toolCallId: "exec-1",`
	`10`	`+phase: "end",`
	`11`	`+title: "pwd",`
	`12`	`+name: "exec",`
	`13`	`+exitCode: 0,`
	`14`	`+},`
	`15`	`+{ commandText: "raw" },`
	`16`	`+);`
	`17`	`+`
	`18`	`+expect(line).toMatchObject({`
	`19`	`+kind: "command-output",`
	`20`	`+id: "exec-1",`
	`21`	`+text: "🛠️ pwd",`
	`22`	`+detail: "pwd",`
	`23`	`+status: "completed",`
	`24`	`+});`
	`25`	`+});`
	`26`	`+`
	`27`	`+it("uses the tool label when successful command output has no title", () => {`
	`28`	`+const line = buildChannelProgressDraftLine({`
	`29`	`+event: "command-output",`
	`30`	`+phase: "end",`
	`31`	`+name: "exec",`
	`32`	`+exitCode: 0,`
	`33`	`+});`
	`34`	`+`
	`35`	`+expect(line).toMatchObject({`
	`36`	`+kind: "command-output",`
	`37`	`+text: "🛠️ Exec",`
	`38`	`+status: "completed",`
	`39`	`+});`
	`40`	`+expect(line?.detail).toBeUndefined();`
	`41`	`+});`
	`42`	`+`
`5`	`43`	`it("keeps command status and title in raw command progress lines", () => {`
`6`	`44`	`const line = buildChannelProgressDraftLine(`
`7`	`45`	`{`

Original file line number	Diff line number	Diff line change
`@@ -443,6 +443,9 @@ function buildCommandOutputProgressLine(`
`443`	`443`	`if (!line \|\| !status) {`
`444`	`444`	`return line;`
`445`	`445`	`}`
	`446`	`+if (status === "completed") {`
	`447`	`+return line;`
	`448`	`+}`
`446`	`449`	`if (!line.detail \|\| line.detail === status) {`
`447`	`450`	`const statusLine = {`
`448`	`451`	`...line,`
`@@ -1055,11 +1058,14 @@ function getProgressDraftLineText(line: string \| ChannelProgressDraftLine): stri`
`1055`	`1058`	`const label = line.label.trim();`
`1056`	`1059`	`const detail = line.detail?.trim();`
`1057`	`1060`	`const status = line.status?.trim();`
	`1061`	`+const displayStatus = status === "completed" ? undefined : status;`
`1058`	`1062`	`if (detail) {`
`1059`	`1063`	`const compactCommandLine =`
`1060`	`1064`	`line.toolName === "exec" \|\| line.toolName === "bash" \|\| line.toolName === "shell";`
`1061`		`-if (line.kind === "command-output" && status && detail !== status) {`
`1062`		-const outputDetail = detail.startsWith(`${status};`) ? detail : `${status}; ${detail}`;
	`1065`	`+if (line.kind === "command-output" && displayStatus && detail !== displayStatus) {`
	`1066`	+const outputDetail = detail.startsWith(`${displayStatus};`)
	`1067`	`+ ? detail`
	`1068`	+ : `${displayStatus}; ${detail}`;
`1063`	`1069`	`if (compactCommandLine) {`
`1064`	`1070`	return `${prefix}${outputDetail}`;
`1065`	`1071`	`}`
`@@ -1070,11 +1076,11 @@ function getProgressDraftLineText(line: string \| ChannelProgressDraftLine): stri`
`1070`	`1076`	`}`
`1071`	`1077`	return `${prefix}${detail}`;
`1072`	`1078`	`}`
`1073`		`-if (status) {`
	`1079`	`+if (displayStatus) {`
`1074`	`1080`	`if (label) {`
`1075`		-return `${prefix}${label}: ${status}`;
	`1081`	+return `${prefix}${label}: ${displayStatus}`;
`1076`	`1082`	`}`
`1077`		-return `${prefix}${status}`;
	`1083`	+return `${prefix}${displayStatus}`;
`1078`	`1084`	`}`
`1079`	`1085`	`const text = line.text.trim();`
`1080`	`1086`	`if (!icon && text && text !== label) {`

Original file line number	Diff line number	Diff line change
`@@ -601,10 +601,16 @@ describe("channel-streaming", () => {`
`601`	`601`	`expect(updated[0]).toMatchObject({`
`602`	`602`	`id: "tool:call-1-output",`
`603`	`603`	`kind: "command-output",`
`604`		`-status: "completed",`
`605`	`604`	`detail: "install dependencies",`
`606`		`-text: "🛠️ completed; install dependencies",`
	`605`	`+status: "completed",`
	`606`	`+text: "🛠️ install dependencies",`
`607`	`607`	`});`
	`608`	`+expect(`
	`609`	`+formatChannelProgressDraftText({`
	`610`	`+lines: updated,`
	`611`	`+entry: { streaming: { progress: { label: false } } },`
	`612`	`+}),`
	`613`	`+).toBe("🛠️ install dependencies");`
`608`	`614`
`609`	`615`	`const recoveredItemLine = buildChannelProgressDraftLine({`
`610`	`616`	`event: "item",`
`@@ -634,9 +640,9 @@ describe("channel-streaming", () => {`
`634`	`640`	`{`
`635`	`641`	`id: "command-2",`
`636`	`642`	`kind: "command-output",`
`637`		`-status: "completed",`
`638`	`643`	`detail: "install dependencies failed",`
`639`		`-text: "🛠️ completed; install dependencies failed",`
	`644`	`+status: "completed",`
	`645`	`+text: "🛠️ install dependencies failed",`
`640`	`646`	`},`
`641`	`647`	`]);`
`642`	`648`	`});`

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

推荐订阅源

Recent Commits to openclaw:main