Skip to content

Commit 4693b28

Browse files
committed
Merge remote-tracking branch 'origin/main' into t3code/collab-agent-lifecycle
# Conflicts: # apps/server/src/pullRequest/PullRequestService.ts
2 parents 2200607 + 050690d commit 4693b28

30 files changed

Lines changed: 327 additions & 193 deletions

‎apps/server/src/git/GitManager.test.ts‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
511511
"--limit",
512512
String(input.limit ?? 1),
513513
"--json",
514-
"number,title,url,baseRefName,headRefName,state,isDraft,mergedAt,isCrossRepository,headRepository,headRepositoryOwner",
514+
"number,title,url,baseRefName,headRefName,state,isDraft,mergedAt,closedAt,isCrossRepository,headRepository,headRepositoryOwner",
515515
],
516516
}).pipe(
517517
Effect.map((result) => JSON.parse(result.stdout) as unknown[]),
@@ -555,7 +555,7 @@ function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
555555
"view",
556556
input.reference,
557557
"--json",
558-
"number,title,url,baseRefName,headRefName,state,isDraft,mergedAt,isCrossRepository,headRepository,headRepositoryOwner",
558+
"number,title,url,baseRefName,headRefName,state,isDraft,mergedAt,closedAt,isCrossRepository,headRepository,headRepositoryOwner",
559559
],
560560
}).pipe(
561561
Effect.map((result) => JSON.parse(result.stdout) as GitHubCli.GitHubPullRequestSummary),
@@ -1148,6 +1148,8 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
11481148

11491149
expect(pullRequest).toEqual({
11501150
state: "open",
1151+
closedAt: null,
1152+
mergedAt: null,
11511153
updatedAt: "2026-04-03T15:00:00.000Z",
11521154
});
11531155
expect((yield* runGit(repoDir, ["branch", "--show-current"])).stdout.trim()).toBe("main");
@@ -1179,6 +1181,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
11791181
baseRefName: "develop",
11801182
headRefName: "main",
11811183
state: "MERGED",
1184+
mergedAt: "2026-04-07T15:00:00Z",
11821185
updatedAt: "2026-04-08T15:00:00Z",
11831186
},
11841187
]),
@@ -1190,6 +1193,8 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
11901193

11911194
expect(pullRequest).toEqual({
11921195
state: "merged",
1196+
closedAt: null,
1197+
mergedAt: "2026-04-07T15:00:00Z",
11931198
updatedAt: "2026-04-08T15:00:00.000Z",
11941199
});
11951200
}),
@@ -1241,6 +1246,8 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
12411246

12421247
expect(pullRequest).toEqual({
12431248
state: "merged",
1249+
closedAt: null,
1250+
mergedAt: null,
12441251
updatedAt: "2026-04-04T15:00:00.000Z",
12451252
});
12461253
expect(ghCalls.some((call) => call.includes("--head feature/deleted-local-branch"))).toBe(
@@ -1305,6 +1312,8 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
13051312

13061313
expect(pullRequest).toEqual({
13071314
state: "merged",
1315+
closedAt: null,
1316+
mergedAt: null,
13081317
updatedAt: "2026-04-05T15:00:00.000Z",
13091318
});
13101319
expect(
@@ -1691,7 +1700,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
16911700
updatedAt: "2026-03-10T07:00:00.000Z",
16921701
});
16931702
expect(ghCalls).toContain(
1694-
"pr list --head jasonLaster:statemachine --state all --limit 20 --json number,title,url,baseRefName,headRefName,state,isDraft,mergedAt,updatedAt,isCrossRepository,headRepository,headRepositoryOwner",
1703+
"pr list --head jasonLaster:statemachine --state all --limit 20 --json number,title,url,baseRefName,headRefName,state,isDraft,mergedAt,closedAt,updatedAt,isCrossRepository,headRepository,headRepositoryOwner",
16951704
);
16961705
}),
16971706
20_000,
@@ -1757,7 +1766,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
17571766
updatedAt: "2026-03-10T07:00:00.000Z",
17581767
});
17591768
expect(ghCalls).toContain(
1760-
"pr list --head contributor:main --state all --limit 20 --json number,title,url,baseRefName,headRefName,state,isDraft,mergedAt,updatedAt,isCrossRepository,headRepository,headRepositoryOwner",
1769+
"pr list --head contributor:main --state all --limit 20 --json number,title,url,baseRefName,headRefName,state,isDraft,mergedAt,closedAt,updatedAt,isCrossRepository,headRepository,headRepositoryOwner",
17611770
);
17621771
}),
17631772
20_000,
@@ -2142,6 +2151,8 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
21422151

