refactor(ui): name workspace surfaces

packages/ui/src/components/comments/useInlineCommentController.ts

@@ -12,7 +12,6 @@ import { useI18n } from '@/lib/i18n';
 import { useEffectiveDirectory } from '@/hooks/useEffectiveDirectory';
 import { getRuntimeKey } from '@/lib/runtime-switch';
 import { focusChatInput } from '@/components/chat/composer/editor/dom';
-import { useUIStore } from '@/stores/useUIStore';
 
 type LineRangeBase = {
   start: number;
@@ -164,7 +163,6 @@ export function useInlineCommentController<TRange extends LineRangeBase>(
 
     reset();
     if (isNewComment) {
-      useUIStore.getState().setActiveMainTab('chat');
       requestAnimationFrame(focusChatInput);
     }
   }, [addDraft, editingDraftId, fileLabel, getCodeForRange, language, reset, selection, source, t, target, toStoreRange, updateDraft]);

packages/ui/src/components/layout/MainLayout.tsx

@@ -45,7 +45,7 @@ const SettingsWindow = lazyWithChunkRecovery(() => import('@/components/views/Se
 
 export const MainLayout: React.FC = () => {
     const isSidebarOpen = useUIStore((state) => state.isSidebarOpen);
-    const activeMainTab = useUIStore((state) => state.activeMainTab);
+    const activeSurface = useUIStore((state) => state.activeSurface);
     const setIsMobile = useUIStore((state) => state.setIsMobile);
     const isSessionSwitcherOpen = useUIStore((state) => state.isSessionSwitcherOpen);
     const isSettingsDialogOpen = useUIStore((state) => state.isSettingsDialogOpen);
@@ -83,7 +83,7 @@ export const MainLayout: React.FC = () => {
             if (sessionSelected || draftOpened) closeSurfacePages();
         });
         const unsubscribeTab = useUIStore.subscribe((state, prev) => {
-            if (state.activeMainTab !== prev.activeMainTab) closeSurfacePages();
+            if (state.activeSurface !== prev.activeSurface) closeSurfacePages();
         });
         return () => {
             unsubscribeSession();
@@ -195,7 +195,7 @@ export const MainLayout: React.FC = () => {
     }, [isMobile, setMobileSessionPanelOpen]);
 
     useEffect(() => {
-        if (!isMobile || activeMainTab !== 'chat' || mobileLeftDrawerOpen || mobileRightSidebarOpen || isSettingsDialogOpen) {
+        if (!isMobile || activeSurface !== 'chat' || mobileLeftDrawerOpen || mobileRightSidebarOpen || isSettingsDialogOpen) {
             return;
         }
 
@@ -231,7 +231,7 @@ export const MainLayout: React.FC = () => {
                 window.clearTimeout(timeoutId);
             }
         };
-    }, [activeMainTab, isMobile, isSettingsDialogOpen, mobileLeftDrawerOpen, mobileRightSidebarOpen]);
+    }, [activeSurface, isMobile, isSettingsDialogOpen, mobileLeftDrawerOpen, mobileRightSidebarOpen]);
 
     // Ensure mobile drawers are closed when opening full-screen settings
     useEffect(() => {
@@ -263,10 +263,10 @@ export const MainLayout: React.FC = () => {
         // Desktop surfaces live in the context panel; the only full-view
         // overlays left there are the terminal (promoted by project actions)
         // and the diagram viewer. Mobile keeps the full tab set.
-        if (!isMobile && activeMainTab !== 'terminal' && activeMainTab !== 'diagram') {
+        if (!isMobile && activeSurface !== 'terminal' && activeSurface !== 'diagram') {
             return null;
         }
-        switch (activeMainTab) {
+        switch (activeSurface) {
             case 'plan':
                 return <React.Suspense fallback={null}><PlanView /></React.Suspense>;
             case 'git':
@@ -284,9 +284,9 @@ export const MainLayout: React.FC = () => {
             default:
                 return null;
         }
-    }, [activeMainTab, isMobile, mobileRightSidebarOpen]);
+    }, [activeSurface, isMobile, mobileRightSidebarOpen]);
 
-    const isChatActive = activeMainTab === 'chat';
+    const isChatActive = activeSurface === 'chat';
 
     return (
         <DiffWorkerProvider>

packages/ui/src/components/views/TerminalView.tsx

@@ -147,8 +147,8 @@ export const TerminalView: React.FC<TerminalViewProps> = ({ visible }) => {
         terminalControllerRef.current?.focus();
     }, [useTouchTerminalInput]);
 
-    const activeMainTab = useUIStore((state) => state.activeMainTab);
-    const isTerminalActive = activeMainTab === 'terminal';
+    const activeSurface = useUIStore((state) => state.activeSurface);
+    const isTerminalActive = activeSurface === 'terminal';
     const isTerminalVisible = visible ?? isTerminalActive;
     const [hasOpenedTerminalViewport, setHasOpenedTerminalViewport] = React.useState(isTerminalVisible);