Skip to content

Commit 9eeed8c

Browse files
fix(server): reduce v2 recovery and runtime resource usage
Index event sequence lookups, recover only threads with pending work, and page projection verification and rebuilds. Bound provider event logging and omit turn histories when resuming Codex threads. Allow delegated thread identifiers through relay routes. Add focused regression coverage and document the performance constraints.
1 parent d2f1f51 commit 9eeed8c

26 files changed

Lines changed: 1859 additions & 189 deletions

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -675,6 +675,26 @@ describe("ClaudeAdapterV2 native protocol logging", () => {
675675
return;
676676
}
677677

678+
yield* protocolLogger({
679+
direction: "incoming",
680+
stage: "decoded",
681+
payload: {
682+
type: "stream_event",
683+
uuid: "00000000-0000-0000-0000-000000000001",
684+
session_id: "native-thread",
685+
parent_tool_use_id: null,
686+
event: {
687+
type: "content_block_delta",
688+
index: 0,
689+
delta: {
690+
type: "text_delta",
691+
get text(): string {
692+
throw new Error("streaming text must not be inspected");
693+
},
694+
},
695+
},
696+
},
697+
});
678698
yield* protocolLogger({
679699
direction: "outgoing",
680700
stage: "decoded",

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,11 @@ import {
8383
BUNDLED_CLAUDE_MODEL_CATALOG,
8484
resolveClaudeCatalogContextWindow,
8585
} from "../../provider/ClaudeModelCatalog.ts";
86-
import type { EventNdjsonLogger } from "../../provider/Layers/EventNdjsonLogger.ts";
86+
import {
87+
boundProviderEventForLogging,
88+
type EventNdjsonLogger,
89+
shouldPersistProviderEvent,
90+
} from "../../provider/Layers/EventNdjsonLogger.ts";
8791
import { ProviderEventLoggers } from "../../provider/Layers/ProviderEventLoggers.ts";
8892
import { mergeProviderInstanceEnvironment } from "../../provider/ProviderInstanceEnvironment.ts";
8993
import { T3_CODE_ORCHESTRATION_INSTRUCTIONS } from "../../provider/T3OrchestrationInstructions.ts";
@@ -518,19 +522,21 @@ export function makeClaudeAgentSdkProtocolLogger(input: {
518522
return undefined;
519523
}
520524

521-
return (event) =>
522-
nativeEventLogger
525+
return (event) => {
526+
if (!shouldPersistProviderEvent("native", event)) return Effect.void;
527+
return nativeEventLogger
523528
.write(
524529
{
525530
provider: CLAUDE_PROVIDER,
526531
protocol: CLAUDE_AGENT_SDK_QUERY_PROTOCOL,
527532
kind: "protocol",
528533
providerSessionId: input.providerSessionId,
529-
event,
534+
event: boundProviderEventForLogging(event),
530535
},
531536
input.threadId,
532537
)
533538
.pipe(Effect.ignore);
539+
};
534540
}
535541

536542
export const claudeAgentSdkQueryRunnerLiveLayer: Layer.Layer<

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

Lines changed: 138 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ import {
6262
} from "./CodexAdapterV2.ts";
6363
import { makeReplayServerConfig } from "./CodexAdapterV2.testkit.ts";
6464

65+
const encodeUnknownJson = Schema.encodeUnknownSync(Schema.fromJsonString(Schema.Unknown));
66+
6567
describe("CodexAdapterV2 context usage", () => {
6668
it("uses the current context rather than cumulative processed tokens", () => {
6769
const usage = codexProviderTurnTokenUsage(
@@ -647,7 +649,7 @@ describe("CodexAdapterV2 dynamic tool projection", () => {
647649
});
648650

649651
describe("CodexAdapterV2 native protocol logging", () => {
650-
it.effect("writes app-server protocol frames to the native provider log", () =>
652+
it.effect("logs decoded app-server frames once with credentials redacted", () =>
651653
Effect.gen(function* () {
652654
const writes: Array<{
653655
readonly event: unknown;
@@ -693,7 +695,7 @@ describe("CodexAdapterV2 native protocol logging", () => {
693695
'{"method":"thread/event","params":{"http_headers":{"Authorization":"Bearer secret-codex-token"}}}\n',
694696
});
695697

696-
assert.equal(writes.length, 2);
698+
assert.equal(writes.length, 1);
697699
assert.equal(writes[0]?.threadId, threadId);
698700
assert.deepEqual(writes[0]?.event, {
699701
provider: "codex",
@@ -713,19 +715,98 @@ describe("CodexAdapterV2 native protocol logging", () => {
713715
},
714716
},
715717
});
716-
assert.equal(writes[1]?.threadId, threadId);
717-
assert.deepEqual(writes[1]?.event, {
718-
provider: "codex",
719-
protocol: "codex.app-server",
720-
kind: "protocol",
721-
providerSessionId,
722-
event: {
723-
direction: "incoming",
724-
stage: "raw",
725-
payload:
726-
'{"method":"thread/event","params":{"http_headers":{"Authorization":"[REDACTED]"}}}',
718+
}),
719+
);
720+
721+
it.effect("filters streaming frames before redaction without losing decode failures", () =>
722+
Effect.gen(function* () {
723+
const writes: Array<unknown> = [];
724+
const protocolLogger = makeCodexAppServerProtocolLogger({
725+
nativeEventLogger: {
726+
filePath: "/tmp/events.log",
727+
write: (event) =>
728+
Effect.sync(() => {
729+
writes.push(event);
730+
}),
731+
close: () => Effect.void,
732+
},
733+
threadId: ThreadId.make("thread-1"),
734+
providerSessionId: ProviderSessionId.make("provider-session-1"),
735+
});
736+
assert.exists(protocolLogger);
737+
if (protocolLogger === undefined) return;
738+
739+
yield* protocolLogger({
740+
direction: "incoming",
741+
stage: "decoded",
742+
payload: {
743+
method: "item/agentMessage/delta",
744+
get params() {
745+
throw new Error("delta must not be copied");
746+
},
747+
},
748+
});
749+
yield* protocolLogger({
750+
direction: "incoming",
751+
stage: "raw",
752+
get payload() {
753+
throw new Error("raw frame must not be parsed");
754+
},
755+
});
756+
yield* protocolLogger({
757+
direction: "incoming",
758+
stage: "decode_failed",
759+
payload: { operation: "decode", method: "turn/completed", issueCount: 1 },
760+
});
761+
762+
assert.equal(writes.length, 1);
763+
assert.nestedPropertyVal(writes[0], "event.stage", "decode_failed");
764+
assert.nestedPropertyVal(writes[0], "event.payload.method", "turn/completed");
765+
}),
766+
);
767+
768+
it.effect("retains redacted failures when large payloads are summarized", () =>
769+
Effect.gen(function* () {
770+
const writes: Array<unknown> = [];
771+
const protocolLogger = makeCodexAppServerProtocolLogger({
772+
nativeEventLogger: {
773+
filePath: "/tmp/events.log",
774+
write: (event) =>
775+
Effect.sync(() => {
776+
writes.push(event);
777+
}),
778+
close: () => Effect.void,
727779
},
780+
threadId: ThreadId.make("thread-1"),
781+
providerSessionId: ProviderSessionId.make("provider-session-1"),
728782
});
783+
assert.exists(protocolLogger);
784+
if (protocolLogger === undefined) return;
785+
786+
yield* protocolLogger({
787+
direction: "incoming",
788+
stage: "decoded",
789+
payload: {
790+
method: "error",
791+
params: {
792+
threadId: "native-thread",
793+
turnId: "native-turn",
794+
error: {
795+
code: "unauthorized",
796+
message: '{"message":"Unauthorized","Authorization":"Bearer secret-token"}',
797+
},
798+
history: "x".repeat(128 * 1_024),
799+
},
800+
},
801+
});
802+
803+
const serialized = encodeUnknownJson(writes);
804+
assert.equal(writes.length, 1);
805+
assert.isBelow(serialized.length, 2_048);
806+
assert.notInclude(serialized, "secret-token");
807+
assert.include(serialized, "[REDACTED]");
808+
assert.nestedPropertyVal(writes[0], "event.payload.params.error.code", "unauthorized");
809+
assert.nestedPropertyVal(writes[0], "event.payload.params.turnId", "native-turn");
729810
}),
730811
);
731812

@@ -1164,6 +1245,50 @@ describe("CodexAdapterV2 post-settle continuation", () => {
11641245
event.type === "message.updated" && event.message.role === "assistant",
11651246
);
11661247

1248+
it.effect("resumes a provider thread without requesting or decoding its history", () =>
1249+
Effect.scoped(
1250+
Effect.gen(function* () {
1251+
const scenario = "codex-resume-metadata";
1252+
const nativeThreadId = `native-${scenario}-thread`;
1253+
const preamble = codexReplayPreamble({
1254+
nativeThreadId,
1255+
nativeTurnId: "unused-turn",
1256+
prompt: "unused-prompt",
1257+
}).slice(0, 5);
1258+
const transcript = makeCodexReplayTranscript({
1259+
scenario,
1260+
entries: [
1261+
...preamble,
1262+
{
1263+
type: "expect_outbound",
1264+
label: "thread/resume",
1265+
frame: {
1266+
id: 3,
1267+
method: "thread/resume",
1268+
params: { threadId: nativeThreadId, excludeTurns: true },
1269+
},
1270+
},
1271+
{
1272+
type: "emit_inbound",
1273+
label: "thread/resume",
1274+
frame: { id: 3, result: { thread: { id: nativeThreadId, updatedAt: 1782622450 } } },
1275+
},
1276+
],
1277+
});
1278+
const harness = yield* makeCodexReplayHarness(transcript);
1279+
const resumed = yield* harness.runtime.resumeThread({
1280+
providerThread: harness.providerThread,
1281+
modelSelection: CODEX_TEST_MODEL_SELECTION,
1282+
runtimePolicy: CODEX_TEST_RUNTIME_POLICY,
1283+
});
1284+
1285+
assert.equal(resumed.nativeThreadRef?.nativeId, nativeThreadId);
1286+
assert.equal(resumed.status, "idle");
1287+
assert.equal(DateTime.toEpochMillis(resumed.updatedAt), 1782622450000);
1288+
}).pipe(Effect.provide(Layer.merge(idAllocatorLayer, NodeServices.layer))),
1289+
),
1290+
);
1291+
11671292
it.effect("resolves retryable app-server errors on resumed provider activity", () =>
11681293
Effect.scoped(
11691294
Effect.gen(function* () {

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

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,11 @@ import {
6363
materializeCodexShadowHome,
6464
resolveCodexHomeLayout,
6565
} from "../../provider/Drivers/CodexHomeLayout.ts";
66-
import type { EventNdjsonLogger } from "../../provider/Layers/EventNdjsonLogger.ts";
66+
import {
67+
boundProviderEventForLogging,
68+
type EventNdjsonLogger,
69+
shouldPersistProviderEvent,
70+
} from "../../provider/Layers/EventNdjsonLogger.ts";
6771
import { ProviderEventLoggers } from "../../provider/Layers/ProviderEventLoggers.ts";
6872
import { mergeProviderInstanceEnvironment } from "../../provider/ProviderInstanceEnvironment.ts";
6973
import * as McpProviderSession from "../../mcp/McpProviderSession.ts";
@@ -1154,6 +1158,10 @@ export function codexThreadRuntimeParams(input: {
11541158
};
11551159
}
11561160

1161+
const decodeCodexResumeMetadata = Schema.decodeUnknownEffect(
1162+
Schema.Struct({ thread: Schema.Struct({ id: Schema.String, updatedAt: Schema.Number }) }),
1163+
);
1164+
11571165
export const makeCodexAppServerSpawnCommand = Effect.fn(
11581166
"CodexAdapterV2.makeCodexAppServerSpawnCommand",
11591167
)(function* (input: {
@@ -1227,19 +1235,21 @@ export function makeCodexAppServerProtocolLogger(input: {
12271235
return undefined;
12281236
}
12291237

1230-
return (event) =>
1231-
nativeEventLogger
1238+
return (event) => {
1239+
if (!shouldPersistProviderEvent("native", event)) return Effect.void;
1240+
return nativeEventLogger
12321241
.write(
12331242
{
12341243
provider: CODEX_PROVIDER,
12351244
protocol: "codex.app-server",
12361245
kind: "protocol",
12371246
providerSessionId: input.providerSessionId,
1238-
event: redactCodexProtocolValue(event),
1247+
event: redactCodexProtocolValue(boundProviderEventForLogging(event)),
12391248
},
12401249
input.threadId,
12411250
)
12421251
.pipe(Effect.ignore);
1252+
};
12431253
}
12441254

12451255
export function redactCodexProtocolValue(value: unknown): unknown {
@@ -1263,7 +1273,9 @@ export function redactCodexProtocolValue(value: unknown): unknown {
12631273
return value;
12641274
}
12651275
try {
1266-
return JSON.stringify(redactCodexProtocolValue(JSON.parse(trimmed) as unknown));
1276+
return JSON.stringify(
1277+
redactCodexProtocolValue(boundProviderEventForLogging(JSON.parse(trimmed) as unknown)),
1278+
);
12671279
} catch {
12681280
return value;
12691281
}
@@ -4551,8 +4563,10 @@ export function makeCodexAdapterV2(adapterOptions: CodexAdapterV2Options): Provi
45514563

45524564
const response = yield* ensureInitialized.pipe(
45534565
Effect.andThen(
4554-
client.request("thread/resume", {
4566+
// excludeTurns is not in the generated request schema yet.
4567+
client.raw.request("thread/resume", {
45554568
threadId: nativeThreadId,
4569+
excludeTurns: true,
45564570
...codexThreadRuntimeParams({
45574571
threadId: threadInput.threadId ?? threadInput.providerThread.appThreadId,
45584572
...(threadInput.modelSelection === undefined
@@ -4564,6 +4578,7 @@ export function makeCodexAdapterV2(adapterOptions: CodexAdapterV2Options): Provi
45644578
}),
45654579
}),
45664580
),
4581+
Effect.flatMap(decodeCodexResumeMetadata),
45674582
);
45684583
return {
45694584
...threadInput.providerThread,

0 commit comments

Comments
 (0)