feat: introduce useEffectiveDirectory hook and adopt across views (#226)

Add a centralized useEffectiveDirectory hook to resolve the active directory
Use the hook across DiffView, FilesView, GitView, and TerminalView
Fix list styling by rendering ul/ol bullets outside

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

@@ -1,9 +1,8 @@
 import React from 'react';
 import { RiArrowDownSLine, RiArrowRightSLine, RiGitCommitLine, RiLoader4Line, RiTextWrap } from '@remixicon/react';
 
-import { useSessionStore } from '@/stores/useSessionStore';
-import { useDirectoryStore } from '@/stores/useDirectoryStore';
 import { useUIStore } from '@/stores/useUIStore';
+import { useEffectiveDirectory } from '@/hooks/useEffectiveDirectory';
 import { useGitStore, useGitStatus, useIsGitRepo, useGitFileCount } from '@/stores/useGitStore';
 import { cn } from '@/lib/utils';
 import type { GitStatus } from '@/lib/api/types';
@@ -793,17 +792,6 @@ const MultiFileDiffEntry = React.memo<MultiFileDiffEntryProps>(({
     );
 });
 
-const useEffectiveDirectory = () => {
-    const { currentSessionId, sessions, worktreeMetadata: worktreeMap } = useSessionStore();
-    const { currentDirectory: fallbackDirectory } = useDirectoryStore();
-
-    const worktreeMetadata = currentSessionId ? worktreeMap.get(currentSessionId) ?? undefined : undefined;
-    const currentSession = sessions.find((session) => session.id === currentSessionId);
-    const sessionDirectory = (currentSession as Record<string, unknown>)?.directory as string | undefined;
-
-    return worktreeMetadata?.path ?? sessionDirectory ?? fallbackDirectory ?? undefined;
-};
-
 export const DiffView: React.FC = () => {
     const { git } = useRuntimeAPIs();
     const effectiveDirectory = useEffectiveDirectory();
@@ -1246,13 +1234,7 @@ export const DiffView: React.FC = () => {
 // eslint-disable-next-line react-refresh/only-export-components
 export const useDiffFileCount = (): number => {
     const { git } = useRuntimeAPIs();
-    const { currentSessionId, sessions, worktreeMetadata: worktreeMap } = useSessionStore();
-    const { currentDirectory: fallbackDirectory } = useDirectoryStore();
-
-    const worktreeMetadata = currentSessionId ? worktreeMap.get(currentSessionId) ?? undefined : undefined;
-    const currentSession = sessions.find((session) => session.id === currentSessionId);
-    const sessionDirectory = (currentSession as Record<string, unknown>)?.directory as string | undefined;
-    const effectiveDirectory = worktreeMetadata?.path ?? sessionDirectory ?? fallbackDirectory ?? undefined;
+    const effectiveDirectory = useEffectiveDirectory();
 
     const { setActiveDirectory, fetchStatus } = useGitStore();
     const fileCount = useGitFileCount(effectiveDirectory ?? null);

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

@@ -63,11 +63,11 @@ import { useSessionStore } from '@/stores/useSessionStore';
 import { useConfigStore } from '@/stores/useConfigStore';
 import { useContextStore } from '@/stores/contextStore';
 import { useUIStore } from '@/stores/useUIStore';
-import { useDirectoryStore } from '@/stores/useDirectoryStore';
 import { opencodeClient } from '@/lib/opencode/client';
 import { useDirectoryShowHidden } from '@/lib/directoryShowHidden';
 import { useFilesViewShowGitignored } from '@/lib/filesViewShowGitignored';
 import { ErrorBoundary } from '@/components/ui/ErrorBoundary';
+import { useEffectiveDirectory } from '@/hooks/useEffectiveDirectory';
 
 type FileNode = {
   name: string;
@@ -101,18 +101,6 @@ const shouldIgnorePath = (path: string): boolean => {
   return normalized === 'node_modules' || normalized.endsWith('/node_modules') || normalized.includes('/node_modules/');
 };
 
-const useEffectiveDirectory = () => {
-  const { currentSessionId, sessions, worktreeMetadata: worktreeMap } = useSessionStore();
-  const { currentDirectory: fallbackDirectory } = useDirectoryStore();
-
-  const worktreeMetadata = currentSessionId ? worktreeMap.get(currentSessionId) ?? undefined : undefined;
-  const currentSession = sessions.find((session) => session.id === currentSessionId);
-  type SessionWithDirectory = { directory?: string };
-  const sessionDirectory = (currentSession as unknown as SessionWithDirectory | undefined)?.directory;
-
-  return worktreeMetadata?.path ?? sessionDirectory ?? fallbackDirectory ?? '';
-};
-
 const MAX_VIEW_CHARS = 200_000;
 
 const CODE_EXTENSIONS = new Set([
@@ -263,7 +251,7 @@ export const FilesView: React.FC = () => {
   const showHidden = useDirectoryShowHidden();
   const showGitignored = useFilesViewShowGitignored();
 
-  const currentDirectory = useEffectiveDirectory();
+  const currentDirectory = useEffectiveDirectory() ?? '';
   const root = normalizePath(currentDirectory);
   const searchFiles = useFileSearchStore((state) => state.searchFiles);
 

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

@@ -4,8 +4,8 @@ import { useConfigStore } from '@/stores/useConfigStore';
 import { useFireworksCelebration } from '@/contexts/FireworksContext';
 import type { GitIdentityProfile, CommitFileEntry } from '@/lib/api/types';
 import { useGitIdentitiesStore } from '@/stores/useGitIdentitiesStore';
-import { useDirectoryStore } from '@/stores/useDirectoryStore';
 import { useProjectsStore } from '@/stores/useProjectsStore';
+import { useEffectiveDirectory } from '@/hooks/useEffectiveDirectory';
 import {
   useGitStore,
   useGitStatus,
@@ -31,7 +31,7 @@ import {
   CommandItem,
   CommandList,
 } from '@/components/ui/command';
-import type { Session } from '@opencode-ai/sdk/v2';
+
 import { useRuntimeAPIs } from '@/hooks/useRuntimeAPIs';
 import { useUIStore } from '@/stores/useUIStore';
 
@@ -182,22 +182,6 @@ const matchGitmojiFromSubject = (subject: string, gitmojis: GitmojiEntry[]): Git
 
 const gitViewSnapshots = new Map<string, GitViewSnapshot>();
 
-const useEffectiveDirectory = () => {
-  const { currentSessionId, sessions, worktreeMetadata: worktreeMap } = useSessionStore();
-  const { currentDirectory: fallbackDirectory } = useDirectoryStore();
-
-  const worktreeMetadata = currentSessionId
-    ? worktreeMap.get(currentSessionId) ?? undefined
-    : undefined;
-  const currentSession = sessions.find((session) => session.id === currentSessionId);
-  type SessionWithDirectory = Session & { directory?: string };
-  const sessionDirectory: string | undefined = (
-    currentSession as SessionWithDirectory | undefined
-  )?.directory;
-
-  return worktreeMetadata?.path ?? sessionDirectory ?? fallbackDirectory ?? undefined;
-};
-
 export const GitView: React.FC = () => {
   const { git } = useRuntimeAPIs();
   const currentDirectory = useEffectiveDirectory();

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

@@ -4,6 +4,7 @@ import { RiAlertLine, RiArrowDownLine, RiArrowGoBackLine, RiArrowLeftLine, RiArr
 import { useSessionStore } from '@/stores/useSessionStore';
 import { useDirectoryStore } from '@/stores/useDirectoryStore';
 import { useTerminalStore } from '@/stores/useTerminalStore';
+import { useEffectiveDirectory } from '@/hooks/useEffectiveDirectory';
 import { type TerminalStreamEvent } from '@/lib/api/types';
 import { useThemeSystem } from '@/contexts/useThemeSystem';
 import { useFontPreferences } from '@/hooks/useFontPreferences';
@@ -79,23 +80,11 @@ export const TerminalView: React.FC = () => {
     const { monoFont } = useFontPreferences();
     const { isMobile, hasTouchInput } = useDeviceInfo();
 
-    const { currentSessionId, sessions, worktreeMetadata: worktreeMap } = useSessionStore();
-    const worktreeMetadata = currentSessionId ? worktreeMap.get(currentSessionId) ?? undefined : undefined;
+    const { currentSessionId, newSessionDraft } = useSessionStore();
+    const hasActiveContext = currentSessionId !== null || newSessionDraft?.open === true;
 
-    const sessionDirectory = React.useMemo(() => {
-        if (worktreeMetadata?.path) {
-            return worktreeMetadata.path;
-        }
-        if (!currentSessionId) return null;
-        const entry = sessions.find((session) => session.id === currentSessionId);
-        const directory = typeof (entry as { directory?: string } | undefined)?.directory === 'string'
-            ? (entry as { directory?: string }).directory
-            : null;
-        return directory && directory.length > 0 ? directory : null;
-    }, [currentSessionId, sessions, worktreeMetadata]);
-
-    const { currentDirectory: fallbackDirectory, homeDirectory } = useDirectoryStore();
-    const effectiveDirectory = sessionDirectory || fallbackDirectory || null;
+    const effectiveDirectory = useEffectiveDirectory() ?? null;
+    const { homeDirectory } = useDirectoryStore();
 
     const displayDirectory = React.useMemo(() => {
         if (!effectiveDirectory) return '';
@@ -269,7 +258,7 @@ export const TerminalView: React.FC = () => {
 
         if (!effectiveDirectory) {
             setConnectionError(
-                currentSessionId
+                hasActiveContext
                     ? 'No working directory available for terminal.'
                     : 'Select a session to open the terminal.'
             );
@@ -328,7 +317,7 @@ export const TerminalView: React.FC = () => {
             disconnectStream();
         };
     }, [
-        currentSessionId,
+        hasActiveContext,
         effectiveDirectory,
         terminalSessionId,
         removeTerminalSession,
@@ -645,7 +634,7 @@ export const TerminalView: React.FC = () => {
                 ? <RiCircleLine size={20} className="text-amber-400 animate-pulse" />
                 : <RiCircleLine size={20} className="text-muted-foreground" />;
 
-    if (!currentSessionId) {
+    if (!hasActiveContext) {
         return (
             <div className="flex h-full items-center justify-center p-4 text-center text-sm text-muted-foreground">
                 Select a session to open the terminal