fix(prove-76729): narrow AgentMessage to Message-with-content before .content access

LiuwqGit · LiuwqGit · commit b6bc7b8119ba · 2026-06-21T12:28:14.000+08:00
AgentMessage = Message | CustomAgentMessages[keyof CustomAgentMessages]
includes BashExecutionMessage which lacks .content, causing tsgo errors.

Use a type guard (isMessageWithContent) that narrows AgentMessage
to Message (= UserMessage | AssistantMessage | ToolResultMessage)
before accessing .content or .text. This also lets the helper
getMessageText() accept Message directly without casts.

Fixes check-test-types and check-lint failures in CI.
diff --git a/src/agents/embedded-agent-runner/prove-76729.e2e.test.ts b/src/agents/embedded-agent-runner/prove-76729.e2e.test.ts
@@ -3,26 +3,38 @@
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
+import type { Message } from "openclaw/plugin-sdk/llm";
 import { SessionManager } from "openclaw/plugin-sdk/agent-sessions";
 import { describe, expect, it } from "vitest";
 import { makeAgentAssistantMessage } from "../test-helpers/agent-message-fixtures.js";
 import {
   rotateTranscriptAfterCompaction,
 } from "./compaction-successor-transcript.js";
 
+function isMessageWithContent(value: unknown): value is Message {
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    "role" in value &&
+    (value as { role: unknown }).role !== "bashExecution"
+  );
+}
+
 function makeAssistant(text: string, timestamp: number) {
   return makeAgentAssistantMessage({
     content: [{ type: "text", text }],
     timestamp,
   });
 }
 
-function getMessageText(msg: { role: string; content?: unknown }): string {
+function getMessageText(msg: Message): string {
   if (typeof msg.content === "string") {
     return msg.content;
   }
   if (Array.isArray(msg.content)) {
-    return msg.content.map((b: Record<string, unknown>) => String(b.text ?? "")).join(" ");
+    return msg.content
+      .map((b) => (b.type === "text" ? b.text : ""))
+      .join(" ");
   }
   return "";
 }
@@ -65,12 +77,15 @@ describe("prove-76729 — real behavior proof", () => {
     proof.push("Session branch entries:");
     for (const entry of manager.getBranch()) {
       if (entry.type === "message") {
-        const txt = typeof entry.message.content === "string"
-          ? entry.message.content
-          : entry.message.content?.[0]?.text ?? "";
-        proof.push(`  ${entry.message.role}[t=${entry.message.timestamp}]: ${txt}`);
+        if (isMessageWithContent(entry.message)) {
+          const msg = entry.message;
+          const txt = getMessageText(msg);
+          proof.push(`  [${msg.role}] "${txt}"`);
+        } else {
+          proof.push(`  [${entry.message.role}] (no text content)`);
+        }
       } else if (entry.type === "compaction") {
-        proof.push(`  compaction(firstKept=${entry.firstKeptEntryId?.slice(0, 8)}): ${entry.summary}`);
+        proof.push(`  compaction(firstKept=${entry.firstKeptEntryId.slice(0, 8)}): ${entry.summary}`);
       } else {
         proof.push(`  ${entry.type}`);
       }
@@ -81,8 +96,10 @@ describe("prove-76729 — real behavior proof", () => {
     for (const msg of successor.buildSessionContext().messages) {
       if (msg.role === "compactionSummary") {
         proof.push(`  [compactionSummary] summary="${msg.summary}"`);
-      } else if ("content" in msg) {
-        proof.push(`  [${msg.role}] "${getMessageText(msg as { role: string; content: unknown })}"`);
+      } else if (isMessageWithContent(msg)) {
+        proof.push(`  [${msg.role}] "${getMessageText(msg)}"`);
+      } else {
+        proof.push(`  [${msg.role}] (no text content)`);
       }
     }
 
@@ -92,27 +109,27 @@ describe("prove-76729 — real behavior proof", () => {
       if (m.role === "compactionSummary") {
         return { role: "compactionSummary", summary: m.summary, tokensBefore: m.tokensBefore };
       }
-      if ("content" in m) {
-        return { role: m.role, content: (m as { content: unknown }).content, timestamp: (m as { timestamp: number }).timestamp };
+      if (isMessageWithContent(m)) {
+        return { role: m.role, content: m.content, timestamp: m.timestamp };
       }
       return { role: m.role };
     });
     proof.push(JSON.stringify(json, null, 2));
 
     const ctx = successor.buildSessionContext().messages;
     const hasAssistantPreserved = ctx.some(
-      (m) => m.role === "assistant" && "content" in m &&
-        getMessageText(m as { role: string; content: unknown }).includes("sunny"),
+      (m) => m.role === "assistant" && isMessageWithContent(m) &&
+        getMessageText(m).includes("sunny"),
     );
     const hasUserSurviving = ctx.some(
-      (m) => m.role === "user" && "content" in m &&
-        typeof (m as { content: unknown }).content === "string" &&
-        ((m as { content: string }).content).includes("tomorrow"),
+      (m) => m.role === "user" && isMessageWithContent(m) &&
+        typeof m.content === "string" &&
+        m.content.includes("tomorrow"),
     );
     const summarizedRemoved = !ctx.some(
-      (m) => m.role === "user" && "content" in m &&
-        typeof (m as { content: unknown }).content === "string" &&
-        ((m as { content: string }).content).includes("weather today"),
+      (m) => m.role === "user" && isMessageWithContent(m) &&
+        typeof m.content === "string" &&
+        m.content.includes("weather today"),
     );
 
     proof.push("");
