Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

Add desktop-backed confirm dialog API for worktree deletion

Julius Marminge0068a93cfac7
diff --git a/apps/desktop/src/confirmDialog.test.ts b/apps/desktop/src/confirmDialog.test.ts
new file mode 100644
index 000000000..60b93e453
--- /dev/null
+++ b/apps/desktop/src/confirmDialog.test.ts
@@ -0,0 +1,57 @@
+import type { BrowserWindow } from "electron";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const { showMessageBoxMock } = vi.hoisted(() => ({
+ showMessageBoxMock: vi.fn(),
+}));
+
+vi.mock("electron", () => ({
+ dialog: {
+ showMessageBox: showMessageBoxMock,
+ },
+}));
+
+import { showDesktopConfirmDialog } from "./confirmDialog";
+
+describe("showDesktopConfirmDialog", () => {
+ beforeEach(() => {
+ showMessageBoxMock.mockReset();
+ });
+
+ it("returns false and does not open a dialog for empty messages", async () => {
+ const result = await showDesktopConfirmDialog(" ", null);
+
+ expect(result).toBe(false);
+ expect(showMessageBoxMock).not.toHaveBeenCalled();
+ });
+
+ it("opens a dialog for the focused window and returns true on confirm", async () => {
+ const ownerWindow = { id: 1 } as BrowserWindow;
+ showMessageBoxMock.mockResolvedValue({ response: 1 });
+
+ const result = await showDesktopConfirmDialog("Delete worktree?", ownerWindow);
+
+ expect(result).toBe(true);
+ expect(showMessageBoxMock).toHaveBeenCalledWith(
+ ownerWindow,
+ expect.objectContaining({
+ buttons: ["Cancel", "Confirm"],
+ message: "Delete worktree?",
+ }),
+ );
+ });
+
+ it("opens an app-level dialog when there is no focused window", async () => {
+ showMessageBoxMock.mockResolvedValue({ response: 0 });
+
+ const result = await showDesktopConfirmDialog("Delete worktree?", null);
+
+ expect(result).toBe(false);
+ expect(showMessageBoxMock).toHaveBeenCalledWith(
+ expect.objectContaining({
+ buttons: ["Cancel", "Confirm"],
+ message: "Delete worktree?",
+ }),
+ );
+ });
+});
diff --git a/apps/desktop/src/confirmDialog.ts b/apps/desktop/src/confirmDialog.ts
new file mode 100644
index 000000000..9238de50f
--- /dev/null
+++ b/apps/desktop/src/confirmDialog.ts
@@ -0,0 +1,26 @@
+import { type BrowserWindow, dialog } from "electron";
+
+const CONFIRM_BUTTON_INDEX = 1;
+
+export async function showDesktopConfirmDialog(
+ message: string,
+ ownerWindow: BrowserWindow | null,
+): Promise<boolean> {
+ const normalizedMessage = message.trim();
+ if (normalizedMessage.length === 0) {
+ return false;
+ }
+
+ const options = {
+ type: "question" as const,
+ buttons: ["Cancel", "Confirm"],
+ defaultId: CONFIRM_BUTTON_INDEX,
+ cancelId: 0,
+ noLink: true,
+ message: normalizedMessage,
+ };
+ const result = ownerWindow
+ ? await dialog.showMessageBox(ownerWindow, options)
+ : await dialog.showMessageBox(options);
+ return result.response === CONFIRM_BUTTON_INDEX;
+}
diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts
index a5f8aa39c..a0c9c4692 100644
--- a/apps/desktop/src/main.ts
+++ b/apps/desktop/src/main.ts
@@ -7,11 +7,13 @@ import path from "node:path";
import { app, BrowserWindow, dialog, ipcMain, Menu, shell } from "electron";
+import { showDesktopConfirmDialog } from "./confirmDialog";
import { fixPath } from "./fixPath";
fixPath();
const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
+const CONFIRM_CHANNEL = "desktop:confirm";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const OPEN_EXTERNAL_CHANNEL = "desktop:open-external";
const ROOT_DIR = path.resolve(__dirname, "../../..");
@@ -142,6 +144,16 @@ function registerIpcHandlers(): void {
return result.filePaths[0] ?? null;
});
+ ipcMain.removeHandler(CONFIRM_CHANNEL);
+ ipcMain.handle(CONFIRM_CHANNEL, async (_event, message: unknown) => {
+ if (typeof message !== "string") {
+ return false;
+ }
+
+ const owner = BrowserWindow.getFocusedWindow() ?? mainWindow;
+ return showDesktopConfirmDialog(message, owner);
+ });
+
ipcMain.removeHandler(CONTEXT_MENU_CHANNEL);
ipcMain.handle(CONTEXT_MENU_CHANNEL, async (_event, items: { id: string; label: string }[]) => {
const window = BrowserWindow.getFocusedWindow() ?? mainWindow;
diff --git a/apps/desktop/src/preload.ts b/apps/desktop/src/preload.ts
index b1961d544..fb90831fc 100644
--- a/apps/desktop/src/preload.ts
+++ b/apps/desktop/src/preload.ts
@@ -1,6 +1,7 @@
import { contextBridge, ipcRenderer } from "electron";
const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
+const CONFIRM_CHANNEL = "desktop:confirm";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const OPEN_EXTERNAL_CHANNEL = "desktop:open-external";
const wsUrl = process.env.T3CODE_DESKTOP_WS_URL ?? null;
@@ -8,6 +9,7 @@ const wsUrl = process.env.T3CODE_DESKTOP_WS_URL ?? null;
contextBridge.exposeInMainWorld("desktopBridge", {
getWsUrl: () => wsUrl,
pickFolder: () => ipcRenderer.invoke(PICK_FOLDER_CHANNEL) as Promise<string | null>,
+ confirm: (message: string) => ipcRenderer.invoke(CONFIRM_CHANNEL, message) as Promise<boolean>,
showContextMenu: (items: { id: string; label: string }[]) =>
ipcRenderer.invoke(CONTEXT_MENU_CHANNEL, items) as Promise<string | null>,
openExternal: (url: string) => ipcRenderer.invoke(OPEN_EXTERNAL_CHANNEL, url) as Promise<boolean>,
diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsx
index d4b569744..82b348936 100644
--- a/apps/web/src/components/Sidebar.tsx
+++ b/apps/web/src/components/Sidebar.tsx
@@ -267,14 +267,14 @@ export default function Sidebar() {
const orphanedWorktreePath = getOrphanedWorktreePathForThread(state.threads, threadId);
const shouldDeleteWorktree =
orphanedWorktreePath !== null &&
- window.confirm(
+ (await api.dialogs.confirm(
[
"This thread is the only one linked to this worktree:",
orphanedWorktreePath,
"",
"Delete the worktree too?",
].join("\n"),
- );
+ ));
// Stop active session if running
if (thread.session?.sessionId) {
diff --git a/apps/web/src/vite-env.d.ts b/apps/web/src/vite-env.d.ts
index 0300a9665..3438d5d7b 100644
--- a/apps/web/src/vite-env.d.ts
+++ b/apps/web/src/vite-env.d.ts
@@ -5,6 +5,7 @@ import type { NativeApi } from "@t3tools/contracts";
interface DesktopBridge {
getWsUrl: () => string | null;
pickFolder: () => Promise<string | null>;
+ confirm: (message: string) => Promise<boolean>;
showContextMenu: (items: readonly { id: string; label: string }[]) => Promise<string | null>;
openExternal: (url: string) => Promise<boolean>;
}
diff --git a/apps/web/src/wsNativeApi.ts b/apps/web/src/wsNativeApi.ts
index 36af2efdd..9d0b95356 100644
--- a/apps/web/src/wsNativeApi.ts
+++ b/apps/web/src/wsNativeApi.ts
@@ -60,6 +60,12 @@ export function createWsNativeApi(): NativeApi {
if (!window.desktopBridge) return null;
return window.desktopBridge.pickFolder();
},
+ confirm: async (message) => {
+ if (window.desktopBridge) {
+ return window.desktopBridge.confirm(message);
+ }
+ return window.confirm(message);
+ },
},
terminal: {
open: (input) => transport.request(WS_METHODS.terminalOpen, input),
diff --git a/packages/contracts/src/ipc.ts b/packages/contracts/src/ipc.ts
index a3f67ced9..2edd94641 100644
--- a/packages/contracts/src/ipc.ts
+++ b/packages/contracts/src/ipc.ts
@@ -56,6 +56,7 @@ export interface NativeApi {
};
dialogs: {
pickFolder: () => Promise<string | null>;
+ confirm: (message: string) => Promise<boolean>;
};
terminal: {
open: (input: TerminalOpenInput) => Promise<TerminalSessionSnapshot>;