cleanup

Author: charlesvien

apps/array/src/main/index.ts

@@ -39,7 +39,6 @@ import {
   shutdownPostHog,
   trackAppEvent,
 } from "./services/posthog-analytics.js";
-import { registerSettingsIpc } from "./services/settings.js";
 import { registerShellIpc } from "./services/shell.js";
 import { registerAutoUpdater } from "./services/updates.js";
 import { registerWorkspaceIpc } from "./services/workspace/index.js";
@@ -270,4 +269,3 @@ registerWorktreeIpc();
 registerShellIpc();
 registerExternalAppsIpc();
 registerWorkspaceIpc(() => mainWindow);
-registerSettingsIpc();

apps/array/src/main/preload.ts

@@ -385,17 +385,6 @@ contextBridge.exposeInMainWorld("electronAPI", {
       }>,
     ): (() => void) => createIpcListener("workspace:warning", listener),
   },
-  // Settings API
-  settings: {
-    getWorktreeLocation: (): Promise<string> =>
-      ipcRenderer.invoke("settings:get-worktree-location"),
-    setWorktreeLocation: (location: string): Promise<void> =>
-      ipcRenderer.invoke("settings:set-worktree-location", location),
-    getTerminalLayout: (): Promise<"split" | "tabbed"> =>
-      ipcRenderer.invoke("settings:get-terminal-layout"),
-    setTerminalLayout: (mode: "split" | "tabbed"): Promise<void> =>
-      ipcRenderer.invoke("settings:set-terminal-layout", mode),
-  },
   // Dock Badge API
   dockBadge: {
     show: (): Promise<void> => ipcRenderer.invoke("dock-badge:show"),

apps/array/src/main/services/index.ts

@@ -13,7 +13,6 @@ import "./git.js";
 import "./oauth.js";
 import "./posthog-analytics.js";
 import "./session-manager.js";
-import "./settings.js";
 import "./settingsStore.js";
 import "./shell.js";
 import "./transcription-prompts.js";

apps/array/src/main/services/settings.ts

@@ -26,6 +26,7 @@ import type { CloudRegion } from "@shared/types/oauth";
 import { useSettingsStore as useTerminalLayoutStore } from "@stores/settingsStore";
 import { useMutation, useQuery } from "@tanstack/react-query";
 import { useEffect, useState } from "react";
+import { trpcVanilla } from "@/renderer/trpc";
 import { useThemeStore } from "../../../stores/themeStore";
 
 const log = logger.scope("settings");
@@ -69,7 +70,8 @@ export function SettingsView() {
 
   const { data: worktreeLocation } = useQuery({
     queryKey: ["settings", "worktreeLocation"],
-    queryFn: () => window.electronAPI.settings.getWorktreeLocation(),
+    queryFn: () =>
+      trpcVanilla.secureStore.getItem.query({ key: "worktreeLocation" }),
   });
 
   const { data: appVersion } = useQuery({
@@ -94,7 +96,10 @@ export function SettingsView() {
   const handleWorktreeLocationChange = async (newLocation: string) => {
     setLocalWorktreeLocation(newLocation);
     try {
-      await window.electronAPI.settings.setWorktreeLocation(newLocation);
+      await trpcVanilla.secureStore.setItem.query({
+        key: "worktreeLocation",
+        value: newLocation,
+      });
     } catch (error) {
       log.error("Failed to set worktree location:", error);
     }

apps/array/src/renderer/features/settings/components/SettingsView.tsx

@@ -1,4 +1,5 @@
 import { create } from "zustand";
+import { trpcVanilla } from "../trpc";
 
 export type TerminalLayoutMode = "split" | "tabbed";
 
@@ -15,16 +16,21 @@ export const useSettingsStore = create<SettingsState>()((set) => ({
 
   loadTerminalLayout: async () => {
     try {
-      const mode = await window.electronAPI.settings.getTerminalLayout();
-      set({ terminalLayoutMode: mode, isLoading: false });
+      const mode = await trpcVanilla.secureStore.getItem.query({
+        key: "terminalLayoutMode",
+      });
+      set({ terminalLayoutMode: mode as TerminalLayoutMode, isLoading: false });
     } catch (_error) {
       set({ terminalLayoutMode: "split", isLoading: false });
     }
   },
 
   setTerminalLayout: async (mode: TerminalLayoutMode) => {
     try {
-      await window.electronAPI.settings.setTerminalLayout(mode);
+      await trpcVanilla.secureStore.setItem.query({
+        key: "terminalLayoutMode",
+        value: mode,
+      });
       set({ terminalLayoutMode: mode });
     } catch (_error) {}
   },

apps/array/src/renderer/stores/settingsStore.ts

@@ -271,12 +271,6 @@ declare global {
         }) => void,
       ) => () => void;
     };
-    settings: {
-      getWorktreeLocation: () => Promise<string>;
-      setWorktreeLocation: (location: string) => Promise<void>;
-      getTerminalLayout: () => Promise<"split" | "tabbed">;
-      setTerminalLayout: (mode: "split" | "tabbed") => Promise<void>;
-    };
     dockBadge: {
       show: () => Promise<void>;
     };