jb/paseo
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Show New Workspace isolation controls immediately (#2702)

Browse Source 
* fix(workspaces): show isolation without checkout delay

* fix(workspaces): trust hydrated project capability

* fix(workspaces): resolve branch before creation

* fix(workspaces): honor invalidated checkout status

* fix(workspaces): preserve isolation while projects load

* fix(workspaces): keep provisional project routes usable

Route-derived projects do not know their worktree capability. Represent that uncertainty at the placement boundary so remembered worktree intent survives hydration without disabling the New Workspace screen indefinitely.
This commit is contained in:
Mohamed Boudra
2026-07-31 17:50:35 +02:00
committed by GitHub
parent 35f985baff
commit de44c8cd66
20 changed files with 333 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/app/src/screens/new-workspace-initial-context.test.ts
+8 -1
View File
@@ -13,7 +13,14 @@ function projectFor(serverId: string, key = "project"): HostProjectListItem {
projectName: key,
projectKind: "git",
iconWorkingDir: `/work/${key}`,
hosts: [{ serverId, projectId: key, iconWorkingDir: `/work/${key}`, canCreateWorktree: true }],
hosts: [
{
serverId,
projectId: key,
iconWorkingDir: `/work/${key}`,
worktreeSupport: "supported" as const,
},
],
workspaceKeys: [],
};
}
packages/app/src/screens/new-workspace-picker-item.test.ts
+34 -1
View File
@@ -1,6 +1,11 @@
import { describe, expect, it } from "vitest";
import type { ForgeSearchItem } from "@getpaseo/protocol/messages";
import { pickerItemToCheckoutRequest, type PickerItem } from "./new-workspace-picker-item";
import type { CheckoutStatusPayload } from "@/git/checkout-status-cache";
import {
pickerItemToCheckoutRequest,
resolveCheckoutRequest,
type PickerItem,
} from "./new-workspace-picker-item";
const prItem: ForgeSearchItem = {
kind: "change_request",
@@ -82,3 +87,31 @@ describe("pickerItemToCheckoutRequest", () => {
});
});
});
describe("resolveCheckoutRequest", () => {
const checkoutStatus = {
currentBranch: "feature/current",
} as CheckoutStatusPayload;
it("branches from the loaded current branch when nothing was picked", () => {
expect(resolveCheckoutRequest(null, checkoutStatus)).toEqual({
action: "branch-off",
refName: "feature/current",
});
});
it("prefers an explicit picker selection", () => {
expect(
resolveCheckoutRequest({ kind: "branch", name: "feature/picked" }, checkoutStatus),
).toEqual({
action: "branch-off",
refName: "feature/picked",
});
});
it("preserves the server-default intent for a detached checkout", () => {
expect(
resolveCheckoutRequest(null, { ...checkoutStatus, currentBranch: null }),
).toBeUndefined();
});
});
packages/app/src/screens/new-workspace-picker-item.ts
+14
View File
@@ -1,5 +1,6 @@
import type { CreatePaseoWorktreeInput } from "@getpaseo/client/internal/daemon-client";
import type { ForgeSearchItem } from "@getpaseo/protocol/messages";
import type { CheckoutStatusPayload } from "@/git/checkout-status-cache";
export type PickerItem =
| { kind: "branch"; name: string }
@@ -43,3 +44,16 @@ export function pickerItemToCheckoutRequest(
}
}
}
export function resolveCheckoutRequest(
selectedItem: PickerItem | null,
checkoutStatus: CheckoutStatusPayload,
): PickerCheckoutRequest | undefined {
const selectedCheckoutRequest = pickerItemToCheckoutRequest(selectedItem);
if (selectedCheckoutRequest) return selectedCheckoutRequest;
if (!checkoutStatus.currentBranch) return undefined;
return {
action: "branch-off",
refName: checkoutStatus.currentBranch,
};
}
packages/app/src/screens/new-workspace-screen.tsx
+45 -54
View File
@@ -8,7 +8,7 @@ import ReanimatedAnimated from "react-native-reanimated";
import { StyleSheet, useUnistyles, withUnistyles } from "react-native-unistyles";
import { useSafeAreaInsets } from "react-native-safe-area-context";
import { createNameId } from "mnemonic-id";
import { useQuery } from "@tanstack/react-query";
import { useQuery, useQueryClient } from "@tanstack/react-query";
import { ChevronDown, Folder, FolderPlus, GitBranch, GitPullRequest } from "lucide-react-native";
import { Composer } from "@/composer";
import { FileDropZone } from "@/components/file-drop/file-drop-zone";
@@ -31,6 +31,8 @@ import { HEADER_INNER_HEIGHT, MAX_CONTENT_WIDTH, useIsCompactFormFactor } from "
import { useToast } from "@/contexts/toast-context";
import { useAgentInputDraft } from "@/composer/draft/input-draft";
import { useForgeSearchQuery } from "@/git/use-forge-search-query";
import { useCheckoutStatusQuery } from "@/git/use-status-query";
import { ensureCheckoutStatus } from "@/git/checkout-status-cache";
import {
useHostRuntimeClient,
useHostRuntimeConnectionStatuses,
@@ -67,6 +69,7 @@ import { projectIconPlaceholderLabelFromDisplayName } from "@/utils/project-disp
import {
getHostProjectSourceDirectory,
getHostProjectId,
getWorktreeSupportForHostProject,
hostProjectFromRoute,
hostProjectFromWorkspace,
useHostProjects,
@@ -87,7 +90,7 @@ import {
remapDraftCwdToWorkspace,
} from "./new-workspace-fork-context";
import {
pickerItemToCheckoutRequest,
resolveCheckoutRequest,
type PickerCheckoutRequest,
type PickerItem,
} from "./new-workspace-picker-item";
@@ -109,19 +112,6 @@ const addProjectIcon = (
<ThemedFolderPlus size={ICON_SIZE.sm} uniProps={foregroundMutedColorMapping} />
);
function resolveCheckoutRequest(
selectedItem: PickerItem | null,
currentBranch: string | null,
): PickerCheckoutRequest | undefined {
const selectedCheckoutRequest = pickerItemToCheckoutRequest(selectedItem);
if (selectedCheckoutRequest) return selectedCheckoutRequest;
if (!currentBranch) return undefined;
return {
action: "branch-off",
refName: currentBranch,
};
}
function useIsNewWorkspaceDraftHandoffActive(input: {
draftId: string | undefined;
selectedServerId: string;
@@ -564,7 +554,8 @@ function NewWorkspaceProjectPickerOption({
active={active}
disabled={
isPending ||
(!supportsWorkspaceMultiplicity && !project.hosts.some((host) => host.canCreateWorktree))
(!supportsWorkspaceMultiplicity &&
!project.hosts.some((host) => host.worktreeSupport !== "unsupported"))
}
onPress={onPress}
/>
@@ -697,21 +688,20 @@ interface WorkspaceIsolationState {
showRefPicker: boolean;
}
// Worktree isolation only makes sense for a git checkout. The effective isolation
// falls back to local whenever the selected directory isn't git so the flow
// never submits an impossible request.
// Preserve the user's worktree choice while route metadata is provisional. Once
// the authoritative placement arrives, unsupported projects fall back to local.
function useWorkspaceIsolation(input: {
supportsMultiplicity: boolean;
selectedIsGit: boolean;
worktreeSupport: "supported" | "unsupported" | "unknown";
}): WorkspaceIsolationState {
const { supportsMultiplicity, selectedIsGit } = input;
const { supportsMultiplicity, worktreeSupport } = input;
// The last isolation choice is remembered alongside the other New Workspace
// form preferences (provider, model, mode). A manual in-screen pick overrides
// the remembered default until the screen remounts.
const { preferences, updatePreferences } = useFormPreferences();
const [manualIsolation, setManualIsolation] = useState<"local" | "worktree" | null>(null);
const isolation = manualIsolation ?? preferences.isolation ?? "local";
const canCreateWorktree = supportsMultiplicity && selectedIsGit;
const canCreateWorktree = supportsMultiplicity && worktreeSupport !== "unsupported";
const isWorktree = isolation === "worktree" && canCreateWorktree;
const setIsolation = useCallback(
@@ -812,8 +802,7 @@ async function createMultiplicityWorkspace(input: {
isolation: "local" | "worktree";
project: HostProjectListItem;
sourceDirectory: string;
selectedItem: PickerItem | null;
currentBranch: string | null;
checkoutRequest: PickerCheckoutRequest | undefined;
withInitialAgent: boolean;
prompt: string;
attachments: AgentAttachment[];
@@ -827,9 +816,6 @@ async function createMultiplicityWorkspace(input: {
const projectId = getHostProjectId(input.project, input.serverId);
if (!projectId) throw new Error("Project is not available on the selected host");
const isWorktree = input.isolation === "worktree";
const checkoutRequest = isWorktree
? resolveCheckoutRequest(input.selectedItem, input.currentBranch)
: undefined;
const firstAgentContext = buildFirstAgentContext({
prompt: input.prompt,
attachments: input.attachments,
@@ -841,7 +827,7 @@ async function createMultiplicityWorkspace(input: {
cwd: input.sourceDirectory,
projectId,
worktreeSlug: createNameId(),
...checkoutRequest,
...input.checkoutRequest,
}
: {
kind: "directory",
@@ -1518,6 +1504,7 @@ export function NewWorkspaceScreen({
displayName: displayNameProp,
draftId,
}: NewWorkspaceScreenProps) {
const queryClient = useQueryClient();
const { theme } = useUnistyles();
const { t } = useTranslation();
const insets = useSafeAreaInsets();
@@ -1567,7 +1554,6 @@ export function NewWorkspaceScreen({
}, [pickerSearchQuery]);
const workspace = createdWorkspace;
const isPending = isNewWorkspacePending({ pendingAction, isDraftHandoffActive });
const client = useHostRuntimeClient(selectedServerId);
const isConnected = useHostRuntimeIsConnected(selectedServerId);
const {
@@ -1646,27 +1632,20 @@ export function NewWorkspaceScreen({
const hasSelectedSourceDirectory = selectedSourceDirectory !== null;
const pickerQueryEnabled = pickerOpen && clientReady && hasSelectedSourceDirectory;
const checkoutStatusQuery = useQuery({
queryKey: ["checkout-status", selectedServerId, selectedSourceDirectory],
queryFn: async () => {
if (!selectedSourceDirectory) {
throw new Error("Choose a project");
}
const connectedClient = withConnectedClient();
return connectedClient.getCheckoutStatus(selectedSourceDirectory);
},
enabled: clientReady && hasSelectedSourceDirectory,
staleTime: Infinity,
refetchOnMount: false,
refetchOnReconnect: false,
refetchOnWindowFocus: false,
const { status: checkoutStatus } = useCheckoutStatusQuery({
serverId: selectedServerId,
cwd: selectedSourceDirectory ?? "",
});
const currentBranch = checkoutStatusQuery.data?.currentBranch ?? null;
const currentBranch = checkoutStatus?.currentBranch ?? null;
const worktreeSupport = selectedProject
? getWorktreeSupportForHostProject({ project: selectedProject, serverId: selectedServerId })
: "unsupported";
const isPending = isNewWorkspacePending({ pendingAction, isDraftHandoffActive });
const { effectiveIsolation, setIsolation, canCreateWorktree, showRefPicker } =
useWorkspaceIsolation({
supportsMultiplicity: supportsWorkspaceMultiplicity,
selectedIsGit: checkoutStatusQuery.data?.isGit === true,
worktreeSupport,
});
const branchSuggestionsQuery = useQuery({
@@ -1885,6 +1864,7 @@ export function NewWorkspaceScreen({
cwd: string;
prompt: string;
attachments: AgentAttachment[];
checkoutRequest: PickerCheckoutRequest | undefined;
}): CreatePaseoWorktreeInput => {
if (!selectedProject) {
throw new Error("Choose a project");
@@ -1892,7 +1872,6 @@ export function NewWorkspaceScreen({
if (!selectedSourceDirectory) {
throw new Error("Choose a host for this project");
}
const checkoutRequest = resolveCheckoutRequest(selectedItem, currentBranch);
const firstAgentContext = buildFirstAgentContext(input);
const hostProjectId = getHostProjectId(selectedProject, selectedServerId);
if (!hostProjectId) {
@@ -1904,10 +1883,10 @@ export function NewWorkspaceScreen({
projectId: hostProjectId,
worktreeSlug: createNameId(),
...(firstAgentContext ? { firstAgentContext } : {}),
...checkoutRequest,
...input.checkoutRequest,
};
},
[currentBranch, selectedItem, selectedProject, selectedServerId, selectedSourceDirectory],
[selectedProject, selectedServerId, selectedSourceDirectory],
);
const ensureWorkspace = useCallback(
@@ -1926,14 +1905,26 @@ export function NewWorkspaceScreen({
if (!selectedSourceDirectory) {
throw new Error("Choose a host for this project");
}
const connectedClient = withConnectedClient();
const createsWorktree = !supportsWorkspaceMultiplicity || effectiveIsolation === "worktree";
const checkoutRequest = createsWorktree
? resolveCheckoutRequest(
selectedItem,
await ensureCheckoutStatus({
queryClient,
client: connectedClient,
serverId: selectedServerId,
cwd: selectedSourceDirectory,
}),
)
: undefined;
const normalizedWorkspace = supportsWorkspaceMultiplicity
? await createMultiplicityWorkspace({
client: withConnectedClient(),
client: connectedClient,
isolation: effectiveIsolation,
project: selectedProject,
sourceDirectory: selectedSourceDirectory,
selectedItem,
currentBranch,
checkoutRequest,
withInitialAgent: input.withInitialAgent,
prompt: input.prompt,
attachments: input.attachments,
@@ -1942,8 +1933,8 @@ export function NewWorkspaceScreen({
createFailedMessage: t("newWorkspace.errors.createWorktreeFailed"),
})
: await createAndMergeWorkspace({
client: withConnectedClient(),
createInput: buildCreateWorktreeInput(input),
client: connectedClient,
createInput: buildCreateWorktreeInput({ ...input, checkoutRequest }),
mergeWorkspaces,
serverId: selectedServerId,
createFailedMessage: t("newWorkspace.errors.createWorktreeFailed"),
@@ -1954,9 +1945,9 @@ export function NewWorkspaceScreen({
[
buildCreateWorktreeInput,
createdWorkspace,
currentBranch,
effectiveIsolation,
mergeWorkspaces,
queryClient,
selectedItem,
selectedProject,
selectedServerId,
packages/app/src/screens/new-workspace/project-picker.ts
+5 -1
View File
@@ -166,7 +166,11 @@ export function useNewWorkspaceProjectPicker({
(id: string) => {
const project = projectByOptionId.get(id);
if (!project) return;
if (!allowAllProjects && !project.hosts.some((host) => host.canCreateWorktree)) return;
if (
!allowAllProjects &&
!project.hosts.some((host) => host.worktreeSupport !== "unsupported")
)
return;
setProjectSelection({
contextKey: manualSelectionContextKey,
project,
packages/app/src/screens/new-workspace/project-selection.test.ts
+8 -8
View File
@@ -23,7 +23,7 @@ function project(projectKey: string, serverId = "host"): HostProjectListItem {
serverId,
projectId: projectKey,
iconWorkingDir: `/work/${projectKey}`,
canCreateWorktree: true,
worktreeSupport: "supported" as const,
},
],
workspaceKeys: [],
@@ -127,7 +127,7 @@ describe("reconcileProjectSelection", () => {
serverId: "host",
projectId: "local-project-id",
iconWorkingDir: "/work/project",
canCreateWorktree: true,
worktreeSupport: "supported" as const,
},
],
};
@@ -138,7 +138,7 @@ describe("reconcileProjectSelection", () => {
serverId: "host",
projectId: "local-project-id",
iconWorkingDir: "/work/project",
canCreateWorktree: false,
worktreeSupport: "unsupported" as const,
},
],
};
@@ -301,7 +301,7 @@ describe("reconcileProjectSelection", () => {
serverId: "host-b",
projectId: "prj_a",
iconWorkingDir: "/work/a",
canCreateWorktree: true,
worktreeSupport: "supported" as const,
},
],
};
@@ -338,7 +338,7 @@ describe("reconcileProjectSelection", () => {
serverId: "host-a",
projectId: "prj_b",
iconWorkingDir: "/work/selected",
canCreateWorktree: true,
worktreeSupport: "supported" as const,
},
],
};
@@ -421,7 +421,7 @@ describe("reconcileProjectSelection", () => {
serverId: "host-a",
projectId: "prj_b",
iconWorkingDir: "/work/selected",
canCreateWorktree: true,
worktreeSupport: "supported" as const,
},
],
};
@@ -466,7 +466,7 @@ describe("reconcileProjectSelection", () => {
serverId: "host-b",
projectId: "shared",
iconWorkingDir: "/work/shared",
canCreateWorktree: false,
worktreeSupport: "unsupported" as const,
},
],
};
@@ -619,7 +619,7 @@ describe("reconcileProjectSelection", () => {
serverId: "host",
projectId: "sibling",
iconWorkingDir: "/work/sibling",
canCreateWorktree: true,
worktreeSupport: "supported" as const,
},
],
};