Skip to content

Commit bf6c413

Browse files
committed
fix(server): 拒绝将旧 Codex 回合归入新任务
- 在启动请求前保留回合归属快照,避免旧回合完成竞态隐藏冲突。 - 对不同任务尝试复用原生回合返回明确错误,保留旧结果归属并允许后续重试。 - 补充响应前后完成及重试恢复回归验证;82 项针对性测试和 check:changed 通过。
1 parent a0e0f8a commit bf6c413

2 files changed

Lines changed: 117 additions & 0 deletions

File tree

‎apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,6 +1001,105 @@ describe("CodexAdapterV2 post-settle continuation", () => {
10011001
};
10021002
});
10031003

1004+
it.effect.each(["before", "after"] as const)(
1005+
"rejects a previous run's native turn when it completes %s the new start response",
1006+
(completionOrder) =>
1007+
Effect.gen(function* () {
1008+
const nativeThreadId = "reused-turn-thread";
1009+
const nativeTurnId = "reused-turn";
1010+
const preamble = codexReplayPreamble({ nativeThreadId, nativeTurnId, prompt: "work" });
1011+
const retry = codexReplayPreamble({
1012+
nativeThreadId,
1013+
nativeTurnId: "retry-turn",
1014+
prompt: "work",
1015+
});
1016+
const completion: CodexReplay.CodexAppServerReplayEntry = {
1017+
type: "emit_inbound",
1018+
label: "original turn completed",
1019+
frame: {
1020+
method: "turn/completed",
1021+
params: {
1022+
threadId: nativeThreadId,
1023+
turn: makeCodexReplayTurn({ id: nativeTurnId, status: "completed" }),
1024+
},
1025+
},
1026+
};
1027+
const harness = yield* makeCodexReplayHarness(
1028+
makeCodexReplayTranscript({
1029+
scenario: `reused-turn-${completionOrder}`,
1030+
entries: [
1031+
...preamble,
1032+
withReplayRequestId(preamble[5]!, 4),
1033+
...(completionOrder === "before" ? [completion] : []),
1034+
withReplayRequestId(preamble[6]!, 4),
1035+
...(completionOrder === "after" ? [completion] : []),
1036+
...retry.slice(5, 7).map((entry) => withReplayRequestId(entry, 5)),
1037+
{
1038+
type: "emit_inbound",
1039+
label: "retry completed",
1040+
frame: {
1041+
method: "turn/completed",
1042+
params: {
1043+
threadId: nativeThreadId,
1044+
turn: makeCodexReplayTurn({ id: "retry-turn", status: "completed" }),
1045+
},
1046+
},
1047+
},
1048+
],
1049+
}),
1050+
);
1051+
const first = makeCodexTestTurnInput({
1052+
threadId: harness.threadId,
1053+
providerThread: harness.providerThread,
1054+
now: yield* DateTime.now,
1055+
attemptId: RunAttemptId.make("original"),
1056+
text: "work",
1057+
});
1058+
yield* harness.runtime.startTurn(first);
1059+
const result = yield* harness.runtime
1060+
.startTurn({
1061+
...first,
1062+
runId: RunId.make("replacement"),
1063+
attemptId: RunAttemptId.make("replacement"),
1064+
rootNodeId: NodeId.make("replacement"),
1065+
runOrdinal: 2,
1066+
providerTurnOrdinal: 2,
1067+
})
1068+
.pipe(Effect.result);
1069+
assert.equal(result._tag, "Failure", "a different run must not adopt the original turn");
1070+
if (result._tag !== "Failure") return;
1071+
const failure = result.failure;
1072+
assert.equal(failure._tag, "ProviderAdapterTurnStartError");
1073+
assert.instanceOf(failure.cause, ProviderAdapter.ProviderAdapterProtocolError);
1074+
yield* harness.firstTerminal;
1075+
assert.deepEqual(
1076+
harness.terminalEvents().map((event) => event.runOrdinal),
1077+
[1],
1078+
);
1079+
yield* harness.runtime.startTurn({
1080+
...first,
1081+
runId: RunId.make("retry"),
1082+
attemptId: RunAttemptId.make("retry"),
1083+
rootNodeId: NodeId.make("retry"),
1084+
runOrdinal: 3,
1085+
providerTurnOrdinal: 3,
1086+
});
1087+
yield* harness.awaitTerminal(2);
1088+
assert.deepEqual(
1089+
harness.terminalEvents().map((event) => [event.runOrdinal, event.status]),
1090+
[
1091+
[1, "completed"],
1092+
[3, "completed"],
1093+
],
1094+
);
1095+
}).pipe(
1096+
Effect.scoped,
1097+
Effect.provide(
1098+
Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
1099+
),
1100+
),
1101+
);
1102+
10041103
it.effect.each(["supported", "unsupported", "invalid"] as const)(
10051104
"delivers native history with %s app-server protocol",
10061105
(response) =>

‎apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6358,7 +6358,25 @@ export const makeCodexAdapterV2 = Effect.fn("makeCodexAdapterV2")(function* (
63586358
else next.delete(threadId);
63596359
return next;
63606360
});
6361+
// Completion can remove the old context while turn/start is in flight.
6362+
const previousTurns = new Map([
6363+
...(yield* Ref.get(settledTurns)),
6364+
...(yield* Ref.get(activeTurns)),
6365+
]);
63616366
const started = yield* client.request("turn/start", turnStartParams);
6367+
const previousTurn =
6368+
previousTurns.get(started.turn.id) ??
6369+
(yield* Ref.get(activeTurns)).get(started.turn.id);
6370+
if (
6371+
previousTurn !== undefined &&
6372+
previousTurn.input.attemptId !== turnInput.attemptId
6373+
) {
6374+
return yield* new ProviderAdapter.ProviderAdapterProtocolError({
6375+
driver: CODEX_PROVIDER,
6376+
detail:
6377+
"Codex returned a turn belonging to an earlier run. Stop the existing turn before retrying this message.",
6378+
});
6379+
}
63626380
yield* registerRootTurn({
63636381
turnInput,
63646382
nativeTurnId: started.turn.id,

0 commit comments

Comments
 (0)