diff --git a/apps/mobile/src/features/settings/ScheduledTaskPickerScreens.tsx b/apps/mobile/src/features/settings/ScheduledTaskPickerScreens.tsx index d37c8c68a81f1..f07ffea096ec8 100644 --- a/apps/mobile/src/features/settings/ScheduledTaskPickerScreens.tsx +++ b/apps/mobile/src/features/settings/ScheduledTaskPickerScreens.tsx @@ -2,6 +2,7 @@ import { msg, T, useGT, useMessages } from "gt-react-native"; import { NativeScrollView } from "../../native/NativeScrollViewMarker"; import { LegendList } from "@legendapp/list/react-native"; import { useNavigation } from "@react-navigation/native"; +import { scheduledTaskWorktreeBaseRef } from "@t3tools/client-runtime/scheduled-task-worktree"; import { isListedThreadLineage } from "@t3tools/contracts"; import * as Haptics from "expo-haptics"; import { useMemo, useState } from "react"; @@ -153,7 +154,11 @@ export function ScheduledTaskBranchPickerRouteScreen() { title={gt("Base branch")} project={project} branches={visibleBranches} - selectedBranchName={editor.draft.baseRef} + selectedBranchName={ + editor.draft.baseRef.trim() || debouncedQuery.trim() || branches.data === null + ? editor.draft.baseRef + : scheduledTaskWorktreeBaseRef("", branches.refs) + } query={query} onQueryChange={setQuery} loading={ diff --git a/apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.test.tsx b/apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.test.tsx index b92c1ec725b47..f0f28492a2a41 100644 --- a/apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.test.tsx +++ b/apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.test.tsx @@ -132,6 +132,9 @@ vi.mock("../../state/query", () => ({ useEnvironmentQuery: () => ({ data: { tasks: mocks.tasks, threads: [] } }), })); vi.mock("../../state/use-atom-command", () => ({ useAtomCommand: () => mocks.upsert })); +vi.mock("../../state/queries", () => ({ + usePaginatedBranches: () => ({ refs: [], data: null, error: null }), +})); import { appAtomRegistry } from "../../state/atom-registry"; import { editDraft } from "./scheduledTaskDraft"; diff --git a/apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.tsx b/apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.tsx index 077f983ac0f2e..94594fa97a8c9 100644 --- a/apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.tsx +++ b/apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.tsx @@ -39,6 +39,7 @@ import { WEBHOOK_FILTER_OPS, type WebhookFilterDraft, } from "@t3tools/client-runtime/scheduled-task-webhook"; +import { scheduledTaskWorktreeBaseRef } from "@t3tools/client-runtime/scheduled-task-worktree"; import { scheduleTimeZoneLabel } from "@t3tools/client-runtime/scheduled-task-time-zone"; import type { MessageResolver } from "../../i18n/messages"; import { useRef, useState, type ReactNode } from "react"; @@ -66,6 +67,7 @@ import { buildModelOptions } from "../../lib/modelOptions"; import { withImplicitFastModeSelection } from "../../lib/providerOptions"; import { useProjects, useEnvironmentServerConfig } from "../../state/entities"; import { useEnvironmentQuery } from "../../state/query"; +import { usePaginatedBranches } from "../../state/queries"; import { serverEnvironment } from "../../state/server"; import { useAtomCommand } from "../../state/use-atom-command"; import { resolveNewTaskBranchLabel } from "../threads/new-task-context-presentation"; @@ -745,6 +747,21 @@ function TaskForm({ project.id === draft.task?.projectId), ) .sort((left, right) => Number(right.pinnedAt != null) - Number(left.pinnedAt != null)); + const automaticBaseRef = draft.workspace === "worktree" && !draft.baseRef.trim(); + const automaticBaseRefCwd = automaticBaseRef + ? (projects.find((project) => project.id === draft.projectId)?.workspaceRoot ?? null) + : null; + const automaticBaseRefs = usePaginatedBranches({ + environmentId, + cwd: automaticBaseRefCwd, + query: "", + }); + const worktreeBaseRef = scheduledTaskWorktreeBaseRef(draft.baseRef, automaticBaseRefs.refs); + // Until the project's refs load, the automatic base would save as `main`. A failed lookup falls back to it. + const automaticBaseRefLoading = + automaticBaseRefCwd !== null && + automaticBaseRefs.data === null && + automaticBaseRefs.error === null; const config = useEnvironmentServerConfig(environmentId); const destinationLabel = useScheduledTaskDestinationLabel(environmentId, draft.threadId); const boundThread = useScheduledTaskThread(environmentId, draft.threadId); @@ -793,7 +810,8 @@ function TaskForm({ saving || dictationPending || taskMissing || - environmentUnavailable + environmentUnavailable || + automaticBaseRefLoading ) return; // Preserve signatures edited on other clients by sending the task's current value. @@ -874,7 +892,7 @@ function TaskForm({ ? { type: "existing_worktree", worktreePath: draft.checkoutPath.trim() } : { type: "worktree", - baseRef: draft.baseRef.trim() || "main", + baseRef: worktreeBaseRef, startFromOrigin: draft.startFromOrigin, }, // Tasks have no mode picker; a mode above the administrator's ceiling is refused. @@ -1101,7 +1119,7 @@ function TaskForm({ label={gt("Base branch")} value={resolveNewTaskBranchLabel( { - branchName: draft.baseRef, + branchName: automaticBaseRefLoading ? null : worktreeBaseRef, startFromOrigin: draft.startFromOrigin, workspaceMode: "worktree", }, @@ -1460,6 +1478,7 @@ function TaskForm({ dictationPending || taskMissing || environmentUnavailable || + automaticBaseRefLoading || // The server refuses an enabled webhook task under this policy. (draft.enabled && draft.schedule.mode === "webhook" && webhookDenial !== undefined) } diff --git a/apps/mobile/src/features/settings/scheduledTaskDraft.test.ts b/apps/mobile/src/features/settings/scheduledTaskDraft.test.ts index 7359403a67dce..c4284fac14c43 100644 --- a/apps/mobile/src/features/settings/scheduledTaskDraft.test.ts +++ b/apps/mobile/src/features/settings/scheduledTaskDraft.test.ts @@ -5,8 +5,12 @@ import { ProviderDriverKind, ProviderInstanceId, ProjectId, + ScheduledTaskId, + type ScheduledTask, } from "@t3tools/contracts"; import { + createDraft, + editDraft, scheduledTaskDefaultModel, DEFAULT_SCHEDULE, scheduleDraftForTask, @@ -207,3 +211,37 @@ it("rejects dedupe keys without valid request placeholders", () => { scheduleFromDraft({ ...DEFAULT_SCHEDULE, mode: "webhook", coalesceKey: "{{body.bad" }), ).toBeNull(); }); + +describe("scheduled task worktree base", () => { + const rootTask = { + id: ScheduledTaskId.make("task"), + title: "Review issues", + prompt: "Review open issues", + enabled: true, + schedule: { type: "interval", everyMs: 60_000 }, + projectId: ProjectId.make("project"), + threadId: null, + workspaceStrategy: { type: "root" }, + modelSelection: { instanceId: ProviderInstanceId.make("codex"), model: "gpt-5.4" }, + runtimeMode: "full-access", + interactionMode: "default", + createdBy: "user", + creationSource: "mobile", + createdAt: "2026-09-17T00:00:00.000Z", + updatedAt: "2026-09-17T00:00:00.000Z", + nextRunAt: null, + lastRunAt: null, + lastRunStatus: "never", + lastRunError: null, + runCount: 0, + } satisfies ScheduledTask; + + it("leaves the base automatic for new tasks and tasks without a worktree", () => { + expect(createDraft(ProjectId.make("project"), null).baseRef).toBe(""); + expect(editDraft(rootTask).baseRef).toBe(""); + expect( + editDraft({ ...rootTask, workspaceStrategy: { type: "worktree", baseRef: "release" } }) + .baseRef, + ).toBe("release"); + }); +}); diff --git a/apps/mobile/src/features/settings/scheduledTaskDraft.ts b/apps/mobile/src/features/settings/scheduledTaskDraft.ts index 1ede30d84072b..5bacd4be83c81 100644 --- a/apps/mobile/src/features/settings/scheduledTaskDraft.ts +++ b/apps/mobile/src/features/settings/scheduledTaskDraft.ts @@ -301,7 +301,7 @@ export function createDraft( schedule: DEFAULT_SCHEDULE, threadMode: "new_thread", workspace: "worktree", - baseRef: "main", + baseRef: "", checkoutPath: "", enabled: true, startFromOrigin: true, @@ -321,7 +321,7 @@ export function editDraft(task: ScheduledTask): ScheduledTaskDraft { schedule: scheduleDraftForTask(task), threadMode: scheduledTaskThreadMode(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 diff --git a/apps/web/src/components/settings/ScheduledTasksSettings.tsx b/apps/web/src/components/settings/ScheduledTasksSettings.tsx index 4988ba93fdd23..39670ed266666 100644 --- a/apps/web/src/components/settings/ScheduledTasksSettings.tsx +++ b/apps/web/src/components/settings/ScheduledTasksSettings.tsx @@ -37,6 +37,7 @@ import { type WebhookFilterDraft, } from "@t3tools/client-runtime/scheduled-task-webhook"; import { scheduleTimeZoneLabel } from "@t3tools/client-runtime/scheduled-task-time-zone"; +import { scheduledTaskWorktreeBaseRef } from "@t3tools/client-runtime/scheduled-task-worktree"; import { MAX_WEBHOOK_DELIVERY_AGE_MINUTES, MAX_WEBHOOK_FILTERS, @@ -76,7 +77,7 @@ import { import { buildThreadRouteParams } from "../../threadRoutes"; import { scopeThreadRef } from "@t3tools/client-runtime/environment"; import { environmentAtomList, environmentIdsKey } from "../../state/environmentAtomList"; -import { useThreadSearch } from "../../state/queries"; +import { usePaginatedBranches, useThreadSearch } from "../../state/queries"; import { formatEnvironmentQueryError, useEnvironmentQuery } from "../../state/query"; import { EMPTY_SERVER_PROVIDERS, serverEnvironment } from "../../state/server"; import { threadFamilies } from "../../state/threads"; @@ -195,7 +196,7 @@ const EMPTY_DRAFT: DraftState = { threadId: "", threadMode: "new_thread", workspaceMode: "worktree", - baseRef: "main", + baseRef: "", startFromOrigin: true, existingWorktreePath: "", modelKey: "", @@ -1530,6 +1531,19 @@ function ScheduledTaskEditorForm({ : task; const selectedProjectId = draft.projectId || projects[0]?.id || ""; const selectedProject = projects.find((project) => project.id === selectedProjectId); + const automaticBaseRef = draft.workspaceMode === "worktree" && !draft.baseRef.trim(); + const automaticBaseRefs = usePaginatedBranches({ + environmentId, + cwd: automaticBaseRef ? (selectedProject?.workspaceRoot ?? null) : null, + query: "", + }); + const worktreeBaseRef = scheduledTaskWorktreeBaseRef(draft.baseRef, automaticBaseRefs.refs); + // Until the project's refs load, the automatic base would save as `main`. A failed lookup falls back to it. + const automaticBaseRefLoading = + automaticBaseRef && + selectedProject !== undefined && + automaticBaseRefs.data === null && + automaticBaseRefs.error === null; const instanceEntries = providerInstanceEntriesFor( providers, settings, @@ -1581,7 +1595,8 @@ function ScheduledTaskEditorForm({ saving || editingTaskMissing || !connected || - tasksQuery.data === null + tasksQuery.data === null || + automaticBaseRefLoading ) return; const selection = activeSelection; @@ -1653,7 +1668,7 @@ function ScheduledTaskEditorForm({ ? { type: "existing_worktree", worktreePath: draft.existingWorktreePath.trim() } : { type: "worktree", - baseRef: draft.baseRef.trim() || "main", + baseRef: worktreeBaseRef, startFromOrigin: draft.startFromOrigin, }; const input: ScheduledTaskUpsertInput = { @@ -1722,7 +1737,7 @@ function ScheduledTaskEditorForm({ projectId: defaultScheduledTaskProjectId(projectsOn(next.environmentId), scope), modelKey: "", baseModelSelection: null, - baseRef: "main", + baseRef: "", startFromOrigin: true, existingWorktreePath: "", })); @@ -1881,7 +1896,7 @@ function ScheduledTaskEditorForm({ id="scheduled-task-base-ref" environmentId={environmentId} cwd={selectedProject?.workspaceRoot ?? null} - value={draft.baseRef} + value={automaticBaseRefLoading ? "" : worktreeBaseRef} onValueChange={(baseRef) => setDraft((current) => ({ ...current, baseRef }))} startFromOrigin={draft.startFromOrigin} onStartFromOriginChange={(startFromOrigin) => @@ -2331,6 +2346,7 @@ function ScheduledTaskEditorForm({ editingTaskMissing || !connected || !tasksQuery.data || + automaticBaseRefLoading || (draft.enabled && draft.scheduleMode === "webhook" && webhookDenial !== undefined) } onClick={() => void submit()} diff --git a/apps/web/src/components/settings/scheduledTasksSettings.logic.test.ts b/apps/web/src/components/settings/scheduledTasksSettings.logic.test.ts index 295ce0aae0bd6..d01b47078dbe2 100644 --- a/apps/web/src/components/settings/scheduledTasksSettings.logic.test.ts +++ b/apps/web/src/components/settings/scheduledTasksSettings.logic.test.ts @@ -171,6 +171,11 @@ describe("editing scheduled task branch settings", () => { expect(draft.baseRef).toBe("release"); expect(draft.startFromOrigin).toBe(false); }); + + it("leaves the base automatic when a task without a worktree switches to one", () => { + const draft = taskToDraft({ ...legacyTask, workspaceStrategy: { type: "root" } }); + expect(draft.baseRef).toBe(""); + }); }); describe("fixed-time scheduled tasks", () => { diff --git a/apps/web/src/components/settings/scheduledTasksSettings.logic.ts b/apps/web/src/components/settings/scheduledTasksSettings.logic.ts index df227cfe32ea2..e66ea42743aa9 100644 --- a/apps/web/src/components/settings/scheduledTasksSettings.logic.ts +++ b/apps/web/src/components/settings/scheduledTasksSettings.logic.ts @@ -332,7 +332,7 @@ export function taskToDraft(task: ScheduledTask): DraftState { threadId: task.threadId ?? "", threadMode: scheduledTaskThreadMode(task), 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) diff --git a/packages/client-runtime/package.json b/packages/client-runtime/package.json index c09deef7e4b39..900dfad694aba 100644 --- a/packages/client-runtime/package.json +++ b/packages/client-runtime/package.json @@ -111,6 +111,10 @@ "types": "./src/scheduledTaskTimeZone.ts", "default": "./src/scheduledTaskTimeZone.ts" }, + "./scheduled-task-worktree": { + "types": "./src/scheduledTaskWorktree.ts", + "default": "./src/scheduledTaskWorktree.ts" + }, "./connection": { "types": "./src/connection/index.ts", "default": "./src/connection/index.ts" diff --git a/packages/client-runtime/src/scheduledTaskWorktree.test.ts b/packages/client-runtime/src/scheduledTaskWorktree.test.ts new file mode 100644 index 0000000000000..c5b044b3fdf2b --- /dev/null +++ b/packages/client-runtime/src/scheduledTaskWorktree.test.ts @@ -0,0 +1,18 @@ +import { expect, it } from "vite-plus/test"; + +import { scheduledTaskWorktreeBaseRef } from "./scheduledTaskWorktree.ts"; + +const ref = (name: string, isDefault = false) => ({ name, isDefault }); + +it("keeps a picked base and otherwise uses the project's default branch", () => { + expect(scheduledTaskWorktreeBaseRef(" release ", [ref("master", true)])).toBe("release"); + expect(scheduledTaskWorktreeBaseRef("", [ref("feature"), ref("master", true)])).toBe("master"); + expect(scheduledTaskWorktreeBaseRef(" ", [ref("origin/develop", true)])).toBe("origin/develop"); +}); + +it("falls back to main, then master, when no ref is marked default", () => { + expect(scheduledTaskWorktreeBaseRef("", [ref("feature"), ref("master")])).toBe("master"); + expect(scheduledTaskWorktreeBaseRef("", [ref("origin/master")])).toBe("origin/master"); + expect(scheduledTaskWorktreeBaseRef("", [ref("master"), ref("main")])).toBe("main"); + expect(scheduledTaskWorktreeBaseRef("", [])).toBe("main"); +}); diff --git a/packages/client-runtime/src/scheduledTaskWorktree.ts b/packages/client-runtime/src/scheduledTaskWorktree.ts new file mode 100644 index 0000000000000..2baa220570ce7 --- /dev/null +++ b/packages/client-runtime/src/scheduledTaskWorktree.ts @@ -0,0 +1,17 @@ +import type { VcsRef } from "@t3tools/contracts"; + +/** An empty base is automatic: the project's default branch, else `main` or `master`. */ +export function scheduledTaskWorktreeBaseRef( + baseRef: string, + refs: ReadonlyArray>, +): string { + const picked = baseRef.trim(); + if (picked) return picked; + const defaultRef = refs.find((ref) => ref.isDefault); + if (defaultRef) return defaultRef.name; + for (const name of ["main", "master"]) { + const match = refs.find((ref) => ref.name === name || ref.name === `origin/${name}`); + if (match) return match.name; + } + return "main"; +}