Merge remote-tracking branch 'origin/v2/main' into 1579-wave-1

# Conflicts:
#	AGENTS.md
#	clients/cli/README.md
#	clients/web/src/App.test.tsx
#	clients/web/src/App.tsx
#	clients/web/src/test/core/auth/utils.test.ts
#	core/mcp/node/transport.ts
#	test-servers/src/composable-test-server.ts

clients/web/src/components/screens/screenUiState.ts

@@ -62,3 +62,15 @@ export const EMPTY_NETWORK_UI: NetworkUiState = {
   filterText: "",
   visibleCategories: ALL_CATEGORIES_VISIBLE,
 };
+
+/** Registry for OAuth resume snapshot restore (data-only; setters live in App). */
+export const TAB_UI_REGISTRY = {
+  Apps: { empty: EMPTY_APPS_UI },
+  Tools: { empty: EMPTY_TOOLS_UI },
+  Prompts: { empty: EMPTY_PROMPTS_UI },
+  Resources: { empty: EMPTY_RESOURCES_UI },
+  Tasks: { empty: EMPTY_TASKS_UI },
+  Logs: { empty: EMPTY_LOGS_UI },
+  History: { empty: EMPTY_HISTORY_UI },
+  Network: { empty: EMPTY_NETWORK_UI },
+} as const;