@devries-cameron20 / t3code Mirror · read-only / commits / 9aaca71bc6
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 22, 23:15 UTC

fix(claude): preserve workflow member completion timestamps (#18142)

Co-authored-by: ashx-j <281260375+ashx-j@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>

ash committed Oct 20, 2026 at 06:45 UTC 9aaca71bc6045ba2e9cd1a6d688b74de421e2a01
7 files changed +67 -16
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
+19 -6
@@ -13283,6 +13283,8 @@ describe("ClaudeAdapterV2 background wake turns", () => {
13283 readonly state: "queued" | "start" | "done";
13284 readonly secondState?: "queued" | "start" | "done";
13285 readonly startedAt?: number;
13286 + readonly lastProgressAt?: number;
13287 + readonly durationMs?: number;
13288 readonly label?: string;
13289 readonly prompt?: string;
13290 readonly model?: string;
@@ -13308,6 +13310,8 @@ describe("ClaudeAdapterV2 background wake turns", () => {
13310 model: input.model ?? "claude-opus-5[1m]",
13311 promptPreview: input.prompt ?? "Reply with exactly: A1",
13312 ...(input.startedAt === undefined ? {} : { startedAt: input.startedAt }),
13313 + ...(input.lastProgressAt === undefined ? {} : { lastProgressAt: input.lastProgressAt }),
13314 + ...(input.durationMs === undefined ? {} : { durationMs: input.durationMs }),
13315 ...(input.attempt === undefined ? {} : { attempt: input.attempt }),
13316 ...(input.state === "done" && input.omitResult !== true
13317 ? { resultPreview: "A1 excerpt" }
@@ -15478,6 +15482,10 @@ describe("ClaudeAdapterV2 background wake turns", () => {
15482 );
15483 assert.equal(workflowMemberEvents(harness.events, 1).at(-1)?.subagent.status, "completed");
15484 assert.equal(workflowMemberEvents(harness.events, 2).at(-1)?.subagent.status, "completed");
15485 + assert.deepEqual(
15486 + workflowMemberEvents(harness.events, 1).at(-1)?.subagent.completedAt,
15487 + yield* DateTime.now,
15488 + );
15489 assert.deepEqual(
15490 threadMessages(harness.events, firstThreadId).map((event) => event.message.text),
15491 ["Reply with exactly: A1", "A1 from the transcript"],
@@ -15538,6 +15546,9 @@ describe("ClaudeAdapterV2 background wake turns", () => {
15546 uuid: "00000000-0000-4000-8000-000000001018",
15547 state: "done",
15548 attempt: 2,
15549 + startedAt: 1000,
15550 + durationMs: 500,
15551 + lastProgressAt: 4432,
15552 }),
15553 );
15554 yield* awaitUntil(
@@ -15545,22 +15556,24 @@ describe("ClaudeAdapterV2 background wake turns", () => {
15556 "two-turn workflow member answer",
15557 );
15558 assert.deepEqual(currentAssistantAnswers().slice(-2), ["First answer", "Second answer"]);
15559 + const completedMember = workflowMemberEvents(harness.events, 1).at(-1)?.subagent;
15560 + assert.equal(
15561 + completedMember?.completedAt && DateTime.toEpochMillis(completedMember.completedAt),
15562 + 4432,
15563 + );
15564 assert.notDeepEqual(
15565 workflowMemberEvents(harness.events, 1).at(-1)?.subagent.startedAt,
15566 previousStartedAt,
15567 );
15552 - yield* Queue.offer(
15553 - harness.sdkMessages,
15568 + yield* harness.offerAndWait(
15569 workflowSnapshot({
15570 uuid: "00000000-0000-4000-8000-000000001019",
15571 state: "start",
15572 attempt: 3,
15573 }),
15574 );
15560 - yield* awaitUntil(
15561 - () => workflowMemberEvents(harness.events, 1).at(-1)?.subagent.status === "running",
15562 - "retried workflow member running",
15563 - );
15575 + assert.equal(workflowMemberEvents(harness.events, 1).at(-1)?.subagent.status, "running");
15576 + assert.isNull(workflowMemberEvents(harness.events, 1).at(-1)?.subagent.completedAt);
15577 yield* Queue.offer(
15578 harness.sdkMessages,
15579 workflowSnapshot({
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
+4 -1
@@ -4842,12 +4842,15 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
4842 : ((restarted ? null : previous?.startedAt) ??
4843 (status === "running" ? now : null));
4844 const completedAt = settled
4845 - ? ((restarted ? null : previous?.completedAt) ?? now)
4845 + ? member.completedAt !== undefined
4846 + ? DateTime.makeUnsafe(member.completedAt)
4847 + : ((restarted ? null : previous?.completedAt) ?? now)
4848 : null;
4849 const changed =
4850 restarted ||
4851 previous?.status !== status ||
4852 !Equal.equals(previous?.startedAt, startedAt) ||
4853 + !Equal.equals(previous?.completedAt, completedAt) ||
4854 previous?.result !== member.result ||
4855 previous?.label !== member.label ||
4856 previous?.prompt !== prompt ||
apps/server/src/orchestration-v2/Adapters/claudeWorkflowProgress.test.ts
+16 -2
@@ -76,11 +76,13 @@ describe("mergeClaudeWorkflowProgress", () => {
76 toolCalls: 3,
77 durationMs: 1277,
78 startedAt: 1_700_000_000_000,
79 + lastProgressAt: 1_700_000_004_432,
80 queuedAt: 1_699_999_999_000,
81 promptPreview: "Reply with exactly: A1",
82 resultPreview: "A1",
83 }),
83 - agent({ index: 2, label: "alpha:two", state: "queued" }),
84 + agent({ index: 2, label: "alpha:two", state: "queued", lastProgressAt: 1000 }),
85 + agent({ index: 3, state: "progress", lastProgressAt: 2000 }),
86 ]),
87 });
88 expect(workflow?.phases).toEqual([{ index: 1, title: "Alpha" }]);
@@ -98,10 +100,13 @@ describe("mergeClaudeWorkflowProgress", () => {
100 durationMs: 1277,
101 queuedAt: 1_699_999_999_000,
102 startedAt: 1_700_000_000_000,
103 + completedAt: 1_700_000_004_432,
104 prompt: "Reply with exactly: A1",
105 result: "A1",
106 });
107 expect(workflow?.agents[1]?.state).toBe("queued");
108 + expect(workflow?.agents[1]).not.toHaveProperty("completedAt");
109 + expect(workflow?.agents[2]).not.toHaveProperty("completedAt");
110 });
111
112 it.each(["something-new", "toString", "constructor", "__proto__"])(
@@ -186,10 +191,13 @@ describe("mergeClaudeWorkflowProgress", () => {
191 durationMs: 50,
192 queuedAt: 1000,
193 startedAt: 1010,
194 + lastProgressAt: 2010,
195 }),
196 agent({ index: 2, state: "done" }),
197 ]),
198 });
199 + expect(first?.agents[0]?.completedAt).toBe(2010);
200 + expect(first?.agents[1]).not.toHaveProperty("completedAt");
201 const second = mergeClaudeWorkflowProgress({
202 previous: first,
203 message: snapshotFrame([
@@ -293,12 +301,18 @@ describe("mergeClaudeWorkflowProgress", () => {
301 const workflow = mergeClaudeWorkflowProgress({
302 previous: undefined,
303 message: snapshotFrame([
296 - agent({ startedAt: 8_640_000_000_000_001, queuedAt: Number.MAX_SAFE_INTEGER }),
304 + agent({
305 + state: "done",
306 + lastProgressAt: 8_640_000_000_000_001,
307 + startedAt: 8_640_000_000_000_001,
308 + queuedAt: Number.MAX_SAFE_INTEGER,
309 + }),
310 agent({ index: 2, startedAt: 8_640_000_000_000_000, queuedAt: 0 }),
311 ]),
312 });
313 expect(workflow?.agents[0]).not.toHaveProperty("startedAt");
314 expect(workflow?.agents[0]).not.toHaveProperty("queuedAt");
315 + expect(workflow?.agents[0]).not.toHaveProperty("completedAt");
316 expect(workflow?.agents[1]?.startedAt).toBe(8_640_000_000_000_000);
317 expect(workflow?.agents[1]?.queuedAt).toBe(0);
318 });
apps/server/src/orchestration-v2/Adapters/claudeWorkflowProgress.ts
+7
@@ -70,6 +70,13 @@ function parseAgent(entry: unknown): OrchestrationV2WorkflowAgent | null {
70 ...optional("durationMs", count(field(entry, "durationMs"))),
71 ...optional("queuedAt", timestamp(field(entry, "queuedAt"))),
72 ...optional("startedAt", timestamp(field(entry, "startedAt"))),
73 + // Execution duration excludes startup waits; terminal progress carries the end instant.
74 + ...optional(
75 + "completedAt",
76 + state === "completed" || state === "failed"
77 + ? timestamp(field(entry, "lastProgressAt"))
78 + : undefined,
79 + ),
80 ...optional("prompt", preview(field(entry, "promptPreview"))),
81 ...optional("result", preview(field(entry, "resultPreview"))),
82 };
packages/client-runtime/src/state/subagentRuntime.test.ts
+16 -4
@@ -87,9 +87,11 @@ describe("projectedSubagentsToRuntime workflow expansion", () => {
87 expect(rows[2]?.startedAt).toBeNull();
88 });
89
90 - it("derives a settled member's end from its reported duration", () => {
90 + it("uses a settled member's wall-clock completion separately from its execution duration", () => {
91 const [, settled] = projectedSubagentsToRuntime([
92 subagent({
93 + status: "completed",
94 + completedAt: at("2026-08-01T10:00:09.000Z"),
95 workflow: {
96 phases: [],
97 agents: [
@@ -97,6 +99,7 @@ describe("projectedSubagentsToRuntime workflow expansion", () => {
99 state: "completed",
100 startedAt: Date.UTC(2026, 7, 1, 10, 0, 0),
101 durationMs: 1500,
102 + completedAt: Date.UTC(2026, 7, 1, 10, 0, 4, 432),
103 totalTokens: 71_141,
104 toolCalls: 3,
105 prompt: "Reply with exactly: A1",
@@ -107,7 +110,7 @@ describe("projectedSubagentsToRuntime workflow expansion", () => {
110 }),
111 ]);
112 expect(settled?.status).toBe("completed");
110 - expect(settled?.completedAt).toBe("2026-08-01T10:00:01.500Z");
113 + expect(settled?.completedAt).toBe("2026-08-01T10:00:04.432Z");
114 expect(settled?.result).toBe("A1");
115 expect(settled?.progress).toBe("Reply with exactly: A1");
116 expect(settled?.usage).toEqual({ totalTokens: 71_141, toolUses: 3, durationMs: 1500 });
@@ -125,7 +128,12 @@ describe("projectedSubagentsToRuntime workflow expansion", () => {
128 agents: [
129 member(),
130 member({ index: 2, state: "queued" }),
128 - member({ index: 3, state: "completed" }),
131 + member({
132 + index: 3,
133 + state: "completed",
134 + startedAt: Date.UTC(2026, 7, 1, 10, 0, 0),
135 + durationMs: 1500,
136 + }),
137 ],
138 },
139 }),
@@ -133,7 +141,11 @@ describe("projectedSubagentsToRuntime workflow expansion", () => {
141 expect(groups[0]?.workflow.status).toBe(status);
142 const members = groups[0]?.phases.flatMap((phase) => phase.members);
143 expect(members?.map((agent) => agent.status)).toEqual([status, status, "completed"]);
136 - expect(members?.[0]?.completedAt).toBe("2026-08-01T10:00:09.000Z");
144 + expect(members?.map((agent) => agent.completedAt)).toEqual([
145 + "2026-08-01T10:00:09.000Z",
146 + "2026-08-01T10:00:09.000Z",
147 + "2026-08-01T10:00:01.500Z",
148 + ]);
149 },
150 );
151
packages/client-runtime/src/state/subagentRuntime.ts
+4 -3
@@ -139,9 +139,10 @@ function workflowMembersToRuntime(
139 const failed = status === "failed";
140 const startedAt = isoFromEpochMillis(agent.startedAt);
141 const completedAt = isTerminalSubagentStatus(status)
142 - ? agent.startedAt !== undefined && agent.durationMs !== undefined
143 - ? isoFromEpochMillis(agent.startedAt + agent.durationMs)
144 - : coordinator.completedAt
142 + ? (isoFromEpochMillis(agent.completedAt) ??
143 + (agent.startedAt !== undefined && agent.durationMs !== undefined
144 + ? isoFromEpochMillis(agent.startedAt + agent.durationMs)
145 + : coordinator.completedAt))
146 : null;
147 return {
148 ...coordinator,
packages/contracts/src/orchestrationV2.ts
+1
@@ -669,6 +669,7 @@ export const OrchestrationV2WorkflowAgent = Schema.Struct({
669 durationMs: Schema.optional(NonNegativeInt),
670 queuedAt: Schema.optional(NonNegativeInt),
671 startedAt: Schema.optional(NonNegativeInt),
672 + completedAt: Schema.optional(NonNegativeInt),
673 prompt: Schema.optional(Schema.NonEmptyString),
674 result: Schema.optional(Schema.NonEmptyString),
675 });