feat(tui): prefetch open session tabs after connect (#39589 )

feat(tui): make session tab switching fast for long transcripts (#39568 )
fix(tui): correct project-aware session lists
2026-07-29 22:51:51 -04:00 · 2026-07-29 22:23:13 -04:00 · 2026-07-29 22:23:10 -04:00 · 2026-07-29 21:59:33 -04:00 · 2026-07-30 00:28:33 +00:00 · 2026-07-29 18:11:58 -05:00
55 changed files with 723 additions and 802 deletions
@@ -402,11 +402,8 @@
        "immer": "11.1.4",
        "jsonc-parser": "3.3.1",
        "semver": "^7.6.3",
-        "tree-sitter-bash": "0.25.0",
-        "tree-sitter-powershell": "0.25.10",
        "turndown": "7.2.0",
        "venice-ai-sdk-provider": "2.1.1",
-        "web-tree-sitter": "0.25.10",
        "which": "6.0.1",
        "zod": "catalog:",
      },
@@ -1076,11 +1073,9 @@
  },
  "trustedDependencies": [
    "esbuild",
-    "tree-sitter-powershell",
    "protobufjs",
    "electron",
    "web-tree-sitter",
-    "tree-sitter-bash",
  ],
  "patchedDependencies": {
    "@pierre/trees@1.0.0-beta.4": "patches/@pierre%2Ftrees@1.0.0-beta.4.patch",
@@ -4077,10 +4072,10 @@

    "fetch-blob": ["fetch-blob@3.2.0", "", { "dependencies": { "node-domexception": "^1.0.0", "web-streams-polyfill": "^3.0.3" } }, "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ=="],

-    "ffi-rs": ["ffi-rs@1.3.2", "", { "optionalDependencies": { "@yuuang/ffi-rs-android-arm64": "1.3.2", "@yuuang/ffi-rs-darwin-arm64": "1.3.2", "@yuuang/ffi-rs-darwin-x64": "1.3.2", "@yuuang/ffi-rs-linux-arm-gnueabihf": "1.3.2", "@yuuang/ffi-rs-linux-arm64-gnu": "1.3.2", "@yuuang/ffi-rs-linux-arm64-musl": "1.3.2", "@yuuang/ffi-rs-linux-x64-gnu": "1.3.2", "@yuuang/ffi-rs-linux-x64-musl": "1.3.2", "@yuuang/ffi-rs-win32-arm64-msvc": "1.3.2", "@yuuang/ffi-rs-win32-ia32-msvc": "1.3.2", "@yuuang/ffi-rs-win32-x64-msvc": "1.3.2" } }, "sha512-4s8dX9VbBw/jd5NOuE3EJRqXaIVdjMyiumeeDzrOhtjQRwp6Bz2za7iksWXTnvTQKV/tTdm1s1w7mObe92zPjQ=="],
-
    "file-uri-to-path": ["file-uri-to-path@1.0.0", "", {}, "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="],

+    "ffi-rs": ["ffi-rs@1.3.2", "", { "optionalDependencies": { "@yuuang/ffi-rs-android-arm64": "1.3.2", "@yuuang/ffi-rs-darwin-arm64": "1.3.2", "@yuuang/ffi-rs-darwin-x64": "1.3.2", "@yuuang/ffi-rs-linux-arm-gnueabihf": "1.3.2", "@yuuang/ffi-rs-linux-arm64-gnu": "1.3.2", "@yuuang/ffi-rs-linux-arm64-musl": "1.3.2", "@yuuang/ffi-rs-linux-x64-gnu": "1.3.2", "@yuuang/ffi-rs-linux-x64-musl": "1.3.2", "@yuuang/ffi-rs-win32-arm64-msvc": "1.3.2", "@yuuang/ffi-rs-win32-ia32-msvc": "1.3.2", "@yuuang/ffi-rs-win32-x64-msvc": "1.3.2" } }, "sha512-4s8dX9VbBw/jd5NOuE3EJRqXaIVdjMyiumeeDzrOhtjQRwp6Bz2za7iksWXTnvTQKV/tTdm1s1w7mObe92zPjQ=="],
+
    "filelist": ["filelist@1.0.6", "", { "dependencies": { "minimatch": "^5.0.1" } }, "sha512-5giy2PkLYY1cP39p17Ech+2xlpTRL9HLspOfEgm0L6CwBXBTgsK5ou0JtzYuepxkaQ/tvhCFIJ5uXo0OrM2DxA=="],

    "fill-range": ["fill-range@7.1.1", "", { "dependencies": { "to-regex-range": "^5.0.1" } }, "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg=="],
@@ -5639,10 +5634,6 @@

    "traverse": ["traverse@0.3.9", "", {}, "sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ=="],

-    "tree-sitter-bash": ["tree-sitter-bash@0.25.0", "", { "dependencies": { "node-addon-api": "^8.2.1", "node-gyp-build": "^4.8.2" }, "peerDependencies": { "tree-sitter": "^0.25.0" }, "optionalPeers": ["tree-sitter"] }, "sha512-gZtlj9+qFS81qKxpLfD6H0UssQ3QBc/F0nKkPsiFDyfQF2YBqYvglFJUzchrPpVhZe9kLZTrJ9n2J6lmka69Vg=="],
-
-    "tree-sitter-powershell": ["tree-sitter-powershell@0.25.10", "", { "dependencies": { "node-addon-api": "^7.1.0", "node-gyp-build": "^4.8.0" }, "peerDependencies": { "tree-sitter": "^0.25.0" }, "optionalPeers": ["tree-sitter"] }, "sha512-bEt8QoySpGFnU3aa8WedQyNMaN6aTwy/WUbvIVt0JSKF+BbJoSHNHu+wCbhj7xLMsfB0AuffmiJm+B8gzva8Lg=="],
-
    "treeverse": ["treeverse@3.0.0", "", {}, "sha512-gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ=="],

    "trim-lines": ["trim-lines@3.0.1", "", {}, "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg=="],
@@ -6865,8 +6856,6 @@

    "topojson-client/commander": ["commander@2.20.3", "", {}, "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="],

-    "tree-sitter-bash/node-addon-api": ["node-addon-api@8.9.0", "", {}, "sha512-ekZMeaaIzSQTSpr7X2X3iJM7lTzgnx8ahAG9pJfT/7+14mlEM8ZYQ9cgCDvSSRbReFK0oHli3WrZdCiRsgAT9Q=="],
-
    "tw-to-css/postcss": ["postcss@8.4.31", "", { "dependencies": { "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" } }, "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ=="],

    "tw-to-css/tailwindcss": ["tailwindcss@3.3.2", "", { "dependencies": { "@alloc/quick-lru": "^5.2.0", "arg": "^5.0.2", "chokidar": "^3.5.3", "didyoumean": "^1.2.2", "dlv": "^1.1.3", "fast-glob": "^3.2.12", "glob-parent": "^6.0.2", "is-glob": "^4.0.3", "jiti": "^1.18.2", "lilconfig": "^2.1.0", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "object-hash": "^3.0.0", "picocolors": "^1.0.0", "postcss": "^8.4.23", "postcss-import": "^15.1.0", "postcss-js": "^4.0.1", "postcss-load-config": "^4.0.1", "postcss-nested": "^6.0.1", "postcss-selector-parser": "^6.0.11", "postcss-value-parser": "^4.2.0", "resolve": "^1.22.2", "sucrase": "^3.32.0" }, "bin": { "tailwind": "lib/cli.js", "tailwindcss": "lib/cli.js" } }, "sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w=="],
@@ -129,8 +129,8 @@ export const loadProjectsQuery = (scope: ServerScope, api: ProjectApi) =>
        api.list().then((projects) => {
          return projects
            .filter((p) => !!p?.id)
-            .filter((p) => !!p.worktree && !p.worktree.includes("opencode-test"))
            .map(normalizeProjectInfo)
+            .filter((p) => !!p.worktree && !p.worktree.includes("opencode-test"))
            .slice()
            .sort((a, b) => cmp(a.id, b.id))
        }),
@@ -168,6 +168,7 @@ export function sanitizeProject(project: Project) {
 export function normalizeProjectInfo(project: Project | CurrentProject): Project {
  return {
    ...project,
+    worktree: "canonical" in project ? project.canonical : project.worktree,
    vcs: project.vcs === "git" ? "git" : undefined,
  }
 }
@@ -128,7 +128,7 @@ function createV1Api(input: CompatibleInput): CompatibleApi {
  const located = <T>(data: T, value?: { directory?: string }) => ({
    location: {
      directory: directory(value) ?? "",
-      project: { id: "", directory: directory(value) ?? "" },
+      project: { id: "", directory: directory(value) ?? "", canonical: directory(value) ?? "" },
    },
    data,
  })
@@ -298,12 +298,19 @@ function createV1Api(input: CompatibleInput): CompatibleApi {
    project: {
      ...input.current.project,
      async list() {
-        return ((await legacy().project.list()).data ?? []) as Project[]
+        return ((await legacy().project.list()).data ?? []).map((project) => ({
+          ...project,
+          canonical: project.worktree,
+        }))
      },
      async current(value?: Parameters<ServerApi["project"]["current"]>[0]) {
        const result = await legacy(value?.location).project.current()
        if (!result.data) throw new Error("Project not found")
-        return { id: result.data.id, directory: result.data.worktree } satisfies ProjectCurrent
+        return {
+          id: result.data.id,
+          directory: result.data.worktree,
+          canonical: result.data.worktree,
+        } satisfies ProjectCurrent
      },
      // async update(value: Parameters<ServerApi["project"]["update"]>[0]) {
      //   const project = (await legacy().project.list()).data?.find((item) => item.id === value.projectID)
@@ -40,9 +40,6 @@
    "open": "10.1.2",
    "semver": "catalog:",
    "solid-js": "catalog:",
-    "tree-sitter-bash": "0.25.0",
-    "tree-sitter-powershell": "0.25.10",
-    "web-tree-sitter": "0.25.10",
    "uqr": "0.1.3",
    "ws": "8.21.0"
  },
@@ -3,7 +3,7 @@ import { copyFile, mkdir, readdir, readFile, stat } from "node:fs/promises"
 import path from "node:path"
 import { fileURLToPath } from "node:url"
 import { getNodeAssets } from "@opentui/core/node-assets"
-import { attentionSoundAssets, type NodeTarget, photonWasmAsset, shellParserWasmAssets } from "../src/node/target"
+import { attentionSoundAssets, type NodeTarget, photonWasmAsset } from "../src/node/target"

 const dir = path.resolve(import.meta.dirname, "..")

@@ -43,10 +43,6 @@ export async function collectNodeAssets(target: NodeTarget) {
      key: photonWasmAsset,
      source: fileURLToPath(import.meta.resolve(photonWasmAsset)),
    },
-    ...Object.values(shellParserWasmAssets).map((key) => ({
-      key,
-      source: fileURLToPath(import.meta.resolve(key)),
-    })),
    ...attentionSoundAssets.map((key) => ({
      key,
      source: path.resolve(dir, "../ui/src/assets/audio", path.basename(key)),
@@ -29,11 +29,6 @@ export function nodeTarget(platform: string, arch: string) {
 }

 export const photonWasmAsset = "@silvia-odwyer/photon-node/photon_rs_bg.wasm"
-export const shellParserWasmAssets = {
-  runtime: "web-tree-sitter/tree-sitter.wasm",
-  bash: "tree-sitter-bash/tree-sitter-bash.wasm",
-  powershell: "tree-sitter-powershell/tree-sitter-powershell.wasm",
-} as const
 export const nodeExecArgv = ["--experimental-ffi", "--use-system-ca", "--disable-warning=ExperimentalWarning"] as const

 export const attentionSoundAssets = [
@@ -3,7 +3,7 @@ import { OpenCode, type LocationGetOutput, type ModelRef, type SessionInfo } fro
 import { resolveSessionTarget, SessionTargetMutationError } from "../src/session-target"

 function location(directory: string, workspaceID?: string): LocationGetOutput {
-  return { directory, workspaceID, project: { id: "project", directory } }
+  return { directory, workspaceID, project: { id: "project", directory, canonical: directory } }
 }

 function session(id: string, directory: string, workspaceID?: string, model?: ModelRef): SessionInfo {
@@ -3,13 +3,7 @@ import { readFile } from "node:fs/promises"
 import { createRequire } from "node:module"
 import { defineConfig, type Plugin, type UserConfig } from "vite"
 import solid from "vite-plugin-solid"
-import {
-  nodeExecArgv,
-  nodeTarget,
-  type NodeTarget,
-  photonWasmAsset,
-  shellParserWasmAssets,
-} from "./src/node/target"
+import { nodeExecArgv, nodeTarget, type NodeTarget, photonWasmAsset } from "./src/node/target"

 const dir = import.meta.dirname

@@ -200,9 +194,6 @@ process.env.OTUI_ASSET_ROOT = __ocAssetRoot
 process.env.OPENCODE_NODE_PTY_PATH = __ocPath.join(__ocAssetRoot, ${JSON.stringify(input.target.nodePtyEntryAsset)})
 process.env.OPENCODE_PARCEL_WATCHER_PATH = __ocPath.join(__ocAssetRoot, ${JSON.stringify(input.target.parcelWatcherAsset)})
 process.env.OPENCODE_PHOTON_WASM_PATH = __ocPath.join(__ocAssetRoot, ${JSON.stringify(photonWasmAsset)})
-process.env.OPENCODE_TREE_SITTER_WASM_PATH = __ocPath.join(__ocAssetRoot, ${JSON.stringify(shellParserWasmAssets.runtime)})
-process.env.OPENCODE_TREE_SITTER_BASH_WASM_PATH = __ocPath.join(__ocAssetRoot, ${JSON.stringify(shellParserWasmAssets.bash)})
-process.env.OPENCODE_TREE_SITTER_POWERSHELL_WASM_PATH = __ocPath.join(__ocAssetRoot, ${JSON.stringify(shellParserWasmAssets.powershell)})
 process.env.FFF_BINARY_PATH = __ocPath.join(__ocAssetRoot, ${JSON.stringify(input.target.fffAsset)})
 process.env.OPENCODE_FFF_FFI_PATH = __ocPath.join(__ocAssetRoot, ${JSON.stringify(input.target.fffFfiAsset)})
 try {
@@ -279,7 +279,7 @@ export type ProjectCommands = { start?: string }

 export type ProjectTime = { created: number; updated: number; initialized?: number }

-export type ProjectCurrent = { id: string; directory: string }
+export type ProjectCurrent = { id: string; directory: string; canonical: string }

 export type ProjectDirectory = { directory: string; strategy?: string }

@@ -1430,7 +1430,7 @@ export type McpResourceCatalog = { resources: Array<McpResource>; templates: Arr

 export type Project = {
  id: string
-  worktree: string
+  canonical: string
  vcs?: ProjectVcs
  name?: string
  icon?: ProjectIcon
@@ -2515,7 +2515,11 @@ export type LocationGetInput = {
  }["location"]
 }

-export type LocationGetOutput = { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+export type LocationGetOutput = {
+  directory: string
+  workspaceID?: string
+  project: { id: string; directory: string; canonical: string }
+}

 export type AgentListInput = {
  readonly location?: {
@@ -2524,7 +2528,7 @@ export type AgentListInput = {
 }

 export type AgentListOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: Array<AgentInfo>
 }

@@ -2536,7 +2540,7 @@ export type AgentGetInput = {
 }

 export type AgentGetOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: AgentInfo
 }

@@ -2547,7 +2551,7 @@ export type PluginListInput = {
 }

 export type PluginListOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: Array<PluginInfo>
 }

@@ -3231,7 +3235,7 @@ export type ModelListInput = {
 }

 export type ModelListOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: Array<ModelInfo>
 }

@@ -3242,7 +3246,7 @@ export type ModelDefaultInput = {
 }

 export type ModelDefaultOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: ModelInfo | null
 }

@@ -3269,7 +3273,7 @@ export type ProviderListInput = {
 }

 export type ProviderListOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: Array<ProviderInfo>
 }

@@ -3281,7 +3285,7 @@ export type ProviderGetInput = {
 }

 export type ProviderGetOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: ProviderInfo
 }

@@ -3292,7 +3296,7 @@ export type IntegrationListInput = {
 }

 export type IntegrationListOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: Array<IntegrationInfo>
 }

@@ -3304,7 +3308,7 @@ export type IntegrationGetInput = {
 }

 export type IntegrationGetOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: IntegrationInfo | null
 }

@@ -3351,7 +3355,7 @@ export type IntegrationOauthConnectInput = {
 }

 export type IntegrationOauthConnectOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: {
    attemptID: string
    url: string
@@ -3370,7 +3374,7 @@ export type IntegrationOauthStatusInput = {
 }

 export type IntegrationOauthStatusOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: IntegrationAttemptStatus
 }

@@ -3405,7 +3409,7 @@ export type IntegrationCommandConnectInput = {
 }

 export type IntegrationCommandConnectOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: IntegrationCommandAttempt
 }

@@ -3418,7 +3422,7 @@ export type IntegrationCommandStatusInput = {
 }

 export type IntegrationCommandStatusOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: IntegrationCommandAttemptStatus
 }

@@ -3439,7 +3443,7 @@ export type McpListInput = {
 }

 export type McpListOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: Array<McpServer>
 }

@@ -3528,7 +3532,7 @@ export type McpResourceCatalogInput = {
 }

 export type McpResourceCatalogOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: McpResourceCatalog
 }

@@ -3577,7 +3581,7 @@ export type FormRequestListInput = {
 }

 export type FormRequestListOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: Array<FormInfo>
 }

