fix(opencode): scope --continue to the current worktree directory

packages/opencode/src/session/session.ts

@@ -1014,6 +1014,9 @@ function listByProject(
           : or(...conds)!,
       )
     }
+    if (input.path === "" && input.directory) {
+      conditions.push(eq(SessionTable.directory, input.directory))
+    }
   } else if (input.scope !== "project") {
     if (input.directory) {
       conditions.push(eq(SessionTable.directory, input.directory))

packages/opencode/test/server/session-list.test.ts

@@ -1,4 +1,5 @@
 import { afterEach, describe, expect } from "bun:test"
+import { $ } from "bun"
 import { Effect, Layer } from "effect"
 import { Database } from "@opencode-ai/core/database/database"
 import { SessionProjector } from "@opencode-ai/core/session/projector"
@@ -237,6 +238,39 @@ describe("session.list", () => {
     { git: true },
   )
 
+  it.instance(
+    "filters root worktree sessions by directory when path is empty",
+    () =>
+      Effect.gen(function* () {
+        const test = yield* TestInstance
+        // Two root-level git worktrees of the same repo. Each worktree root maps to an
+        // empty project-relative path (""), so both root sessions share a project_id and
+        // path === "" — directory is the only thing that distinguishes them. Regression
+        // for #25963, where `--continue` could resume another worktree's root session.
+        const featureDir = path.join(test.directory, "..", path.basename(test.directory) + "-feature")
+        yield* Effect.addFinalizer(() =>
+          Effect.promise(() => $`git worktree remove --force ${featureDir}`.cwd(test.directory).quiet().nothrow()).pipe(
+            Effect.ignore,
+          ),
+        )
+        yield* Effect.promise(() => $`git worktree add ${featureDir} -b feature`.cwd(test.directory).quiet())
+
+        const mainSession = yield* withSession({ title: "main-root" })
+        const featureSession = yield* withSession({ title: "feature-root" }).pipe(provideInstance(featureDir))
+
+        expect(mainSession.projectID).toBe(featureSession.projectID)
+        expect(mainSession.path).toBe("")
+        expect(featureSession.path).toBe("")
+
+        const ids = (yield* SessionNs.Service.use((session) =>
+          session.list({ directory: featureDir, path: "" }),
+        )).map((session) => session.id)
+        expect(ids).toContain(featureSession.id)
+        expect(ids).not.toContain(mainSession.id)
+      }),
+    { git: true },
+  )
+
   it.instance(
     "filters root sessions",
     () =>

packages/tui/src/context/sync.tsx

@@ -149,10 +149,11 @@ export const {
       hydratingSessions.get(sessionID)?.parts.add(partID)
     }
 
-    function sessionListQuery(): { scope?: "project"; path?: string } {
+    function sessionListQuery(): { directory?: string; scope?: "project"; path?: string } {
       if (!kv.get("session_directory_filter_enabled", true)) return { scope: "project" }
       if (!project.data.instance.path.worktree || !project.data.instance.path.directory) return { scope: "project" }
       return {
+        directory: project.data.instance.path.directory,
         path: path
           .relative(path.resolve(project.data.instance.path.worktree), project.data.instance.path.directory)
           .replaceAll("\\", "/"),