Skip to content

Commit 59d4d02

Browse files
fix(app): open new workspace sessions after creation (anomalyco#1693)
* fix(app): open new workspace sessions after creation * fix(app): create empty session for new workspaces * fix(app): focus composer for new sessions
1 parent b80b33e commit 59d4d02

4 files changed

Lines changed: 130 additions & 15 deletions

File tree

‎apps/app/src/react-app/shell/session-route.tsx‎

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,12 @@ function describeWorkspaceCreateError(error: unknown) {
192192
return message;
193193
}
194194

195+
function focusPromptSoon() {
196+
if (typeof window === "undefined") return;
197+
const focus = () => window.dispatchEvent(new Event("openwork:focusPrompt"));
198+
[0, 80, 240, 600].forEach((delay) => window.setTimeout(focus, delay));
199+
}
200+
195201
const emptyPendingPermissions: PendingPermission[] = [];
196202

197203
function useQueryCacheState<T>(queryKey: readonly unknown[] | null, fallback: T): T {
@@ -1726,6 +1732,7 @@ export function SessionRoute() {
17261732
[workspaceId]: [session as any, ...(current[workspaceId] ?? [])],
17271733
}));
17281734
navigateToWorkspaceSession(workspaceId, session.id);
1735+
focusPromptSoon();
17291736
void refreshRouteState();
17301737
} catch (error) {
17311738
const message = describeRouteError(error);
@@ -1868,6 +1875,8 @@ export function SessionRoute() {
18681875
preset,
18691876
});
18701877
const createdId = resolveWorkspaceListSelectedId(list) || list.workspaces[list.workspaces.length - 1]?.id || "";
1878+
let targetWorkspaceId = createdId;
1879+
let targetWorkspace = list.workspaces.find((workspace) => workspace.id === createdId) ?? null;
18711880
if (createdId) {
18721881
await workspaceSetSelected(createdId).catch(() => undefined);
18731882
await workspaceSetRuntimeActive(createdId).catch(() => undefined);
@@ -1878,23 +1887,45 @@ export function SessionRoute() {
18781887
// is launched with a fixed --workspace list at boot and the bridge
18791888
// write only updates desktop-side state).
18801889
if (client) {
1881-
await client
1890+
const serverList = await client
18821891
.createLocalWorkspace({ folderPath: folder, name: workspaceName, preset })
1883-
.catch(() => undefined);
1892+
.catch(() => null);
1893+
targetWorkspaceId = serverList
1894+
? resolveWorkspaceListSelectedId(serverList) || serverList.workspaces[serverList.workspaces.length - 1]?.id || targetWorkspaceId
1895+
: targetWorkspaceId;
1896+
targetWorkspace = serverList?.workspaces.find((workspace) => workspace.id === targetWorkspaceId) ?? targetWorkspace;
18841897
}
18851898
setCreateWorkspaceOpen(false);
18861899
// Mark onboarding complete so the /welcome redirect never fires again.
18871900
local.setPrefs((prev) => ({ ...prev, hasCompletedOnboarding: true }));
18881901
await refreshRouteState();
1889-
if (createdId) {
1890-
handleOpenSettings("/settings/general", createdId);
1902+
if (targetWorkspaceId) {
1903+
const workspacePath = targetWorkspace?.path?.trim() || folder;
1904+
const session = baseUrl && token
1905+
? unwrap(await createClient(
1906+
`${(buildOpenworkWorkspaceBaseUrl(baseUrl, targetWorkspaceId) ?? baseUrl).replace(/\/+$/, "")}/opencode`,
1907+
workspacePath || undefined,
1908+
{ token, mode: "openwork" },
1909+
).session.create({ directory: workspacePath || undefined }))
1910+
: null;
1911+
setLegacySelectedWorkspaceId(targetWorkspaceId);
1912+
writeActiveWorkspaceId(targetWorkspaceId);
1913+
if (session?.id) {
1914+
writeLastSessionFor(targetWorkspaceId, session.id);
1915+
setSessionsByWorkspaceId((current) => ({
1916+
...current,
1917+
[targetWorkspaceId]: [session as any, ...(current[targetWorkspaceId] ?? [])],
1918+
}));
1919+
}
1920+
navigateToWorkspaceSession(targetWorkspaceId, session?.id ?? null, { replace: true });
1921+
if (session?.id) focusPromptSoon();
18911922
}
18921923
} catch (error) {
18931924
setCreateWorkspaceError(describeWorkspaceCreateError(error));
18941925
} finally {
18951926
setCreateWorkspaceBusy(false);
18961927
}
1897-
}, [client, handleOpenSettings, local, refreshRouteState]);
1928+
}, [client, local, navigateToWorkspaceSession, refreshRouteState]);
18981929

