Skip to content

fix(project): use case-insensitive path comparison for global session migration on Windows #17514

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

fix(project): use case-insensitive path comparison for global session migration on Windows #17514

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
10 changes: 8 additions & 2 deletions packages/opencode/src/project/project.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import z from "zod"
import { Filesystem } from "../util/filesystem"
import path from "path"
import { and, Database, eq } from "../storage/db"
import { and, Database, eq, sql } from "../storage/db"
import { ProjectTable } from "./project.sql"
import { SessionTable } from "../session/session.sql"
import { Log } from "../util/log"
Expand Down Expand Up @@ -276,11 +276,17 @@ export namespace Project {
// Runs on every startup because sessions created before git init
// accumulate under "global" and need migrating whenever they appear.
if (data.id !== ProjectID.global) {
// On Windows, use case-insensitive directory matching since the
// filesystem is case-insensitive and stored paths may differ in case.
const directory =
process.platform === "win32"
? sql`LOWER(${SessionTable.directory}) = ${path.normalize(data.worktree).toLowerCase()}`
: eq(SessionTable.directory, data.worktree)
Database.use((db) =>
db
.update(SessionTable)
.set({ project_id: data.id })
.where(and(eq(SessionTable.project_id, ProjectID.global), eq(SessionTable.directory, data.worktree)))
.where(and(eq(SessionTable.project_id, ProjectID.global), directory))
.run(),
)
}
Expand Down
Loading