fix(chat): type fixes and protocol regen for branch switcher CI

steipete · steipete · commit 1021407619df · 2026-07-18T11:32:08.000-07:00
diff --git a/apps/android/app/src/main/java/ai/openclaw/app/gateway/GatewayProtocol.kt b/apps/android/app/src/main/java/ai/openclaw/app/gateway/GatewayProtocol.kt
@@ -303,6 +303,8 @@ enum class GatewayMethod(
   SessionsCompactionGet("sessions.compaction.get"),
   SessionsCompactionBranch("sessions.compaction.branch"),
   SessionsCompactionRestore("sessions.compaction.restore"),
+  SessionsBranchesList("sessions.branches.list"),
+  SessionsBranchesSwitch("sessions.branches.switch"),
   SessionsRewind("sessions.rewind"),
   SessionsFork("sessions.fork"),
   SessionsCreate("sessions.create"),
diff --git a/ui/src/pages/chat/chat-history.test.ts b/ui/src/pages/chat/chat-history.test.ts
@@ -193,6 +193,7 @@ describe("switchChatHistoryBranch", () => {
         },
       ]),
       switchBranch: vi.fn().mockResolvedValue({}),
+      setModelOverride: vi.fn(),
     };
     cacheChatSessionSnapshot(
       state.chatMessagesBySession,
@@ -227,7 +228,7 @@ describe("switchChatHistoryBranch", () => {
     };
     state.chatBranchesSessionKey = state.sessionKey;
     state.chatBranchesConnectionEpoch = state.connectionEpoch - 1;
-    state.sessions = { listBranches: vi.fn().mockResolvedValue([]) };
+    state.sessions = { listBranches: vi.fn().mockResolvedValue([]), setModelOverride: vi.fn() };
 
     await loadChatHistory(state);
 
diff --git a/ui/src/pages/chat/chat-pane.ts b/ui/src/pages/chat/chat-pane.ts
@@ -2671,7 +2671,7 @@ class ChatPane extends OpenClawLightDomElement {
       workspaceLabel: workspace.label,
       branch,
       branches:
-        this.state?.chatBranchesSessionKey === this.state?.sessionKey
+        this.state && this.state.chatBranchesSessionKey === this.state.sessionKey
           ? (this.state.chatBranches ?? [])
           : [],
       branchSwitchDisabledReason,
diff --git a/ui/src/pages/chat/components/chat-pane-header.ts b/ui/src/pages/chat/components/chat-pane-header.ts
@@ -279,7 +279,7 @@ export function renderChatPaneHeader(props: ChatPaneHeaderProps) {
                           branch.messageCount === 1
                             ? "chat.sessionHeader.oneMessage"
                             : "chat.sessionHeader.messages",
-                          { count: branch.messageCount },
+                          { count: String(branch.messageCount) },
                         )}${relativeTime ? ` · ${relativeTime}` : ""}</span
                       >
                     </span>

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ export function renderChatPaneHeader(props: ChatPaneHeaderProps) {`
`279`	`279`	`branch.messageCount === 1`
`280`	`280`	`? "chat.sessionHeader.oneMessage"`
`281`	`281`	`: "chat.sessionHeader.messages",`
`282`		`- { count: branch.messageCount },`
	`282`	`+ { count: String(branch.messageCount) },`
`283`	`283`	)}${relativeTime ? ` · ${relativeTime}` : ""}</span
`284`	`284`	`>`
`285`	`285`	`</span>`