diff --git a/products/desktop/packages/ui/src/features/command-center/components/CommandCenterPanel.tsx b/products/desktop/packages/ui/src/features/command-center/components/CommandCenterPanel.tsx index acb9c0cc77ba..720feb13de4f 100644 --- a/products/desktop/packages/ui/src/features/command-center/components/CommandCenterPanel.tsx +++ b/products/desktop/packages/ui/src/features/command-center/components/CommandCenterPanel.tsx @@ -293,7 +293,10 @@ function TerminalCell({ }) { const clearCell = useCommandCenterStore((s) => s.clearCell); const { getRecentFolders, getFolderDisplayName } = useFolders(); - const cwd = terminalCwd ?? getRecentFolders(1)[0]?.path; + const defaultCwd = useSettingsStore((s) => s.terminalDefaultCwd); + // Cells restored from a previous session may predate the setting, so fall + // back to it here too rather than only at creation time. + const cwd = terminalCwd ?? (defaultCwd || getRecentFolders(1)[0]?.path); const folderName = cwd ? getFolderDisplayName(cwd) : null; const stateKey = getTerminalCellStateKey(terminalId); diff --git a/products/desktop/packages/ui/src/features/command-center/components/TaskSelector.test.tsx b/products/desktop/packages/ui/src/features/command-center/components/TaskSelector.test.tsx index cc3d22fd6a26..fdf926179630 100644 --- a/products/desktop/packages/ui/src/features/command-center/components/TaskSelector.test.tsx +++ b/products/desktop/packages/ui/src/features/command-center/components/TaskSelector.test.tsx @@ -1,7 +1,9 @@ +import { useSettingsStore } from "@posthog/ui/features/settings/settingsStore"; import { Theme } from "@radix-ui/themes"; import { render, screen } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; -import { describe, expect, it, vi } from "vitest"; +import { useState } from "react"; +import { beforeEach, describe, expect, it, vi } from "vitest"; vi.mock("@posthog/ui/features/command-center/hooks/useAvailableTasks", () => ({ useAvailableTasks: () => [], @@ -18,21 +20,32 @@ vi.mock("@posthog/ui/features/folders/useFolders", () => ({ import { TaskSelector } from "./TaskSelector"; -function renderSelector() { - return render( +// Mirrors how CommandCenterPanel drives the selector: `open` is real state, so +// the popup can actually unmount when a choice closes it. +function ControlledSelector({ + onNewTerminal, +}: { + onNewTerminal: (cwd?: string) => void; +}) { + const [open, setOpen] = useState(true); + return ( {}} - onNewTerminal={() => {}} + open={open} + onOpenChange={setOpen} + onNewTerminal={onNewTerminal} > - , + ); } +function renderSelector(onNewTerminal: (cwd?: string) => void = () => {}) { + return render(); +} + function expectPopupWidth(input: HTMLElement) { expect(input.closest(".combobox-content")).toHaveStyle({ minWidth: "240px", @@ -40,6 +53,12 @@ function expectPopupWidth(input: HTMLElement) { } describe("TaskSelector", () => { + // Reset before rather than after: an afterEach hook runs ahead of Testing + // Library's auto-cleanup, so it would update a still-mounted component. + beforeEach(() => { + useSettingsStore.setState({ terminalDefaultCwd: "" }); + }); + it("keeps the task popup wider than its compact trigger", () => { renderSelector(); @@ -53,4 +72,26 @@ describe("TaskSelector", () => { expectPopupWidth(screen.getByPlaceholderText("Search folders...")); }); + + it("opens the default directory instead of prompting for a folder", async () => { + useSettingsStore.setState({ terminalDefaultCwd: "/default" }); + const onNewTerminal = vi.fn(); + renderSelector(onNewTerminal); + + await userEvent.click(screen.getByRole("button", { name: "Terminal" })); + + expect(onNewTerminal).toHaveBeenCalledWith("/default"); + // The popup closes outright, so neither step is left on screen. + expect(screen.queryByPlaceholderText("Search folders...")).toBeNull(); + expect(screen.queryByPlaceholderText("Search tasks...")).toBeNull(); + }); + + it("still offers an explicit folder choice once a default is set", async () => { + useSettingsStore.setState({ terminalDefaultCwd: "/default" }); + renderSelector(); + + await userEvent.click(screen.getByRole("button", { name: "Terminal in…" })); + + expect(screen.getByPlaceholderText("Search folders...")).toBeVisible(); + }); }); diff --git a/products/desktop/packages/ui/src/features/command-center/components/TaskSelector.tsx b/products/desktop/packages/ui/src/features/command-center/components/TaskSelector.tsx index 456dc5e6b8b5..7a0650c21b44 100644 --- a/products/desktop/packages/ui/src/features/command-center/components/TaskSelector.tsx +++ b/products/desktop/packages/ui/src/features/command-center/components/TaskSelector.tsx @@ -10,6 +10,7 @@ import { Popover } from "@radix-ui/themes"; import { type ReactNode, useCallback, useState } from "react"; import { Combobox } from "../../../primitives/combobox/Combobox"; import { useFolders } from "../../folders/useFolders"; +import { useSettingsStore } from "../../settings/settingsStore"; import { useCommandCenterStore } from "../commandCenterStore"; import { useAvailableTasks } from "../hooks/useAvailableTasks"; @@ -39,6 +40,7 @@ export function TaskSelector({ const assignTask = useCommandCenterStore((s) => s.assignTask); const { getRecentFolders } = useFolders(); const folders = getRecentFolders(); + const defaultCwd = useSettingsStore((s) => s.terminalDefaultCwd); const [step, setStep] = useState<"tasks" | "folder">("tasks"); const handleOpenChange = useCallback( @@ -70,14 +72,21 @@ export function TaskSelector({ } }, [handleOpenChange, onNewTask]); + // A configured default wins outright: no folder prompt, even with several + // folders registered. "Terminal in…" below stays as the one-off escape hatch. const handleNewTerminal = useCallback(() => { + if (defaultCwd) { + handleOpenChange(false); + onNewTerminal?.(defaultCwd); + return; + } if (folders.length > 1) { setStep("folder"); return; } handleOpenChange(false); onNewTerminal?.(folders[0]?.path); - }, [folders, handleOpenChange, onNewTerminal]); + }, [defaultCwd, folders, handleOpenChange, onNewTerminal]); const handleBrainrot = useCallback(() => { handleOpenChange(false); @@ -177,6 +186,16 @@ export function TaskSelector({ Terminal )} + {onNewTerminal && defaultCwd && folders.length > 0 && ( + + )} {onBrainrot && ( + + )} + + + + )} + { "local", ); }); + + it("leaves the default terminal directory unset", () => { + expect(useSettingsStore.getState().terminalDefaultCwd).toBe(""); + }); }); describe("feature settingsStore cloud selections", () => { @@ -599,3 +603,42 @@ describe("feature settingsStore hydration", () => { expect(useSettingsStore.getState()._hasHydrated).toBe(true); }); }); + +describe("feature settingsStore terminal default directory", () => { + beforeEach(async () => { + await resetPersistenceMocks(); + + useSettingsStore.setState({ terminalDefaultCwd: "" }); + }); + + it.each([ + ["a chosen directory", "/Users/luke/Documents/Jarvis"], + ["a cleared directory", ""], + ])("persists %s", async (_label, value) => { + useSettingsStore.getState().setTerminalDefaultCwd(value); + + await waitForPersistedWrite(); + + const lastCall = setItem.mock.calls[setItem.mock.calls.length - 1]; + const persisted = JSON.parse(lastCall[1]); + + expect(persisted.state.terminalDefaultCwd).toBe(value); + }); + + it("rehydrates the default terminal directory", async () => { + getItem.mockResolvedValue( + JSON.stringify({ + state: { terminalDefaultCwd: "/Users/luke/Documents/Jarvis" }, + version: 0, + }), + ); + + useSettingsStore.setState({ terminalDefaultCwd: "" }); + + await useSettingsStore.persist.rehydrate(); + + expect(useSettingsStore.getState().terminalDefaultCwd).toBe( + "/Users/luke/Documents/Jarvis", + ); + }); +}); diff --git a/products/desktop/packages/ui/src/features/settings/settingsStore.ts b/products/desktop/packages/ui/src/features/settings/settingsStore.ts index 806000165e13..58967f4d25d0 100644 --- a/products/desktop/packages/ui/src/features/settings/settingsStore.ts +++ b/products/desktop/packages/ui/src/features/settings/settingsStore.ts @@ -233,9 +233,13 @@ interface SettingsStore { terminalFont: TerminalFont; terminalCustomFontFamily: string; terminalGpuRendering: boolean; + // Directory new standalone terminals open in. Any path, not just a + // registered project folder. Empty means "infer from recent folders". + terminalDefaultCwd: string; setTerminalFont: (font: TerminalFont) => void; setTerminalCustomFontFamily: (value: string) => void; setTerminalGpuRendering: (enabled: boolean) => void; + setTerminalDefaultCwd: (path: string) => void; // Conversation thread (new-thread) conversationCollapseMode: CollapseMode; @@ -466,11 +470,13 @@ export const useSettingsStore = create()( terminalFont: "berkeley-mono", terminalCustomFontFamily: "", terminalGpuRendering: true, + terminalDefaultCwd: "", setTerminalFont: (font) => set({ terminalFont: font }), setTerminalCustomFontFamily: (value) => set({ terminalCustomFontFamily: value }), setTerminalGpuRendering: (enabled) => set({ terminalGpuRendering: enabled }), + setTerminalDefaultCwd: (path) => set({ terminalDefaultCwd: path }), // Conversation thread (new-thread) conversationCollapseMode: COLLAPSE_MODE_DEFAULT, @@ -613,6 +619,7 @@ export const useSettingsStore = create()( terminalFont: state.terminalFont, terminalCustomFontFamily: state.terminalCustomFontFamily, terminalGpuRendering: state.terminalGpuRendering, + terminalDefaultCwd: state.terminalDefaultCwd, // Conversation thread (new-thread) conversationCollapseMode: state.conversationCollapseMode, diff --git a/products/desktop/packages/workspace-server/src/services/shell/shell.test.ts b/products/desktop/packages/workspace-server/src/services/shell/shell.test.ts index c74da28697c8..f24058a2d8c7 100644 --- a/products/desktop/packages/workspace-server/src/services/shell/shell.test.ts +++ b/products/desktop/packages/workspace-server/src/services/shell/shell.test.ts @@ -1,5 +1,5 @@ import { mkdtempSync, rmSync } from "node:fs"; -import { tmpdir } from "node:os"; +import { homedir, tmpdir } from "node:os"; import path from "node:path"; import { beforeEach, describe, expect, it, vi } from "vitest"; import { createMockRepositoryRepository } from "../../db/repositories/repository-repository.mock"; @@ -194,6 +194,69 @@ describe("ShellService.createSession workspace env", () => { }); }); +describe("ShellService.createSession working directory", () => { + function spawnedCwd(): string { + return mockPty.spawn.mock.calls[0][2].cwd; + } + + beforeEach(() => { + mockPty.spawn.mockReset(); + mockPty.spawn.mockReturnValue(createMockPtyProcess()); + }); + + it("spawns in a cwd that exists on disk", async () => { + const tempDir = mkdtempSync(path.join(tmpdir(), "shell-cwd-")); + try { + const { service } = createService(); + + await service.createSession({ sessionId: "session-1", cwd: tempDir }); + + expect(spawnedCwd()).toBe(tempDir); + } finally { + rmSync(tempDir, { recursive: true, force: true }); + } + }); + + it.each([ + ["no cwd", undefined], + ["an empty cwd", ""], + ["a cwd that does not exist", "/does/not/exist"], + ])("falls back to home for %s", async (_label, cwd) => { + const { service } = createService(); + + await service.createSession({ sessionId: "session-1", cwd }); + + expect(spawnedCwd()).toBe(homedir()); + }); + + it.each([ + ["a bare tilde", "~"], + ["a trailing-slash tilde", "~/"], + ])("expands %s to the home directory", async (_label, cwd) => { + const { service } = createService(); + + await service.createSession({ sessionId: "session-1", cwd }); + + expect(spawnedCwd()).toBe(homedir()); + }); + + it("expands a tilde path before checking that it exists", async () => { + const tempDir = mkdtempSync(path.join(homedir(), ".shell-cwd-test-")); + try { + const { service } = createService(); + + await service.createSession({ + sessionId: "session-1", + cwd: `~/${path.basename(tempDir)}`, + }); + + expect(spawnedCwd()).toBe(tempDir); + } finally { + rmSync(tempDir, { recursive: true, force: true }); + } + }); +}); + describe("ShellService.execute", () => { it("runs commands with the sanitized shell env", async () => { const saved = { diff --git a/products/desktop/packages/workspace-server/src/services/shell/shell.ts b/products/desktop/packages/workspace-server/src/services/shell/shell.ts index bf9b4afa4f4f..8dbcdceca4a8 100644 --- a/products/desktop/packages/workspace-server/src/services/shell/shell.ts +++ b/products/desktop/packages/workspace-server/src/services/shell/shell.ts @@ -1,6 +1,7 @@ import { exec } from "node:child_process"; import { existsSync } from "node:fs"; import { homedir, platform } from "node:os"; +import { join } from "node:path"; import { ROOT_LOGGER, type RootLogger, @@ -52,6 +53,15 @@ function getDefaultShell(): string { return process.env.SHELL || "/bin/bash"; } +/** Resolve a leading "~" against the home directory. Other paths pass through. */ +export function expandHomePath(path: string, home: string): string { + if (path === "~") return home; + if (path.startsWith("~/") || path.startsWith("~\\")) { + return join(home, path.slice(2)); + } + return path; +} + function getShellArgs(shell: string): string[] { if (platform() === "win32") { const lower = shell.toLowerCase(); @@ -403,7 +413,9 @@ export class ShellService extends TypedEventEmitter { private resolveWorkingDir(sessionId: string, cwd?: string): string { const home = homedir(); - const workingDir = cwd || home; + // Expand "~" before the existence check: a tilde path is real to the user + // but not to existsSync, so it would otherwise be discarded for home. + const workingDir = cwd ? expandHomePath(cwd, home) : home; if (!existsSync(workingDir)) { this.log.warn(