feat: add worktree execution context

packages/app/src/components/prompt-input/workspace-chip-helpers.ts

@@ -1,15 +1,23 @@
 import { effectiveWorkspaceOrder, workspaceKey } from "@/pages/layout/helpers"
 
+export type WorkspaceEntry = string | { directory: string; branch?: string }
+
 export type WorkspaceProject = {
   worktree: string
-  sandboxes?: string[]
+  sandboxes?: WorkspaceEntry[]
+}
+
+function workspacePath(entry: WorkspaceEntry) {
+  return typeof entry === "string" ? entry : entry.directory
 }
 
 export function findWorkspaceProject(projects: WorkspaceProject[], directory?: string) {
   if (!directory) return
   const key = workspaceKey(directory)
   return projects.find(
-    (item) => workspaceKey(item.worktree) === key || item.sandboxes?.some((sandbox) => workspaceKey(sandbox) === key),
+    (item) =>
+      workspaceKey(item.worktree) === key ||
+      item.sandboxes?.some((sandbox) => workspaceKey(workspacePath(sandbox)) === key),
   )
 }
 
@@ -21,7 +29,7 @@ export type WorkspaceChoice = {
 export function workspaceChipChoices(input: {
   directory?: string
   projects: WorkspaceProject[]
-  listed?: string[]
+  listed?: WorkspaceEntry[]
 }): WorkspaceChoice[] {
   const directory = input.directory
   if (!directory) return []
@@ -30,19 +38,24 @@ export function workspaceChipChoices(input: {
   const seen = new Set<string>()
   const choices: WorkspaceChoice[] = []
 
-  const append = (value: string) => {
-    const key = workspaceKey(value)
+  const append = (value: WorkspaceEntry) => {
+    const path = workspacePath(value)
+    const key = workspaceKey(path)
     if (seen.has(key)) return
     seen.add(key)
-    choices.push({ path: value })
+    choices.push({ path, branch: typeof value === "string" ? undefined : value.branch })
   }
 
   if (!current) append(directory)
 
   for (const project of input.projects) {
     const ordered =
       current && workspaceKey(project.worktree) === workspaceKey(current.worktree)
-        ? effectiveWorkspaceOrder(project.worktree, [project.worktree, ...(project.sandboxes ?? []), ...(input.listed ?? [])])
+        ? effectiveWorkspaceOrder(project.worktree, [
+            project.worktree,
+            ...(project.sandboxes ?? []).map(workspacePath),
+            ...(input.listed ?? []).map(workspacePath),
+          ])
         : [project.worktree, ...(project.sandboxes ?? [])]
 
     for (const item of ordered) append(item)

packages/app/src/components/prompt-input/workspace-chip.tsx

@@ -34,7 +34,7 @@ export function WorkspaceChip(props: { style?: JSX.CSSProperties | string } = {}
       return globalSDK.client.worktree
         .list({ directory })
         .then((x) => x.data ?? [])
-        .catch(() => [] as string[])
+        .catch(() => [])
     },
   )
   const workspaces = createMemo(() => {
@@ -132,4 +132,3 @@ export function WorkspaceChip(props: { style?: JSX.CSSProperties | string } = {}
     </Popover>
   )
 }
-

packages/app/src/components/session/session-header.tsx

@@ -14,6 +14,7 @@ import { usePlatform } from "@/context/platform"
 import { useServer } from "@/context/server"
 import { useShellSurface } from "@/context/shell-surface"
 import { useSync } from "@/context/sync"
+import { PawworkWorktreeBadge } from "@/pages/layout/pawwork-worktree-badge"
 import { useSessionLayout } from "@/pages/session/session-layout"
 import { decode64 } from "@/utils/base64"
 import { StatusPopover } from "../status-popover"
@@ -42,6 +43,11 @@ export function SessionHeader() {
   })
   const sessionInfo = createMemo(() => (params.id ? sync.session.get(params.id) : undefined))
   const sessionTitle = createMemo(() => sessionInfo()?.title || params.id || "")
+  const activeWorktree = createMemo(() => {
+    const exec = sessionInfo()?.executionContext
+    if (!exec || exec.activeDirectory === exec.ownerDirectory) return
+    return exec.activeWorktree
+  })
   const homeTitle = createMemo(() => language.t("command.session.new"))
   const onSessionRoute = createMemo(() => location.pathname.includes("/session"))
   const fileManagerLabel = createMemo(() => {
@@ -80,7 +86,7 @@ export function SessionHeader() {
       <Show when={!shellSurface.settingsOpen() && centerMount()}>
         {(mount) => (
           <Portal mount={mount()}>
-            <div class="hidden md:flex min-w-0 items-center gap-1.5 text-13-medium">
+            <div class="hidden md:flex max-w-[min(72vw,760px)] min-w-0 items-center gap-1 text-13-medium">
               <Show
                 when={params.id}
                 fallback={<div class="min-w-0 truncate text-text-strong">{homeTitle()}</div>}
@@ -90,7 +96,7 @@ export function SessionHeader() {
                     type="button"
                     variant="ghost"
                     size="small"
-                    class="max-w-[180px] min-w-0 items-center gap-1 rounded-md px-1.5 shadow-none text-text-weak hover:text-text-strong"
+                    class="h-6 max-w-[180px] min-w-0 items-center gap-1 rounded px-1 shadow-none text-13-medium text-text-weak hover:text-text-strong"
                     onClick={openProjectDirectory}
                     aria-label={
                       canOpenProjectDirectory() ? language.t("session.header.open.ariaLabel", { app: fileManagerLabel() }) : undefined
@@ -102,14 +108,25 @@ export function SessionHeader() {
                     }
                     disabled={!canOpenProjectDirectory()}
                   >
-                    <Icon name="folder" size="small" class="shrink-0 text-icon-weak" />
                     <span class="min-w-0 truncate">{name()}</span>
                   </Button>
                 </Show>
                 <Show when={projectDirectory()}>
-                  <span class="shrink-0 text-text-weaker">/</span>
+                  <span class="shrink-0 text-13-regular text-text-weaker">/</span>
+                </Show>
+                <Show when={activeWorktree()}>
+                  {(worktree) => (
+                    <>
+                      <PawworkWorktreeBadge
+                        name={worktree().name}
+                        branch={worktree().branch}
+                        directory={worktree().directory}
+                      />
+                      <span class="shrink-0 text-13-regular text-text-weaker">/</span>
+                    </>
+                  )}
                 </Show>
-                <span class="min-w-0 truncate text-text-strong">{sessionTitle()}</span>
+                <span class="min-w-0 truncate text-13-medium text-text-strong">{sessionTitle()}</span>
               </Show>
             </div>
           </Portal>

packages/app/src/components/settings-page.tsx

@@ -17,8 +17,9 @@ import { SettingsGeneral } from "./settings-general"
 import { SettingsKeybinds } from "./settings-keybinds"
 import { SettingsModels } from "./settings-models"
 import { SettingsProviders } from "./settings-providers"
+import { SettingsWorktrees } from "./settings-worktrees"
 
-export type SettingsPageTab = "general" | "shortcuts" | "providers" | "models"
+export type SettingsPageTab = "general" | "shortcuts" | "providers" | "models" | "worktrees"
 
 export const SettingsPage: Component<{
   active: SettingsPageTab
@@ -86,7 +87,14 @@ export const SettingsPage: Component<{
         variant="settings"
         value={props.active}
         onChange={(value) => {
-          if (value !== "general" && value !== "shortcuts" && value !== "providers" && value !== "models") return
+          if (
+            value !== "general" &&
+            value !== "shortcuts" &&
+            value !== "providers" &&
+            value !== "models" &&
+            value !== "worktrees"
+          )
+            return
           props.onSelect(value)
         }}
         class="h-full w-full"
@@ -134,6 +142,10 @@ export const SettingsPage: Component<{
                       <Icon name="models" />
                       {language.t("settings.models.title")}
                     </Tabs.Trigger>
+                    <Tabs.Trigger value="worktrees">
+                      <Icon name="worktree" />
+                      {language.t("settings.tab.worktrees")}
+                    </Tabs.Trigger>
                   </div>
                 </div>
               </div>
@@ -165,6 +177,11 @@ export const SettingsPage: Component<{
             <SettingsModels />
           </div>
         </Tabs.Content>
+        <Tabs.Content value="worktrees" class="no-scrollbar">
+          <div class="mx-auto w-full max-w-[760px]">
+            <SettingsWorktrees />
+          </div>
+        </Tabs.Content>
       </Tabs>
     </section>
   )

packages/app/src/components/settings-worktrees.tsx

@@ -0,0 +1,201 @@
+import { type Component, createResource, createSignal, For, Show } from "solid-js"
+import { Button } from "@opencode-ai/ui/button"
+import { Icon } from "@opencode-ai/ui/icon"
+import { showToast } from "@opencode-ai/ui/toast"
+import { useGlobalSDK } from "@/context/global-sdk"
+import { useGlobalSync } from "@/context/global-sync"
+import { useLanguage } from "@/context/language"
+import { SettingsList } from "./settings-list"
+
+type WorktreeInfo = {
+  name: string
+  branch: string
+  directory: string
+  ownerDirectory: string
+  source?: "created" | "existing"
+}
+
+function basename(p: string): string {
+  const trimmed = p.replace(/[/\\]+$/, "")
+  const last = trimmed.split(/[/\\]/).pop()
+  return last || p
+}
+
+/**
+ * Settings → Worktrees panel.
+ *
+ * Lists every PawWork-tracked worktree directory for the current project (via
+ * `client.worktree.list()`); offers a per-row delete with two-step confirm. Delete is disabled
+ * when an open session in this app instance has the worktree as its activeDirectory; the user
+ * must call ExitWorktree from that session first.
+ */
+export const SettingsWorktrees: Component = () => {
+  const language = useLanguage()
+  const sdk = useGlobalSDK()
+  const sync = useGlobalSync()
+
+  const projectRoots = () =>
+    sync.data.project.filter((project) => project.vcs === "git").map((project) => project.worktree).filter(Boolean)
+
+  const [data, { refetch }] = createResource(
+    () => projectRoots().join("\0"),
+    async () => {
+      const rows = await Promise.all(
+        projectRoots().map(async (ownerDirectory) => {
+          const res = await sdk.client.worktree.list({ directory: ownerDirectory })
+          return (res.data ?? []).map((worktree) => ({ ...worktree, ownerDirectory }) as WorktreeInfo)
+        }),
+      )
+      const byDirectory = new Map<string, WorktreeInfo>()
+      for (const row of rows.flat()) byDirectory.set(row.directory, row)
+      return Array.from(byDirectory.values())
+    },
+  )
+
+  // Sessions whose activeDirectory points at a worktree path block its deletion.
+  const boundSessions = (): Map<string, string> => {
+    const map = new Map<string, string>()
+    const directories = new Set<string>()
+    for (const project of sync.data.project) {
+      directories.add(project.worktree)
+      for (const sandbox of project.sandboxes ?? []) directories.add(sandbox)
+    }
+    for (const worktree of data() ?? []) {
+      directories.add(worktree.ownerDirectory)
+      directories.add(worktree.directory)
+    }
+
+    for (const directory of directories) {
+      const [store] = sync.child(directory, { bootstrap: false })
+      for (const s of store.session ?? []) {
+        const exec = s.executionContext
+        if (!exec) continue
+        if (exec.activeDirectory && exec.activeDirectory !== exec.ownerDirectory) {
+          map.set(exec.activeDirectory, s.title)
+        }
+      }
+    }
+    return map
+  }
+
+  const [confirming, setConfirming] = createSignal<string | undefined>(undefined)
+  const [deleting, setDeleting] = createSignal<string | undefined>(undefined)
+
+  const handleDelete = async (directory: string) => {
+    setDeleting(directory)
+    try {
+      const ownerDirectory = data()?.find((worktree) => worktree.directory === directory)?.ownerDirectory ?? directory
+      const res = await sdk.client.worktree.remove({ directory: ownerDirectory, worktreeRemoveInput: { directory } })
+      if (res.error) throw new Error(JSON.stringify(res.error))
+      setConfirming(undefined)
+      void refetch()
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err)
+      showToast({
+        title: language.t("settings.worktrees.deleteFailed", { message }),
+      })
+    } finally {
+      setDeleting(undefined)
+    }
+  }
+
+  return (
+    <SettingsList>
+      <div class="flex flex-col gap-3 py-4">
+        <div class="flex flex-col gap-1">
+          <h2 class="text-16-medium text-text-strong">{language.t("settings.worktrees.title")}</h2>
+          <p class="text-13-regular text-text-weak">{language.t("settings.worktrees.description")}</p>
+        </div>
+
+        <Show
+          when={!data.loading}
+          fallback={
+            <div class="text-13-regular text-text-weak py-6 text-center">{language.t("common.loading")}</div>
+          }
+        >
+          <Show
+            when={(data() ?? []).length > 0}
+            fallback={
+              <div class="text-13-regular text-text-weak py-6 text-center">
+                {language.t("settings.worktrees.empty")}
+              </div>
+            }
+          >
+            <ul
+              class="flex flex-col divide-y divide-line-base rounded border border-line-base"
+              data-component="settings-worktrees-list"
+            >
+              <For each={data() ?? []}>
+                {(worktree) => {
+                  const directory = () => worktree.directory
+                  const name = () => worktree.name || basename(worktree.directory)
+                  const branch = () => worktree.branch || "-"
+                  const blocker = () => boundSessions().get(worktree.directory)
+                  const blocked = () => !!blocker()
+                  const isConfirming = () => confirming() === worktree.directory
+                  const isDeleting = () => deleting() === worktree.directory
+
+                  return (
+                    <li class="flex items-center gap-3 px-3 py-2.5">
+                      <Icon name="worktree" size="small" class="text-text-weak shrink-0" />
+                      <div class="flex flex-col min-w-0 flex-1">
+                        <span class="text-13-medium text-text-strong truncate" title={directory()}>
+                          {name()}
+                        </span>
+                        <span class="text-13-regular text-text-weak truncate" title={directory()}>
+                          {branch()} · {worktree.source ?? "created"} · {directory()}
+                        </span>
+                      </div>
+                      <Show
+                        when={isConfirming()}
+                        fallback={
+                          <Button
+                            variant="ghost"
+                            size="small"
+                            disabled={blocked() || isDeleting()}
+                            title={
+                              blocked()
+                                ? language.t("settings.worktrees.deleteDisabled.tooltip", {
+                                    session: blocker() ?? "",
+                                  })
+                                : undefined
+                            }
+                            onClick={() => setConfirming(directory())}
+                          >
+                            {language.t("settings.worktrees.delete")}
+                          </Button>
+                        }
+                      >
+                        <div class="flex items-center gap-1">
+                          <span class="text-13-regular text-text-weak">
+                            {language.t("settings.worktrees.confirmDelete.body", { name: name() })}
+                          </span>
+                          <Button
+                            variant="ghost"
+                            size="small"
+                            disabled={isDeleting()}
+                            onClick={() => setConfirming(undefined)}
+                          >
+                            {language.t("settings.worktrees.confirmDelete.cancelLabel")}
+                          </Button>
+                          <Button
+                            variant="primary"
+                            size="small"
+                            disabled={isDeleting()}
+                            onClick={() => handleDelete(directory())}
+                          >
+                            {language.t("settings.worktrees.confirmDelete.confirmLabel")}
+                          </Button>
+                        </div>
+                      </Show>
+                    </li>
+                  )
+                }}
+              </For>
+            </ul>
+          </Show>
+        </Show>
+      </div>
+    </SettingsList>
+  )
+}