Skip to content

πŸ™Œ OpenHands: AI-Driven Development

fix(home): show git repo picker on home when active backend is cloud (#270)

Robert Brennan3f55a57ff807
diff --git a/__tests__/components/features/conversation-panel/new-conversation-button-cloud.test.tsx b/__tests__/components/features/conversation-panel/new-conversation-button-cloud.test.tsx
new file mode 100644
index 0000000000..158eee2735
--- /dev/null
+++ b/__tests__/components/features/conversation-panel/new-conversation-button-cloud.test.tsx
@@ -0,0 +1,243 @@
+import { screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import { renderWithProviders } from "test-utils";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
+import { NewConversationButton } from "#/components/features/conversation-panel/new-conversation-button";
+import { GitRepository } from "#/types/git";
+
+const mockUseUserProviders = vi.fn();
+const mockUseActiveBackend = vi.fn();
+const mockUseGitRepositories = vi.fn();
+const mockUseSearchRepositories = vi.fn();
+
+vi.mock("#/hooks/use-user-providers", () => ({
+ useUserProviders: () => mockUseUserProviders(),
+}));
+
+vi.mock("#/contexts/active-backend-context", () => ({
+ useActiveBackend: () => mockUseActiveBackend(),
+}));
+
+vi.mock("#/hooks/query/use-git-repositories", () => ({
+ useGitRepositories: (...args: unknown[]) => mockUseGitRepositories(...args),
+}));
+
+vi.mock("#/hooks/query/use-search-repositories", () => ({
+ useSearchRepositories: (...args: unknown[]) =>
+ mockUseSearchRepositories(...args),
+}));
+
+vi.mock("#/hooks/use-tracking", () => ({
+ useTracking: () => ({
+ trackConversationCreated: vi.fn(),
+ }),
+}));
+
+const makeRepo = (
+ full_name: string,
+ overrides: Partial<GitRepository> = {},
+): GitRepository => ({
+ id: full_name,
+ full_name,
+ git_provider: "github",
+ is_public: true,
+ ...overrides,
+});
+
+const makeStartTask = (conversationId: string) => ({
+ id: "task-id",
+ created_by_user_id: null,
+ status: "READY" as const,
+ detail: null,
+ app_conversation_id: conversationId,
+ agent_server_url: "http://agent-server.local",
+ request: {
+ initial_message: null,
+ processors: [],
+ llm_model: null,
+ selected_repository: null,
+ selected_branch: null,
+ git_provider: "github" as const,
+ suggested_task: null,
+ title: null,
+ trigger: null,
+ pr_number: [],
+ parent_conversation_id: null,
+ agent_type: "default" as const,
+ },
+ created_at: new Date().toISOString(),
+ updated_at: new Date().toISOString(),
+});
+
+describe("NewConversationButton (cloud)", () => {
+ beforeEach(() => {
+ window.localStorage.clear();
+ mockUseActiveBackend.mockReturnValue({
+ backend: { id: "cloud-1", kind: "cloud" },
+ orgId: null,
+ });
+ mockUseUserProviders.mockReturnValue({
+ providers: ["github"],
+ isLoadingSettings: false,
+ });
+ mockUseGitRepositories.mockReturnValue({
+ data: {
+ pages: [
+ {
+ items: [
+ makeRepo("octo/cat", { main_branch: "main" }),
+ makeRepo("octo/dog", { main_branch: "trunk" }),
+ ],
+ next_page_id: null,
+ },
+ ],
+ },
+ isLoading: false,
+ isError: false,
+ hasNextPage: false,
+ isFetchingNextPage: false,
+ fetchNextPage: vi.fn(),
+ onLoadMore: vi.fn(),
+ });
+ mockUseSearchRepositories.mockReturnValue({
+ data: [],
+ isLoading: false,
+ });
+ });
+
+ afterEach(() => {
+ vi.restoreAllMocks();
+ window.localStorage.clear();
+ });
+
+ it("renders a list of repositories from the active provider", async () => {
+ const user = userEvent.setup();
+ renderWithProviders(<NewConversationButton />);
+
+ await user.click(screen.getByTestId("new-conversation-button"));
+
+ expect(screen.getByTestId("new-conversation-popover")).toBeInTheDocument();
+ const items = screen.getAllByTestId("launch-repository");
+ expect(items).toHaveLength(2);
+ expect(items[0]).toHaveAttribute("data-repo-name", "octo/cat");
+ expect(items[1]).toHaveAttribute("data-repo-name", "octo/dog");
+
+ // No workspace footer in cloud mode.
+ expect(
+ screen.queryByTestId("add-workspaces-button"),
+ ).not.toBeInTheDocument();
+ expect(screen.queryByTestId("launch-no-workspace")).not.toBeInTheDocument();
+ });
+
+ it("launches a conversation against the repo's default branch", async () => {
+ const navigate = vi.fn();
+ const createSpy = vi
+ .spyOn(AgentServerConversationService, "createConversation")
+ .mockResolvedValue(makeStartTask("conv-xyz"));
+
+ const user = userEvent.setup();
+ renderWithProviders(<NewConversationButton />, {
+ navigation: { navigate, currentPath: "/conversations" },
+ });
+
+ await user.click(screen.getByTestId("new-conversation-button"));
+ const items = screen.getAllByTestId("launch-repository");
+ await user.click(items[1]); // octo/dog, main_branch = "trunk"
+
+ await waitFor(() => {
+ expect(createSpy).toHaveBeenCalledWith(
+ undefined,
+ undefined,
+ undefined,
+ {
+ selected_repository: "octo/dog",
+ selected_branch: "trunk",
+ git_provider: "github",
+ },
+ undefined,
+ undefined,
+ undefined,
+ );
+ });
+ await waitFor(() => {
+ expect(navigate).toHaveBeenCalledWith("/conversations/conv-xyz");
+ });
+ });
+
+ it('falls back to "main" when the repository has no main_branch metadata', async () => {
+ mockUseGitRepositories.mockReturnValue({
+ data: {
+ pages: [{ items: [makeRepo("octo/no-main")], next_page_id: null }],
+ },
+ isLoading: false,
+ isError: false,
+ hasNextPage: false,
+ isFetchingNextPage: false,
+ fetchNextPage: vi.fn(),
+ onLoadMore: vi.fn(),
+ });
+ const createSpy = vi
+ .spyOn(AgentServerConversationService, "createConversation")
+ .mockResolvedValue(makeStartTask("conv-abc"));
+
+ const user = userEvent.setup();
+ renderWithProviders(<NewConversationButton />);
+
+ await user.click(screen.getByTestId("new-conversation-button"));
+ await user.click(screen.getByTestId("launch-repository"));
+
+ await waitFor(() => {
+ expect(createSpy).toHaveBeenCalledWith(
+ undefined,
+ undefined,
+ undefined,
+ {
+ selected_repository: "octo/no-main",
+ selected_branch: "main",
+ git_provider: "github",
+ },
+ undefined,
+ undefined,
+ undefined,
+ );
+ });
+ });
+
+ it("renders provider tabs when multiple providers are connected", async () => {
+ mockUseUserProviders.mockReturnValue({
+ providers: ["github", "gitlab"],
+ isLoadingSettings: false,
+ });
+
+ const user = userEvent.setup();
+ renderWithProviders(<NewConversationButton />);
+
+ await user.click(screen.getByTestId("new-conversation-button"));
+
+ expect(screen.getByTestId("cloud-provider-tabs")).toBeInTheDocument();
+ expect(screen.getByTestId("cloud-provider-tab-github")).toBeInTheDocument();
+ expect(screen.getByTestId("cloud-provider-tab-gitlab")).toBeInTheDocument();
+ });
+
+ it("shows an empty state when no repositories are returned", async () => {
+ mockUseGitRepositories.mockReturnValue({
+ data: { pages: [{ items: [], next_page_id: null }] },
+ isLoading: false,
+ isError: false,
+ hasNextPage: false,
+ isFetchingNextPage: false,
+ fetchNextPage: vi.fn(),
+ onLoadMore: vi.fn(),
+ });
+
+ const user = userEvent.setup();
+ renderWithProviders(<NewConversationButton />);
+
+ await user.click(screen.getByTestId("new-conversation-button"));
+
+ expect(screen.getByTestId("cloud-repo-empty")).toBeInTheDocument();
+ expect(screen.queryAllByTestId("launch-repository")).toHaveLength(0);
+ });
+});
diff --git a/__tests__/components/features/home/repo-connector.test.tsx b/__tests__/components/features/home/repo-connector.test.tsx
index 356818b416..aa86ef36d6 100644
--- a/__tests__/components/features/home/repo-connector.test.tsx
+++ b/__tests__/components/features/home/repo-connector.test.tsx
@@ -4,15 +4,24 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
import { RepoConnector } from "#/components/features/home/repo-connector";
const mockUseUserProviders = vi.fn();
+const mockUseActiveBackend = vi.fn();
vi.mock("#/hooks/use-user-providers", () => ({
useUserProviders: () => mockUseUserProviders(),
}));
+vi.mock("#/contexts/active-backend-context", () => ({
+ useActiveBackend: () => mockUseActiveBackend(),
+}));
+
vi.mock("#/components/features/home/workspace-selection-form", () => ({
WorkspaceSelectionForm: () => <div data-testid="stub-workspace-form" />,
}));
+vi.mock("#/components/features/home/repo-selection-form", () => ({
+ RepositorySelectionForm: () => <div data-testid="stub-repository-form" />,
+}));
+
describe("RepoConnector", () => {
beforeEach(() => {
mockUseUserProviders.mockReturnValue({
@@ -21,9 +30,29 @@ describe("RepoConnector", () => {
});
});
- it("always shows the workspace launcher for the agent-server build", () => {
+ it("shows the workspace launcher when the active backend is local", () => {
+ mockUseActiveBackend.mockReturnValue({
+ backend: { kind: "local" },
+ orgId: null,
+ });
+
render(<RepoConnector />);
expect(screen.getByTestId("stub-workspace-form")).toBeInTheDocument();
+ expect(
+ screen.queryByTestId("stub-repository-form"),
+ ).not.toBeInTheDocument();
+ });
+
+ it("shows the git repository launcher when the active backend is cloud", () => {
+ mockUseActiveBackend.mockReturnValue({
+ backend: { kind: "cloud" },
+ orgId: null,
+ });
+
+ render(<RepoConnector />);
+
+ expect(screen.getByTestId("stub-repository-form")).toBeInTheDocument();
+ expect(screen.queryByTestId("stub-workspace-form")).not.toBeInTheDocument();
});
});
diff --git a/src/components/features/conversation-panel/new-conversation-button-cloud.tsx b/src/components/features/conversation-panel/new-conversation-button-cloud.tsx
new file mode 100644
index 0000000000..0074a59be1
--- /dev/null
+++ b/src/components/features/conversation-panel/new-conversation-button-cloud.tsx
@@ -0,0 +1,321 @@
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { Plus } from "lucide-react";
+
+import { useCreateConversation } from "#/hooks/mutation/use-create-conversation";
+import { useNavigation } from "#/context/navigation-context";
+import { useIsCreatingConversation } from "#/hooks/use-is-creating-conversation";
+import { useGitRepositories } from "#/hooks/query/use-git-repositories";
+import { useSearchRepositories } from "#/hooks/query/use-search-repositories";
+import { useUserProviders } from "#/hooks/use-user-providers";
+import { useDebounce } from "#/hooks/use-debounce";
+import { useHomeStore } from "#/stores/home-store";
+import { I18nKey } from "#/i18n/declaration";
+import { cn } from "#/utils/utils";
+import { GitRepository } from "#/types/git";
+import { Provider } from "#/types/settings";
+import RepoIcon from "#/icons/repo.svg?react";
+import { GitProviderIcon } from "#/components/shared/git-provider-icon";
+
+interface RepoListItemProps {
+ repo: GitRepository;
+ disabled: boolean;
+ onSelect: (repo: GitRepository) => void;
+ itemClass: string;
+}
+
+function RepoListItem({
+ repo,
+ disabled,
+ onSelect,
+ itemClass,
+}: RepoListItemProps) {
+ return (
+ <li>
+ <button
+ type="button"
+ disabled={disabled}
+ data-testid="launch-repository"
+ data-repo-name={repo.full_name}
+ onClick={() => onSelect(repo)}
+ className={itemClass}
+ >
+ <RepoIcon width={14} height={14} className="shrink-0" />
+ <span className="truncate">{repo.full_name}</span>
+ </button>
+ </li>
+ );
+}
+
+/**
+ * Cloud-backend variant of the sidebar "+ New Conversation" trigger.
+ *
+ * Lists git repositories (filtered by an optional search query) from the
+ * active provider. Clicking a row immediately launches a conversation
+ * against the repo's default branch (falling back to "main"). No branch
+ * picker is exposed β€” the user can switch branches from inside the
+ * conversation once it's running.
+ */
+export function CloudNewConversationButton() {
+ const { t } = useTranslation("openhands");
+ const { navigate } = useNavigation();
+
+ const { providers } = useUserProviders();
+ const { lastSelectedProvider, setLastSelectedProvider } = useHomeStore();
+
+ const [open, setOpen] = React.useState(false);
+ const popoverRef = React.useRef<HTMLDivElement>(null);
+ const [selectedProvider, setSelectedProvider] =
+ React.useState<Provider | null>(lastSelectedProvider ?? null);
+ const [query, setQuery] = React.useState("");
+ const debouncedQuery = useDebounce(query, 300);
+
+ // Auto-select a provider once `useUserProviders` resolves: prefer the
+ // previously chosen one if it's still connected, otherwise the first
+ // available provider.
+ React.useEffect(() => {
+ if (providers.length === 0) {
+ if (selectedProvider !== null) setSelectedProvider(null);
+ return;
+ }
+ if (selectedProvider && providers.includes(selectedProvider)) return;
+ const fallback =
+ lastSelectedProvider && providers.includes(lastSelectedProvider)
+ ? lastSelectedProvider
+ : providers[0];
+ setSelectedProvider(fallback);
+ }, [providers, selectedProvider, lastSelectedProvider]);
+
+ const {
+ data: repoPages,
+ isLoading,
+ isError,
+ hasNextPage,
+ isFetchingNextPage,
+ fetchNextPage,
+ } = useGitRepositories({ provider: selectedProvider });
+
+ const { data: searchResults, isLoading: isSearchLoading } =
+ useSearchRepositories(debouncedQuery, selectedProvider);
+
+ const allRepositories = React.useMemo(
+ () => repoPages?.pages.flatMap((page) => page.items) ?? [],
+ [repoPages],
+ );
+
+ const repositories = debouncedQuery ? (searchResults ?? []) : allRepositories;
+
+ const { mutate: createConversation, isPending } = useCreateConversation();
+ const isCreatingElsewhere = useIsCreatingConversation();
+ const isCreating = isPending || isCreatingElsewhere;
+
+ React.useEffect(() => {
+ if (!open) return undefined;
+ const onDown = (e: MouseEvent) => {
+ if (
+ popoverRef.current &&
+ !popoverRef.current.contains(e.target as Node)
+ ) {
+ setOpen(false);
+ }
+ };
+ document.addEventListener("mousedown", onDown);
+ return () => document.removeEventListener("mousedown", onDown);
+ }, [open]);
+
+ React.useEffect(() => {
+ if (!open) return undefined;
+ const onKeyDown = (event: KeyboardEvent) => {
+ if (event.key === "Escape") setOpen(false);
+ };
+ window.addEventListener("keydown", onKeyDown);
+ return () => window.removeEventListener("keydown", onKeyDown);
+ }, [open]);
+
+ const launchRepository = (repo: GitRepository) => {
+ if (isCreating) return;
+ createConversation(
+ {
+ repository: {
+ name: repo.full_name,
+ gitProvider: repo.git_provider,
+ branch: repo.main_branch ?? "main",
+ },
+ },
+ {
+ onSuccess: (data) => {
+ setOpen(false);
+ navigate(`/conversations/${data.conversation_id}`);
+ },
+ },
+ );
+ };
+
+ const handleProviderChange = (provider: Provider) => {
+ setSelectedProvider(provider);
+ setLastSelectedProvider(provider);
+ setQuery("");
+ };
+
+ const itemClass = cn(
+ "flex items-center gap-2 w-full px-2 py-2 text-sm text-white text-left",
+ "hover:bg-[#5C5D62] rounded-md transition-colors duration-150 font-normal",
+ "disabled:opacity-60 disabled:cursor-not-allowed",
+ );
+
+ // When the popover is open and the active provider has very few repos
+ // available, auto-load the next page so users can scroll without
+ // explicitly clicking "Load more".
+ React.useEffect(() => {
+ if (!open) return;
+ if (debouncedQuery) return;
+ if (!hasNextPage || isFetchingNextPage || isLoading) return;
+ if (repositories.length === 0 || repositories.length >= 10) return;
+ fetchNextPage();
+ }, [
+ open,
+ debouncedQuery,
+ hasNextPage,
+ isFetchingNextPage,
+ isLoading,
+ repositories.length,
+ fetchNextPage,
+ ]);
+
+ const isListLoading = debouncedQuery ? isSearchLoading : isLoading;
+ const showLoadMore =
+ !debouncedQuery && hasNextPage && repositories.length > 0;
+
+ return (
+ <div className="relative" ref={popoverRef}>
+ <button
+ type="button"
+ data-testid="new-conversation-button"
+ onClick={() => setOpen((o) => !o)}
+ aria-expanded={open}
+ className={cn(
+ "flex items-center gap-1.5 w-full px-3 py-2 rounded-md",
+ "text-sm font-medium text-white bg-[#1f1f1f99] hover:bg-[#2a2a2a]",
+ "border border-[#525252] cursor-pointer transition-colors",
+ )}
+ >
+ <Plus width={16} height={16} className="shrink-0" />
+ {t(I18nKey.SIDEBAR$NEW_CONVERSATION)}
+ </button>
+
+ {open && (
+ <div
+ data-testid="new-conversation-popover"
+ className={cn(
+ "absolute z-30 left-0 right-0 top-full mt-2 p-1",
+ "bg-[#26282D] border border-[#727987] rounded-lg shadow-xl",
+ "flex flex-col gap-1",
+ )}
+ >
+ {providers.length > 1 && (
+ <div
+ className="flex items-center gap-1 px-1 pt-1"
+ data-testid="cloud-provider-tabs"
+ >
+ {providers.map((provider) => {
+ const isActive = provider === selectedProvider;
+ return (
+ <button
+ key={provider}
+ type="button"
+ data-testid={`cloud-provider-tab-${provider}`}
+ onClick={() => handleProviderChange(provider)}
+ className={cn(
+ "flex items-center gap-1 px-2 py-1 rounded text-xs",
+ "border transition-colors",
+ isActive
+ ? "bg-[#5C5D62] border-[#727987] text-white"
+ : "border-transparent text-[#B7BDC2] hover:text-white",
+ )}
+ >
+ <GitProviderIcon gitProvider={provider} />
+ <span className="capitalize">{provider}</span>
+ </button>
+ );
+ })}
+ </div>
+ )}
+
+ <div className="px-1">
+ <input
+ type="text"
+ data-testid="cloud-repo-search-input"
+ value={query}
+ onChange={(e) => setQuery(e.target.value)}
+ placeholder={t(I18nKey.COMMON$SEARCH_REPOSITORIES)}
+ disabled={!selectedProvider}
+ className={cn(
+ "w-full px-2 py-1.5 text-sm rounded-md",
+ "bg-[#1f1f1f] border border-[#525252] text-white",
+ "placeholder:text-[#A3A3A3] outline-none",
+ "focus:border-[#727987]",
+ "disabled:opacity-60 disabled:cursor-not-allowed",
+ )}
+ />
+ </div>
+
+ <ul className="flex flex-col max-h-[40vh] sm:max-h-[280px] overflow-y-auto">
+ {isListLoading && repositories.length === 0 && (
+ <li
+ className="px-2 py-2 text-sm text-[#A3A3A3] italic"
+ data-testid="cloud-repo-loading"
+ >
+ {t(I18nKey.HOME$LOADING_REPOSITORIES)}
+ </li>
+ )}
+ {isError && (
+ <li
+ className="px-2 py-2 text-sm text-[#F87171]"
+ data-testid="cloud-repo-error"
+ >
+ {t(I18nKey.HOME$FAILED_TO_LOAD_REPOSITORIES)}
+ </li>
+ )}
+ {!isListLoading &&
+ !isError &&
+ repositories.length === 0 &&
+ !!selectedProvider && (
+ <li
+ className="px-2 py-2 text-sm text-[#A3A3A3] italic"
+ data-testid="cloud-repo-empty"
+ >
+ {t(I18nKey.GITHUB$NO_RESULTS)}
+ </li>
+ )}
+ {repositories.map((repo) => (
+ <RepoListItem
+ key={`${repo.git_provider}:${repo.id}`}
+ repo={repo}
+ disabled={isCreating}
+ onSelect={launchRepository}
+ itemClass={itemClass}
+ />
+ ))}
+ {showLoadMore && (
+ <li>
+ <button
+ type="button"
+ data-testid="cloud-repo-load-more"
+ disabled={isFetchingNextPage}
+ onClick={() => fetchNextPage()}
+ className={itemClass}
+ >
+ <span className="text-[#B7BDC2]">
+ {isFetchingNextPage
+ ? t(I18nKey.HOME$LOADING_MORE_REPOSITORIES)
+ : t(I18nKey.CONVERSATION$LOAD_MORE)}
+ </span>
+ </button>
+ </li>
+ )}
+ </ul>
+ </div>
+ )}
+ </div>
+ );
+}
diff --git a/src/components/features/conversation-panel/new-conversation-button-local.tsx b/src/components/features/conversation-panel/new-conversation-button-local.tsx
new file mode 100644
index 0000000000..80066b2e10
--- /dev/null
+++ b/src/components/features/conversation-panel/new-conversation-button-local.tsx
@@ -0,0 +1,212 @@
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { Plus } from "lucide-react";
+
+import { useCreateConversation } from "#/hooks/mutation/use-create-conversation";
+import { useNavigation } from "#/context/navigation-context";
+import { useIsCreatingConversation } from "#/hooks/use-is-creating-conversation";
+import { useWorkspacesStore } from "#/stores/workspaces-store";
+import { useResolvedWorkspaces } from "#/hooks/query/use-resolved-workspaces";
+import { I18nKey } from "#/i18n/declaration";
+import { cn } from "#/utils/utils";
+import RepoIcon from "#/icons/repo.svg?react";
+
+import { FolderBrowserModal } from "#/components/features/home/workspace-dropdown/folder-browser-modal";
+import { ManageWorkspacesModal } from "#/components/features/home/workspace-dropdown/manage-workspaces-modal";
+
+/**
+ * Local-backend variant of the sidebar "+ New Conversation" trigger.
+ *
+ * Opens an inline popover on top of the conversation list. The popover is a
+ * flat list: each entry (including a leading "No workspace" option)
+ * immediately starts a conversation when clicked. The sticky footer still
+ * exposes "+ Add Workspace" / "Manage Workspaces" entries.
+ */
+export function LocalNewConversationButton() {
+ const { t } = useTranslation("openhands");
+ const { navigate } = useNavigation();
+
+ const [open, setOpen] = React.useState(false);
+ const popoverRef = React.useRef<HTMLDivElement>(null);
+
+ const {
+ workspaceParents,
+ addWorkspaces,
+ removeWorkspace,
+ addWorkspaceParents,
+ removeWorkspaceParent,
+ } = useWorkspacesStore();
+ const { workspaces } = useResolvedWorkspaces();
+ const [browserOpen, setBrowserOpen] = React.useState(false);
+ const [manageOpen, setManageOpen] = React.useState(false);
+
+ const { mutate: createConversation, isPending } = useCreateConversation();
+ const isCreatingElsewhere = useIsCreatingConversation();
+ // `isCreatingElsewhere` already covers in-flight mutations and the
+ // post-submit navigation window (`isNavigating`). We deliberately do not
+ // include `isSuccess` here: this component stays mounted across navigation,
+ // so a sticky `isSuccess` would lock the button as disabled forever.
+ const isCreating = isPending || isCreatingElsewhere;
+
+ // Close the popover on outside click. Modal-based children portal out of
+ // the popover, so we ignore clicks while a modal is showing.
+ React.useEffect(() => {
+ if (!open || browserOpen || manageOpen) return undefined;
+ const onDown = (e: MouseEvent) => {
+ if (
+ popoverRef.current &&
+ !popoverRef.current.contains(e.target as Node)
+ ) {
+ setOpen(false);
+ }
+ };
+ document.addEventListener("mousedown", onDown);
+ return () => document.removeEventListener("mousedown", onDown);
+ }, [open, browserOpen, manageOpen]);
+
+ React.useEffect(() => {
+ if (!open || browserOpen || manageOpen) return undefined;
+ const onKeyDown = (event: KeyboardEvent) => {
+ if (event.key === "Escape") {
+ setOpen(false);
+ }
+ };
+ window.addEventListener("keydown", onKeyDown);
+ return () => window.removeEventListener("keydown", onKeyDown);
+ }, [open, browserOpen, manageOpen]);
+
+ const launch = (workingDir?: string) => {
+ if (isCreating) return;
+ createConversation(
+ { workingDir },
+ {
+ onSuccess: (data) => {
+ setOpen(false);
+ navigate(`/conversations/${data.conversation_id}`);
+ },
+ },
+ );
+ };
+
+ const itemClass = cn(
+ "flex items-center gap-2 w-full px-2 py-2 text-sm text-white text-left",
+ "hover:bg-[#5C5D62] rounded-md transition-colors duration-150 font-normal",
+ "disabled:opacity-60 disabled:cursor-not-allowed",
+ );
+
+ const keepPopoverOpenOnMouseDown = React.useCallback(
+ (event: React.MouseEvent<HTMLButtonElement>) => {
+ event.preventDefault();
+ event.stopPropagation();
+ },
+ [],
+ );
+
+ return (
+ <div className="relative" ref={popoverRef}>
+ <button
+ type="button"
+ data-testid="new-conversation-button"
+ onClick={() => setOpen((o) => !o)}
+ aria-expanded={open}
+ className={cn(
+ "flex items-center gap-1.5 w-full px-3 py-2 rounded-md",
+ "text-sm font-medium text-white bg-[#1f1f1f99] hover:bg-[#2a2a2a]",
+ "border border-[#525252] cursor-pointer transition-colors",
+ )}
+ >
+ <Plus width={16} height={16} className="shrink-0" />
+ {t(I18nKey.SIDEBAR$NEW_CONVERSATION)}
+ </button>
+
+ {open && (
+ <div
+ data-testid="new-conversation-popover"
+ className={cn(
+ "absolute z-30 left-0 right-0 top-full mt-2 p-1",
+ "bg-[#26282D] border border-[#727987] rounded-lg shadow-xl",
+ "flex flex-col",
+ )}
+ >
+ <ul className="flex flex-col max-h-[40vh] sm:max-h-[280px] overflow-y-auto">
+ <li>
+ <button
+ type="button"
+ disabled={isCreating}
+ data-testid="launch-no-workspace"
+ onClick={() => launch()}
+ className={itemClass}
+ >
+ <span className="italic text-[#A3A3A3]">
+ {t(I18nKey.HOME$NO_WORKSPACE_OPTION)}
+ </span>
+ </button>
+ </li>
+ {workspaces.map((w) => (
+ <li key={w.id}>
+ <button
+ type="button"
+ disabled={isCreating}
+ data-testid="launch-workspace"
+ data-workspace-path={w.path}
+ onClick={() => launch(w.path)}
+ className={itemClass}
+ >
+ <RepoIcon width={14} height={14} className="shrink-0" />
+ <span className="truncate">{w.name}</span>
+ </button>
+ </li>
+ ))}
+ </ul>
+
+ <div className="flex flex-col border-t border-[#525252] mt-1 pt-1">
+ <button
+ type="button"
+ data-testid="add-workspaces-button"
+ onMouseDown={keepPopoverOpenOnMouseDown}
+ onClick={(event) => {
+ event.preventDefault();
+ event.stopPropagation();
+ setBrowserOpen(true);
+ }}
+ className={itemClass}
+ >
+ {t(I18nKey.HOME$ADD_WORKSPACES)}
+ </button>
+ {(workspaces.length > 0 || workspaceParents.length > 0) && (
+ <button
+ type="button"
+ data-testid="manage-workspaces-button"
+ onMouseDown={keepPopoverOpenOnMouseDown}
+ onClick={(event) => {
+ event.preventDefault();
+ event.stopPropagation();
+ setManageOpen(true);
+ }}
+ className={itemClass}
+ >
+ {t(I18nKey.HOME$MANAGE_WORKSPACES)}
+ </button>
+ )}
+ </div>
+ </div>
+ )}
+
+ <FolderBrowserModal
+ isOpen={browserOpen}
+ onClose={() => setBrowserOpen(false)}
+ onAdd={(items) => addWorkspaces(items)}
+ onAddParent={(items) => addWorkspaceParents(items)}
+ />
+
+ <ManageWorkspacesModal
+ isOpen={manageOpen}
+ workspaces={workspaces}
+ workspaceParents={workspaceParents}
+ onClose={() => setManageOpen(false)}
+ onRemove={(path) => removeWorkspace(path)}
+ onRemoveParent={(path) => removeWorkspaceParent(path)}
+ />
+ </div>
+ );
+}
diff --git a/src/components/features/conversation-panel/new-conversation-button.tsx b/src/components/features/conversation-panel/new-conversation-button.tsx
index 0cceeb7477..d7d013c3eb 100644
--- a/src/components/features/conversation-panel/new-conversation-button.tsx
+++ b/src/components/features/conversation-panel/new-conversation-button.tsx
@@ -1,211 +1,18 @@
-import React from "react";
-import { useTranslation } from "react-i18next";
-import { Plus } from "lucide-react";
+import { useActiveBackend } from "#/contexts/active-backend-context";
-import { useCreateConversation } from "#/hooks/mutation/use-create-conversation";
-import { useNavigation } from "#/context/navigation-context";
-import { useIsCreatingConversation } from "#/hooks/use-is-creating-conversation";
-import { useWorkspacesStore } from "#/stores/workspaces-store";
-import { useResolvedWorkspaces } from "#/hooks/query/use-resolved-workspaces";
-import { I18nKey } from "#/i18n/declaration";
-import { cn } from "#/utils/utils";
-import RepoIcon from "#/icons/repo.svg?react";
-
-import { FolderBrowserModal } from "#/components/features/home/workspace-dropdown/folder-browser-modal";
-import { ManageWorkspacesModal } from "#/components/features/home/workspace-dropdown/manage-workspaces-modal";
+import { CloudNewConversationButton } from "./new-conversation-button-cloud";
+import { LocalNewConversationButton } from "./new-conversation-button-local";
/**
- * "+ New Conversation" trigger that opens an inline popover on top of the
- * conversation list. The popover is a flat list: each entry (including a
- * leading "No workspace" option) immediately starts a conversation when
- * clicked. The sticky footer still exposes "+ Add Workspace" / "Manage
- * Workspaces" entries.
+ * Sidebar "+ New Conversation" trigger.
+ *
+ * The popover content depends on the active backend: local backends operate
+ * on workspace folders so we surface the workspace picker, while cloud
+ * backends operate on git repositories so we surface a repository picker.
*/
export function NewConversationButton() {
- const { t } = useTranslation("openhands");
- const { navigate } = useNavigation();
-
- const [open, setOpen] = React.useState(false);
- const popoverRef = React.useRef<HTMLDivElement>(null);
-
- const {
- workspaceParents,
- addWorkspaces,
- removeWorkspace,
- addWorkspaceParents,
- removeWorkspaceParent,
- } = useWorkspacesStore();
- const { workspaces } = useResolvedWorkspaces();
- const [browserOpen, setBrowserOpen] = React.useState(false);
- const [manageOpen, setManageOpen] = React.useState(false);
-
- const { mutate: createConversation, isPending } = useCreateConversation();
- const isCreatingElsewhere = useIsCreatingConversation();
- // `isCreatingElsewhere` already covers in-flight mutations and the
- // post-submit navigation window (`isNavigating`). We deliberately do not
- // include `isSuccess` here: this component stays mounted across navigation,
- // so a sticky `isSuccess` would lock the button as disabled forever.
- const isCreating = isPending || isCreatingElsewhere;
-
- // Close the popover on outside click. Modal-based children portal out of
- // the popover, so we ignore clicks while a modal is showing.
- React.useEffect(() => {
- if (!open || browserOpen || manageOpen) return undefined;
- const onDown = (e: MouseEvent) => {
- if (
- popoverRef.current &&
- !popoverRef.current.contains(e.target as Node)
- ) {
- setOpen(false);
- }
- };
- document.addEventListener("mousedown", onDown);
- return () => document.removeEventListener("mousedown", onDown);
- }, [open, browserOpen, manageOpen]);
-
- React.useEffect(() => {
- if (!open || browserOpen || manageOpen) return undefined;
- const onKeyDown = (event: KeyboardEvent) => {
- if (event.key === "Escape") {
- setOpen(false);
- }
- };
- window.addEventListener("keydown", onKeyDown);
- return () => window.removeEventListener("keydown", onKeyDown);
- }, [open, browserOpen, manageOpen]);
-
- const launch = (workingDir?: string) => {
- if (isCreating) return;
- createConversation(
- { workingDir },
- {
- onSuccess: (data) => {
- setOpen(false);
- navigate(`/conversations/${data.conversation_id}`);
- },
- },
- );
- };
-
- const itemClass = cn(
- "flex items-center gap-2 w-full px-2 py-2 text-sm text-white text-left",
- "hover:bg-[#5C5D62] rounded-md transition-colors duration-150 font-normal",
- "disabled:opacity-60 disabled:cursor-not-allowed",
- );
-
- const keepPopoverOpenOnMouseDown = React.useCallback(
- (event: React.MouseEvent<HTMLButtonElement>) => {
- event.preventDefault();
- event.stopPropagation();
- },
- [],
- );
-
- return (
- <div className="relative" ref={popoverRef}>
- <button
- type="button"
- data-testid="new-conversation-button"
- onClick={() => setOpen((o) => !o)}
- aria-expanded={open}
- className={cn(
- "flex items-center gap-1.5 w-full px-3 py-2 rounded-md",
- "text-sm font-medium text-white bg-[#1f1f1f99] hover:bg-[#2a2a2a]",
- "border border-[#525252] cursor-pointer transition-colors",
- )}
- >
- <Plus width={16} height={16} className="shrink-0" />
- {t(I18nKey.SIDEBAR$NEW_CONVERSATION)}
- </button>
-
- {open && (
- <div
- data-testid="new-conversation-popover"
- className={cn(
- "absolute z-30 left-0 right-0 top-full mt-2 p-1",
- "bg-[#26282D] border border-[#727987] rounded-lg shadow-xl",
- "flex flex-col",
- )}
- >
- <ul className="flex flex-col max-h-[40vh] sm:max-h-[280px] overflow-y-auto">
- <li>
- <button
- type="button"
- disabled={isCreating}
- data-testid="launch-no-workspace"
- onClick={() => launch()}
- className={itemClass}
- >
- <span className="italic text-[#A3A3A3]">
- {t(I18nKey.HOME$NO_WORKSPACE_OPTION)}
- </span>
- </button>
- </li>
- {workspaces.map((w) => (
- <li key={w.id}>
- <button
- type="button"
- disabled={isCreating}
- data-testid="launch-workspace"
- data-workspace-path={w.path}
- onClick={() => launch(w.path)}
- className={itemClass}
- >
- <RepoIcon width={14} height={14} className="shrink-0" />
- <span className="truncate">{w.name}</span>
- </button>
- </li>
- ))}
- </ul>
-
- <div className="flex flex-col border-t border-[#525252] mt-1 pt-1">
- <button
- type="button"
- data-testid="add-workspaces-button"
- onMouseDown={keepPopoverOpenOnMouseDown}
- onClick={(event) => {
- event.preventDefault();
- event.stopPropagation();
- setBrowserOpen(true);
- }}
- className={itemClass}
- >
- {t(I18nKey.HOME$ADD_WORKSPACES)}
- </button>
- {(workspaces.length > 0 || workspaceParents.length > 0) && (
- <button
- type="button"
- data-testid="manage-workspaces-button"
- onMouseDown={keepPopoverOpenOnMouseDown}
- onClick={(event) => {
- event.preventDefault();
- event.stopPropagation();
- setManageOpen(true);
- }}
- className={itemClass}
- >
- {t(I18nKey.HOME$MANAGE_WORKSPACES)}
- </button>
- )}
- </div>
- </div>
- )}
-
- <FolderBrowserModal
- isOpen={browserOpen}
- onClose={() => setBrowserOpen(false)}
- onAdd={(items) => addWorkspaces(items)}
- onAddParent={(items) => addWorkspaceParents(items)}
- />
+ const isCloud = useActiveBackend().backend.kind === "cloud";
- <ManageWorkspacesModal
- isOpen={manageOpen}
- workspaces={workspaces}
- workspaceParents={workspaceParents}
- onClose={() => setManageOpen(false)}
- onRemove={(path) => removeWorkspace(path)}
- onRemoveParent={(path) => removeWorkspaceParent(path)}
- />
- </div>
- );
+ if (isCloud) return <CloudNewConversationButton />;
+ return <LocalNewConversationButton />;
}
diff --git a/src/components/features/home/repo-connector.tsx b/src/components/features/home/repo-connector.tsx
index bc5f658303..7fe9d6df36 100644
--- a/src/components/features/home/repo-connector.tsx
+++ b/src/components/features/home/repo-connector.tsx
@@ -1,21 +1,27 @@
+import { useActiveBackend } from "#/contexts/active-backend-context";
import { useUserProviders } from "#/hooks/use-user-providers";
+import { RepositorySelectionForm } from "./repo-selection-form";
import { WorkspaceSelectionForm } from "./workspace-selection-form";
export function RepoConnector() {
const { isLoadingSettings } = useUserProviders();
+ const isCloud = useActiveBackend().backend.kind === "cloud";
- // Agent-canvas talks directly to an `agent_server` backend (there is no
- // hosted/cloud backend in this build), so the home screen always shows the
- // local-workspace launcher rather than a git repository picker. If/when a
- // cloud backend is supported, this component should branch on the backend
- // mode and render <RepositorySelectionForm /> instead.
+ // Local (agent-server) backends operate on folders on the host machine, so
+ // the launcher shows the workspace picker. Cloud backends run conversations
+ // against remote git repositories, so the launcher shows the git provider /
+ // repo / branch dropdowns instead.
return (
<section
data-testid="repo-connector"
className="w-full flex flex-col gap-6 rounded-[12px] p-[20px] border border-[#727987] bg-[#26282D] min-h-[263.5px] relative"
>
- <WorkspaceSelectionForm isLoadingSettings={isLoadingSettings} />
+ {isCloud ? (
+ <RepositorySelectionForm isLoadingSettings={isLoadingSettings} />
+ ) : (
+ <WorkspaceSelectionForm isLoadingSettings={isLoadingSettings} />
+ )}
</section>
);
}
diff --git a/src/components/features/home/repo-selection-form.tsx b/src/components/features/home/repo-selection-form.tsx
index f476533dbd..8206e0b3a0 100644
--- a/src/components/features/home/repo-selection-form.tsx
+++ b/src/components/features/home/repo-selection-form.tsx
@@ -16,7 +16,14 @@ import { GitRepoDropdown } from "./git-repo-dropdown";
import { useHomeStore } from "#/stores/home-store";
interface RepositorySelectionFormProps {
- onRepoSelection: (repo: GitRepository | null) => void;
+ /**
+ * Optional callback fired whenever the user picks or clears a repository.
+ * The form itself owns the "Launch" action β€” it creates the conversation
+ * and navigates internally β€” so this prop is only useful for callers that
+ * want to mirror the selection in their own state (e.g. to filter a
+ * sibling list by the currently picked repo).
+ */
+ onRepoSelection?: (repo: GitRepository | null) => void;
isLoadingSettings?: boolean;
}
@@ -85,7 +92,7 @@ export function RepositorySelectionForm({
setLastSelectedProvider(provider); // Store the selected provider
setSelectedRepository(null); // Reset repository selection when provider changes
setSelectedBranch(null); // Reset branch selection when provider changes
- onRepoSelection(null); // Reset parent component's selected repo
+ onRepoSelection?.(null); // Reset parent component's selected repo
};
const handleBranchSelection = React.useCallback((branch: Branch | null) => {
@@ -115,10 +122,10 @@ export function RepositorySelectionForm({
const renderRepositorySelector = () => {
const handleRepoSelection = (repository?: GitRepository) => {
if (repository) {
- onRepoSelection(repository);
+ onRepoSelection?.(repository);
setSelectedRepository(repository);
} else {
- onRepoSelection(null); // Notify parent component that repo was cleared
+ onRepoSelection?.(null); // Notify parent component that repo was cleared
setSelectedRepository(null);
setSelectedBranch(null);
}