21432152
expect(pullRequest).toEqual({
21442153
state: "merged",
2154+
closedAt: null,
2155+
mergedAt: null,
21452156
updatedAt: "2026-05-02T10:00:00.000Z",
21462157
});
21472158
}),

‎apps/server/src/git/GitManager.ts‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,12 @@ export class GitManager extends Context.Service<
100100
readonly cwd: string;
101101
readonly branch: string;
102102
}) => Effect.Effect<
103-
{ readonly state: "open" | "closed" | "merged"; readonly updatedAt: string | null } | null,
103+
{
104+
readonly state: "open" | "closed" | "merged";
105+
readonly updatedAt: string | null;
106+
readonly closedAt?: string | null;
107+
readonly mergedAt?: string | null;
108+
} | null,
104109
GitManagerServiceError
105110
>;
106111
readonly invalidateLocalStatus: (cwd: string) => Effect.Effect<void, never>;
@@ -171,6 +176,8 @@ interface OpenPrInfo {
171176
interface PullRequestInfo extends OpenPrInfo, PullRequestHeadRemoteInfo {
172177
state: "open" | "closed" | "merged";
173178
isDraft?: boolean;
179+
closedAt?: string | null;
180+
mergedAt?: string | null;
174181
updatedAt: Option.Option<DateTime.Utc>;
175182
}
176183

@@ -406,6 +413,8 @@ function toPullRequestInfo(summary: ChangeRequest): PullRequestInfo {
406413
headRefName: summary.headRefName,
407414
state: summary.state ?? "open",
408415
...(summary.isDraft === true ? { isDraft: true } : {}),
416+
closedAt: summary.closedAt ?? null,
417+
mergedAt: summary.mergedAt ?? null,
409418
updatedAt: summary.updatedAt,
410419
...(summary.isCrossRepository !== undefined
411420
? { isCrossRepository: summary.isCrossRepository }
@@ -2157,7 +2166,12 @@ export const make = Effect.gen(function* () {
21572166
return null;
21582167
}
21592168
const statusPr = toStatusPr(latest);
2160-
return { state: statusPr.state, updatedAt: statusPr.updatedAt };
2169+
return {
2170+
state: statusPr.state,
2171+
updatedAt: statusPr.updatedAt,
2172+
closedAt: latest.closedAt ?? null,
2173+
mergedAt: latest.mergedAt ?? null,
2174+
};
21612175
});
21622176
const invalidateLocalStatus: GitManager["Service"]["invalidateLocalStatus"] = Effect.fn(
21632177
"invalidateLocalStatus",

‎apps/server/src/orchestration/ThreadSettlementPolicy.test.ts‎

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
TurnId,
77
type OrchestrationThreadShell,
88
} from "@t3tools/contracts";
9-
import { resolveAutoSettlementAt } from "./ThreadSettlementPolicy.ts";
9+
import { type SettlementPullRequest, resolveAutoSettlementAt } from "./ThreadSettlementPolicy.ts";
1010

1111
const NOW = "2026-08-28T12:00:00.000Z";
1212
const makeThread = (
@@ -36,7 +36,7 @@ const makeThread = (
3636

3737
const decide = (
3838
thread: OrchestrationThreadShell,
39-
pullRequest: { state: "open" | "closed" | "merged"; updatedAt: string | null } | null = null,
39+
pullRequest: SettlementPullRequest | null = null,
4040
settings: { days?: number | null; merge?: boolean } = {},
4141
) =>
4242
resolveAutoSettlementAt({
@@ -77,7 +77,7 @@ describe("resolveAutoSettlementAt", () => {
7777
latestTurn: null,
7878
updatedAt: "2026-08-27T00:00:00.000Z",
7979
}),
80-
pullRequest: { state: "closed", updatedAt: NOW },
80+
pullRequest: { state: "closed", closedAt: NOW },
8181
now: NOW,
8282
autoSettleAfterDays: null,
8383
autoSettleOnMerge: true,
@@ -100,38 +100,57 @@ describe("resolveAutoSettlementAt", () => {
100100
});
101101

102102
it("settles closed requests and honors the merge setting", () => {
103-
expect(decide(makeThread(), { state: "closed", updatedAt: NOW }, { merge: false })).toBe(true);
104-
expect(decide(makeThread(), { state: "merged", updatedAt: NOW }, { merge: false })).toBe(true);
103+
expect(decide(makeThread(), { state: "closed", closedAt: NOW }, { merge: false })).toBe(true);
104+
expect(decide(makeThread(), { state: "merged", mergedAt: NOW }, { merge: false })).toBe(true);
105105
expect(
106-
decide(makeThread(), { state: "merged", updatedAt: NOW }, { merge: false, days: null }),
106+
decide(makeThread(), { state: "merged", mergedAt: NOW }, { merge: false, days: null }),
107107
).toBe(false);
108108
});
109109

110110
it("does not settle again after user activity newer than the PR", () => {
111111
expect(
112112
decide(
113113
makeThread({ latestUserMessageAt: "2026-08-27T00:00:00.000Z" }),
114-
{ state: "merged", updatedAt: "2026-08-26T00:00:00.000Z" },
114+
{ state: "merged", mergedAt: "2026-08-26T00:00:00.000Z" },
115115
{ days: null },
116116
),
117117
).toBe(false);
118118
});
119119

120+
it.each(["closed", "merged"] as const)(
121+
"ignores metadata edits after resumed work for %s requests",
122+
(state) => {
123+
expect(
124+
decide(
125+
makeThread({ latestUserMessageAt: "2026-08-27T00:00:00.000Z" }),
126+
{
127+
state,
128+
closedAt: "2026-08-26T00:00:00.000Z",
129+
mergedAt: "2026-08-26T00:00:00.000Z",
130+
updatedAt: NOW,
131+
},
132+
{ days: null },
133+
),
134+
).toBe(false);
135+
expect(decide(makeThread(), { state, updatedAt: NOW }, { days: null })).toBe(false);
136+
},
137+
);
138+
120139
it("does not inherit a terminal pull request older than the thread", () => {
121140
expect(
122141
decide(
123142
makeThread({ createdAt: "2026-08-20T00:00:00.000Z", latestUserMessageAt: null }),
124-
{ state: "closed", updatedAt: "2026-08-19T00:00:00.000Z" },
143+
{ state: "closed", closedAt: "2026-08-19T00:00:00.000Z" },
125144
{ days: null },
126145
),
127146
).toBe(false);
128147
});
129148

130149
it("requires a comparable PR timestamp for immediate settlement", () => {
131150
const recentThread = makeThread({ latestUserMessageAt: "2026-08-27T00:00:00.000Z" });
132-
expect(decide(recentThread, { state: "closed", updatedAt: null })).toBe(false);
133-
expect(decide(recentThread, { state: "merged", updatedAt: "unknown" })).toBe(false);
134-
expect(decide(makeThread(), { state: "closed", updatedAt: null })).toBe(true);
151+
expect(decide(recentThread, { state: "closed", closedAt: null })).toBe(false);
152+
expect(decide(recentThread, { state: "merged", mergedAt: "unknown" })).toBe(false);
153+
expect(decide(makeThread(), { state: "closed", closedAt: null })).toBe(true);
135154
});
136155

137156
it("uses user request time instead of completion time as the PR anchor", () => {
@@ -145,7 +164,7 @@ describe("resolveAutoSettlementAt", () => {
145164
assistantMessageId: null,
146165
},
147166
});
148-
expect(decide(thread, { state: "merged", updatedAt: "2026-08-26T00:00:00.000Z" })).toBe(true);
167+
expect(decide(thread, { state: "merged", mergedAt: "2026-08-26T00:00:00.000Z" })).toBe(true);
149168
});
150169

151170
it("blocks pins, snooze, pending work, live sessions, and queued starts", () => {

‎apps/server/src/orchestration/ThreadSettlementPolicy.ts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import type { OrchestrationThreadShell } from "@t3tools/contracts";
22

33
export interface SettlementPullRequest {
44
readonly state: "open" | "closed" | "merged";
5-
readonly updatedAt: string | null;
5+
readonly closedAt?: string | null;
6+
readonly mergedAt?: string | null;
7+
readonly updatedAt?: string | null;
68
}
79

810
const DAY_MS = 24 * 60 * 60 * 1_000;
@@ -49,14 +51,15 @@ function pullRequestSettles(
4951
if (pullRequest.state !== "closed" && (pullRequest.state !== "merged" || !autoSettleOnMerge)) {
5052
return false;
5153
}
52-
if (pullRequest.updatedAt === null) return false;
54+
const terminalAt = pullRequest.state === "merged" ? pullRequest.mergedAt : pullRequest.closedAt;
55+
if (terminalAt == null) return false;
5356
const userAnchor = latestTimestamp([
5457
thread.createdAt,
5558
thread.latestUserMessageAt,
5659
thread.latestTurn?.requestedAt,
5760
]);
5861
if (userAnchor === null) return false;
59-
const pullRequestAt = Date.parse(pullRequest.updatedAt);
62+
const pullRequestAt = Date.parse(terminalAt);
6063
const userAnchorAt = Date.parse(userAnchor);
6164
if (Number.isNaN(pullRequestAt) || Number.isNaN(userAnchorAt)) return false;
6265
return pullRequestAt >= userAnchorAt;

‎apps/server/src/orchestration/ThreadSettlementReactor.test.ts‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ function makePullRequestSummary(input: {
127127
headBranch: "feature",
128128
baseBranch: "main",
129129
updatedAt: input.updatedAt ?? NOW,
130+
closedAt: input.state === "closed" ? (input.updatedAt ?? NOW) : null,
131+
mergedAt: input.state === "merged" ? (input.updatedAt ?? NOW) : null,
130132
};
131133
}
132134

@@ -372,7 +374,9 @@ describe("ThreadSettlementReactor", () => {
372374
}),
373375
]),
374376
branchPullRequest: () =>
375-
Ref.get(pullRequest).pipe(Effect.map((state) => ({ state, updatedAt: NOW }))),
377+
Ref.get(pullRequest).pipe(
378+
Effect.map((state) => ({ state, updatedAt: NOW, closedAt: NOW, mergedAt: NOW })),
379+
),
376380
});
377381

378382
yield* Effect.gen(function* () {
@@ -472,7 +476,12 @@ describe("ThreadSettlementReactor", () => {
472476
]),
473477
branchPullRequest: () =>
474478
Ref.get(state).pipe(
475-
Effect.map((pullRequestState) => ({ state: pullRequestState, updatedAt: NOW })),
479+
Effect.map((pullRequestState) => ({
480+
state: pullRequestState,
481+
updatedAt: NOW,
482+
closedAt: NOW,
483+
mergedAt: NOW,
484+
})),
476485
),
477486
onDispatch: () => Deferred.succeed(mergedThreadSettled, undefined),
478487
});
@@ -603,7 +612,12 @@ describe("ThreadSettlementReactor", () => {
603612
: Effect.void,
604613
),
605614
Effect.andThen(Ref.get(state)),
606-
Effect.map((pullRequestState) => ({ state: pullRequestState, updatedAt: NOW })),
615+
Effect.map((pullRequestState) => ({
616+
state: pullRequestState,
617+
updatedAt: NOW,
618+
closedAt: NOW,
619+
mergedAt: NOW,
620+
})),
607621
),
608622
});
609623

@@ -749,7 +763,8 @@ describe("ThreadSettlementReactor", () => {
749763
makeProject(LINKED_PROJECT_ID, "/workspace/linked-root"),
750764
],
751765
),
752-
branchPullRequest: () => Effect.succeed({ state: "closed", updatedAt: NOW }),
766+
branchPullRequest: () =>
767+
Effect.succeed({ state: "closed", updatedAt: NOW, closedAt: NOW }),
753768
pullRequestSummary: (input) =>
754769
Effect.succeed(makePullRequestSummary({ ...input, state: "merged" })),
755770
});

‎apps/server/src/orchestration/ThreadSettlementReactor.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export const make = Effect.gen(function* () {
119119
) {
120120
return {
121121
state: "merged",
122-
updatedAt: mergedPullRequest.mergedAt,
122+
mergedAt: mergedPullRequest.mergedAt,
123123
} satisfies SettlementPullRequest;
124124
}
125125
if (!projects.has(thread.linkedPullRequest.projectId)) {
@@ -135,7 +135,8 @@ export const make = Effect.gen(function* () {
135135
);
136136
return {
137137
state: summary.state,
138-
updatedAt: summary.updatedAt,
138+
closedAt: summary.closedAt ?? null,
139+
mergedAt: summary.mergedAt ?? null,
139140
} satisfies SettlementPullRequest;
140141
}
141142
if (thread.branch === null) return null;

0 commit comments

Comments
 (0)