From c68e7c87590ec6a8b3e7577560b1ba6911f98e52 Mon Sep 17 00:00:00 2001 From: jollyxenon <1378319314@qq.com> Date: Sat, 2 May 2026 03:17:49 +0800 Subject: [PATCH 1/2] fix(ui): scope session list by workspace folder Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus --- packages/ui/src/stores/session-api.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ui/src/stores/session-api.ts b/packages/ui/src/stores/session-api.ts index 54a371e99..404cedd5e 100644 --- a/packages/ui/src/stores/session-api.ts +++ b/packages/ui/src/stores/session-api.ts @@ -123,8 +123,8 @@ async function fetchSessions(instanceId: string): Promise { }) try { - log.info("session.list", { instanceId }) - const response = await rootClient.session.list() + log.info("session.list", { instanceId, directory: instance.folder }) + const response = await rootClient.session.list({ directory: instance.folder }) const sessionMap = new Map() From 56f98b125481d5e49904adaf0d84317885828cdd Mon Sep 17 00:00:00 2001 From: jollyxenon <1378319314@qq.com> Date: Sat, 2 May 2026 20:54:31 +0800 Subject: [PATCH 2/2] fix(ui): preserve worktree session listing Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus --- packages/ui/src/stores/session-api.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/ui/src/stores/session-api.ts b/packages/ui/src/stores/session-api.ts index 404cedd5e..9c3520b98 100644 --- a/packages/ui/src/stores/session-api.ts +++ b/packages/ui/src/stores/session-api.ts @@ -123,8 +123,14 @@ async function fetchSessions(instanceId: string): Promise { }) try { - log.info("session.list", { instanceId, directory: instance.folder }) - const response = await rootClient.session.list({ directory: instance.folder }) + const projectResponse = await rootClient.project.current() + const projectId = projectResponse.data?.id + const sessionListOptions = projectId === "global" ? { directory: instance.folder } : undefined + + log.info("session.list", { instanceId, projectId, directory: sessionListOptions?.directory }) + const response = sessionListOptions + ? await rootClient.session.list(sessionListOptions) + : await rootClient.session.list() const sessionMap = new Map()