Skip to content

Commit 1f3932f

Browse files
committed
fix(codex): guard native toggle teardown ownership
1 parent 2468502 commit 1f3932f

2 files changed

Lines changed: 26 additions & 0 deletions

File tree

‎src/server/management/native-integration-routes.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,13 @@ async function handleCodexToggle(ctx: ManagementContext): Promise<Response> {
234234
}
235235
const enabled = body.enabled;
236236

237+
if (!enabled) {
238+
// Restoring Codex mutates shared native artifacts. Refuse before even
239+
// persisting intent when the installed service belongs to another home.
240+
const owned = assertNativeTeardownOwned();
241+
if (!owned.ok) return refusal(409, "codex", "home_mismatch", owned.message);
242+
}
243+
237244
const { setCodexIntegrationEnabled } = await import("../../codex/desired-state");
238245
const persisted = setCodexIntegrationEnabled(enabled);
239246
/*

‎tests/native-codex-toggle.test.ts‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,25 @@ describe("request validation", () => {
104104
});
105105

106106
describe("turning Codex off", () => {
107+
test("refuses teardown owned by a service installed from another home", async () => {
108+
writeFileSync(join(fixtureRoot, "service-state.json"), JSON.stringify({
109+
version: 2,
110+
codexHome: process.env.CODEX_HOME?.trim() || join(homedir(), ".codex"),
111+
opencodexHome: join(fixtureRoot, "foreign-opencodex-home"),
112+
backend: "scheduler",
113+
}));
114+
115+
const result = await put(baseConfig(), { enabled: false });
116+
117+
expect(result.status).toBe(409);
118+
expect(result.body).toMatchObject({
119+
code: "native_integration_refused",
120+
clientId: "codex",
121+
reason: "home_mismatch",
122+
});
123+
expect(persistedCodexIntent()).toBeUndefined();
124+
});
125+
107126
test("persists the decision so it survives the next start", async () => {
108127
const result = await put(baseConfig(), { enabled: false });
109128
expect(result.status).toBe(200);

0 commit comments

Comments
 (0)