refactor(app): unify project close actions

Author: a-happysoft

packages/app/src/pages/layout.tsx

@@ -83,7 +83,7 @@ import {
 import { workspaceOpenState } from "./layout/sidebar-workspace-helpers"
 import { ProjectDragOverlay, SortableProject, type ProjectSidebarContext } from "./layout/sidebar-project"
 import { SidebarContent } from "./layout/sidebar-shell"
-import { askProjectClose, closeProject as runProjectClose } from "./layout/project-close"
+import { closeProject as runProjectClose } from "./layout/project-close"
 
 export default function Layout(props: ParentProps) {
   const [store, setStore, , ready] = persisted(
@@ -1341,16 +1341,6 @@ export default function Layout(props: ParentProps) {
       open: navigateToProject,
     })
 
-  const askClose = (project: LocalProject) =>
-    askProjectClose({
-      project,
-      t: language.t,
-      show: dialog.show,
-      dismiss: dialog.close,
-      onClose: close,
-      list: globalSDK.client.session.list,
-    })
-
   function toggleProjectWorkspaces(project: LocalProject) {
     const enabled = layout.sidebar.workspaces(project.worktree)()
     if (enabled) {
@@ -2025,7 +2015,7 @@ export default function Layout(props: ParentProps) {
                         <DropdownMenu.Item
                           data-action="project-close-menu"
                           data-project={base64Encode(p().worktree)}
-                          onSelect={() => void askClose(p())}
+                          onSelect={() => close(p().worktree)}
                         >
                           <DropdownMenu.ItemLabel>{language.t("common.close")}</DropdownMenu.ItemLabel>
                         </DropdownMenu.Item>

packages/app/src/pages/layout/project-close.test.ts

@@ -1,26 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import { closeProject, projectCloseBody } from "./project-close"
-
-const t = (key: string, vars?: Record<string, string | number>) => {
-  if (key === "dialog.project.close.note") return "Reopen later."
-  if (key === "dialog.project.close.sessions.one") return "1 active session."
-  if (key === "dialog.project.close.sessions.many") return `${vars?.count} active sessions.`
-  return key
-}
-
-describe("project close copy", () => {
-  test("shows note when there are no active sessions", () => {
-    expect(projectCloseBody(0, t)).toBe("Reopen later.")
-  })
-
-  test("shows singular session warning with note", () => {
-    expect(projectCloseBody(1, t)).toBe("1 active session. Reopen later.")
-  })
-
-  test("shows plural session warning with note", () => {
-    expect(projectCloseBody(3, t)).toBe("3 active sessions. Reopen later.")
-  })
-})
+import { closeProject } from "./project-close"
 
 describe("closeProject", () => {
   test("closes inactive project without navigation", () => {

packages/app/src/pages/layout/project-close.tsx

@@ -1,12 +1,5 @@
 import { base64Encode } from "@opencode-ai/util/encode"
-import { Button } from "@opencode-ai/ui/button"
-import { Dialog } from "@opencode-ai/ui/dialog"
-import { createMemo, Show, type JSX } from "solid-js"
-import type { Session } from "@opencode-ai/sdk/v2/client"
 import type { LocalProject } from "@/context/layout"
-import { displayName } from "./helpers"
-
-type T = (key: string, vars?: Record<string, string | number>) => string
 
 type Nav = {
   directory: string
@@ -18,29 +11,6 @@ type Nav = {
   open: (directory: string) => Promise<void> | void
 }
 
-type Ask = {
-  project: LocalProject
-  t: T
-  show: (cb: () => JSX.Element) => void
-  dismiss: () => void
-  onClose: (directory: string) => void
-  list: (input: { directory: string }) => Promise<{ data?: Session[] | null }>
-}
-
-type DialogProps = {
-  count: number
-  project: LocalProject
-  t: T
-  onCancel: () => void
-  onClose: () => void
-}
-
-export function projectCloseBody(count: number, t: T) {
-  if (count === 0) return t("dialog.project.close.note")
-  if (count === 1) return `${t("dialog.project.close.sessions.one")} ${t("dialog.project.close.note")}`
-  return `${t("dialog.project.close.sessions.many", { count })} ${t("dialog.project.close.note")}`
-}
-
 export function closeProject(input: Nav) {
   const go = input.go ?? input.navigate
   const index = input.list.findIndex((x) => x.worktree === input.directory)
@@ -65,56 +35,3 @@ export function closeProject(input: Nav) {
     void input.open(next.worktree)
   })
 }
-
-async function count(project: LocalProject, list: Ask["list"]) {
-  const dirs = [project.worktree, ...(project.sandboxes ?? [])]
-  const all = await Promise.all(
-    dirs.map((directory) =>
-      list({ directory })
-        .then((x) => x.data ?? [])
-        .catch(() => []),
-    ),
-  )
-  return all.flat().filter((session) => session.time.archived === undefined).length
-}
-
-export async function askProjectClose(input: Ask) {
-  const total = await count(input.project, input.list)
-  input.show(() => (
-    <DialogCloseProject
-      count={total}
-      project={input.project}
-      t={input.t}
-      onCancel={input.dismiss}
-      onClose={() => {
-        input.dismiss()
-        input.onClose(input.project.worktree)
-      }}
-    />
-  ))
-}
-
-export function DialogCloseProject(props: DialogProps) {
-  const name = createMemo(() => displayName(props.project))
-
-  return (
-    <Dialog title={props.t("dialog.project.close.title")} fit>
-      <div class="flex flex-col gap-4 pl-6 pr-2.5 pb-3">
-        <div class="flex flex-col gap-1">
-          <span class="text-14-regular text-text-strong">
-            {props.t("dialog.project.close.confirm", { name: name() })}
-          </span>
-          <span class="text-12-regular text-text-weak">{projectCloseBody(props.count, props.t)}</span>
-        </div>
-        <div class="flex justify-end gap-2">
-          <Button variant="ghost" size="large" onClick={props.onCancel}>
-            {props.t("common.cancel")}
-          </Button>
-          <Button variant="primary" size="large" onClick={props.onClose}>
-            {props.t("common.close")}
-          </Button>
-        </div>
-      </div>
-    </Dialog>
-  )
-}