Skip to content

Commit d6134f8

Browse files
feat(scheduled-tasks): bound tasks can steer, steer-or-start, or restart instead of queueing
Scheduled and webhook tasks bound to a thread always queued behind the running turn. Tasks now store a delivery mode (queue, auto, steer, restart) that the run passes to sendToThread. It defaults to queue, and a save that omits it keeps the stored mode. Web and mobile editors show it for thread-bound tasks. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 62db662 commit d6134f8

16 files changed

Lines changed: 158 additions & 5 deletions

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ import { ScreenScrollView as ScrollView } from "../../components/ui/ScreenScroll
5454
import { SegmentedControl } from "../../components/ui/SegmentedControl";
5555
import { ThemedSwitch } from "../../components/ui/ThemedSwitch";
5656
import { webhookAddress } from "@t3tools/client-runtime/webhook-address";
57+
import {
58+
SCHEDULED_TASK_SEND_MODE_COPY,
59+
SCHEDULED_TASK_SEND_MODES,
60+
} from "@t3tools/client-runtime/scheduled-task-send-mode";
5761
import { tryCopyTextWithHaptic } from "../../lib/copyTextWithHaptic";
5862
import { usePreparedConnection } from "../../state/session";
5963
import { buildModelOptions } from "../../lib/modelOptions";
@@ -795,6 +799,7 @@ function TaskForm({
795799
schedule,
796800
enabled: draft.enabled,
797801
threadId: draft.task?.threadId ?? null,
802+
sendMode: draft.sendMode,
798803
workspaceStrategy:
799804
draft.workspace === "root"
800805
? { type: "root" }
@@ -932,6 +937,31 @@ function TaskForm({
932937
/>
933938
</SettingsSection>
934939

940+
{draft.task?.threadId ? (
941+
<SettingsSection
942+
title="Thread"
943+
footer={SCHEDULED_TASK_SEND_MODE_COPY[draft.sendMode].description}
944+
>
945+
<SelectRow
946+
label="Delivery"
947+
value={SCHEDULED_TASK_SEND_MODE_COPY[draft.sendMode].label}
948+
actions={
949+
saving || dictationPending
950+
? []
951+
: SCHEDULED_TASK_SEND_MODES.map((mode) => ({
952+
id: mode,
953+
title: SCHEDULED_TASK_SEND_MODE_COPY[mode].label,
954+
state: mode === draft.sendMode ? "on" : undefined,
955+
}))
956+
}
957+
onSelect={(id) => {
958+
const mode = SCHEDULED_TASK_SEND_MODES.find((candidate) => candidate === id);
959+
if (mode) setDraft({ ...draft, sendMode: mode });
960+
}}
961+
/>
962+
</SettingsSection>
963+
) : null}
964+
935965
<SettingsSection title="Workspace">
936966
<SelectRow
937967
label="Run in"

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import type {
55
ProjectId,
66
RuntimeMode,
77
ScheduledTask,
8+
ScheduledTaskSendMode,
89
ScheduledTaskUpsertSchedule,
910
ScheduledTaskWebhookSignature,
1011
} from "@t3tools/contracts";
@@ -210,6 +211,7 @@ export type ScheduledTaskDraft = {
210211
readonly enabled: boolean;
211212
readonly startFromOrigin: boolean;
212213
readonly runtimeMode: RuntimeMode;
214+
readonly sendMode: ScheduledTaskSendMode;
213215
};
214216

215217
function draftSignature(draft: ScheduledTaskDraft): string {
@@ -238,6 +240,7 @@ function draftSignature(draft: ScheduledTaskDraft): string {
238240
draft.enabled,
239241
draft.startFromOrigin,
240242
draft.runtimeMode,
243+
draft.sendMode,
241244
]);
242245
}
243246

@@ -266,6 +269,7 @@ export function createDraft(
266269
enabled: true,
267270
startFromOrigin: true,
268271
runtimeMode: "full-access",
272+
sendMode: "queue",
269273
};
270274
}
271275

@@ -290,5 +294,6 @@ export function editDraft(task: ScheduledTask): ScheduledTaskDraft {
290294
? (task.workspaceStrategy.startFromOrigin ?? false)
291295
: true,
292296
runtimeMode: task.runtimeMode,
297+
sendMode: task.sendMode,
293298
};
294299
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2499,6 +2499,7 @@ describe("OrchestratorMcpService provider resolution", () => {
24992499
schedule: { type: "webhook", signature: null },
25002500
projectId,
25012501
threadId: null,
2502+
sendMode: "queue",
25022503
workspaceStrategy: { type: "root" },
25032504
modelSelection: { instanceId: ProviderInstanceId.make("codex"), model: "gpt-5" },
25042505
runtimeMode: "approval-required",
@@ -2747,6 +2748,7 @@ describe("OrchestratorMcpService provider resolution", () => {
27472748
schedule: { type: "interval", everyMs: 3_600_000 },
27482749
projectId,
27492750
threadId: null,
2751+
sendMode: "queue",
27502752
workspaceStrategy: { type: "root" },
27512753
modelSelection: { instanceId: ProviderInstanceId.make("codex"), model: "gpt-5" },
27522754
runtimeMode: "approval-required",

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ import Migration0077 from "./Migrations/077_RepairBooleanSettledOverride.ts";
8383
import Migration0078 from "./Migrations/078_DropOrchestrationEventCorrelationIndex.ts";
8484

8585
import Migration0079 from "./Migrations/079_DelegatedRecoveryIndexes.ts";
86+
import Migration0080 from "./Migrations/080_ScheduledTaskSendMode.ts";
8687

8788
const migrationEntries = [
8889
[1, "OrchestrationEvents", Migration0001],
@@ -165,6 +166,7 @@ const migrationEntries = [
165166
[77, "RepairBooleanSettledOverride", Migration0077],
166167
[78, "DropOrchestrationEventCorrelationIndex", Migration0078],
167168
[79, "DelegatedRecoveryIndexes", Migration0079],
169+
[80, "ScheduledTaskSendMode", Migration0080],
168170
] as const;
169171

170172
export const migrationManifest = migrationEntries.map(([id, name]) => [id, name] as const);
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
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+
yield* sql`ALTER TABLE scheduled_tasks ADD COLUMN send_mode TEXT NOT NULL DEFAULT 'queue'`;
7+
});

‎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, "ScheduledTaskSendMode"],
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, "ScheduledTaskSendMode"],
164166
]);
165167
}).pipe(Effect.provide(NodeSqliteClient.layer({ filename: ":memory:" }))),
166168
);