@@ -4433,7 +4437,7 @@ export type PermissionRequestListInput = {
 }

 export type PermissionRequestListOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: Array<PermissionRequest>
 }

@@ -4555,7 +4559,7 @@ export type FileListInput = {
 }

 export type FileListOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: Array<FileSystemEntry>
 }

@@ -4587,7 +4591,7 @@ export type FileFindInput = {
 }

 export type FileFindOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: Array<FileSystemEntry>
 }

@@ -4598,7 +4602,7 @@ export type CommandListInput = {
 }

 export type CommandListOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: Array<CommandInfo>
 }

@@ -4609,7 +4613,7 @@ export type SkillListInput = {
 }

 export type SkillListOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: Array<SkillInfo>
 }

@@ -4622,7 +4626,7 @@ export type PtyListInput = {
 }

 export type PtyListOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: Array<Pty>
 }

@@ -4668,7 +4672,7 @@ export type PtyCreateInput = {
 }

 export type PtyCreateOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: Pty
 }

@@ -4680,7 +4684,7 @@ export type PtyGetInput = {
 }

 export type PtyGetOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: Pty
 }

@@ -4697,7 +4701,7 @@ export type PtyUpdateInput = {
 }

 export type PtyUpdateOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: Pty
 }

@@ -4717,7 +4721,7 @@ export type ShellListInput = {
 }

 export type ShellListOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: Array<ShellInfo1>
 }

@@ -4752,7 +4756,7 @@ export type ShellCreateInput = {
 }

 export type ShellCreateOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: ShellInfo1
 }

@@ -4764,7 +4768,7 @@ export type ShellGetInput = {
 }

 export type ShellGetOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: ShellInfo1
 }

@@ -4777,7 +4781,7 @@ export type ShellTimeoutInput = {
 }

 export type ShellTimeoutOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: ShellInfo1
 }

@@ -4801,7 +4805,7 @@ export type ShellOutputInput = {
 }

 export type ShellOutputOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: { output: string; cursor: number; size: number; truncated: boolean }
 }

@@ -4821,7 +4825,7 @@ export type QuestionRequestListInput = {
 }

 export type QuestionRequestListOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: Array<QuestionRequest>
 }

@@ -4851,7 +4855,7 @@ export type ReferenceListInput = {
 }

 export type ReferenceListOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: Array<ReferenceInfo>
 }

@@ -4894,7 +4898,7 @@ export type VcsStatusInput = {
 }

 export type VcsStatusOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: Array<VcsFileStatus>
 }

@@ -4917,7 +4921,7 @@ export type VcsDiffInput = {
 }

 export type VcsDiffOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: Array<FileDiffInfo>
 }

@@ -4938,7 +4942,7 @@ export type WebsearchProvidersInput = {
 }

 export type WebsearchProvidersOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: Array<WebSearchProvider>
 }

@@ -4951,6 +4955,6 @@ export type WebsearchQueryInput = {
 }

 export type WebsearchQueryOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
  data: { providerID: string; results: Array<WebSearchResult> }
 }
@@ -41,11 +41,6 @@
      "node": "./src/image/photon-wasm.node.ts",
      "default": "./src/image/photon-wasm.bun.ts"
    },
-    "#shell-parser-wasm": {
-      "bun": "./src/shell/parser-wasm.bun.ts",
-      "node": "./src/shell/parser-wasm.node.ts",
-      "default": "./src/shell/parser-wasm.bun.ts"
-    },
    "#process-lock-ffi": {
      "bun": "./src/util/process-lock-ffi.bun.ts",
      "node": "./src/util/process-lock-ffi.node.ts",
@@ -124,10 +119,7 @@
    "jsonc-parser": "3.3.1",
    "semver": "^7.6.3",
    "turndown": "7.2.0",
-    "tree-sitter-bash": "0.25.0",
-    "tree-sitter-powershell": "0.25.10",
    "venice-ai-sdk-provider": "2.1.1",
-    "web-tree-sitter": "0.25.10",
    "which": "6.0.1",
    "zod": "catalog:"
  },
@@ -25,7 +25,7 @@ const layer = (ref: Ref) =>
      return Service.of({
        directory: ref.directory,
        workspaceID: ref.workspaceID,
-        project: { id: resolved.id, directory: resolved.directory },
+        project: { id: resolved.id, directory: resolved.directory, canonical: resolved.canonical },
        vcs: resolved.vcs,
      })
    }),
@@ -2,7 +2,7 @@ export * as Project from "./project"

 import { Context, Effect, Layer, Schema } from "effect"
 import { ChildProcess } from "effect/unstable/process"
-import { asc, desc } from "drizzle-orm"
+import { asc, desc, isNotNull, isNull, ne, or } from "drizzle-orm"
 import path from "path"
 import { AbsolutePath } from "./schema"
 import { Database } from "./database/database"
@@ -40,6 +40,7 @@ export interface Resolved {
  readonly previous?: ID
  readonly id: ID
  readonly directory: AbsolutePath
+  readonly canonical: AbsolutePath
  readonly vcs?: Vcs
 }

