🙌 OpenHands: AI-Driven Development
Revert "Mount dev:docker project path at /projects and auto-list it as a work…" (#242)
Robert Brennanfef07e52eef9
diff --git a/__tests__/components/features/home/workspace-selection-form.test.tsx b/__tests__/components/features/home/workspace-selection-form.test.tsxindex cc525e758e..d1334b4910 100644--- a/__tests__/components/features/home/workspace-selection-form.test.tsx+++ b/__tests__/components/features/home/workspace-selection-form.test.tsx@@ -85,14 +85,6 @@ describe("WorkspaceSelectionForm", () => {vi.restoreAllMocks();mockUseIsCreatingConversation.mockReturnValue(false);useWorkspacesStore.setState({ workspaces: [], workspaceParents: [] });- // `useResolvedWorkspaces` always queries an implicit `/projects` parent- // (the dev:docker mount point). Default it to empty so tests that don't- // care about it don't hit a real network call. Tests that need specific- // behavior can replace this with their own spy.- vi.spyOn(FilesService, "searchSubdirs").mockResolvedValue({- items: [],- next_page_id: null,- });});it("Add Workspace adds only the chosen folder (not its subfolders) and dedupes on repeat", async () => {@@ -349,22 +341,14 @@ describe("WorkspaceSelectionForm", () => {});it("Removing a workspace parent stops listing its children", async () => {- // Scope the mock to the user-added parent so the implicit `/projects`- // parent (always queried by `useResolvedWorkspaces`) doesn't also get- // these entries.const searchSpy = vi.spyOn(FilesService, "searchSubdirs")- .mockImplementation(async (path: string) => {- if (path === "/Users/me/dev") {- return {- items: [- { name: "repoA", path: "/Users/me/dev/repoA" },- { name: "repoB", path: "/Users/me/dev/repoB" },- ],- next_page_id: null,- };- }- return { items: [], next_page_id: null };+ .mockResolvedValue({+ items: [+ { name: "repoA", path: "/Users/me/dev/repoA" },+ { name: "repoB", path: "/Users/me/dev/repoB" },+ ],+ next_page_id: null,});renderForm(diff --git a/scripts/dev-docker.mjs b/scripts/dev-docker.mjsindex 50a28dd493..cc1d1d29b9 100644--- a/scripts/dev-docker.mjs+++ b/scripts/dev-docker.mjs@@ -10,9 +10,7 @@** Required environment variables:* - PROJECT_PATH: Absolute host path to your projects. Mounted into the- * container at /projects so the agent can read/edit your code. The- * frontend always treats /projects as a "workspace parent", so the- * dropdown lists its immediate subdirectories as workspaces.+ * container at /workspace/projects so the agent can read/edit your code.** Optional environment variables:* - OH_AGENT_SERVER_GIT_REF: Git ref (branch/tag/SHA) of the agent-server@@ -142,7 +140,7 @@ function startAgentServerDocker(config) {CONTAINER_NAME,"--init","-v",- `${process.env.PROJECT_PATH}:/projects`,+ `${process.env.PROJECT_PATH}:/workspace/projects`,];// Optional credential / state mounts. Only mount when the host pathdiff --git a/src/hooks/query/use-resolved-workspaces.ts b/src/hooks/query/use-resolved-workspaces.tsindex 48138402a1..c0852f22b5 100644--- a/src/hooks/query/use-resolved-workspaces.ts+++ b/src/hooks/query/use-resolved-workspaces.ts@@ -3,7 +3,7 @@ import { useQueries } from "@tanstack/react-query";import FilesService from "#/api/files-service/files-service.api";import { useWorkspacesStore } from "#/stores/workspaces-store";-import { LocalWorkspace, LocalWorkspaceParent } from "#/types/workspace";+import { LocalWorkspace } from "#/types/workspace";interface UseResolvedWorkspacesResult {workspaces: LocalWorkspace[];@@ -11,52 +11,18 @@ interface UseResolvedWorkspacesResult {isError: boolean;}-/**- * Implicit workspace parents that are always considered when resolving- * workspaces. The `dev:docker` script mounts the host's PROJECT_PATH at- * `/projects` inside the agent-server container, so this directory is- * effectively the user's projects root in the dockerized dev stack. We- * surface its immediate subdirectories as workspaces automatically.- *- * In environments where `/projects` doesn't exist (e.g. dockerless dev),- * `searchSubdirs` simply errors and contributes no entries -- the implicit- * parent stays silent rather than user-visible, which is safe.- * In environments where `/projects` doesn't exist (e.g. dockerless dev),- * the `searchSubdirs` call will fail and the implicit parent contributes- * no entries. This is safe and intentional — the implicit parent stays- * silent rather than user-visible.-const IMPLICIT_WORKSPACE_PARENTS: LocalWorkspaceParent[] = [- { id: "implicit:/projects", name: "/projects", path: "/projects" },-];-/*** Returns the merged list of workspaces to display:- * - workspaces explicitly added by the user (from the persisted store),+ * - workspaces explicitly added by the user (from the persisted store), and* - the immediate subdirectories of every saved "workspace parent",- * fetched dynamically, and- * - the immediate subdirectories of any implicit, built-in parents- * (currently just `/projects`, the dockerized dev mount point).+ * fetched dynamically.** Static workspaces always take precedence over a dynamic child with the* same path so that user-selected names/ids are preserved.*/export function useResolvedWorkspaces(): UseResolvedWorkspacesResult {const workspaces = useWorkspacesStore((s) => s.workspaces);- const storedParents = useWorkspacesStore((s) => s.workspaceParents);-- // Merge stored parents with the implicit ones, deduping on path so a- // user-added `/projects` doesn't trigger a second query.- const workspaceParents = useMemo(() => {- const seen = new Set(storedParents.map((p) => p.path));- const workspaceParents = useMemo(() => {- const seen = new Set(storedParents.map((p) => p.path));- // Filter out implicit parents that conflict with user-added ones (by path)- // so custom names/ids are preserved- const extras = IMPLICIT_WORKSPACE_PARENTS.filter((p) => !seen.has(p.path));- return extras.length === 0 ? storedParents : [...storedParents, ...extras];- }, [storedParents]);- return extras.length === 0 ? storedParents : [...storedParents, ...extras];- }, [storedParents]);+ const workspaceParents = useWorkspacesStore((s) => s.workspaceParents);const parentQueries = useQueries({queries: workspaceParents.map((parent) => ({