diff --git a/packages/ui/src/stores/sessionStore.ts b/packages/ui/src/stores/sessionStore.ts index 33d9d19c..d9e21c71 100644 --- a/packages/ui/src/stores/sessionStore.ts +++ b/packages/ui/src/stores/sessionStore.ts @@ -273,7 +273,14 @@ export const useSessionStore = create()( const worktreeRoot = `${normalizedProject}/${WORKTREE_ROOT}`; try { const candidates = new Set(); - if (worktreeRoot) { + + // Check if .openchamber directory exists before trying to list it + const projectEntries = await opencodeClient.listLocalDirectory(normalizedProject); + const worktreeDirExists = projectEntries.some( + (entry) => entry.isDirectory && entry.name === WORKTREE_ROOT + ); + + if (worktreeDirExists) { const entries = await opencodeClient.listLocalDirectory(worktreeRoot); entries .filter((entry) => entry.isDirectory)