@devries-cameron20 / t3code-1 / commits / b5481adcd8
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

fix(web,mobile): scheduled tasks from Settings start from the project's default branch (#32841)

Co-authored-by: Ajraba04 <143622128+Ajraba04@users.noreply.github.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>

Bin Jamshid committed Nov 20, 2026 at 00:38 UTC b5481adcd8af677c85e4b461093759ec1ccab6fd
11 files changed +138 -13
apps/mobile/src/features/settings/ScheduledTaskPickerScreens.tsx
+6 -1
@@ -2,6 +2,7 @@ import { msg, T, useGT, useMessages } from "gt-react-native";
2 import { NativeScrollView } from "../../native/NativeScrollViewMarker";
3 import { LegendList } from "@legendapp/list/react-native";
4 import { useNavigation } from "@react-navigation/native";
5 +import { scheduledTaskWorktreeBaseRef } from "@t3tools/client-runtime/scheduled-task-worktree";
6 import { isListedThreadLineage } from "@t3tools/contracts";
7 import * as Haptics from "expo-haptics";
8 import { useMemo, useState } from "react";
@@ -153,7 +154,11 @@ export function ScheduledTaskBranchPickerRouteScreen() {
154 title={gt("Base branch")}
155 project={project}
156 branches={visibleBranches}
156 - selectedBranchName={editor.draft.baseRef}
157 + selectedBranchName={
158 + editor.draft.baseRef.trim() || debouncedQuery.trim() || branches.data === null
159 + ? editor.draft.baseRef
160 + : scheduledTaskWorktreeBaseRef("", branches.refs)
161 + }
162 query={query}
163 onQueryChange={setQuery}
164 loading={
apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.test.tsx
+3
@@ -132,6 +132,9 @@ vi.mock("../../state/query", () => ({
132 useEnvironmentQuery: () => ({ data: { tasks: mocks.tasks, threads: [] } }),
133 }));
134 vi.mock("../../state/use-atom-command", () => ({ useAtomCommand: () => mocks.upsert }));
135 +vi.mock("../../state/queries", () => ({
136 + usePaginatedBranches: () => ({ refs: [], data: null, error: null }),
137 +}));
138
139 import { appAtomRegistry } from "../../state/atom-registry";
140 import { editDraft } from "./scheduledTaskDraft";
apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.tsx
+22 -3
@@ -39,6 +39,7 @@ import {
39 WEBHOOK_FILTER_OPS,
40 type WebhookFilterDraft,
41 } from "@t3tools/client-runtime/scheduled-task-webhook";
42 +import { scheduledTaskWorktreeBaseRef } from "@t3tools/client-runtime/scheduled-task-worktree";
43 import { scheduleTimeZoneLabel } from "@t3tools/client-runtime/scheduled-task-time-zone";
44 import type { MessageResolver } from "../../i18n/messages";
45 import { useRef, useState, type ReactNode } from "react";
@@ -66,6 +67,7 @@ import { buildModelOptions } from "../../lib/modelOptions";
67 import { withImplicitFastModeSelection } from "../../lib/providerOptions";
68 import { useProjects, useEnvironmentServerConfig } from "../../state/entities";
69 import { useEnvironmentQuery } from "../../state/query";
70 +import { usePaginatedBranches } from "../../state/queries";
71 import { serverEnvironment } from "../../state/server";
72 import { useAtomCommand } from "../../state/use-atom-command";
73 import { resolveNewTaskBranchLabel } from "../threads/new-task-context-presentation";
@@ -745,6 +747,21 @@ function TaskForm({
747 project.id === draft.task?.projectId),
748 )
749 .sort((left, right) => Number(right.pinnedAt != null) - Number(left.pinnedAt != null));
750 + const automaticBaseRef = draft.workspace === "worktree" && !draft.baseRef.trim();
751 + const automaticBaseRefCwd = automaticBaseRef
752 + ? (projects.find((project) => project.id === draft.projectId)?.workspaceRoot ?? null)
753 + : null;
754 + const automaticBaseRefs = usePaginatedBranches({
755 + environmentId,
756 + cwd: automaticBaseRefCwd,
757 + query: "",
758 + });
759 + const worktreeBaseRef = scheduledTaskWorktreeBaseRef(draft.baseRef, automaticBaseRefs.refs);
760 + // Until the project's refs load, the automatic base would save as `main`. A failed lookup falls back to it.
761 + const automaticBaseRefLoading =
762 + automaticBaseRefCwd !== null &&
763 + automaticBaseRefs.data === null &&
764 + automaticBaseRefs.error === null;
765 const config = useEnvironmentServerConfig(environmentId);
766 const destinationLabel = useScheduledTaskDestinationLabel(environmentId, draft.threadId);
767 const boundThread = useScheduledTaskThread(environmentId, draft.threadId);
@@ -793,7 +810,8 @@ function TaskForm({
810 saving ||
811 dictationPending ||
812 taskMissing ||
796 - environmentUnavailable
813 + environmentUnavailable ||
814 + automaticBaseRefLoading
815 )
816 return;
817 // Preserve signatures edited on other clients by sending the task's current value.
@@ -874,7 +892,7 @@ function TaskForm({
892 ? { type: "existing_worktree", worktreePath: draft.checkoutPath.trim() }
893 : {
894 type: "worktree",
877 - baseRef: draft.baseRef.trim() || "main",
895 + baseRef: worktreeBaseRef,
896 startFromOrigin: draft.startFromOrigin,
897 },
898 // Tasks have no mode picker; a mode above the administrator's ceiling is refused.
@@ -1101,7 +1119,7 @@ function TaskForm({
1119 label={gt("Base branch")}
1120 value={resolveNewTaskBranchLabel(
1121 {
1104 - branchName: draft.baseRef,
1122 + branchName: automaticBaseRefLoading ? null : worktreeBaseRef,
1123 startFromOrigin: draft.startFromOrigin,
1124 workspaceMode: "worktree",
1125 },
@@ -1460,6 +1478,7 @@ function TaskForm({
1478 dictationPending ||
1479 taskMissing ||
1480 environmentUnavailable ||
1481 + automaticBaseRefLoading ||
1482 // The server refuses an enabled webhook task under this policy.
1483 (draft.enabled && draft.schedule.mode === "webhook" && webhookDenial !== undefined)
1484 }
apps/mobile/src/features/settings/scheduledTaskDraft.test.ts
+38
@@ -5,8 +5,12 @@ import {
5 ProviderDriverKind,
6 ProviderInstanceId,
7 ProjectId,
8 + ScheduledTaskId,
9 + type ScheduledTask,
10 } from "@t3tools/contracts";
11 import {
12 + createDraft,
13 + editDraft,
14 scheduledTaskDefaultModel,
15 DEFAULT_SCHEDULE,
16 scheduleDraftForTask,
@@ -207,3 +211,37 @@ it("rejects dedupe keys without valid request placeholders", () => {
211 scheduleFromDraft({ ...DEFAULT_SCHEDULE, mode: "webhook", coalesceKey: "{{body.bad" }),
212 ).toBeNull();
213 });
214 +
215 +describe("scheduled task worktree base", () => {
216 + const rootTask = {
217 + id: ScheduledTaskId.make("task"),
218 + title: "Review issues",
219 + prompt: "Review open issues",
220 + enabled: true,
221 + schedule: { type: "interval", everyMs: 60_000 },
222 + projectId: ProjectId.make("project"),
223 + threadId: null,
224 + workspaceStrategy: { type: "root" },
225 + modelSelection: { instanceId: ProviderInstanceId.make("codex"), model: "gpt-5.4" },
226 + runtimeMode: "full-access",
227 + interactionMode: "default",
228 + createdBy: "user",
229 + creationSource: "mobile",
230 + createdAt: "2026-09-17T00:00:00.000Z",
231 + updatedAt: "2026-09-17T00:00:00.000Z",
232 + nextRunAt: null,
233 + lastRunAt: null,
234 + lastRunStatus: "never",
235 + lastRunError: null,
236 + runCount: 0,
237 + } satisfies ScheduledTask;
238 +
239 + it("leaves the base automatic for new tasks and tasks without a worktree", () => {
240 + expect(createDraft(ProjectId.make("project"), null).baseRef).toBe("");
241 + expect(editDraft(rootTask).baseRef).toBe("");
242 + expect(
243 + editDraft({ ...rootTask, workspaceStrategy: { type: "worktree", baseRef: "release" } })
244 + .baseRef,
245 + ).toBe("release");
246 + });
247 +});
apps/mobile/src/features/settings/scheduledTaskDraft.ts
+2 -2
@@ -301,7 +301,7 @@ export function createDraft(
301 schedule: DEFAULT_SCHEDULE,
302 threadMode: "new_thread",
303 workspace: "worktree",
304 - baseRef: "main",
304 + baseRef: "",
305 checkoutPath: "",
306 enabled: true,
307 startFromOrigin: true,
@@ -321,7 +321,7 @@ export function editDraft(task: ScheduledTask): ScheduledTaskDraft {
321 schedule: scheduleDraftForTask(task),
322 threadMode: scheduledTaskThreadMode(task),
323 workspace: task.workspaceStrategy.type,
324 - baseRef: task.workspaceStrategy.type === "worktree" ? task.workspaceStrategy.baseRef : "main",
324 + baseRef: task.workspaceStrategy.type === "worktree" ? task.workspaceStrategy.baseRef : "",
325 checkoutPath:
326 task.workspaceStrategy.type === "existing_worktree"
327 ? task.workspaceStrategy.worktreePath
apps/web/src/components/settings/ScheduledTasksSettings.tsx
+22 -6
@@ -37,6 +37,7 @@ import {
37 type WebhookFilterDraft,
38 } from "@t3tools/client-runtime/scheduled-task-webhook";
39 import { scheduleTimeZoneLabel } from "@t3tools/client-runtime/scheduled-task-time-zone";
40 +import { scheduledTaskWorktreeBaseRef } from "@t3tools/client-runtime/scheduled-task-worktree";
41 import {
42 MAX_WEBHOOK_DELIVERY_AGE_MINUTES,
43 MAX_WEBHOOK_FILTERS,
@@ -76,7 +77,7 @@ import {
77 import { buildThreadRouteParams } from "../../threadRoutes";
78 import { scopeThreadRef } from "@t3tools/client-runtime/environment";
79 import { environmentAtomList, environmentIdsKey } from "../../state/environmentAtomList";
79 -import { useThreadSearch } from "../../state/queries";
80 +import { usePaginatedBranches, useThreadSearch } from "../../state/queries";
81 import { formatEnvironmentQueryError, useEnvironmentQuery } from "../../state/query";
82 import { EMPTY_SERVER_PROVIDERS, serverEnvironment } from "../../state/server";
83 import { threadFamilies } from "../../state/threads";
@@ -195,7 +196,7 @@ const EMPTY_DRAFT: DraftState = {
196 threadId: "",
197 threadMode: "new_thread",
198 workspaceMode: "worktree",
198 - baseRef: "main",
199 + baseRef: "",
200 startFromOrigin: true,
201 existingWorktreePath: "",
202 modelKey: "",
@@ -1530,6 +1531,19 @@ function ScheduledTaskEditorForm({
1531 : task;
1532 const selectedProjectId = draft.projectId || projects[0]?.id || "";
1533 const selectedProject = projects.find((project) => project.id === selectedProjectId);
1534 + const automaticBaseRef = draft.workspaceMode === "worktree" && !draft.baseRef.trim();
1535 + const automaticBaseRefs = usePaginatedBranches({
1536 + environmentId,
1537 + cwd: automaticBaseRef ? (selectedProject?.workspaceRoot ?? null) : null,
1538 + query: "",
1539 + });
1540 + const worktreeBaseRef = scheduledTaskWorktreeBaseRef(draft.baseRef, automaticBaseRefs.refs);
1541 + // Until the project's refs load, the automatic base would save as `main`. A failed lookup falls back to it.
1542 + const automaticBaseRefLoading =
1543 + automaticBaseRef &&
1544 + selectedProject !== undefined &&
1545 + automaticBaseRefs.data === null &&
1546 + automaticBaseRefs.error === null;
1547 const instanceEntries = providerInstanceEntriesFor(
1548 providers,
1549 settings,
@@ -1581,7 +1595,8 @@ function ScheduledTaskEditorForm({
1595 saving ||
1596 editingTaskMissing ||
1597 !connected ||
1584 - tasksQuery.data === null
1598 + tasksQuery.data === null ||
1599 + automaticBaseRefLoading
1600 )
1601 return;
1602 const selection = activeSelection;
@@ -1653,7 +1668,7 @@ function ScheduledTaskEditorForm({
1668 ? { type: "existing_worktree", worktreePath: draft.existingWorktreePath.trim() }
1669 : {
1670 type: "worktree",
1656 - baseRef: draft.baseRef.trim() || "main",
1671 + baseRef: worktreeBaseRef,
1672 startFromOrigin: draft.startFromOrigin,
1673 };
1674 const input: ScheduledTaskUpsertInput = {
@@ -1722,7 +1737,7 @@ function ScheduledTaskEditorForm({
1737 projectId: defaultScheduledTaskProjectId(projectsOn(next.environmentId), scope),
1738 modelKey: "",
1739 baseModelSelection: null,
1725 - baseRef: "main",
1740 + baseRef: "",
1741 startFromOrigin: true,
1742 existingWorktreePath: "",
1743 }));
@@ -1881,7 +1896,7 @@ function ScheduledTaskEditorForm({
1896 id="scheduled-task-base-ref"
1897 environmentId={environmentId}
1898 cwd={selectedProject?.workspaceRoot ?? null}
1884 - value={draft.baseRef}
1899 + value={automaticBaseRefLoading ? "" : worktreeBaseRef}
1900 onValueChange={(baseRef) => setDraft((current) => ({ ...current, baseRef }))}
1901 startFromOrigin={draft.startFromOrigin}
1902 onStartFromOriginChange={(startFromOrigin) =>
@@ -2331,6 +2346,7 @@ function ScheduledTaskEditorForm({
2346 editingTaskMissing ||
2347 !connected ||
2348 !tasksQuery.data ||
2349 + automaticBaseRefLoading ||
2350 (draft.enabled && draft.scheduleMode === "webhook" && webhookDenial !== undefined)
2351 }
2352 onClick={() => void submit()}
apps/web/src/components/settings/scheduledTasksSettings.logic.test.ts
+5
@@ -171,6 +171,11 @@ describe("editing scheduled task branch settings", () => {
171 expect(draft.baseRef).toBe("release");
172 expect(draft.startFromOrigin).toBe(false);
173 });
174 +
175 + it("leaves the base automatic when a task without a worktree switches to one", () => {
176 + const draft = taskToDraft({ ...legacyTask, workspaceStrategy: { type: "root" } });
177 + expect(draft.baseRef).toBe("");
178 + });
179 });
180
181 describe("fixed-time scheduled tasks", () => {
apps/web/src/components/settings/scheduledTasksSettings.logic.ts
+1 -1
@@ -332,7 +332,7 @@ export function taskToDraft(task: ScheduledTask): DraftState {
332 threadId: task.threadId ?? "",
333 threadMode: scheduledTaskThreadMode(task),
334 workspaceMode: task.workspaceStrategy.type,
335 - baseRef: task.workspaceStrategy.type === "worktree" ? task.workspaceStrategy.baseRef : "main",
335 + baseRef: task.workspaceStrategy.type === "worktree" ? task.workspaceStrategy.baseRef : "",
336 startFromOrigin:
337 task.workspaceStrategy.type === "worktree"
338 ? (task.workspaceStrategy.startFromOrigin ?? false)
packages/client-runtime/package.json
+4
@@ -111,6 +111,10 @@
111 "types": "./src/scheduledTaskTimeZone.ts",
112 "default": "./src/scheduledTaskTimeZone.ts"
113 },
114 + "./scheduled-task-worktree": {
115 + "types": "./src/scheduledTaskWorktree.ts",
116 + "default": "./src/scheduledTaskWorktree.ts"
117 + },
118 "./connection": {
119 "types": "./src/connection/index.ts",
120 "default": "./src/connection/index.ts"
packages/client-runtime/src/scheduledTaskWorktree.test.ts new
+18
@@ -0,0 +1,18 @@
1 +import { expect, it } from "vite-plus/test";
2 +
3 +import { scheduledTaskWorktreeBaseRef } from "./scheduledTaskWorktree.ts";
4 +
5 +const ref = (name: string, isDefault = false) => ({ name, isDefault });
6 +
7 +it("keeps a picked base and otherwise uses the project's default branch", () => {
8 + expect(scheduledTaskWorktreeBaseRef(" release ", [ref("master", true)])).toBe("release");
9 + expect(scheduledTaskWorktreeBaseRef("", [ref("feature"), ref("master", true)])).toBe("master");
10 + expect(scheduledTaskWorktreeBaseRef(" ", [ref("origin/develop", true)])).toBe("origin/develop");
11 +});
12 +
13 +it("falls back to main, then master, when no ref is marked default", () => {
14 + expect(scheduledTaskWorktreeBaseRef("", [ref("feature"), ref("master")])).toBe("master");
15 + expect(scheduledTaskWorktreeBaseRef("", [ref("origin/master")])).toBe("origin/master");
16 + expect(scheduledTaskWorktreeBaseRef("", [ref("master"), ref("main")])).toBe("main");
17 + expect(scheduledTaskWorktreeBaseRef("", [])).toBe("main");
18 +});
packages/client-runtime/src/scheduledTaskWorktree.ts new
+17
@@ -0,0 +1,17 @@
1 +import type { VcsRef } from "@t3tools/contracts";
2 +
3 +/** An empty base is automatic: the project's default branch, else `main` or `master`. */
4 +export function scheduledTaskWorktreeBaseRef(
5 + baseRef: string,
6 + refs: ReadonlyArray<Pick<VcsRef, "name" | "isDefault">>,
7 +): string {
8 + const picked = baseRef.trim();
9 + if (picked) return picked;
10 + const defaultRef = refs.find((ref) => ref.isDefault);
11 + if (defaultRef) return defaultRef.name;
12 + for (const name of ["main", "master"]) {
13 + const match = refs.find((ref) => ref.name === name || ref.name === `origin/${name}`);
14 + if (match) return match.name;
15 + }
16 + return "main";
17 +}