fix(clients): scheduled task editors no longer default to a missing main branch

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

@@ -8,9 +8,11 @@ import { resolveProviderOptionDescriptors } from "../../lib/providerOptions";
 import { useEnvironmentServerConfig, useProjects } from "../../state/entities";
 import { useDebouncedValue, usePaginatedBranches } from "../../state/queries";
 import { BranchPickerScreen } from "../threads/NewTaskContextPickerScreens";
+import { filterNewTaskBranches } from "../threads/new-task-context-presentation";
 import { ThreadSettingsPickerScreen } from "../threads/ThreadSettingsSheet";
 import { SettingsScreen } from "./components/SettingsScreen";
 import { useScheduledTaskEditor } from "./scheduled-task-editor";
+import { useScheduledTaskBaseRef } from "./useScheduledTaskBaseRef";
 
 function MissingTaskDraft() {
   return (
@@ -114,9 +116,13 @@ export function ScheduledTaskBranchPickerRouteScreen() {
     cwd: project?.workspaceRoot ?? null,
     query: debouncedQuery,
   });
-  const visibleBranches = branches.refs.filter(
-    (branch) => !branch.isRemote && branch.name.toLowerCase().includes(query.trim().toLowerCase()),
-  );
+  const { baseRef, pending: baseRefPending } = useScheduledTaskBaseRef({
+    environmentId: editor?.environmentId ?? null,
+    cwd: project?.workspaceRoot ?? null,
+    chosen: editor?.draft.baseRef ?? "",
+    worktree: editor?.draft.workspace === "worktree",
+  });
+  const visibleBranches = filterNewTaskBranches(branches.refs, query);
 
   if (!editor) return <MissingTaskDraft />;
 
@@ -125,11 +131,21 @@ export function ScheduledTaskBranchPickerRouteScreen() {
       title="Base branch"
       project={project}
       branches={visibleBranches}
-      selectedBranchName={editor.draft.baseRef}
+      selectedBranchName={
+        visibleBranches.find(
+          (branch) =>
+            branch.name === baseRef ||
+            (editor.draft.startFromOrigin &&
+              branch.isRemote &&
+              branch.name === `origin/${baseRef}`),
+        )?.name ?? baseRef
+      }
       query={query}
       onQueryChange={setQuery}
       loading={
-        query.trim() !== debouncedQuery.trim() || (branches.isPending && branches.data === null)
+        baseRefPending ||
+        query.trim() !== debouncedQuery.trim() ||
+        (branches.isPending && branches.data === null)
       }
       error={project ? branches.error : "This project is no longer available."}
       refreshing={branches.isFetchingNextPage}

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

@@ -57,6 +57,7 @@ import { withNativeGlassHeaderItem } from "../layout/native-glass-header-items";
 import { resolveNewTaskBranchLabel } from "../threads/new-task-context-presentation";
 import { useVoiceInputController } from "../voice-input/useVoiceInputController";
 import { ScheduledTaskPromptField } from "./components/ScheduledTaskPromptField";
+import { useScheduledTaskBaseRef } from "./useScheduledTaskBaseRef";
 import {
   AndroidSettingsEnvironmentFilter,
   SettingsEnvironmentFilterHeader,
@@ -574,6 +575,12 @@ function TaskForm({
     serverEnvironment.scheduledTasksLive({ environmentId, input: {} }),
   );
   const projects = useProjects().filter((project) => project.environmentId === environmentId);
+  const { baseRef, pending: baseRefPending } = useScheduledTaskBaseRef({
+    environmentId,
+    cwd: projects.find((project) => project.id === draft.projectId)?.workspaceRoot ?? null,
+    chosen: draft.baseRef,
+    worktree: draft.workspace === "worktree",
+  });
   const config = useEnvironmentServerConfig(environmentId);
   const modelOptions = buildModelOptions(config, null, undefined, draft.projectId);
   const canOperate = useAtomValue(
@@ -606,7 +613,8 @@ function TaskForm({
       saving ||
       dictationPending ||
       taskMissing ||
-      environmentUnavailable
+      environmentUnavailable ||
+      baseRefPending
     )
       return;
     // Signatures are edited on desktop and web; send the task's current one,
@@ -661,7 +669,7 @@ function TaskForm({
             ? { type: "existing_worktree", worktreePath: draft.checkoutPath.trim() }
             : {
                 type: "worktree",
-                baseRef: draft.baseRef.trim() || "main",
+                baseRef: baseRef.trim() || "main",
                 startFromOrigin: draft.startFromOrigin,
               },
       runtimeMode: draft.runtimeMode,
@@ -825,7 +833,7 @@ function TaskForm({
             <PickerRow
               label="Base branch"
               value={resolveNewTaskBranchLabel({
-                branchName: draft.baseRef,
+                branchName: baseRef,
                 startFromOrigin: draft.startFromOrigin,
                 workspaceMode: "worktree",
               })}
@@ -1009,7 +1017,9 @@ function TaskForm({
         tone="primary"
         fullWidth
         loading={saving}
-        disabled={!canOperate || dictationPending || taskMissing || environmentUnavailable}
+        disabled={
+          !canOperate || dictationPending || taskMissing || environmentUnavailable || baseRefPending
+        }
         onPress={() => void save()}
         label={saving ? "Saving…" : draft.task ? "Save changes" : "Create task"}
       />

apps/mobile/src/features/settings/scheduledTaskDraft.test.ts

@@ -245,6 +245,7 @@ describe("editing scheduled task branch settings", () => {
     const draft = editDraft(legacyTask);
     expect(draft.baseRef).toBe("release");
     expect(draft.startFromOrigin).toBe(false);
+    expect(editDraft({ ...legacyTask, workspaceStrategy: { type: "root" } }).baseRef).toBe("");
   });
 
   it.each([true, false])("preserves an explicit origin flag of %s", (startFromOrigin) => {
@@ -256,8 +257,10 @@ describe("editing scheduled task branch settings", () => {
   });
 });
 
-it("continues to default newly created tasks to origin", () => {
-  expect(createDraft(null, null).startFromOrigin).toBe(true);
+it("leaves a new task's base branch automatic while defaulting to origin", () => {
+  const draft = createDraft(null, null);
+  expect(draft.baseRef).toBe("");
+  expect(draft.startFromOrigin).toBe(true);
 });
 
 describe("scheduled task model defaults", () => {

apps/mobile/src/features/settings/scheduledTaskDraft.ts

@@ -189,7 +189,7 @@ export function createDraft(
     modelSelectionIsExplicit: false,
     schedule: DEFAULT_SCHEDULE,
     workspace: "worktree",
-    baseRef: "main",
+    baseRef: "",
     checkoutPath: "",
     enabled: true,
     startFromOrigin: true,
@@ -207,7 +207,7 @@ export function editDraft(task: ScheduledTask): ScheduledTaskDraft {
     modelSelectionIsExplicit: true,
     schedule: scheduleDraftForTask(task),
     workspace: task.workspaceStrategy.type,
-    baseRef: task.workspaceStrategy.type === "worktree" ? task.workspaceStrategy.baseRef : "main",
+    baseRef: task.workspaceStrategy.type === "worktree" ? task.workspaceStrategy.baseRef : "",
     checkoutPath:
       task.workspaceStrategy.type === "existing_worktree"
         ? task.workspaceStrategy.worktreePath

apps/mobile/src/features/settings/useScheduledTaskBaseRef.ts

@@ -0,0 +1,19 @@
+import { useAtomValue } from "@effect/atom-react";
+import type { EnvironmentId } from "@t3tools/contracts";
+
+import { scheduledTaskBaseRefAtom } from "../../state/vcs";
+
+export function useScheduledTaskBaseRef(input: {
+  readonly environmentId: EnvironmentId | null;
+  readonly cwd: string | null;
+  readonly chosen: string;
+  readonly worktree: boolean;
+}) {
+  const autoBaseRef = useAtomValue(
+    scheduledTaskBaseRefAtom({
+      environmentId: input.environmentId,
+      cwd: input.worktree && !input.chosen ? input.cwd : null,
+    }),
+  );
+  return { baseRef: input.chosen || autoBaseRef.baseRef, pending: autoBaseRef.pending };
+}

apps/mobile/src/state/vcs.ts

@@ -1,3 +1,4 @@
+import { createScheduledTaskBaseRefAtomFamily } from "@t3tools/client-runtime/scheduled-task-base-ref";
 import {
   createVcsActionManager,
   createVcsEnvironmentAtoms,
@@ -7,3 +8,7 @@ import { connectionAtomRuntime } from "../connection/runtime";
 
 export const vcsEnvironment = createVcsEnvironmentAtoms(connectionAtomRuntime);
 export const vcsActionManager = createVcsActionManager(connectionAtomRuntime);
+
+export const scheduledTaskBaseRefAtom = createScheduledTaskBaseRefAtomFamily(
+  vcsEnvironment.listRefs,
+);

apps/web/src/components/settings/ScheduledTasksSettings.tsx

@@ -63,6 +63,7 @@ import { formatEnvironmentQueryError, useEnvironmentQuery } from "../../state/qu
 import { EMPTY_SERVER_PROVIDERS, serverEnvironment } from "../../state/server";
 import { useAtomCommand } from "../../state/use-atom-command";
 import { WorktreeBaseBranchPicker } from "../WorktreeBaseBranchPicker";
+import { scheduledTaskBaseRefAtom } from "../../state/vcs";
 import { EnvironmentMachineIcon } from "../EnvironmentMachineIcon";
 import { ConnectionStatusDot, connectionPhaseDotClassName } from "../ConnectionStatusDot";
 import { AuthOrchestrationOperateScope } from "@t3tools/contracts";
@@ -133,7 +134,7 @@ const EMPTY_DRAFT: DraftState = {
   projectId: "",
   threadId: "",
   workspaceMode: "worktree",
-  baseRef: "main",
+  baseRef: "",
   startFromOrigin: true,
   existingWorktreePath: "",
   modelKey: "",
@@ -1014,6 +1015,15 @@ function ScheduledTaskEditorForm({
     : task;
   const selectedProjectId = draft.projectId || projects[0]?.id || "";
   const selectedProject = projects.find((project) => project.id === selectedProjectId);
+  const autoBaseRefCwd =
+    draft.workspaceMode === "worktree" && !draft.baseRef
+      ? (selectedProject?.workspaceRoot ?? null)
+      : null;
+  const autoBaseRef = useAtomValue(
+    scheduledTaskBaseRefAtom({ environmentId, cwd: autoBaseRefCwd }),
+  );
+  const baseRef = draft.baseRef || autoBaseRef.baseRef;
+  const baseRefPending = autoBaseRef.pending;
   const instanceEntries = sortProviderInstanceEntries(
     applyProviderInstanceSettings(
       deriveProviderInstanceEntries(providers),
@@ -1056,7 +1066,8 @@ function ScheduledTaskEditorForm({
       saving ||
       editingTaskMissing ||
       !connected ||
-      tasksQuery.data === null
+      tasksQuery.data === null ||
+      baseRefPending
     )
       return;
     const selection = activeSelection;
@@ -1111,7 +1122,7 @@ function ScheduledTaskEditorForm({
           ? { type: "existing_worktree", worktreePath: draft.existingWorktreePath.trim() }
           : {
               type: "worktree",
-              baseRef: draft.baseRef.trim() || "main",
+              baseRef: baseRef.trim() || "main",
               startFromOrigin: draft.startFromOrigin,
             };
     const input: ScheduledTaskUpsertInput = {
@@ -1170,7 +1181,7 @@ function ScheduledTaskEditorForm({
                   projectId: "",
                   modelKey: "",
                   baseModelSelection: null,
-                  baseRef: "main",
+                  baseRef: "",
                   startFromOrigin: true,
                   existingWorktreePath: "",
                 }));
@@ -1297,7 +1308,7 @@ function ScheduledTaskEditorForm({
                 id="scheduled-task-base-ref"
                 environmentId={environmentId}
                 cwd={selectedProject?.workspaceRoot ?? null}
-                value={draft.baseRef}
+                value={baseRef}
                 onValueChange={(baseRef) => setDraft((current) => ({ ...current, baseRef }))}
                 startFromOrigin={draft.startFromOrigin}
                 onStartFromOriginChange={(startFromOrigin) =>
@@ -1581,7 +1592,14 @@ function ScheduledTaskEditorForm({
         </DialogClose>
         <Button
           size="sm"
-          disabled={!canOperate || saving || editingTaskMissing || !connected || !tasksQuery.data}
+          disabled={
+            !canOperate ||
+            saving ||
+            editingTaskMissing ||
+            !connected ||
+            !tasksQuery.data ||
+            baseRefPending
+          }
           onClick={() => void submit()}
         >
           {draft.editingId ? "Save task" : "Create task"}

apps/web/src/components/settings/scheduledTasksSettings.logic.test.ts

@@ -8,6 +8,7 @@ import {
   type ScheduledTask,
 } from "@t3tools/contracts";
 import { describe, expect, it } from "vite-plus/test";
+import { defaultWorktreeBaseRef } from "@t3tools/client-runtime/scheduled-task-base-ref";
 
 import type {
   SidebarProjectGroupMember,
@@ -151,11 +152,31 @@ const legacyTask: ScheduledTask = {
   runCount: 0,
 };
 
+describe("scheduled task automatic base branch", () => {
+  const current = { name: "feature", current: true, isDefault: false };
+  const defaultRef = { name: "develop", current: false, isDefault: true };
+
+  it("prefers an existing main over the repository default and current branch", () => {
+    for (const name of ["main", "origin/main"]) {
+      expect(
+        defaultWorktreeBaseRef([current, defaultRef, { name, current: false, isDefault: false }]),
+      ).toBe("main");
+    }
+  });
+
+  it("uses the repository default, then current branch, without inventing main", () => {
+    expect(defaultWorktreeBaseRef([current, defaultRef])).toBe("develop");
+    expect(defaultWorktreeBaseRef([current])).toBe("feature");
+    expect(defaultWorktreeBaseRef([])).toBe("");
+  });
+});
+
 describe("editing scheduled task branch settings", () => {
   it("keeps an omitted origin flag on the local base branch", () => {
     const draft = taskToDraft(legacyTask);
     expect(draft.baseRef).toBe("release");
     expect(draft.startFromOrigin).toBe(false);
+    expect(taskToDraft({ ...legacyTask, workspaceStrategy: { type: "root" } }).baseRef).toBe("");
   });
 
   it.each([true, false])("preserves an explicit origin flag of %s", (startFromOrigin) => {

apps/web/src/components/settings/scheduledTasksSettings.logic.ts

@@ -135,7 +135,7 @@ export function taskToDraft(task: ScheduledTask): DraftState {
     projectId: task.projectId,
     threadId: task.threadId ?? "",
     workspaceMode: task.workspaceStrategy.type,
-    baseRef: task.workspaceStrategy.type === "worktree" ? task.workspaceStrategy.baseRef : "main",
+    baseRef: task.workspaceStrategy.type === "worktree" ? task.workspaceStrategy.baseRef : "",
     startFromOrigin:
       task.workspaceStrategy.type === "worktree"
         ? (task.workspaceStrategy.startFromOrigin ?? false)

apps/web/src/state/vcs.ts

@@ -1,3 +1,4 @@
+import { createScheduledTaskBaseRefAtomFamily } from "@t3tools/client-runtime/scheduled-task-base-ref";
 import {
   createVcsActionManager,
   createVcsEnvironmentAtoms,
@@ -7,3 +8,7 @@ import { connectionAtomRuntime } from "../connection/runtime";
 
 export const vcsEnvironment = createVcsEnvironmentAtoms(connectionAtomRuntime);
 export const vcsActionManager = createVcsActionManager(connectionAtomRuntime);
+
+export const scheduledTaskBaseRefAtom = createScheduledTaskBaseRefAtomFamily(
+  vcsEnvironment.listRefs,
+);

packages/client-runtime/package.json

@@ -51,6 +51,10 @@
       "types": "./src/secretRequest.ts",
       "default": "./src/secretRequest.ts"
     },
+    "./scheduled-task-base-ref": {
+      "types": "./src/scheduledTaskBaseRef.ts",
+      "default": "./src/scheduledTaskBaseRef.ts"
+    },
     "./scheduled-task-webhook": {
       "types": "./src/scheduledTaskWebhook.ts",
       "default": "./src/scheduledTaskWebhook.ts"