Skip to content

perf(server): Codex item maps no longer grow and copy for the whole session #13876

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 1 commit into from
Sep 26, 2026
Merged

perf(server): Codex item maps no longer grow and copy for the whole session #13876

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 21 additions & 29 deletions apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,6 +1030,13 @@ interface ActiveCodexTurnContext {
readonly rootNodeId: OrchestrationV2ExecutionNode["id"];
readonly subagent: CodexSubagentThreadContext | null;
readonly startedAt: DateTime.Utc;
// Item positions allocated in this turn. Later turns never look items up
// here: late background items resolve their settled turn's context, and a
// subagent's approvals allocate on the owning root turn.
readonly itemPositions: Map<
string,
{ readonly ordinal: number; readonly startedAt: DateTime.Utc }
>;
}

interface ActiveCodexProviderRetry {
Expand Down Expand Up @@ -1639,14 +1646,11 @@ export function makeCodexAdapterV2(adapterOptions: CodexAdapterV2Options): Provi
new Map<string, ReadonlyArray<PendingCodexSubagentTurnStarted>>(),
);
const nextProviderTurnOrdinals = yield* Ref.make(new Map<string, number>());
const itemPositions = yield* Ref.make(
new Map<string, { readonly ordinal: number; readonly startedAt: DateTime.Utc }>(),
);
const nextItemOrdinalsByTurn = yield* Ref.make(new Map<string, number>());
const providerRetries = yield* Ref.make(
new Map<ProviderTurnId, ActiveCodexProviderRetry>(),
);
const planDeltas = yield* Ref.make(new Map<string, string>());
// Streamed plan text per plan item, dropped when the item completes.
const planDeltas = new Map<string, string>();
const planIds = yield* Ref.make(new Map<string, OrchestrationV2PlanArtifact["id"]>());
const pendingRuntimeRequests = yield* Ref.make(
new Map<string, PendingCodexRuntimeRequest>(),
Expand Down Expand Up @@ -1751,6 +1755,7 @@ export function makeCodexAdapterV2(adapterOptions: CodexAdapterV2Options): Provi
rootNodeId: input.turnInput.rootNodeId,
subagent: null,
startedAt: input.startedAt,
itemPositions: new Map(),
};
yield* Ref.update(limitedTurnItems, (current) => {
const next = new Map(current);
Expand Down Expand Up @@ -2114,27 +2119,17 @@ export function makeCodexAdapterV2(adapterOptions: CodexAdapterV2Options): Provi
startedAt?: DateTime.Utc,
) =>
Effect.gen(function* () {
const existing = (yield* Ref.get(itemPositions)).get(nativeItemId);
// Read the clock first so the lookup and the insert run without yielding.
const now = startedAt ?? (yield* DateTime.now);
const existing = context.itemPositions.get(nativeItemId);
if (existing !== undefined) {
return existing;
}

const turnKey = context.nativeTurnId;
const nextWithinTurn = yield* Ref.modify(nextItemOrdinalsByTurn, (current) => {
const next = (current.get(turnKey) ?? 0) + 1;
const updated = new Map(current);
updated.set(turnKey, next);
return [next, updated];
});
const position = {
ordinal: context.providerTurnOrdinal * 100 + nextWithinTurn,
startedAt: startedAt ?? (yield* DateTime.now),
ordinal: context.providerTurnOrdinal * 100 + context.itemPositions.size + 1,
startedAt: now,
};
yield* Ref.update(itemPositions, (current) => {
const updated = new Map(current);
updated.set(nativeItemId, position);
return updated;
});
context.itemPositions.set(nativeItemId, position);
return position;
});

Expand Down Expand Up @@ -2303,6 +2298,7 @@ export function makeCodexAdapterV2(adapterOptions: CodexAdapterV2Options): Provi
rootNodeId: providerNodeId,
subagent,
startedAt: turn.startedAt,
itemPositions: new Map(),
};
beginTurnTokenUsage(activeContext);
yield* Ref.update(activeTurns, (current) => {
Expand Down Expand Up @@ -3706,12 +3702,8 @@ export function makeCodexAdapterV2(adapterOptions: CodexAdapterV2Options): Provi
return;
}
yield* completeProviderRetry(context, yield* DateTime.now);
const markdown = yield* Ref.modify(planDeltas, (current) => {
const updated = new Map(current);
const next = `${updated.get(payload.itemId) ?? ""}${payload.delta}`;
updated.set(payload.itemId, next);
return [next, updated];
});
const markdown = `${planDeltas.get(payload.itemId) ?? ""}${payload.delta}`;
planDeltas.set(payload.itemId, markdown);
const artifacts = yield* buildProposedPlanArtifacts({
context,
nativeItemId: payload.itemId,
Expand Down Expand Up @@ -4297,11 +4289,11 @@ export function makeCodexAdapterV2(adapterOptions: CodexAdapterV2Options): Provi
}

if (payload.item.type === "plan") {
const deltas = yield* Ref.get(planDeltas);
const markdown =
payload.item.text.length > 0
? payload.item.text
: (deltas.get(payload.item.id) ?? "");
: (planDeltas.get(payload.item.id) ?? "");
planDeltas.delete(payload.item.id);
// A finished proposal stays active until Implement consumes it.
const artifacts = yield* buildProposedPlanArtifacts({
context,
Expand Down
Loading