fix(app): confirm workspace deletion on Enter

Author: rubencu

packages/app/src/pages/layout.tsx

@@ -71,6 +71,7 @@ import {
   errorMessage,
   latestRootSession,
   sortedRootSessions,
+  workspaceDeleteKeyAction,
 } from "./layout/helpers"
 import {
   collectNewSessionDeepLinks,
@@ -1622,7 +1623,30 @@ export default function Layout(props: ParentProps) {
       dirty: false,
     })
 
+    const handleDelete = () => {
+      const leaveDeletedWorkspace = !!params.dir && pathKey(currentDir()) === pathKey(props.directory)
+      if (leaveDeletedWorkspace) {
+        navigateWithSidebarReset(`/${base64Encode(props.root)}/session`)
+      }
+      dialog.close()
+      void deleteWorkspace(props.root, props.directory, leaveDeletedWorkspace)
+    }
+
     onMount(() => {
+      makeEventListener(
+        window,
+        "keydown",
+        (event) => {
+          const action = workspaceDeleteKeyAction(event, data.status)
+          if (action === "ignore") return
+          event.preventDefault()
+          event.stopPropagation()
+          if (action === "block") return
+          handleDelete()
+        },
+        { capture: true },
+      )
+
       globalSDK.client.file
         .status({ directory: props.directory })
         .then((x) => {
@@ -1635,15 +1659,6 @@ export default function Layout(props: ParentProps) {
         })
     })
 
-    const handleDelete = () => {
-      const leaveDeletedWorkspace = !!params.dir && pathKey(currentDir()) === pathKey(props.directory)
-      if (leaveDeletedWorkspace) {
-        navigateWithSidebarReset(`/${base64Encode(props.root)}/session`)
-      }
-      dialog.close()
-      void deleteWorkspace(props.root, props.directory, leaveDeletedWorkspace)
-    }
-
     const description = () => {
       if (data.status === "loading") return language.t("workspace.status.checking")
       if (data.status === "error") return language.t("workspace.status.error")

packages/app/src/pages/layout/helpers.test.ts

@@ -14,6 +14,7 @@ import {
   errorMessage,
   hasProjectPermissions,
   latestRootSession,
+  workspaceDeleteKeyAction,
 } from "./helpers"
 import { pathKey } from "@/utils/path-key"
 
@@ -217,6 +218,14 @@ describe("layout workspace helpers", () => {
     expect(displayName({ worktree: "/tmp/app", name: "My App" })).toBe("My App")
   })
 
+  test("maps workspace delete dialog Enter keys", () => {
+    expect(workspaceDeleteKeyAction(new KeyboardEvent("keydown", { key: "Escape" }), "ready")).toBe("ignore")
+    expect(workspaceDeleteKeyAction(new KeyboardEvent("keydown", { key: "Enter" }), "loading")).toBe("block")
+    expect(workspaceDeleteKeyAction(new KeyboardEvent("keydown", { key: "Enter", repeat: true }), "ready")).toBe("block")
+    expect(workspaceDeleteKeyAction(new KeyboardEvent("keydown", { key: "Enter" }), "ready")).toBe("confirm")
+    expect(workspaceDeleteKeyAction(new KeyboardEvent("keydown", { key: "Enter" }), "error")).toBe("confirm")
+  })
+
   test("extracts api error message and fallback", () => {
     expect(errorMessage({ data: { message: "boom" } }, "fallback")).toBe("boom")
     expect(errorMessage(new Error("broken"), "fallback")).toBe("broken")

packages/app/src/pages/layout/helpers.ts

@@ -55,6 +55,15 @@ export const childSessionOnPath = (sessions: Session[] | undefined, rootID: stri
 export const displayName = (project: { name?: string; worktree: string }) =>
   project.name || getFilename(project.worktree)
 
+export function workspaceDeleteKeyAction(
+  event: Pick<KeyboardEvent, "key" | "repeat">,
+  status: "loading" | "ready" | "error",
+) {
+  if (event.key !== "Enter") return "ignore"
+  if (event.repeat || status === "loading") return "block"
+  return "confirm"
+}
+
 export const errorMessage = (err: unknown, fallback: string) => {
   if (err && typeof err === "object" && "data" in err) {
     const data = (err as { data?: { message?: string } }).data