fix(desktop): select the agent tab when opening a CLI-created workspace

apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/useAutoAdoptBackgroundSessions/useAutoAdoptBackgroundSessions.ts

@@ -5,13 +5,13 @@ import { logStressEvent } from "renderer/lib/performance/stress-instrumentation"
 import { getTerminalBackgroundMarkerIdsKey } from "renderer/lib/terminal/terminal-background-intents";
 import type { StoreApi } from "zustand/vanilla";
 import type { PaneViewerData } from "../../types";
+import { adoptTerminalPanes } from "../../utils/adoptTerminalPanes";
 import {
 	getAttachedTerminalIdsKey,
 	getBackgroundTerminalSessions,
 	parseAttachedTerminalIdsKey,
 } from "../../utils/backgroundTerminals";
 import { isTerminalReplacementCancelled } from "../../utils/cancelledTerminalReplacements";
-import { focusOrAddTerminalPane } from "../../utils/focusTerminalPane";
 
 interface UseAutoAdoptBackgroundSessionsArgs {
 	store: StoreApi<WorkspaceStore<PaneViewerData>>;
@@ -75,15 +75,10 @@ export function useAutoAdoptBackgroundSessions({
 		);
 		if (toAdopt.length === 0) return;
 
-		// Oldest→newest so tabs read chronologically; restore the active tab so
-		// adoption never steals focus.
-		const restoreActiveTabId = state.tabs.length > 0 ? state.activeTabId : null;
-		for (const session of toAdopt.reverse()) {
-			focusOrAddTerminalPane(store, session.terminalId, { focus: false });
-		}
-		if (restoreActiveTabId) {
-			store.getState().setActiveTab(restoreActiveTabId);
-		}
+		adoptTerminalPanes(
+			store,
+			toAdopt.reverse().map((session) => session.terminalId),
+		);
 		logStressEvent("background-terminals.auto-adopt", {
 			count: toAdopt.length,
 			workspaceId,

apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/utils/adoptTerminalPanes/adoptTerminalPanes.test.ts

@@ -0,0 +1,44 @@
+import { describe, expect, it } from "bun:test";
+import { createWorkspaceStore } from "@superset/panes";
+import type { PaneViewerData } from "../../types";
+import { adoptTerminalPanes } from "./adoptTerminalPanes";
+
+function tabTerminalIds(store: ReturnType<typeof emptyStore>) {
+	return store
+		.getState()
+		.tabs.map(
+			(tab) =>
+				(Object.values(tab.panes)[0]?.data as { terminalId: string })
+					.terminalId,
+		);
+}
+
+function activeTerminalId(store: ReturnType<typeof emptyStore>) {
+	const state = store.getState();
+	const tab = state.tabs.find((t) => t.id === state.activeTabId);
+	return (Object.values(tab?.panes ?? {})[0]?.data as { terminalId: string })
+		?.terminalId;
+}
+
+function emptyStore() {
+	return createWorkspaceStore<PaneViewerData>({
+		initialState: { version: 1, tabs: [], activeTabId: null },
+	});
+}
+
+describe("adoptTerminalPanes", () => {
+	it("selects the oldest terminal when the layout was empty", () => {
+		const store = emptyStore();
+		adoptTerminalPanes(store, ["agent", "setup"]);
+		expect(tabTerminalIds(store)).toEqual(["agent", "setup"]);
+		expect(activeTerminalId(store)).toBe("agent");
+	});
+
+	it("keeps the tab the user already had selected", () => {
+		const store = emptyStore();
+		adoptTerminalPanes(store, ["existing"]);
+		adoptTerminalPanes(store, ["agent", "setup"]);
+		expect(tabTerminalIds(store)).toEqual(["existing", "agent", "setup"]);
+		expect(activeTerminalId(store)).toBe("existing");
+	});
+});

apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/utils/adoptTerminalPanes/adoptTerminalPanes.ts

@@ -0,0 +1,31 @@
+import type { WorkspaceStore } from "@superset/panes";
+import type { StoreApi } from "zustand/vanilla";
+import type { PaneViewerData } from "../../types";
+import {
+	findTerminalPaneLocation,
+	focusOrAddTerminalPane,
+} from "../focusTerminalPane";
+
+/**
+ * Give each terminal a tab, oldest first, without moving the selection off a
+ * tab the user already has. In an empty layout the oldest terminal is
+ * selected: the host starts an independent agent before the setup terminal.
+ */
+export function adoptTerminalPanes(
+	store: StoreApi<WorkspaceStore<PaneViewerData>>,
+	oldestFirstTerminalIds: readonly string[],
+): void {
+	const [firstTerminalId] = oldestFirstTerminalIds;
+	if (firstTerminalId === undefined) return;
+
+	const previousActiveTabId = store.getState().activeTabId;
+	for (const terminalId of oldestFirstTerminalIds) {
+		focusOrAddTerminalPane(store, terminalId, { focus: false });
+	}
+
+	const state = store.getState();
+	const selectedTabId =
+		previousActiveTabId ??
+		findTerminalPaneLocation(state, firstTerminalId)?.tabId;
+	if (selectedTabId) state.setActiveTab(selectedTabId);
+}

apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/utils/adoptTerminalPanes/index.ts

@@ -0,0 +1 @@
+export { adoptTerminalPanes } from "./adoptTerminalPanes";