‎apps/server/src/scheduledTasks/ScheduledTaskService.test.ts‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
ProviderInstanceId,
99
ScheduledTaskError,
1010
ScheduledTaskId,
11+
type ScheduledTaskUpsertInput,
1112
ThreadId,
1213
} from "@t3tools/contracts";
1314
import * as DateTime from "effect/DateTime";
@@ -414,7 +415,9 @@ it.effect("a bound run follows its thread when promotion moves it mid-send", ()
414415
Effect.gen(function* () {
415416
const scratch = ProjectId.make("project:scratch");
416417
const promoted = ProjectId.make("project:promoted");
417-
const sends = yield* Ref.make<Array<{ projectId: ProjectId; commandId: string }>>([]);
418+
const sends = yield* Ref.make<Array<{ projectId: ProjectId; commandId: string; mode: string }>>(
419+
[],
420+
);
418421
// Rebind lands first, then the promotion commits between the shell read and the retry.
419422
const shellProjects = yield* Ref.make([scratch, promoted]);
420423
const layer = ScheduledTaskService.layer.pipe(
@@ -426,7 +429,7 @@ it.effect("a bound run follows its thread when promotion moves it mid-send", ()
426429
sendToThread: (input) =>
427430
Ref.updateAndGet(sends, (all) => [
428431
...all,
429-
{ projectId: input.projectId, commandId: input.commandId },
432+
{ projectId: input.projectId, commandId: input.commandId, mode: input.mode },
430433
]).pipe(
431434
Effect.flatMap((all) =>
432435
all.length < 3
@@ -458,7 +461,7 @@ it.effect("a bound run follows its thread when promotion moves it mid-send", ()
458461
yield* Effect.gen(function* () {
459462
const service = yield* ScheduledTaskService.ScheduledTaskService;
460463
const threadId = ThreadId.make("thread:promoted-during-run");
461-
const { task } = yield* service.upsert({
464+
const input: ScheduledTaskUpsertInput = {
462465
id: ScheduledTaskId.make("task:promoted-during-run"),
463466
title: "Check in",
464467
prompt: "Check progress",
@@ -470,7 +473,10 @@ it.effect("a bound run follows its thread when promotion moves it mid-send", ()
470473
modelSelection: { instanceId: ProviderInstanceId.make("codex"), model: "gpt-5.4" },
471474
runtimeMode: "full-access",
472475
interactionMode: "default",
473-
});
476+
};
477+
yield* service.upsert({ ...input, sendMode: "auto" });
478+
// A save from a client or tool that predates the mode keeps it.
479+
const { task } = yield* service.upsert(input);
474480

475481
const result = yield* service.runNow({ id: task.id });
476482

@@ -481,6 +487,7 @@ it.effect("a bound run follows its thread when promotion moves it mid-send", ()
481487
[promoted, scratch, promoted],
482488
);
483489
assert.equal(new Set(attempts.map((attempt) => attempt.commandId)).size, 1);
490+
assert.deepEqual(new Set(attempts.map((attempt) => attempt.mode)), new Set(["auto"]));
484491
}).pipe(Effect.provide(layer));
485492
}).pipe(Effect.provide(SqlitePersistence.layerMemory)),
486493
);

‎apps/server/src/scheduledTasks/ScheduledTaskService.ts‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ interface ScheduledTaskRow {
199199
readonly schedule_json: string;
200200
readonly project_id: string;
201201
readonly thread_id: string | null;
202+
readonly send_mode: string;
202203
readonly workspace_strategy_json: string;
203204
readonly model_selection_json: string;
204205
readonly runtime_mode: string;
@@ -372,6 +373,7 @@ const decodeRow = Effect.fnUntraced(
372373
schedule,
373374
projectId: row.project_id,
374375
threadId: row.thread_id,
376+
sendMode: row.send_mode,
375377
workspaceStrategy,
376378
modelSelection,
377379
runtimeMode: row.runtime_mode,
@@ -494,6 +496,7 @@ export const layer = Layer.effect(
494496
schedule_json,
495497
project_id,
496498
thread_id,
499+
send_mode,
497500
workspace_strategy_json,
498501
model_selection_json,
499502
runtime_mode,
@@ -535,6 +538,7 @@ export const layer = Layer.effect(
535538
schedule_json,
536539
project_id,
537540
thread_id,
541+
send_mode,
538542
workspace_strategy_json,
539543
model_selection_json,
540544
runtime_mode,
@@ -612,6 +616,7 @@ export const layer = Layer.effect(
612616
schedule_json,
613617
project_id,
614618
thread_id,
619+
send_mode,
615620
workspace_strategy_json,
616621
model_selection_json,
617622
runtime_mode,
@@ -636,6 +641,7 @@ export const layer = Layer.effect(
636641
${JSON.stringify(task.schedule)},
637642
${task.projectId},
638643
${task.threadId},
644+
${task.sendMode},
639645
${JSON.stringify(task.workspaceStrategy)},
640646
${JSON.stringify(task.modelSelection)},
641647
${task.runtimeMode},
@@ -661,6 +667,7 @@ export const layer = Layer.effect(
661667
schedule_json = excluded.schedule_json,
662668
project_id = excluded.project_id,
663669
thread_id = excluded.thread_id,
670+
send_mode = excluded.send_mode,
664671
workspace_strategy_json = excluded.workspace_strategy_json,
665672
model_selection_json = excluded.model_selection_json,
666673
runtime_mode = excluded.runtime_mode,
@@ -902,7 +909,7 @@ export const layer = Layer.effect(
902909
scheduledTaskId: active.id,
903910
text: prompt,
904911
attachments: [],
905-
mode: "queue",
912+
mode: active.sendMode,
906913
createdBy: active.createdBy,
907914
creationSource: active.creationSource,
908915
})
@@ -1328,6 +1335,8 @@ export const layer = Layer.effect(
13281335
schedule,
13291336
projectId: input.projectId,
13301337
threadId: input.threadId ?? null,
1338+
// Omitted keeps the stored mode, so clients and tools that predate it keep it on re-save.
1339+
sendMode: input.sendMode ?? existingTask?.sendMode ?? "queue",
13311340
workspaceStrategy,
13321341
modelSelection: input.modelSelection,
13331342
runtimeMode: input.runtimeMode,

‎apps/web/src/components/settings/ScheduledTasksSettings.browser.test.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const task: ScheduledTask = {
2626
schedule: { type: "interval", everyMs: 60_000 },
2727
projectId,
2828
threadId: ThreadId.make("older-thread"),
29+
sendMode: "queue",
2930
workspaceStrategy: { type: "root" },
3031
modelSelection: { instanceId: ProviderInstanceId.make("codex"), model: "gpt-5.4" },
3132
runtimeMode: "full-access",

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import type {
2020
ScheduledTask,
2121
ScheduledTaskId,
2222
ScheduledTaskSchedule,
23+
ScheduledTaskSendMode,
2324
ScheduledTaskUpsertInput,
2425
ScheduledTaskWebhookDeliverySummary,
2526
ThreadId,
@@ -32,6 +33,10 @@ import {
3233
WEBHOOK_FILTER_OPS,
3334
type WebhookFilterDraft,
3435
} from "@t3tools/client-runtime/scheduled-task-webhook";
36+
import {
37+
SCHEDULED_TASK_SEND_MODE_COPY,
38+
SCHEDULED_TASK_SEND_MODES,
39+
} from "@t3tools/client-runtime/scheduled-task-send-mode";
3540
import {
3641
MAX_WEBHOOK_DELIVERY_AGE_MINUTES,
3742
MAX_WEBHOOK_FILTERS,
@@ -149,6 +154,7 @@ const EMPTY_DRAFT: DraftState = {
149154
weekdays: new Set([1, 2, 3, 4, 5]),
150155
projectId: "",
151156
threadId: "",
157+
sendMode: "queue",
152158
workspaceMode: "worktree",
153159
baseRef: "main",
154160
startFromOrigin: true,
@@ -1356,6 +1362,7 @@ function ScheduledTaskEditorForm({
13561362
schedule,
13571363
projectId: selectedProjectId as ProjectId,
13581364
threadId: draft.threadId ? (draft.threadId as ThreadId) : null,
1365+
sendMode: draft.sendMode,
13591366
workspaceStrategy,
13601367
modelSelection,
13611368
// Tasks have no mode picker; a mode above the administrator's ceiling would fail every run.
@@ -1484,6 +1491,35 @@ function ScheduledTaskEditorForm({
14841491
threadId={draft.threadId ? (draft.threadId as ThreadId) : null}
14851492
/>
14861493

1494+
{draft.threadId ? (
1495+
<Field label="Delivery" htmlFor="scheduled-task-send-mode">
1496+
<Select
1497+
value={draft.sendMode}
1498+
onValueChange={(value) =>
1499+
setDraft((current) => ({ ...current, sendMode: value as ScheduledTaskSendMode }))
1500+
}
1501+
>
1502+
<SelectTrigger size="sm" id="scheduled-task-send-mode">
1503+
<SelectValue>{SCHEDULED_TASK_SEND_MODE_COPY[draft.sendMode].label}</SelectValue>
1504+
</SelectTrigger>
1505+
<SelectPopup>
1506+
{SCHEDULED_TASK_SEND_MODES.map((mode) => (
1507+
<SelectItem
1508+
key={mode}
1509+
value={mode}
1510+
label={SCHEDULED_TASK_SEND_MODE_COPY[mode].label}
1511+
>
1512+
{SCHEDULED_TASK_SEND_MODE_COPY[mode].label}
1513+
</SelectItem>
1514+
))}
1515+
</SelectPopup>
1516+
</Select>
1517+
<p className="text-xs text-muted-foreground">
1518+
{SCHEDULED_TASK_SEND_MODE_COPY[draft.sendMode].description}
1519+
</p>
1520+
</Field>
1521+
) : null}
1522+
14871523
<div className="grid gap-3 sm:grid-cols-2">
14881524
<Field label="Project" htmlFor="scheduled-task-project">
14891525
<Select

0 commit comments

Comments
 (0)