fix(ui): render persisted history text blocks (#93841) · openclaw/openclaw@cb84041

Recent Commits to openclaw:main

mushuiyu886 · 2026-06-23 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -580,14 +580,18 @@ function extractAssistantTextForSilentCheck(message: unknown): string \| undefine`
`580`	`580`	`return undefined;`
`581`	`581`	`}`
`582`	`582`	`const typed = block as { type?: unknown; text?: unknown };`
`583`		`-if (typed.type !== "text" \|\| typeof typed.text !== "string") {`
	`583`	`+if (!isAssistantTextContentType(typed.type) \|\| typeof typed.text !== "string") {`
`584`	`584`	`return undefined;`
`585`	`585`	`}`
`586`	`586`	`texts.push(typed.text);`
`587`	`587`	`}`
`588`	`588`	`return texts.length > 0 ? texts.join("\n") : undefined;`
`589`	`589`	`}`
`590`	`590`
	`591`	`+function isAssistantTextContentType(type: unknown): boolean {`
	`592`	`+return type === "text" \|\| type === "input_text" \|\| type === "output_text";`
	`593`	`+}`
	`594`	`+`
`591`	`595`	`function hasAssistantNonTextContent(message: unknown): boolean {`
`592`	`596`	`if (!message \|\| typeof message !== "object") {`
`593`	`597`	`return false;`
`@@ -597,7 +601,10 @@ function hasAssistantNonTextContent(message: unknown): boolean {`
`597`	`601`	`return false;`
`598`	`602`	`}`
`599`	`603`	`return content.some(`
`600`		`-(block) => block && typeof block === "object" && (block as { type?: unknown }).type !== "text",`
	`604`	`+(block) =>`
	`605`	`+block &&`
	`606`	`+typeof block === "object" &&`
	`607`	`+!isAssistantTextContentType((block as { type?: unknown }).type),`
`601`	`608`	`);`
`602`	`609`	`}`
`603`	`610`
`@@ -619,7 +626,11 @@ function hasAssistantMixedToolVisibleText(message: unknown): boolean {`
`619`	`626`	`if (isToolHistoryBlockType(entry.type)) {`
`620`	`627`	`hasToolHistoryBlock = true;`
`621`	`628`	`}`
`622`		`-if (entry.type === "text" && typeof entry.text === "string" && entry.text.trim()) {`
	`629`	`+if (`
	`630`	`+isAssistantTextContentType(entry.type) &&`
	`631`	`+typeof entry.text === "string" &&`
	`632`	`+entry.text.trim()`
	`633`	`+) {`
`623`	`634`	`hasText = true;`
`624`	`635`	`}`
`625`	`636`	`}`
`@@ -1644,7 +1655,7 @@ function projectEmptyAssistantErrorMessages(`
`1644`	`1655`	`}`
`1645`	`1656`	`const type = (block as { type?: unknown }).type;`
`1646`	`1657`	`return (`
`1647`		`-type !== "text" &&`
	`1658`	`+!isAssistantTextContentType(type) &&`
`1648`	`1659`	`type !== "thinking" &&`
`1649`	`1660`	`type !== "reasoning" &&`
`1650`	`1661`	`type !== "redacted_thinking"`
`@@ -1665,7 +1676,7 @@ function projectEmptyAssistantErrorMessages(`
`1665`	`1676`	`continue;`
`1666`	`1677`	`}`
`1667`	`1678`	`const entry = block as { type?: unknown; text?: unknown };`
`1668`		`-if (entry.type === "text" && typeof entry.text === "string") {`
	`1679`	`+if (isAssistantTextContentType(entry.type) && typeof entry.text === "string") {`
`1669`	`1680`	`visibleTexts.push(entry.text);`
`1670`	`1681`	`}`
`1671`	`1682`	`}`

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,39 @@ describe("stripEnvelopeFromMessage", () => {`
`25`	`25`	`expect(result.content?.[0]?.text).toBe("hi");`
`26`	`26`	`});`
`27`	`27`
	`28`	`+test("strips role-appropriate Responses text blocks", () => {`
	`29`	`+const user = stripEnvelopeFromMessage({`
	`30`	`+role: "user",`
	`31`	`+content: [{ type: "input_text", text: "hello\n[message_id: abc123]" }],`
	`32`	`+}) as { content?: Array<{ text?: string }> };`
	`33`	`+const assistant = stripEnvelopeFromMessage({`
	`34`	`+role: "assistant",`
	`35`	`+content: [`
	`36`	`+{`
	`37`	`+type: "output_text",`
	`38`	+text: 'Conversation info (untrusted metadata):\n```json\n{"message_id":"123"}\n```\n\nAssistant body',
	`39`	`+},`
	`40`	`+],`
	`41`	`+}) as { content?: Array<{ text?: string }> };`
	`42`	`+`
	`43`	`+expect(user.content?.[0]?.text).toBe("hello");`
	`44`	`+expect(assistant.content?.[0]?.text).toBe("Assistant body");`
	`45`	`+});`
	`46`	`+`
	`47`	`+test("strips internal metadata from assistant input_text blocks", () => {`
	`48`	`+const assistant = stripEnvelopeFromMessage({`
	`49`	`+role: "assistant",`
	`50`	`+content: [`
	`51`	`+{`
	`52`	`+type: "input_text",`
	`53`	+text: 'Conversation info (untrusted metadata):\n```json\n{"message_id":"123"}\n```\n\nAssistant body',
	`54`	`+},`
	`55`	`+],`
	`56`	`+}) as { content?: Array<{ text?: string }> };`
	`57`	`+`
	`58`	`+expect(assistant.content?.[0]?.text).toBe("Assistant body");`
	`59`	`+});`
	`60`	`+`
`28`	`61`	`test("does not strip inline message_id text that is part of a line", () => {`
`29`	`62`	`const input = {`
`30`	`63`	`role: "user",`

Original file line number	Diff line number	Diff line change
`@@ -47,15 +47,20 @@ function extractMessageSenderLabel(entry: Record<string, unknown>): string \| nul`
`47`	`47`	`// inbound envelopes while assistant/tool content may carry internal metadata.`
`48`	`48`	`function stripEnvelopeFromContentWithRole(`
`49`	`49`	`content: unknown[],`
`50`		`-stripUserEnvelope: boolean,`
	`50`	`+role: string,`
`51`	`51`	`): { content: unknown[]; changed: boolean } {`
	`52`	`+const stripUserEnvelope = role === "user";`
`52`	`53`	`let changed = false;`
`53`	`54`	`const next = content.map((item) => {`
`54`	`55`	`if (!item \|\| typeof item !== "object") {`
`55`	`56`	`return item;`
`56`	`57`	`}`
`57`	`58`	`const entry = item as Record<string, unknown>;`
`58`		`-if (entry.type !== "text" \|\| typeof entry.text !== "string") {`
	`59`	`+const isRoleTextBlock =`
	`60`	`+entry.type === "text" \|\|`
	`61`	`+(role === "user" && entry.type === "input_text") \|\|`
	`62`	`+(role === "assistant" && (entry.type === "input_text" \|\| entry.type === "output_text"));`
	`63`	`+if (!isRoleTextBlock \|\| typeof entry.text !== "string") {`
`59`	`64`	`return item;`
`60`	`65`	`}`
`61`	`66`	`const stripped = stripUserEnvelope`
`@@ -99,7 +104,7 @@ export function stripEnvelopeFromMessage(message: unknown): unknown {`
`99`	`104`	`changed = true;`
`100`	`105`	`}`
`101`	`106`	`} else if (Array.isArray(entry.content)) {`
`102`		`-const updated = stripEnvelopeFromContentWithRole(entry.content, stripUserEnvelope);`
	`107`	`+const updated = stripEnvelopeFromContentWithRole(entry.content, role);`
`103`	`108`	`if (updated.changed) {`
`104`	`109`	`next.content = updated.content;`
`105`	`110`	`changed = true;`

Original file line number	Diff line number	Diff line change
`@@ -941,6 +941,43 @@ describe("projectRecentChatDisplayMessages", () => {`
`941`	`941`	`]);`
`942`	`942`	`});`
`943`	`943`
	`944`	`+it.each([`
	`945`	`+["output_text", ""],`
	`946`	`+["output_text", "NO_REPLY"],`
	`947`	`+["input_text", ""],`
	`948`	`+["input_text", "NO_REPLY"],`
	`949`	`+])("projects hidden %s assistant errors %j as a generic safe failure", (type, text) => {`
	`950`	`+const result = projectRecentChatDisplayMessages([`
	`951`	`+{`
	`952`	`+role: "assistant",`
	`953`	`+content: [{ type, text }],`
	`954`	`+stopReason: "error",`
	`955`	`+errorMessage: "Connection error.",`
	`956`	`+timestamp: 1,`
	`957`	`+},`
	`958`	`+]);`
	`959`	`+`
	`960`	`+expect(result[0]?.content).toEqual([`
	`961`	`+{ type: "text", text: "The agent run failed before producing a reply." },`
	`962`	`+]);`
	`963`	`+});`
	`964`	`+`
	`965`	`+it("preserves visible output_text from a failed assistant turn", () => {`
	`966`	`+const result = projectRecentChatDisplayMessages([`
	`967`	`+{`
	`968`	`+role: "assistant",`
	`969`	`+content: [{ type: "output_text", text: "A partial reply before the run failed." }],`
	`970`	`+stopReason: "error",`
	`971`	`+errorMessage: "Connection error.",`
	`972`	`+timestamp: 1,`
	`973`	`+},`
	`974`	`+]);`
	`975`	`+`
	`976`	`+expect(result[0]?.content).toEqual([`
	`977`	`+{ type: "output_text", text: "A partial reply before the run failed." },`
	`978`	`+]);`
	`979`	`+});`
	`980`	`+`
`944`	`981`	`it("projects thinking-only assistant errors as a generic safe failure", () => {`
`945`	`982`	`const result = projectRecentChatDisplayMessages([`
`946`	`983`	`{`

Original file line number	Diff line number	Diff line change
`@@ -702,6 +702,36 @@ describe("gateway server chat", () => {`
`702`	`702`	`expect(textValues).toEqual(["hello", "real reply", "real text field reply", "NO_REPLY"]);`
`703`	`703`	`});`
`704`	`704`
	`705`	`+test("chat.history hides assistant control replies in Responses output blocks", async () => {`
	`706`	`+const historyMessages = await loadChatHistoryWithMessages([`
	`707`	`+{`
	`708`	`+role: "assistant",`
	`709`	`+content: [{ type: "output_text", text: "NO_REPLY" }],`
	`710`	`+timestamp: 1,`
	`711`	`+},`
	`712`	`+{`
	`713`	`+role: "assistant",`
	`714`	`+content: [{ type: "output_text", text: "visible response" }],`
	`715`	`+timestamp: 2,`
	`716`	`+},`
	`717`	`+{`
	`718`	`+role: "assistant",`
	`719`	`+content: [{ type: "input_text", text: "NO_REPLY" }],`
	`720`	`+timestamp: 3,`
	`721`	`+},`
	`722`	`+{`
	`723`	`+role: "assistant",`
	`724`	`+content: [{ type: "input_text", text: "visible assistant input" }],`
	`725`	`+timestamp: 4,`
	`726`	`+},`
	`727`	`+]);`
	`728`	`+`
	`729`	`+expect(collectHistoryTextValues(historyMessages)).toEqual([`
	`730`	`+"visible response",`
	`731`	`+"visible assistant input",`
	`732`	`+]);`
	`733`	`+});`
	`734`	`+`
`705`	`735`	`test("chat.history mirrors current-session message tool sends before NO_REPLY", async () => {`
`706`	`736`	`const replyText = "Here, love. Eva, not Evo.";`
`707`	`737`	`const historyMessages = await loadChatHistoryWithMessages([`

Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,24 @@ describe("extractAssistantVisibleText", () => {`
`138`	`138`	`).toBe("Legacy answer");`
`139`	`139`	`});`
`140`	`140`
	`141`	`+it("extracts persisted Responses output_text blocks as assistant-visible text", () => {`
	`142`	`+expect(`
	`143`	`+extractAssistantVisibleText({`
	`144`	`+role: "assistant",`
	`145`	`+content: [{ type: "output_text", text: "Persisted assistant answer" }],`
	`146`	`+}),`
	`147`	`+).toBe("Persisted assistant answer");`
	`148`	`+});`
	`149`	`+`
	`150`	`+it("extracts persisted Responses assistant input_text blocks", () => {`
	`151`	`+expect(`
	`152`	`+extractAssistantVisibleText({`
	`153`	`+role: "assistant",`
	`154`	`+content: [{ type: "input_text", text: "Persisted assistant input" }],`
	`155`	`+}),`
	`156`	`+).toBe("Persisted assistant input");`
	`157`	`+});`
	`158`	`+`
`141`	`159`	`it("does not mix unphased legacy text into final_answer output", () => {`
`142`	`160`	`expect(`
`143`	`161`	`extractAssistantVisibleText({`

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,10 @@ export function extractFirstTextBlock(message: unknown): string \| undefined {`
`23`	`23`
`24`	`24`	`export type AssistantPhase = "commentary" \| "final_answer";`
`25`	`25`
	`26`	`+function isAssistantTextContentBlockType(value: unknown): boolean {`
	`27`	`+return value === "text" \|\| value === "input_text" \|\| value === "output_text";`
	`28`	`+}`
	`29`	`+`
`26`	`30`	`/** Narrows unknown phase metadata to assistant text phases that affect visibility. */`
`27`	`31`	`export function normalizeAssistantPhase(value: unknown): AssistantPhase \| undefined {`
`28`	`32`	`return value === "commentary" \|\| value === "final_answer" ? value : undefined;`
`@@ -73,7 +77,7 @@ export function resolveAssistantMessagePhase(message: unknown): AssistantPhase \|`
`73`	`77`	`continue;`
`74`	`78`	`}`
`75`	`79`	`const record = block as { type?: unknown; textSignature?: unknown };`
`76`		`-if (record.type !== "text") {`
	`80`	`+if (!isAssistantTextContentBlockType(record.type)) {`
`77`	`81`	`continue;`
`78`	`82`	`}`
`79`	`83`	`const phase = parseAssistantTextSignature(record.textSignature)?.phase;`
`@@ -156,7 +160,7 @@ export function extractAssistantTextForPhase(`
`156`	`160`	`return false;`
`157`	`161`	`}`
`158`	`162`	`const record = block as { type?: unknown; textSignature?: unknown };`
`159`		`-if (record.type !== "text") {`
	`163`	`+if (!isAssistantTextContentBlockType(record.type)) {`
`160`	`164`	`return false;`
`161`	`165`	`}`
`162`	`166`	`return Boolean(parseAssistantTextSignature(record.textSignature)?.phase);`
`@@ -173,7 +177,7 @@ export function extractAssistantTextForPhase(`
`173`	`177`	`return null;`
`174`	`178`	`}`
`175`	`179`	`const record = block as { type?: unknown; text?: unknown; textSignature?: unknown };`
`176`		`-if (record.type !== "text" \|\| typeof record.text !== "string") {`
	`180`	`+if (!isAssistantTextContentBlockType(record.type) \|\| typeof record.text !== "string") {`
`177`	`181`	`return null;`
`178`	`182`	`}`
`179`	`183`	`const signature = parseAssistantTextSignature(record.textSignature);`

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,36 @@ describe("extractTextCached", () => {`
`44`	`44`	`expect(extractTextCached(message)).toBe("Final user answer");`
`45`	`45`	`});`
`46`	`46`
	`47`	`+it("extracts text from persisted Responses content blocks", () => {`
	`48`	`+expect(`
	`49`	`+extractText({`
	`50`	`+role: "user",`
	`51`	`+content: [{ type: "input_text", text: "Persisted user question" }],`
	`52`	`+}),`
	`53`	`+).toBe("Persisted user question");`
	`54`	`+expect(`
	`55`	`+extractText({`
	`56`	`+role: "assistant",`
	`57`	`+content: [{ type: "output_text", text: "Persisted assistant answer" }],`
	`58`	`+}),`
	`59`	`+).toBe("Persisted assistant answer");`
	`60`	`+});`
	`61`	`+`
	`62`	`+it("accepts assistant Responses input blocks but ignores user output blocks", () => {`
	`63`	`+expect(`
	`64`	`+extractText({`
	`65`	`+role: "user",`
	`66`	`+content: [{ type: "output_text", text: "Assistant-only block" }],`
	`67`	`+}),`
	`68`	`+).toBeNull();`
	`69`	`+expect(`
	`70`	`+extractText({`
	`71`	`+role: "assistant",`
	`72`	`+content: [{ type: "input_text", text: "User-only block" }],`
	`73`	`+}),`
	`74`	`+).toBe("User-only block");`
	`75`	`+});`
	`76`	`+`
`47`	`77`	`it("prefers final_answer assistant text over commentary text", () => {`
`48`	`78`	`const message = {`
`49`	`79`	`role: "assistant",`

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,14 @@ import { stripThinkingTags } from "../strip-thinking-tags.ts";`
`9`	`9`	`const textCache = new WeakMap<object, string \| null>();`
`10`	`10`	`const thinkingCache = new WeakMap<object, string \| null>();`
`11`	`11`
	`12`	`+function isTextContentBlockType(value: unknown, role: string): boolean {`
	`13`	`+return (`
	`14`	`+value === "text" \|\|`
	`15`	`+(role === "user" && value === "input_text") \|\|`
	`16`	`+(role === "assistant" && (value === "input_text" \|\| value === "output_text"))`
	`17`	`+);`
	`18`	`+}`
	`19`	`+`
`12`	`20`	`function processMessageText(text: string, role: string): string {`
`13`	`21`	`const shouldStripInboundMetadata = normalizeLowercaseStringOrEmpty(role) === "user";`
`14`	`22`	`const withoutInternalContext = stripInternalRuntimeContext(text);`
`@@ -90,6 +98,7 @@ export function extractThinkingCached(message: unknown): string \| null {`
`90`	`98`
`91`	`99`	`export function extractRawText(message: unknown): string \| null {`
`92`	`100`	`const m = message as Record<string, unknown>;`
	`101`	`+const role = normalizeLowercaseStringOrEmpty(m.role);`
`93`	`102`	`const content = m.content;`
`94`	`103`	`if (typeof content === "string") {`
`95`	`104`	`return content;`
`@@ -98,7 +107,7 @@ export function extractRawText(message: unknown): string \| null {`
`98`	`107`	`const parts = content`
`99`	`108`	`.map((p) => {`
`100`	`109`	`const item = p as Record<string, unknown>;`
`101`		`-if (item.type === "text" && typeof item.text === "string") {`
	`110`	`+if (isTextContentBlockType(item.type, role) && typeof item.text === "string") {`
`102`	`111`	`return item.text;`
`103`	`112`	`}`
`104`	`113`	`return null;`

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,41 @@ describe("message-normalizer", () => {`
`90`	`90`	`});`
`91`	`91`	`});`
`92`	`92`
	`93`	`+it("normalizes persisted Responses text blocks as renderable text", () => {`
	`94`	`+const user = normalizeMessage({`
	`95`	`+role: "user",`
	`96`	`+content: [{ type: "input_text", text: "Persisted user question" }],`
	`97`	`+});`
	`98`	`+const assistant = normalizeMessage({`
	`99`	`+role: "assistant",`
	`100`	`+content: [{ type: "output_text", text: "Persisted assistant answer" }],`
	`101`	`+});`
	`102`	`+`
	`103`	`+expect(user.content).toEqual([`
	`104`	`+{`
	`105`	`+type: "text",`
	`106`	`+text: "Persisted user question",`
	`107`	`+name: undefined,`
	`108`	`+args: undefined,`
	`109`	`+},`
	`110`	`+]);`
	`111`	`+expect(assistant.content).toEqual([{ type: "text", text: "Persisted assistant answer" }]);`
	`112`	`+});`
	`113`	`+`
	`114`	`+it("accepts assistant Responses input blocks but rejects user output blocks", () => {`
	`115`	`+const user = normalizeMessage({`
	`116`	`+role: "user",`
	`117`	`+content: [{ type: "output_text", text: "Assistant-only block" }],`
	`118`	`+});`
	`119`	`+const assistant = normalizeMessage({`
	`120`	`+role: "assistant",`
	`121`	`+content: [{ type: "input_text", text: "User-only block" }],`
	`122`	`+});`
	`123`	`+`
	`124`	`+expect(user.content).not.toContainEqual({ type: "text", text: "Assistant-only block" });`
	`125`	`+expect(assistant.content).toContainEqual({ type: "text", text: "User-only block" });`
	`126`	`+});`
	`127`	`+`
`93`	`128`	`it("normalizes structured base64 audio content blocks as renderable attachments", () => {`
`94`	`129`	`const result = normalizeMessage({`
`95`	`130`	`role: "assistant",`

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

推荐订阅源

Recent Commits to openclaw:main