Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
97 changes: 75 additions & 22 deletions apps/server/src/provider/Layers/CodexSessionRuntime.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,20 @@ function makeThreadOpenResponse(
modelProvider: "openai",
approvalPolicy: "never",
approvalsReviewer: "user",
sandbox: { type: "danger-full-access" },
sandbox: { type: "dangerFullAccess" },
thread: {
id: threadId,
createdAt: "2026-04-18T00:00:00.000Z",
source: { session: "cli" },
cliVersion: "0.147.0",
createdAt: 1_776_470_400,
cwd: "/tmp/project",
ephemeral: false,
modelProvider: "openai",
preview: "",
sessionId: threadId,
source: "cli",
turns: [],
status: {
state: "idle",
activeFlags: [],
},
status: { type: "idle" },
updatedAt: 1_776_470_400,
},
} as unknown as CodexRpc.ClientRequestResponsesByMethod["thread/start"];
}
Expand Down Expand Up @@ -398,19 +402,22 @@ describe("openCodexThread", () => {
const calls: Array<{ method: "thread/start" | "thread/resume"; payload: unknown }> = [];
const started = makeThreadOpenResponse("fresh-thread");
const client = {
request: <M extends "thread/start" | "thread/resume">(
method: M,
payload: CodexRpc.ClientRequestParamsByMethod[M],
) => {
calls.push({ method, payload });
if (method === "thread/resume") {
raw: {
request: (method: string, payload?: unknown) => {
calls.push({ method: method as "thread/resume", payload });
return Effect.fail(
new CodexErrors.CodexAppServerRequestError({
code: -32603,
errorMessage: "thread not found",
}),
);
}
},
},
request: <M extends "thread/start" | "thread/resume">(
method: M,
payload: CodexRpc.ClientRequestParamsByMethod[M],
) => {
calls.push({ method, payload });
return Effect.succeed(started as CodexRpc.ClientRequestResponsesByMethod[M]);
},
};
Expand All @@ -436,18 +443,19 @@ describe("openCodexThread", () => {
it.effect("propagates non-recoverable resume failures", () =>
Effect.gen(function* () {
const client = {
request: <M extends "thread/start" | "thread/resume">(
method: M,
_payload: CodexRpc.ClientRequestParamsByMethod[M],
) => {
if (method === "thread/resume") {
return Effect.fail(
raw: {
request: () =>
Effect.fail(
new CodexErrors.CodexAppServerRequestError({
code: -32603,
errorMessage: "timed out waiting for server",
}),
);
}
),
},
request: <M extends "thread/start" | "thread/resume">(
_method: M,
_payload: CodexRpc.ClientRequestParamsByMethod[M],
) => {
return Effect.succeed(
makeThreadOpenResponse("fresh-thread") as CodexRpc.ClientRequestResponsesByMethod[M],
);
Expand All @@ -468,4 +476,49 @@ describe("openCodexThread", () => {
NodeAssert.equal(error.errorMessage, "timed out waiting for server");
}),
);

it.effect("resumes without returning historical turns", () =>
Effect.gen(function* () {
const calls: Array<{ method: string; payload: unknown }> = [];
const resumed = makeThreadOpenResponse("resumed-thread");
const client = {
raw: {
request: (method: string, payload?: unknown) => {
calls.push({ method, payload });
return Effect.succeed(resumed);
},
},
request: <M extends "thread/start" | "thread/resume">(
_method: M,
_payload: CodexRpc.ClientRequestParamsByMethod[M],
) => Effect.succeed(resumed as CodexRpc.ClientRequestResponsesByMethod[M]),
};

const opened = yield* openCodexThread({
client,
threadId: ThreadId.make("thread-1"),
runtimeMode: "full-access",
cwd: "/tmp/project",
requestedModel: "gpt-5.3-codex",
serviceTier: undefined,
resumeThreadId: "existing-thread",
});

NodeAssert.equal(opened.thread.id, "resumed-thread");
NodeAssert.deepStrictEqual(calls, [
{
method: "thread/resume",
payload: {
threadId: "existing-thread",
cwd: "/tmp/project",
approvalPolicy: "never",
sandbox: "danger-full-access",
approvalsReviewer: "user",
model: "gpt-5.3-codex",
excludeTurns: true,
},
},
]);
}),
);
});
26 changes: 25 additions & 1 deletion apps/server/src/provider/Layers/CodexSessionRuntime.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ import { codexSessionAppServerArgs } from "./codexLaunchArgs.ts";
import { expandHomePath } from "../../pathExpansion.ts";
import { buildCodexDeveloperInstructions } from "../CodexDeveloperInstructions.ts";
const decodeV2TurnStartResponse = Schema.decodeUnknownEffect(EffectCodexSchema.V2TurnStartResponse);
const decodeV2ThreadResumeResponse = Schema.decodeUnknownEffect(
EffectCodexSchema.V2ThreadResumeResponse,
);

const PROVIDER = ProviderDriverKind.make("codex");

Expand Down Expand Up @@ -448,6 +451,12 @@ type CodexThreadOpenResponse =
type CodexThreadOpenMethod = "thread/start" | "thread/resume";

interface CodexThreadOpenClient {
readonly raw: {
readonly request: (
method: string,
payload?: unknown,
) => Effect.Effect<unknown, CodexErrors.CodexAppServerError>;
};
readonly request: <M extends CodexThreadOpenMethod>(
method: M,
payload: CodexRpc.ClientRequestParamsByMethod[M],
Expand Down Expand Up @@ -475,12 +484,27 @@ export const openCodexThread = (input: {
return input.client.request("thread/start", startParams);
}

return input.client
return input.client.raw
.request("thread/resume", {
threadId: resumeThreadId,
...startParams,
// T3 already persists the visible transcript. Asking Codex to rebuild and
// return every historical turn can make large resumes exhaust the local
// backend before the session becomes ready.
excludeTurns: true,
})
.pipe(
Effect.flatMap((rawResponse) =>
decodeV2ThreadResumeResponse(rawResponse).pipe(
Effect.mapError((error) =>
CodexErrors.CodexAppServerProtocolParseError.fromSchemaError(
"decode-response-payload",
error,
{ method: "thread/resume" },
),
),
),
),
Effect.catchIf(isRecoverableThreadResumeError, (error) =>
Effect.logWarning("codex app-server thread resume fell back to fresh start", {
threadId: input.threadId,
Expand Down
Loading