)
return (
@@ -240,7 +243,9 @@ export function SettingsShell({ children }: SettingsShellProps) {
{/* Desktop sidebar */}
{!isMobile && (
-
+
)}
{/* Mobile navigation Sheet */}
diff --git a/src/components/tabs/tab-item.tsx b/src/components/tabs/tab-item.tsx
index ffb871f3e..a30ec301c 100644
--- a/src/components/tabs/tab-item.tsx
+++ b/src/components/tabs/tab-item.tsx
@@ -4,7 +4,7 @@ import { memo, useCallback, useMemo, useRef } from "react"
import { Reorder } from "motion/react"
import { X } from "lucide-react"
import { useTranslations } from "next-intl"
-import { cn } from "@/lib/utils"
+import { cn, handleMiddleClickClose } from "@/lib/utils"
import type { ConversationStatus } from "@/lib/types"
import { ConversationStatusDot } from "@/components/conversations/conversation-status-dot"
import {
@@ -126,6 +126,7 @@ export const TabItem = memo(function TabItem({
aria-selected={isActive}
onClick={handleClick}
onDoubleClick={handleDoubleClick}
+ onMouseDown={(event) => handleMiddleClickClose(event, handleClose)}
className={cn(
"group/tab relative flex items-center h-full gap-1.5 px-3 text-xs rounded-full",
"cursor-pointer select-none shrink-0",
diff --git a/src/components/terminal/terminal-tab-bar.tsx b/src/components/terminal/terminal-tab-bar.tsx
index d3ccc2c4f..d2a07d879 100644
--- a/src/components/terminal/terminal-tab-bar.tsx
+++ b/src/components/terminal/terminal-tab-bar.tsx
@@ -9,6 +9,7 @@ import { useTerminalContext } from "@/contexts/terminal-context"
import { useShortcutSettings } from "@/hooks/use-shortcut-settings"
import { useIsMac } from "@/hooks/use-is-mac"
import { formatShortcutLabel } from "@/lib/keyboard-shortcuts"
+import { handleMiddleClickClose } from "@/lib/utils"
import { Button } from "@/components/ui/button"
import {
ContextMenu,
@@ -79,6 +80,10 @@ export function TerminalTabBar() {
: "text-muted-foreground hover:text-foreground hover:bg-muted"
}`}
onClick={() => switchTerminal(tab.id)}
+ onMouseDown={(event) => {
+ if (editingId === tab.id) return
+ handleMiddleClickClose(event, () => closeTerminal(tab.id))
+ }}
title={`${folderIndex.get(tab.folderId) ?? String(tab.folderId)} — ${tab.title}`}
>
{editingId === tab.id ? (
diff --git a/src/contexts/aux-panel-context.tsx b/src/contexts/aux-panel-context.tsx
index 6c2991398..9cd965190 100644
--- a/src/contexts/aux-panel-context.tsx
+++ b/src/contexts/aux-panel-context.tsx
@@ -32,6 +32,8 @@ interface AuxPanelContextValue {
maxWidth: number
activeTab: AuxPanelTab
toggle: () => void
+ /** Imperatively set the panel open/closed (used by the chat-mode auto-hide). */
+ setOpen: (open: boolean) => void
setWidth: (w: number) => void
setActiveTab: (tab: AuxPanelTab) => void
openTab: (tab: AuxPanelTab) => void
@@ -71,6 +73,8 @@ export function AuxPanelProvider({ children }: AuxPanelProviderProps) {
const toggle = useCallback(() => setIsOpen((prev) => !prev), [])
+ const setOpen = useCallback((open: boolean) => setIsOpen(open), [])
+
const setWidth = useCallback((w: number) => {
setWidthState(clampWidth(w))
}, [])
@@ -123,6 +127,7 @@ export function AuxPanelProvider({ children }: AuxPanelProviderProps) {
maxWidth: MAX_WIDTH,
activeTab,
toggle,
+ setOpen,
setWidth,
setActiveTab,
openTab,
@@ -136,6 +141,7 @@ export function AuxPanelProvider({ children }: AuxPanelProviderProps) {
width,
activeTab,
toggle,
+ setOpen,
setWidth,
openTab,
pendingRevealPath,
diff --git a/src/contexts/tab-context.test.tsx b/src/contexts/tab-context.test.tsx
index fe14c9819..e95f7148b 100644
--- a/src/contexts/tab-context.test.tsx
+++ b/src/contexts/tab-context.test.tsx
@@ -45,6 +45,7 @@ vi.mock("@/contexts/app-workspace-context", () => ({
useAppWorkspace: () => ({
conversations: conversationsMock,
folders: foldersMock,
+ allFolders: allFoldersMock,
foldersHydrated: true,
setActiveFolderId: setActiveFolderIdMock,
}),
@@ -80,6 +81,7 @@ const defaultFoldersMock: FolderDetail[] = [
sort_order: 0,
color: "blue",
parent_id: null,
+ is_chat: false,
},
{
id: 2,
@@ -91,10 +93,14 @@ const defaultFoldersMock: FolderDetail[] = [
sort_order: 1,
color: "green",
parent_id: null,
+ is_chat: false,
},
]
let foldersMock: FolderDetail[] = defaultFoldersMock
+// `allFolders` includes hidden chat folders that the user-facing `folders` list
+// excludes; defaults to the same set (no chat folders) for most tests.
+let allFoldersMock: FolderDetail[] = defaultFoldersMock
const conversationsMock: DbConversationSummary[] = [
{
@@ -190,6 +196,7 @@ describe("TabProvider tab state transitions", () => {
beforeEach(() => {
vi.clearAllMocks()
foldersMock = defaultFoldersMock
+ allFoldersMock = defaultFoldersMock
listOpenedTabsMock.mockReturnValue(new Promise(() => {}))
saveOpenedTabsMock.mockResolvedValue({
accepted: true,
@@ -343,6 +350,72 @@ describe("TabProvider tab state transitions", () => {
expect(screen.getByTestId("active")).toHaveTextContent(tabsText)
})
+ it("redirects a new-conversation action targeting a hidden chat folder to chat mode", () => {
+ // The open-folder list (`folders`) excludes chat folders after refetch, but
+ // `allFolders` keeps them — chat detection must read `allFolders`, else a
+ // "new conversation" from an active chat conversation would pile a normal
+ // draft onto the hidden per-conversation chat folder.
+ const chatFolder: FolderDetail = {
+ id: 42,
+ name: "Chat",
+ path: "/data/chat-sessions/x",
+ git_branch: null,
+ default_agent_type: null,
+ last_opened_at: "2026-06-11T00:00:00Z",
+ sort_order: 99,
+ color: "inherit",
+ parent_id: null,
+ is_chat: true,
+ }
+ foldersMock = defaultFoldersMock
+ allFoldersMock = [...defaultFoldersMock, chatFolder]
+ renderTabs()
+ expect(latestContext).not.toBeNull()
+
+ act(() => {
+ latestContext?.openNewConversationTab(42, "/data/chat-sessions/x")
+ })
+
+ const activeId = latestContext?.activeTabId ?? ""
+ const draft = latestContext?.tabs.find((t) => t.id === activeId)
+ expect(activeId).toMatch(/^new-/)
+ expect(draft?.isChat).toBe(true)
+ expect(draft?.folderId).toBe(0)
+ })
+
+ it("seeds a non-chat replacement draft when closing a bound chat tab whose folder is filtered from the open list", () => {
+ const chatFolder: FolderDetail = {
+ id: 42,
+ name: "Chat",
+ path: "/data/chat-sessions/x",
+ git_branch: null,
+ default_agent_type: null,
+ last_opened_at: "2026-06-11T00:00:00Z",
+ sort_order: 99,
+ color: "inherit",
+ parent_id: null,
+ is_chat: true,
+ }
+ foldersMock = defaultFoldersMock // open list excludes the chat folder
+ allFoldersMock = [...defaultFoldersMock, chatFolder]
+ renderTabs()
+ expect(latestContext).not.toBeNull()
+
+ act(() => {
+ latestContext?.openTab(42, 5, "codex", true, "chat conversation")
+ })
+ act(() => {
+ latestContext?.closeTab("conv-42-codex-5")
+ })
+
+ const replId = latestContext?.activeTabId ?? ""
+ const repl = latestContext?.tabs.find((t) => t.id === replId)
+ expect(replId).toMatch(/^new-/)
+ expect(repl?.conversationId).toBeNull()
+ expect(repl?.folderId).not.toBe(42)
+ expect(repl?.isChat ?? false).toBe(false)
+ })
+
it("retargets the replacement draft when reopening a closed draft for another folder in the same batch", async () => {
renderTabs()
@@ -482,6 +555,7 @@ describe("TabProvider cross-client sync", () => {
beforeEach(() => {
vi.clearAllMocks()
foldersMock = defaultFoldersMock
+ allFoldersMock = defaultFoldersMock
listOpenedTabsMock.mockResolvedValue({ items: [], version: 0 })
saveOpenedTabsMock.mockResolvedValue({
accepted: true,
@@ -520,6 +594,37 @@ describe("TabProvider cross-client sync", () => {
expect(screen.getByTestId("tabs")).toHaveTextContent("conv-1-codex-1")
})
+ it("preserves an active chat-mode draft across an inbound remote snapshot", async () => {
+ await renderHydrated()
+ expect(tabsChangedHandler).not.toBeNull()
+
+ // Enter folderless chat mode → a device-local chat draft (folderId 0).
+ act(() => {
+ latestContext?.openChatModeTab()
+ })
+ const chatDraftId = latestContext?.activeTabId ?? ""
+ expect(chatDraftId).toMatch(/^new-/)
+ expect(latestContext?.tabs.find((t) => t.id === chatDraftId)?.isChat).toBe(
+ true
+ )
+
+ // A remote snapshot arrives. The chat draft's folderId 0 is in no folder
+ // list, so it must be preserved by its `isChat` flag — never silently
+ // dropped — keeping the user on their unsent folderless draft.
+ act(() => {
+ tabsChangedHandler?.({
+ version: 1,
+ origin: "other-device",
+ tabs: [tabItem(1, 1)],
+ })
+ })
+
+ const draft = latestContext?.tabs.find((t) => t.id === chatDraftId)
+ expect(draft).toBeDefined()
+ expect(draft?.isChat).toBe(true)
+ expect(draft?.conversationId).toBeNull()
+ })
+
it("does not save when applying a remote snapshot (no echo back)", async () => {
await renderHydrated()
saveOpenedTabsMock.mockClear()
diff --git a/src/contexts/tab-context.tsx b/src/contexts/tab-context.tsx
index 6b5f83f97..401bbba85 100644
--- a/src/contexts/tab-context.tsx
+++ b/src/contexts/tab-context.tsx
@@ -55,6 +55,16 @@ interface TabItemInternal {
* runs (e.g. `acpListAgents()` keeps failing).
*/
agentTypeProvisional?: boolean
+ /**
+ * Marks a draft tab as "chat mode" (folderless). Set by `openChatModeTab`,
+ * cleared implicitly once the draft binds to a real conversation (whose hidden
+ * `is_chat` folder then drives chat-mode chrome via `useIsActiveChatMode`).
+ * **Internal-only and never persisted** — drafts (`conversationId == null`) are
+ * not written to opened_tabs, so this flag only ever lives in memory for the
+ * pre-send draft. While set, the draft has no resolvable folder, so the
+ * composer hides the branch picker and shows the "no-folder" chip.
+ */
+ isChat?: boolean
}
export type TabItem = TabItemInternal
@@ -111,6 +121,25 @@ interface TabContextValue {
folderDefaultAgent?: AgentType | null
}
) => void
+ /**
+ * Re-target the singleton draft tab into folderless "chat mode" — no DB write
+ * and no working dir yet (the backend creates the dated scratch dir + hidden
+ * `is_chat` folder lazily on first send, in `createChatConversation`). Sets
+ * the draft's `isChat` flag, drops its `workingDir`, and disconnects any live
+ * ACP session bound to the draft (its cwd is about to change). Wired from the
+ * composer folder picker's "no-folder mode" item.
+ */
+ openChatModeTab: () => void
+ /**
+ * Attach an eagerly-created scratch dir to a chat-mode draft so its ACP
+ * connection can spawn at a real cwd *before* the first send. Patches the
+ * draft's `workingDir` only while it is still an unbound chat draft
+ * (`isChat && conversationId == null`); `folderId` stays 0 (no DB row yet, so
+ * `activeFolder` resolves null until the lazy create binds the hidden folder).
+ * A stale call (the draft already bound, retargeted, or left chat mode) is a
+ * no-op. Wired from conversation-detail-panel's eager-prepare effect.
+ */
+ setChatDraftWorkingDir: (tabId: string, workingDir: string) => void
/**
* Mark a draft tab's agent as user-confirmed. Patches `agentType` on
* the tab and clears the `agentTypeProvisional` flag so the correction
@@ -134,7 +163,16 @@ interface TabContextValue {
conversationId: number,
agentType: AgentType,
title: string,
- runtimeConversationId?: number
+ runtimeConversationId?: number,
+ /**
+ * When a chat-mode draft binds, the backend has just created its hidden
+ * `is_chat` folder; pass the new `folderId`/`workingDir` so the tab points at
+ * the real per-conversation scratch dir (cwd) and `activeFolderId` syncs to
+ * the hidden folder (which drives chat-mode chrome). Omit for normal binds —
+ * the tab keeps its existing folder.
+ */
+ folderId?: number,
+ workingDir?: string
) => void
setTabRuntimeConversationId: (
tabId: string,
@@ -237,8 +275,13 @@ function buildPersistItems(
export function TabProvider({ children }: TabProviderProps) {
const t = useTranslations("Folder.tabContext")
const { activateConversationPane } = useWorkspaceContext()
- const { conversations, folders, foldersHydrated, setActiveFolderId } =
- useAppWorkspace()
+ const {
+ conversations,
+ folders,
+ allFolders,
+ foldersHydrated,
+ setActiveFolderId,
+ } = useAppWorkspace()
const { disconnect: acpDisconnect } = useAcpActions()
const [tabState, setTabState] = useState
({
@@ -318,6 +361,19 @@ export function TabProvider({ children }: TabProviderProps) {
foldersRef.current = folders
}, [folders])
+ // `allFolders` includes hidden `is_chat` folders (the user-facing `folders`
+ // list filters them out, and drops them on refetch), so chat-folder detection
+ // must read this ref — never `foldersRef`.
+ const allFoldersRef = useRef(allFolders)
+ useEffect(() => {
+ allFoldersRef.current = allFolders
+ }, [allFolders])
+
+ // Forward reference to `openChatModeTab` (defined after `openNewConversationTab`
+ // but called by it for the chat-folder redirect). Assigned at render time once
+ // the callback is created, mirroring the existing callback-ref idiom.
+ const openChatModeTabRef = useRef<() => void>(() => {})
+
// ACP agent list driven by the shared hook. `sortedTypes` reflects the
// user-defined drag-sort order (filtered to enabled+available) and is
// seeded from localStorage for synchronous cold-start use. `fresh`
@@ -449,6 +505,10 @@ export function TabProvider({ children }: TabProviderProps) {
workingDir: request.workingDir,
agentType: request.agentType,
agentTypeProvisional: request.provisional,
+ // Retargets only ever move a draft to a REAL folder (the
+ // chat-folder case is redirected to openChatModeTab), so this
+ // clears chat mode if the draft was previously a chat draft.
+ isChat: false,
}
: tab
),
@@ -732,11 +792,26 @@ export function TabProvider({ children }: TabProviderProps) {
const makeReplacementDraftTab = useCallback(
(preferred?: TabItemInternal): TabItemInternal => {
- const folderId = preferred?.folderId ?? foldersRef.current[0]?.id ?? 0
- const workingDir =
- preferred?.workingDir ??
- foldersRef.current.find((f) => f.id === folderId)?.path ??
- ""
+ // A closing chat-mode tab (its hidden `is_chat` folder, or the in-memory
+ // draft flag) must not seed the replacement draft — that folder is hidden
+ // from folder lists and has no real project cwd. Fall back to a real
+ // folder. Detection reads `allFoldersRef` (the in-memory draft flag is
+ // dropped on reload, and `foldersRef` excludes chat folders after refetch),
+ // while the fallback pool reads the user-facing `foldersRef`.
+ const preferredIsChat =
+ preferred?.isChat === true ||
+ allFoldersRef.current.find((f) => f.id === preferred?.folderId)
+ ?.is_chat === true
+ const nonChatFallbackId =
+ foldersRef.current.find((f) => !f.is_chat)?.id ?? 0
+ const folderId = preferredIsChat
+ ? nonChatFallbackId
+ : (preferred?.folderId ?? nonChatFallbackId)
+ const workingDir = preferredIsChat
+ ? (foldersRef.current.find((f) => f.id === folderId)?.path ?? "")
+ : (preferred?.workingDir ??
+ foldersRef.current.find((f) => f.id === folderId)?.path ??
+ "")
// If we have a preferred (closing) tab, inherit BOTH its agent and
// its provisional flag — we should not silently launder a system
// best-guess into a confirmed value just because the source tab was
@@ -839,12 +914,15 @@ export function TabProvider({ children }: TabProviderProps) {
}
})
- // Keep the device-local draft if its folder still exists.
+ // Keep the device-local draft if it's a folderless chat draft (its
+ // `folderId` 0 is in no folder list, so check the flag) or its real
+ // folder still exists. Never yank the user off an in-progress draft.
const localDraft = prev.rawTabs.find((tb) => tb.conversationId == null)
const nextTabs = [...remoteTabs]
if (
localDraft &&
- foldersRef.current.some((f) => f.id === localDraft.folderId)
+ (localDraft.isChat === true ||
+ foldersRef.current.some((f) => f.id === localDraft.folderId))
) {
nextTabs.push(localDraft)
}
@@ -1173,6 +1251,15 @@ export function TabProvider({ children }: TabProviderProps) {
folderDefaultAgent?: AgentType | null
}
) => {
+ // "New conversation" while a chat conversation is active resolves the
+ // active (hidden) chat folder. Never pile a second conversation into a
+ // per-conversation chat folder — its delete cleanup retires the folder and
+ // it has no real project cwd — so start a fresh folderless chat draft
+ // instead. Single choke point for every "new conversation" entry point.
+ if (allFoldersRef.current.find((f) => f.id === folderId)?.is_chat) {
+ openChatModeTabRef.current()
+ return
+ }
// Pick the agent for the new conversation via the shared resolver.
// Only inherit from the active tab when the caller opted in. The
// active tab counts as a valid inherit source if it's either:
@@ -1283,6 +1370,122 @@ export function TabProvider({ children }: TabProviderProps) {
[activateConversationPane, resolveAgentForFolder, t]
)
+ const openChatModeTab = useCallback(() => {
+ // Inherit the agent like openNewConversationTab's inherit path: keep the
+ // active tab's agent when it's a real conversation or a confirmed draft,
+ // else fall back to the global default (chat mode has no folder default).
+ const activeTab = rawTabsRef.current.find(
+ (x) => x.id === activeTabIdRef.current
+ )
+ const inherit =
+ activeTab &&
+ (activeTab.conversationId != null || !activeTab.agentTypeProvisional)
+ ? activeTab.agentType
+ : null
+ const { agentType: targetAgent, provisional } = resolveAgentForFolder(
+ 0,
+ inherit,
+ null
+ )
+
+ // Capture the existing singleton draft (if any) up front so its stale ACP
+ // session can be torn down after we flip it to chat mode.
+ const existingDraft = rawTabsRef.current.find(
+ (t) => t.conversationId == null
+ )
+ const needsDisconnect =
+ existingDraft != null &&
+ !(existingDraft.isChat && existingDraft.folderId === 0)
+
+ const tabId = makeNewConversationTabId()
+ setTabState((prevState) => {
+ const existingTab = prevState.rawTabs.find(
+ (t) => t.conversationId == null
+ )
+
+ if (!existingTab) {
+ const newTab: TabItemInternal = {
+ id: tabId,
+ kind: "conversation",
+ folderId: 0,
+ conversationId: null,
+ agentType: targetAgent,
+ title: t("newConversation"),
+ isPinned: true,
+ workingDir: undefined,
+ agentTypeProvisional: provisional,
+ isChat: true,
+ }
+ return {
+ ...prevState,
+ rawTabs: [...prevState.rawTabs, newTab],
+ activeTabId: tabId,
+ }
+ }
+
+ // Already a chat-mode draft — just focus it.
+ if (existingTab.isChat && existingTab.folderId === 0) {
+ if (prevState.activeTabId === existingTab.id) return prevState
+ return { ...prevState, activeTabId: existingTab.id }
+ }
+
+ // Existing draft on a real folder: flip it to chat mode SYNCHRONOUSLY in
+ // this same state update (folderId + isChat together), so a send issued
+ // before any async teardown can never still create/send in the old folder.
+ // Its now-stale ACP session is disconnected fire-and-forget below. The
+ // agent is re-resolved for chat mode (no folder default), so a draft still
+ // carrying its old folder's provisional default doesn't leak into chat.
+ return {
+ ...prevState,
+ activeTabId: existingTab.id,
+ rawTabs: prevState.rawTabs.map((tab) =>
+ tab.id === existingTab.id
+ ? {
+ ...tab,
+ folderId: 0,
+ workingDir: undefined,
+ isChat: true,
+ agentType: targetAgent,
+ agentTypeProvisional: provisional,
+ }
+ : tab
+ ),
+ }
+ })
+ if (needsDisconnect && existingDraft) {
+ void acpDisconnect(existingDraft.id).catch((err) => {
+ console.error("[TabProvider] disconnect chat-mode draft:", err)
+ })
+ }
+ activateConversationPane()
+ }, [acpDisconnect, activateConversationPane, resolveAgentForFolder, t])
+ // Forward reference for `openNewConversationTab`'s chat-folder redirect (the
+ // callbacks are siblings; this mirrors the codebase's callback-ref idiom).
+ openChatModeTabRef.current = openChatModeTab
+
+ const setChatDraftWorkingDir = useCallback(
+ (tabId: string, workingDir: string) => {
+ setTabs((prev) =>
+ prev.map((tab) => {
+ if (tab.id !== tabId) return tab
+ // Guard against a stale eager-prepare result landing after the draft
+ // already bound, retargeted to a real folder, or left chat mode — any
+ // of which would make this workingDir wrong. Only patch a still-unbound
+ // chat draft, and skip a redundant write to keep the reference stable.
+ if (
+ tab.conversationId != null ||
+ tab.isChat !== true ||
+ tab.workingDir === workingDir
+ ) {
+ return tab
+ }
+ return { ...tab, workingDir }
+ })
+ )
+ },
+ [setTabs]
+ )
+
const confirmDraftAgent = useCallback(
(tabId: string, agentType: AgentType) => {
setTabs((prev) =>
@@ -1320,7 +1523,9 @@ export function TabProvider({ children }: TabProviderProps) {
conversationId: number,
agentType: AgentType,
title: string,
- runtimeConversationId?: number
+ runtimeConversationId?: number,
+ folderId?: number,
+ workingDir?: string
) => {
setTabState((prevState) => {
const nextTabs = prevState.rawTabs.flatMap((tab) => {
@@ -1334,6 +1539,12 @@ export function TabProvider({ children }: TabProviderProps) {
// Bound to a real conversation now — drop the provisional
// hint so the correction effect never revisits it.
agentTypeProvisional: false,
+ // Chat-mode bind: point at the backend-created hidden `is_chat`
+ // folder and its scratch cwd. `isChat` stays set so chrome stays
+ // hidden through the brief window before the folder lands in
+ // `allFolders` (after which `activeFolder.is_chat` takes over).
+ ...(folderId != null ? { folderId } : {}),
+ ...(workingDir != null ? { workingDir } : {}),
}
return [nextTab]
}
@@ -1526,6 +1737,8 @@ export function TabProvider({ children }: TabProviderProps) {
pinTab,
toggleTileMode,
openNewConversationTab,
+ openChatModeTab,
+ setChatDraftWorkingDir,
confirmDraftAgent,
setDraftAgentFromFallback,
bindConversationTab,
@@ -1548,6 +1761,8 @@ export function TabProvider({ children }: TabProviderProps) {
pinTab,
toggleTileMode,
openNewConversationTab,
+ openChatModeTab,
+ setChatDraftWorkingDir,
confirmDraftAgent,
setDraftAgentFromFallback,
bindConversationTab,
diff --git a/src/hooks/use-connection.ts b/src/hooks/use-connection.ts
index 45b12e443..4dc546bb0 100644
--- a/src/hooks/use-connection.ts
+++ b/src/hooks/use-connection.ts
@@ -46,6 +46,10 @@ export interface UseConnectionReturn {
selectorsReady: boolean
hasCachedSelectors: boolean
sessionId: string | null
+ /** The working directory the live connection was established with (null when
+ * not connected). Lets callers detect a connection that is mid-reconnect to a
+ * different cwd and avoid acting on the stale one. */
+ connectedWorkingDir: string | null
modes: SessionModeStateInfo | null
configOptions: SessionConfigOptionInfo[] | null
availableCommands: AvailableCommandInfo[] | null
@@ -126,6 +130,7 @@ export function useConnection(contextKey: string): UseConnectionReturn {
? getCachedSelectors(connection.agentType)
: null
const hasCachedSelectors = cached !== null
+ const connectedWorkingDir = connection?.workingDir ?? null
const modes = connection?.modes ?? cached?.modes ?? null
const configOptions =
connection?.configOptions ?? cached?.configOptions ?? null
@@ -225,6 +230,7 @@ export function useConnection(contextKey: string): UseConnectionReturn {
selectorsReady,
hasCachedSelectors,
sessionId,
+ connectedWorkingDir,
modes,
configOptions,
availableCommands,
@@ -260,6 +266,7 @@ export function useConnection(contextKey: string): UseConnectionReturn {
selectorsReady,
hasCachedSelectors,
sessionId,
+ connectedWorkingDir,
modes,
configOptions,
availableCommands,
diff --git a/src/hooks/use-is-active-chat-mode.ts b/src/hooks/use-is-active-chat-mode.ts
new file mode 100644
index 000000000..dc6793137
--- /dev/null
+++ b/src/hooks/use-is-active-chat-mode.ts
@@ -0,0 +1,20 @@
+"use client"
+
+import { useActiveFolder } from "@/contexts/active-folder-context"
+import { useTabContext } from "@/contexts/tab-context"
+
+/**
+ * True when the active conversation is folderless "chat mode" — either a bound
+ * conversation whose backing folder is a hidden `is_chat` folder, or a
+ * not-yet-sent chat draft (the in-memory `isChat` tab flag). Drives hiding of
+ * folder-bound chrome — the top-bar branch selector, the aux-panel toggle, the
+ * right sidebar, and the composer branch picker — consistently from the moment
+ * "no-folder mode" is selected through first send and beyond.
+ */
+export function useIsActiveChatMode(): boolean {
+ const { activeFolder } = useActiveFolder()
+ const { tabs, activeTabId } = useTabContext()
+ if (activeFolder?.is_chat === true) return true
+ const activeTab = tabs.find((t) => t.id === activeTabId)
+ return activeTab?.isChat === true
+}
diff --git a/src/i18n/messages/ar.json b/src/i18n/messages/ar.json
index 97d4806b6..e265647e5 100644
--- a/src/i18n/messages/ar.json
+++ b/src/i18n/messages/ar.json
@@ -1001,7 +1001,10 @@
"toastOpFailed": "فشلت العملية: {message}"
},
"sectionPinned": "مثبّتة",
- "sectionFolders": "المجلدات"
+ "sectionFolders": "المجلدات",
+ "sectionChats": "محادثة",
+ "noChats": "لا توجد محادثات",
+ "newChatAction": "محادثة جديدة"
},
"conversation": {
"reloadFailed": "فشل إعادة تحميل المحادثة: {message}",
@@ -1822,6 +1825,8 @@
"autoConnectFallback": "انقر لفتح {path} وإدارة التثبيت.",
"autoConnectAppend": "{message}. انقر لفتح {path} وإدارة التثبيت.",
"enableAgentFirstPlaceholder": "فعّل وكيلًا واحدًا على الأقل قبل بدء جلسة...",
+ "prepareSessionFailed": "تعذّر تحضير جلسة الدردشة. يرجى المحاولة مرة أخرى.",
+ "createConversationFailed": "تعذّر إنشاء المحادثة. يرجى المحاولة مرة أخرى.",
"askAnythingPlaceholder": "اسأل أي شيء..."
},
"welcomePanel": {
@@ -2128,9 +2133,8 @@
},
"messageNav": {
"title": "تنقل الرسائل",
- "expand": "توسيع تنقل الرسائل",
"collapse": "طي تنقل الرسائل",
- "jumpToMessage": "الانتقال إلى: {label}",
+ "collapsedSummary": "الرسائل {count}",
"fileCount": "{count, plural, one {# ملف} other {# ملفات}}",
"remove": "إزالة",
"noDiffDataAvailable": "لا توجد بيانات diff متاحة لـ {filePath}"
@@ -2192,12 +2196,14 @@
"noFolders": "No folders",
"noBranches": "No branches",
"noBranch": "(no branch)",
+ "chatModeLabel": "وضع بدون مجلد",
"commit": "Commit",
"push": "Push",
"merge": "Merge",
"toasts": {
"folderChanged": "Switched to {name}",
"openFolderFailed": "Failed to open folder",
+ "switchedToChatMode": "تم التبديل إلى وضع المحادثة",
"openStashFailed": "Failed to open stash window",
"openMergeFailed": "Failed to open merge window"
}
diff --git a/src/i18n/messages/de.json b/src/i18n/messages/de.json
index bfadd2669..9afff4bef 100644
--- a/src/i18n/messages/de.json
+++ b/src/i18n/messages/de.json
@@ -1001,7 +1001,10 @@
"toastOpFailed": "Aktion fehlgeschlagen: {message}"
},
"sectionPinned": "Angeheftet",
- "sectionFolders": "Ordner"
+ "sectionFolders": "Ordner",
+ "sectionChats": "Chat",
+ "noChats": "Keine Chats",
+ "newChatAction": "Neuer Chat"
},
"conversation": {
"reloadFailed": "Konversation konnte nicht neu geladen werden: {message}",
@@ -1822,6 +1825,8 @@
"autoConnectFallback": "Klicken Sie, um {path} zu öffnen und die Installation zu verwalten.",
"autoConnectAppend": "{message}. Klicken Sie, um {path} zu öffnen und die Installation zu verwalten.",
"enableAgentFirstPlaceholder": "Aktivieren Sie mindestens einen Agenten, bevor Sie eine Sitzung starten...",
+ "prepareSessionFailed": "Die Chat-Sitzung konnte nicht vorbereitet werden. Bitte versuche es erneut.",
+ "createConversationFailed": "Die Konversation konnte nicht erstellt werden. Bitte versuche es erneut.",
"askAnythingPlaceholder": "Fragen Sie alles..."
},
"welcomePanel": {
@@ -2128,9 +2133,8 @@
},
"messageNav": {
"title": "Nachrichtennavigation",
- "expand": "Nachrichtennavigation einblenden",
"collapse": "Nachrichtennavigation ausblenden",
- "jumpToMessage": "Springen zu: {label}",
+ "collapsedSummary": "Nachrichten {count}",
"fileCount": "{count, plural, one {# Datei} other {# Dateien}}",
"remove": "Entfernen",
"noDiffDataAvailable": "Keine Diff-Daten verfügbar für {filePath}"
@@ -2192,12 +2196,14 @@
"noFolders": "No folders",
"noBranches": "No branches",
"noBranch": "(no branch)",
+ "chatModeLabel": "Ohne-Ordner-Modus",
"commit": "Commit",
"push": "Push",
"merge": "Merge",
"toasts": {
"folderChanged": "Switched to {name}",
"openFolderFailed": "Failed to open folder",
+ "switchedToChatMode": "In den Chat-Modus gewechselt",
"openStashFailed": "Failed to open stash window",
"openMergeFailed": "Failed to open merge window"
}
diff --git a/src/i18n/messages/en.json b/src/i18n/messages/en.json
index 80bf1a1e9..3c7e6e43d 100644
--- a/src/i18n/messages/en.json
+++ b/src/i18n/messages/en.json
@@ -1001,7 +1001,10 @@
"toastOpFailed": "Operation failed: {message}"
},
"sectionPinned": "Pinned",
- "sectionFolders": "Folders"
+ "sectionFolders": "Folders",
+ "sectionChats": "Chat",
+ "noChats": "No chats",
+ "newChatAction": "New chat"
},
"conversation": {
"reloadFailed": "Failed to reload conversation: {message}",
@@ -1822,6 +1825,8 @@
"autoConnectFallback": "Click to open {path} and manage installation.",
"autoConnectAppend": "{message}. Click to open {path} and manage installation.",
"enableAgentFirstPlaceholder": "Enable at least one agent before starting a session...",
+ "prepareSessionFailed": "Couldn't prepare the chat session. Please try again.",
+ "createConversationFailed": "Couldn't create the conversation. Please try again.",
"askAnythingPlaceholder": "Ask anything..."
},
"welcomePanel": {
@@ -2128,9 +2133,8 @@
},
"messageNav": {
"title": "Message navigation",
- "expand": "Expand message navigation",
"collapse": "Collapse message navigation",
- "jumpToMessage": "Jump to: {label}",
+ "collapsedSummary": "Messages {count}",
"fileCount": "{count, plural, one {# file} other {# files}}",
"remove": "Remove",
"noDiffDataAvailable": "No diff data available for {filePath}"
@@ -2192,12 +2196,14 @@
"noFolders": "No folders",
"noBranches": "No branches",
"noBranch": "(no branch)",
+ "chatModeLabel": "No-folder mode",
"commit": "Commit",
"push": "Push",
"merge": "Merge",
"toasts": {
"folderChanged": "Switched to {name}",
"openFolderFailed": "Failed to open folder",
+ "switchedToChatMode": "Switched to chat mode",
"openStashFailed": "Failed to open stash window",
"openMergeFailed": "Failed to open merge window"
}
diff --git a/src/i18n/messages/es.json b/src/i18n/messages/es.json
index 2b40fde85..ee5c2ffc2 100644
--- a/src/i18n/messages/es.json
+++ b/src/i18n/messages/es.json
@@ -1001,7 +1001,10 @@
"toastOpFailed": "Error en la operación: {message}"
},
"sectionPinned": "Fijadas",
- "sectionFolders": "Carpetas"
+ "sectionFolders": "Carpetas",
+ "sectionChats": "Chat",
+ "noChats": "Sin chats",
+ "newChatAction": "Nuevo chat"
},
"conversation": {
"reloadFailed": "No se pudo recargar la conversación: {message}",
@@ -1822,6 +1825,8 @@
"autoConnectFallback": "Haz clic para abrir {path} y gestionar la instalación.",
"autoConnectAppend": "{message}. Haz clic para abrir {path} y gestionar la instalación.",
"enableAgentFirstPlaceholder": "Habilita al menos un agente antes de iniciar una sesión...",
+ "prepareSessionFailed": "No se pudo preparar la sesión de chat. Inténtalo de nuevo.",
+ "createConversationFailed": "No se pudo crear la conversación. Inténtalo de nuevo.",
"askAnythingPlaceholder": "Pregunta lo que sea..."
},
"welcomePanel": {
@@ -2128,9 +2133,8 @@
},
"messageNav": {
"title": "Navegación de mensajes",
- "expand": "Expandir navegación de mensajes",
"collapse": "Contraer navegación de mensajes",
- "jumpToMessage": "Ir a: {label}",
+ "collapsedSummary": "Mensajes {count}",
"fileCount": "{count, plural, one {# archivo} other {# archivos}}",
"remove": "Quitar",
"noDiffDataAvailable": "No hay datos de diff disponibles para {filePath}"
@@ -2192,12 +2196,14 @@
"noFolders": "No folders",
"noBranches": "No branches",
"noBranch": "(no branch)",
+ "chatModeLabel": "Modo sin carpeta",
"commit": "Commit",
"push": "Push",
"merge": "Merge",
"toasts": {
"folderChanged": "Switched to {name}",
"openFolderFailed": "Failed to open folder",
+ "switchedToChatMode": "Cambiado al modo de chat",
"openStashFailed": "Failed to open stash window",
"openMergeFailed": "Failed to open merge window"
}
diff --git a/src/i18n/messages/fr.json b/src/i18n/messages/fr.json
index 8dfd0d4d4..144ff6fd9 100644
--- a/src/i18n/messages/fr.json
+++ b/src/i18n/messages/fr.json
@@ -1001,7 +1001,10 @@
"toastOpFailed": "Échec de l'opération : {message}"
},
"sectionPinned": "Épinglées",
- "sectionFolders": "Dossiers"
+ "sectionFolders": "Dossiers",
+ "sectionChats": "Discussion",
+ "noChats": "Aucune discussion",
+ "newChatAction": "Nouvelle discussion"
},
"conversation": {
"reloadFailed": "Échec du rechargement de la conversation : {message}",
@@ -1822,6 +1825,8 @@
"autoConnectFallback": "Cliquez pour ouvrir {path} et gérer l'installation.",
"autoConnectAppend": "{message}. Cliquez pour ouvrir {path} et gérer l'installation.",
"enableAgentFirstPlaceholder": "Activez au moins un agent avant de démarrer une session...",
+ "prepareSessionFailed": "Impossible de préparer la session de chat. Veuillez réessayer.",
+ "createConversationFailed": "Impossible de créer la conversation. Veuillez réessayer.",
"askAnythingPlaceholder": "Posez n'importe quelle question..."
},
"welcomePanel": {
@@ -2128,9 +2133,8 @@
},
"messageNav": {
"title": "Navigation des messages",
- "expand": "Développer la navigation des messages",
"collapse": "Réduire la navigation des messages",
- "jumpToMessage": "Aller à : {label}",
+ "collapsedSummary": "Messages {count}",
"fileCount": "{count, plural, one {# fichier} other {# fichiers}}",
"remove": "Retirer",
"noDiffDataAvailable": "Aucune donnée de diff disponible pour {filePath}"
@@ -2192,12 +2196,14 @@
"noFolders": "No folders",
"noBranches": "No branches",
"noBranch": "(no branch)",
+ "chatModeLabel": "Mode sans dossier",
"commit": "Commit",
"push": "Push",
"merge": "Merge",
"toasts": {
"folderChanged": "Switched to {name}",
"openFolderFailed": "Failed to open folder",
+ "switchedToChatMode": "Basculé en mode discussion",
"openStashFailed": "Failed to open stash window",
"openMergeFailed": "Failed to open merge window"
}
diff --git a/src/i18n/messages/ja.json b/src/i18n/messages/ja.json
index e31156ed4..e61294c3c 100644
--- a/src/i18n/messages/ja.json
+++ b/src/i18n/messages/ja.json
@@ -1001,7 +1001,10 @@
"toastOpFailed": "操作に失敗しました: {message}"
},
"sectionPinned": "ピン留め",
- "sectionFolders": "フォルダ"
+ "sectionFolders": "フォルダ",
+ "sectionChats": "チャット",
+ "noChats": "チャットがありません",
+ "newChatAction": "新しいチャット"
},
"conversation": {
"reloadFailed": "会話の再読み込みに失敗しました: {message}",
@@ -1822,6 +1825,8 @@
"autoConnectFallback": "{path} を開いてインストールを管理してください。",
"autoConnectAppend": "{message}。{path} を開いてインストールを管理してください。",
"enableAgentFirstPlaceholder": "セッション開始前に少なくとも1つのエージェントを有効化してください...",
+ "prepareSessionFailed": "チャットセッションを準備できませんでした。もう一度お試しください。",
+ "createConversationFailed": "会話を作成できませんでした。もう一度お試しください。",
"askAnythingPlaceholder": "何でも質問してください..."
},
"welcomePanel": {
@@ -2128,9 +2133,8 @@
},
"messageNav": {
"title": "メッセージナビ",
- "expand": "メッセージナビを開く",
"collapse": "メッセージナビを閉じる",
- "jumpToMessage": "移動: {label}",
+ "collapsedSummary": "メッセージ {count}",
"fileCount": "{count, plural, one {# 個のファイル} other {# 個のファイル}}",
"remove": "削除",
"noDiffDataAvailable": "{filePath} の差分データがありません"
@@ -2192,12 +2196,14 @@
"noFolders": "No folders",
"noBranches": "No branches",
"noBranch": "(no branch)",
+ "chatModeLabel": "フォルダーなしモード",
"commit": "Commit",
"push": "Push",
"merge": "Merge",
"toasts": {
"folderChanged": "Switched to {name}",
"openFolderFailed": "Failed to open folder",
+ "switchedToChatMode": "チャットモードに切り替えました",
"openStashFailed": "Failed to open stash window",
"openMergeFailed": "Failed to open merge window"
}
diff --git a/src/i18n/messages/ko.json b/src/i18n/messages/ko.json
index f916eb077..38a659a97 100644
--- a/src/i18n/messages/ko.json
+++ b/src/i18n/messages/ko.json
@@ -1001,7 +1001,10 @@
"toastOpFailed": "작업 실패: {message}"
},
"sectionPinned": "고정됨",
- "sectionFolders": "폴더"
+ "sectionFolders": "폴더",
+ "sectionChats": "채팅",
+ "noChats": "채팅 없음",
+ "newChatAction": "새 채팅"
},
"conversation": {
"reloadFailed": "대화 다시 불러오기 실패: {message}",
@@ -1822,6 +1825,8 @@
"autoConnectFallback": "{path}을(를) 열어 설치를 관리하세요.",
"autoConnectAppend": "{message}. {path}을(를) 열어 설치를 관리하세요.",
"enableAgentFirstPlaceholder": "세션을 시작하기 전에 최소 한 개의 에이전트를 활성화하세요...",
+ "prepareSessionFailed": "채팅 세션을 준비하지 못했습니다. 다시 시도해 주세요.",
+ "createConversationFailed": "대화를 만들지 못했습니다. 다시 시도해 주세요.",
"askAnythingPlaceholder": "무엇이든 물어보세요..."
},
"welcomePanel": {
@@ -2128,9 +2133,8 @@
},
"messageNav": {
"title": "메시지 탐색",
- "expand": "메시지 탐색 펼치기",
"collapse": "메시지 탐색 접기",
- "jumpToMessage": "이동: {label}",
+ "collapsedSummary": "메시지 {count}",
"fileCount": "{count, plural, one {#개 파일} other {#개 파일}}",
"remove": "제거",
"noDiffDataAvailable": "{filePath}에 대한 diff 데이터가 없습니다"
@@ -2192,12 +2196,14 @@
"noFolders": "No folders",
"noBranches": "No branches",
"noBranch": "(no branch)",
+ "chatModeLabel": "폴더 없음 모드",
"commit": "Commit",
"push": "Push",
"merge": "Merge",
"toasts": {
"folderChanged": "Switched to {name}",
"openFolderFailed": "Failed to open folder",
+ "switchedToChatMode": "채팅 모드로 전환했습니다",
"openStashFailed": "Failed to open stash window",
"openMergeFailed": "Failed to open merge window"
}
diff --git a/src/i18n/messages/pt.json b/src/i18n/messages/pt.json
index c755fe003..c23adfc92 100644
--- a/src/i18n/messages/pt.json
+++ b/src/i18n/messages/pt.json
@@ -1001,7 +1001,10 @@
"toastOpFailed": "Falha na operação: {message}"
},
"sectionPinned": "Fixadas",
- "sectionFolders": "Pastas"
+ "sectionFolders": "Pastas",
+ "sectionChats": "Chat",
+ "noChats": "Sem chats",
+ "newChatAction": "Novo chat"
},
"conversation": {
"reloadFailed": "Falha ao recarregar conversa: {message}",
@@ -1822,6 +1825,8 @@
"autoConnectFallback": "Clique para abrir {path} e gerenciar a instalação.",
"autoConnectAppend": "{message}. Clique para abrir {path} e gerenciar a instalação.",
"enableAgentFirstPlaceholder": "Ative pelo menos um agente antes de iniciar uma sessão...",
+ "prepareSessionFailed": "Não foi possível preparar a sessão de chat. Tente novamente.",
+ "createConversationFailed": "Não foi possível criar a conversa. Tente novamente.",
"askAnythingPlaceholder": "Pergunte qualquer coisa..."
},
"welcomePanel": {
@@ -2128,9 +2133,8 @@
},
"messageNav": {
"title": "Navegação de mensagens",
- "expand": "Expandir navegação de mensagens",
"collapse": "Recolher navegação de mensagens",
- "jumpToMessage": "Ir para: {label}",
+ "collapsedSummary": "Mensagens {count}",
"fileCount": "{count, plural, one {# arquivo} other {# arquivos}}",
"remove": "Remover",
"noDiffDataAvailable": "Nenhum dado de diff disponível para {filePath}"
@@ -2192,12 +2196,14 @@
"noFolders": "No folders",
"noBranches": "No branches",
"noBranch": "(no branch)",
+ "chatModeLabel": "Modo sem pasta",
"commit": "Commit",
"push": "Push",
"merge": "Merge",
"toasts": {
"folderChanged": "Switched to {name}",
"openFolderFailed": "Failed to open folder",
+ "switchedToChatMode": "Alternado para o modo de chat",
"openStashFailed": "Failed to open stash window",
"openMergeFailed": "Failed to open merge window"
}
diff --git a/src/i18n/messages/zh-CN.json b/src/i18n/messages/zh-CN.json
index bdf62c37f..2c891eea1 100644
--- a/src/i18n/messages/zh-CN.json
+++ b/src/i18n/messages/zh-CN.json
@@ -1001,7 +1001,10 @@
"toastOpFailed": "操作失败：{message}"
},
"sectionPinned": "已置顶",
- "sectionFolders": "文件夹"
+ "sectionFolders": "文件夹",
+ "sectionChats": "聊天",
+ "noChats": "没有聊天",
+ "newChatAction": "新建聊天"
},
"conversation": {
"reloadFailed": "会话重新加载失败：{message}",
@@ -1822,6 +1825,8 @@
"autoConnectFallback": "点击前往 {path} 管理安装。",
"autoConnectAppend": "{message}，点击前往 {path} 管理安装。",
"enableAgentFirstPlaceholder": "请先启用至少一个 Agent 后开始会话...",
+ "prepareSessionFailed": "无法准备聊天会话，请重试。",
+ "createConversationFailed": "无法创建会话，请重试。",
"askAnythingPlaceholder": "请开始输入..."
},
"welcomePanel": {
@@ -2128,9 +2133,8 @@
},
"messageNav": {
"title": "消息导航",
- "expand": "展开消息导航",
"collapse": "收起消息导航",
- "jumpToMessage": "跳转到：{label}",
+ "collapsedSummary": "消息 {count}",
"fileCount": "{count} 个文件",
"remove": "移除",
"noDiffDataAvailable": "未找到 {filePath} 的差异数据"
@@ -2192,12 +2196,14 @@
"noFolders": "暂无文件夹",
"noBranches": "暂无分支",
"noBranch": "（无分支）",
+ "chatModeLabel": "无文件夹模式",
"commit": "提交",
"push": "推送",
"merge": "合并",
"toasts": {
"folderChanged": "已切换到 {name}",
"openFolderFailed": "打开文件夹失败",
+ "switchedToChatMode": "已切换到聊天模式",
"openStashFailed": "打开贮藏窗口失败",
"openMergeFailed": "打开合并窗口失败"
}
diff --git a/src/i18n/messages/zh-TW.json b/src/i18n/messages/zh-TW.json
index fd00e31f4..92f6c1b17 100644
--- a/src/i18n/messages/zh-TW.json
+++ b/src/i18n/messages/zh-TW.json
@@ -1001,7 +1001,10 @@
"toastOpFailed": "操作失敗：{message}"
},
"sectionPinned": "已置頂",
- "sectionFolders": "資料夾"
+ "sectionFolders": "資料夾",
+ "sectionChats": "聊天",
+ "noChats": "沒有聊天",
+ "newChatAction": "新增聊天"
},
"conversation": {
"reloadFailed": "會話重新載入失敗：{message}",
@@ -1822,6 +1825,8 @@
"autoConnectFallback": "點擊前往 {path} 管理安裝。",
"autoConnectAppend": "{message}，點擊前往 {path} 管理安裝。",
"enableAgentFirstPlaceholder": "請先啟用至少一個 Agent 後開始會話...",
+ "prepareSessionFailed": "無法準備聊天工作階段，請重試。",
+ "createConversationFailed": "無法建立會話，請重試。",
"askAnythingPlaceholder": "請開始輸入..."
},
"welcomePanel": {
@@ -2128,9 +2133,8 @@
},
"messageNav": {
"title": "訊息導覽",
- "expand": "展開訊息導覽",
"collapse": "收合訊息導覽",
- "jumpToMessage": "跳至：{label}",
+ "collapsedSummary": "訊息 {count}",
"fileCount": "{count} 個檔案",
"remove": "移除",
"noDiffDataAvailable": "找不到 {filePath} 的差異資料"
@@ -2192,12 +2196,14 @@
"noFolders": "No folders",
"noBranches": "No branches",
"noBranch": "(no branch)",
+ "chatModeLabel": "無資料夾模式",
"commit": "Commit",
"push": "Push",
"merge": "Merge",
"toasts": {
"folderChanged": "Switched to {name}",
"openFolderFailed": "Failed to open folder",
+ "switchedToChatMode": "已切換到聊天模式",
"openStashFailed": "Failed to open stash window",
"openMergeFailed": "Failed to open merge window"
}
diff --git a/src/lib/api.ts b/src/lib/api.ts
index da355f0d6..239a0bd37 100644
--- a/src/lib/api.ts
+++ b/src/lib/api.ts
@@ -37,6 +37,8 @@ import type {
ExpertInstallStatus,
FolderHistoryEntry,
FolderDetail,
+ CreateChatConversationResult,
+ CreateChatDirResult,
WorktreeResolution,
DbConversationSummary,
ImportResult,
@@ -1511,6 +1513,35 @@ export async function createConversation(
})
}
+/**
+ * Create a folderless "chat mode" conversation. The backend lazily creates a
+ * dated per-conversation scratch dir and a dedicated hidden `is_chat` folder
+ * backing it, then the conversation. Returns the new conversation id plus that
+ * folder so the caller can seed `allFolders` (cwd / active-folder) immediately.
+ */
+export async function createChatConversation(
+ agentType: AgentType,
+ title?: string,
+ // Reuse a scratch dir already minted by `createChatDir` (eager connect) so the
+ // ACP cwd never moves across the first send; omit to let the backend mint one.
+ existingDir?: string
+): Promise {
+ return getTransport().call("create_chat_conversation", {
+ agentType,
+ title: title ?? null,
+ existingDir: existingDir ?? null,
+ })
+}
+
+/**
+ * Eagerly create a chat-mode scratch directory (filesystem only — no DB rows)
+ * and return its path, so a chat draft can connect ACP at a real cwd the instant
+ * "no-folder mode" is selected, before any first prompt.
+ */
+export async function createChatDir(): Promise {
+ return getTransport().call("create_chat_dir", {})
+}
+
export async function updateConversationStatus(
conversationId: number,
status: string
diff --git a/src/lib/branch-switch.test.ts b/src/lib/branch-switch.test.ts
index f844f4c01..ac3ccf3f0 100644
--- a/src/lib/branch-switch.test.ts
+++ b/src/lib/branch-switch.test.ts
@@ -16,6 +16,7 @@ function mkFolder(p: Partial & { id: number }): FolderDetail {
sort_order: p.id,
color: "blue",
parent_id: null,
+ is_chat: false,
...p,
}
}
diff --git a/src/lib/folder-display.test.ts b/src/lib/folder-display.test.ts
index 57d5d8415..368b87c8d 100644
--- a/src/lib/folder-display.test.ts
+++ b/src/lib/folder-display.test.ts
@@ -1,5 +1,6 @@
import { describe, expect, it } from "vitest"
import {
+ excludeChatFolders,
filterTopLevelFolders,
resolveFolderDisplayName,
resolvePickerSelectedFolderId,
@@ -62,6 +63,25 @@ describe("filterTopLevelFolders", () => {
})
})
+describe("excludeChatFolders", () => {
+ it("drops hidden chat folders, keeping real ones", () => {
+ const list = [
+ { id: 1, is_chat: false },
+ { id: 2, is_chat: true },
+ { id: 3, is_chat: false },
+ ]
+ expect(excludeChatFolders(list).map((f) => f.id)).toEqual([1, 3])
+ })
+
+ it("returns all folders when none are chat folders", () => {
+ const list = [
+ { id: 1, is_chat: false },
+ { id: 2, is_chat: false },
+ ]
+ expect(excludeChatFolders(list)).toHaveLength(2)
+ })
+})
+
describe("resolvePickerSelectedFolderId", () => {
it("returns the folder's own id for a top-level folder", () => {
expect(resolvePickerSelectedFolderId({ id: 5, parent_id: null })).toBe(5)
diff --git a/src/lib/folder-display.ts b/src/lib/folder-display.ts
index a9baf86af..119368891 100644
--- a/src/lib/folder-display.ts
+++ b/src/lib/folder-display.ts
@@ -33,6 +33,19 @@ export function filterTopLevelFolders<
return folders.filter((f) => f.parent_id == null)
}
+/**
+ * Drop hidden chat-mode folders (`is_chat`) from a folder list. These back
+ * folderless "chat mode" conversations and must never appear in user-facing
+ * folder surfaces (the sidebar "文件夹" group, the input-box folder picker). They
+ * stay in the full `allFolders` set so by-id lookups (cwd, active-folder, theme
+ * color) keep resolving — only list rendering excludes them.
+ */
+export function excludeChatFolders>(
+ folders: readonly T[]
+): T[] {
+ return folders.filter((f) => !f.is_chat)
+}
+
/**
* The folder id the input-box picker highlights for a conversation's folder:
* the parent repo for a worktree (since the worktree itself isn't listed), or
diff --git a/src/lib/message-nav-active.test.ts b/src/lib/message-nav-active.test.ts
deleted file mode 100644
index 987f21b67..000000000
--- a/src/lib/message-nav-active.test.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { describe, it, expect } from "vitest"
-import {
- pickActiveThreadIndex,
- reconcileActive,
- type ActiveClickGuard,
-} from "./message-nav-active"
-
-// User-message ticks are sparse in the thread (assistant turns sit between
-// them), so threadIndex jumps: 0, 3, 6.
-const entries = [{ threadIndex: 0 }, { threadIndex: 3 }, { threadIndex: 6 }]
-
-describe("pickActiveThreadIndex", () => {
- it("returns null when the top is above the first entry", () => {
- expect(pickActiveThreadIndex(entries, -1)).toBeNull()
- expect(pickActiveThreadIndex([], 5)).toBeNull()
- })
-
- it("picks the last entry at or above the viewport top", () => {
- expect(pickActiveThreadIndex(entries, 0)).toBe(0)
- expect(pickActiveThreadIndex(entries, 2)).toBe(0)
- expect(pickActiveThreadIndex(entries, 3)).toBe(3)
- expect(pickActiveThreadIndex(entries, 5)).toBe(3)
- expect(pickActiveThreadIndex(entries, 6)).toBe(6)
- expect(pickActiveThreadIndex(entries, 100)).toBe(6)
- })
-})
-
-describe("reconcileActive", () => {
- it("passes the reading through when no guard is armed", () => {
- expect(reconcileActive(3, null, 0)).toEqual({ active: 3, guard: null })
- expect(reconcileActive(null, null, 0)).toEqual({
- active: null,
- guard: null,
- })
- })
-
- it("releases the guard as soon as the scroll arrives at the target", () => {
- const guard: ActiveClickGuard = { target: 6, releaseAfter: 1000 }
- expect(reconcileActive(6, guard, 200)).toEqual({ active: 6, guard: null })
- })
-
- it("holds the clicked tick instead of regressing to the previous one", () => {
- // The smooth scroll toward tick 6 momentarily reads tick 3 (the previous
- // user message); within the guard window we keep showing 6, not 3.
- const guard: ActiveClickGuard = { target: 6, releaseAfter: 1000 }
- expect(reconcileActive(3, guard, 200)).toEqual({ active: 6, guard })
- })
-
- it("safety-releases after the window so normal tracking resumes", () => {
- const guard: ActiveClickGuard = { target: 6, releaseAfter: 1000 }
- expect(reconcileActive(3, guard, 1500)).toEqual({ active: 3, guard: null })
- })
-
- it("keeps a bottom-clamped click active, then resumes on later scroll", () => {
- // Click the last message; align:"start" is clamped so the scroll-spy can
- // never read 6 — it keeps reading the previous tick 3.
- let guard: ActiveClickGuard | null = { target: 6, releaseAfter: 1000 }
-
- // During the clamped scroll: stays on the clicked tick, never regresses.
- let step = reconcileActive(3, guard, 100)
- expect(step.active).toBe(6)
- guard = step.guard
- step = reconcileActive(3, guard, 600)
- expect(step.active).toBe(6)
- guard = step.guard
-
- // After the safety window (a genuine later scroll): normal tracking resumes.
- step = reconcileActive(3, guard, 1200)
- expect(step.active).toBe(3)
- expect(step.guard).toBeNull()
- })
-})
diff --git a/src/lib/message-nav-active.ts b/src/lib/message-nav-active.ts
deleted file mode 100644
index 3f5e491e9..000000000
--- a/src/lib/message-nav-active.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Active-tick resolution for the conversation message navigator.
- *
- * The navigator highlights the user-message tick nearest the top of the
- * viewport (a scroll-spy). Two wrinkles are handled here as pure functions so
- * they stay unit-testable away from the virtualizer:
- *
- * 1. A click optimistically activates the clicked tick. The smooth scroll that
- * follows fires scroll-spy readings; we must not let them regress the
- * highlight to the *previous* tick before the scroll arrives — and for a
- * bottom-clamped target (a message near the end that can never reach the
- * viewport top) the scroll never arrives at all.
- */
-
-/** Pending "I just clicked this tick" intent. */
-export interface ActiveClickGuard {
- /** threadIndex the user clicked. */
- target: number
- /**
- * Monotonic time (ms, e.g. `performance.now()`) after which the guard is
- * force-released. Safety net for bottom-clamped targets whose scroll never
- * produces a reading equal to `target`.
- */
- releaseAfter: number
-}
-
-/**
- * Last nav entry at or above the viewport top. `entries` must be ascending by
- * `threadIndex`. Returns null when the top is above the first entry.
- */
-export function pickActiveThreadIndex(
- entries: readonly { threadIndex: number }[],
- startIndex: number
-): number | null {
- let active: number | null = null
- for (const entry of entries) {
- if (entry.threadIndex <= startIndex) active = entry.threadIndex
- else break
- }
- return active
-}
-
-export interface ReconciledActive {
- /** The active threadIndex to render. */
- active: number | null
- /** Guard to carry into the next reading (null once released). */
- guard: ActiveClickGuard | null
-}
-
-/**
- * Reconcile a fresh scroll-spy reading (`computed`) with a pending click
- * `guard`. While the guard holds we keep showing `guard.target` so the clicked
- * tick never regresses to the previous one. The guard releases when the reading
- * reaches the target (the scroll arrived) or once `now >= guard.releaseAfter`
- * (the clamped-target safety net), after which normal scroll-spy resumes.
- */
-export function reconcileActive(
- computed: number | null,
- guard: ActiveClickGuard | null,
- now: number
-): ReconciledActive {
- if (!guard) return { active: computed, guard: null }
- // Arrived at the clicked tick → resume normal tracking.
- if (computed === guard.target) return { active: computed, guard: null }
- // Still settling (incl. clamped targets) → hold the clicked tick.
- if (now < guard.releaseAfter) return { active: guard.target, guard }
- // Safety release → resume normal tracking.
- return { active: computed, guard: null }
-}
diff --git a/src/lib/queue-flush.test.ts b/src/lib/queue-flush.test.ts
index e7803ea7f..8624ba3fa 100644
--- a/src/lib/queue-flush.test.ts
+++ b/src/lib/queue-flush.test.ts
@@ -2,8 +2,10 @@ import { describe, it, expect } from "vitest"
import {
flushRetryDelayMs,
forkSendBlockedByQueue,
+ isConnectionReady,
QUEUE_FLUSH_RETRY_BACKOFF_MS,
shouldQueueDirectSend,
+ shouldRejectDuplicateCreate,
} from "./queue-flush"
describe("flushRetryDelayMs", () => {
@@ -61,3 +63,47 @@ describe("forkSendBlockedByQueue", () => {
expect(forkSendBlockedByQueue(0)).toBe(false)
})
})
+
+describe("isConnectionReady", () => {
+ const cwd = "/work/chat-sessions/2026-06-11/abc"
+
+ it("is ready when connected AND the connection cwd matches the intended cwd", () => {
+ expect(isConnectionReady("connected", cwd, cwd)).toBe(true)
+ })
+
+ it("is NOT ready when connected but the connection cwd differs (stale reconnect window)", () => {
+ // The crux of the chat-draft fix: a stale "connected" for the PREVIOUS cwd
+ // must not be treated as ready, or a send would hit the wrong workspace.
+ expect(isConnectionReady("connected", "/old/folder", cwd)).toBe(false)
+ })
+
+ it("is NOT ready in any non-connected status, even if cwds match", () => {
+ expect(isConnectionReady("connecting", cwd, cwd)).toBe(false)
+ expect(isConnectionReady("disconnected", cwd, cwd)).toBe(false)
+ expect(isConnectionReady("prompting", cwd, cwd)).toBe(false)
+ expect(isConnectionReady(null, cwd, cwd)).toBe(false)
+ })
+
+ it("normalizes nullish cwds so null and undefined compare equal", () => {
+ expect(isConnectionReady("connected", null, undefined)).toBe(true)
+ expect(isConnectionReady("connected", undefined, null)).toBe(true)
+ // A real cwd vs. no cwd is still a mismatch.
+ expect(isConnectionReady("connected", cwd, null)).toBe(false)
+ expect(isConnectionReady("connected", null, cwd)).toBe(false)
+ })
+})
+
+describe("shouldRejectDuplicateCreate", () => {
+ it("rejects a second submit while an unbound create is in flight", () => {
+ expect(shouldRejectDuplicateCreate(false, true)).toBe(true)
+ })
+
+ it("allows the first submit (no create pending yet)", () => {
+ expect(shouldRejectDuplicateCreate(false, false)).toBe(false)
+ })
+
+ it("never single-flights a persisted conversation (it allows concurrent queued sends)", () => {
+ expect(shouldRejectDuplicateCreate(true, true)).toBe(false)
+ expect(shouldRejectDuplicateCreate(true, false)).toBe(false)
+ })
+})
diff --git a/src/lib/queue-flush.ts b/src/lib/queue-flush.ts
index 37ea50758..1b7978af5 100644
--- a/src/lib/queue-flush.ts
+++ b/src/lib/queue-flush.ts
@@ -58,3 +58,44 @@ export function shouldQueueDirectSend(
export function forkSendBlockedByQueue(queueLength: number): boolean {
return queueLength > 0
}
+
+/**
+ * Whether the live connection is ready to accept a send for THIS tab: connected
+ * AND its established cwd matches the tab's intended working dir.
+ *
+ * Bare `connStatus === "connected"` is insufficient. A chat draft that just
+ * retargeted into folderless mode (or any tab mid-reconnect) can read a stale
+ * "connected" belonging to the PREVIOUS cwd for a render or two before the
+ * reconnect lands. Sending then would deliver the prompt to the wrong
+ * agent/workspace. Both the direct send (handleSend) and the queue auto-flush
+ * gate on this. Nullish cwds are normalized so `null`/`undefined` compare equal
+ * (both mean "no cwd yet").
+ */
+export function isConnectionReady(
+ connStatus: string | null | undefined,
+ connectedWorkingDir: string | null | undefined,
+ intendedWorkingDir: string | null | undefined
+): boolean {
+ return (
+ connStatus === "connected" &&
+ (connectedWorkingDir ?? null) === (intendedWorkingDir ?? null)
+ )
+}
+
+/**
+ * Whether a direct submit must be rejected because an unbound new-tab create is
+ * already in flight (single-flight the create).
+ *
+ * A second submit fired before the first create resolves (double Enter / double
+ * click) would otherwise append an optimistic turn it can never deliver: the
+ * create-pending guard that actually stops the duplicate returns only AFTER the
+ * optimistic append. `hasPersistedId` is true once the tab is bound to a real
+ * conversation row, so only the unbound path is single-flighted — persisted
+ * conversations keep their legitimate concurrent queued-send behavior.
+ */
+export function shouldRejectDuplicateCreate(
+ hasPersistedId: boolean,
+ createPending: boolean
+): boolean {
+ return !hasPersistedId && createPending
+}
diff --git a/src/lib/sidebar-view-mode-storage.ts b/src/lib/sidebar-view-mode-storage.ts
index 4aa6efdaf..8055747d5 100644
--- a/src/lib/sidebar-view-mode-storage.ts
+++ b/src/lib/sidebar-view-mode-storage.ts
@@ -12,6 +12,7 @@ export type SidebarSortMode = "created" | "updated"
export interface SidebarSectionCollapsed {
pinned?: boolean
folders?: boolean
+ chats?: boolean
}
export function loadFolderExpanded(): Record {
@@ -94,6 +95,7 @@ export function loadSectionCollapsed(): SidebarSectionCollapsed {
const result: SidebarSectionCollapsed = {}
if (typeof obj.pinned === "boolean") result.pinned = obj.pinned
if (typeof obj.folders === "boolean") result.folders = obj.folders
+ if (typeof obj.chats === "boolean") result.chats = obj.chats
return result
} catch {
return {}
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 7d859c25f..8ae8ad2ad 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -250,6 +250,34 @@ export interface FolderDetail {
* original root. Drives the sidebar merge and worktree-branch detection.
*/
parent_id: number | null
+ /**
+ * True for the dedicated hidden folder backing a single chat-mode (folderless)
+ * conversation. Kept in `allFolders` so cwd / active-folder resolve, but hidden
+ * from user-facing folder lists; its conversation routes to the sidebar "Chat"
+ * group and folder-bound chrome is hidden while it is active.
+ */
+ is_chat: boolean
+}
+
+/**
+ * Result of `createChatConversation`: the new conversation id plus the hidden
+ * chat folder backing it, so the caller can drop the folder straight into
+ * `allFolders` (resolving cwd / active-folder) without a refetch.
+ */
+export interface CreateChatConversationResult {
+ conversationId: number
+ folderId: number
+ folder: FolderDetail
+}
+
+/**
+ * Result of `createChatDir`: a freshly created chat-mode scratch directory
+ * (filesystem only — no DB rows). Used to connect ACP at a real cwd the instant
+ * "no-folder mode" is selected; the conversation is still created lazily on the
+ * first send, reusing this path.
+ */
+export interface CreateChatDirResult {
+ path: string
}
export interface OpenedTab {
diff --git a/src/lib/utils.test.ts b/src/lib/utils.test.ts
new file mode 100644
index 000000000..22d41a1b8
--- /dev/null
+++ b/src/lib/utils.test.ts
@@ -0,0 +1,42 @@
+import type { MouseEvent } from "react"
+import { describe, expect, it, vi } from "vitest"
+
+import { handleMiddleClickClose } from "./utils"
+
+function mouseEventWithButton(button: number) {
+ const preventDefault = vi.fn()
+ const event = { button, preventDefault } as unknown as MouseEvent
+ return { event, preventDefault }
+}
+
+describe("handleMiddleClickClose", () => {
+ it("closes and prevents default on middle-click (button 1)", () => {
+ const onClose = vi.fn()
+ const { event, preventDefault } = mouseEventWithButton(1)
+
+ handleMiddleClickClose(event, onClose)
+
+ expect(onClose).toHaveBeenCalledTimes(1)
+ expect(preventDefault).toHaveBeenCalledTimes(1)
+ })
+
+ it("ignores left-click (button 0)", () => {
+ const onClose = vi.fn()
+ const { event, preventDefault } = mouseEventWithButton(0)
+
+ handleMiddleClickClose(event, onClose)
+
+ expect(onClose).not.toHaveBeenCalled()
+ expect(preventDefault).not.toHaveBeenCalled()
+ })
+
+ it("ignores right-click (button 2) so the context menu still opens", () => {
+ const onClose = vi.fn()
+ const { event, preventDefault } = mouseEventWithButton(2)
+
+ handleMiddleClickClose(event, onClose)
+
+ expect(onClose).not.toHaveBeenCalled()
+ expect(preventDefault).not.toHaveBeenCalled()
+ })
+})
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index 2187866e3..4a42e2b03 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -1,3 +1,4 @@
+import type { MouseEvent } from "react"
import { clsx, type ClassValue } from "clsx"
import { twMerge } from "tailwind-merge"
@@ -5,6 +6,23 @@ export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs))
}
+/**
+ * Close a tab when it is middle-clicked, matching the browser/editor
+ * convention. Wire this to a tab element's `onMouseDown`. Only the middle
+ * button (`event.button === 1`) acts; left-click select and right-click context
+ * menus fall through untouched. `preventDefault()` suppresses the default
+ * middle-button behaviour (autoscroll on Windows, primary-selection paste on
+ * Linux/X11).
+ */
+export function handleMiddleClickClose(
+ event: MouseEvent,
+ onClose: () => void
+): void {
+ if (event.button !== 1) return
+ event.preventDefault()
+ onClose()
+}
+
/**
* Legacy clipboard copy: a hidden `