fix(clients): new threads prefer a connected copy of the project

apps/mobile/src/features/home/HomeRouteScreen.tsx

@@ -71,6 +71,7 @@ export function HomeRouteScreen() {
         params: {
           environmentId: String(thread.environmentId),
           projectId: String(thread.projectId),
+          environmentSelection: "manual",
           branch: thread.branch,
           worktreePath: thread.worktreePath,
         },

apps/mobile/src/features/keyboard/CommandPalette.tsx

@@ -311,6 +311,7 @@ export function CommandPalette(props: {
         navigation.navigate("NewTaskSheet", {
           screen: "NewTaskDraft",
           params: {
+            environmentSelection: "manual",
             environmentId: project.environmentId,
             projectId: project.id,
             title: project.title,

apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx

@@ -424,6 +424,7 @@ function AdaptiveWorkspaceLayoutContent(
       params: {
         environmentId: String(thread.environmentId),
         projectId: String(thread.projectId),
+        environmentSelection: "manual",
         branch: thread.branch,
         worktreePath: thread.worktreePath,
       },

apps/mobile/src/features/projects/AddProjectScreen.tsx

@@ -670,7 +670,10 @@ function openNewTaskDraft(
   },
 ) {
   navigation.dispatch(
-    CommonActions.reset({ index: 0, routes: [{ name: "NewTaskDraft", params }] }),
+    CommonActions.reset({
+      index: 0,
+      routes: [{ name: "NewTaskDraft", params: { ...params, environmentSelection: "manual" } }],
+    }),
   );
 }
 
@@ -717,6 +720,7 @@ function useCreateProject(environment: EnvironmentOption | null) {
             {
               name: "NewTaskDraft",
               params: {
+                environmentSelection: "manual",
                 environmentId: existing.environmentId,
                 projectId: existing.id,
                 title: existing.title,
@@ -748,6 +752,7 @@ function useCreateProject(environment: EnvironmentOption | null) {
           {
             name: "NewTaskDraft",
             params: {
+              environmentSelection: "manual",
               environmentId: environment.environmentId,
               projectId,
               title: inferProjectTitleFromPath(workspaceRoot),

apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.test.tsx

@@ -20,6 +20,7 @@ vi.mock("../../state/session", () => ({
   readEnvironmentScope: () => true,
   useEnvironmentsWithScope: () => new Set(["local"]),
 }));
+vi.mock("../../state/environments", () => ({ useEnvironments: () => ({ environments: [] }) }));
 vi.mock("../../state/server", () => ({ serverEnvironment: { updateSettings: {} } }));
 vi.mock("../../state/use-atom-command", () => ({
   useAtomCommand: () => mocks.updateSettings,

apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.tsx

@@ -18,6 +18,7 @@ import { View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 import { RUNTIME_MODE_CHOICES } from "../threads/thread-settings-options";
+import { useEnvironments } from "../../state/environments";
 import { serverEnvironment } from "../../state/server";
 import { useAtomCommand } from "../../state/use-atom-command";
 import { SettingsScreen } from "./components/SettingsScreen";
@@ -51,7 +52,12 @@ const PAGE_TITLES: Record<SettingsPage, string> = {
 };
 
 const PAGE_PROJECT_KEYS: Record<SettingsPage, readonly ProjectScopedServerSettingKey[]> = {
-  "new-threads": ["defaultThreadEnvMode", "worktreeSubmodules", "defaultRuntimeMode"],
+  "new-threads": [
+    "defaultEnvironmentId",
+    "defaultThreadEnvMode",
+    "worktreeSubmodules",
+    "defaultRuntimeMode",
+  ],
   "source-control": [
     "defaultAutoPull",
     "removeAgentCreditsOnMerge",
@@ -142,7 +148,23 @@ function ServerSettingsDetail(props: { readonly page: SettingsPage }) {
   const insets = useSafeAreaInsets();
   const navigation = useNavigation();
   const { selectedTargets, projectGroups, selectedProjectKey } = useSettingsEnvironmentFilter();
+  const { environments } = useEnvironments();
   const selectedProject = projectGroups.find((group) => group.key === selectedProjectKey);
+  const projectEnvironments = selectedProject
+    ? [
+        ...new Map(
+          selectedProject.members.map(({ project }) => [
+            project.environmentId,
+            {
+              environmentId: project.environmentId,
+              label:
+                environments.find((target) => target.environmentId === project.environmentId)
+                  ?.label ?? project.environmentId,
+            },
+          ]),
+        ).values(),
+      ]
+    : [];
   const writableEnvironments = useEnvironmentsWithScope(selectedTargets, AuthSettingsWriteScope);
   const projectSelected = selectedProjectKey !== null;
   const targets = resolveMobileSettingsTargets(
@@ -293,6 +315,42 @@ function ServerSettingsDetail(props: { readonly page: SettingsPage }) {
               ) : null}
               {props.page === "new-threads" ? (
                 <>
+                  {projectEnvironments.length > 1 ? (
+                    <SettingsSection
+                      title="Default environment"
+                      trailing={
+                        pendingWrites === 0 && isMixed("defaultEnvironmentId") ? (
+                          <MixedValuesLabel projectSelected={projectSelected} />
+                        ) : null
+                      }
+                    >
+                      <SettingsChoiceRow
+                        separated={false}
+                        label="Automatic"
+                        description="Use the current environment or automatic routing."
+                        selected={
+                          !isMixed("defaultEnvironmentId") &&
+                          uniform("defaultEnvironmentId") === null
+                        }
+                        disabled={disabledFor("defaultEnvironmentId")}
+                        onPress={() => write({ defaultEnvironmentId: null })}
+                      />
+                      {projectEnvironments.map((environment) => (
+                        <SettingsChoiceRow
+                          key={environment.environmentId}
+                          label={environment.label}
+                          description="Start new threads here when connected."
+                          selected={
+                            !isMixed("defaultEnvironmentId") &&
+                            uniform("defaultEnvironmentId") === environment.environmentId
+                          }
+                          separated
+                          disabled={disabledFor("defaultEnvironmentId")}
+                          onPress={() => write({ defaultEnvironmentId: environment.environmentId })}
+                        />
+                      ))}
+                    </SettingsSection>
+                  ) : null}
                   <SettingsSection
                     title="Default workspace"
                     trailing={

apps/mobile/src/features/threads/NewTaskDraftRouteScreen.tsx

@@ -19,6 +19,7 @@ import { NewTaskDraftScreen } from "./NewTaskDraftScreen";
 type NewTaskDraftRouteParams = {
   readonly environmentId?: string | string[];
   readonly projectId?: string | string[];
+  readonly environmentSelection?: "manual";
   readonly branch?: string | null;
   readonly worktreePath?: string | null;
   readonly title?: string | string[];
@@ -45,6 +46,7 @@ export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraf
         ? params.environmentId[0]
         : params.environmentId,
       projectId: Array.isArray(params.projectId) ? params.projectId[0] : params.projectId,
+      environmentSelection: params.environmentSelection,
       branch: params.branch,
       worktreePath: params.worktreePath,
       cloning: (Array.isArray(params.cloning) ? params.cloning[0] : params.cloning) === "1",

apps/mobile/src/features/threads/NewTaskDraftScreen.tsx

@@ -128,6 +128,7 @@ import {
   useHardwareKeyboardCommand,
 } from "../keyboard/hardwareKeyboardCommands";
 import { resolveProjectThreadCreationBranch } from "./projectThreadCreationValidation";
+import { useNewTaskProjectTarget } from "./use-new-task-project-target";
 import { resolveDraftProjectSelection } from "./new-task-project-selection";
 import {
   resolveNewTaskBranchLabel,
@@ -187,6 +188,7 @@ function NewTaskWorkspaceIcon(props: {
 
 export function NewTaskDraftScreen(props: {
   readonly initialProjectRef?: {
+    readonly environmentSelection?: "manual";
     readonly environmentId?: string;
     readonly projectId?: string;
     readonly branch?: string | null;
@@ -198,6 +200,7 @@ export function NewTaskDraftScreen(props: {
   readonly incomingShareId?: string;
 }) {
   const projects = useProjects();
+  const resolveProjectTarget = useNewTaskProjectTarget();
   const flow = useNewTaskFlow();
   const navigation = useNavigation();
   const {
@@ -643,15 +646,33 @@ export function NewTaskDraftScreen(props: {
       lastInitialProjectRefRef.current = props.initialProjectRef;
       appliedInitialProjectKeyRef.current = null;
     }
+    if (
+      appliedInitialProjectKeyRef.current !== null &&
+      projects.some(
+        (project) =>
+          `${project.environmentId}:${project.id}` === appliedInitialProjectKeyRef.current,
+      )
+    ) {
+      return;
+    }
     const initialEnvironmentId = props.initialProjectRef?.environmentId;
     const initialProjectId = props.initialProjectRef?.projectId;
     if (initialEnvironmentId && initialProjectId) {
-      const directProject =
+      const requestedProject =
         projects.find(
           (project) =>
             project.environmentId === initialEnvironmentId && project.id === initialProjectId,
         ) ?? null;
 
+      const directProject =
+        requestedProject &&
+        props.initialProjectRef?.environmentSelection !== "manual" &&
+        !props.initialProjectRef?.branch &&
+        !props.initialProjectRef?.worktreePath &&
+        !props.initialProjectRef?.cloning &&
+        !props.incomingShareId
+          ? resolveProjectTarget(requestedProject)
+          : requestedProject;
       if (directProject) {
         // Apply the route's project once. Re-applying on every change would
         // instantly revert environment/project switches made in the picker.
@@ -664,7 +685,7 @@ export function NewTaskDraftScreen(props: {
             selectedProject?.environmentId !== directProject.environmentId ||
             selectedProject.id !== directProject.id
           ) {
-            setProject(directProject);
+            setProject(directProject, { environmentSelection: "manual" });
             return;
           }
           if (!flow.draftKey) return;
@@ -680,13 +701,22 @@ export function NewTaskDraftScreen(props: {
           });
         }
         appliedInitialProjectKeyRef.current = directProjectKey;
+        const manual =
+          props.initialProjectRef?.environmentSelection === "manual" ||
+          Boolean(
+            props.initialProjectRef?.branch ||
+            props.initialProjectRef?.worktreePath ||
+            props.initialProjectRef?.cloning ||
+            props.incomingShareId,
+          );
         if (
+          !manual &&
           selectedProject?.environmentId === directProject.environmentId &&
           selectedProject.id === directProject.id
         ) {
           return;
         }
-        setProject(directProject);
+        setProject(directProject, manual ? { environmentSelection: "manual" } : undefined);
         return;
       }
 
@@ -701,14 +731,15 @@ export function NewTaskDraftScreen(props: {
       return;
     }
     if (selection.kind === "select") {
-      setProject(selection.project);
+      setProject(resolveProjectTarget(selection.project));
       return;
     }
 
     navigation.dispatch(StackActions.replace("NewTask"));
   }, [
     projectScopes,
     projects,
+    resolveProjectTarget,
     flow.draftKey,
     props.initialProjectRef,
     props.incomingShareId,

apps/mobile/src/features/threads/NewTaskRouteScreen.tsx

@@ -34,6 +34,7 @@ import { useWorkspaceState } from "../../state/workspace";
 import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout";
 import { usePromptLinkResolver } from "../prompt-links/usePromptLinkResolver";
 import { useIncomingShare } from "../sharing/IncomingShareProvider";
+import { useNewTaskProjectTarget } from "./use-new-task-project-target";
 import { useNewTaskFlow } from "./new-task-flow-provider";
 import { filterProjectScopes, getProjectScopeSelectionTarget } from "./new-task-project-selection";
 
@@ -144,8 +145,9 @@ function NewTaskHeader(props: {
 
 export function NewTaskRouteScreen({ route }: StaticScreenProps<NewTaskRouteParams | undefined>) {
   const projects = useProjects();
+  const resolveProjectTarget = useNewTaskProjectTarget();
   const [searchText, setSearchText] = useState("");
-  const { projectScopes, selectedEnvironmentId, setProject } = useNewTaskFlow();
+  const { projectScopes, selectedEnvironmentId, manualProjectRef, setProject } = useNewTaskFlow();
   const { state: catalogState } = useWorkspaceState();
   const navigation = useNavigation();
   const isFocused = useIsFocused();
@@ -451,9 +453,9 @@ export function NewTaskRouteScreen({ route }: StaticScreenProps<NewTaskRoutePara
             >
               {visibleScopes.map((scope, scopeIndex) => {
                 const hasMultipleProjects = scope.projects.length > 1;
-                const selectionTarget = getProjectScopeSelectionTarget(
-                  scope,
-                  selectedEnvironmentId,
+                const selectionTarget = resolveProjectTarget(
+                  getProjectScopeSelectionTarget(scope, selectedEnvironmentId),
+                  { manualProjectRef },
                 );
                 if (Platform.OS === "android") {
                   return (