Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 16 additions & 3 deletions packages/opencode/src/session/session.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,19 @@ import { NonNegativeInt, optionalOmitUndefined, withStatics } from "@/util/schem

const log = Log.create({ service: "session" })

function windowsDirectoryVariants(directory: string) {
if (!/^[a-zA-Z]:[\\/]/.test(directory) && !directory.startsWith("\\\\") && !directory.startsWith("//")) {
return [directory]
}
return Array.from(new Set([directory, directory.replaceAll("/", "\\"), directory.replaceAll("\\", "/")]))
}

function directoryCondition(directory: string) {
const variants = windowsDirectoryVariants(directory)
if (variants.length === 1) return eq(SessionTable.directory, directory)
return or(...variants.map((item) => eq(SessionTable.directory, item)))!
}

const parentTitlePrefix = "New session - "
const childTitlePrefix = "Child session - "

Expand Down Expand Up @@ -829,13 +842,13 @@ function* listByProject(

conditions.push(
input.directory
? or(...conds, and(isNull(SessionTable.path), eq(SessionTable.directory, input.directory))!)!
? or(...conds, and(isNull(SessionTable.path), directoryCondition(input.directory))!)!
: or(...conds)!,
)
}
} else if (input.scope !== "project" && !Flag.OPENCODE_EXPERIMENTAL_WORKSPACES) {
if (input.directory) {
conditions.push(eq(SessionTable.directory, input.directory))
conditions.push(directoryCondition(input.directory))
}
}
if (input.roots) {
Expand Down Expand Up @@ -876,7 +889,7 @@ export function* listGlobal(input?: {
const conditions: SQL[] = []

if (input?.directory) {
conditions.push(eq(SessionTable.directory, input.directory))
conditions.push(directoryCondition(input.directory))
}
if (input?.roots) {
conditions.push(isNull(SessionTable.parent_id))
Expand Down
15 changes: 14 additions & 1 deletion packages/opencode/src/v2/session.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,19 @@ export type Delivery = Schema.Schema.Type<typeof Delivery>

export const DefaultDelivery = "immediate" satisfies Delivery

function windowsDirectoryVariants(directory: string) {
if (!/^[a-zA-Z]:[\\/]/.test(directory) && !directory.startsWith("\\\\") && !directory.startsWith("//")) {
return [directory]
}
return Array.from(new Set([directory, directory.replaceAll("/", "\\"), directory.replaceAll("\\", "/")]))
}

function directoryCondition(directory: string) {
const variants = windowsDirectoryVariants(directory)
if (variants.length === 1) return eq(SessionTable.directory, directory)
return or(...variants.map((item) => eq(SessionTable.directory, item)))!
}

export class Info extends Schema.Class<Info>("Session.Info")({
id: SessionID,
parentID: optionalOmitUndefined(SessionID),
Expand Down Expand Up @@ -158,7 +171,7 @@ export const layer = Layer.effect(
if (direction === "previous" && order === "asc") order = "desc"
if (direction === "previous" && order === "desc") order = "asc"
const conditions: SQL[] = []
if (input.directory) conditions.push(eq(SessionTable.directory, input.directory))
if (input.directory) conditions.push(directoryCondition(input.directory))
if (input.path)
conditions.push(or(eq(SessionTable.path, input.path), like(SessionTable.path, `${input.path}/%`))!)
if (input.workspaceID) conditions.push(eq(SessionTable.workspace_id, input.workspaceID))
Expand Down
Loading