diff --git a/apps/server/src/mcp/OrchestratorMcpService.test.ts b/apps/server/src/mcp/OrchestratorMcpService.test.ts index fb087724dbdb..e1a77578e289 100644 --- a/apps/server/src/mcp/OrchestratorMcpService.test.ts +++ b/apps/server/src/mcp/OrchestratorMcpService.test.ts @@ -3375,7 +3375,7 @@ describe("OrchestratorMcpService provider resolution", () => { git: Partial, saved: Ref.Ref>, task: ScheduledTask = existing, - modes?: Ref.Ref>, + inputs?: Ref.Ref>, ) => OrchestratorMcpService.layer.pipe( Layer.provide(Layer.mock(ThreadLaunchService.ThreadLaunchService)({})), @@ -3407,9 +3407,9 @@ describe("OrchestratorMcpService provider resolution", () => { upsert: (input) => 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 }), ), @@ -3438,16 +3438,48 @@ describe("OrchestratorMcpService provider resolution", () => { }), ); + it.effect.each([ + { + name: "drops an emoji the limit splits", + prompt: `${"a".repeat(79)}😀 rest`, + title: "a".repeat(79), + }, + { + name: "keeps an emoji that ends at the limit", + prompt: `${"a".repeat(78)}😀 rest`, + title: `${"a".repeat(78)}😀`, + }, + ])("a prompt-derived title $name", ({ prompt, title }) => + Effect.gen(function* () { + const inputs = yield* Ref.make>([]); + const mcp = yield* OrchestratorMcpService.OrchestratorMcpService.pipe( + Effect.provide( + service( + masterRepository, + yield* Ref.make>([]), + existing, + inputs, + ), + ), + ); + yield* mcp.scheduleTask(client, { projectId, prompt, schedule }); + assert.deepEqual( + (yield* Ref.get(inputs)).map((input) => input.title), + [title], + ); + }), + ); + 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>([]), { ...existing, threadMode: "fresh_session" }, - modes, + inputs, ), ), ); @@ -3459,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"], + ); }), ); @@ -3467,7 +3502,7 @@ 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( @@ -3478,7 +3513,7 @@ describe("OrchestratorMcpService provider resolution", () => { threadId: ThreadId.make("thread:scheduled-base"), threadMode: "continue", }, - modes, + inputs, ), ), ); @@ -3490,7 +3525,7 @@ 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), []); }), ); diff --git a/apps/server/src/mcp/OrchestratorMcpService.ts b/apps/server/src/mcp/OrchestratorMcpService.ts index d7ef5f788f0b..2d0e7847389a 100644 --- a/apps/server/src/mcp/OrchestratorMcpService.ts +++ b/apps/server/src/mcp/OrchestratorMcpService.ts @@ -2161,9 +2161,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,