Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
915cb9d
feat(web-shell): restore remote workspace add flow
yiliang114 Sep 17, 2026
3ccc4e8
fix(web-shell): restore workspace location choice
yiliang114 Sep 17, 2026
e666df9
feat(web-shell): reuse remote connections for workspaces
yiliang114 Sep 17, 2026
67337b7
feat(web-shell): mark remote workspaces
yiliang114 Sep 17, 2026
11d6bac
fix(web-shell): keep the resumed add flow copy neutral
yiliang114 Sep 17, 2026
b910bfb
test(web-shell): disambiguate the extension manager's Add button
yiliang114 Sep 17, 2026
74fb08e
fix(web-shell): guard the resumed add step outside a document
yiliang114 Sep 17, 2026
b045a7d
test(web-shell): cover the remote workspace add flow end to end
yiliang114 Sep 17, 2026
2cde1e4
Merge remote-tracking branch 'origin/main' into codex/11475-remote-fo…
yiliang114 Sep 17, 2026
1773d98
refactor(web-shell): simplify resumed workspace add state
yiliang114 Sep 17, 2026
2364d15
fix(web-shell): keep the workspace add flow in place and cut its dupl…
yiliang114 Sep 17, 2026
c6b43d6
Merge branch 'main' into codex/11475-remote-folder-entry
yiliang114 Sep 18, 2026
a491d80
revert(web-shell): drop the folder-browser breadcrumbs
yiliang114 Sep 18, 2026
6769641
Merge branch 'main' into codex/11475-remote-folder-entry
yiliang114 Sep 18, 2026
8ccef6c
feat(web-shell): add connected folder sources
yiliang114 Sep 18, 2026
6ab462c
Merge remote-tracking branch 'origin/main' into codex/11475-remote-fo…
yiliang114 Sep 18, 2026
1b5c3d6
feat(web-shell): complete remote connection setup
yiliang114 Sep 18, 2026
0696655
fix(web-shell): drop a return location an abandoned hand-over left be…
yiliang114 Sep 19, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(web-shell): guard the resumed add step outside a document
  • Loading branch information
yiliang114 committed Sep 17, 2026
commit 74fb08e133d8ba0a506fd9e9447ac9572a363080
9 changes: 9 additions & 0 deletions packages/web-shell/client/config/remote-workspace-add.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,4 +141,13 @@ describe('remote workspace add navigation', () => {
`${testOrigin}/session/current?daemon=https%3A%2F%2Fremote.example`,
);
});

it('reports no step for an entry point evaluated outside a document', () => {
vi.stubGlobal('window', undefined);
try {
expect(getRemoteWorkspaceAddStep()).toBeUndefined();
} finally {
vi.unstubAllGlobals();
}
});
});
4 changes: 4 additions & 0 deletions packages/web-shell/client/config/remote-workspace-add.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ export type RemoteWorkspaceAddStep = 'connect' | 'browse';
export function getRemoteWorkspaceAddStep():
| RemoteWorkspaceAddStep
| undefined {
// Parity with getAllowedDaemonOrigin in the sibling module: this is the only
// reader on a render path, and an entry point that evaluates outside a
// document has no URL to carry a step.
if (typeof window === 'undefined') return undefined;
const step = new URLSearchParams(window.location.search).get(FLOW_PARAM);
return step === 'connect' || step === 'browse' ? step : undefined;
}
Expand Down