fix(sessions): route new sessions to the correct project when server omits directory (#1637, #2270)

[bashrusakh]

Summary

Fixes two related bugs where a newly created session is grouped under the wrong project when the server response omits the directory field.

Issues

• [Bug] openchamber/openchamber#1637 — Clicking + on one project creates a session grouped under a different project.
• [Bug] New sessions from nested Git projects target a sibling child project openchamber/openchamber#2270 — New sessions from nested Git projects target a sibling child project instead of the selected child.

Both reports describe the same root cause: createSession() passes the server response's directory field to setCurrentSession as directoryHint. When the server response omits the field, directoryHint is null and setCurrentSession falls back to opencodeClient.getDirectory(), which can hold a stale directory from a different project.

Root cause

// Before
const session = await opencodeClient.createSession({...}, directoryOverride ?? dir())
const sessionDirectory = (session as { directory?: string | null }).directory ?? null
useSessionUIStore.getState().setCurrentSession(session.id, sessionDirectory)

When the server returns a session without a directory field, sessionDirectory is null. setCurrentSession then falls back to opencodeClient.getDirectory(), which can be stale.

Fix

Capture the effective directory passed to the SDK and reuse it as the fallback for the server response:

// After
const effectiveDirectory = directoryOverride ?? dir()
const session = await opencodeClient.createSession({...}, effectiveDirectory)
const sessionDirectory = (session as { directory?: string | null }).directory ?? effectiveDirectory ?? null
useSessionUIStore.getState().setCurrentSession(session.id, sessionDirectory)

This guarantees setCurrentSession and registerSessionDirectory always see the directory the user explicitly selected for the new session, even when the server response omits the field.

Changed files

• packages/ui/src/sync/session-actions.ts — 2-line fix in createSession
• packages/ui/src/sync/__tests__/issue-1637-2270.test.ts — 7 regression tests covering both reported topologies plus preservation paths

Fix level

Shared, root-level. The bug is in the common session creation path used by all callers. The same fix resolves both openchamber#1637 and openchamber#2270.

Test coverage

Scenario	Expected behavior
directoryOverride set, server omits directory	setCurrentSession receives directoryOverride
directoryOverride set, server returns directory	setCurrentSession receives server's value (server wins)
No directoryOverride, server omits directory	setCurrentSession receives null (preserved)
No directoryOverride, server returns directory	setCurrentSession receives server's value
Nested Git projects (openchamber#2270)	Child project directory is used, not parent or sibling
registerSessionDirectory with override	Routing index uses effective directory
registerSessionDirectory with server response	Routing index uses server's authoritative value

Verification

• bun test packages/ui/src/sync/__tests__/issue-1637-2270.test.ts — 7 pass, 0 fail
• bun run type-check — all packages pass
• bun run lint — all packages pass

Out of scope (intentionally)

• The partial fix on fix/2257-text-selection-menu-y (commit fac3c7f48) that adds selectedProjectId to openNewSessionDraft options is not needed for this fix — the root cause is in createSession, not in the draft opener.
• setCurrentSession's fallback chain is correct as-is; the problem was that createSession was not passing the right hint.
• worktreeSessionCreator.ts already passes both selectedProjectId and directoryOverride, so no changes needed there.

[coderabbitai]

Important

Review skipped

Draft detected.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: b94c637f-3e50-4924-a72d-54bb54795c67

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch fix/1637-2270-session-routing

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}