Skip to content

A desktop coding agent with free access to frontier models.

TypeScript

New task: pick the project folder above the composer

Anurag Pappula4244278c9a40
diff --git a/apps/app/src/i18n/locales/en.ts b/apps/app/src/i18n/locales/en.ts
index 7491d675..a399e7b0 100644
--- a/apps/app/src/i18n/locales/en.ts
+++ b/apps/app/src/i18n/locales/en.ts
@@ -2011,6 +2011,9 @@ export default {
"workspace.sandbox_badge": "Sandbox",
"workspace.selected": "Selected",
"workspace_list.add_workspace": "Add workspace",
+ "workspace_list.choose_project": "Choose a project",
+ "workspace_list.open_folder": "Open folder…",
+ "workspace_list.project_picker": "Project: {name}",
"workspace_list.connected": "Connected",
"workspace_list.connected_loaded_tasks_one": "Connected. Loaded {count} task.",
"workspace_list.connected_loaded_tasks_other": "Connected. Loaded {count} tasks.",
diff --git a/apps/app/src/react-app/domains/session/chat/new-task-composer.tsx b/apps/app/src/react-app/domains/session/chat/new-task-composer.tsx
index 2ef4fb2f..5fa7b24f 100644
--- a/apps/app/src/react-app/domains/session/chat/new-task-composer.tsx
+++ b/apps/app/src/react-app/domains/session/chat/new-task-composer.tsx
@@ -30,6 +30,7 @@ import {
} from "@/react-app/domains/connections/cloud-inventory-cache";
import { connectPluginsForComposer, EMPTY_CONNECT_CAPABILITY_INVENTORY } from "@/react-app/domains/session/surface/connect-capability-inventory";
import { resolveAttachmentFileMetadata } from "@/react-app/domains/session/sync/attachment-file-part";
+import { ProjectPicker, type ProjectPickerProps } from "@/react-app/domains/session/chat/project-picker";
/**
* Workspace-scoped wiring for the new-task composer. Everything here is
@@ -66,6 +67,8 @@ export type NewTaskComposerContext = {
isRemoteWorkspace: boolean;
isSandboxWorkspace: boolean;
onOpenSettingsSection?: (section: ComposerSettingsSection) => void;
+ /** The folder the new task works in, picked above the composer. */
+ projectPicker?: ProjectPickerProps;
};
export type NewTaskComposerProps = {
@@ -423,6 +426,7 @@ export function NewTaskComposer(props: NewTaskComposerProps) {
restoreComposer(failedSubmission);
setFailedSubmission(null);
}}>Clear the current draft to restore the unsent message</button> : null}
+ {context?.projectPicker ? <ProjectPicker {...context.projectPicker} /> : null}
<ReactSessionComposer
runModeControl={<WorkspaceRunModeMenu client={workspaceClient} workspaceId={workspaceId} busy={props.busy} />}
fullPermissionsControl={<FullPermissionsToggle client={workspaceClient} workspaceId={workspaceId} />}
diff --git a/apps/app/src/react-app/domains/session/chat/project-picker.tsx b/apps/app/src/react-app/domains/session/chat/project-picker.tsx
new file mode 100644
index 00000000..5488fbb3
--- /dev/null
+++ b/apps/app/src/react-app/domains/session/chat/project-picker.tsx
@@ -0,0 +1,76 @@
+/** @jsxImportSource react */
+import { ChevronDown, Folder, FolderOpen, LoaderCircle } from "lucide-react";
+import { useState } from "react";
+
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuRadioGroup, DropdownMenuRadioItem, DropdownMenuSeparator, DropdownMenuTrigger } from "@/components/ui/dropdown-menu";
+import { t } from "@/i18n";
+
+export type ProjectPickerWorkspace = { id: string; name: string; path: string | null };
+
+export type ProjectPickerProps = {
+ workspaces: readonly ProjectPickerWorkspace[];
+ selectedId: string | null;
+ onSelect: (workspaceId: string) => void;
+ /** Picks a folder on disk and makes it the workspace; null where folders cannot be opened. */
+ onOpenFolder: (() => Promise<void>) | null;
+};
+
+/**
+ * The folder a new task works in, picked above the composer: the workspaces
+ * the person has, and "Open folder…" to add one. Without it people stay in
+ * the starter folder and ask the agent to go find their project, so the
+ * agent searches their home folder and works outside the workspace.
+ */
+export function ProjectPicker(props: ProjectPickerProps) {
+ const [opening, setOpening] = useState(false);
+ const selected = props.workspaces.find((workspace) => workspace.id === props.selectedId) ?? null;
+ const openFolder = props.onOpenFolder;
+ return (
+ <DropdownMenu>
+ <DropdownMenuTrigger
+ data-testid="project-picker-trigger"
+ aria-label={t("workspace_list.project_picker", { name: selected?.name ?? t("workspace_list.choose_project") })}
+ title={selected?.path ?? undefined}
+ disabled={opening}
+ className="mb-2 inline-flex h-8 max-w-full items-center gap-1.5 rounded-md px-2 text-sm text-gray-11 transition-colors hover:bg-gray-3 hover:text-gray-12"
+ >
+ {opening ? <LoaderCircle className="size-4 shrink-0 animate-spin" /> : <Folder className="size-4 shrink-0" />}
+ <span className="truncate">{selected?.name ?? t("workspace_list.choose_project")}</span>
+ <ChevronDown className="size-3.5 shrink-0 text-gray-10" />
+ </DropdownMenuTrigger>
+ <DropdownMenuContent side="bottom" align="start" sideOffset={4} className="w-[min(320px,calc(100vw-32px))] p-1">
+ <DropdownMenuRadioGroup value={props.selectedId ?? ""}>
+ {props.workspaces.map((workspace) => (
+ <DropdownMenuRadioItem
+ key={workspace.id}
+ value={workspace.id}
+ data-testid={`project-picker-option-${workspace.id}`}
+ title={workspace.path ?? undefined}
+ onClick={() => {
+ if (workspace.id !== props.selectedId) props.onSelect(workspace.id);
+ }}
+ >
+ <span className="truncate">{workspace.name}</span>
+ </DropdownMenuRadioItem>
+ ))}
+ </DropdownMenuRadioGroup>
+ {openFolder ? (
+ <>
+ {props.workspaces.length ? <DropdownMenuSeparator /> : null}
+ <DropdownMenuItem
+ data-testid="project-picker-open-folder"
+ disabled={opening}
+ onClick={() => {
+ setOpening(true);
+ void openFolder().finally(() => setOpening(false));
+ }}
+ >
+ <FolderOpen className="size-4" />
+ {t("workspace_list.open_folder")}
+ </DropdownMenuItem>
+ </>
+ ) : null}
+ </DropdownMenuContent>
+ </DropdownMenu>
+ );
+}
diff --git a/apps/app/src/react-app/shell/session-route.tsx b/apps/app/src/react-app/shell/session-route.tsx
index bbfcf5b5..5210d488 100644
--- a/apps/app/src/react-app/shell/session-route.tsx
+++ b/apps/app/src/react-app/shell/session-route.tsx
@@ -3196,6 +3196,34 @@ export function SessionRoute() {
}
}, [baseUrl, client, local, navigateToWorkspaceSession, refreshRouteState, rememberPendingCreatedSession, token]);
+ // The new task's folder, picked above its composer: switch to another
+ // workspace, or open a folder as a new one (the sidebar's "+" in one step).
+ const openProjectFolder = useCallback(async () => {
+ if (workspaces.length > 0 && checkDesktopRestriction({ restriction: "allowMultipleWorkspaces" })) {
+ restrictionNotice.show({
+ title: "Additional workspaces are restricted",
+ message: "Your organization administrator has restricted access to adding additional workspaces.",
+ });
+ return;
+ }
+ const folder = singlePickedDirectory(await pickDirectory({ title: t("onboarding.authorize_folder") }));
+ await handleCreateWorkspace("starter", folder);
+ }, [checkDesktopRestriction, handleCreateWorkspace, restrictionNotice, workspaces.length]);
+ const newTaskComposerWithProjects = useMemo<NewTaskComposerContext | null>(() => newTaskComposerContext && {
+ ...newTaskComposerContext,
+ projectPicker: {
+ workspaces: workspaces.map((workspace) => ({ id: workspace.id, name: workspace.displayNameResolved, path: workspace.path || null })),
+ selectedId: selectedWorkspaceId || null,
+ onSelect: (workspaceId: string) => {
+ setLegacySelectedWorkspaceId(workspaceId);
+ writeActiveWorkspaceId(workspaceId);
+ navigateToWorkspaceSession(workspaceId);
+ focusPromptSoon();
+ },
+ onOpenFolder: platform.capabilities.nativeFilePicker && canCreateWorkspaces() ? openProjectFolder : null,
+ },
+ }, [navigateToWorkspaceSession, newTaskComposerContext, openProjectFolder, platform.capabilities.nativeFilePicker, selectedWorkspaceId, setLegacySelectedWorkspaceId, workspaces]);
+
/**
* Chat-first onboarding: the empty-state composer creates a default chat
* workspace under the user's home folder instead of asking where to put
@@ -3390,7 +3418,7 @@ export function SessionRoute() {
onOpenProviderAuth={handleOpenProviderAuth}
onChatFirstTask={handleChatFirstTask}
chatFirstBusy={createWorkspaceBusy}
- newTaskComposer={newTaskComposerContext}
+ newTaskComposer={newTaskComposerWithProjects}
providerAuthModal={sessionProviderAuthSnapshot.providerAuthModalOpen ? {
open: true,
loading: false,