@@ -83,7 +84,7 @@ function fromRow(row: typeof ProjectTable.$inferSelect): Info {
      : undefined
  return {
    id: row.id,
-    worktree: row.worktree,
+    canonical: row.worktree,
    vcs: row.vcs ?? undefined,
    name: row.name ?? undefined,
    icon,
@@ -106,6 +107,40 @@ const layer = Layer.effect(
    const db = (yield* Database.Service).db
    const projectDirectories = yield* ProjectDirectories.Service

+    const persist = Effect.fnUntraced(function* (project: Resolved) {
+      yield* db
+        .transaction((tx) =>
+          Effect.gen(function* () {
+            const vcs = project.vcs?.type
+            yield* tx
+              .insert(ProjectTable)
+              .values({ id: project.id, worktree: project.canonical, vcs, sandboxes: [] })
+              .onConflictDoUpdate({
+                target: ProjectTable.id,
+                set: { worktree: project.canonical, vcs: vcs ?? null },
+                setWhere: or(
+                  ne(ProjectTable.worktree, project.canonical),
+                  vcs ? or(isNull(ProjectTable.vcs), ne(ProjectTable.vcs, vcs)) : isNotNull(ProjectTable.vcs),
+                ),
+              })
+              .run()
+            if (!project.vcs) return
+            yield* projectDirectories.create({ projectID: project.id, directory: project.canonical }, tx)
+            if (project.directory === project.canonical) return
+            yield* projectDirectories.create(
+              {
+                projectID: project.id,
+                directory: project.directory,
+                strategy: project.vcs.type === "git" ? "git_worktree" : undefined,
+              },
+              tx,
+            )
+          }),
+        )
+        .pipe(Effect.orDie)
+      return project
+    })
+
    const list = Effect.fn("Project.list")(function* () {
      const rows = yield* db
        .select()
@@ -211,17 +246,25 @@ const layer = Layer.effect(
      if (repo) {
        const previous = yield* cached(repo.commonDirectory)
        const id = (yield* remote(repo)) ?? previous ?? (yield* root(repo))
-        return {
+        const canonical = yield* git.worktree
+          .list(repo)
+          .pipe(
+            Effect.map((items) => items.find((item) => item.kind === "main")?.directory ?? repo.worktree),
+            Effect.catch(() => Effect.succeed(repo.worktree)),
+          )
+        return yield* persist({
          previous,
          id: id ?? ID.global,
          directory: repo.worktree,
+          canonical,
          vcs: { type: "git" as const, store: repo.commonDirectory },
-        }
+        })
      }

      const hg = yield* hgDiscover(input)
-      if (hg) return hg
-      return { id: ID.global, directory: AbsolutePath.make(path.parse(input).root), vcs: undefined }
+      if (hg) return yield* persist({ ...hg, canonical: hg.directory })
+      const directory = AbsolutePath.make(path.parse(input).root)
+      return yield* persist({ id: ID.global, directory, canonical: directory, vcs: undefined })
    })

    const commit = Effect.fn("Project.commit")(function* (input: { store: AbsolutePath; id: ID }) {
@@ -3,7 +3,7 @@ export * from "./session/schema"

 import { Effect, Layer, Schema, Context, Stream, Scope } from "effect"
 import { ListAnchor } from "@opencode-ai/schema/session"
-import { and, asc, desc, eq, gt, isNull, like, lt, or, type SQL } from "drizzle-orm"
+import { and, asc, desc, eq, gt, isNotNull, isNull, like, lt, ne, or, type SQL } from "drizzle-orm"
 import { Project } from "./project"
 import { Workspace } from "./workspace"
 import { Model } from "./model"
@@ -325,6 +325,22 @@ const layer = Layer.effect(
    const shellLocks = KeyedMutex.makeUnsafe<SessionSchema.ID>()
    const decodeMessage = Schema.decodeUnknownEffect(SessionMessage.Info)
    const isDurableSessionEvent = Schema.is(SessionEvent.Durable)
+    const persistProject = (project: Project.Resolved) => {
+      const vcs = project.vcs?.type
+      return db
+        .insert(ProjectTable)
+        .values({ id: project.id, worktree: project.canonical, vcs, sandboxes: [] })
+        .onConflictDoUpdate({
+          target: ProjectTable.id,
+          set: { worktree: project.canonical, vcs: vcs ?? null },
+          setWhere: or(
+            ne(ProjectTable.worktree, project.canonical),
+            vcs ? or(isNull(ProjectTable.vcs), ne(ProjectTable.vcs, vcs)) : isNotNull(ProjectTable.vcs),
+          ),
+        })
+        .run()
+        .pipe(Effect.orDie)
+    }
    const decode = (row: typeof SessionMessageTable.$inferSelect) =>
      decodeMessage({ ...row.data, id: row.id, type: row.type }).pipe(
        Effect.mapError(
@@ -347,12 +363,7 @@ const layer = Layer.effect(
        if (location === undefined)
          return yield* Effect.die(new Error("Session.create requires either location or an existing parentID"))
        const project = yield* projects.resolve(location.directory)
-        yield* db
-          .insert(ProjectTable)
-          .values({ id: project.id, worktree: project.directory, vcs: project.vcs?.type, sandboxes: [] })
-          .onConflictDoNothing()
-          .run()
-          .pipe(Effect.orDie)
+        yield* persistProject(project)
        const now = Date.now()
        const info = SessionV1.SessionInfo.make({
          id: sessionID,
@@ -451,6 +462,7 @@ const layer = Layer.effect(
        if ("directory" in input) conditions.push(eq(SessionTable.directory, input.directory))
        if (input.workspaceID) conditions.push(eq(SessionTable.workspace_id, input.workspaceID))
        if ("project" in input) conditions.push(eq(SessionTable.project_id, input.project))
+        if ("project" in input && input.subpath !== undefined) conditions.push(eq(SessionTable.path, input.subpath))
        if (input.search) conditions.push(like(SessionTable.title, `%${input.search}%`))
        if (input.parentID !== undefined)
          conditions.push(
@@ -732,12 +744,7 @@ const layer = Layer.effect(
        )
          return
        const project = yield* projects.resolve(directory)
-        yield* db
-          .insert(ProjectTable)
-          .values({ id: project.id, worktree: project.directory, vcs: project.vcs?.type, sandboxes: [] })
-          .onConflictDoNothing()
-          .run()
-          .pipe(Effect.orDie)
+        yield* persistProject(project)
        if ((yield* execution.active).has(input.sessionID)) {
          yield* execution.interrupt(input.sessionID)
          yield* execution.awaitIdle(input.sessionID)
@@ -1,296 +0,0 @@
-export * as ShellParse from "./parse"
-
-import { Effect } from "effect"
-import { fileURLToPath } from "url"
-import os from "os"
-import path from "path"
-import type { Node } from "web-tree-sitter"
-import { shellParserWasm } from "#shell-parser-wasm"
-import { ShellSelect } from "./select"
-
-type Part = { type: string; text: string }
-const CWD = new Set(["cd", "chdir", "popd", "pushd", "push-location", "set-location"])
-const POWERSHELL_PATH_FLAGS = new Set(["-literalpath", "-path"])
-
-const ARITY: Record<string, number> = {
-  cat: 1,
-  cd: 1,
-  chmod: 1,
-  chown: 1,
-  cp: 1,
-  echo: 1,
-  env: 1,
-  export: 1,
-  grep: 1,
-  kill: 1,
-  killall: 1,
-  ln: 1,
-  ls: 1,
-  mkdir: 1,
-  mv: 1,
-  ps: 1,
-  pwd: 1,
-  rm: 1,
-  rmdir: 1,
-  sleep: 1,
-  source: 1,
-  tail: 1,
-  touch: 1,
-  unset: 1,
-  which: 1,
-  aws: 3,
-  az: 3,
-  bazel: 2,
-  brew: 2,
-  bun: 2,
-  "bun run": 3,
-  "bun x": 3,
-  cargo: 2,
-  "cargo add": 3,
-  "cargo run": 3,
-  cdk: 2,
-  cf: 2,
-  cmake: 2,
-  composer: 2,
-  consul: 2,
-  "consul kv": 3,
-  crictl: 2,
-  deno: 2,
-  "deno task": 3,
-  doctl: 3,
-  docker: 2,
-  "docker builder": 3,
-  "docker compose": 3,
-  "docker container": 3,
-  "docker image": 3,
-  "docker network": 3,
-  "docker volume": 3,
-  eksctl: 2,
-  "eksctl create": 3,
-  firebase: 2,
-  flyctl: 2,
-  gcloud: 3,
-  gh: 3,
-  git: 2,
-  "git config": 3,
-  "git remote": 3,
-  "git stash": 3,
-  go: 2,
-  gradle: 2,
-  helm: 2,
-  heroku: 2,
-  hugo: 2,
-  ip: 2,
-  "ip addr": 3,
-  "ip link": 3,
-  "ip netns": 3,
-  "ip route": 3,
-  kind: 2,
-  "kind create": 3,
-  kubectl: 2,
-  "kubectl kustomize": 3,
-  "kubectl rollout": 3,
-  kustomize: 2,
-  make: 2,
-  mc: 2,
-  "mc admin": 3,
-  minikube: 2,
-  mongosh: 2,
-  mysql: 2,
-  mvn: 2,
-  ng: 2,
-  npm: 2,
-  "npm exec": 3,
-  "npm init": 3,
-  "npm run": 3,
-  "npm view": 3,
-  npx: 2,
-  nvm: 2,
-  nx: 2,
-  openssl: 2,
-  "openssl req": 3,
-  "openssl x509": 3,
-  pip: 2,
-  pipenv: 2,
-  pnpm: 2,
-  "pnpm dlx": 3,
-  "pnpm exec": 3,
-  "pnpm run": 3,
-  poetry: 2,
-  podman: 2,
-  "podman container": 3,
-  "podman image": 3,
-  psql: 2,
-  pulumi: 2,
-  "pulumi stack": 3,
-  python: 2,
-  pyenv: 2,
-  rake: 2,
-  rbenv: 2,
-  "redis-cli": 2,
-  rustup: 2,
-  serverless: 2,
-  sfdx: 3,
-  skaffold: 2,
-  sls: 2,
-  sst: 2,
-  swift: 2,
-  systemctl: 2,
-  terraform: 2,
-  "terraform workspace": 3,
-  tmux: 2,
-  turbo: 2,
-  ufw: 2,
-  vault: 2,
-  "vault auth": 3,
-  "vault kv": 3,
-  vercel: 2,
-  volta: 2,
-  wp: 2,
-  yarn: 2,
-  "yarn dlx": 3,
-  "yarn run": 3,
-}
-
-export const scan = Effect.fn("ShellParse.scan")(function* (command: string, shell: string, cwd: string) {
-  const parsers = yield* Effect.promise(load)
-  const powershell = ShellSelect.ps(shell)
-  const tree = (powershell ? parsers.ps : parsers.bash).parse(command)
-  if (!tree) return yield* Effect.fail(new Error("Failed to parse shell command"))
-
-  return yield* Effect.acquireUseRelease(
-    Effect.succeed(tree),
-    (tree) =>
-      Effect.sync(() =>
-        tree.rootNode.descendantsOfType("command").reduce(
-          (result, node) => {
-            if (!node) return result
-            const command = parts(node)
-            const tokens = command.map((part) => part.text)
-            if (tokens.length === 0) return result
-            const name = powershell ? tokens[0].toLowerCase() : tokens[0]
-            if (CWD.has(name)) {
-              result.directories.push(...directoryArgs(command, powershell, cwd, shell))
-              return result
-            }
-            result.commands.push({
-              resource: (node.parent?.type === "redirected_statement" ? node.parent.text : node.text).trim(),
-              save: `${prefix(tokens).join(" ")} *`,
-            })
-            return result
-          },
-          { commands: [] as Array<{ resource: string; save: string }>, directories: [] as string[] },
-        ),
-      ),
-    (tree) => Effect.sync(() => tree.delete()),
-  )
-})
-
-function parts(node: Node) {
-  return Array.from({ length: node.childCount }).flatMap((_, index): Part[] => {
-    const child = node.child(index)
-    if (!child) return []
-    if (child.type === "command_elements")
-      return Array.from({ length: child.childCount }).flatMap((_, itemIndex): Part[] => {
-        const item = child.child(itemIndex)
-        if (!item || item.type === "command_argument_sep" || item.type === "redirection") return []
-        return [{ type: item.type, text: item.text }]
-      })
-    if (!["command_name", "command_name_expr", "word", "string", "raw_string", "concatenation"].includes(child.type))
-      return []
-    return [{ type: child.type, text: child.text }]
-  })
-}
-
-function directoryArgs(command: Part[], powershell: boolean, cwd: string, shell: string) {
-  if (!powershell)
-    return command
-      .slice(1)
-      .filter((part) => !part.text.startsWith("-"))
-      .map((part) => directoryArgument(part.text, powershell, cwd, shell))
-      .filter((part) => part !== undefined)
-
-  const directories: string[] = []
-  let path = false
-  for (const part of command.slice(1)) {
-    if (path) {
-      const value = directoryArgument(part.text, powershell, cwd, shell)
-      if (value) directories.push(value)
-      path = false
-      continue
-    }
-    if (part.type === "command_parameter") {
-      path = POWERSHELL_PATH_FLAGS.has(part.text.toLowerCase())
-      continue
-    }
-    const value = directoryArgument(part.text, powershell, cwd, shell)
-    if (value) directories.push(value)
-  }
-  return directories
-}
-
-function directoryArgument(value: string, powershell: boolean, cwd: string, shell: string) {
-  const quote = value[0]
-  const text = (quote === '"' || quote === "'") && value.at(-1) === quote ? value.slice(1, -1) : value
-  if (!powershell) return expandKnownDirectory(text)
-
-  // PowerShell exposes environment variables through $env:NAME and provides these
-  // automatic directory variables. Expand only values we can determine without executing code.
-  return expandKnownDirectory(
-    text
-      .replace(/\$\{env:([^}]+)\}/gi, (_, key: string) => environment(key) ?? "")
-      .replace(/\$env:([A-Za-z_][A-Za-z0-9_]*)/gi, (_, key: string) => environment(key) ?? "")
-      .replace(/\$(HOME|PWD|PSHOME)(?=$|[\\/])/gi, (_, key: string) => {
-        if (key.toUpperCase() === "HOME") return os.homedir()
-        if (key.toUpperCase() === "PWD") return cwd
-        return path.dirname(shell)
-      }),
-  )
-}
-
-function expandKnownDirectory(value: string) {
-  // Unknown shell expressions cannot be resolved safely during permission analysis.
-  if (value.includes("$") || value.includes("`") || value.startsWith("(")) return
-  if (value === "~") return os.homedir()
-  if (value.startsWith("~/") || value.startsWith("~\\")) return path.join(os.homedir(), value.slice(2))
-  return value
-}
-
-function environment(key: string) {
-  if (process.platform !== "win32") return process.env[key]
-  const name = Object.keys(process.env).find((item) => item.toLowerCase() === key.toLowerCase())
-  return name ? process.env[name] : undefined
-}
-
-function prefix(tokens: string[]) {
-  for (let length = tokens.length; length > 0; length--) {
-    const arity = ARITY[tokens.slice(0, length).join(" ")]
-    if (arity !== undefined) return tokens.slice(0, arity)
-  }
-  return tokens.slice(0, 1)
-}
-
-function resolve(asset: string) {
-  if (asset.startsWith("file://")) return fileURLToPath(asset)
-  if (asset.startsWith("/") || /^[a-z]:/i.test(asset)) return asset
-  return fileURLToPath(new URL(asset, import.meta.url))
-}
-
-const load = (() => {
-  let loading: ReturnType<typeof initialize> | undefined
-  return () => (loading ??= initialize())
-})()
-
-async function initialize() {
-  const { Parser, Language } = await import("web-tree-sitter")
-  await Parser.init({ locateFile: () => resolve(shellParserWasm.runtime) })
-  const [bashLanguage, psLanguage] = await Promise.all([
-    Language.load(resolve(shellParserWasm.bash)),
-    Language.load(resolve(shellParserWasm.powershell)),
-  ])
-  const bash = new Parser()
-  bash.setLanguage(bashLanguage)
-  const ps = new Parser()
-  ps.setLanguage(psLanguage)
-  return { bash, ps }
-}
@@ -1,8 +0,0 @@
-// @ts-ignore Bun embeds static file imports when compiling the CLI.
-import runtime from "web-tree-sitter/tree-sitter.wasm" with { type: "file" }
-// @ts-ignore Bun embeds static file imports when compiling the CLI.
-import bash from "tree-sitter-bash/tree-sitter-bash.wasm" with { type: "file" }
-// @ts-ignore Bun embeds static file imports when compiling the CLI.
-import powershell from "tree-sitter-powershell/tree-sitter-powershell.wasm" with { type: "file" }
-
-export const shellParserWasm = { runtime, bash, powershell }
@@ -1,12 +0,0 @@
-import { createRequire } from "node:module"
-
-const require = createRequire(import.meta.url)
-
-export const shellParserWasm = {
-  runtime: process.env.OPENCODE_TREE_SITTER_WASM_PATH ?? require.resolve("web-tree-sitter/tree-sitter.wasm"),
-  bash:
-    process.env.OPENCODE_TREE_SITTER_BASH_WASM_PATH ?? require.resolve("tree-sitter-bash/tree-sitter-bash.wasm"),
-  powershell:
-    process.env.OPENCODE_TREE_SITTER_POWERSHELL_WASM_PATH ??
-    require.resolve("tree-sitter-powershell/tree-sitter-powershell.wasm"),
-}
@@ -10,13 +10,13 @@ import type { Context as PluginContext } from "@opencode-ai/plugin/effect/plugin
 import { ToolFailure } from "@opencode-ai/ai"
 import { FileDiff } from "@opencode-ai/schema/file-diff"
 import { Bom } from "@opencode-ai/util/bom"
-import { createTwoFilesPatch, diffLines } from "diff"
 import { Effect, Schema } from "effect"
 import { FileMutation } from "../../file-mutation"
 import { Formatter } from "../../formatter"
 import { FSUtil } from "@opencode-ai/util/fs-util"
 import { LocationMutation } from "../../location-mutation"
 import { Permission } from "../../permission"
+import { fileDiff } from "./file-diff"

 export const name = "edit"

@@ -238,19 +238,3 @@ export const Plugin = {
      .pipe(Effect.orDie)
  }),
 }
-
-function fileDiff(file: string, before: string, after: string): typeof FileDiff.Info.Type {
-  const counts = diffLines(before, after).reduce(
-    (result, item) => ({
-      additions: result.additions + (item.added ? (item.count ?? 0) : 0),
-      deletions: result.deletions + (item.removed ? (item.count ?? 0) : 0),
-    }),
-    { additions: 0, deletions: 0 },
-  )
-  return {
-    file,
-    patch: createTwoFilesPatch(file, file, before, after),
-    status: "modified",
-    ...counts,
-  }
-}
@@ -0,0 +1,23 @@
+import { FileDiff } from "@opencode-ai/schema/file-diff"
+import { createTwoFilesPatch, diffLines } from "diff"
+
+export function fileDiff(
+  file: string,
+  before: string,
+  after: string,
+  status: typeof FileDiff.Info.Type.status = "modified",
+): typeof FileDiff.Info.Type {
+  const counts = diffLines(before, after).reduce(
+    (result, item) => ({
+      additions: result.additions + (item.added ? (item.count ?? 0) : 0),
+      deletions: result.deletions + (item.removed ? (item.count ?? 0) : 0),
+    }),
+    { additions: 0, deletions: 0 },
+  )
+  return {
+    file,
+    patch: createTwoFilesPatch(file, file, before, after),
+    status,
+    ...counts,
+  }
+}
@@ -1,6 +1,5 @@
 export * as ShellTool from "./shell"

-import path from "path"
 import { ToolFailure } from "@opencode-ai/ai"
 import type { Content } from "@opencode-ai/schema/tool"
 import type { Context as PluginContext } from "@opencode-ai/plugin/effect/plugin"
@@ -12,7 +11,6 @@ import { PluginRuntime } from "../../plugin/runtime"
 import { NonNegativeInt } from "../../schema"
 import { SessionSchema } from "../../session/schema"
 import { Shell } from "../../shell"
-import { ShellParse } from "../../shell/parse"

 export const name = "shell"
 export const DEFAULT_TIMEOUT_MS = 2 * 60 * 1_000
@@ -77,6 +75,18 @@ const modelOutput = (output: Output): string | undefined => {
  return `Command exited with code ${output.exit}.`
 }

+/**
+ * Minimal core shell boundary. Keep parity debt visible without pulling the
+ * legacy shell runtime into core.
+ */
+// TODO: Port tree-sitter bash / PowerShell parser-based approval reduction.
+// TODO: Port BashArity reusable command-prefix approvals.
+// TODO: Add plugin shell.env environment augmentation once plugin hooks exist.
+// TODO: Persist job status and define restart recovery before exposing remote observation.
+// TODO: Add HTTP job observation only after durable status, restart recovery, and authorization are defined.
+// TODO: Revisit process-group cleanup and platform coverage with shell-specific tests if current AppProcess semantics do not fully cover it.
+// TODO: Revisit binary output handling if stdout/stderr decoding is text-only.
+
 export const Plugin = {
  id: "opencode.tool.shell",
  effect: Effect.fn("ShellTool.Plugin")(function* (ctx: PluginContext) {
@@ -148,34 +158,24 @@ export const Plugin = {
                  (invocation) =>
                    Effect.gen(function* () {
                      const target = yield* mutation.resolve({ path: invocation.cwd, kind: "directory" })
-                      const parsed = yield* ShellParse.scan(invocation.command, invocation.shell, target.canonical)
-                      const directories = yield* Effect.forEach(parsed.directories, (directory) =>
-                        mutation.resolve({ path: path.resolve(target.canonical, directory), kind: "directory" }),
-                      )
                      invocation.cwd = target.canonical
                      finalTimeout = invocation.timeout
-                      const external = [target, ...directories]
-                        .map((item) => item.externalDirectory)
-                        .filter((item) => item !== undefined)
-                        .filter((item, index, items) => items.findIndex((other) => other.resource === item.resource) === index)
-                      if (external.length > 0)
+                      const external = target.externalDirectory
+                      if (external)
                        yield* permission.assert({
-                          action: "external_directory",
-                          resources: external.map((item) => item.resource),
-                          save: external.map((item) => item.save),
-                          sessionID: context.sessionID,
-                          agent: context.agent,
-                          source,
-                        })
-                      if (parsed.commands.length > 0)
-                        yield* permission.assert({
-                          action: name,
-                          resources: parsed.commands.map((command) => command.resource),
-                          save: parsed.commands.map((command) => command.save),
+                          ...LocationMutation.externalDirectoryPermission(external),
                          sessionID: context.sessionID,
                          agent: context.agent,
                          source,
                        })
+                      yield* permission.assert({
+                        action: name,
+                        resources: [invocation.command],
+                        save: [invocation.command],
+                        sessionID: context.sessionID,
+                        agent: context.agent,
+                        source,
+                      })
                      if ((yield* fsUtil.stat(target.canonical)).type !== "Directory")
                        return yield* Effect.fail(new Error(`Working directory is not a directory: ${target.canonical}`))
                    }),
@@ -8,15 +8,14 @@ export * as WriteTool from "./write"

 import type { Context as PluginContext } from "@opencode-ai/plugin/effect/plugin"
 import { ToolFailure } from "@opencode-ai/ai"
-import { FileDiff } from "@opencode-ai/schema/file-diff"
 import { Effect, Schema } from "effect"
-import { createTwoFilesPatch, diffLines } from "diff"
 import { Bom } from "@opencode-ai/util/bom"
 import { FSUtil } from "@opencode-ai/util/fs-util"
 import { FileMutation } from "../../file-mutation"
 import { Formatter } from "../../formatter"
 import { LocationMutation } from "../../location-mutation"
 import { Permission } from "../../permission"
+import { fileDiff } from "./file-diff"

 export const name = "write"

@@ -83,19 +82,12 @@ export const Plugin = {
                    Effect.catchReason("PlatformError", "NotFound", () => Effect.succeed(undefined)),
                  )
                  const next = Bom.split(input.content)
-                  const counts = diffLines(current?.text ?? "", next.text).reduce(
-                    (result, item) => ({
-                      additions: result.additions + (item.added ? (item.count ?? 0) : 0),
-                      deletions: result.deletions + (item.removed ? (item.count ?? 0) : 0),
-                    }),
-                    { additions: 0, deletions: 0 },
+                  const preview = fileDiff(
+                    target.resource,
+                    current?.text ?? "",
+                    next.text,
+                    current ? "modified" : "added",
                  )
-                  const preview: typeof FileDiff.Info.Type = {
-                    file: target.resource,
-                    patch: createTwoFilesPatch(target.resource, target.resource, current?.text ?? "", next.text),
-                    status: current ? "modified" : "added",
-                    ...counts,
-                  }
                  yield* permission.assert({
                    action: "edit",
                    resources: [target.resource],
@@ -56,7 +56,7 @@ describe("node build", () => {
              Location.Service.of({
                directory: ref.directory,
                workspaceID: ref.workspaceID,
-                project: { id: Project.ID.global, directory: service.directory },
+                project: { id: Project.ID.global, directory: service.directory, canonical: service.directory },
              }),
            ),
          { idleTimeToLive: "1 minute" },
@@ -79,7 +79,7 @@ describe("node build", () => {
        return Project.Service.of({
          list: () => Effect.succeed([]),
          directories: () => Effect.succeed([]),
-          resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory }),
+          resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory, canonical: directory }),
          commit: () => Effect.void,
        })
      }),
@@ -5,10 +5,11 @@ import { Effect, Layer } from "effect"
 import { tmpdir } from "./tmpdir"

 export function location(ref: Location.Ref, input: { projectDirectory?: AbsolutePath; vcs?: Project.Vcs } = {}) {
+  const directory = input.projectDirectory ?? ref.directory
  return {
    directory: ref.directory,
    workspaceID: ref.workspaceID,
-    project: { id: Project.ID.global, directory: input.projectDirectory ?? ref.directory },
+    project: { id: Project.ID.global, directory, canonical: directory },
    vcs: input.vcs,
  } satisfies Location.Interface
 }
@@ -18,6 +18,7 @@ const projectLayer = Layer.succeed(
      Effect.succeed({
        id: Project.ID.make("project"),
        directory: AbsolutePath.make("/repo"),
+        canonical: AbsolutePath.make("/main/repo"),
        vcs: { type: "git", store: AbsolutePath.make("/repo/.git") },
      }),
    commit: () => Effect.void,
@@ -34,6 +35,7 @@ describe("Location", () => {
      expect(location.workspaceID).toBe(workspaceID)
      expect(location.project.id).toBe(Project.ID.make("project"))
      expect(location.project.directory).toBe(AbsolutePath.make("/repo"))
+      expect(location.project.canonical).toBe(AbsolutePath.make("/main/repo"))
      expect(location.vcs).toEqual({
        type: "git",
        store: AbsolutePath.make("/repo/.git"),
@@ -11,7 +11,6 @@ import { LayerNode } from "@opencode-ai/util/effect/layer-node"
 import { Bus } from "@opencode-ai/core/bus"
 import { Job } from "@opencode-ai/core/job"
 import { Project } from "@opencode-ai/core/project"
-import { ProjectTable } from "@opencode-ai/core/project/sql"
 import { ProjectDirectories } from "@opencode-ai/core/project/directories"
 import { AbsolutePath } from "@opencode-ai/core/schema"
 import { Session } from "@opencode-ai/core/session"
@@ -88,11 +87,6 @@ describe("MoveSession", () => {
      const projectID = (yield* Project.Service.use((service) => service.resolve(source))).id
      const sessionID = Session.ID.make("ses_move")
      const { db } = yield* Database.Service
-      yield* db
-        .insert(ProjectTable)
-        .values({ id: projectID, worktree: source, sandboxes: [], time_created: 1, time_updated: 1 })
-        .run()
-        .pipe(Effect.orDie)
      yield* db
        .insert(SessionTable)
        .values({
@@ -144,11 +138,6 @@ describe("MoveSession", () => {
      const projectID = (yield* Project.Service.use((service) => service.resolve(source))).id
      const sessionID = Session.ID.make("ses_move_nested")
      const { db } = yield* Database.Service
-      yield* db
-        .insert(ProjectTable)
-        .values({ id: projectID, worktree: source, sandboxes: [], time_created: 1, time_updated: 1 })
-        .run()
-        .pipe(Effect.orDie)
      yield* db
        .insert(SessionTable)
        .values({
@@ -204,11 +193,6 @@ describe("MoveSession", () => {
      const destinationProjectID = (yield* Project.Service.use((service) => service.resolve(destination))).id
      const sessionID = Session.ID.make("ses_move_project")
      const { db } = yield* Database.Service
-      yield* db
-        .insert(ProjectTable)
-        .values({ id: projectID, worktree: source, sandboxes: [], time_created: 1, time_updated: 1 })
-        .run()
-        .pipe(Effect.orDie)
      yield* db
        .insert(SessionTable)
        .values({
@@ -268,11 +252,6 @@ describe("MoveSession", () => {
      const projectID = (yield* Project.Service.use((service) => service.resolve(source))).id
      const sessionID = Session.ID.make("ses_move_nested_checkout")
      const { db } = yield* Database.Service
-      yield* db
-        .insert(ProjectTable)
-        .values({ id: projectID, worktree: source, sandboxes: [], time_created: 1, time_updated: 1 })
-        .run()
-        .pipe(Effect.orDie)
      yield* db
        .insert(SessionTable)
        .values({
@@ -121,7 +121,11 @@ export function agentHost(agent: Agent.Interface): Plugin.Context["agent"] {
            ? Effect.succeed({
                location: new Location.Info({
                  directory: AbsolutePath.make("/"),
-                  project: { id: Project.ID.make("test"), directory: AbsolutePath.make("/") },
+                  project: {
+                    id: Project.ID.make("test"),
+                    directory: AbsolutePath.make("/"),
+                    canonical: AbsolutePath.make("/"),
+                  },
                }),
                data: agentInfo(value),
              })
@@ -163,7 +167,11 @@ export function catalogHost(catalog: Catalog.Interface): Plugin.Context["catalog
          Effect.map((data) => ({
            location: new Location.Info({
              directory: AbsolutePath.make("/"),
-              project: { id: Project.ID.make("test"), directory: AbsolutePath.make("/") },
+              project: {
+                id: Project.ID.make("test"),
+                directory: AbsolutePath.make("/"),
+                canonical: AbsolutePath.make("/"),
+              },
            }),
            data: data.map(modelInfo),
          })),
@@ -357,7 +365,11 @@ export function integrationHost(integration: Integration.Interface): Plugin.Cont
 export function webSearchHost(websearch: WebSearch.Interface): Plugin.Context["websearch"] {
  const location = Location.Info.make({
    directory: AbsolutePath.make("/tmp/websearch-test"),
-    project: { id: Project.ID.make("websearch-test"), directory: AbsolutePath.make("/tmp/websearch-test") },
+    project: {
+      id: Project.ID.make("websearch-test"),
+      directory: AbsolutePath.make("/tmp/websearch-test"),
+      canonical: AbsolutePath.make("/tmp/websearch-test"),
+    },
  })
  return {
    providers: () => websearch.providers().pipe(Effect.map((data) => ({ location, data }))),
@@ -47,13 +47,13 @@ describe("Project.list", () => {
      expect(yield* project.list()).toEqual([
        {
          id: Project.ID.make("newer"),
-          worktree: abs("/newer"),
+          canonical: abs("/newer"),
          time: { created: 2, updated: 2, initialized: 3 },
          sandboxes: [],
        },
        {
          id: Project.ID.make("older"),
-          worktree: abs("/older"),
+          canonical: abs("/older"),
          vcs: "git",
          name: "Older",
          icon: { color: "#000000" },
@@ -105,6 +105,7 @@ describe("Project.resolve", () => {

      expect(result.id).toBe(Project.ID.make("global"))
      expect(path.resolve(result.directory)).toBe(path.parse(tmp.path).root)
+      expect(result.canonical).toBe(result.directory)
      expect(result.previous).toBeUndefined()
      expect(result.vcs).toBeUndefined()
    }),
@@ -123,6 +124,7 @@ describe("Project.resolve", () => {

      expect(result.id).toBe(Project.ID.make("global"))
      expect(result.directory).toBe(yield* real(tmp.path))
+      expect(result.canonical).toBe(result.directory)
      expect(result.previous).toBeUndefined()
      expect(result.vcs?.type).toBe("git")
    }),
@@ -327,13 +329,46 @@ describe("Project.resolve", () => {
      yield* Effect.promise(() => Bun.write(path.join(tmp.path, ".git", "opencode"), "old-id"))
      yield* Effect.promise(() => $`git worktree add ${worktree} -b test-${Date.now()}`.cwd(tmp.path).quiet())
      const project = yield* Project.Service
+      const db = (yield* Database.Service).db
+      const id = remoteID("github.com/owner/repo")
+      yield* db
+        .insert(ProjectTable)
+        .values({
+          id,
+          worktree: abs("/stale-worktree"),
+          vcs: "hg",
+          name: "Preserved name",
+          icon_color: "#123456",
+          commands: { start: "bun dev" },
+          sandboxes: [abs("/preserved-sandbox")],
+          time_created: 1,
+          time_updated: 1,
+          time_initialized: 2,
+        })
+        .run()

      const result = yield* project.resolve(abs(worktree))

      expect(result.directory).toBe(yield* real(worktree))
+      expect(result.canonical).toBe(yield* real(tmp.path))
      expect(result.previous).toBe(Project.ID.make("old-id"))
-      expect(result.id).toBe(remoteID("github.com/owner/repo"))
+      expect(result.id).toBe(id)
      expect(result.vcs?.type).toBe("git")
+      expect((yield* project.list()).find((item) => item.id === id)).toMatchObject({
+        canonical: yield* real(tmp.path),
+        vcs: "git",
+        name: "Preserved name",
+        icon: { color: "#123456" },
+        commands: { start: "bun dev" },
+        sandboxes: [abs("/preserved-sandbox")],
+        time: { created: 1, initialized: 2 },
+      })
+      expect(
+        (yield* project.directories({ projectID: id })).toSorted((a, b) => a.directory.localeCompare(b.directory)),
+      ).toEqual([
+        { directory: yield* real(tmp.path) },
+        { directory: yield* real(worktree), strategy: "git_worktree" },
+      ])
    }),
  )
 })
@@ -34,7 +34,7 @@ const projects = Layer.succeed(
  Project.Service,
  Project.Service.of({
    list: () => Effect.succeed([]),
-    resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory }),
+    resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory, canonical: directory }),
    directories: () => Effect.succeed([]),
    commit: () => Effect.void,
  }),
@@ -14,7 +14,7 @@ import { Model } from "@opencode-ai/core/model"
 import { Project } from "@opencode-ai/core/project"
 import { ProjectTable } from "@opencode-ai/core/project/sql"
 import { Provider } from "@opencode-ai/core/provider"
-import { AbsolutePath } from "@opencode-ai/core/schema"
+import { AbsolutePath, RelativePath } from "@opencode-ai/core/schema"
 import { Session } from "@opencode-ai/core/session"
 import { SessionV1 } from "@opencode-ai/core/v1/session"
 import { SessionMessage } from "@opencode-ai/core/session/message"
@@ -32,7 +32,7 @@ const projects = Layer.succeed(
  Project.Service,
  Project.Service.of({
    list: () => Effect.succeed([]),
-    resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory }),
+    resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory, canonical: directory }),
    directories: () => Effect.succeed([]),
    commit: () => Effect.void,
  }),
@@ -184,6 +184,26 @@ describe("Session.create", () => {
    }),
  )

+  it.effect("filters project sessions by subpath", () =>
+    Effect.gen(function* () {
+      const session = yield* Session.Service
+      const { db } = yield* Database.Service
+      const root = yield* session.create({ location, title: "root" })
+      const nested = yield* session.create({ location, title: "nested" })
+
+      yield* db.update(SessionTable).set({ path: "packages/tui" }).where(eq(SessionTable.id, nested.id)).run()
+
+      const page = yield* session.list({
+        project: Project.ID.global,
+        subpath: RelativePath.make("packages/tui"),
+        parentID: null,
+      })
+
+      expect(page.data.map((item) => item.id)).toEqual([nested.id])
+      expect(page.data.map((item) => item.id)).not.toContain(root.id)
+    }),
+  )
+
  it.effect("forks a session by replaying a durable fork event into copied projected rows", () =>
    Effect.gen(function* () {
      const session = yield* Session.Service
@@ -15,7 +15,6 @@ import { Location } from "@opencode-ai/core/location"
 import { McpInstructions } from "@opencode-ai/core/mcp/instructions"
 import { ID } from "@opencode-ai/core/model"
 import { Project } from "@opencode-ai/core/project"
-import { ProjectTable } from "@opencode-ai/core/project/sql"
 import { Provider } from "@opencode-ai/core/provider"
 import { ReferenceInstructions } from "@opencode-ai/core/reference/instructions"
 import { AbsolutePath } from "@opencode-ai/core/schema"
@@ -191,11 +190,6 @@ const setup = Effect.gen(function* () {
      agent.mode = "primary"
    }),
  )
-  yield* db
-    .insert(ProjectTable)
-    .values({ id: Project.ID.global, worktree: AbsolutePath.make("/project"), sandboxes: [] })
-    .run()
-    .pipe(Effect.orDie)
  yield* db
    .insert(SessionTable)
    .values({
@@ -54,7 +54,7 @@ const projects = Layer.succeed(
  Project.Service,
  Project.Service.of({
    list: () => Effect.succeed([]),
-    resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory }),
+    resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory, canonical: directory }),
    directories: () => Effect.succeed([]),
    commit: () => Effect.void,
  }),
@@ -21,7 +21,7 @@ const projects = Layer.succeed(
  Project.Service,
  Project.Service.of({
    list: () => Effect.succeed([]),
-    resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory }),
+    resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory, canonical: directory }),
    directories: () => Effect.succeed([]),
    commit: () => Effect.void,
  }),
@@ -17,7 +17,7 @@ const projects = Layer.succeed(
  Project.Service,
  Project.Service.of({
    list: () => Effect.succeed([]),
-    resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory }),
+    resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory, canonical: directory }),
    directories: () => Effect.succeed([]),
    commit: () => Effect.void,
  }),
@@ -20,7 +20,7 @@ import { testEffect } from "./lib/effect"

 const location = Location.Ref.make({ directory: AbsolutePath.make("/project") })
 const projects = Layer.mock(Project.Service, {
-  resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory }),
+  resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory, canonical: directory }),
 })
 const skills = Layer.mock(Skill.Service, {
  list: () =>
@@ -17,7 +17,7 @@ import { testEffect } from "./lib/effect"
 const location = Location.Ref.make({ directory: AbsolutePath.make("/project") })
 const awaited: Session.ID[] = []
 const projects = Layer.mock(Project.Service, {
-  resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory }),
+  resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory, canonical: directory }),
 })
 const execution = Layer.mock(SessionExecution.Service, {
  awaitIdle: (sessionID) => Effect.sync(() => awaited.push(sessionID)),
@@ -1,55 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { Effect } from "effect"
-import os from "os"
-import path from "path"
-import { ShellParse } from "@opencode-ai/core/shell/parse"
-
-describe("ShellParse", () => {
-  test("splits bash commands and derives reusable prefixes", async () => {
-    const result = await Effect.runPromise(
-      ShellParse.scan("git status && npm run test -- --watch", "/bin/bash", "/workspace"),
-    )
-    expect(result).toEqual({
-      commands: [
-        { resource: "git status", save: "git status *" },
-        { resource: "npm run test -- --watch", save: "npm run test *" },
-      ],
-      directories: [],
-    })
-  })
-
-  test("splits PowerShell commands case-insensitively", async () => {
-    const result = await Effect.runPromise(
-      ShellParse.scan("Get-ChildItem; Write-Output 'done'", "C:\\Program Files\\PowerShell\\7\\pwsh.exe", "C:\\workspace"),
-    )
-    expect(result.commands).toEqual([
-      { resource: "Get-ChildItem", save: "Get-ChildItem *" },
-      { resource: "Write-Output 'done'", save: "Write-Output *" },
-    ])
-  })
-
-  test("does not permission directory changes separately", async () => {
-    const result = await Effect.runPromise(ShellParse.scan("cd 'src dir' && git status", "/bin/bash", "/workspace"))
-    expect(result).toEqual({
-      commands: [{ resource: "git status", save: "git status *" }],
-      directories: ["src dir"],
-    })
-  })
-
-  test("extracts PowerShell directory parameters", async () => {
-    const result = await Effect.runPromise(
-      ShellParse.scan("Set-Location -LiteralPath '..\\outside'; Get-ChildItem", "pwsh", "C:\\workspace"),
-    )
-    expect(result.directories).toEqual(["..\\outside"])
-  })
-
-  test("expands deterministic directory variables", async () => {
-    const bash = await Effect.runPromise(ShellParse.scan("cd ~/src", "/bin/bash", "/workspace"))
-    expect(bash.directories).toEqual([path.join(os.homedir(), "src")])
-
-    const powershell = await Effect.runPromise(
-      ShellParse.scan('Set-Location "$PWD/src"; Set-Location $PSHOME', "/usr/local/bin/pwsh", "/workspace"),
-    )
-    expect(powershell.directories).toEqual([path.join("/workspace", "src"), "/usr/local/bin"])
-  })
-})
@@ -1,6 +1,5 @@
 import fs from "fs/promises"
 import { realpathSync } from "node:fs"
-import os from "os"
 import path from "path"
 import { describe, expect } from "bun:test"
 import { DateTime, Deferred, Duration, Effect, Fiber, Layer, Scope, Stream } from "effect"
@@ -224,7 +223,6 @@ describe("ShellTool", () => {
              text: expect.stringContaining("Command exited with code 0."),
            })
            expect(assertions).toMatchObject([{ sessionID, action: "shell", resources: [helloCommand] }])
-            expect(assertions[0]?.save).toEqual(["printf *"])
          }),
        )
      },
@@ -255,29 +253,6 @@ describe("ShellTool", () => {
    ),
  )

-  it.live("permissions compound commands separately", () =>
-    Effect.acquireUseRelease(
-      Effect.promise(() => tmpdir()),
-      (tmp) => {
-        reset()
-        return withSession(tmp.path, (registry) =>
-          executeTool(registry, call({ command: "printf one && printf two" }, "call-compound")),
-        ).pipe(
-          Effect.andThen(
-            Effect.sync(() => {
-              expect(assertions).toHaveLength(1)
-              expect(assertions[0]).toMatchObject({
-                resources: ["printf one", "printf two"],
-                save: ["printf *", "printf *"],
-              })
-            }),
-          ),
-        )
-      },
-      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]().then(() => undefined)),
-    ),
-  )
-
  it.live("captures stderr-only and mixed stdout/stderr output", () =>
    Effect.acquireUseRelease(
      Effect.promise(() => tmpdir()),
@@ -350,51 +325,6 @@ describe("ShellTool", () => {
    ),
  )

-  it.live("approves an external directory used by a directory-change command", () =>
-    Effect.acquireUseRelease(
-      Effect.promise(() => Promise.all([tmpdir(), tmpdir()])),
-      ([active, outside]) => {
-        reset()
-        const command = isWindows
-          ? `Set-Location -LiteralPath '${outside.path}'; (Get-Location).Path`
-          : `cd '${outside.path}' && pwd`
-        return withSession(active.path, (registry) => executeTool(registry, call({ command }, "call-external-cd"))).pipe(
-          Effect.andThen(
-            Effect.sync(() => {
-              expect(assertions.map((item) => item.action)).toEqual(["external_directory", "shell"])
-              expect(assertions[0]).toMatchObject({
-                resources: [path.join(realpathSync(outside.path), "*").replaceAll("\\", "/")],
-              })
-            }),
-          ),
-        )
-      },
-      ([active, outside]) =>
-        Effect.promise(() =>
-          Promise.all([active[Symbol.asyncDispose](), outside[Symbol.asyncDispose]()]).then(() => undefined),
-        ),
-    ),
-  )
-
-  it.live("approves an expanded external home directory", () =>
-    Effect.acquireUseRelease(
-      Effect.promise(() => tmpdir()),
-      (tmp) => {
-        reset()
-        const command = isWindows ? "Set-Location $HOME; (Get-Location).Path" : "cd ~ && pwd"
-        return withSession(tmp.path, (registry) => executeTool(registry, call({ command }, "call-external-home"))).pipe(
-          Effect.andThen(
-            Effect.sync(() => {
-              expect(assertions.map((item) => item.action)).toEqual(["external_directory", "shell"])
-              expect(assertions[0]?.resources[0]).toStartWith(os.homedir().replaceAll("\\", "/"))
-            }),
-          ),
-        )
-      },
-      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]().then(() => undefined)),
-    ),
-  )
-
  it.live("does not execute after external-directory or shell denial", () =>
    Effect.acquireUseRelease(
      Effect.promise(() => Promise.all([tmpdir(), tmpdir()])),
@@ -11,6 +11,7 @@ import type {
  OpenCodeEvent,
  PermissionSavedInfo,
  PermissionRequest,
+  Project,
  ProviderInfo,
  ReferenceInfo,
  SessionInfo,
@@ -77,6 +78,10 @@ export interface Data {
    }
  }
  readonly project: {
+    list(): Project[]
+    get(projectID: string): Project | undefined
+    sync(): Promise<void>
+    invalidate(): void
    readonly permission: {
      list(projectID: string): PermissionSavedInfo[] | undefined
      sync(projectID: string): Promise<void>
@@ -17,6 +17,7 @@ export class Info extends Schema.Class<Info>("Location.Info")({
  project: Schema.Struct({
    id: ProjectID,
    directory: AbsolutePath,
+    canonical: AbsolutePath,
  }),
 }) {}

@@ -12,6 +12,7 @@ export const Vcs = Schema.Literals(["git", "hg"]).annotate({ identifier: "Projec
 export const Current = Schema.Struct({
  id: ID,
  directory: AbsolutePath,
+  canonical: AbsolutePath,
 }).annotate({ identifier: "Project.Current" })
 export interface Current extends Schema.Schema.Type<typeof Current> {}
 export const Directory = Schema.Struct({
@@ -46,7 +47,7 @@ export interface Time extends Schema.Schema.Type<typeof Time> {}

 export const Info = Schema.Struct({
  id: ID,
-  worktree: Schema.String,
+  canonical: AbsolutePath,
  vcs: optional(Vcs),
  name: optional(Schema.String),
  icon: optional(Icon),
@@ -9,7 +9,11 @@ export const ProjectHandler = HttpApiBuilder.group(Api, "server.project", (handl
    .handle("project.list", () => Project.Service.use((project) => project.list()))
    .handle("project.current", () =>
      Location.Service.use((location) =>
-        Effect.succeed({ id: location.project.id, directory: location.project.directory }),
+        Effect.succeed({
+          id: location.project.id,
+          directory: location.project.directory,
+          canonical: location.project.canonical,
+        }),
      ),
    )
    .handle("project.directories", (ctx) =>
@@ -102,12 +102,12 @@ export function DialogIntegration(
      title="Connect a service"
      options={options()}
      emptyView={
-        <box paddingLeft={4} paddingRight={4} paddingTop={1}>
+        <box paddingLeft={4} paddingRight={4}>
          <text fg={theme.text.subdued}>No integrations available</text>
        </box>
      }
      noMatchView={
-        <box paddingLeft={4} paddingRight={4} paddingTop={1}>
+        <box paddingLeft={4} paddingRight={4}>
          <text fg={theme.text.subdued}>No integrations found</text>
        </box>
      }
@@ -328,7 +328,7 @@ export function DialogMoveSession(props: DialogMoveSessionProps) {
        options={options()}
        emptyView={
          showError() ? (
-            <box paddingLeft={4} paddingRight={4} paddingTop={1}>
+            <box paddingLeft={4} paddingRight={4}>
              <text fg={theme.text.feedback.error.default} attributes={TextAttributes.BOLD}>
                Could not load project directories
              </text>
@@ -336,17 +336,17 @@ export function DialogMoveSession(props: DialogMoveSessionProps) {
              <text fg={theme.text.subdued}>Close and reopen Move session to try again.</text>
            </box>
          ) : directories.loading || loadedProject.loading ? (
-            <box paddingLeft={4} paddingRight={4} paddingTop={1}>
+            <box paddingLeft={4} paddingRight={4}>
              <text fg={theme.text.subdued}>Loading project directories…</text>
            </box>
          ) : (
-            <box paddingLeft={4} paddingRight={4} paddingTop={1}>
+            <box paddingLeft={4} paddingRight={4}>
              <text fg={theme.text.subdued}>No project directories available</text>
            </box>
          )
        }
        noMatchView={
-          <box paddingLeft={4} paddingRight={4} paddingTop={1}>
+          <box paddingLeft={4} paddingRight={4}>
            <text fg={theme.text.subdued}>No project directories found</text>
          </box>
        }
@@ -1,6 +1,7 @@
-import { createMemo, createResource, createSignal, onMount } from "solid-js"
+import { createMemo, createResource, createSignal, onMount, Show } from "solid-js"
 import path from "path"
 import type { SessionInfo } from "@opencode-ai/client"
+import { TextAttributes } from "@opentui/core"
 import { useDialog } from "../ui/dialog"
 import { DialogSelect } from "../ui/dialog-select"
 import { useRoute } from "../context/route"
@@ -32,52 +33,69 @@ export function DialogSessionList() {
  const shortcuts = Keymap.useShortcuts()
  const [search, setSearch] = createDebouncedSignal("", 150)
  const [toDelete, setToDelete] = createSignal<string>()
+  const [allProjects, setAllProjects] = createSignal(false)

-  const [searchResults] = createResource(search, async (query) => {
-    if (!query) return
-    try {
-      if (!data.location.info()) await data.location.sync()
-      const current = data.location.info()
-      if (!current) throw new Error("Location unavailable")
-      const response = await client.api.session.list({
-        project: current.project.id,
-        search: query,
-        limit: 50,
-        order: "desc",
-        parentID: null,
-      })
-      return { query, sessions: response.data, error: undefined }
-    } catch (error) {
-      // A transient transport failure must degrade search, not crash the TUI
-      // through the root ErrorBoundary when the errored resource is read.
-      return { query, sessions: [] as SessionInfo[], error }
-    }
-  })
+  const [searchResults, { mutate: setSearchResults }] = createResource(
+    () => ({ query: search().trim(), allProjects: allProjects() }),
+    async ({ query, allProjects }) => {
+      try {
+        if (!data.location.info()) await data.location.sync()
+        const current = data.location.info()
+        if (!current) throw new Error("Location unavailable")
+        const response = await client.api.session.list({
+          ...(allProjects
+            ? {}
+            : {
+                project: current.project.id,
+                subpath: path.relative(current.project.directory, current.directory).replaceAll("\\", "/"),
+              }),
+          ...(query ? { search: query } : {}),
+          limit: 50,
+          order: "desc",
+          parentID: null,
+        })
+        return { query, allProjects, sessions: response.data, error: undefined }
+      } catch (error) {
+        // A transient transport failure must degrade search, not crash the TUI
+        // through the root ErrorBoundary when the errored resource is read.
+        return { query, allProjects, sessions: [] as SessionInfo[], error }
+      }
+    },
+  )

  const currentSessionID = createMemo(() => (route.data.type === "session" ? route.data.sessionID : undefined))
  const localSessions = createMemo(() => {
    const query = filter().trim().toLowerCase()
-    const sessions = data.session.list()
+    const current = data.location.info()
+    const sessions = data.session
+      .list()
+      .filter(
+        (session) =>
+          allProjects() ||
+          (session.projectID === current?.project.id && session.location.directory === current.directory),
+      )
    if (!query) return sessions
    return sessions.filter((session) => !session.parentID && session.title.toLowerCase().includes(query))
  })
  const sessions = createMemo(() => {
-    const query = filter()
+    const query = filter().trim()
    const local = localSessions()
-    if (!query) return local
-    if (query !== search() || searchResults.loading) return local
+    if (query !== search().trim() || searchResults.loading) return searchResults.latest?.sessions ?? local
    const result = searchResults()
-    if (result?.query !== query || result.error) return local
+    if (result?.query !== query || result.allProjects !== allProjects() || result.error) return local
    return result.sessions
  })
  const searchState = createMemo(() => {
-    const query = filter()
-    if (!query) return { message: "No sessions available", error: false }
-    if (query !== search() || searchResults.loading) return { message: "Searching sessions…", error: false }
+    const query = filter().trim()
+    if (query !== search().trim() || searchResults.loading)
+      return { message: query ? "Searching sessions…" : "Loading sessions…", error: false }
    const result = searchResults()
    if (result?.query === query && result.error)
-      return { message: "Could not search sessions. Change the search to try again.", error: true }
-    return { message: "No sessions found", error: false }
+      return {
+        message: query ? "Could not search sessions. Change the search to try again." : "Could not load sessions.",
+        error: true,
+      }
+    return { message: query ? "No sessions found" : "No sessions available", error: false }
  })

  const quickSwitchHint = createMemo(() => {
@@ -91,6 +109,13 @@ export function DialogSessionList() {
    const hint = quickSwitchHint()
    return hint && local.session.slots().length > 0 ? [{ title: "switch", label: hint }] : []
  })
+  const currentProjectName = createMemo(() => {
+    const current = data.location.info()
+    if (!current) return ""
+    const project = data.project.get(current.project.id)
+    if (!project) return ""
+    return project.name || path.basename(project.canonical)
+  })

  const options = createMemo(() => {
    const today = new Date().toDateString()
@@ -105,8 +130,12 @@ export function DialogSessionList() {

    const option = (session: SessionInfo, category: string) => {
      const directory = session.location.directory
-      const footer =
-        directory !== data.location.info()?.project.directory ? Locale.truncate(path.basename(directory), 20) : ""
+      const project = data.project.get(session.projectID)
+      const footer = allProjects()
+        ? Locale.truncate(project?.name || path.basename(project?.canonical ?? directory), 20)
+        : directory !== data.location.info()?.project.directory
+          ? Locale.truncate(path.basename(directory), 20)
+          : ""
      const slot = sessionTabs.enabled() ? undefined : slotByID.get(session.id)
      const deleting = toDelete() === session.id
      return {
@@ -139,6 +168,16 @@ export function DialogSessionList() {
  return (
    <DialogSelect
      title="Sessions"
+      titleView={
+        <box flexDirection="row">
+          <text fg={theme.text.default} attributes={TextAttributes.BOLD}>
+            Sessions
+          </text>
+          <Show when={!allProjects() && currentProjectName()}>
+            <text fg={theme.text.subdued}> for {currentProjectName()}</text>
+          </Show>
+        </box>
+      }
      options={options()}
      skipFilter={true}
      current={currentSessionID()}
@@ -146,13 +185,25 @@ export function DialogSessionList() {
        setFilter(query)
        setSearch(query)
      }}
+      bindings={[
+        {
+          bind: "ctrl+a",
+          title: allProjects() ? "Show current directory sessions" : "Show all project sessions",
+          group: "Dialog",
+          run: () => {
+            setAllProjects((value) => !value)
+          },
+        },
+      ]}
      emptyView={
-        <box paddingLeft={4} paddingRight={4} paddingTop={1}>
-          <text fg={theme.text.subdued}>No sessions available</text>
+        <box paddingLeft={4} paddingRight={4}>
+          <text fg={searchState().error ? theme.text.feedback.error.default : theme.text.subdued}>
+            {searchState().message}
+          </text>
        </box>
      }
      noMatchView={
-        <box paddingLeft={4} paddingRight={4} paddingTop={1}>
+        <box paddingLeft={4} paddingRight={4}>
          <text fg={searchState().error ? theme.text.feedback.error.default : theme.text.subdued}>
            {searchState().message}
          </text>
@@ -178,24 +229,34 @@ export function DialogSessionList() {
              setToDelete(option.value)
              return
            }
-            void client.api.session.remove({ sessionID: option.value }).catch((error) => {
-              setToDelete(undefined)
-              toast.show({
-                message: `Failed to delete session: ${errorMessage(error)}`,
-                variant: "error",
-                duration: 5000,
+            void client.api.session
+              .remove({ sessionID: option.value })
+              .then(() => {
+                setSearchResults((result) =>
+                  result ? { ...result, sessions: result.sessions.filter((session) => session.id !== option.value) } : result,
+                )
+              })
+              .catch((error) => {
+                setToDelete(undefined)
+                toast.show({
+                  message: `Failed to delete session: ${errorMessage(error)}`,
+                  variant: "error",
+                  duration: 5000,
+                })
              })
-            })
          },
        },
        {
          command: "session.rename",
          title: "rename",
-          onTrigger: (option: { value: string }) =>
-            DialogSessionRename.show(dialog, option.value, data.session.get(option.value)?.title),
+          onTrigger: (option: { value: string; title: string }) =>
+            DialogSessionRename.show(dialog, option.value, option.title),
        },
      ]}
-      footerHints={quickSwitchFooterHints()}
+      footerHints={[
+        ...quickSwitchFooterHints(),
+        { title: allProjects() ? "current directory" : "all projects", label: "ctrl+a", side: "right" },
+      ]}
    />
  )
 }
@@ -62,13 +62,13 @@ export function DialogSkill(props: DialogSkillProps) {
      emptyView={
        <Switch
          fallback={
-            <box paddingLeft={4} paddingRight={4} paddingTop={1}>
+            <box paddingLeft={4} paddingRight={4}>
              <text fg={theme.text.subdued}>No skills available</text>
            </box>
          }
        >
          <Match when={showError()}>
-            <box paddingLeft={4} paddingRight={4} paddingTop={1}>
+            <box paddingLeft={4} paddingRight={4}>
              <text fg={theme.text.feedback.error.default} attributes={TextAttributes.BOLD}>
                Could not load skills
              </text>
@@ -77,14 +77,14 @@ export function DialogSkill(props: DialogSkillProps) {
            </box>
          </Match>
          <Match when={skills.loading}>
-            <box paddingLeft={4} paddingRight={4} paddingTop={1}>
+            <box paddingLeft={4} paddingRight={4}>
              <text fg={theme.text.subdued}>Loading skills…</text>
            </box>
          </Match>
        </Switch>
      }
      noMatchView={
-        <box paddingLeft={4} paddingRight={4} paddingTop={1}>
+        <box paddingLeft={4} paddingRight={4}>
          <text fg={theme.text.subdued}>No skills found</text>
        </box>
      }
@@ -15,6 +15,7 @@ import type {
  ModelInfo,
  PermissionSavedInfo,
  PermissionRequest,
+  Project,
  ProviderInfo,
  ReferenceInfo,
  SessionMessageInfo,
@@ -80,6 +81,7 @@ type Store = {
    form: Record<string, FormWithLocation[]>
  }
  project: {
+    info: Record<string, Project>
    permission: Record<string, PermissionSavedInfo[]>
  }
  location: Record<string, LocationData>
@@ -139,6 +141,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
        form: {},
      },
      project: {
+        info: {},
        permission: {},
      },
      location: {},
@@ -954,10 +957,26 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
            sync.invalidate(`session.pending:${sessionID}`)
          },
        },
-        sync(sessionID: string) {
-          return sync.run(`session:${sessionID}`, async () => {
-            setStore("session", "info", sessionID, await client.api.session.get({ sessionID }))
-            registerSession(sessionID)
+        sync(sessionID: string, options?: { children?: boolean }) {
+          return sync.run(options?.children ? `session.family:${sessionID}` : `session:${sessionID}`, async () => {
+            const [info, children] = await Promise.all([
+              client.api.session.get({ sessionID }),
+              options?.children
+                ? client.api.session.list({ parentID: sessionID, order: "desc" }).then((response) => response.data)
+                : [],
+            ])
+            const sessions = [info, ...children]
+            setStore(
+              "session",
+              "info",
+              produce((draft) => {
+                for (const session of sessions) draft[session.id] = session
+              }),
+            )
+            for (const session of sessions) {
+              sync.complete(`session:${session.id}`)
+              registerSession(session.id)
+            }
          })
        },
        invalidate(sessionID: string) {
@@ -1037,6 +1056,21 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
        },
      },
      project: {
+        list() {
+          return Object.values(store.project.info).toSorted((a, b) => b.time.updated - a.time.updated)
+        },
+        get(projectID: string) {
+          return store.project.info[projectID]
+        },
+        sync() {
+          return sync.run("project", async () => {
+            const projects = await client.api.project.list()
+            setStore("project", "info", reconcile(Object.fromEntries(projects.map((project) => [project.id, project]))))
+          })
+        },
+        invalidate() {
+          sync.invalidate("project")
+        },
        permission: {
          list(projectID: string) {
            return store.project.permission[projectID]
@@ -1318,27 +1352,9 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
            .then((location) => {
              const key = locationKey(location)
              setStore("location", key, { ...store.location[key], info: location })
-              return client.api.session.list({
-                project: location.project.id,
-                limit: 50,
-                order: "desc",
-                parentID: null,
-              })
            })
-            .then((response) => {
-              setStore(
-                "session",
-                "info",
-                produce((draft) => {
-                  for (const session of response.data) draft[session.id] = session
-                }),
-              )
-              for (const session of response.data) {
-                sync.complete(`session:${session.id}`)
-                registerSession(session.id)
-              }
-            })
-            .catch((error) => console.error("Failed to preload sessions", error))
+            .catch((error) => console.error("Failed to preload location", error))
+          void result.project.sync().catch((error) => console.error("Failed to preload projects", error))
          return
        }
        handleEvent(details)
@@ -1,6 +1,7 @@
-import { createEffect, onCleanup } from "solid-js"
+import { createEffect, createMemo, onCleanup } from "solid-js"
 import { isDeepEqual } from "remeda"
 import { createSimpleContext } from "./helper"
+import { useClient } from "./client"
 import { useData } from "./data"
 import { useEvent } from "./event"
 import { useRoute } from "./route"
@@ -31,10 +32,14 @@ type PersistedState = {

 const empty = (): TabsState => ({ tabs: [], unread: {} })

+// Deliberately after connect settles: the visible session's mount syncs win the first slots.
+const TAB_PREFETCH_DELAY = 300
+
 export const { use: useSessionTabs, provider: SessionTabsProvider } = createSimpleContext({
  name: "SessionTabs",
  init: () => {
    const route = useRoute()
+    const client = useClient()
    const data = useData()
    const event = useEvent()
    const config = useConfig().data
@@ -129,6 +134,45 @@ export const { use: useSessionTabs, provider: SessionTabsProvider } = createSimp
      })
    })

+    // Warm open tabs' session data so first switches render from cache instead of fetching inside
+    // the switch gesture. Uses only existing sync methods (each dedupes internally), so reruns on
+    // tab-set or connection changes are no-ops for already-warm sessions, and reconnects double as
+    // a cache refresh after an SSE gap. The delay lets the current session's own mount syncs get
+    // the first connection slots. The effect tracks only the id set: reorders, tab switches, and
+    // title updates neither restart the timer nor an in-flight warm pass; the timer callback
+    // itself runs untracked, where the current session is skipped.
+    const openTabSessions = createMemo(() =>
+      state()
+        .tabs.map((tab) => tab.sessionID)
+        .sort()
+        .join("\n"),
+    )
+    createEffect(() => {
+      if (!enabled()) return
+      if (client.connection.status() !== "connected") return
+      if (openTabSessions() === "") return
+      let stale = false
+      const timer = setTimeout(async () => {
+        const sessions = state()
+          .tabs.map((tab) => tab.sessionID)
+          .filter((sessionID) => sessionID !== current())
+        for (const sessionID of sessions) {
+          if (stale) return
+          await Promise.allSettled([
+            data.session.sync(sessionID),
+            data.session.message.sync(sessionID),
+            data.session.pending.sync(sessionID),
+            data.session.permission.sync(sessionID),
+            data.session.form.sync(sessionID),
+          ])
+        }
+      }, TAB_PREFETCH_DELAY)
+      onCleanup(() => {
+        stale = true
+        clearTimeout(timer)
+      })
+    })
+
    onCleanup(event.on("session.execution.succeeded", (evt) => markUnread(evt.data.sessionID, "activity")))
    onCleanup(event.on("session.execution.interrupted", (evt) => markUnread(evt.data.sessionID, "activity")))
    onCleanup(event.on("session.execution.failed", (evt) => markUnread(evt.data.sessionID, "error")))
@@ -98,6 +98,13 @@ addDefaultParsers(parsers.parsers)
 // Exclude temporary bottom space when measuring the real transcript height.
 const NAVIGATION_SLACK_ID = "session-navigation-slack"

+// Tail-first transcript mounting: rows mounted with the session, then backfill cadence.
+// The tail comfortably overfills a tall viewport; backfill drains a 200-message transcript
+// in a few hundred milliseconds without a perceptible pause.
+const TRANSCRIPT_TAIL_ROWS = 40
+const TRANSCRIPT_BACKFILL_CHUNK = 60
+const TRANSCRIPT_BACKFILL_DELAY = 120
+
 const context = createContext<{
  width: number
  sessionID: string
@@ -256,7 +263,7 @@ export function Session() {
    const sessionID = route.sessionID
    void (async () => {
      await Promise.all([
-        data.session.sync(sessionID),
+        data.session.sync(sessionID, { children: true }),
        data.session.permission.sync(sessionID),
        data.session.form.sync(sessionID),
      ])
@@ -296,6 +303,49 @@ export function Session() {
    r.set(route.prompt)
  }

+  /** Runs after layout has settled (two frames), unless the transcript was torn down. */
+  const afterLayout = (continuation: () => void) => {
+    requestAnimationFrame(() => {
+      requestAnimationFrame(() => {
+        if (!scroll || scroll.isDestroyed) return
+        continuation()
+      })
+    })
+  }
+
+  // Tail-first transcript mounting: only the newest rows mount when the session opens, and the
+  // rest backfill in chunks shortly after, so switching to a long session costs the visible tail
+  // instead of the whole transcript. Until backfill pins the count, the hidden span derives from
+  // the row count, so it needs no effect ordering; the clamp keeps at least a tail visible when a
+  // re-reduce shrinks the transcript. Streaming appends land at the end of the visible slice.
+  const [hiddenRows, setHiddenRows] = createSignal<number>()
+  const hidden = createMemo(() => Math.max(0, Math.min(hiddenRows() ?? Infinity, rows.length - TRANSCRIPT_TAIL_ROWS)))
+  const visibleRows = createMemo(() => (hidden() === 0 ? rows : rows.slice(hidden())))
+  createEffect(() => {
+    const current = hidden()
+    if (current === 0) return
+    // Until the first chunk pins hiddenRows, appends change hidden() and reset this timer, so
+    // backfill waits for a pause in streaming before starting. Once pinned, it drains on a fixed
+    // cadence undisturbed by appends.
+    const timer = setTimeout(() => {
+      const before = scroll && !scroll.isDestroyed ? scroll.scrollHeight : undefined
+      const viewportBottom = before === undefined ? 0 : scroll.scrollTop + scroll.viewport.height
+      setHiddenRows(Math.max(0, current - TRANSCRIPT_BACKFILL_CHUNK))
+      if (before === undefined) return
+      // Sticky scroll holds bottom-anchored readers through the mount; compensation is only for
+      // readers who have scrolled up.
+      if (viewportBottom >= before - 1) return
+      afterLayout(() => scroll.scrollBy(scroll.scrollHeight - before))
+    }, TRANSCRIPT_BACKFILL_DELAY)
+    onCleanup(() => clearTimeout(timer))
+  })
+  /** Message navigation needs the full transcript mounted before walking or jumping. */
+  const ensureAllRows = (continuation: () => void) => {
+    if (hidden() === 0) return continuation()
+    setHiddenRows(0)
+    afterLayout(continuation)
+  }
+
  createEffect(() => {
    const current = prompt()
    if (sent || !current || !synced() || !local.model.ready) return
@@ -322,41 +372,36 @@ export function Session() {
        currentSlack: scroll.getRenderable(NAVIGATION_SLACK_ID)?.height ?? 0,
      }),
    )
-    requestAnimationFrame(() => {
-      requestAnimationFrame(() => {
-        if (scroll.isDestroyed || navigationMessage() !== messageID) return
-        scroll.scrollTo(top)
+    afterLayout(() => {
+      if (navigationMessage() !== messageID) return
+      scroll.scrollTo(top)
+    })
+  }
+
+  const scrollToMessage = (direction: "next" | "prev", dialog: ReturnType<typeof useDialog>, userOnly = false) =>
+    ensureAllRows(() => {
+      const target = findMessageBoundary({
+        direction,
+        children: scroll.getChildren(),
+        messages: messages(),
+        scrollTop: scroll.scrollTop,
+        viewportY: scroll.viewport.y,
+        currentID: navigationMessage(),
+        userOnly,
      })
-    })
-  }

-  const scrollToMessage = (direction: "next" | "prev", dialog: ReturnType<typeof useDialog>, userOnly = false) => {
-    const target = findMessageBoundary({
-      direction,
-      children: scroll.getChildren(),
-      messages: messages(),
-      scrollTop: scroll.scrollTop,
-      viewportY: scroll.viewport.y,
-      currentID: navigationMessage(),
-      userOnly,
-    })
-
-    if (!target) {
+      if (target) alignMessage(target.id, target.top)
      dialog.clear()
-      return
-    }
+    })

-    alignMessage(target.id, target.top)
-    dialog.clear()
-  }
-
-  const jumpToMessage = (messageID: string) => {
-    const child = scroll.getRenderable(messageID)
-    if (!child) return
-    const y = scroll.scrollTop + child.y - scroll.viewport.y
-    const message = data.session.message.get(route.sessionID, messageID)
-    alignMessage(messageID, Math.max(0, y - (message?.type === "assistant" ? 1 : 0)))
-  }
+  const jumpToMessage = (messageID: string) =>
+    ensureAllRows(() => {
+      const child = scroll.getRenderable(messageID)
+      if (!child) return
+      const y = scroll.scrollTop + child.y - scroll.viewport.y
+      const message = data.session.message.get(route.sessionID, messageID)
+      alignMessage(messageID, Math.max(0, y - (message?.type === "assistant" ? 1 : 0)))
+    })

  function toBottom() {
    clearMessageNavigation()
@@ -932,12 +977,12 @@ export function Session() {
              flexGrow={1}
              scrollAcceleration={scrollAcceleration()}
            >
-              <For each={rows}>
+              <For each={visibleRows()}>
                {(row, index) => (
                  <SessionRowView
                    row={row}
                    message={(messageID) => data.session.message.get(route.sessionID, messageID)}
-                    boundaryID={boundaries()[index()]}
+                    boundaryID={boundaries()[index() + hidden()]}
                  />
                )}
              </For>
@@ -97,11 +97,16 @@ export function createSessionRows(sessionID: Accessor<string>) {
    }),
  )

-  // Re-reduce when the revert boundary changes (stage/clear/commit).
+  // Re-reduce when the revert boundary changes (stage/clear/commit). These reactions defer
+  // their first run: the mount effect above has already reduced the same state.
  createEffect(
-    on(revertBoundary, () => {
-      setRows(reconcile(reduce()))
-    }),
+    on(
+      revertBoundary,
+      () => {
+        setRows(reconcile(reduce()))
+      },
+      { defer: true },
+    ),
  )

  createEffect(
@@ -112,6 +117,7 @@ export function createSessionRows(sessionID: Accessor<string>) {
          .filter((item) => item.type === "compaction")
          .map((item) => item.id),
      () => setRows(reconcile(reduce())),
+      { defer: true },
    ),
  )

@@ -137,12 +143,11 @@ export function createSessionRows(sessionID: Accessor<string>) {
              : [],
        ),
      () => setRows(reconcile(reduce())),
+      { defer: true },
    ),
  )

-  createEffect(
-    on(turnTokens, () => setRows(reconcile(reduce()))),
-  )
+  createEffect(on(turnTokens, () => setRows(reconcile(reduce())), { defer: true }))

  const appendMessage = (messageID: string) =>
    setRows(
@@ -615,14 +615,14 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
              when={props.renderFilter !== false && store.filter.length > 0}
              fallback={
                props.emptyView ?? (
-                  <box paddingLeft={4} paddingRight={4} paddingTop={1}>
+                  <box paddingLeft={4} paddingRight={4}>
                    <text fg={theme.text.subdued}>No items available</text>
                  </box>
                )
              }
            >
              {props.noMatchView ?? (
-                <box paddingLeft={4} paddingRight={4} paddingTop={1}>
+                <box paddingLeft={4} paddingRight={4}>
                  <text fg={theme.text.subdued}>No results found</text>
                </box>
              )}
@@ -11,7 +11,7 @@ import { ClientProvider, useClient } from "../../../src/context/client"
 import { DataProvider as DataProviderBase, useData } from "../../../src/context/data"
 import { LocationProvider, useLocation } from "../../../src/context/location"
 import { createSessionRows, type SessionRow } from "../../../src/routes/session/rows"
-import { createApi, createEventStream, createFetch, directory, json } from "../../fixture/tui-client"
+import { createApi, createEventStream, createFetch, directory, json, worktree } from "../../fixture/tui-client"
 import { TestTuiContexts } from "../../fixture/tui-environment"
 import { createTuiResolvedConfig } from "../../fixture/tui-runtime"

@@ -71,11 +71,13 @@ function durable(sessionID: string, seq = 0, version = 1) {
  return { aggregateID: sessionID, seq, version }
 }

-test("preloads root sessions before applying the session limit", async () => {
+test("does not preload session summaries into the data context", async () => {
  const events = createEventStream()
-  let request: URL | undefined
+  let location = false
+  let sessions = false
  const calls = createFetch((url) => {
-    if (url.pathname === "/api/session") request = url
+    if (url.pathname === "/api/location") location = true
+    if (url.pathname === "/api/session") sessions = true
    return undefined
  }, events)

@@ -92,10 +94,58 @@ test("preloads root sessions before applying the session limit", async () => {
  ))

  try {
-    await wait(() => request !== undefined)
-    expect(request?.searchParams.get("project")).toBe("proj_test")
-    expect(request?.searchParams.get("limit")).toBe("50")
-    expect(request?.searchParams.get("parentID")).toBe("null")
+    await wait(() => location)
+    await Bun.sleep(20)
+    expect(sessions).toBe(false)
+  } finally {
+    app.renderer.destroy()
+  }
+})
+
+test("proactively syncs project metadata", async () => {
+  const events = createEventStream()
+  const calls = createFetch((url) => {
+    if (url.pathname !== "/api/project") return
+    return json([
+      {
+        id: "proj_test",
+        canonical: worktree,
+        name: "OpenCode",
+        time: { created: 1, updated: 2 },
+        sandboxes: [],
+      },
+    ])
+  }, events)
+  let data!: ReturnType<typeof useData>
+
+  function Probe() {
+    data = useData()
+    return <box />
+  }
+
+  const app = await testRender(() => (
+    <TestTuiContexts>
+      <ClientProvider api={createApi(calls.fetch)}>
+        <ProjectProvider>
+          <DataProvider>
+            <Probe />
+          </DataProvider>
+        </ProjectProvider>
+      </ClientProvider>
+    </TestTuiContexts>
+  ))
+
+  try {
+    await wait(() => data.project.get("proj_test") !== undefined)
+    expect(data.project.list()).toEqual([
+      {
+        id: "proj_test",
+        canonical: worktree,
+        name: "OpenCode",
+        time: { created: 1, updated: 2 },
+        sandboxes: [],
+      },
+    ])
  } finally {
    app.renderer.destroy()
  }
@@ -1398,6 +1448,29 @@ test("restores queued compaction from durable pending input", async () => {
      { type: "compaction-queued", inputID: "message-compaction-later" },
    ])

+    emitEvent(events, {
+      id: "evt_step_started",
+      created: 2,
+      type: "session.step.started",
+      durable: durable(sessionID, 3),
+      data: {
+        sessionID,
+        assistantMessageID: "message-assistant",
+        agent: "build",
+        model: { id: "model", providerID: "provider" },
+      },
+    })
+    emitEvent(events, {
+      id: "evt_text_started",
+      created: 2,
+      type: "session.text.started",
+      durable: durable(sessionID, 4),
+      data: {
+        sessionID,
+        assistantMessageID: "message-assistant",
+        ordinal: 0,
+      },
+    })
    emitEvent(events, {
      id: "evt_text_ended",
      created: 2,
@@ -1417,7 +1490,7 @@ test("restores queued compaction from durable pending input", async () => {
      id: "evt_compaction_started",
      created: 2,
      type: "session.compaction.started",
-      durable: durable(sessionID, 4),
+      durable: durable(sessionID, 6),
      data: {
        sessionID,
        reason: "manual",
@@ -1432,7 +1505,7 @@ test("restores queued compaction from durable pending input", async () => {
      id: "evt_compaction_ended",
      created: 3,
      type: "session.compaction.ended",
-      durable: durable(sessionID, 5),
+      durable: durable(sessionID, 7),
      data: { sessionID, reason: "manual", text: "Summary", recent: "" },
    })
    expect(data.session.pending.list(sessionID).map((item) => item.id)).toEqual(["message-compaction-later"])
@@ -2596,8 +2669,18 @@ function sessionInfo(id: string, parentID: string | undefined, cost = 0) {
 // the family-index tests below.
 async function mountData(parents: Record<string, string>, costs: Record<string, number> = {}) {
  const calls = createFetch((url) => {
+    if (url.pathname === "/api/session") {
+      const parentID = url.searchParams.get("parentID")
+      return json({
+        data: Object.entries(parents)
+          .filter(([, parent]) => parent === parentID)
+          .map(([id, parent]) => sessionInfo(id, parent, costs[id])),
+        cursor: {},
+      })
+    }
    const match = url.pathname.match(/^\/api\/session\/([^/]+)$/)
-    if (match && match[1] !== "active") return json({ data: sessionInfo(match[1], parents[match[1]], costs[match[1]]) })
+    if (match && match[1] !== "active")
+      return json({ data: sessionInfo(match[1], parents[match[1]], costs[match[1]]) })
  })
  let data!: ReturnType<typeof useData>
  let ready!: () => void
@@ -2624,6 +2707,20 @@ async function mountData(parents: Record<string, string>, costs: Record<string,
  return { data, app }
 }

+test("syncs direct child session info with a navigated root", async () => {
+  const { data, app } = await mountData({ child: "root", sibling: "root", grandchild: "child" })
+  try {
+    await data.session.sync("root", { children: true })
+    expect(data.session.get("root")?.id).toBe("root")
+    expect(data.session.get("child")?.parentID).toBe("root")
+    expect(data.session.get("sibling")?.parentID).toBe("root")
+    expect(data.session.get("grandchild")).toBeUndefined()
+    expect(data.session.family("root")).toEqual(["root", "child", "sibling"])
+  } finally {
+    app.renderer.destroy()
+  }
+})
+
 test("groups an orphan child under its missing parent until the root arrives", async () => {
  const { data, app } = await mountData({ child: "root" })
  try {
@@ -185,6 +185,19 @@ test("dialog actions run without options while row actions still require a selec
  }
 })

+test("renders one gap before an empty state", async () => {
+  await using tmp = await tmpdir()
+  const app = await renderSelect(tmp.path, [], () => {}, () => {})
+
+  try {
+    await app.waitForFrame((frame) => frame.includes("No items available"))
+    const lines = app.captureCharFrame().split("\n").map((line) => line.trim())
+    expect(lines.indexOf("No items available") - lines.indexOf("Search")).toBe(2)
+  } finally {
+    app.renderer.destroy()
+  }
+})
+
 test("footer actions run when filtering leaves no selected row", async () => {
  await using tmp = await tmpdir()
  let global = 0
@@ -93,24 +93,26 @@ export function createFetch(override?: FetchHandler, events?: ReturnType<typeof
    if (url.pathname === "/experimental/console") return json({ consoleManagedProviders: [], switchableOrgCount: 0 })
    if (url.pathname === "/experimental/capabilities") return json({ backgroundSubagents: true })
    if (url.pathname === "/path") return json({ home: "", state: "", config: "", worktree, directory })
-    if (url.pathname === "/api/location") return json({ directory, project: { id: "proj_test", directory: worktree } })
+    if (url.pathname === "/api/location")
+      return json({ directory, project: { id: "proj_test", directory: worktree, canonical: worktree } })
    if (url.pathname === "/api/fs/list")
-      return json({ location: { directory, project: { id: "proj_test", directory: worktree } }, data: [] })
+      return json({ location: { directory, project: { id: "proj_test", directory: worktree, canonical: worktree } }, data: [] })
    if (url.pathname === "/api/project/current") return json({ id: "proj_test", directory: worktree })
+    if (url.pathname === "/api/project") return json([])
    if (url.pathname === "/api/project/proj_test/directories") return json([{ directory: worktree }])
    if (url.pathname === "/api/shell")
-      return json({ location: { directory, project: { id: "proj_test", directory: worktree } }, data: [] })
+      return json({ location: { directory, project: { id: "proj_test", directory: worktree, canonical: worktree } }, data: [] })
    if (url.pathname === "/api/mcp")
-      return json({ location: { directory, project: { id: "proj_test", directory: worktree } }, data: [] })
+      return json({ location: { directory, project: { id: "proj_test", directory: worktree, canonical: worktree } }, data: [] })
    if (url.pathname === "/api/mcp/resource")
      return json({
-        location: { directory, project: { id: "proj_test", directory: worktree } },
+        location: { directory, project: { id: "proj_test", directory: worktree, canonical: worktree } },
        data: { resources: [], templates: [] },
      })
    if (url.pathname === "/api/session") return json({ data: [], cursor: {} })
    if (url.pathname === "/api/session/active") return json({ data: {} })
    if (url.pathname === "/api/permission/request")
-      return json({ location: { directory, project: { id: "proj_test", directory: worktree } }, data: [] })
+      return json({ location: { directory, project: { id: "proj_test", directory: worktree, canonical: worktree } }, data: [] })
    if (url.pathname === "/api/form/request")
      return json({ location: { directory, project: { id: "proj_test", directory: worktree } }, data: [] })
    if (/^\/api\/session\/[^/]+\/form$/.test(url.pathname)) return json({ data: [] })
@@ -120,13 +122,13 @@ export function createFetch(override?: FetchHandler, events?: ReturnType<typeof
      )
    )
      return json({
-        location: { directory, project: { id: "proj_test", directory: worktree } },
+        location: { directory, project: { id: "proj_test", directory: worktree, canonical: worktree } },
        data: [],
      })
    if (url.pathname === "/api/reference")
-      return json({ location: { directory, project: { id: "proj_test", directory } }, data: [] })
+      return json({ location: { directory, project: { id: "proj_test", directory, canonical: directory } }, data: [] })
    if (url.pathname === "/api/websearch/provider") {
-      return json({ location: { directory, project: { id: "proj_test", directory } }, data: [] })
+      return json({ location: { directory, project: { id: "proj_test", directory, canonical: directory } }, data: [] })
    }
    if (url.pathname === "/provider") return json({ all: [], default: {}, connected: [] })
    if (url.pathname === "/session") return json([])
@@ -78,7 +78,7 @@ describe("run interactive runtime", () => {
        directory: "/tmp",
        target: async () => ({
          sessionID: "ses_root",
-          location: { directory: "/tmp", project: { id: "pro-1", directory: "/tmp" } },
+          location: { directory: "/tmp", project: { id: "pro-1", directory: "/tmp", canonical: "/tmp" } },
          agent: "build",
          model: undefined,
          variant: undefined,
@@ -130,7 +130,7 @@ describe("run interactive runtime", () => {
    await refreshCatalog?.()
    expect(defaultModel).toHaveBeenCalledTimes(1)
    selected.resolve({
-      location: { directory: "/tmp", project: { id: "pro-1", directory: "/tmp" } },
+      location: { directory: "/tmp", project: { id: "pro-1", directory: "/tmp", canonical: "/tmp" } },
      data: model,
    })
    while (defaultModel.mock.calls.length < 2) await Bun.sleep(0)
@@ -165,7 +165,7 @@ describe("run interactive runtime", () => {
        directory: "/tmp",
        target: async () => ({
          sessionID: "ses_root",
-          location: { directory: "/tmp", project: { id: "pro-1", directory: "/tmp" } },
+          location: { directory: "/tmp", project: { id: "pro-1", directory: "/tmp", canonical: "/tmp" } },
          agent: "build",
          model: { providerID: "test", modelID: "model" },
          variant: undefined,
@@ -261,7 +261,7 @@ describe("run interactive runtime", () => {
          return {
            sessionID: "ses-deferred",
            sessionTitle: "Deferred",
-            location: { directory: "/tmp", project: { id: "pro-1", directory: "/tmp" } },
+            location: { directory: "/tmp", project: { id: "pro-1", directory: "/tmp", canonical: "/tmp" } },
            agent: "build",
            model: { providerID: "openai", modelID: "gpt-5" },
            variant: undefined,
@@ -349,7 +349,7 @@ describe("run interactive runtime", () => {
        target: async () => ({
          sessionID: "ses-resume",
          sessionTitle: "Resume",
-          location: { directory: "/tmp", project: { id: "pro-1", directory: "/tmp" } },
+          location: { directory: "/tmp", project: { id: "pro-1", directory: "/tmp", canonical: "/tmp" } },
          agent: "review",
          model: { providerID: "openai", modelID: "gpt-5" },
          variant: "high",
@@ -432,7 +432,7 @@ describe("run interactive runtime", () => {
        target: async () => ({
          sessionID: "ses-resume-abort",
          sessionTitle: "Cached title",
-          location: { directory: "/tmp", project: { id: "pro-1", directory: "/tmp" } },
+          location: { directory: "/tmp", project: { id: "pro-1", directory: "/tmp", canonical: "/tmp" } },
          agent: "build",
          model: undefined,
          variant: undefined,
@@ -490,7 +490,7 @@ describe("run interactive runtime", () => {
      location: {
        directory: "/session",
        workspaceID: "work-1",
-        project: { id: "pro-1", directory: "/session" },
+        project: { id: "pro-1", directory: "/session", canonical: "/session" },
      },
      data: [{ path: "src/index.ts", type: "file" }],
    } as never)
@@ -507,7 +507,7 @@ describe("run interactive runtime", () => {
            location: {
              directory: "/session",
              workspaceID: "work-1",
-              project: { id: "location-project", directory: "/session" },
+              project: { id: "location-project", directory: "/session", canonical: "/session" },
            },
            agent: "review",
            model: { providerID: "openai", modelID: "gpt-5" },
@@ -167,7 +167,11 @@ function sdk(input: {
      location: {
        directory: input.globalLocation?.directory ?? "/tmp",
        workspaceID: input.globalLocation?.workspaceID,
-        project: { id: "proj_1", directory: input.globalLocation?.directory ?? "/tmp" },
+        project: {
+          id: "proj_1",
+          directory: input.globalLocation?.directory ?? "/tmp",
+          canonical: input.globalLocation?.directory ?? "/tmp",
+        },
      },
      data: input.globals ?? [],
    }),
Author	SHA1	Message	Date
Kit Langton	c161978852	feat(tui): prefetch open session tabs after connect (#39589 )	2026-07-29 22:23:13 -04:00
Kit Langton	cb37a7166a	feat(tui): make session tab switching fast for long transcripts (#39568 )	2026-07-29 22:23:10 -04:00
Dax Raad	488445a679	fix(tui): correct project-aware session lists	2026-07-29 21:59:33 -04:00
opencode-agent[bot]	97786afdd8	refactor(core): share file diff construction (#39586 ) Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>	2026-07-30 00:28:33 +00:00
Aiden Cline	b1a5e8a6ae	test(tui): restore compaction event lifecycle (#39581 )	2026-07-29 18:11:58 -05:00