Skip to content

Commit c0c7405

Browse files
fix(server): t3_thread_list says when its project does not exist (pingdotgg#29187)
1 parent 2ab87e1 commit c0c7405

3 files changed

Lines changed: 48 additions & 2 deletions

File tree

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

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import * as Fiber from "effect/Fiber";
3535
import * as Layer from "effect/Layer";
3636
import * as Queue from "effect/Queue";
3737
import * as Ref from "effect/Ref";
38+
import * as Result from "effect/Result";
3839
import * as Schema from "effect/Schema";
3940
import * as Stream from "effect/Stream";
4041

@@ -3912,7 +3913,21 @@ describe("OrchestratorMcpService thread list", () => {
39123913
Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({
39133914
list: () => Effect.succeed([]),
39143915
}),
3915-
Layer.mock(ProjectService.ProjectService)({}),
3916+
Layer.mock(ProjectService.ProjectService)({
3917+
getById: (id) =>
3918+
shells.some((thread) => thread.projectId === id)
3919+
? Effect.succeedSome({
3920+
id,
3921+
title: id,
3922+
workspaceRoot: `/projects/${id}`,
3923+
defaultModelSelection: null,
3924+
scripts: [],
3925+
createdAt: "2026-10-18T00:00:00.000Z",
3926+
updatedAt: "2026-10-18T00:00:00.000Z",
3927+
deletedAt: null,
3928+
})
3929+
: Effect.succeedNone,
3930+
}),
39163931
Layer.mock(SecretRequests.SecretRequests)({}),
39173932
Layer.mock(RemoteDelegation.RemoteDelegation)({}),
39183933
Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -3939,6 +3954,20 @@ describe("OrchestratorMcpService thread list", () => {
39393954
}).pipe(Effect.provide(service)),
39403955
);
39413956

3957+
it.effect("refuses a projectId that names no project", () =>
3958+
Effect.gen(function* () {
3959+
const mcp = yield* OrchestratorMcpService.OrchestratorMcpService;
3960+
const listed = yield* mcp
3961+
.listThreads(client, { projectId: ProjectId.make("project:missing") })
3962+
.pipe(Effect.result);
3963+
if (Result.isSuccess(listed)) {
3964+
assert.fail(`listed threads for a missing project: ${JSON.stringify(listed.success)}`);
3965+
}
3966+
assert.equal(listed.failure.code, "invalid_request");
3967+
assert.include(listed.failure.message, "not found");
3968+
}).pipe(Effect.provide(service)),
3969+
);
3970+
39423971
it.effect("counts a thread holding awaited background work as live in the status filter", () =>
39433972
Effect.gen(function* () {
39443973
const mcp = yield* OrchestratorMcpService.OrchestratorMcpService;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2969,6 +2969,9 @@ const make = Effect.gen(function* () {
29692969
input.projectId,
29702970
"Pass projectId, or allProjects: true for every project. This MCP client is not running inside a T3 thread.",
29712971
);
2972+
if (!input.allProjects && input.projectId !== undefined) {
2973+
yield* requireProject(input.projectId);
2974+
}
29722975
const projectThreads = yield* threadManagement
29732976
.listProjectThreads({
29742977
projectId: projectId ?? undefined,

‎apps/server/src/mcp/toolkits/core.test.ts‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1100,7 +1100,21 @@ it.effect(
11001100
Layer.provide(Layer.mock(ProviderRegistry.ProviderRegistry)({})),
11011101
Layer.provide(Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({})),
11021102
Layer.provide(Layer.mock(ScheduledTaskService.ScheduledTaskService)({})),
1103-
Layer.provide(Layer.mock(ProjectService.ProjectService)({})),
1103+
Layer.provide(
1104+
Layer.mock(ProjectService.ProjectService)({
1105+
getById: (projectId) =>
1106+
Effect.succeedSome({
1107+
id: projectId,
1108+
title: "MCP test",
1109+
workspaceRoot: "/repo",
1110+
defaultModelSelection: null,
1111+
scripts: [],
1112+
createdAt: "2026-10-18T00:00:00.000Z",
1113+
updatedAt: "2026-10-18T00:00:00.000Z",
1114+
deletedAt: null,
1115+
}),
1116+
}),
1117+
),
11041118
Layer.provide(Layer.mock(SecretRequests.SecretRequests)({})),
11051119
Layer.provide(Layer.mock(PeerForwarding.PeerForwarding)({})),
11061120
Layer.provide(Layer.mock(PeerLinkRequests.PeerLinkRequests)({})),

0 commit comments

Comments
 (0)