From b1932b26f9d6c19721fe31781f6fc861bf059414 Mon Sep 17 00:00:00 2001 From: Victor Vogel Date: Sun, 1 Nov 2026 10:37:28 -0600 Subject: [PATCH 1/2] fix(server): scheduled-task titles no longer end in a broken emoji A title derived from an agent's schedule_task prompt is cut at 80 UTF-16 code units, which can split a surrogate pair and leave a lone high surrogate that renders as a replacement character. Drop that dangling half after the cut, keeping the 80-unit limit, explicit titles and the "Scheduled task" fallback. Co-Authored-By: Claude Opus 5.5 --- .../src/mcp/OrchestratorMcpService.test.ts | 70 +++++++++++++++---- apps/server/src/mcp/OrchestratorMcpService.ts | 8 ++- 2 files changed, 61 insertions(+), 17 deletions(-) diff --git a/apps/server/src/mcp/OrchestratorMcpService.test.ts b/apps/server/src/mcp/OrchestratorMcpService.test.ts index 47a6bda166ce..431bfa2ff396 100644 --- a/apps/server/src/mcp/OrchestratorMcpService.test.ts +++ b/apps/server/src/mcp/OrchestratorMcpService.test.ts @@ -12,6 +12,7 @@ import { type OrchestrationV2ThreadShell, type ScheduledTask, ScheduledTaskId, + type ScheduledTaskUpsertInput, ProjectId, ProviderDriverKind, ProviderInstanceId, @@ -2618,7 +2619,7 @@ describe("OrchestratorMcpService provider resolution", () => { }; const service = ( git: Partial, - saved: Ref.Ref>, + saved: Ref.Ref>, ) => OrchestratorMcpService.layer.pipe( Layer.provide(Layer.mock(ThreadLaunchService.ThreadLaunchService)({})), @@ -2645,7 +2646,7 @@ describe("OrchestratorMcpService provider resolution", () => { Layer.mock(ScheduledTaskService.ScheduledTaskService)({ list: () => Effect.succeed({ tasks: [existing] }), upsert: (input) => - Ref.update(saved, (strategies) => [...strategies, input.workspaceStrategy]).pipe( + Ref.update(saved, (inputs) => [...inputs, input]).pipe( Effect.as({ task: existing }), ), }), @@ -2662,20 +2663,59 @@ describe("OrchestratorMcpService provider resolution", () => { it.effect("starts from the project's default branch", () => Effect.gen(function* () { - const saved = yield* Ref.make>([]); + const saved = yield* Ref.make>([]); const mcp = yield* OrchestratorMcpService.OrchestratorMcpService.pipe( Effect.provide(service(masterRepository, saved)), ); yield* mcp.scheduleTask(client, { projectId, prompt: "Check the build", schedule }); - assert.deepEqual(yield* Ref.get(saved), [ - { type: "worktree", baseRef: "origin/master", startFromOrigin: true }, - ]); + assert.deepEqual( + (yield* Ref.get(saved)).map((input) => input.workspaceStrategy), + [{ type: "worktree", baseRef: "origin/master", startFromOrigin: true }], + ); + }), + ); + + it.effect.each([ + { name: "a long ASCII line", prompt: "a".repeat(100), title: "a".repeat(80) }, + { + name: "an emoji split by the limit", + prompt: `${"a".repeat(79)}😀 rest`, + title: "a".repeat(79), + }, + { + name: "an emoji ending at the limit", + prompt: `${"a".repeat(78)}😀 rest`, + title: `${"a".repeat(78)}😀`, + }, + { name: "a blank first line", prompt: " \nCheck the build", title: "Scheduled task" }, + { + name: "an explicit title", + prompt: `${"a".repeat(79)}😀`, + explicitTitle: "Nightly", + title: "Nightly", + }, + ])("titles $name", ({ prompt, explicitTitle, title }) => + Effect.gen(function* () { + const saved = yield* Ref.make>([]); + const mcp = yield* OrchestratorMcpService.OrchestratorMcpService.pipe( + Effect.provide(service(masterRepository, saved)), + ); + yield* mcp.scheduleTask(client, { + projectId, + prompt, + schedule, + ...(explicitTitle === undefined ? {} : { title: explicitTitle }), + }); + assert.deepEqual( + (yield* Ref.get(saved)).map((input) => input.title), + [title], + ); }), ); it.effect("follows the default branch when a task is unbound from its thread", () => Effect.gen(function* () { - const saved = yield* Ref.make>([]); + const saved = yield* Ref.make>([]); const mcp = yield* OrchestratorMcpService.OrchestratorMcpService.pipe( Effect.provide(service(masterRepository, saved)), ); @@ -2683,9 +2723,10 @@ describe("OrchestratorMcpService provider resolution", () => { scheduledTaskId: existing.id, bindToCurrentThread: false, }); - assert.deepEqual(yield* Ref.get(saved), [ - { type: "worktree", baseRef: "origin/master", startFromOrigin: true }, - ]); + assert.deepEqual( + (yield* Ref.get(saved)).map((input) => input.workspaceStrategy), + [{ type: "worktree", baseRef: "origin/master", startFromOrigin: true }], + ); }), ); @@ -2762,7 +2803,7 @@ describe("OrchestratorMcpService provider resolution", () => { }, ])("$name starts from $baseRef", ({ remote, remoteDefault, refs, baseRef }) => Effect.gen(function* () { - const saved = yield* Ref.make>([]); + const saved = yield* Ref.make>([]); const gitFailure = (cwd: string, detail: string) => new GitCommandError({ operation: "GitVcsDriver.test", command: "git", cwd, detail }); const mcp = yield* OrchestratorMcpService.OrchestratorMcpService.pipe( @@ -2784,9 +2825,10 @@ describe("OrchestratorMcpService provider resolution", () => { ), ); yield* mcp.scheduleTask(client, { projectId, prompt: "Check the build", schedule }); - assert.deepEqual(yield* Ref.get(saved), [ - { type: "worktree", baseRef, startFromOrigin: true }, - ]); + assert.deepEqual( + (yield* Ref.get(saved)).map((input) => input.workspaceStrategy), + [{ type: "worktree", baseRef, startFromOrigin: true }], + ); }), ); }); diff --git a/apps/server/src/mcp/OrchestratorMcpService.ts b/apps/server/src/mcp/OrchestratorMcpService.ts index b124a03ea2c4..dc8c8658ae96 100644 --- a/apps/server/src/mcp/OrchestratorMcpService.ts +++ b/apps/server/src/mcp/OrchestratorMcpService.ts @@ -1971,9 +1971,11 @@ const make = Effect.gen(function* () { } const modelSelection = parent?.thread.modelSelection ?? (yield* projectDefaultModelSelection(project)); - const derivedTitle = input.prompt.split("\n")[0]?.trim() ?? ""; - const title = - input.title ?? (derivedTitle.length > 0 ? derivedTitle.slice(0, 80) : "Scheduled task"); + // Never end on a lone high surrogate, which renders as a broken character. + const derivedTitle = (input.prompt.split("\n")[0]?.trim() ?? "") + .slice(0, 80) + .replace(/[\uD800-\uDBFF]$/, ""); + const title = input.title ?? (derivedTitle.length > 0 ? derivedTitle : "Scheduled task"); const upsertInput: ScheduledTaskUpsertInput = { title, prompt: input.prompt, From cebe7af737c78238bf1b3305d722779701df52c0 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Sat, 14 Nov 2026 13:11:51 +0000 Subject: [PATCH 2/2] test(server): trim scheduled-task title cases to the surrogate split Keep the existing upsert spy shape and capture full inputs only through the optional ref the thread-mode tests already used. Co-Authored-By: Claude Opus 5.5 --- .../src/mcp/OrchestratorMcpService.test.ts | 97 +++++++++---------- 1 file changed, 44 insertions(+), 53 deletions(-) diff --git a/apps/server/src/mcp/OrchestratorMcpService.test.ts b/apps/server/src/mcp/OrchestratorMcpService.test.ts index ec8b16ab5878..e1a77578e289 100644 --- a/apps/server/src/mcp/OrchestratorMcpService.test.ts +++ b/apps/server/src/mcp/OrchestratorMcpService.test.ts @@ -3373,9 +3373,9 @@ describe("OrchestratorMcpService provider resolution", () => { }; const service = ( git: Partial, - saved: Ref.Ref>, + saved: Ref.Ref>, task: ScheduledTask = existing, - modes?: Ref.Ref>, + inputs?: Ref.Ref>, ) => OrchestratorMcpService.layer.pipe( Layer.provide(Layer.mock(ThreadLaunchService.ThreadLaunchService)({})), @@ -3405,11 +3405,11 @@ describe("OrchestratorMcpService provider resolution", () => { Layer.mock(ScheduledTaskService.ScheduledTaskService)({ list: () => Effect.succeed({ tasks: [task] }), upsert: (input) => - Ref.update(saved, (inputs) => [...inputs, input]).pipe( + Ref.update(saved, (strategies) => [...strategies, input.workspaceStrategy]).pipe( Effect.andThen( - modes === undefined + inputs === undefined ? Effect.void - : Ref.update(modes, (all) => [...all, input.threadMode]), + : Ref.update(inputs, (all) => [...all, input]), ), Effect.as({ task }), ), @@ -3427,51 +3427,44 @@ describe("OrchestratorMcpService provider resolution", () => { it.effect("starts from the project's default branch", () => Effect.gen(function* () { - const saved = yield* Ref.make>([]); + const saved = yield* Ref.make>([]); const mcp = yield* OrchestratorMcpService.OrchestratorMcpService.pipe( Effect.provide(service(masterRepository, saved)), ); yield* mcp.scheduleTask(client, { projectId, prompt: "Check the build", schedule }); - assert.deepEqual( - (yield* Ref.get(saved)).map((input) => input.workspaceStrategy), - [{ type: "worktree", baseRef: "origin/master", startFromOrigin: true }], - ); + assert.deepEqual(yield* Ref.get(saved), [ + { type: "worktree", baseRef: "origin/master", startFromOrigin: true }, + ]); }), ); it.effect.each([ - { name: "a long ASCII line", prompt: "a".repeat(100), title: "a".repeat(80) }, { - name: "an emoji split by the limit", + name: "drops an emoji the limit splits", prompt: `${"a".repeat(79)}😀 rest`, title: "a".repeat(79), }, { - name: "an emoji ending at the limit", + name: "keeps an emoji that ends at the limit", prompt: `${"a".repeat(78)}😀 rest`, title: `${"a".repeat(78)}😀`, }, - { name: "a blank first line", prompt: " \nCheck the build", title: "Scheduled task" }, - { - name: "an explicit title", - prompt: `${"a".repeat(79)}😀`, - explicitTitle: "Nightly", - title: "Nightly", - }, - ])("titles $name", ({ prompt, explicitTitle, title }) => + ])("a prompt-derived title $name", ({ prompt, title }) => Effect.gen(function* () { - const saved = yield* Ref.make>([]); + const inputs = yield* Ref.make>([]); const mcp = yield* OrchestratorMcpService.OrchestratorMcpService.pipe( - Effect.provide(service(masterRepository, saved)), + Effect.provide( + service( + masterRepository, + yield* Ref.make>([]), + existing, + inputs, + ), + ), ); - yield* mcp.scheduleTask(client, { - projectId, - prompt, - schedule, - ...(explicitTitle === undefined ? {} : { title: explicitTitle }), - }); + yield* mcp.scheduleTask(client, { projectId, prompt, schedule }); assert.deepEqual( - (yield* Ref.get(saved)).map((input) => input.title), + (yield* Ref.get(inputs)).map((input) => input.title), [title], ); }), @@ -3479,14 +3472,14 @@ describe("OrchestratorMcpService provider resolution", () => { it.effect("keeps one thread when fresh sessions are turned off before the first run", () => Effect.gen(function* () { - const modes = yield* Ref.make>([]); + const inputs = yield* Ref.make>([]); const mcp = yield* OrchestratorMcpService.OrchestratorMcpService.pipe( Effect.provide( service( masterRepository, - yield* Ref.make>([]), + yield* Ref.make>([]), { ...existing, threadMode: "fresh_session" }, - modes, + inputs, ), ), ); @@ -3498,7 +3491,10 @@ describe("OrchestratorMcpService provider resolution", () => { scheduledTaskId: existing.id, bindToCurrentThread: false, }); - assert.deepEqual(yield* Ref.get(modes), ["continue", "new_thread"]); + assert.deepEqual( + (yield* Ref.get(inputs)).map((input) => input.threadMode), + ["continue", "new_thread"], + ); }), ); @@ -3506,18 +3502,18 @@ describe("OrchestratorMcpService provider resolution", () => { "refuses unbinding into fresh sessions in one call, which would keep the thread", () => Effect.gen(function* () { - const modes = yield* Ref.make>([]); + const inputs = yield* Ref.make>([]); const mcp = yield* OrchestratorMcpService.OrchestratorMcpService.pipe( Effect.provide( service( masterRepository, - yield* Ref.make>([]), + yield* Ref.make>([]), { ...existing, threadId: ThreadId.make("thread:scheduled-base"), threadMode: "continue", }, - modes, + inputs, ), ), ); @@ -3529,13 +3525,13 @@ describe("OrchestratorMcpService provider resolution", () => { }) .pipe(Effect.flip); assert.include(refused.message, "first unbind it"); - assert.deepEqual(yield* Ref.get(modes), []); + assert.deepEqual(yield* Ref.get(inputs), []); }), ); it.effect("follows the default branch when a task is unbound from its thread", () => Effect.gen(function* () { - const saved = yield* Ref.make>([]); + const saved = yield* Ref.make>([]); const mcp = yield* OrchestratorMcpService.OrchestratorMcpService.pipe( Effect.provide( service(masterRepository, saved, { @@ -3549,16 +3545,15 @@ describe("OrchestratorMcpService provider resolution", () => { scheduledTaskId: existing.id, bindToCurrentThread: false, }); - assert.deepEqual( - (yield* Ref.get(saved)).map((input) => input.workspaceStrategy), - [{ type: "worktree", baseRef: "origin/master", startFromOrigin: true }], - ); + assert.deepEqual(yield* Ref.get(saved), [ + { type: "worktree", baseRef: "origin/master", startFromOrigin: true }, + ]); }), ); it.effect("keeps the saved workspace when an unbound task stays unbound", () => Effect.gen(function* () { - const saved = yield* Ref.make>([]); + const saved = yield* Ref.make>([]); const mcp = yield* OrchestratorMcpService.OrchestratorMcpService.pipe( Effect.provide(service(masterRepository, saved)), ); @@ -3566,10 +3561,7 @@ describe("OrchestratorMcpService provider resolution", () => { scheduledTaskId: existing.id, bindToCurrentThread: false, }); - assert.deepEqual( - (yield* Ref.get(saved)).map((input) => input.workspaceStrategy), - [{ type: "root" }], - ); + assert.deepEqual(yield* Ref.get(saved), [{ type: "root" }]); }), ); @@ -3646,7 +3638,7 @@ describe("OrchestratorMcpService provider resolution", () => { }, ])("$name starts from $baseRef", ({ remote, remoteDefault, refs, baseRef }) => Effect.gen(function* () { - const saved = yield* Ref.make>([]); + const saved = yield* Ref.make>([]); const gitFailure = (cwd: string, detail: string) => new GitCommandError({ operation: "GitVcsDriver.test", command: "git", cwd, detail }); const mcp = yield* OrchestratorMcpService.OrchestratorMcpService.pipe( @@ -3668,10 +3660,9 @@ describe("OrchestratorMcpService provider resolution", () => { ), ); yield* mcp.scheduleTask(client, { projectId, prompt: "Check the build", schedule }); - assert.deepEqual( - (yield* Ref.get(saved)).map((input) => input.workspaceStrategy), - [{ type: "worktree", baseRef, startFromOrigin: true }], - ); + assert.deepEqual(yield* Ref.get(saved), [ + { type: "worktree", baseRef, startFromOrigin: true }, + ]); }), ); });