Skip to content

Commit 3e0d877

Browse files
only21milclaudemaria-rcks
authored
fix(server): Codex switches respect each instance's CODEX_HOME variable (#24664)
Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]> Co-authored-by: maria-rcks <[email protected]>
1 parent 52b65aa commit 3e0d877

2 files changed

Lines changed: 24 additions & 1 deletion

File tree

‎apps/server/src/provider/Drivers/CodexDriver.test.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,24 @@ it.layer(layerTest)("CodexDriver", (it) => {
478478
}).pipe(Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, noSpawn), Effect.scoped),
479479
);
480480

481+
it.effect("uses each instance's environment CODEX_HOME for continuation", () =>
482+
Effect.gen(function* () {
483+
const fs = yield* FileSystem.FileSystem;
484+
const tempDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-codex-driver-" });
485+
for (const [index, account] of ["work", "personal", "work "].entries()) {
486+
const codexHome = NodePath.join(tempDir, account);
487+
const instance = yield* CodexDriver.create({
488+
instanceId: ProviderInstanceId.make(`account-${index}`),
489+
displayName: account,
490+
enabled: false,
491+
environment: [{ name: "CODEX_HOME", value: codexHome, sensitive: false }],
492+
config: CodexDriver.defaultConfig(),
493+
});
494+
expect(instance.continuationIdentity.continuationKey).toBe(`codex:home:${codexHome}`);
495+
}
496+
}).pipe(Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, noSpawn), Effect.scoped),
497+
);
498+
481499
for (const fixture of [
482500
{
483501
name: "leaves mise npm-backend installations manual-only",

‎apps/server/src/provider/Drivers/CodexDriver.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,12 @@ export const CodexDriver: ProviderDriver<
154154
environment,
155155
yield* HostProcess.Environment,
156156
);
157-
const homeLayout = yield* resolveCodexHomeLayout(config);
157+
const environmentHome = processEnv.CODEX_HOME;
158+
const homeLayout = yield* resolveCodexHomeLayout(
159+
!config.homePath.trim() && !config.shadowHomePath.trim() && environmentHome?.trim()
160+
? { ...config, homePath: environmentHome }
161+
: config,
162+
);
158163
const continuationIdentity = codexContinuationIdentity(homeLayout);
159164
const stampIdentity = withInstanceIdentity({
160165
instanceId,

0 commit comments

Comments
 (0)