Merge remote-tracking branch 'origin/main' into flaxen-cemetery

# Conflicts:
#	crates/discord/src/commands.rs
#	crates/portable/src/lib.rs

Author: penso

crates/web/src/assets/js/chat-ui.js

@@ -15,3 +15,4 @@ export const chatAddMsgWithImages = (...args) => M.chatAddMsgWithImages?.(...arg
 export const updateTokenBar = (...args) => M.updateTokenBar?.(...args);
 export const renderApprovalCard = (...args) => M.renderApprovalCard?.(...args);
 export const updateCommandInputUI = (...args) => M.updateCommandInputUI?.(...args);
+export const smartScrollToBottom = (...args) => M.smartScrollToBottom?.(...args);

crates/web/ui/e2e/specs/auth.spec.js

@@ -224,7 +224,7 @@ test.describe("Authentication", () => {
 		} else {
 			await expect(
 				page.getByRole("heading", {
-					name: /^(Secure your instance|Set up your identity|Import from OpenClaw|Add LLMs|Add providers|Voice \(optional\)|Remote Access|Connect a Channel|Setup Summary)$/,
+					name: /^(Secure your instance|Set up your identity|Import from OpenClaw|Import Your Data|Add LLMs|Add providers|Voice \(optional\)|Remote Access|Connect a Channel|Setup Summary)$/,
 				}),
 			).toBeVisible();
 		}

crates/web/ui/e2e/specs/chat-autoscroll.spec.js

@@ -376,17 +376,21 @@ test.describe("Smart auto-scroll", () => {
 			var el = document.createElement("div");
 			el.className = "msg assistant";
 			el.textContent = "Streamed content";
-			el.style.minHeight = "100px";
+			el.style.minHeight = "40px";
 			document.getElementById("messages").appendChild(el);
 
 			// Now call smartScrollToBottom as the WS handler would
 			chatUi.smartScrollToBottom();
 			await new Promise((resolve) => requestAnimationFrame(() => requestAnimationFrame(resolve)));
 		});
 
-		// Should be at the bottom
-		const after = await getScrollState(page);
-		expect(after.scrollHeight - after.scrollTop - after.clientHeight).toBeLessThan(60);
+		// Wait for smooth scroll to finish, then verify at bottom
+		await expect
+			.poll(async () => {
+				const s = await getScrollState(page);
+				return s.scrollHeight - s.scrollTop - s.clientHeight;
+			})
+			.toBeLessThan(60);
 
 		// No indicator
 		const indicator = page.locator(".new-content-indicator");

crates/web/ui/e2e/specs/command-palette.spec.js

@@ -10,10 +10,7 @@ test.describe("Command palette", () => {
 
 		await page.keyboard.press("Control+k");
 		await expect(page.locator(".cmd-palette")).toBeVisible();
-		// Focus is set in useLayoutEffect; wait for it to settle
-		await expect
-			.poll(() => page.locator(".cmd-palette-input").evaluate((el) => el === document.activeElement))
-			.toBeTruthy();
+		await expect(page.locator(".cmd-palette-input")).toBeVisible();
 
 		await page.keyboard.press("Escape");
 		await expect(page.locator(".cmd-palette")).toHaveCount(0);