diff --git a/apps/server/src/mcp/OrchestratorMcpService.test.ts b/apps/server/src/mcp/OrchestratorMcpService.test.ts index f49bcc7c9412..aae212b82c86 100644 --- a/apps/server/src/mcp/OrchestratorMcpService.test.ts +++ b/apps/server/src/mcp/OrchestratorMcpService.test.ts @@ -2866,7 +2866,7 @@ describe("OrchestratorMcpService provider resolution", () => { projectId, title: "MCP parent", modelSelection: { instanceId: codexInstanceId, model: "gpt-5.4" }, - runtimeMode: "full-access", + runtimeMode: "approval-required", interactionMode: "default", branch: null, worktreePath: cwd, @@ -2910,6 +2910,23 @@ describe("OrchestratorMcpService provider resolution", () => { ...request, clientRequestId: "empty", }); + const raised = yield* service.createThreads(scope, { + ...request, + clientRequestId: "raised", + }); + const raisedId = raised.threads[0]!.threadId; + yield* orchestrator.dispatch({ + type: "thread.runtime-mode.set", + commandId: CommandId.make("raise-created-thread"), + threadId: raisedId, + runtimeMode: "full-access", + }); + const rejected = yield* service + .createThreads(scope, { ...withPrompt, clientRequestId: "raised" }) + .pipe(Effect.flip); + assert.equal(rejected.code, "runtime_mode_escalation_denied"); + assert.equal((yield* orchestrator.getThreadProjection(raisedId)).runs.length, 0); + const emojiAtLimit = yield* service.createThreads(scope, { threads: [{ ...request.threads[0]!, prompt: `${"a".repeat(76)}😀 and more work.` }], clientRequestId: "emoji-title", diff --git a/apps/server/src/mcp/OrchestratorMcpService.ts b/apps/server/src/mcp/OrchestratorMcpService.ts index 5c5c9636406e..b7908d1d7487 100644 --- a/apps/server/src/mcp/OrchestratorMcpService.ts +++ b/apps/server/src/mcp/OrchestratorMcpService.ts @@ -3127,6 +3127,8 @@ const make = Effect.gen(function* () { initialMessage !== undefined && !created.storedEvents.some(({ event }) => event.type === "run.created") ) { + const currentParent = (yield* loadThreadRecords(scope.thread.threadId, [])).thread; + const refused = yield* Ref.make(undefined); yield* threadManagement .dispatch({ ...initialMessage, @@ -3144,6 +3146,11 @@ const make = Effect.gen(function* () { dispatchMode: { type: "start_immediately" }, }) .pipe( + Effect.provideService(DispatchModeLimit, { + runtimeMode: currentParent.runtimeMode, + interactionMode: currentParent.interactionMode, + refused, + }), Effect.mapError((error) => error._tag === "ThreadManagementProviderInstanceDisabledError" ? threadManagementFailure(error) @@ -3152,6 +3159,20 @@ const make = Effect.gen(function* () { `Unable to start thread ${index + 1}: ${userFacingDispatchErrorMessage(error) ?? errorMessage(error)}`, ), ), + Effect.catch((error) => + Effect.flatMap(Ref.get(refused), (refusal) => + Effect.fail( + refusal === undefined + ? error + : failure( + refusal.mode === "runtime" + ? "runtime_mode_escalation_denied" + : "interaction_mode_escalation_denied", + `Thread ${refusal.threadId} now runs in ${refusal.runtimeMode}/${refusal.interactionMode} mode, above this thread's.`, + ), + ), + ), + ), ); } const projection = yield* loadThreadRecords(threadId, ["runs"]); diff --git a/apps/server/src/mcp/toolkits/project/handlers.test.ts b/apps/server/src/mcp/toolkits/project/handlers.test.ts index c95fadd9096e..7d3b1cdc2d75 100644 --- a/apps/server/src/mcp/toolkits/project/handlers.test.ts +++ b/apps/server/src/mcp/toolkits/project/handlers.test.ts @@ -540,16 +540,22 @@ it.effect("a launch binds only an existing checkout that is one of the project's McpToolAccess.HandlersLayer.layer(ProjectHandlers.layer).pipe(Layer.provide(dependencies)), ), ); - const launchInto = (worktreePath: string) => + const launchInto = (worktreePath: string, clientRequestId?: string) => toolkit .handle("t3_thread_launch", { title: "Fix", projectId, + ...(clientRequestId === undefined ? {} : { clientRequestId }), workspaceStrategy: { type: "existing_worktree", worktreePath }, }) .pipe(Stream.unwrap, Stream.runCollect, Effect.provide(dependencies)); - expect((yield* launchInto(worktree)).at(-1)?.result).toMatchObject({ projectId }); + expect((yield* launchInto(worktree, "existing-checkout")).at(-1)?.result).toMatchObject({ + projectId, + }); + expect((yield* launchInto(outside, "existing-checkout")).at(-1)?.result).toMatchObject({ + code: "invalid_request", + }); expect((yield* launchInto(repo)).at(-1)?.result).toMatchObject({ projectId }); for (const elsewhere of [outside, path.join(worktree, "..", "outside"), "/"]) { expect((yield* launchInto(elsewhere)).at(-1)?.result).toMatchObject({ diff --git a/apps/server/src/mcp/toolkits/project/handlers.ts b/apps/server/src/mcp/toolkits/project/handlers.ts index 7a2fb5381227..f3266fedbad4 100644 --- a/apps/server/src/mcp/toolkits/project/handlers.ts +++ b/apps/server/src/mcp/toolkits/project/handlers.ts @@ -161,24 +161,30 @@ export const layer = McpToolAccess.toLayer(ProjectToolkit, { const launchedModel = launched === null || launched.deletedAt !== null ? undefined : launched.modelSelection; const replaying = launchedModel !== undefined; - const project = replaying - ? undefined - : yield* Project.ProjectService.pipe( - Effect.flatMap((projects) => projects.getById(projectId)), - Effect.mapError(unavailable), - Effect.flatMap( - Option.match({ - onNone: () => - Effect.fail( - new OrchestratorMcpFailure({ - code: "invalid_request", - message: "The project was not found.", - }), - ), - onSome: Effect.succeed, - }), - ), - ); + if (launched !== null && replaying && launched.projectId !== projectId) + return yield* new OrchestratorMcpFailure({ + code: "invalid_request", + message: "A launch retry must use the original project.", + }); + const project = + replaying && input.workspaceStrategy?.type !== "existing_worktree" + ? undefined + : yield* Project.ProjectService.pipe( + Effect.flatMap((projects) => projects.getById(projectId)), + Effect.mapError(unavailable), + Effect.flatMap( + Option.match({ + onNone: () => + Effect.fail( + new OrchestratorMcpFailure({ + code: "invalid_request", + message: "The project was not found.", + }), + ), + onSome: Effect.succeed, + }), + ), + ); if (project !== undefined && input.workspaceStrategy?.type === "existing_worktree") yield* assertProjectWorktree(project.workspaceRoot, input.workspaceStrategy.worktreePath); if (!replaying && input.modelSelection !== undefined) { @@ -189,7 +195,7 @@ export const layer = McpToolAccess.toLayer(ProjectToolkit, { yield* OrchestrationMcp.requireAdvertisedModel(provider, model); } const projectSettings = - project === undefined + replaying || project === undefined ? undefined : yield* ServerSettings.ServerSettingsService.pipe( Effect.flatMap((settings) => settings.getSettings), diff --git a/apps/server/src/orchestration-v2/ThreadLaunchService.ts b/apps/server/src/orchestration-v2/ThreadLaunchService.ts index eb452b883d76..21a9e829f780 100644 --- a/apps/server/src/orchestration-v2/ThreadLaunchService.ts +++ b/apps/server/src/orchestration-v2/ThreadLaunchService.ts @@ -1334,7 +1334,10 @@ const make = Effect.gen(function* () { const threadId = claimed.storedEvents.find((stored) => stored.event.type.startsWith("thread."))?.event .threadId ?? candidateThreadId; - if (project.id !== input.projectId) { + const committedThread = yield* threads + .getThreadShell(threadId) + .pipe(Effect.mapError(mapError(input, "resolve-project", threadId))); + if (committedThread?.projectId !== input.projectId) { return yield* mapError(input, "resolve-project", threadId)("Project identity changed."); } let runId: RunId | null = null; @@ -1410,7 +1413,8 @@ const make = Effect.gen(function* () { // retry's own strategy, whose defaults may resolve differently. const accepted = current?.runs.find((run) => run.id === runId)?.workspacePreparation; const preparationStrategy: ThreadLaunchWorkspaceStrategy = - Option.isSome(launchReceipt) && accepted?.type === "worktree" + Option.isSome(launchReceipt) && + (accepted?.type === "worktree" || accepted?.type === "existing_worktree") ? accepted : Option.isSome(launchReceipt) && workspaceStrategy.type === "root" &&