18991930
const handleCreateRemoteWorkspace = useCallback(async (input: {
19001931
openworkHostUrl?: string | null;

‎apps/app/src/react-app/shell/welcome-route.tsx‎

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,27 @@ import {
1212
workspaceSetSelected,
1313
} from "../../app/lib/desktop";
1414
import { isDesktopRuntime } from "../../app/utils";
15+
import { createClient, unwrap } from "../../app/lib/opencode";
1516
import { useLocal } from "../kernel/local-provider";
1617
import { WelcomePage } from "../domains/onboarding/welcome-page";
1718
import { CreateWorkspaceModal } from "../domains/workspace/create-workspace-modal";
1819
import { resolveOpenworkConnection } from "./openwork-connection";
19-
import { createOpenworkServerClient } from "../../app/lib/openwork-server";
20-
import { writeActiveWorkspaceId } from "./session-memory";
21-
import { workspaceSessionRoute, workspaceSettingsRoute } from "./workspace-routes";
20+
import { buildOpenworkWorkspaceBaseUrl, createOpenworkServerClient } from "../../app/lib/openwork-server";
21+
import { writeActiveWorkspaceId, writeLastSessionFor } from "./session-memory";
22+
import { workspaceSessionRoute } from "./workspace-routes";
2223

2324
function folderNameFromPath(path: string) {
2425
const normalized = path.replace(/\\/g, "/").replace(/\/+$/, "");
2526
const parts = normalized.split("/").filter(Boolean);
2627
return parts[parts.length - 1] ?? "workspace";
2728
}
2829

30+
function focusPromptSoon() {
31+
if (typeof window === "undefined") return;
32+
const focus = () => window.dispatchEvent(new Event("openwork:focusPrompt"));
33+
[0, 80, 240, 600].forEach((delay) => window.setTimeout(focus, delay));
34+
}
35+
2936
/**
3037
* WelcomeRoute: full-screen welcome page shown on first launch when
3138
* the user has no workspaces and has not completed onboarding.
@@ -70,6 +77,9 @@ export function WelcomeRoute() {
7077
resolveWorkspaceListSelectedId(list) ||
7178
list.workspaces[list.workspaces.length - 1]?.id ||
7279
"";
80+
let targetWorkspaceId = createdId;
81+
let targetWorkspace = list.workspaces.find((workspace) => workspace.id === createdId) ?? null;
82+
let targetSessionId: string | null = null;
7383
if (createdId) {
7484
await workspaceSetSelected(createdId).catch(() => undefined);
7585
await workspaceSetRuntimeActive(createdId).catch(() => undefined);
@@ -85,20 +95,38 @@ export function WelcomeRoute() {
8595
token: resolvedToken,
8696
hostToken: resolvedHostToken || undefined,
8797
});
88-
await openworkClient
98+
const serverList = await openworkClient
8999
.createLocalWorkspace({
90100
folderPath: folder,
91101
name: workspaceName,
92102
preset: "starter",
93103
})
94-
.catch(() => undefined);
104+
.catch(() => null);
105+
targetWorkspaceId = serverList
106+
? resolveWorkspaceListSelectedId(serverList) || serverList.workspaces[serverList.workspaces.length - 1]?.id || targetWorkspaceId
107+
: targetWorkspaceId;
108+
targetWorkspace = serverList?.workspaces.find((workspace) => workspace.id === targetWorkspaceId) ?? targetWorkspace;
109+
if (targetWorkspaceId) {
110+
const workspacePath = targetWorkspace?.path?.trim() || folder;
111+
const session = unwrap(await createClient(
112+
`${(buildOpenworkWorkspaceBaseUrl(normalizedBaseUrl, targetWorkspaceId) ?? normalizedBaseUrl).replace(/\/+$/, "")}/opencode`,
113+
workspacePath || undefined,
114+
{ token: resolvedToken, mode: "openwork" },
115+
).session.create({ directory: workspacePath || undefined }));
116+
targetSessionId = session.id;
117+
}
95118
}
96119
} catch {
97120
// Best-effort server registration.
98121
}
122+
if (targetWorkspaceId) {
123+
writeActiveWorkspaceId(targetWorkspaceId);
124+
if (targetSessionId) writeLastSessionFor(targetWorkspaceId, targetSessionId);
125+
}
99126
markOnboardingComplete();
100127
setModalOpen(false);
101-
navigate(createdId ? workspaceSettingsRoute(createdId, "general") : "/settings/general", { replace: true });
128+
navigate(targetWorkspaceId ? workspaceSessionRoute(targetWorkspaceId, targetSessionId) : "/session", { replace: true });
129+
if (targetSessionId) focusPromptSoon();
102130
} catch (error) {
103131
setCreateError(
104132
error instanceof Error ? error.message : "Failed to create workspace.",

‎evals/onboarding-welcome-flows.md‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ Known regressions this catches:
114114
115115
**Why**: The most common first-run path: pick a local folder and
116116
create a workspace. After creation, onboarding must be marked complete
117-
and the user lands on `/settings/general`.
117+
and the user lands in the new workspace session surface.
118118
119119
Steps:
120120
1. From `/welcome`, click "Get started".
@@ -129,7 +129,8 @@ Steps:
129129
- "Select folder" button.
130130
4. Click "Select folder" and choose a folder.
131131
5. Click "Create Workspace".
132-
6. Expect: workspace is created; URL changes to `/settings/general`.
132+
6. Expect: workspace is created; URL changes to
133+
`/workspace/<new-workspace-id>/session/<new-session-id>`.
133134
7. Navigate to `/welcome`.
134135
8. Expect: URL redirects back to `/session` (not `/welcome`), because
135136
`hasCompletedOnboarding` is now true.
@@ -144,13 +145,18 @@ chrome-devtools_take_snapshot
144145
chrome-devtools_click { uid: <Select folder> }
145146
-- native picker interaction --
146147
chrome-devtools_click { uid: <Create Workspace> }
147-
chrome-devtools_wait_for { text: ["Settings"], timeout: 15000 }
148+
chrome-devtools_wait_for { text: ["New session"], timeout: 15000 }
148149
chrome-devtools_take_snapshot
149150
```
150151
151152
Pass criteria:
152153
- Folder explanation (bullets, hint) is visible before picking.
153-
- After workspace creation, URL is `/settings/general`.
154+
- After workspace creation, URL contains `/workspace/` and `/session/ses_`.
155+
- Main panel heading is "New session".
156+
- Composer is visible with the "Run task" action.
157+
- Composer is focused so typing starts in "Describe your task..." without an
158+
extra click.
159+
- "Select or create a session to get started." is not visible.
154160
- Navigating to `/welcome` redirects away (onboarding flagged done).
155161
- `localStorage` contains `hasCompletedOnboarding: true` in
156162
`openwork.preferences`.

‎evals/react-session-flows.md‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ Pass criteria:
107107
- URL changes to `/session/ses_*`.
108108
- Sidebar shows a new **"New session"** entry above existing sessions.
109109
- Main area renders the composer with **"No transcript yet."**.
110+
- Composer is focused so typing starts in **"Describe your task..."** without
111+
an extra click.
110112
- Composer model label is whatever is saved as default (e.g.
111113
`opencode/minimax-m2.5-free`).
112114

@@ -527,6 +529,52 @@ Pass criteria:
527529

528530
---
529531

532+
## Flow 20 — Local workspace creation opens a new session
533+
534+
**Why**: Creating a local workspace from the session sidebar is a task-starting
535+
flow. The user should land in that workspace's session surface, not in settings.
536+
537+
Steps:
538+
1. From an existing session route, click "Add workspace" in the sidebar.
539+
2. Click "Local workspace".
540+
3. Select or inject a disposable test folder path.
541+
4. Click "Create Workspace".
542+
5. Expect: the modal closes and the URL changes to
543+
`/workspace/<new-workspace-id>/session/<new-session-id>`.
544+
6. Expect: the new workspace is selected in the sidebar.
545+
7. Expect: the main area shows a ready empty chat session for that workspace.
546+
8. Expect: the app does not navigate to `/settings/general`.
547+
548+
Tool recipe:
549+
```
550+
chrome-devtools_take_snapshot
551+
chrome-devtools_click { uid: <Add workspace> }
552+
chrome-devtools_click { uid: <Local workspace card> }
553+
-- select a disposable folder, or inject it when the native picker blocks automation --
554+
chrome-devtools_click { uid: <Create Workspace> }
555+
chrome-devtools_wait_for { text: ["New session"], timeout: 15000 }
556+
chrome-devtools_take_snapshot
557+
```
558+
559+
Pass criteria:
560+
- URL contains `/workspace/` and `/session/ses_`.
561+
- The selected sidebar workspace name matches the folder name.
562+
- Main panel heading is "New session".
563+
- Composer is visible with the "Run task" action.
564+
- Composer is focused so typing starts in "Describe your task..." without an
565+
extra click.
566+
- "Select or create a session to get started." is not visible.
567+
- Settings heading is not visible after creation.
568+
569+
Known regressions this catches:
570+
- Local workspace creation calling `handleOpenSettings("/settings/general")`.
571+
- Local workspace creation stopping at the workspace session root instead of
572+
creating a ready-to-chat empty session.
573+
- The selected workspace id being persisted but the route remaining on the
574+
previous workspace.
575+
576+
---
577+
530578
## Change log
531579

532580
- 2026-04-16 — initial doc after the React port cutover fixed streaming,
@@ -538,3 +586,5 @@ Pass criteria:
538586
- 2026-04-28 — added Flows 13-19: slash command stability, error recovery
539587
with model change, paste chip collapse, user message display, single action
540588
button, skill lifecycle, and workspace button placement.
589+
- 2026-05-06 — added Flow 20 to ensure local workspace creation opens the
590+
new workspace session surface instead of settings.

0 commit comments

Comments
 (0)