Skip to content
Merged
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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={
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
Comment thread
binjamshid marked this conversation as resolved.
Resolved
// 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);
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -1101,7 +1119,7 @@ function TaskForm({
label={gt("Base branch")}
value={resolveNewTaskBranchLabel(
{
branchName: draft.baseRef,
branchName: automaticBaseRefLoading ? null : worktreeBaseRef,
startFromOrigin: draft.startFromOrigin,
workspaceMode: "worktree",
},
Expand Down Expand Up @@ -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)
}
Expand Down
38 changes: 38 additions & 0 deletions apps/mobile/src/features/settings/scheduledTaskDraft.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,12 @@ import {
ProviderDriverKind,
ProviderInstanceId,
ProjectId,
ScheduledTaskId,
type ScheduledTask,
} from "@t3tools/contracts";
import {
createDraft,
editDraft,
scheduledTaskDefaultModel,
DEFAULT_SCHEDULE,
scheduleDraftForTask,
Expand Down Expand Up @@ -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");
});
});
4 changes: 2 additions & 2 deletions apps/mobile/src/features/settings/scheduledTaskDraft.ts
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ export function createDraft(
schedule: DEFAULT_SCHEDULE,
threadMode: "new_thread",
workspace: "worktree",
baseRef: "main",
baseRef: "",
checkoutPath: "",
enabled: true,
startFromOrigin: true,
Expand All @@ -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
Expand Down
28 changes: 22 additions & 6 deletions apps/web/src/components/settings/ScheduledTasksSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -195,7 +196,7 @@ const EMPTY_DRAFT: DraftState = {
threadId: "",
threadMode: "new_thread",
workspaceMode: "worktree",
baseRef: "main",
baseRef: "",
startFromOrigin: true,
existingWorktreePath: "",
modelKey: "",
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -1581,7 +1595,8 @@ function ScheduledTaskEditorForm({
saving ||
editingTaskMissing ||
!connected ||
tasksQuery.data === null
tasksQuery.data === null ||
automaticBaseRefLoading
)
return;
const selection = activeSelection;
Expand Down Expand Up @@ -1653,7 +1668,7 @@ function ScheduledTaskEditorForm({
? { type: "existing_worktree", worktreePath: draft.existingWorktreePath.trim() }
: {
type: "worktree",
baseRef: draft.baseRef.trim() || "main",
baseRef: worktreeBaseRef,
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
startFromOrigin: draft.startFromOrigin,
};
const input: ScheduledTaskUpsertInput = {
Expand Down Expand Up @@ -1722,7 +1737,7 @@ function ScheduledTaskEditorForm({
projectId: defaultScheduledTaskProjectId(projectsOn(next.environmentId), scope),
modelKey: "",
baseModelSelection: null,
baseRef: "main",
baseRef: "",
startFromOrigin: true,
existingWorktreePath: "",
}));
Expand Down Expand Up @@ -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) =>
Expand Down Expand Up @@ -2331,6 +2346,7 @@ function ScheduledTaskEditorForm({
editingTaskMissing ||
!connected ||
!tasksQuery.data ||
automaticBaseRefLoading ||
(draft.enabled && draft.scheduleMode === "webhook" && webhookDenial !== undefined)
}
onClick={() => void submit()}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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", () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions packages/client-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
18 changes: 18 additions & 0 deletions packages/client-runtime/src/scheduledTaskWorktree.test.ts
Original file line number Diff line number Diff line change
@@ -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");
});
17 changes: 17 additions & 0 deletions packages/client-runtime/src/scheduledTaskWorktree.ts
Original file line number Diff line number Diff line change
@@ -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<Pick<VcsRef, "name" | "isDefault">>,
): 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";
}
Loading