Skip to content

fix(desktop): apply stale remote session fallback on all platforms #35815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leecoder wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

fix(desktop): apply stale remote session fallback on all platforms #35815

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4be1827
fix(desktop): skip stale remote session restore
OpeOginni Jul 7, 2026
71a5a47
fix(desktop): apply stale remote session fallback on all platforms
leecoder Jul 8, 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
18 changes: 17 additions & 1 deletion packages/desktop/src/renderer/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,27 @@ function getLastActiveUrl(windowID: string) {
if (typeof localStorage !== "object") return "/"
try {
const value = localStorage.getItem(windowLastActiveUrlKey(windowID))
if (value?.startsWith("/") && !value.startsWith("//")) return value
if (value?.startsWith("/") && !value.startsWith("//") && !isStaleRemoteSessionUrl(value)) return value
} catch {}
return "/"
}

function isStaleRemoteSessionUrl(value: string) {
const match = value.match(/^\/([^/]+)\/session(?:\/|$)/)
if (!match) return false
const directory = decodeRouteSegment(match[1])
return directory?.startsWith("/") ?? false
}

function decodeRouteSegment(value: string) {
try {
const binary = atob(value.replace(/-/g, "+").replace(/_/g, "/"))
return new TextDecoder().decode(Uint8Array.from(binary, (char) => char.charCodeAt(0)))
} catch {
return undefined
}
}

function setLastActiveUrl(windowID: string, value: string) {
if (typeof localStorage !== "object") return
try {
Expand Down
Loading