Skip to content

fix: normalize WSL desktop session paths #22049

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
paulcatamio wants to merge 1 commit into
base: dev
Choose a base branch
from
+19 −2
Open

fix: normalize WSL desktop session paths #22049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion packages/app/src/pages/layout/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ type SessionStore = {
}

export const workspaceKey = (directory: string) => {
const value = directory.replaceAll("\\", "/")
let value = directory.replaceAll("\\", "/")
const wslMatch = value.match(/(?:^|\/+)(?:wsl(?:\.localhost|\$))\/[^/]+(\/.*)$/i)
if (wslMatch?.[1]) {
value = wslMatch[1]
}
const drive = value.match(/^([A-Za-z]:)\/+$/)
if (drive) return `${drive[1]}/`
if (/^\/+$/i.test(value)) return "/"
Expand Down
15 changes: 14 additions & 1 deletion packages/opencode/src/session/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,18 @@ export namespace Session {
const parentTitlePrefix = "New session - "
const childTitlePrefix = "Child session - "

function normalizeSessionDirectory(directory: string) {
let value = directory.replaceAll("\\", "/")
const wslMatch = value.match(/(?:^|\/+)(?:wsl(?:\.localhost|\$))\/[^/]+(\/.*)$/i)
if (wslMatch?.[1]) {
value = wslMatch[1]
}
const drive = value.match(/^([A-Za-z]:)\/+$/)
if (drive) return `${drive[1]}/`
if (/^\/+$/i.test(value)) return "/"
return value.replace(/\/+$/, "")
}

function createDefaultTitle(isChild = false) {
return (isChild ? childTitlePrefix : parentTitlePrefix) + new Date().toISOString()
}
Expand Down Expand Up @@ -381,12 +393,13 @@ export namespace Session {
permission?: Permission.Ruleset
}) {
const ctx = yield* InstanceState.context
const directory = normalizeSessionDirectory(input.directory)
const result: Info = {
id: SessionID.descending(input.id),
slug: Slug.create(),
version: Installation.VERSION,
projectID: ctx.project.id,
directory: input.directory,
directory,
workspaceID: input.workspaceID,
parentID: input.parentID,
title: input.title ?? createDefaultTitle(!!input.parentID),
Expand Down
Loading