Skip to content

Commit 4aab23c

Browse files
feat: scheduled tasks can run in one thread with a fresh session each run (#30326)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent 99e361e commit 4aab23c

19 files changed

Lines changed: 539 additions & 35 deletions

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

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import type {
1111
EnvironmentId,
1212
ProjectId,
1313
ScheduledTask,
14+
ScheduledTaskThreadMode,
1415
ScheduledTaskUpsertInput,
1516
} from "@t3tools/contracts";
1617
import {
@@ -109,6 +110,12 @@ const DAYS = [
109110
{ index: 0, label: "Sun" },
110111
] as const;
111112

113+
const THREAD_MODE_LABELS: Record<ScheduledTaskThreadMode, string> = {
114+
new_thread: "New thread each run",
115+
continue: "One thread, same conversation",
116+
fresh_session: "One thread, fresh session",
117+
};
118+
112119
function describeSchedule(task: ScheduledTask): string {
113120
if (task.schedule.type === "webhook") return "On webhook";
114121
if (task.schedule.type === "once") {
@@ -722,6 +729,7 @@ function TaskForm({
722729
const offersOnce =
723730
config?.environment.capabilities.oneTimeSchedules === true ||
724731
draft.task?.schedule.type === "once";
732+
const offersThreadModes = config?.environment.capabilities.scheduledTaskThreadModes === true;
725733
const save = async () => {
726734
if (
727735
!readEnvironmentScope(environmentId, AuthOrchestrationOperateScope) ||
@@ -795,6 +803,7 @@ function TaskForm({
795803
schedule,
796804
enabled: draft.enabled,
797805
threadId: draft.task?.threadId ?? null,
806+
...(offersThreadModes ? { threadMode: draft.threadMode } : {}),
798807
workspaceStrategy:
799808
draft.workspace === "root"
800809
? { type: "root" }
@@ -932,6 +941,37 @@ function TaskForm({
932941
/>
933942
</SettingsSection>
934943

944+
{offersThreadModes ? (
945+
<SettingsSection
946+
title="Destination"
947+
footer={
948+
draft.threadMode === "new_thread"
949+
? "Each run starts a new thread."
950+
: `${
951+
draft.threadMode === "continue"
952+
? "Runs continue one conversation."
953+
: "Runs share one thread, each in a fresh session without earlier runs' context."
954+
} The first run starts the thread. Deleting it also deletes this task.`
955+
}
956+
>
957+
<SelectRow
958+
label="Runs go to"
959+
value={THREAD_MODE_LABELS[draft.threadMode]}
960+
actions={(Object.keys(THREAD_MODE_LABELS) as ScheduledTaskThreadMode[]).map(
961+
(mode) => ({
962+
id: mode,
963+
title: THREAD_MODE_LABELS[mode],
964+
state: draft.threadMode === mode ? "on" : undefined,
965+
}),
966+
)}
967+
onSelect={(id) => {
968+
if (id === "new_thread" || id === "continue" || id === "fresh_session")
969+
setDraft({ ...draft, threadMode: id });
970+
}}
971+
/>
972+
</SettingsSection>
973+
) : null}
974+
935975
<SettingsSection title="Workspace">
936976
<SelectRow
937977
label="Run in"

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import { isWebhookDedupeTemplate } from "@t3tools/contracts";
1+
import { isWebhookDedupeTemplate, scheduledTaskThreadMode } from "@t3tools/contracts";
22
import type {
33
ModelSelection,
44
ServerConfig,
55
ProjectId,
66
RuntimeMode,
77
ScheduledTask,
8+
ScheduledTaskThreadMode,
89
ScheduledTaskUpsertSchedule,
910
ScheduledTaskWebhookSignature,
1011
} from "@t3tools/contracts";
@@ -204,6 +205,7 @@ export type ScheduledTaskDraft = {
204205
readonly modelSelection: ModelSelection | null;
205206
readonly modelSelectionIsExplicit: boolean;
206207
readonly schedule: ScheduleDraft;
208+
readonly threadMode: ScheduledTaskThreadMode;
207209
readonly workspace: Workspace;
208210
readonly baseRef: string;
209211
readonly checkoutPath: string;
@@ -232,6 +234,7 @@ function draftSignature(draft: ScheduledTaskDraft): string {
232234
draft.schedule.coalesceKey,
233235
draft.schedule.coalesceWindowSeconds,
234236
draft.schedule.filters.map(({ path, op, value }) => [path, op, value]),
237+
draft.threadMode,
235238
draft.workspace,
236239
draft.baseRef,
237240
draft.checkoutPath,
@@ -260,6 +263,7 @@ export function createDraft(
260263
modelSelection,
261264
modelSelectionIsExplicit: false,
262265
schedule: DEFAULT_SCHEDULE,
266+
threadMode: "new_thread",
263267
workspace: "worktree",
264268
baseRef: "main",
265269
checkoutPath: "",
@@ -278,6 +282,7 @@ export function editDraft(task: ScheduledTask): ScheduledTaskDraft {
278282
modelSelection: task.modelSelection,
279283
modelSelectionIsExplicit: true,
280284
schedule: scheduleDraftForTask(task),
285+
threadMode: scheduledTaskThreadMode(task),
281286
workspace: task.workspaceStrategy.type,
282287
baseRef: task.workspaceStrategy.type === "worktree" ? task.workspaceStrategy.baseRef : "main",
283288
checkoutPath:

‎apps/server/src/environment/ServerEnvironment.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ export const make = Effect.gen(function* () {
269269
triage: true,
270270
oneTimeSchedules: true,
271271
freshContext: true,
272+
scheduledTaskThreadModes: true,
272273
npmReleaseLookup: true,
273274
...(serverSelfUpdate === null ? {} : { serverSelfUpdate }),
274275
...(serverInstallation === null ? {} : { serverInstallation }),

‎apps/server/src/mcp/OrchestratorMcpService.test.ts‎

Lines changed: 69 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
OrchestratorMcpTarget,
1414
type OrchestrationV2ThreadShell,
1515
type ScheduledTask,
16+
type ScheduledTaskUpsertInput,
1617
ScheduledTaskId,
1718
ProjectId,
1819
ProviderDriverKind,
@@ -2776,6 +2777,8 @@ describe("OrchestratorMcpService provider resolution", () => {
27762777
const service = (
27772778
git: Partial<GitVcsDriver.GitVcsDriver["Service"]>,
27782779
saved: Ref.Ref<ReadonlyArray<ScheduledTask["workspaceStrategy"]>>,
2780+
task: ScheduledTask = existing,
2781+
modes?: Ref.Ref<ReadonlyArray<ScheduledTaskUpsertInput["threadMode"]>>,
27792782
) =>
27802783
OrchestratorMcpService.layer.pipe(
27812784
Layer.provide(Layer.mock(ThreadLaunchService.ThreadLaunchService)({})),
@@ -2784,7 +2787,9 @@ describe("OrchestratorMcpService provider resolution", () => {
27842787
Layer.mergeAll(
27852788
NodeServices.layer,
27862789
NodeCrypto.layer,
2787-
Layer.mock(ThreadManagementService.ThreadManagementService)({}),
2790+
Layer.mock(ThreadManagementService.ThreadManagementService)({
2791+
getThreadShell: () => Effect.succeed(null),
2792+
}),
27882793
ServerSettings.layerTest(),
27892794
Layer.mock(ProviderRegistry.ProviderRegistry)({ getProviders: Effect.succeed([]) }),
27902795
Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({
@@ -2801,10 +2806,15 @@ describe("OrchestratorMcpService provider resolution", () => {
28012806
Layer.mock(SecretRequests.SecretRequests)({}),
28022807
Layer.mock(RemoteDelegation.RemoteDelegation)({}),
28032808
Layer.mock(ScheduledTaskService.ScheduledTaskService)({
2804-
list: () => Effect.succeed({ tasks: [existing] }),
2809+
list: () => Effect.succeed({ tasks: [task] }),
28052810
upsert: (input) =>
28062811
Ref.update(saved, (strategies) => [...strategies, input.workspaceStrategy]).pipe(
2807-
Effect.as({ task: existing }),
2812+
Effect.andThen(
2813+
modes === undefined
2814+
? Effect.void
2815+
: Ref.update(modes, (all) => [...all, input.threadMode]),
2816+
),
2817+
Effect.as({ task }),
28082818
),
28092819
}),
28102820
),
@@ -2831,6 +2841,62 @@ describe("OrchestratorMcpService provider resolution", () => {
28312841
}),
28322842
);
28332843

2844+
it.effect("keeps one thread when fresh sessions are turned off before the first run", () =>
2845+
Effect.gen(function* () {
2846+
const modes = yield* Ref.make<ReadonlyArray<ScheduledTaskUpsertInput["threadMode"]>>([]);
2847+
const mcp = yield* OrchestratorMcpService.OrchestratorMcpService.pipe(
2848+
Effect.provide(
2849+
service(
2850+
masterRepository,
2851+
yield* Ref.make<ReadonlyArray<ScheduledTask["workspaceStrategy"]>>([]),
2852+
{ ...existing, threadMode: "fresh_session" },
2853+
modes,
2854+
),
2855+
),
2856+
);
2857+
yield* mcp.updateScheduledTask(client, {
2858+
scheduledTaskId: existing.id,
2859+
freshSession: false,
2860+
});
2861+
yield* mcp.updateScheduledTask(client, {
2862+
scheduledTaskId: existing.id,
2863+
bindToCurrentThread: false,
2864+
});
2865+
assert.deepEqual(yield* Ref.get(modes), ["continue", "new_thread"]);
2866+
}),
2867+
);
2868+
2869+
it.effect(
2870+
"refuses unbinding into fresh sessions in one call, which would keep the thread",
2871+
() =>
2872+
Effect.gen(function* () {
2873+
const modes = yield* Ref.make<ReadonlyArray<ScheduledTaskUpsertInput["threadMode"]>>([]);
2874+
const mcp = yield* OrchestratorMcpService.OrchestratorMcpService.pipe(
2875+
Effect.provide(
2876+
service(
2877+
masterRepository,
2878+
yield* Ref.make<ReadonlyArray<ScheduledTask["workspaceStrategy"]>>([]),
2879+
{
2880+
...existing,
2881+
threadId: ThreadId.make("thread:scheduled-base"),
2882+
threadMode: "continue",
2883+
},
2884+
modes,
2885+
),
2886+
),
2887+
);
2888+
const refused = yield* mcp
2889+
.updateScheduledTask(client, {
2890+
scheduledTaskId: existing.id,
2891+
bindToCurrentThread: false,
2892+
freshSession: true,
2893+
})
2894+
.pipe(Effect.flip);
2895+
assert.include(refused.message, "first unbind it");
2896+
assert.deepEqual(yield* Ref.get(modes), []);
2897+
}),
2898+
);
2899+
28342900
it.effect("follows the default branch when a task is unbound from its thread", () =>
28352901
Effect.gen(function* () {
28362902
const saved = yield* Ref.make<ReadonlyArray<ScheduledTask["workspaceStrategy"]>>([]);

‎apps/server/src/mcp/OrchestratorMcpService.ts‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ import {
5858
type RuntimeMode,
5959
type ScheduledTask,
6060
type ScheduledTaskUpsertInput,
61+
scheduledTaskThreadMode,
6162
type ServerProvider,
6263
type ServerProviderModel,
6364
ThreadId,
@@ -266,6 +267,7 @@ function scheduledTaskSummary(task: ScheduledTask, mayRun: boolean): Orchestrato
266267
enabled: task.enabled,
267268
projectId: task.projectId,
268269
boundThreadId: task.threadId,
270+
freshSession: scheduledTaskThreadMode(task) === "fresh_session",
269271
schedule: task.schedule,
270272
nextRunAt: task.nextRunAt,
271273
lastRunStatus: task.lastRunStatus,
@@ -2009,6 +2011,11 @@ const make = Effect.gen(function* () {
20092011
schedule: input.schedule,
20102012
projectId,
20112013
threadId: bindToCurrentThread && parent !== undefined ? parent.thread.id : null,
2014+
threadMode: input.freshSession
2015+
? "fresh_session"
2016+
: bindToCurrentThread
2017+
? "continue"
2018+
: "new_thread",
20122019
workspaceStrategy: yield* scheduledTaskWorkspaceStrategy(bindToCurrentThread, projectId),
20132020
modelSelection,
20142021
runtimeMode: limits.runtimeMode,
@@ -2071,6 +2078,18 @@ const make = Effect.gen(function* () {
20712078
: "bindToCurrentThread binds to this thread, which belongs to a different project.",
20722079
);
20732080
}
2081+
// A save keeps a bound thread unless the task goes back to new threads, so this pair
2082+
// would leave runs in the old thread.
2083+
if (
2084+
input.bindToCurrentThread === false &&
2085+
input.freshSession === true &&
2086+
existing.threadId !== null
2087+
) {
2088+
return yield* failure(
2089+
"invalid_request",
2090+
"To move this task to a new thread with fresh sessions, first unbind it with bindToCurrentThread: false, then set freshSession: true in a second call.",
2091+
);
2092+
}
20742093
const threadId =
20752094
input.bindToCurrentThread === undefined
20762095
? existing.threadId
@@ -2090,6 +2109,18 @@ const make = Effect.gen(function* () {
20902109
schedule: input.schedule ?? existing.schedule,
20912110
projectId: existing.projectId,
20922111
threadId,
2112+
threadMode:
2113+
input.freshSession === undefined && input.bindToCurrentThread === undefined
2114+
? scheduledTaskThreadMode(existing)
2115+
: (input.freshSession ??
2116+
(input.bindToCurrentThread !== false &&
2117+
scheduledTaskThreadMode(existing) === "fresh_session"))
2118+
? "fresh_session"
2119+
: threadId === null &&
2120+
(input.bindToCurrentThread === false ||
2121+
scheduledTaskThreadMode(existing) === "new_thread")
2122+
? "new_thread"
2123+
: "continue",
20932124
workspaceStrategy,
20942125
modelSelection: existing.modelSelection,
20952126
runtimeMode: existing.runtimeMode,

‎apps/server/src/orchestration-v2/runtimeLayer.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,8 @@ it.layer(layerProjectDeletionTest)("project deletion during thread commands", (i
425425
}
426426
const save = (name: string, target: ThreadId | null, webhook = false) =>
427427
tasks.upsert({
428+
// As schedule_task sends it, so clearing the thread unbinds the task.
429+
threadMode: target === null ? "new_thread" : "continue",
428430
id: ScheduledTaskId.make(`automation:${deletion}:${name}`),
429431
title: name,
430432
prompt: "Check orchestration progress",

‎apps/server/src/persistence/Migrations.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ import Migration0075 from "./Migrations/075_SubagentDeliveryState.ts";
8181
import Migration0076 from "./Migrations/076_ProjectionProjectsPinArchive.ts";
8282
import Migration0077 from "./Migrations/077_RepairBooleanSettledOverride.ts";
8383
import Migration0078 from "./Migrations/078_DropOrchestrationEventCorrelationIndex.ts";
84-
8584
import Migration0079 from "./Migrations/079_DelegatedRecoveryIndexes.ts";
85+
import Migration0080 from "./Migrations/080_ScheduledTaskThreadMode.ts";
8686

8787
const migrationEntries = [
8888
[1, "OrchestrationEvents", Migration0001],
@@ -165,6 +165,7 @@ const migrationEntries = [
165165
[77, "RepairBooleanSettledOverride", Migration0077],
166166
[78, "DropOrchestrationEventCorrelationIndex", Migration0078],
167167
[79, "DelegatedRecoveryIndexes", Migration0079],
168+
[80, "ScheduledTaskThreadMode", Migration0080],
168169
] as const;
169170

170171
export const migrationManifest = migrationEntries.map(([id, name]) => [id, name] as const);
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import * as Effect from "effect/Effect";
2+
import * as SqlClient from "effect/sql/SqlClient";
3+
4+
export default Effect.gen(function* () {
5+
const sql = yield* SqlClient.SqlClient;
6+
7+
yield* sql`ALTER TABLE scheduled_tasks ADD COLUMN thread_mode TEXT NOT NULL DEFAULT 'new_thread'`;
8+
yield* sql`UPDATE scheduled_tasks SET thread_mode = 'continue' WHERE thread_id IS NOT NULL`;
9+
});

‎apps/server/src/persistence/reconcileV2PreviewMigration.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ describe("V2 preview upgrade", () => {
5959
[77, "RepairBooleanSettledOverride"],
6060
[78, "DropOrchestrationEventCorrelationIndex"],
6161
[79, "DelegatedRecoveryIndexes"],
62+
[80, "ScheduledTaskThreadMode"],
6263
]);
6364
assert.deepStrictEqual(yield* runMigrations(), []);
6465
assert.deepStrictEqual(yield* sql`SELECT * FROM orchestration_v2_legacy_imports`, imports);
@@ -161,6 +162,7 @@ describe("V2 preview upgrade", () => {
161162
[77, "RepairBooleanSettledOverride"],
162163
[78, "DropOrchestrationEventCorrelationIndex"],
163164
[79, "DelegatedRecoveryIndexes"],
165+
[80, "ScheduledTaskThreadMode"],
164166
]);
165167
}).pipe(Effect.provide(NodeSqliteClient.layer({ filename: ":memory:" }))),
166168
);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"claudeSystemAppendBytes": 5133,
33
"codexAdditionalContextBytes": 6863,
4-
"mcpToolListJsonBytes": 47642
4+
"mcpToolListJsonBytes": 47818
55
}

0 commit comments

Comments
 (0)