diff --git a/packages/app/src/screens/new-workspace-picker-state.test.ts b/packages/app/src/screens/new-workspace-picker-state.test.ts
new file mode 100644
index 000000000..66f6995d6
--- /dev/null
+++ b/packages/app/src/screens/new-workspace-picker-state.test.ts
@@ -0,0 +1,96 @@
+import { describe, expect, it } from "vitest";
+import type { UserComposerAttachment } from "@/attachments/types";
+import type { GitHubSearchItem } from "@server/shared/messages";
+import { syncPickerPrAttachment } from "./new-workspace-picker-state";
+
+function makePrItem(number: number, title: string, headRefName = "feature/x"): GitHubSearchItem {
+  return {
+    kind: "pr",
+    number,
+    title,
+    url: `https://example.com/pull/${number}`,
+    state: "open",
+    body: null,
+    labels: [],
+    baseRefName: "main",
+    headRefName,
+  };
+}
+
+function prAttachment(item: GitHubSearchItem): UserComposerAttachment {
+  return { kind: "github_pr", item };
+}
+
+function issueAttachment(number: number): UserComposerAttachment {
+  return {
+    kind: "github_issue",
+    item: {
+      kind: "issue",
+      number,
+      title: `Issue ${number}`,
+      url: `https://example.com/issues/${number}`,
+      state: "open",
+      body: null,
+      labels: [],
+    },
+  };
+}
+
+describe("syncPickerPrAttachment", () => {
+  it("selects a PR when no previous picker PR is set", () => {
+    const pr = makePrItem(202, "Refactor picker");
+    const result = syncPickerPrAttachment({
+      attachments: [],
+      previousPickerPrNumber: null,
+      item: { kind: "github-pr", item: pr },
+    });
+    expect(result.attachedPrNumber).toBe(202);
+    expect(result.attachments).toEqual([prAttachment(pr)]);
+  });
+
+  it("selects a branch without modifying attachments when no previous picker PR", () => {
+    const issue = issueAttachment(44);
+    const result = syncPickerPrAttachment({
+      attachments: [issue],
+      previousPickerPrNumber: null,
+      item: { kind: "branch", name: "dev" },
+    });
+    expect(result.attachedPrNumber).toBeNull();
+    expect(result.attachments).toEqual([issue]);
+  });
+
+  it("replaces the previous picker PR when a different PR is selected", () => {
+    const prA = makePrItem(202, "Refactor picker", "feature/picker");
+    const prB = makePrItem(303, "Polish chip", "feature/chip");
+    const result = syncPickerPrAttachment({
+      attachments: [prAttachment(prA)],
+      previousPickerPrNumber: 202,
+      item: { kind: "github-pr", item: prB },
+    });
+    expect(result.attachedPrNumber).toBe(303);
+    expect(result.attachments).toEqual([prAttachment(prB)]);
+  });
+
+  it("removes the previous picker PR and adds no new attachment when a branch is selected", () => {
+    const pr = makePrItem(202, "Refactor picker");
+    const issue = issueAttachment(44);
+    const result = syncPickerPrAttachment({
+      attachments: [issue, prAttachment(pr)],
+      previousPickerPrNumber: 202,
+      item: { kind: "branch", name: "dev" },
+    });
+    expect(result.attachedPrNumber).toBeNull();
+    expect(result.attachments).toEqual([issue]);
+  });
+
+  it("does not duplicate a PR that was already manually attached by the user", () => {
+    const pr = makePrItem(202, "Refactor picker");
+    const result = syncPickerPrAttachment({
+      attachments: [prAttachment(pr)],
+      previousPickerPrNumber: null,
+      item: { kind: "github-pr", item: pr },
+    });
+    expect(result.attachedPrNumber).toBeNull();
+    expect(result.attachments).toHaveLength(1);
+  });
+});
diff --git a/packages/app/src/screens/new-workspace-picker-state.ts b/packages/app/src/screens/new-workspace-picker-state.ts
new file mode 100644
index 000000000..d9aac0f49
--- /dev/null
+++ b/packages/app/src/screens/new-workspace-picker-state.ts
@@ -0,0 +1,35 @@
+import type { UserComposerAttachment } from "@/attachments/types";
+import type { PickerItem } from "./new-workspace-picker-item";
+
+// The picker "owns" at most one PR attachment at a time. When the user selects
+// a different item the previously-owned PR is removed before the new one is added.
+// User-added attachments for other PRs/issues are left untouched.
+export function syncPickerPrAttachment(input: {
+  attachments: UserComposerAttachment[];
+  previousPickerPrNumber: number | null;
+  item: PickerItem;
+}): { attachments: UserComposerAttachment[]; attachedPrNumber: number | null } {
+  let nextAttachments = input.attachments;
+  let attachedPrNumber: number | null = null;
+
+  if (input.previousPickerPrNumber !== null) {
+    nextAttachments = nextAttachments.filter(
+      (attachment) =>
+        attachment.kind !== "github_pr" || attachment.item.number !== input.previousPickerPrNumber,
+    );
+  }
+
+  if (input.item.kind === "github-pr") {
+    const selectedPr = input.item.item;
+    const hasExistingPrAttachment = nextAttachments.some(
+      (attachment) =>
+        attachment.kind === "github_pr" && attachment.item.number === selectedPr.number,
+    );
+    if (!hasExistingPrAttachment) {
+      nextAttachments = [...nextAttachments, { kind: "github_pr", item: selectedPr }];
+      attachedPrNumber = selectedPr.number;
+    }
+  }
+
+  return { attachments: nextAttachments, attachedPrNumber };
+}
diff --git a/packages/app/src/screens/new-workspace-screen.test.tsx b/packages/app/src/screens/new-workspace-screen.test.tsx
deleted file mode 100644
index c09b38d7a..000000000
--- a/packages/app/src/screens/new-workspace-screen.test.tsx
+++ /dev/null
@@ -1,982 +0,0 @@
-import React from "react";
-import { act } from "react";
-import { createRoot, type Root } from "react-dom/client";
-import { JSDOM } from "jsdom";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import type { ComposerAttachment } from "@/attachments/types";
-import type { CreatePaseoWorktreeInput } from "@server/client/daemon-client";
-import type { GitHubSearchItem } from "@server/shared/messages";
-import { NewWorkspaceScreen } from "./new-workspace-screen";
-
-const {
-  theme,
-  mockClient,
-  mergeWorkspacesMock,
-  navigateMock,
-  saveDraftInputMock,
-  clearDraftInputMock,
-  queueDraftSubmissionMock,
-  createdAgent: _createdAgent,
-  createdWorkspace,
-  prItem,
-  prItemB,
-  issueItem,
-  initialAttachments,
-  initialDraftState,
-} = vi.hoisted(() => {
-  const hoistedTheme = {
-    spacing: { 1: 4, 2: 8, 3: 12, 4: 16, 6: 24, 8: 32 },
-    iconSize: { sm: 14, md: 18, lg: 22 },
-    borderWidth: { 1: 1 },
-    borderRadius: { md: 6, lg: 8, "2xl": 16 },
-    fontSize: { xs: 11, sm: 13, base: 15, lg: 18 },
-    fontWeight: { medium: "500" },
-    shadow: { md: {} },
-    colors: {
-      surface0: "#000",
-      surface1: "#111",
-      surface2: "#222",
-      foreground: "#fff",
-      foregroundMuted: "#aaa",
-      popoverForeground: "#fff",
-      border: "#555",
-      destructive: "#ff453a",
-      palette: {
-        zinc: { 600: "#52525b" },
-      },
-    },
-  };
-
-  const hoistedPrItem: GitHubSearchItem = {
-    kind: "pr",
-    number: 202,
-    title: "Refactor picker",
-    url: "https://example.com/pull/202",
-    state: "open",
-    body: null,
-    labels: [],
-    baseRefName: "main",
-    headRefName: "feature/picker",
-  };
-
-  const hoistedPrItemB: GitHubSearchItem = {
-    kind: "pr",
-    number: 303,
-    title: "Polish composer chip",
-    url: "https://example.com/pull/303",
-    state: "open",
-    body: null,
-    labels: [],
-    baseRefName: "main",
-    headRefName: "feature/composer-chip",
-  };
-
-  const hoistedIssueItem: GitHubSearchItem = {
-    kind: "issue",
-    number: 44,
-    title: "Keep manual attachment",
-    url: "https://example.com/issues/44",
-    state: "open",
-    body: null,
-    labels: [],
-  };
-
-  const hoistedInitialAttachments: ComposerAttachment[] = [];
-  const hoistedInitialDraftState = { text: "" };
-
-  const hoistedCreatedWorkspace = {
-    id: "workspace-1",
-    workspaceDirectory: "/repo/.paseo/worktrees/workspace-1",
-  };
-
-  const hoistedCreatedAgent = {
-    id: "agent-1",
-    cwd: hoistedCreatedWorkspace.workspaceDirectory,
-  };
-
-  const hoistedMockClient = {
-    isConnected: true,
-    getCheckoutStatus: vi.fn(async () => ({ currentBranch: "main" })),
-    getBranchSuggestions: vi.fn(async () => ({ branches: ["main", "dev", "feat/x"] })),
-    searchGitHub: vi.fn(async () => ({
-      items: [hoistedPrItem, hoistedPrItemB],
-      githubFeaturesEnabled: true,
-      error: null,
-    })),
-    createPaseoWorktree: vi.fn(async (_input: CreatePaseoWorktreeInput) => ({
-      workspace: hoistedCreatedWorkspace,
-      error: null,
-    })),
-    createAgent: vi.fn(async () => hoistedCreatedAgent),
-  };
-
-  return {
-    theme: hoistedTheme,
-    mockClient: hoistedMockClient,
-    mergeWorkspacesMock: vi.fn(),
-    navigateMock: vi.fn(),
-    saveDraftInputMock: vi.fn(),
-    clearDraftInputMock: vi.fn(),
-    queueDraftSubmissionMock: vi.fn(),
-    createdAgent: hoistedCreatedAgent,
-    createdWorkspace: hoistedCreatedWorkspace,
-    prItem: hoistedPrItem,
-    prItemB: hoistedPrItemB,
-    issueItem: hoistedIssueItem,
-    initialAttachments: hoistedInitialAttachments,
-    initialDraftState: hoistedInitialDraftState,
-  };
-});
-
-vi.mock("react-native-unistyles", () => ({
-  StyleSheet: {
-    create: (factory: unknown) => (typeof factory === "function" ? factory(theme) : factory),
-  },
-  useUnistyles: () => ({ theme }),
-}));
-
-vi.mock("@/constants/platform", () => ({
-  isWeb: true,
-  isNative: false,
-}));
-
-vi.mock("@/constants/layout", () => ({
-  HEADER_INNER_HEIGHT: 48,
-  HEADER_INNER_HEIGHT_MOBILE: 56,
-  HEADER_TOP_PADDING_MOBILE: 8,
-  MAX_CONTENT_WIDTH: 900,
-  useIsCompactFormFactor: () => false,
-}));
-
-vi.mock("react-native-safe-area-context", () => ({
-  useSafeAreaInsets: () => ({ top: 0, right: 0, bottom: 0, left: 0 }),
-}));
-
-vi.mock("lucide-react-native", () => {
-  const createIcon = (name: string) => (props: Record<string, unknown>) =>
-    React.createElement("span", { ...props, "data-icon": name });
-  return {
-    ChevronDown: createIcon("ChevronDown"),
-    GitBranch: createIcon("GitBranch"),
-    GitPullRequest: createIcon("GitPullRequest"),
-  };
-});
-
-function flattenReanimatedStyle(style: unknown) {
-  if (!Array.isArray(style)) {
-    return style;
-  }
-  return Object.assign({}, ...style.filter(Boolean));
-}
-
-vi.mock("react-native-reanimated", () => ({
-  default: {
-    View: ({
-      testID,
-      style,
-      ...props
-    }: React.HTMLAttributes<HTMLDivElement> & { testID?: string; style?: unknown }) => {
-      const flattenedStyle = flattenReanimatedStyle(style);
-      return <div {...props} data-testid={testID} style={flattenedStyle as React.CSSProperties} />;
-    },
-  },
-}));
-
-vi.mock("@/runtime/host-runtime", () => ({
-  useHostRuntimeClient: () => mockClient,
-  useHostRuntimeIsConnected: () => true,
-}));
-
-vi.mock("@/stores/session-store", () => ({
-  useSessionStore: (selector: (state: unknown) => unknown) =>
-    selector({
-      mergeWorkspaces: mergeWorkspacesMock,
-    }),
-  normalizeWorkspaceDescriptor: (workspace: unknown) => workspace,
-}));
-
-vi.mock("@/utils/agent-snapshots", () => ({
-  normalizeAgentSnapshot: (agent: unknown) => agent,
-}));
-
-vi.mock("@/utils/encode-images", () => ({
-  encodeImages: vi.fn(async () => []),
-}));
-
-vi.mock("@/utils/error-messages", () => ({
-  toErrorMessage: (error: unknown) => (error instanceof Error ? error.message : String(error)),
-}));
-
-vi.mock("@/utils/workspace-execution", () => ({
-  requireWorkspaceExecutionAuthority: (input: { workspace: { workspaceDirectory: string } }) => ({
-    workspaceDirectory: input.workspace.workspaceDirectory,
-  }),
-}));
-
-vi.mock("@/utils/workspace-navigation", () => ({
-  navigateToPreparedWorkspaceTab: navigateMock,
-}));
-
-vi.mock("@/stores/draft-keys", () => ({
-  buildDraftStoreKey: ({
-    serverId,
-    agentId,
-    draftId,
-  }: {
-    serverId: string;
-    agentId: string;
-    draftId?: string | null;
-  }) => (draftId ? `draft:${serverId}:${draftId}` : `agent:${serverId}:${agentId}`),
-  generateDraftId: () => "draft-new-workspace",
-}));
-
-vi.mock("@/stores/draft-store", () => ({
-  useDraftStore: {
-    getState: () => ({
-      saveDraftInput: saveDraftInputMock,
-      clearDraftInput: clearDraftInputMock,
-    }),
-  },
-}));
-
-vi.mock("@/stores/workspace-draft-submission-store", () => ({
-  useWorkspaceDraftSubmissionStore: {
-    getState: () => ({
-      setPending: queueDraftSubmissionMock,
-    }),
-  },
-}));
-
-vi.mock("@/contexts/toast-context", () => ({
-  useToast: () => ({ error: vi.fn() }),
-}));
-
-vi.mock("@/hooks/use-agent-input-draft", () => ({
-  useAgentInputDraft: () => {
-    const [attachments, setAttachments] = React.useState<ComposerAttachment[]>(initialAttachments);
-    const [text, setText] = React.useState(initialDraftState.text);
-    return {
-      text,
-      setText,
-      attachments,
-      setAttachments,
-      cwd: "/repo",
-      composerState: {
-        selectedProvider: "claude-code",
-        selectedMode: "",
-        modeOptions: [],
-        effectiveModelId: null,
-        effectiveThinkingOptionId: null,
-        commandDraftConfig: undefined,
-        statusControls: {},
-      },
-    };
-  },
-}));
-
-vi.mock("@/hooks/use-keyboard-shift-style", () => ({
-  useKeyboardShiftStyle: () => ({ style: { transform: "translateY(-216px)" } }),
-}));
-
-interface ComposerMockProps {
-  onSubmitMessage: (payload: {
-    text: string;
-    attachments: ComposerAttachment[];
-    cwd: string;
-  }) => void;
-  submitBehavior?: "clear" | "preserve-and-lock";
-  submitIcon?: "arrow" | "return";
-  isSubmitLoading?: boolean;
-  value: string;
-  onChangeText: (text: string) => void;
-  attachments: ComposerAttachment[];
-  onChangeAttachments: (attachments: ComposerAttachment[]) => void;
-}
-
-interface AttachmentPillProps {
-  attachment: Extract<ComposerAttachment, { kind: "github_pr" | "github_issue" }>;
-  attachments: ComposerAttachment[];
-  isDisabled: boolean;
-  onChangeAttachments: (attachments: ComposerAttachment[]) => void;
-}
-
-function ComposerMockAttachmentPill({
-  attachment,
-  attachments,
-  isDisabled,
-  onChangeAttachments,
-}: AttachmentPillProps) {
-  const handleRemove = React.useCallback(() => {
-    onChangeAttachments(
-      attachments.filter(
-        (candidate) =>
-          candidate.kind !== attachment.kind || candidate.item.number !== attachment.item.number,
-      ),
-    );
-  }, [attachment, attachments, onChangeAttachments]);
-  return (
-    <div data-testid="composer-github-attachment-pill">
-      #{attachment.item.number} {attachment.item.title}
-      <button
-        type="button"
-        aria-label={`Remove ${attachment.kind === "github_pr" ? "PR" : "issue"} #${attachment.item.number}`}
-        disabled={isDisabled}
-        onClick={handleRemove}
-      >
-        Remove
-      </button>
-    </div>
-  );
-}
-
-function ComposerMock({
-  onSubmitMessage,
-  submitBehavior,
-  submitIcon,
-  isSubmitLoading,
-  value,
-  onChangeText,
-  attachments,
-  onChangeAttachments,
-}: ComposerMockProps) {
-  const isDisabled = submitBehavior === "preserve-and-lock" && Boolean(isSubmitLoading);
-  const handleTextareaChange = React.useCallback(
-    (event: React.ChangeEvent<HTMLTextAreaElement>) => onChangeText(event.currentTarget.value),
-    [onChangeText],
-  );
-  const handleSubmit = React.useCallback(
-    () => onSubmitMessage({ text: value, attachments, cwd: "/repo" }),
-    [onSubmitMessage, value, attachments],
-  );
-  return (
-    <div
-      data-testid="test-composer"
-      data-submit-behavior={submitBehavior}
-      data-submit-icon={submitIcon}
-    >
-      <textarea
-        aria-label="Message agent..."
-        disabled={isDisabled}
-        value={value}
-        onChange={handleTextareaChange}
-      />
-      <button type="button" data-testid="message-input-attach-button" disabled={isDisabled}>
-        Attach
-      </button>
-      {attachments.map((attachment) =>
-        attachment.kind === "github_pr" || attachment.kind === "github_issue" ? (
-          <ComposerMockAttachmentPill
-            key={`${attachment.kind}-${attachment.item.number}`}
-            attachment={attachment}
-            attachments={attachments}
-            isDisabled={isDisabled}
-            onChangeAttachments={onChangeAttachments}
-          />
-        ) : null,
-      )}
-      <button type="button" data-testid="test-composer-submit" onClick={handleSubmit}>
-        Submit
-      </button>
-    </div>
-  );
-}
-
-vi.mock("@/components/composer", () => ({
-  Composer: ComposerMock,
-}));
-
-vi.mock("@/components/composer-attachments", () => ({
-  splitComposerAttachmentsForSubmit: (attachments: ComposerAttachment[]) => ({
-    images: [],
-    attachments: attachments.flatMap((attachment) => {
-      if (attachment.kind === "github_pr") {
-        return [
-          {
-            type: "github_pr",
-            mimeType: "application/github-pr",
-            number: attachment.item.number,
-            title: attachment.item.title,
-            url: attachment.item.url,
-          },
-        ];
-      }
-      if (attachment.kind === "github_issue") {
-        return [
-          {
-            type: "github_issue",
-            mimeType: "application/github-issue",
-            number: attachment.item.number,
-            title: attachment.item.title,
-            url: attachment.item.url,
-          },
-        ];
-      }
-      return [];
-    }),
-  }),
-}));
-
-vi.mock("@/components/desktop/titlebar-drag-region", () => ({
-  TitlebarDragRegion: () => null,
-}));
-
-vi.mock("@/components/headers/menu-header", () => ({
-  SidebarMenuToggle: () => null,
-}));
-
-vi.mock("@/components/headers/screen-header", () => ({
-  ScreenHeader: () => null,
-}));
-
-vi.mock("@/components/ui/tooltip", () => ({
-  Tooltip: ({ children }: { children: React.ReactNode }) => children,
-  TooltipTrigger: ({ children }: { children: React.ReactNode }) => children,
-  TooltipContent: ({ children }: { children: React.ReactNode }) => children,
-}));
-
-function ComboboxOptionButton({
-  option,
-  onSelect,
-}: {
-  option: { id: string; label: string };
-  onSelect: (id: string) => void;
-}) {
-  const handleClick = React.useCallback(() => onSelect(option.id), [onSelect, option.id]);
-  return (
-    <button type="button" onClick={handleClick}>
-      {option.label}
-    </button>
-  );
-}
-
-function ComboboxOptionRenderWrapper({
-  option,
-  onSelect,
-  renderOption,
-}: {
-  option: { id: string; label: string };
-  onSelect: (id: string) => void;
-  renderOption: (input: {
-    option: { id: string; label: string };
-    selected: boolean;
-    active: boolean;
-    onPress: () => void;
-  }) => React.ReactElement;
-}) {
-  const handlePress = React.useCallback(() => onSelect(option.id), [onSelect, option.id]);
-  return (
-    <>
-      {renderOption({
-        option,
-        selected: false,
-        active: false,
-        onPress: handlePress,
-      })}
-    </>
-  );
-}
-
-vi.mock("@/components/ui/combobox", () => ({
-  Combobox: ({
-    open,
-    options,
-    renderOption,
-    onSelect,
-  }: {
-    open?: boolean;
-    options: Array<{ id: string; label: string }>;
-    renderOption?: (input: {
-      option: { id: string; label: string };
-      selected: boolean;
-      active: boolean;
-      onPress: () => void;
-    }) => React.ReactElement;
-    onSelect: (id: string) => void;
-  }) => {
-    if (!open) return null;
-    return (
-      <div data-testid="ref-picker-combobox">
-        {options.map((option) =>
-          renderOption ? (
-            <ComboboxOptionRenderWrapper
-              key={option.id}
-              option={option}
-              onSelect={onSelect}
-              renderOption={renderOption}
-            />
-          ) : (
-            <ComboboxOptionButton key={option.id} option={option} onSelect={onSelect} />
-          ),
-        )}
-      </div>
-    );
-  },
-  ComboboxItem: ({
-    label,
-    onPress,
-    testID,
-    disabled,
-  }: {
-    label: string;
-    onPress: () => void;
-    testID?: string;
-    disabled?: boolean;
-  }) => (
-    <button type="button" data-testid={testID} disabled={disabled} onClick={onPress}>
-      {label}
-    </button>
-  ),
-}));
-
-vi.mock("mnemonic-id", () => ({
-  createNameId: () => "gentle-slug",
-}));
-
-vi.mock("react-native", async () => {
-  const actual = await vi.importActual<Record<string, unknown>>("react-native");
-  return actual;
-});
-
-let root: Root | null = null;
-let container: HTMLElement | null = null;
-let queryClient: QueryClient | null = null;
-
-beforeEach(() => {
-  const dom = new JSDOM("<!doctype html><html><body></body></html>");
-  vi.stubGlobal("React", React);
-  vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
-  vi.stubGlobal("window", dom.window);
-  vi.stubGlobal("document", dom.window.document);
-  vi.stubGlobal("HTMLElement", dom.window.HTMLElement);
-  vi.stubGlobal("Node", dom.window.Node);
-  vi.stubGlobal("navigator", dom.window.navigator);
-
-  container = document.createElement("div");
-  document.body.appendChild(container);
-  root = createRoot(container);
-  queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } });
-  mockClient.getBranchSuggestions.mockClear();
-  mockClient.searchGitHub.mockClear();
-  mockClient.searchGitHub.mockResolvedValue({
-    items: [prItem, prItemB],
-    githubFeaturesEnabled: true,
-    error: null,
-  });
-  mockClient.createPaseoWorktree.mockClear();
-  mockClient.createAgent.mockClear();
-  saveDraftInputMock.mockClear();
-  clearDraftInputMock.mockClear();
-  queueDraftSubmissionMock.mockClear();
-  navigateMock.mockClear();
-  initialAttachments.length = 0;
-  initialDraftState.text = "";
-});
-
-afterEach(() => {
-  if (root) {
-    act(() => {
-      root?.unmount();
-    });
-  }
-  queryClient?.clear();
-  root = null;
-  container = null;
-  queryClient = null;
-  vi.unstubAllGlobals();
-});
-
-function renderScreen() {
-  act(() => {
-    root?.render(
-      <QueryClientProvider client={queryClient!}>
-        <NewWorkspaceScreen serverId="server" sourceDirectory="/repo" />
-      </QueryClientProvider>,
-    );
-  });
-}
-
-function click(element: Element) {
-  act(() => {
-    element.dispatchEvent(new window.MouseEvent("click", { bubbles: true }));
-  });
-}
-
-async function flush() {
-  await act(async () => {
-    await Promise.resolve();
-    await Promise.resolve();
-    await new Promise((resolve) => setTimeout(resolve, 0));
-  });
-}
-
-async function findByTestId(testID: string): Promise<HTMLElement> {
-  for (let attempt = 0; attempt < 10; attempt += 1) {
-    await flush();
-    const element = document.querySelector(`[data-testid="${testID}"]`) as HTMLElement | null;
-    if (element) return element;
-  }
-  throw new Error(`Missing element with testID ${testID}`);
-}
-
-function queryByTestId(testID: string): HTMLElement | null {
-  return document.querySelector(`[data-testid="${testID}"]`);
-}
-
-function queryAllByTestId(testID: string): HTMLElement[] {
-  return Array.from(document.querySelectorAll(`[data-testid="${testID}"]`)) as HTMLElement[];
-}
-
-type CreatePaseoWorktreeArg = Parameters<typeof mockClient.createPaseoWorktree>[0];
-
-function createDeferredPromise<T>() {
-  let resolve!: (value: T | PromiseLike<T>) => void;
-  let reject!: (reason?: unknown) => void;
-  const promise = new Promise<T>((nextResolve, nextReject) => {
-    resolve = nextResolve;
-    reject = nextReject;
-  });
-  return { promise, resolve, reject };
-}
-
-function firstCreateWorktreeCall(): CreatePaseoWorktreeArg {
-  const calls = mockClient.createPaseoWorktree.mock.calls;
-  const firstCall = calls[0];
-  if (!firstCall) throw new Error("createPaseoWorktree not called");
-  return firstCall[0];
-}
-
-describe("NewWorkspaceScreen picker payload", () => {
-  it("moves the ref picker row with the mobile keyboard shift", async () => {
-    renderScreen();
-    await flush();
-
-    const pickerRow = await findByTestId("new-workspace-ref-picker-row");
-    expect(pickerRow.style.transform).toBe("translateY(-216px)");
-  });
-
-  it("lazily searches only GitHub PRs when the picker opens", async () => {
-    renderScreen();
-    await flush();
-
-    expect(mockClient.searchGitHub).not.toHaveBeenCalled();
-
-    click(await findByTestId("new-workspace-ref-picker-trigger"));
-    await flush();
-
-    expect(mockClient.searchGitHub).toHaveBeenCalledWith({
-      cwd: "/repo",
-      query: "",
-      limit: 20,
-      kinds: ["github-pr"],
-    });
-  });
-
-  it("sends no new fields when nothing is selected (default)", async () => {
-    renderScreen();
-    await flush();
-
-    click(await findByTestId("test-composer-submit"));
-    await flush();
-
-    expect(mockClient.createPaseoWorktree).toHaveBeenCalledTimes(1);
-    const call = firstCreateWorktreeCall();
-    expect(call).toMatchObject({
-      cwd: "/repo",
-      worktreeSlug: "gentle-slug",
-    });
-    expect(call).not.toHaveProperty("refName");
-    expect(call).not.toHaveProperty("action");
-    expect(call).not.toHaveProperty("githubPrNumber");
-  });
-
-  it("opens the new workspace draft tab as soon as the worktree is ready", async () => {
-    initialDraftState.text = "please review this change";
-    renderScreen();
-    await flush();
-
-    click(await findByTestId("test-composer-submit"));
-    await flush();
-
-    expect(mockClient.createPaseoWorktree).toHaveBeenCalledTimes(1);
-    expect(firstCreateWorktreeCall().firstAgentContext?.prompt).toBe("please review this change");
-    expect(mockClient.createAgent).not.toHaveBeenCalled();
-    expect(saveDraftInputMock).toHaveBeenCalledWith({
-      draftKey: "draft:server:draft-new-workspace",
-      draft: {
-        text: "please review this change",
-        attachments: [],
-        cwd: createdWorkspace.workspaceDirectory,
-      },
-    });
-    expect(queueDraftSubmissionMock).toHaveBeenCalledWith({
-      serverId: "server",
-      workspaceId: createdWorkspace.id,
-      draftId: "draft-new-workspace",
-      text: "please review this change",
-      attachments: [],
-      cwd: createdWorkspace.workspaceDirectory,
-      provider: "claude-code",
-      allowEmptyText: true,
-    });
-    expect(navigateMock).toHaveBeenCalledWith({
-      serverId: "server",
-      workspaceId: createdWorkspace.id,
-      target: { kind: "draft", draftId: "draft-new-workspace" },
-      navigationMethod: "replace",
-    });
-    expect(clearDraftInputMock).toHaveBeenCalledWith({
-      draftKey: "new-workspace:server:/repo",
-      lifecycle: "sent",
-    });
-    expect(navigateMock.mock.invocationCallOrder[0]).toBeLessThan(
-      clearDraftInputMock.mock.invocationCallOrder[0],
-    );
-    expect(document.querySelector("textarea")).toHaveProperty("disabled", true);
-  });
-
-  it("shows the selected PR number, title, and PR icon in the picker trigger", async () => {
-    renderScreen();
-    await flush();
-
-    click(await findByTestId("new-workspace-ref-picker-trigger"));
-    await flush();
-
-    click(await findByTestId(`new-workspace-ref-picker-pr-${prItem.number}`));
-    await flush();
-
-    const trigger = await findByTestId("new-workspace-ref-picker-trigger");
-    expect(trigger.textContent).toContain(`#${prItem.number}`);
-    expect(trigger.textContent).toContain(prItem.title);
-    expect(trigger.textContent).not.toContain("feature/picker");
-    expect(trigger.querySelectorAll('[data-icon="GitPullRequest"]')).toHaveLength(1);
-  });
-
-  it("adds the selected picker PR as a composer attachment pill", async () => {
-    renderScreen();
-    await flush();
-
-    click(await findByTestId("new-workspace-ref-picker-trigger"));
-    await flush();
-
-    click(await findByTestId(`new-workspace-ref-picker-pr-${prItem.number}`));
-    await flush();
-
-    const pills = queryAllByTestId("composer-github-attachment-pill");
-    expect(pills).toHaveLength(1);
-    expect(pills[0]?.textContent).toContain(`#${prItem.number}`);
-    expect(pills[0]?.textContent).toContain("Refactor picker");
-  });
-
-  it("replaces the picker-owned composer PR pill when another PR is selected", async () => {
-    renderScreen();
-    await flush();
-
-    click(await findByTestId("new-workspace-ref-picker-trigger"));
-    await flush();
-
-    click(await findByTestId(`new-workspace-ref-picker-pr-${prItem.number}`));
-    await flush();
-
-    click(await findByTestId("new-workspace-ref-picker-trigger"));
-    await flush();
-
-    click(await findByTestId(`new-workspace-ref-picker-pr-${prItemB.number}`));
-    await flush();
-
-    const pills = queryAllByTestId("composer-github-attachment-pill");
-    expect(pills).toHaveLength(1);
-    expect(pills[0]?.textContent).toContain(`#${prItemB.number}`);
-    expect(pills[0]?.textContent).toContain("Polish composer chip");
-    expect(pills[0]?.textContent).not.toContain(`#${prItem.number}`);
-  });
-
-  it("removes the picker-owned PR pill when switching to a branch and preserves user-added chips", async () => {
-    initialAttachments.push({ kind: "github_issue", item: issueItem });
-    renderScreen();
-    await flush();
-
-    click(await findByTestId("new-workspace-ref-picker-trigger"));
-    await flush();
-
-    click(await findByTestId(`new-workspace-ref-picker-pr-${prItem.number}`));
-    await flush();
-
-    click(await findByTestId("new-workspace-ref-picker-trigger"));
-    await flush();
-
-    click(await findByTestId("new-workspace-ref-picker-branch-dev"));
-    await flush();
-
-    const pills = queryAllByTestId("composer-github-attachment-pill");
-    expect(pills).toHaveLength(1);
-    expect(pills[0]?.textContent).toContain(`#${issueItem.number}`);
-    expect(pills[0]?.textContent).toContain(issueItem.title);
-    expect(pills[0]?.textContent).not.toContain(`#${prItem.number}`);
-  });
-
-  it("sends action=branch-off with the branch name when a branch row is selected", async () => {
-    renderScreen();
-    await flush();
-
-    click(await findByTestId("new-workspace-ref-picker-trigger"));
-    await flush();
-
-    click(await findByTestId("new-workspace-ref-picker-branch-dev"));
-    await flush();
-
-    click(await findByTestId("test-composer-submit"));
-    await flush();
-
-    expect(mockClient.createPaseoWorktree).toHaveBeenCalledTimes(1);
-    const call = firstCreateWorktreeCall();
-    expect(call).toMatchObject({
-      cwd: "/repo",
-      worktreeSlug: "gentle-slug",
-      action: "branch-off",
-      refName: "dev",
-    });
-    expect(call).not.toHaveProperty("githubPrNumber");
-  });
-
-  it("sends action=checkout with pr number + head ref when a github PR row is selected", async () => {
-    renderScreen();
-    await flush();
-
-    click(await findByTestId("new-workspace-ref-picker-trigger"));
-    await flush();
-
-    click(await findByTestId(`new-workspace-ref-picker-pr-${prItem.number}`));
-    await flush();
-
-    click(await findByTestId("test-composer-submit"));
-    await flush();
-
-    expect(mockClient.createPaseoWorktree).toHaveBeenCalledTimes(1);
-    const call = firstCreateWorktreeCall();
-    expect(call).toMatchObject({
-      cwd: "/repo",
-      worktreeSlug: "gentle-slug",
-      action: "checkout",
-      refName: "feature/picker",
-      githubPrNumber: 202,
-    });
-  });
-
-  it("sends the selected PR attachment when creating the worktree", async () => {
-    renderScreen();
-    await flush();
-
-    click(await findByTestId("new-workspace-ref-picker-trigger"));
-    await flush();
-
-    click(await findByTestId(`new-workspace-ref-picker-pr-${prItem.number}`));
-    await flush();
-
-    click(await findByTestId("test-composer-submit"));
-    await flush();
-
-    const call = firstCreateWorktreeCall();
-    const attachments = call.firstAgentContext?.attachments ?? [];
-    expect(attachments).toHaveLength(1);
-    expect(attachments[0]).toMatchObject({ type: "github_pr", number: 202 });
-  });
-
-  it("keeps the selected PR attachment when the PR query refreshes after selection", async () => {
-    renderScreen();
-    await flush();
-
-    click(await findByTestId("new-workspace-ref-picker-trigger"));
-    await flush();
-
-    click(await findByTestId(`new-workspace-ref-picker-pr-${prItem.number}`));
-    await flush();
-
-    mockClient.searchGitHub.mockResolvedValue({
-      items: [],
-      githubFeaturesEnabled: true,
-      error: null,
-    });
-    await act(async () => {
-      await queryClient?.invalidateQueries({
-        queryKey: ["new-workspace-github-prs", "server", "/repo"],
-      });
-    });
-    await flush();
-
-    click(await findByTestId("test-composer-submit"));
-    await flush();
-
-    const call = firstCreateWorktreeCall();
-    expect(call.firstAgentContext?.attachments).toHaveLength(1);
-    expect(call.firstAgentContext?.attachments?.[0]).toMatchObject({
-      type: "github_pr",
-      number: 202,
-    });
-  });
-
-  it("omits PR rows from the picker when GitHub features are disabled", async () => {
-    mockClient.searchGitHub.mockResolvedValueOnce({
-      items: [],
-      githubFeaturesEnabled: false,
-      error: null,
-    });
-    renderScreen();
-    await flush();
-
-    click(await findByTestId("new-workspace-ref-picker-trigger"));
-    await flush();
-
-    expect(queryByTestId(`new-workspace-ref-picker-pr-${prItem.number}`)).toBeNull();
-    expect((await findByTestId("new-workspace-ref-picker-branch-dev")).textContent).toContain(
-      "dev",
-    );
-  });
-
-  it("preserves and locks the composer and picker while worktree creation is pending, then unlocks on error", async () => {
-    initialDraftState.text = "please review this change";
-    const createWorktree = createDeferredPromise<{
-      workspace: typeof createdWorkspace;
-      error: null;
-    }>();
-    mockClient.createPaseoWorktree.mockImplementationOnce(async () => await createWorktree.promise);
-    renderScreen();
-    await flush();
-
-    click(await findByTestId("new-workspace-ref-picker-trigger"));
-    await flush();
-
-    click(await findByTestId(`new-workspace-ref-picker-pr-${prItem.number}`));
-    await flush();
-
-    click(await findByTestId("new-workspace-ref-picker-trigger"));
-    await flush();
-
-    click(await findByTestId("test-composer-submit"));
-    await flush();
-
-    const textInput = document.querySelector('[aria-label="Message agent..."]');
-    const removeButton = document.querySelector(`[aria-label="Remove PR #${prItem.number}"]`);
-    expect(queryByTestId("test-composer")?.dataset.submitBehavior).toBe("preserve-and-lock");
-    expect(queryByTestId("test-composer")?.dataset.submitIcon).toBe("return");
-    expect(textInput).toHaveProperty("value", "please review this change");
-    expect(textInput).toHaveProperty("disabled", true);
-    expect(queryByTestId("composer-github-attachment-pill")).not.toBeNull();
-    expect(removeButton).toHaveProperty("disabled", true);
-    expect(queryByTestId("message-input-attach-button")).toHaveProperty("disabled", true);
-    expect(queryByTestId("new-workspace-ref-picker-trigger")).toHaveProperty("disabled", true);
-    expect(queryByTestId("new-workspace-ref-picker-branch-dev")).toHaveProperty("disabled", true);
-    expect(clearDraftInputMock).not.toHaveBeenCalled();
-
-    createWorktree.reject(new Error("Create worktree failed"));
-    await flush();
-
-    expect(textInput).toHaveProperty("value", "please review this change");
-    expect(textInput).toHaveProperty("disabled", false);
-    expect(queryByTestId("composer-github-attachment-pill")).not.toBeNull();
-    expect(removeButton).toHaveProperty("disabled", false);
-    expect(queryByTestId("message-input-attach-button")).toHaveProperty("disabled", false);
-    expect(queryByTestId("new-workspace-ref-picker-trigger")).toHaveProperty("disabled", false);
-    expect(queryByTestId("new-workspace-ref-picker-branch-dev")).toHaveProperty("disabled", false);
-  });
-});
diff --git a/packages/app/src/screens/new-workspace-screen.tsx b/packages/app/src/screens/new-workspace-screen.tsx
index ee36921b7..b0f647624 100644
--- a/packages/app/src/screens/new-workspace-screen.tsx
+++ b/packages/app/src/screens/new-workspace-screen.tsx
@@ -31,6 +31,7 @@ import type { ImageAttachment, MessagePayload } from "@/components/message-input
 import type { AgentAttachment, GitHubSearchItem } from "@server/shared/messages";
 import type { AgentProvider } from "@server/server/agent/agent-sdk-types";
 import { pickerItemToCheckoutRequest, type PickerItem } from "./new-workspace-picker-item";
