Skip to content

fix(server): t3_thread_list counts threads waiting on background work as live #34674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusmarminge merged 2 commits into from
Nov 12, 2026
+32 −4
Merged

fix(server): t3_thread_list counts threads waiting on background work as live #34674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13dc3d8
test(server): thread list status filter skips threads holding awaited…
juliusmarminge Nov 12, 2026
05087f3
fix(server): t3_thread_list counts threads waiting on background work…
juliusmarminge Nov 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions apps/server/src/mcp/OrchestratorMcpService.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3886,6 +3886,13 @@ describe("OrchestratorMcpService thread list", () => {
shell("thread:a-snoozed", "project:a", true),
shell("thread:a-awake", "project:a", false),
shell("thread:b-snoozed", "project:b", true),
{
...shell("thread:a-awaiting-command", "project:a", false),
activityRunStatus: null,
pendingBackgroundTasks: [
{ taskId: "sleep-600", kind: "command" as const, awaited: true as const },
],
},
];
const service = layerOrchestratorService.pipe(
Layer.provide(
Expand Down Expand Up @@ -3932,6 +3939,20 @@ describe("OrchestratorMcpService thread list", () => {
}).pipe(Effect.provide(service)),
);

it.effect("counts a thread holding awaited background work as live in the status filter", () =>
Effect.gen(function* () {
const mcp = yield* OrchestratorMcpService.OrchestratorMcpService;
const listed = yield* mcp.listThreads(client, {
projectId: ProjectId.make("project:a"),
statuses: ["preparing", "queued", "starting", "running", "waiting"],
});
assert.deepStrictEqual(
listed.threads.map((thread) => thread.threadId),
["thread:a-awaiting-command"],
);
}).pipe(Effect.provide(service)),
);

it.effect("points a caller outside any thread at allProjects when it omits projectId", () =>
Effect.gen(function* () {
const mcp = yield* OrchestratorMcpService.OrchestratorMcpService;
Expand Down
15 changes: 11 additions & 4 deletions apps/server/src/mcp/OrchestratorMcpService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ import {
SECRET_REQUEST_UNSAVED_NOTE,
} from "@t3tools/contracts";
import { getProviderOptionCurrentValue, withLegacyUltracodeEffort } from "@t3tools/shared/model";
import { backgroundWorkHoldsCompletion } from "@t3tools/shared/orchestrationV2PendingBackgroundWork";
import { runRanAfter } from "@t3tools/shared/orchestrationV2ThreadError";
import { formatThreadLink } from "@t3tools/shared/threadLinks";
import {
Expand Down Expand Up @@ -814,6 +815,14 @@ function threadPullRequests(
}));
}

// Awaited background work keeps a thread live after its turn ends, as auto-settle and the sidebar treat it.
function listedThreadStatus(shell: OrchestrationV2ThreadShell) {
if (shell.activityRunStatus != null) return shell.activityRunStatus;
return backgroundWorkHoldsCompletion(shell.pendingBackgroundTasks ?? [])
? "waiting"
: shell.status;
}

function listItemFromShell(
scope: McpInvocationScope,
shell: OrchestrationV2ThreadShell,
Expand All @@ -826,7 +835,7 @@ function listItemFromShell(
link: threadLinkFor(scope, shell.id, shell.title),
createdBy: shell.createdBy,
creationSource: shell.creationSource,
status: shell.activityRunStatus ?? shell.status,
status: listedThreadStatus(shell),
latestRunId: shell.latestRunId,
providerInstanceId: shell.modelSelection.instanceId,
model: shell.modelSelection.model,
Expand Down Expand Up @@ -2978,9 +2987,7 @@ const make = Effect.gen(function* () {
: new Set(input.statuses);
const titleContains = input.titleContains?.toLocaleLowerCase();
const filtered = projectThreads
.filter(
(thread) => statuses === null || statuses.has(thread.activityRunStatus ?? thread.status),
)
.filter((thread) => statuses === null || statuses.has(listedThreadStatus(thread)))
.filter(
(thread) =>
input.settled === undefined || threadSettlement(thread).settled === input.settled,
Expand Down
Loading