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.
Open folder picker immediately on desktop Electron
Julius Marminge75ca0d4fa41a
diff --git a/apps/web/src/components/Sidebar.logic.test.ts b/apps/web/src/components/Sidebar.logic.test.tsnew file mode 100644index 000000000..5bf53f25f--- /dev/null+++ b/apps/web/src/components/Sidebar.logic.test.ts@@ -0,0 +1,31 @@+import { describe, expect, it } from "vitest";+import { shouldOpenProjectFolderPickerImmediately } from "./Sidebar.logic";++describe("shouldOpenProjectFolderPickerImmediately", () => {+ it("opens the folder picker immediately in Electron on desktop", () => {+ expect(+ shouldOpenProjectFolderPickerImmediately({+ isElectron: true,+ isMobile: false,+ }),+ ).toBe(true);+ });++ it("keeps manual project entry on mobile Electron layouts", () => {+ expect(+ shouldOpenProjectFolderPickerImmediately({+ isElectron: true,+ isMobile: true,+ }),+ ).toBe(false);+ });++ it("keeps manual project entry outside Electron", () => {+ expect(+ shouldOpenProjectFolderPickerImmediately({+ isElectron: false,+ isMobile: false,+ }),+ ).toBe(false);+ });+});diff --git a/apps/web/src/components/Sidebar.logic.ts b/apps/web/src/components/Sidebar.logic.tsnew file mode 100644index 000000000..9fa649bc0--- /dev/null+++ b/apps/web/src/components/Sidebar.logic.ts@@ -0,0 +1,6 @@+export function shouldOpenProjectFolderPickerImmediately(input: {+ isElectron: boolean;+ isMobile: boolean;+}): boolean {+ return input.isElectron && !input.isMobile;+}diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsxindex 894fde25e..67d5feccb 100644--- a/apps/web/src/components/Sidebar.tsx+++ b/apps/web/src/components/Sidebar.tsx@@ -32,6 +32,7 @@ import { type Thread } from "../types";import { derivePendingApprovals } from "../session-logic";import { gitRemoveWorktreeMutationOptions, gitStatusQueryOptions } from "../lib/gitReactQuery";import { serverConfigQueryOptions } from "../lib/serverReactQuery";+import { useMediaQuery } from "../hooks/useMediaQuery";import { readNativeApi } from "../nativeApi";import { type DraftThreadEnvMode, useComposerDraftStore } from "../composerDraftStore";import { selectThreadTerminalState, useTerminalStateStore } from "../terminalStateStore";@@ -49,6 +50,7 @@ import {} from "./desktopUpdate.logic";import { Alert, AlertAction, AlertDescription, AlertTitle } from "./ui/alert";import { Button } from "./ui/button";+import { shouldOpenProjectFolderPickerImmediately } from "./Sidebar.logic";import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "./ui/collapsible";import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip";import {@@ -266,6 +268,7 @@ function ProjectFavicon({ cwd }: { cwd: string }) {}export default function Sidebar() {+ const isMobile = useMediaQuery("(max-width: 767px)");const projects = useStore((store) => store.projects);const threads = useStore((store) => store.threads);const markThreadUnread = useStore((store) => store.markThreadUnread);@@ -312,6 +315,11 @@ export default function Sidebar() {const renamingCommittedRef = useRef(false);const renamingInputRef = useRef<HTMLInputElement | null>(null);const [desktopUpdateState, setDesktopUpdateState] = useState<DesktopUpdateState | null>(null);+ const shouldBrowseForProjectImmediately = shouldOpenProjectFolderPickerImmediately({+ isElectron,+ isMobile,+ });+ const shouldShowProjectPathEntry = addingProject && !shouldBrowseForProjectImmediately;const pendingApprovalByThreadId = useMemo(() => {const map = new Map<ThreadId, boolean>();for (const thread of threads) {@@ -550,12 +558,21 @@ export default function Sidebar() {}if (pickedPath) {await addProjectFromPath(pickedPath);- } else {+ } else if (!shouldBrowseForProjectImmediately) {addProjectInputRef.current?.focus();}setIsPickingFolder(false);};+ const handleStartAddProject = () => {+ setAddProjectError(null);+ if (shouldBrowseForProjectImmediately) {+ void handlePickFolder();+ return;+ }+ setAddingProject((prev) => !prev);+ };+const cancelRename = useCallback(() => {setRenamingThreadId(null);renamingInputRef.current = null;@@ -1075,21 +1092,23 @@ export default function Sidebar() {<buttontype="button"aria-label="Add project"+ aria-pressed={shouldShowProjectPathEntry}className="inline-flex size-5 items-center justify-center rounded-md text-muted-foreground/60 transition-colors hover:bg-accent hover:text-foreground"- onClick={() => {- setAddingProject((prev) => !prev);- setAddProjectError(null);- }}+ onClick={handleStartAddProject}/>}>- <PlusIcon className="size-3.5" />+ <PlusIcon+ className={`size-3.5 transition-transform duration-150 ${+ shouldShowProjectPathEntry ? "rotate-45" : "rotate-0"+ }`}+ /></TooltipTrigger><TooltipPopup side="right">Add project</TooltipPopup></Tooltip></div>- {addingProject && (+ {shouldShowProjectPathEntry && (<div className="mb-2 px-1">{isElectron && (<button@@ -1415,7 +1434,7 @@ export default function Sidebar() {})}</SidebarMenu>- {projects.length === 0 && !addingProject && (+ {projects.length === 0 && !shouldShowProjectPathEntry && (<div className="px-2 pt-4 text-center text-xs text-muted-foreground/60">No projects yet</div>