+import { syncPickerPrAttachment } from "./new-workspace-picker-state";
 
 interface NewWorkspaceScreenProps {
   serverId: string;
@@ -194,36 +195,6 @@ function pickerItemTriggerLabel(item: PickerItem): string {
   return item.kind === "branch" ? item.name : formatPrLabel(item.item);
 }
 
-function syncPickerPrAttachment(input: {
-  attachments: UserComposerAttachment[];
-  previousPickerPrNumber: number | null;
-  item: PickerItem;
-}): { attachments: UserComposerAttachment[]; attachedPrNumber: number | null } {
-  let nextAttachments = input.attachments;
-  let attachedPrNumber: number | null = null;
-
-  if (input.previousPickerPrNumber !== null) {
-    nextAttachments = nextAttachments.filter(
-      (attachment) =>
-        attachment.kind !== "github_pr" || attachment.item.number !== input.previousPickerPrNumber,
-    );
-  }
-
-  if (input.item.kind === "github-pr") {
-    const selectedPr = input.item.item;
-    const hasExistingPrAttachment = nextAttachments.some(
-      (attachment) =>
-        attachment.kind === "github_pr" && attachment.item.number === selectedPr.number,
-    );
-    if (!hasExistingPrAttachment) {
-      nextAttachments = [...nextAttachments, { kind: "github_pr", item: selectedPr }];
-      attachedPrNumber = selectedPr.number;
-    }
-  }
-
-  return { attachments: nextAttachments, attachedPrNumber };
-}
-
 function computePickerOptionData(
   branchDetails: ReadonlyArray<{ name: string; committerDate: number }>,
   prItems: ReadonlyArray<GitHubSearchItem>,
diff --git a/packages/app/src/screens/project-settings-screen.test.tsx b/packages/app/src/screens/project-settings-screen.test.tsx
deleted file mode 100644
index 56b71b8c0..000000000
--- a/packages/app/src/screens/project-settings-screen.test.tsx
+++ /dev/null
@@ -1,1152 +0,0 @@
-/**
- * @vitest-environment jsdom
- */
-import React, { act } from "react";
-import { createRoot, type Root } from "react-dom/client";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import type {
-  PaseoConfigRaw,
-  PaseoConfigRevision,
-  ProjectConfigRpcError,
-} from "@server/shared/messages";
-import type { ProjectHostEntry, ProjectSummary, WorkspaceSummary } from "@/utils/projects";
-import type { ProjectHostError, UseProjectsResult } from "@/hooks/use-projects";
-
-type ReadResult =
-  | { ok: true; config: PaseoConfigRaw | null; revision: PaseoConfigRevision | null }
-  | { ok: false; error: ProjectConfigRpcError };
-type WriteResult =
-  | { ok: true; config: PaseoConfigRaw; revision: PaseoConfigRevision }
-  | { ok: false; error: ProjectConfigRpcError };
-
-interface MockClient {
-  readProjectConfig: ReturnType<typeof vi.fn>;
-  writeProjectConfig: ReturnType<typeof vi.fn>;
-}
-
-const { theme, projectsState, hostState, navigate, confirmDialogMock, client } = vi.hoisted(() => {
-  const hoistedClient: MockClient = {
-    readProjectConfig: vi.fn(),
-    writeProjectConfig: vi.fn(),
-  };
-
-  return {
-    theme: {
-      spacing: { 0: 0, 1: 4, "1.5": 6, 2: 8, 3: 12, 4: 16, 5: 20, 6: 24, 8: 32 },
-      iconSize: { sm: 14, md: 18, lg: 22 },
-      fontSize: { xs: 11, sm: 13, base: 15, lg: 18 },
-      fontWeight: { normal: "400" as const, medium: "500" as const },
-      borderRadius: { sm: 4, md: 6, lg: 8, xl: 12, full: 999 },
-      borderWidth: { 1: 1 },
-      opacity: { 50: 0.5 },
-      colors: {
-        surface0: "#000",
-        surface1: "#111",
-        surface2: "#222",
-        surface3: "#333",
-        surfaceSidebarHover: "#1a1a1a",
-        foreground: "#fff",
-        foregroundMuted: "#aaa",
-        border: "#444",
-        accent: "#0a84ff",
-        accentForeground: "#fff",
-        borderAccent: "#0a84ff",
-        destructive: "#ff453a",
-        statusSuccess: "#3ecf8e",
-        palette: {
-          red: { 300: "#ff6b6b", 500: "#ff453a" },
-          green: { 400: "#3ecf8e" },
-          amber: { 500: "#fbbf24" },
-          white: "#fff",
-        },
-      },
-    },
-    projectsState: {
-      current: {
-        projects: [],
-        hostErrors: [] as ProjectHostError[],
-        isLoading: false,
-        isFetching: false,
-        refetch: vi.fn(),
-      } as UseProjectsResult,
-    },
-    hostState: {
-      onlineByServerId: new Map<string, boolean>(),
-    },
-    navigate: vi.fn(),
-    confirmDialogMock: vi.fn<(input: { title: string }) => Promise<boolean>>(),
-    client: hoistedClient,
-  };
-});
-
-vi.mock("react-native", () => {
-  const passthrough = ({
-    children,
-    testID,
-    accessibilityLabel,
-    accessibilityRole,
-    onPress,
-    disabled,
-    ...rest
-  }: {
-    children?:
-      | React.ReactNode
-      | ((state: { pressed: boolean; hovered: boolean }) => React.ReactNode);
-    testID?: string;
-    accessibilityLabel?: string;
-    accessibilityRole?: string;
-    onPress?: (event: { stopPropagation: () => void }) => void;
-    disabled?: boolean;
-  } & Record<string, unknown>) => {
-    const dataAttrs: Record<string, unknown> = {};
-    for (const [key, value] of Object.entries(rest)) {
-      if (key.startsWith("data-")) {
-        dataAttrs[key] = value;
-      }
-    }
-    return React.createElement(
-      "div",
-      {
-        role: accessibilityRole,
-        "aria-label": accessibilityLabel,
-        "data-testid": testID,
-        "data-disabled": disabled ? "true" : "false",
-        onClick: onPress
-          ? (event: React.MouseEvent) => {
-              if (disabled) return;
-              onPress({ stopPropagation: () => event.stopPropagation() });
-            }
-          : undefined,
-        ...dataAttrs,
-      },
-      typeof children === "function" ? children({ pressed: false, hovered: false }) : children,
-    );
-  };
-
-  return {
-    View: ({ children, testID }: { children?: React.ReactNode; testID?: string }) =>
-      React.createElement("div", { "data-testid": testID }, children),
-    Text: ({ children }: { children?: React.ReactNode }) =>
-      React.createElement("span", null, children),
-    Pressable: passthrough,
-    TextInput: ({
-      value,
-      onChangeText,
-      placeholder,
-      testID,
-      accessibilityLabel,
-      multiline,
-      keyboardType,
-    }: {
-      value?: string;
-      onChangeText?: (text: string) => void;
-      placeholder?: string;
-      testID?: string;
-      accessibilityLabel?: string;
-      multiline?: boolean;
-      keyboardType?: string;
-    }) =>
-      React.createElement(multiline ? "textarea" : "input", {
-        "data-testid": testID,
-        "aria-label": accessibilityLabel,
-        placeholder,
-        value: value ?? "",
-        "data-keyboard-type": keyboardType,
-        onChange: (event: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) =>
-          onChangeText?.(event.currentTarget.value),
-      }),
-    ActivityIndicator: ({ size }: { size?: string | number }) =>
-      React.createElement("span", { "data-testid": "loading-spinner", "data-size": size }),
-    Linking: { openURL: vi.fn() },
-    Platform: { OS: "web" },
-  };
-});
-
-vi.mock("react-native-unistyles", () => ({
-  StyleSheet: {
-    create: (factory: unknown) =>
-      typeof factory === "function" ? (factory as (t: typeof theme) => unknown)(theme) : factory,
-  },
-  useUnistyles: () => ({ theme }),
-}));
-
-vi.mock("lucide-react-native", () => {
-  const icon = (name: string) => {
-    const Icon = () => React.createElement("span", { "data-icon": name });
-    Icon.displayName = name;
-    return Icon;
-  };
-  return {
-    ArrowLeft: icon("ArrowLeft"),
-    ChevronDown: icon("ChevronDown"),
-    ChevronRight: icon("ChevronRight"),
-    FolderGit2: icon("FolderGit2"),
-    MoreVertical: icon("MoreVertical"),
-    Pencil: icon("Pencil"),
-    Plus: icon("Plus"),
-    Trash2: icon("Trash2"),
-    Activity: icon("Activity"),
-    Terminal: icon("Terminal"),
-    Circle: icon("Circle"),
-    X: icon("X"),
-  };
-});
-
-vi.mock("expo-router", () => ({
-  router: { navigate },
-}));
-
-vi.mock("@/hooks/use-projects", () => ({
-  useProjects: () => projectsState.current,
-}));
-
-vi.mock("@/runtime/host-runtime", () => ({
-  useHostRuntimeClient: (serverId: string | null) => {
-    if (!serverId) return null;
-    if (hostState.onlineByServerId.get(serverId) === false) return null;
-    return client;
-  },
-  useHostRuntimeIsConnected: (serverId: string | null) => {
-    if (!serverId) return false;
-    return hostState.onlineByServerId.get(serverId) ?? true;
-  },
-  useHostRuntimeSnapshot: (serverId: string | null) => {
-    if (!serverId) return null;
-    const isOnline = hostState.onlineByServerId.get(serverId) ?? true;
-    return { connectionStatus: isOnline ? "online" : "offline" };
-  },
-}));
-
-vi.mock("@/components/ui/loading-spinner", () => ({
-  LoadingSpinner: ({ size }: { size?: string | number }) =>
-    React.createElement("span", { "data-testid": "loading-spinner", "data-size": size }),
-}));
-
-vi.mock("@/components/ui/switch", () => ({
-  Switch: ({
-    value,
-    onValueChange,
-    disabled,
-    accessibilityLabel,
-    testID,
-  }: {
-    value: boolean;
-    onValueChange?: (next: boolean) => void;
-    disabled?: boolean;
-    accessibilityLabel?: string;
-    testID?: string;
-  }) =>
-    React.createElement("div", {
-      role: "switch",
-      "aria-checked": value ? "true" : "false",
-      "aria-disabled": disabled ? "true" : undefined,
-      "aria-label": accessibilityLabel,
-      "data-testid": testID,
-      onClick: (event: React.MouseEvent) => {
-        event.stopPropagation();
-        if (disabled) return;
-        onValueChange?.(!value);
-      },
-    }),
-}));
-
-vi.mock("@/components/ui/button", () => ({
-  Button: ({
-    children,
-    onPress,
-    disabled,
-    testID,
-    accessibilityLabel,
-  }: {
-    children?: React.ReactNode;
-    onPress?: () => void;
-    disabled?: boolean;
-    testID?: string;
-    accessibilityLabel?: string;
-    variant?: string;
-    size?: string;
-  }) =>
-    React.createElement(
-      "button",
-      {
-        type: "button",
-        "data-testid": testID,
-        "aria-label": accessibilityLabel,
-        disabled,
-        onClick: () => {
-          if (disabled) return;
-          onPress?.();
-        },
-      },
-      children,
-    ),
-}));
-
-vi.mock("@/components/ui/dropdown-menu", () => ({
-  DropdownMenu: ({ children }: { children?: React.ReactNode }) =>
-    React.createElement("div", { "data-testid": "dropdown-menu" }, children),
-  DropdownMenuTrigger: ({
-    children,
-    accessibilityLabel,
-    testID,
-  }: {
-    children?:
-      | React.ReactNode
-      | ((state: { pressed: boolean; hovered: boolean; open: boolean }) => React.ReactNode);
-    accessibilityLabel?: string;
-    testID?: string;
-  }) =>
-    React.createElement(
-      "button",
-      {
-        type: "button",
-        "aria-label": accessibilityLabel,
-        "data-testid": testID,
-      },
-      typeof children === "function"
-        ? children({ pressed: false, hovered: false, open: false })
-        : children,
-    ),
-  DropdownMenuContent: ({ children }: { children?: React.ReactNode }) =>
-    React.createElement("div", { "data-testid": "dropdown-menu-content" }, children),
-  DropdownMenuItem: ({
-    children,
-    onSelect,
-    testID,
-  }: {
-    children?: React.ReactNode;
-    onSelect?: () => void;
-    testID?: string;
-  }) =>
-    React.createElement(
-      "button",
-      {
-        type: "button",
-        "data-testid": testID,
-        onClick: (event: React.MouseEvent) => {
-          event.stopPropagation();
-          onSelect?.();
-        },
-      },
-      children,
-    ),
-}));
-
-vi.mock("@/components/adaptive-modal-sheet", () => ({
-  AdaptiveModalSheet: ({
-    visible,
-    title,
-    children,
-    testID,
-  }: {
-    visible: boolean;
-    title: string;
-    children?: React.ReactNode;
-    testID?: string;
-  }) => {
-    if (!visible) return null;
-    return React.createElement(
-      "div",
-      { "data-testid": testID, "data-modal-title": title },
-      children,
-    );
-  },
-}));
-
-vi.mock("@/components/ui/alert", () => ({
-  Alert: ({
-    title,
-    description,
-    children,
-    testID,
-  }: {
-    title?: string;
-    description?: React.ReactNode;
-    children?: React.ReactNode;
-    testID?: string;
-  }) =>
-    React.createElement(
-      "div",
-      { "data-testid": testID, role: "alert" },
-      React.createElement("span", { "data-testid": `${testID}-title` }, title),
-      React.createElement("span", { "data-testid": `${testID}-description` }, description),
-      children,
-    ),
-}));
-
-vi.mock("@/components/ui/status-badge", () => ({
-  StatusBadge: ({ label }: { label: string }) =>
-    React.createElement("span", { "data-testid": "status-badge" }, label),
-}));
-
-vi.mock("@/screens/settings/settings-section", () => ({
-  SettingsSection: ({
-    title,
-    children,
-    testID,
-  }: {
-    title: string;
-    children?: React.ReactNode;
-    testID?: string;
-  }) =>
-    React.createElement(
-      "section",
-      { "data-testid": testID, "data-section-title": title },
-      React.createElement("h2", null, title),
-      children,
-    ),
-}));
-
-vi.mock("@/utils/confirm-dialog", () => ({
-  confirmDialog: confirmDialogMock,
-}));
-
-vi.mock("@/contexts/toast-context", () => ({
-  useToast: () => ({ show: vi.fn(), error: vi.fn() }),
-}));
-
-import ProjectSettingsScreen from "./project-settings-screen";
-
-function workspaceSummary(overrides: Partial<WorkspaceSummary> = {}): WorkspaceSummary {
-  return {
-    id: "ws-1",
-    name: "main",
-    workspaceKind: "directory",
-    status: "done",
-    currentBranch: "main",
-    ...overrides,
-  };
-}
-
-function hostEntry(overrides: Partial<ProjectHostEntry> = {}): ProjectHostEntry {
-  return {
-    serverId: "host-a",
-    serverName: "alpha",
-    isOnline: true,
-    repoRoot: "/home/me/proj",
-    workspaceCount: 1,
-    workspaces: [workspaceSummary()],
-    ...overrides,
-  };
-}
-
-function project(overrides: Partial<ProjectSummary> = {}): ProjectSummary {
-  const hosts = overrides.hosts ?? [hostEntry()];
-  return {
-    projectKey: "remote:github.com/acme/app",
-    projectName: "acme/app",
-    hosts,
-    totalWorkspaceCount: hosts.reduce((sum, host) => sum + host.workspaceCount, 0),
-    hostCount: hosts.length,
-    onlineHostCount: hosts.filter((host) => host.isOnline).length,
-    githubUrl: "https://github.com/acme/app",
-    ...overrides,
-  };
-}
-
-function setProjectsState(overrides: Partial<UseProjectsResult>) {
-  projectsState.current = {
-    projects: [],
-    hostErrors: [],
-    isLoading: false,
-    isFetching: false,
-    refetch: vi.fn(),
-    ...overrides,
-  };
-}
-
-function readSuccess(input: {
-  config: PaseoConfigRaw | null;
-  revision: PaseoConfigRevision | null;
-}): ReadResult {
-  return { ok: true, config: input.config, revision: input.revision };
-}
-
-function readError(error: ProjectConfigRpcError): ReadResult {
-  return { ok: false, error };
-}
-
-function writeSuccess(input: {
-  config: PaseoConfigRaw;
-  revision: PaseoConfigRevision;
-}): WriteResult {
-  return { ok: true, config: input.config, revision: input.revision };
-}
-
-function writeError(error: ProjectConfigRpcError): WriteResult {
-  return { ok: false, error };
-}
-
-let root: Root | null = null;
-let container: HTMLElement | null = null;
-let queryClient: QueryClient | null = null;
-
-beforeEach(() => {
-  vi.stubGlobal("React", React);
-  vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
-  container = document.createElement("div");
-  document.body.appendChild(container);
-  root = createRoot(container);
-  queryClient = new QueryClient({ defaultOptions: { queries: { retry: false, gcTime: 0 } } });
-  hostState.onlineByServerId.clear();
-  navigate.mockReset();
-  confirmDialogMock.mockReset();
-  client.readProjectConfig.mockReset();
-  client.writeProjectConfig.mockReset();
-  setProjectsState({});
-});
-
-afterEach(() => {
-  if (root) {
-    act(() => {
-      root?.unmount();
-    });
-  }
-  queryClient?.clear();
-  root = null;
-  container?.remove();
-  container = null;
-  queryClient = null;
-  vi.unstubAllGlobals();
-});
-
-function renderScreen(projectKey: string) {
-  act(() => {
-    root?.render(
-      <QueryClientProvider client={queryClient!}>
-        <ProjectSettingsScreen projectKey={projectKey} />
-      </QueryClientProvider>,
-    );
-  });
-}
-
-async function flush() {
-  for (let i = 0; i < 5; i += 1) {
-    await act(async () => {
-      await Promise.resolve();
-      await Promise.resolve();
-      await new Promise((resolve) => setTimeout(resolve, 0));
-    });
-  }
-}
-
-function click(element: Element) {
-  act(() => {
-    element.dispatchEvent(new window.MouseEvent("click", { bubbles: true }));
-  });
-}
-
-function changeValue(element: Element, value: string) {
-  const event = new window.Event("input", { bubbles: true });
-  Object.defineProperty(event, "target", { value: { value, currentTarget: { value } } });
-  // jsdom + React: simulate via change event
-  act(() => {
-    const input = element as HTMLInputElement | HTMLTextAreaElement;
-    const setter = Object.getOwnPropertyDescriptor(
-      input.tagName === "TEXTAREA"
-        ? window.HTMLTextAreaElement.prototype
-        : window.HTMLInputElement.prototype,
-      "value",
-    )?.set;
-    setter?.call(input, value);
-    input.dispatchEvent(new window.Event("input", { bubbles: true }));
-    input.dispatchEvent(new window.Event("change", { bubbles: true }));
-  });
-}
-
-function findById(testID: string): HTMLElement | null {
-  return container?.querySelector<HTMLElement>(`[data-testid="${testID}"]`) ?? null;
-}
-
-function requireById(testID: string): HTMLElement {
-  const element = findById(testID);
-  if (!element) {
-    throw new Error(`Expected element with testID="${testID}"`);
-  }
-  return element;
-}
-
-describe("ProjectSettingsScreen — no editable target", () => {
-  it("renders the no-editable-target state for an unknown projectKey", () => {
-    setProjectsState({ projects: [project()] });
-
-    renderScreen("remote:github.com/unknown/repo");
-
-    expect(container?.textContent).toContain(
-      "We don't have an editable copy of this project on any connected host",
-    );
-    const back = requireById("project-settings-back-button");
-    expect(back.textContent).toBe("Back to projects");
-  });
-
-  it("renders no-editable-target when every host is offline", () => {
-    setProjectsState({
-      projects: [
-        project({
-          hosts: [
-            hostEntry({ serverId: "a", isOnline: false }),
-            hostEntry({ serverId: "b", isOnline: false }),
-          ],
-        }),
-      ],
-    });
-
-    renderScreen("remote:github.com/acme/app");
-
-    expect(container?.textContent).toContain(
-      "We don't have an editable copy of this project on any connected host",
-    );
-  });
-
-  it("renders no-editable-target when every host has empty repoRoot or serverId", () => {
-    setProjectsState({
-      projects: [
-        project({
-          hosts: [
-            hostEntry({ serverId: "a", repoRoot: "" }),
-            hostEntry({ serverId: " ", repoRoot: "/x" }),
-          ],
-        }),
-      ],
-    });
-
-    renderScreen("remote:github.com/acme/app");
-
-    expect(container?.textContent).toContain(
-      "We don't have an editable copy of this project on any connected host",
-    );
-  });
-
-  it("'Back to projects' navigates to /settings/projects", () => {
-    setProjectsState({ projects: [project()] });
-
-    renderScreen("remote:github.com/unknown/repo");
-
-    click(requireById("project-settings-back-button"));
-    expect(navigate).toHaveBeenCalledWith("/settings/projects");
-  });
-});
-
-describe("ProjectSettingsScreen — host selection", () => {
-  it("renders a static host indicator and no host picker when only one host exists", async () => {
-    setProjectsState({
-      projects: [
-        project({
-          hosts: [hostEntry({ serverId: "a", serverName: "alpha", repoRoot: "/path/to/alpha" })],
-        }),
-      ],
-    });
-    client.readProjectConfig.mockResolvedValue(
-      readSuccess({ config: {}, revision: { mtimeMs: 1, size: 1 } }),
-    );
-
-    renderScreen("remote:github.com/acme/app");
-    await flush();
-
-    expect(findById("host-picker")).toBeNull();
-    expect(findById("host-indicator")).not.toBeNull();
-    expect(container?.textContent).toContain("alpha");
-    expect(container?.textContent).not.toContain("/path/to/alpha");
-  });
-
-  it("renders a host picker chip when more than one host has the project", async () => {
-    setProjectsState({
-      projects: [
-        project({
-          hosts: [
-            hostEntry({ serverId: "a", serverName: "alpha", repoRoot: "/p/a" }),
-            hostEntry({ serverId: "b", serverName: "beta", repoRoot: "/p/b" }),
-          ],
-        }),
-      ],
-    });
-    client.readProjectConfig.mockResolvedValue(
-      readSuccess({ config: {}, revision: { mtimeMs: 1, size: 1 } }),
-    );
-
-    renderScreen("remote:github.com/acme/app");
-    await flush();
-
-    expect(findById("host-picker")).not.toBeNull();
-    expect(findById("host-picker-item-a")).not.toBeNull();
-    expect(findById("host-picker-item-b")).not.toBeNull();
-  });
-
-  it("refetches config for the new host when a different picker item is selected", async () => {
-    setProjectsState({
-      projects: [
-        project({
-          hosts: [
-            hostEntry({ serverId: "a", serverName: "alpha", repoRoot: "/p/a" }),
-            hostEntry({ serverId: "b", serverName: "beta", repoRoot: "/p/b" }),
-          ],
-        }),
-      ],
-    });
-    client.readProjectConfig.mockResolvedValue(
-      readSuccess({ config: {}, revision: { mtimeMs: 1, size: 1 } }),
-    );
-
-    renderScreen("remote:github.com/acme/app");
-    await flush();
-
-    const initialCallCount = client.readProjectConfig.mock.calls.length;
-    expect(client.readProjectConfig.mock.calls.some((call) => call[0] === "/p/a")).toBe(true);
-
-    click(requireById("host-picker-item-b"));
-    await flush();
-
-    expect(client.readProjectConfig.mock.calls.length).toBeGreaterThan(initialCallCount);
-    expect(client.readProjectConfig.mock.calls.some((call) => call[0] === "/p/b")).toBe(true);
-  });
-});
-
-describe("ProjectSettingsScreen — save flow", () => {
-  it("disables save when the daemon client is offline", async () => {
-    setProjectsState({
-      projects: [project({ hosts: [hostEntry({ serverId: "a", serverName: "alpha" })] })],
-    });
-    hostState.onlineByServerId.set("a", false);
-    client.readProjectConfig.mockResolvedValue(
-      readSuccess({ config: {}, revision: { mtimeMs: 1, size: 1 } }),
-    );
-
-    renderScreen("remote:github.com/acme/app");
-    await flush();
-
-    // With one host offline, the screen falls into no-editable-target.
-    expect(container?.textContent).toContain(
-      "We don't have an editable copy of this project on any connected host",
-    );
-  });
-
-  it("issues writeProjectConfig with the current config + expectedRevision and installs the response", async () => {
-    setProjectsState({
-      projects: [project({ hosts: [hostEntry({ serverId: "a", repoRoot: "/p/a" })] })],
-    });
-    const baseConfig: PaseoConfigRaw = {
-      worktree: { setup: "npm install" },
-      customTopLevel: "preserved",
-    } as unknown as PaseoConfigRaw;
-    const initialRevision: PaseoConfigRevision = { mtimeMs: 100, size: 50 };
-    const newRevision: PaseoConfigRevision = { mtimeMs: 200, size: 60 };
-
-    client.readProjectConfig.mockResolvedValue(
-      readSuccess({ config: baseConfig, revision: initialRevision }),
-    );
-    client.writeProjectConfig.mockImplementation(
-      async (input: { config: PaseoConfigRaw; expectedRevision: PaseoConfigRevision | null }) =>
-        writeSuccess({ config: input.config, revision: newRevision }),
-    );
-
-    const invalidateSpy = vi.spyOn(queryClient!, "invalidateQueries");
-
-    renderScreen("remote:github.com/acme/app");
-    await flush();
-
-    click(requireById("save-button"));
-    await flush();
-
-    expect(client.writeProjectConfig).toHaveBeenCalledTimes(1);
-    const callArg = client.writeProjectConfig.mock.calls[0][0] as {
-      repoRoot: string;
-      config: PaseoConfigRaw;
-      expectedRevision: PaseoConfigRevision | null;
-    };
-    expect(callArg.repoRoot).toBe("/p/a");
-    expect(callArg.expectedRevision).toEqual(initialRevision);
-    expect(callArg.config.worktree?.setup).toBe("npm install");
-    expect((callArg.config as Record<string, unknown>).customTopLevel).toBe("preserved");
-
-    expect(invalidateSpy).toHaveBeenCalledWith({ queryKey: ["projects"] });
-
-    // Subsequent saves use the freshly-returned revision.
-    click(requireById("save-button"));
-    await flush();
-    const secondArg = client.writeProjectConfig.mock.calls[1][0] as {
-      expectedRevision: PaseoConfigRevision;
-    };
-    expect(secondArg.expectedRevision).toEqual(newRevision);
-  });
-
-  it("renders the stale-write callout, leaves save disabled, and reload refetches", async () => {
-    setProjectsState({
-      projects: [project({ hosts: [hostEntry({ serverId: "a", repoRoot: "/p/a" })] })],
-    });
-    client.readProjectConfig.mockResolvedValue(
-      readSuccess({ config: {}, revision: { mtimeMs: 1, size: 1 } }),
-    );
-    client.writeProjectConfig.mockResolvedValue(
-      writeError({ code: "stale_project_config", currentRevision: { mtimeMs: 9, size: 9 } }),
-    );
-
-    renderScreen("remote:github.com/acme/app");
-    await flush();
-
-    click(requireById("save-button"));
-    await flush();
-
-    const callout = requireById("stale-callout");
-    expect(callout.textContent).toContain("Config changed on disk");
-
-    // Save is disabled while the callout stands.
-    const save = requireById("save-button") as HTMLButtonElement;
-    expect(save.disabled).toBe(true);
-
-    // Pressing reload triggers another readProjectConfig.
-    const initialReadCalls = client.readProjectConfig.mock.calls.length;
-    click(requireById("stale-callout-action-0"));
-    await flush();
-    expect(client.readProjectConfig.mock.calls.length).toBeGreaterThan(initialReadCalls);
-  });
-
-  it("renders the invalid_project_config callout with a Reload action", async () => {
-    setProjectsState({
-      projects: [project({ hosts: [hostEntry({ serverId: "a", repoRoot: "/p/a" })] })],
-    });
-    client.readProjectConfig.mockResolvedValue(readError({ code: "invalid_project_config" }));
-
-    renderScreen("remote:github.com/acme/app");
-    await flush();
-
-    const callout = requireById("invalid-callout");
-    expect(callout.textContent).toContain("paseo.json couldn't be parsed");
-    expect(findById("invalid-callout-action-0")?.textContent).toBe("Reload");
-  });
-
-  it("renders the write_failed callout with Try again and Reload, and Try again retries the save", async () => {
-    setProjectsState({
-      projects: [project({ hosts: [hostEntry({ serverId: "a", repoRoot: "/p/a" })] })],
-    });
-    client.readProjectConfig.mockResolvedValue(
-      readSuccess({ config: {}, revision: { mtimeMs: 1, size: 1 } }),
-    );
-    client.writeProjectConfig.mockResolvedValue(writeError({ code: "write_failed" }));
-
-    renderScreen("remote:github.com/acme/app");
-    await flush();
-
-    click(requireById("save-button"));
-    await flush();
-
-    const callout = requireById("write-failed-callout");
-    expect(callout.textContent).toContain("Couldn't save paseo.json");
-    expect(findById("write-failed-callout-action-0")?.textContent).toBe("Try again");
-    expect(findById("write-failed-callout-action-1")?.textContent).toBe("Reload");
-
-    const beforeRetry = client.writeProjectConfig.mock.calls.length;
-    click(requireById("write-failed-callout-action-0"));
-    await flush();
-    expect(client.writeProjectConfig.mock.calls.length).toBe(beforeRetry + 1);
-  });
-});
-
-describe("ProjectSettingsScreen — round-trip semantics", () => {
-  it("preserves the original lifecycle string kind on in-place edits", async () => {
-    setProjectsState({
-      projects: [project({ hosts: [hostEntry({ serverId: "a", repoRoot: "/p/a" })] })],
-    });
-    client.readProjectConfig.mockResolvedValue(
-      readSuccess({
-        config: { worktree: { setup: "npm install" } },
-        revision: { mtimeMs: 1, size: 1 },
-      }),
-    );
-    client.writeProjectConfig.mockImplementation(async (input: { config: PaseoConfigRaw }) =>
-      writeSuccess({ config: input.config, revision: { mtimeMs: 2, size: 2 } }),
-    );
-
-    renderScreen("remote:github.com/acme/app");
-    await flush();
-
-    const setupInput = requireById("worktree-setup-input");
-    changeValue(setupInput, "npm install\nnpm run prepare");
-    await flush();
-    click(requireById("save-button"));
-    await flush();
-
-    const savedConfig = client.writeProjectConfig.mock.calls[0][0]!.config as PaseoConfigRaw;
-    // string stays string when edited in place
-    expect(savedConfig.worktree?.setup).toBe("npm install\nnpm run prepare");
-  });
-
-  it("preserves the original lifecycle array kind on in-place edits", async () => {
-    setProjectsState({
-      projects: [project({ hosts: [hostEntry({ serverId: "a", repoRoot: "/p/a" })] })],
-    });
-    client.readProjectConfig.mockResolvedValue(
-      readSuccess({
-        config: { worktree: { teardown: ["docker compose down"] } },
-        revision: { mtimeMs: 1, size: 1 },
-      }),
-    );
-    client.writeProjectConfig.mockImplementation(async (input: { config: PaseoConfigRaw }) =>
-      writeSuccess({ config: input.config, revision: { mtimeMs: 2, size: 2 } }),
-    );
-
-    renderScreen("remote:github.com/acme/app");
-    await flush();
-
-    const teardownInput = requireById("worktree-teardown-input");
-    changeValue(teardownInput, "docker compose down\nrm -rf .cache");
-    await flush();
-    click(requireById("save-button"));
-    await flush();
-
-    const savedConfig = client.writeProjectConfig.mock.calls[0][0]!.config as PaseoConfigRaw;
-    expect(savedConfig.worktree?.teardown).toEqual(["docker compose down", "rm -rf .cache"]);
-  });
-
-  it("writes a single string for a newly added lifecycle field with one non-empty line", async () => {
-    setProjectsState({
-      projects: [project({ hosts: [hostEntry({ serverId: "a", repoRoot: "/p/a" })] })],
-    });
-    client.readProjectConfig.mockResolvedValue(
-      readSuccess({ config: {}, revision: { mtimeMs: 1, size: 1 } }),
-    );
-    client.writeProjectConfig.mockImplementation(async (input: { config: PaseoConfigRaw }) =>
-      writeSuccess({ config: input.config, revision: { mtimeMs: 2, size: 2 } }),
-    );
-
-    renderScreen("remote:github.com/acme/app");
-    await flush();
-
-    changeValue(requireById("worktree-setup-input"), "npm install");
-    await flush();
-    click(requireById("save-button"));
-    await flush();
-
-    const savedConfig = client.writeProjectConfig.mock.calls[0][0]!.config as PaseoConfigRaw;
-    expect(savedConfig.worktree?.setup).toBe("npm install");
-  });
-
-  it("writes an array for a newly added lifecycle field with multiple non-empty lines", async () => {
-    setProjectsState({
-      projects: [project({ hosts: [hostEntry({ serverId: "a", repoRoot: "/p/a" })] })],
-    });
-    client.readProjectConfig.mockResolvedValue(
-      readSuccess({ config: {}, revision: { mtimeMs: 1, size: 1 } }),
-    );
-    client.writeProjectConfig.mockImplementation(async (input: { config: PaseoConfigRaw }) =>
-      writeSuccess({ config: input.config, revision: { mtimeMs: 2, size: 2 } }),
-    );
-
-    renderScreen("remote:github.com/acme/app");
-    await flush();
-
-    changeValue(requireById("worktree-setup-input"), "npm install\nnpm run prepare");
-    await flush();
-    click(requireById("save-button"));
-    await flush();
-
-    const savedConfig = client.writeProjectConfig.mock.calls[0][0]!.config as PaseoConfigRaw;
-    expect(savedConfig.worktree?.setup).toEqual(["npm install", "npm run prepare"]);
-  });
-});
-
-describe("ProjectSettingsScreen — scripts editor", () => {
-  it("removes a script via confirm dialog and persists on save", async () => {
-    setProjectsState({
-      projects: [project({ hosts: [hostEntry({ serverId: "a", repoRoot: "/p/a" })] })],
-    });
-    client.readProjectConfig.mockResolvedValue(
-      readSuccess({
-        config: {
-          scripts: {
-            dev: { command: "npm run dev" },
-            build: { command: "npm run build" },
-          },
-        },
-        revision: { mtimeMs: 1, size: 1 },
-      }),
-    );
-    client.writeProjectConfig.mockImplementation(async (input: { config: PaseoConfigRaw }) =>
-      writeSuccess({ config: input.config, revision: { mtimeMs: 2, size: 2 } }),
-    );
-    confirmDialogMock.mockResolvedValue(true);
-
-    renderScreen("remote:github.com/acme/app");
-    await flush();
-
-    // Two script rows render, one per script.
-    expect(findById("scripts-list")).not.toBeNull();
-    // open kebab + select Remove on the build row by clicking the testID directly.
-    const removeButton = container?.querySelector<HTMLElement>(
-      '[data-testid^="script-row-menu-"][data-testid$="-remove"]',
-    );
-    // Find the remove menu item for "build" specifically.
-    const buildRemove = Array.from(
-      container?.querySelectorAll<HTMLElement>('[data-testid$="-remove"]') ?? [],
-    ).find((el) => el.textContent?.toLowerCase().includes("remove"));
-    expect(buildRemove ?? removeButton).not.toBeNull();
-    // For determinism we'll click the first remove menu item we find — assert there are two scripts before.
-    const beforeRows =
-      container?.querySelectorAll('[data-testid^="script-row-"]:not([data-testid*="menu"])') ?? [];
-    expect(beforeRows.length).toBe(2);
-
-    click((buildRemove ?? removeButton)!);
-    await flush();
-
-    expect(confirmDialogMock).toHaveBeenCalled();
-
-    click(requireById("save-button"));
-    await flush();
-
-    const savedConfig = client.writeProjectConfig.mock.calls[0][0]!.config as PaseoConfigRaw;
-    const scriptKeys = Object.keys((savedConfig as Record<string, unknown>).scripts ?? {});
-    // One of the two scripts was removed.
-    expect(scriptKeys.length).toBe(1);
-  });
-
-  it("preserves passthrough fields on script entries through a save round-trip", async () => {
-    setProjectsState({
-      projects: [project({ hosts: [hostEntry({ serverId: "a", repoRoot: "/p/a" })] })],
-    });
-    const base = {
-      worktree: { setup: "npm install", customWorktreeField: "keep" },
-      scripts: {
-        dev: {
-          type: "long-running",
-          command: "npm run dev",
-          port: 3000,
-          customScriptField: { nested: true },
-        },
-      },
-      customTopLevel: "preserved",
-    } as unknown as PaseoConfigRaw;
-    client.readProjectConfig.mockResolvedValue(
-      readSuccess({ config: base, revision: { mtimeMs: 1, size: 1 } }),
-    );
-    client.writeProjectConfig.mockImplementation(async (input: { config: PaseoConfigRaw }) =>
-      writeSuccess({ config: input.config, revision: { mtimeMs: 2, size: 2 } }),
-    );
-
-    renderScreen("remote:github.com/acme/app");
-    await flush();
-
-    click(requireById("save-button"));
-    await flush();
-
-    const savedConfig = client.writeProjectConfig.mock.calls[0][0]!.config as PaseoConfigRaw;
-    expect((savedConfig as Record<string, unknown>).customTopLevel).toBe("preserved");
-    const worktreeRecord = (savedConfig.worktree ?? {}) as Record<string, unknown>;
-    expect(worktreeRecord.customWorktreeField).toBe("keep");
-    const devEntry = (savedConfig.scripts ?? {}).dev as unknown as Record<string, unknown>;
-    expect(devEntry.customScriptField).toEqual({ nested: true });
-  });
-});
-
-describe("ProjectSettingsScreen — read failures keep the header and host picker visible", () => {
-  it("renders a transport-error callout when the read RPC rejects, with the host picker still mounted", async () => {
-    setProjectsState({
-      projects: [
-        project({
-          hosts: [
-            hostEntry({ serverId: "a", serverName: "alpha", repoRoot: "/p/a" }),
-            hostEntry({ serverId: "b", serverName: "beta", repoRoot: "/p/b" }),
-          ],
-        }),
-      ],
-    });
-    client.readProjectConfig.mockRejectedValue(new Error("Unknown request schema"));
-
-    renderScreen("remote:github.com/acme/app");
-    await flush();
-
-    expect(findById("read-transport-callout")).not.toBeNull();
-    expect(findById("loading-spinner")).toBeNull();
-    expect(findById("host-picker")).not.toBeNull();
-    expect(findById("host-picker-item-a")).not.toBeNull();
-    expect(findById("host-picker-item-b")).not.toBeNull();
-  });
-
-  it("renders a project-not-found callout when the daemon reports the project is missing", async () => {
-    setProjectsState({
-      projects: [project({ hosts: [hostEntry({ serverId: "a", repoRoot: "/p/a" })] })],
-    });
-    client.readProjectConfig.mockResolvedValue(readError({ code: "project_not_found" }));
-
-    renderScreen("remote:github.com/acme/app");
-    await flush();
-
-    const callout = requireById("project-not-found-callout");
-    expect(callout.textContent).toContain("This host doesn't have this project");
-    expect(findById("loading-spinner")).toBeNull();
-    expect(findById("host-indicator")).not.toBeNull();
-  });
-
-  it("Reload action on the transport callout retries the read", async () => {
-    setProjectsState({
-      projects: [project({ hosts: [hostEntry({ serverId: "a", repoRoot: "/p/a" })] })],
-    });
-    client.readProjectConfig.mockRejectedValue(new Error("timeout"));
-
-    renderScreen("remote:github.com/acme/app");
-    await flush();
-
-    const before = client.readProjectConfig.mock.calls.length;
-    click(requireById("read-transport-callout-action-0"));
-    await flush();
-    expect(client.readProjectConfig.mock.calls.length).toBeGreaterThan(before);
-  });
-
-  it("does not retry the read query on transport failure (settles fast)", async () => {
-    setProjectsState({
-      projects: [project({ hosts: [hostEntry({ serverId: "a", repoRoot: "/p/a" })] })],
-    });
-    client.readProjectConfig.mockRejectedValue(new Error("boom"));
-
-    renderScreen("remote:github.com/acme/app");
-    await flush();
-
-    // retry: false on the query → exactly one call regardless of how many flushes happen.
-    expect(client.readProjectConfig.mock.calls.length).toBe(1);
-    expect(findById("read-transport-callout")).not.toBeNull();
-  });
-});
-
-describe("ProjectSettingsScreen — copy and accessibility", () => {
-  it("does not render the word 'checkout' anywhere", async () => {
-    setProjectsState({
-      projects: [
-        project({
-          hosts: [
-            hostEntry({ serverId: "a", serverName: "alpha", repoRoot: "/p/a" }),
-            hostEntry({ serverId: "b", serverName: "beta", repoRoot: "/p/b" }),
-          ],
-        }),
-      ],
-    });
-    client.readProjectConfig.mockResolvedValue(
-      readSuccess({ config: {}, revision: { mtimeMs: 1, size: 1 } }),
-    );
-
-    renderScreen("remote:github.com/acme/app");
-    await flush();
-
-    expect(container?.innerHTML.toLowerCase()).not.toContain("checkout");
-  });
-
-  it("the host picker chip carries an accessibility label", async () => {
-    setProjectsState({
-      projects: [
-        project({
-          hosts: [
-            hostEntry({ serverId: "a", serverName: "alpha", repoRoot: "/p/a" }),
-            hostEntry({ serverId: "b", serverName: "beta", repoRoot: "/p/b" }),
-          ],
-        }),
-      ],
-    });
-    client.readProjectConfig.mockResolvedValue(
-      readSuccess({ config: {}, revision: { mtimeMs: 1, size: 1 } }),
-    );
-
-    renderScreen("remote:github.com/acme/app");
-    await flush();
-
-    const picker = requireById("host-picker");
-    expect(picker.getAttribute("aria-label")).toBe("Switch host");
-  });
-});
diff --git a/packages/app/src/screens/sessions-screen.test.tsx b/packages/app/src/screens/sessions-screen.test.tsx
deleted file mode 100644
index 9f307a3e4..000000000
--- a/packages/app/src/screens/sessions-screen.test.tsx
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
- * @vitest-environment jsdom
- */
-import React from "react";
-import { act } from "react";
-import { createRoot, type Root } from "react-dom/client";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import type { AgentHistoryResult } from "@/hooks/use-agent-history";
-import { SessionsScreen } from "@/screens/sessions-screen";
-
-const { historyResult, navigate } = vi.hoisted(() => ({
-  historyResult: {
-    current: null as AgentHistoryResult | null,
-  },
-  navigate: vi.fn(),
-}));
-
-vi.mock("react-native", () => ({
-  View: ({ children, ...props }: React.PropsWithChildren<Record<string, unknown>>) =>
-    React.createElement("div", props, children),
-  Text: ({ children, ...props }: React.PropsWithChildren<Record<string, unknown>>) =>
-    React.createElement("span", props, children),
-}));
-
-vi.mock("react-native-unistyles", () => {
-  const theme = {
-    spacing: { 4: 16, 6: 24 },
-    fontSize: { lg: 18 },
-    colors: {
-      surface0: "#111",
-      foregroundMuted: "#999",
-    },
-  };
-
-  return {
-    StyleSheet: {
-      create: (factory: unknown) => (typeof factory === "function" ? factory(theme) : factory),
-    },
-    useUnistyles: () => ({ theme }),
-  };
-});
-
-vi.mock("@react-navigation/native", () => ({
-  useIsFocused: () => true,
-}));
-
-vi.mock("expo-router", () => ({
-  router: {
-    navigate,
-  },
-}));
-
-vi.mock("lucide-react-native", () => ({
-  ChevronLeft: () => React.createElement("span", { "data-icon": "ChevronLeft" }),
-}));
-
-vi.mock("@/components/headers/menu-header", () => ({
-  MenuHeader: ({ title }: { title: string }) =>
-    React.createElement("header", { "data-testid": "menu-header" }, title),
-}));
-
-vi.mock("@/components/ui/button", () => ({
-  Button: ({ children, onPress }: React.PropsWithChildren<{ onPress?: () => void }>) =>
-    React.createElement("button", { type: "button", onClick: onPress }, children),
-}));
-
-vi.mock("@/components/ui/loading-spinner", () => ({
-  LoadingSpinner: ({ color, size }: { color: string; size?: string }) =>
-    React.createElement("div", {
-      "data-color": color,
-      "data-size": size,
-      "data-testid": "sessions-loading-spinner",
-    }),
-}));
-
-vi.mock("@/components/agent-list", () => ({
-  AgentList: ({ agents }: { agents: unknown[] }) =>
-    React.createElement("div", { "data-agent-count": agents.length, "data-testid": "agent-list" }),
-}));
-
-vi.mock("@/hooks/use-agent-history", () => ({
-  useAgentHistory: () => {
-    if (!historyResult.current) {
-      throw new Error("Expected history result");
-    }
-    return historyResult.current;
-  },
-}));
-
-vi.mock("@/utils/host-routes", () => ({
-  buildHostOpenProjectRoute: (serverId: string) => `/h/${serverId}/open-project`,
-}));
-
-function makeHistoryResult(overrides: Partial<AgentHistoryResult> = {}): AgentHistoryResult {
-  return {
-    agents: [],
-    isLoading: false,
-    isInitialLoad: false,
-    isRevalidating: false,
-    hasMore: false,
-    isLoadingMore: false,
-    refreshAll: vi.fn(),
-    loadMore: vi.fn(),
-    ...overrides,
-  };
-}
-
-describe("SessionsScreen", () => {
-  let container: HTMLElement | null = null;
-  let root: Root | null = null;
-
-  beforeEach(() => {
-    vi.stubGlobal("React", React);
-    vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
-    container = document.createElement("div");
-    document.body.appendChild(container);
-    root = createRoot(container);
-    navigate.mockReset();
-    historyResult.current = makeHistoryResult();
-  });
-
-  afterEach(() => {
-    if (root) {
-      act(() => {
-        root?.unmount();
-      });
-    }
-    root = null;
-    container?.remove();
-    container = null;
-    historyResult.current = null;
-    vi.unstubAllGlobals();
-  });
-
-  it("shows the shared loader during the initial React Query history load", () => {
-    historyResult.current = makeHistoryResult({ isInitialLoad: true, isLoading: true });
-
-    act(() => {
-      root?.render(<SessionsScreen serverId="server-1" />);
-    });
-
-    expect(container?.querySelector('[data-testid="sessions-loading-spinner"]')).not.toBeNull();
-    expect(container?.textContent).not.toContain("No sessions yet");
-    expect(container?.textContent).not.toContain("Back");
-  });
-
-  it("shows the empty state after history finishes loading with no sessions", () => {
-    historyResult.current = makeHistoryResult();
-
-    act(() => {
-      root?.render(<SessionsScreen serverId="server-1" />);
-    });
-
-    expect(container?.querySelector('[data-testid="sessions-loading-spinner"]')).toBeNull();
-    expect(container?.textContent).toContain("No sessions yet");
-    expect(container?.textContent).toContain("Back");
-  });
-});
diff --git a/packages/app/src/screens/workspace/workspace-draft-agent-tab.test.tsx b/packages/app/src/screens/workspace/workspace-draft-agent-tab.test.tsx
deleted file mode 100644
index d090e4f20..000000000
--- a/packages/app/src/screens/workspace/workspace-draft-agent-tab.test.tsx
+++ /dev/null
@@ -1,304 +0,0 @@
-/**
- * @vitest-environment jsdom
- */
-import React from "react";
-import { act } from "react";
-import { createRoot, type Root } from "react-dom/client";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import type { ComposerAttachment } from "@/attachments/types";
-import type { MessagePayload } from "@/components/message-input";
-import { useCreateFlowStore } from "@/stores/create-flow-store";
-import { useWorkspaceDraftSubmissionStore } from "@/stores/workspace-draft-submission-store";
-import type { StreamItem } from "@/types/stream";
-import { WorkspaceDraftAgentTab } from "./workspace-draft-agent-tab";
-
-const {
-  createAgentMock,
-  getCheckoutStatusMock,
-  onRuntimeEventMock,
-  latestComposerText,
-  latestComposerDisabled,
-  latestStreamText,
-  onCreatedMock,
-} = vi.hoisted(() => ({
-  createAgentMock: vi.fn(),
-  getCheckoutStatusMock: vi.fn(),
-  onRuntimeEventMock: vi.fn(() => () => {}),
-  latestComposerText: { current: null as string | null },
-  latestComposerDisabled: { current: null as boolean | null },
-  latestStreamText: { current: null as string | null },
-  onCreatedMock: vi.fn(),
-}));
-
-vi.mock("react-native-unistyles", () => ({
-  StyleSheet: {
-    create: (factory: unknown) =>
-      typeof factory === "function"
-        ? factory({
-            colors: {
-              surface0: "#000",
-              surface2: "#222",
-              destructive: "#f00",
-            },
-            spacing: { 2: 8, 3: 12, 4: 16, 6: 24 },
-            borderRadius: { md: 6 },
-            fontSize: { sm: 13 },
-          })
-        : factory,
-  },
-  useUnistyles: () => ({ rt: { breakpoint: "lg" } }),
-}));
-
-vi.mock("react-native-safe-area-context", () => ({
-  useSafeAreaInsets: () => ({ top: 0, right: 0, bottom: 0, left: 0 }),
-}));
-
-vi.mock("@/constants/platform", () => ({
-  isWeb: true,
-  isNative: false,
-}));
-
-vi.mock("@/runtime/host-runtime", () => ({
-  useHostRuntimeClient: () => ({
-    createAgent: createAgentMock,
-    getCheckoutStatus: getCheckoutStatusMock,
-    on: onRuntimeEventMock,
-  }),
-  useHostRuntimeIsConnected: () => true,
-}));
-
-vi.mock("@/stores/session-store-hooks", () => ({
-  useWorkspaceExecutionAuthority: () => ({
-    ok: true,
-    authority: {
-      workspaceId: "workspace-1",
-      workspaceDirectory: "/repo/.paseo/worktrees/workspace-1",
-    },
-  }),
-}));
-
-vi.mock("@/hooks/use-agent-input-draft", () => ({
-  useAgentInputDraft: () => {
-    const [text, setText] = React.useState("please review this change");
-    const [attachments, setAttachments] = React.useState<ComposerAttachment[]>([]);
-    return {
-      text,
-      setText,
-      attachments,
-      setAttachments,
-      cwd: "/repo/.paseo/worktrees/workspace-1",
-      clear: () => {
-        setText("");
-        setAttachments([]);
-      },
-      isHydrated: true,
-      composerState: {
-        providerDefinitions: [{ id: "codex", label: "Codex" }],
-        selectedProvider: "codex",
-        selectedMode: "",
-        modeOptions: [],
-        selectedModel: "gpt-5.4",
-        availableModels: [{ id: "gpt-5.4", label: "GPT-5.4" }],
-        allProviderModels: {},
-        isAllModelsLoading: false,
-        isModelLoading: false,
-        effectiveModelId: "gpt-5.4",
-        effectiveThinkingOptionId: "",
-        featureValues: undefined,
-        statusControls: {
-          providerDefinitions: [{ id: "codex", label: "Codex" }],
-          selectedProvider: "codex",
-          modeOptions: [],
-          selectedMode: "",
-          models: [{ id: "gpt-5.4", label: "GPT-5.4" }],
-          selectedModel: "gpt-5.4",
-          thinkingOptions: [],
-          selectedThinkingOptionId: "",
-          isModelLoading: false,
-          allProviderModels: {},
-          isAllModelsLoading: false,
-          features: [],
-        },
-        commandDraftConfig: undefined,
-        persistFormPreferences: vi.fn(),
-      },
-    };
-  },
-}));
-
-vi.mock("@/utils/encode-images", () => ({
-  encodeImages: vi.fn(async () => []),
-}));
-
-vi.mock("@/components/composer-attachments", () => ({
-  splitComposerAttachmentsForSubmit: (attachments: ComposerAttachment[]) => ({
-    images: [],
-    attachments,
-  }),
-}));
-
-vi.mock("@/attachments/composer-workspace-attachments", () => ({
-  composerWorkspaceAttachment: {
-    userAttachmentsOnly: (attachments: ComposerAttachment[]) =>
-      attachments.filter(
-        (attachment): attachment is Exclude<ComposerAttachment, { kind: "review" }> =>
-          attachment.kind !== "review",
-      ),
-  },
-}));
-
-vi.mock("@/components/composer", () => ({
-  Composer: ({
-    value,
-    isSubmitLoading,
-  }: {
-    onSubmitMessage: (payload: MessagePayload) => Promise<void>;
-    value: string;
-    isSubmitLoading?: boolean;
-  }) => {
-    latestComposerText.current = value;
-    latestComposerDisabled.current = isSubmitLoading ?? false;
-    return (
-      <textarea
-        aria-label="Message agent..."
-        data-testid="composer"
-        disabled={isSubmitLoading}
-        readOnly
-        value={value}
-      />
-    );
-  },
-}));
-
-vi.mock("@/components/agent-stream-view", () => ({
-  AgentStreamView: ({ streamItems }: { streamItems: StreamItem[] }) => {
-    latestStreamText.current =
-      streamItems.find((item) => item.kind === "user_message")?.text ?? null;
-    return <div data-testid="agent-stream-view">{latestStreamText.current}</div>;
-  },
-}));
-
-vi.mock("@/components/file-drop-zone", () => ({
-  FileDropZone: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-}));
-
-function createDeferredPromise<T>() {
-  let resolve!: (value: T | PromiseLike<T>) => void;
-  let reject!: (reason?: unknown) => void;
-  const promise = new Promise<T>((nextResolve, nextReject) => {
-    resolve = nextResolve;
-    reject = nextReject;
-  });
-  return { promise, resolve, reject };
-}
-
-let root: Root | null = null;
-let container: HTMLElement | null = null;
-let queryClient: QueryClient | null = null;
-
-beforeEach(() => {
-  vi.stubGlobal("React", React);
-  vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
-  vi.stubGlobal(
-    "ResizeObserver",
-    class ResizeObserver {
-      observe() {}
-      unobserve() {}
-      disconnect() {}
-    },
-  );
-  container = document.createElement("div");
-  document.body.appendChild(container);
-  root = createRoot(container);
-  queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } });
-  createAgentMock.mockReset();
-  getCheckoutStatusMock.mockResolvedValue({
-    cwd: "/repo/.paseo/worktrees/workspace-1",
-    error: null,
-    requestId: "checkout-status-1",
-    isGit: false,
-    isPaseoOwnedWorktree: true,
-    repoRoot: null,
-    currentBranch: null,
-    isDirty: false,
-    baseRef: null,
-    aheadBehind: null,
-    aheadOfOrigin: null,
-    behindOfOrigin: null,
-    hasRemote: false,
-    remoteUrl: null,
-  });
-  onRuntimeEventMock.mockClear();
-  onCreatedMock.mockReset();
-  latestComposerText.current = null;
-  latestComposerDisabled.current = null;
-  latestStreamText.current = null;
-  useCreateFlowStore.getState().clearAll();
-  useWorkspaceDraftSubmissionStore.setState({ pendingByDraftId: {} });
-});
-
-afterEach(() => {
-  if (root) {
-    act(() => {
-      root?.unmount();
-    });
-  }
-  queryClient?.clear();
-  root = null;
-  container?.remove();
-  container = null;
-  queryClient = null;
-});
-
-async function flush() {
-  await act(async () => {
-    await Promise.resolve();
-    await Promise.resolve();
-    await new Promise((resolve) => setTimeout(resolve, 0));
-  });
-}
-
-function renderDraftTab() {
-  act(() => {
-    root?.render(
-      <QueryClientProvider client={queryClient!}>
-        <WorkspaceDraftAgentTab
-          serverId="server"
-          workspaceId="workspace-1"
-          tabId="draft-1"
-          draftId="draft-1"
-          isPaneFocused={true}
-          onCreated={onCreatedMock}
-          onOpenWorkspaceFile={vi.fn()}
-        />
-      </QueryClientProvider>,
-    );
-  });
-}
-
-describe("WorkspaceDraftAgentTab", () => {
-  it("clears the composer while an auto-submitted new-workspace prompt is shown in the stream", async () => {
-    const createAgent = createDeferredPromise<{ id: string }>();
-    createAgentMock.mockImplementationOnce(async () => await createAgent.promise);
-    useWorkspaceDraftSubmissionStore.getState().setPending({
-      serverId: "server",
-      workspaceId: "workspace-1",
-      draftId: "draft-1",
-      text: "please review this change",
-      attachments: [],
-      cwd: "/repo/.paseo/worktrees/workspace-1",
-      provider: "codex",
-      model: "gpt-5.4",
-      allowEmptyText: true,
-    });
-
-    renderDraftTab();
-    await flush();
-
-    expect(createAgentMock).toHaveBeenCalledTimes(1);
-    expect(latestStreamText.current).toBe("please review this change");
-    expect(latestComposerDisabled.current).toBe(true);
-    expect(latestComposerText.current).toBe("");
-  });
-});