From 9554abfc5759e2c6150ee4b815ad4e8af10819c0 Mon Sep 17 00:00:00 2001 From: Timothy Jaeryang Baek Date: Sat, 11 Jul 2026 18:17:16 -0500 Subject: [PATCH] refac --- cptr/frontend/src/lib/apis/search.ts | 7 +- .../src/lib/components/GroupTabBar.svelte | 13 +- .../src/lib/components/SearchModal.svelte | 2 +- .../components/SidebarWorkspaceList.svelte | 23 +- cptr/frontend/src/lib/stores.ts | 7 - cptr/frontend/src/routes/+page.svelte | 485 +++++++++--------- cptr/routers/search.py | 10 +- 7 files changed, 298 insertions(+), 249 deletions(-) diff --git a/cptr/frontend/src/lib/apis/search.ts b/cptr/frontend/src/lib/apis/search.ts index bd96a4c..4c5dc72 100644 --- a/cptr/frontend/src/lib/apis/search.ts +++ b/cptr/frontend/src/lib/apis/search.ts @@ -45,5 +45,8 @@ export const unifiedSearch = ( return fetchJSON(`/api/search?${params}`); }; -export const getRecentChats = (limit = 9) => - fetchJSON<{ chats: ChatSearchResult[] }>(`/api/search/recent?limit=${limit}`); +export const getRecentChats = (limit = 9, workspace?: string) => { + const params = new URLSearchParams({ limit: String(limit) }); + if (workspace) params.set('workspace', workspace); + return fetchJSON<{ chats: ChatSearchResult[] }>(`/api/search/recent?${params}`); +}; diff --git a/cptr/frontend/src/lib/components/GroupTabBar.svelte b/cptr/frontend/src/lib/components/GroupTabBar.svelte index 039a699..83d1a5f 100644 --- a/cptr/frontend/src/lib/components/GroupTabBar.svelte +++ b/cptr/frontend/src/lib/components/GroupTabBar.svelte @@ -40,6 +40,7 @@ onTabDragOver?: () => void; onHomeSelect?: (tabId: string) => void; onHomeClose?: (tabId: string) => void; + onHomeReorder?: (oldIndex: number, newIndex: number) => void; onHomeNewChat?: () => void; onHomeNewTerminal?: () => void; onHomeNewBrowser?: () => void; @@ -47,6 +48,7 @@ onHomeCloseGroup?: () => void; homeSplitDirection?: 'horizontal' | 'vertical'; homeSplitActive?: boolean; + homeActive?: boolean; } let { @@ -57,13 +59,15 @@ onTabDragOver, onHomeSelect, onHomeClose, + onHomeReorder, onHomeNewChat, onHomeNewTerminal, onHomeNewBrowser, onHomeSplit, onHomeCloseGroup, homeSplitDirection = 'horizontal', - homeSplitActive = false + homeSplitActive = false, + homeActive = true }: Props = $props(); let tabsEl: HTMLDivElement | undefined = $state(); @@ -89,7 +93,7 @@ const displayTabs = $derived((group?.tabs ?? []).filter((t) => t.type !== 'git')); - const isActiveGroup = $derived(home || $activeWorkspace?.activeGroupId === group?.id); + const isActiveGroup = $derived(home ? homeActive : $activeWorkspace?.activeGroupId === group?.id); function tabIconName(tab: Tab): string { switch (tab.type) { @@ -344,7 +348,7 @@ } onMount(() => { - if (tabsEl && !home) { + if (tabsEl) { sortable = Sortable.create(tabsEl, { animation: 150, ghostClass: 'tab-reorder-preview', @@ -361,7 +365,8 @@ }, onEnd: (evt) => { if (evt.oldIndex != null && evt.newIndex != null && evt.oldIndex !== evt.newIndex) { - reorderTabs(evt.oldIndex, evt.newIndex, group.id); + if (home) onHomeReorder?.(evt.oldIndex, evt.newIndex); + else reorderTabs(evt.oldIndex, evt.newIndex, group.id); } } }); diff --git a/cptr/frontend/src/lib/components/SearchModal.svelte b/cptr/frontend/src/lib/components/SearchModal.svelte index 8117505..172f583 100644 --- a/cptr/frontend/src/lib/components/SearchModal.svelte +++ b/cptr/frontend/src/lib/components/SearchModal.svelte @@ -58,7 +58,7 @@ async function loadRecents() { try { - const data = await getRecentChats(9); + const data = await getRecentChats(9, effectiveWorkspace?.path); recentChats = data.chats; } catch { // ignore diff --git a/cptr/frontend/src/lib/components/SidebarWorkspaceList.svelte b/cptr/frontend/src/lib/components/SidebarWorkspaceList.svelte index 0482d27..a00cb42 100644 --- a/cptr/frontend/src/lib/components/SidebarWorkspaceList.svelte +++ b/cptr/frontend/src/lib/components/SidebarWorkspaceList.svelte @@ -29,6 +29,7 @@ let wsListEl: HTMLDivElement | undefined = $state(); let sortable: Sortable | null = null; let unbindSocketListener: (() => void) | null = null; + let workspacesExpanded = $state(true); let expandedWorkspaces = $state>(new Set()); let wsChatsCache = $state>(new Map()); @@ -204,7 +205,20 @@
- {$t('sidebar.workspaces')} +
-
+
{#each $workspaceList as ws (ws.path)} {@const isExpanded = expandedWorkspaces.has(ws.path)} {@const chats = wsChatsCache.get(ws.path)} diff --git a/cptr/frontend/src/lib/stores.ts b/cptr/frontend/src/lib/stores.ts index 2e789bb..900bf12 100644 --- a/cptr/frontend/src/lib/stores.ts +++ b/cptr/frontend/src/lib/stores.ts @@ -1567,13 +1567,6 @@ export function setSplitRatio(splitId: string, ratio: number): void { ); } -export function setHomeSplitRatio(splitId: string, ratio: number): void { - homeState.update((state) => ({ - ...state, - layout: updateSplitRatio(state.layout, splitId, ratio) - })); -} - function updateSplitRatio(layout: EditorLayout, splitId: string, ratio: number): EditorLayout { if (layout.type === 'group') return layout; if (layout.id === splitId) return { ...layout, ratio: Math.max(0.2, Math.min(0.8, ratio)) }; diff --git a/cptr/frontend/src/routes/+page.svelte b/cptr/frontend/src/routes/+page.svelte index 3a9eacf..e2072f8 100644 --- a/cptr/frontend/src/routes/+page.svelte +++ b/cptr/frontend/src/routes/+page.svelte @@ -21,8 +21,7 @@ homeState, splitHomeTab, closeHomeGroup, - setHomeActiveGroup, - setHomeSplitRatio + setHomeActiveGroup } from '$lib/stores'; import type { Tab, EditorGroup, EditorLayout, SplitDirection, WorkspaceState } from '$lib/stores'; import { chatEnabled } from '$lib/stores/chat'; @@ -67,14 +66,6 @@ }); const greetingVariant = $derived(new Date().getDate() % 3); const greetingNameMarker = '\uE000'; - const activeHomeGroup = $derived( - $homeState.groups.find((group) => group.id === $homeState.activeGroupId) ?? $homeState.groups[0] - ); - const activeHomeTab = $derived( - activeHomeGroup?.tabs.find((tab) => tab.id === activeHomeGroup.activeTabId) ?? - activeHomeGroup?.tabs[0] - ); - function updateHomeTabs( groupId: string, update: (tabs: Tab[]) => { tabs: Tab[]; activeTabId: string } @@ -88,6 +79,16 @@ })); } + function reorderHomeTabs(groupId: string, oldIndex: number, newIndex: number) { + const group = $homeState.groups.find((item) => item.id === groupId); + if (!group) return; + const tabs = [...group.tabs]; + const [tab] = tabs.splice(oldIndex, 1); + if (!tab) return; + tabs.splice(newIndex, 0, tab); + updateHomeTabs(groupId, () => ({ tabs, activeTabId: group.activeTabId })); + } + function openHomeChat(chatId?: string, groupId = $homeState.activeGroupId) { const group = $homeState.groups.find((item) => item.id === groupId); if (!group) return; @@ -164,10 +165,11 @@ label: string, groupId = $homeState.activeGroupId ) { + const group = $homeState.groups.find((item) => item.id === groupId); + if (!group) return; updateHomeTabs(groupId, (tabs) => ({ tabs: tabs.map((tab) => (tab.id === tabId ? { ...tab, path: chatId, label } : tab)), - activeTabId: - groupId === $homeState.activeGroupId ? (activeHomeGroup?.activeTabId ?? tabId) : tabId + activeTabId: group.activeTabId })); } @@ -790,6 +792,11 @@ // Computed let isWideScreen = $state(typeof window !== 'undefined' ? window.innerWidth >= 1024 : false); + const visibleHomeGroups = $derived( + isWideScreen + ? $homeState.groups + : $homeState.groups.filter((group) => group.id === $homeState.activeGroupId) + ); $effect(() => { if (typeof window === 'undefined') return; @@ -934,244 +941,260 @@ {#if !$currentWorkspace} -
- {#each $homeState.groups as homePane (homePane.id)} - {@const homeTab = - homePane.tabs.find((tab) => tab.id === homePane.activeTabId) ?? homePane.tabs[0]} -
- +
+
+ {#each visibleHomeGroups as homePane, index (homePane.id)} + {@const homeTab = + homePane.tabs.find((tab) => tab.id === homePane.activeTabId) ?? homePane.tabs[0]}
setHomeActiveGroup(homePane.id)} - onfocusin={() => setHomeActiveGroup(homePane.id)} + class="split-branch-child border-gray-200 dark:border-white/6" + style="flex: 1 1 0%;" + class:border-l={index > 0 && $homeState.splitDirection === 'horizontal'} + class:border-t={index > 0 && $homeState.splitDirection === 'vertical'} > - 1} - homeSplitActive={$homeState.groups.length > 1} - homeSplitDirection={$homeState.splitDirection} - onHomeSelect={(tabId) => - updateHomeTabs(homePane.id, (tabs) => ({ tabs, activeTabId: tabId }))} - onHomeClose={(tabId) => closeHomeTab(tabId, homePane.id)} - onHomeNewChat={() => openHomeChat(undefined, homePane.id)} - onHomeNewTerminal={() => openHomeTerminal(homePane.id)} - onHomeNewBrowser={() => openHomeBrowser(undefined, homePane.id)} - onHomeSplit={(direction) => { - setHomeActiveGroup(homePane.id); - splitHomeTab(direction); - }} - onHomeCloseGroup={() => closeHomeGroup(homePane.id)} - /> -
- {#if homeTab?.type === 'home'} -
-
-
-
-

- {#if welcomeName} - {@const greeting = $t( - `home.greeting.${greetingTime}.${greetingVariant}`, - { - name: greetingNameMarker - } - )} - {@const [beforeName, afterName] = greeting.split(greetingNameMarker)} - {beforeName}{welcomeName}{afterName} - {:else} - Computer - {/if} -

-
-
- {#if welcomeData?.hostname} - {welcomeData.hostname} - {/if} - {#if $appVersion} - + {/if} +
+
+ +
+

+ {$t('home.start')} +

+ + {#if $chatEnabled} + {/if}
-
-
-

- {$t('home.start')} -

- - {#if $chatEnabled} - + {#if continuation} +
+

+ {$t('home.continue')} +

+ +
{/if} -
- {#if continuation} -
-

- {$t('home.continue')} -

- -
- {/if} - - {#if recent.length} -
-

- {$t('home.recent')} -

-
- {#each recent as item} - {@const resume = workspaceResumes.get(item.path)} - {@const signals = resumeSignals(resume)} - + {/each} +
+
+ {:else if !continuation} +
+

+ {$t('home.recent')} +

+ +
+ {/if} + + {#if nearby.length && !welcomeData?.recent?.length} +
+

+ {$t('home.folders')} +

+
+ {#each nearby as item} + - {/each} + + {/each} +
-
- {:else if !continuation} -
-

- {$t('home.recent')} -

- -
- {/if} - - {#if nearby.length && !welcomeData?.recent?.length} -
-

- {$t('home.folders')} -

-
- {#each nearby as item} - - {/each} -
-
- {/if} + {/if} +
-
- {:else if homeTab?.type === 'chat'} - - updateHomeChatTab(tabId, chatId, label, homePane.id)} - onopenchat={(chatId) => openHomeChat(chatId, homePane.id)} - /> - {:else if homeTab?.type === 'terminal' && homeTab.sessionId} - - {:else if homeTab?.type === 'browser' && homeTab.browserSessionId} - updateHomeBrowserTab(homeTab.id, label, homePane.id)} - onOpenBrowser={(url) => openHomeBrowser(url, homePane.id)} - /> - {/if} + {:else if homeTab?.type === 'chat'} + + updateHomeChatTab(tabId, chatId, label, homePane.id)} + onopenchat={(chatId) => openHomeChat(chatId, homePane.id)} + /> + {:else if homeTab?.type === 'terminal' && homeTab.sessionId} + + {:else if homeTab?.type === 'browser' && homeTab.browserSessionId} + updateHomeBrowserTab(homeTab.id, label, homePane.id)} + onOpenBrowser={(url) => openHomeBrowser(url, homePane.id)} + /> + {/if} +
-
- {/each} + {/each} +
{:else} diff --git a/cptr/routers/search.py b/cptr/routers/search.py index 5ec347c..8b32aa6 100644 --- a/cptr/routers/search.py +++ b/cptr/routers/search.py @@ -107,8 +107,9 @@ async def unified_search( async def recent_chats( request: Request, limit: int = Query(9, ge=1, le=20), + workspace: Optional[str] = Query(None, description="Scope to one workspace path"), ): - """Return most recent chats across all workspaces (for empty-query state).""" + """Return most recent chats, optionally scoped to one workspace.""" user_id = _get_user(request) from sqlalchemy import select @@ -119,7 +120,12 @@ async def recent_chats( select(Chat).where(Chat.user_id == user_id).order_by(Chat.updated_at.desc()) ) rows = list(result.scalars().all()) - rows = [c for c in rows if not (c.meta or {}).get("subagent")][:limit] + rows = [ + c + for c in rows + if not (c.meta or {}).get("subagent") + and (workspace is None or (c.meta or {}).get("workspace") == workspace) + ][:limit] return { "chats": [