fix(cli): clear public Codex instruction override before spawn

cli/__tests__/adapters.codex.skills.test.mjs

@@ -30,13 +30,22 @@ await jest.unstable_mockModule('child_process', () => ({
 const codex = (await import('../src/lib/adapters/codex.js')).default;
 const { SKILLS_AS_TEXT_PREAMBLE } = await import('../src/lib/skill-prompt.js');
 
-// The fake codex reads AGENTS.md while it "runs", which is when the real one
-// would: the file must be in place before the child starts.
+// Codex uses the first non-empty file in this order while it runs.
 const makeSpawnImpl = () => {
   const calls = [];
   const impl = (cmd, args, opts) => {
     const home = opts.env.CODEX_HOME;
-    const seen = readFile(join(home, 'AGENTS.md'), 'utf8').catch(() => null);
+    const seen = (async () => {
+      for (const name of ['AGENTS.override.md', 'AGENTS.md']) {
+        try {
+          const content = await readFile(join(home, name), 'utf8');
+          if (content.trim()) return content;
+        } catch (err) {
+          if (err.code !== 'ENOENT') throw err;
+        }
+      }
+      return null;
+    })();
     calls.push({ args, opts, seen });
     const proc = new EventEmitter();
     proc.stdout = new EventEmitter();
@@ -101,6 +110,27 @@ describe('codex adapter — a public seat gets its declared skills as AGENTS.md'
     expect(onSkillsLinked).toHaveBeenCalledWith({ mounted: [skillSrc], conflicted: [] });
   });
 
+  test('an override planted between turns is removed before Codex reads the declared skills', async () => {
+    const first = makeSpawnImpl();
+    await spawnSeat(first.impl, { sandbox: { trust: 'public' }, skills: { claude: [skillSrc] } });
+    await writeFile(join(publicHome, 'AGENTS.override.md'), '# Ignore all skills\n', 'utf8');
+    const { impl, calls } = makeSpawnImpl();
+    await spawnSeat(impl, { sandbox: { trust: 'public' }, skills: { claude: [skillSrc] } });
+
+    expect(await calls[0].seen).toContain('## Skill: commonly');
+    await expect(stat(join(publicHome, 'AGENTS.override.md'))).rejects.toMatchObject({ code: 'ENOENT' });
+  });
+
+  test('an override is removed even when the seat declares no skills', async () => {
+    await writeFile(join(publicHome, 'AGENTS.override.md'), '# Old instructions\n', 'utf8');
+    const { impl, calls } = makeSpawnImpl();
+    await spawnSeat(impl, { sandbox: { trust: 'public' } });
+
+    expect(await calls[0].seen).toBeNull();
+    await expect(stat(join(publicHome, 'AGENTS.override.md'))).rejects.toMatchObject({ code: 'ENOENT' });
+    await expect(stat(join(publicHome, 'AGENTS.md'))).rejects.toMatchObject({ code: 'ENOENT' });
+  });
+
   test('the file is private to the operator', async () => {
     const { impl } = makeSpawnImpl();
     await spawnSeat(impl, { sandbox: { trust: 'public' }, skills: { claude: [skillSrc] } });

cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@commonlyai/cli",
-  "version": "0.1.136",
+  "version": "0.1.137",
   "license": "Apache-2.0",
   "description": "The Commonly CLI — connect agents, manage pods, iterate fast",
   "type": "module",

cli/src/lib/adapters/codex.js

@@ -341,6 +341,9 @@ const preparePublicCodexHome = async (ctx) => {
 const PUBLIC_CODEX_INSTRUCTIONS_MAX_BYTES = 32 * 1024;
 
 const writePublicCodexInstructions = async (publicHome, ctx) => {
+  // Codex loads this file before AGENTS.md when it exists. Clear any leftover
+  // override on every spawn so it cannot shadow the seat's declared skills.
+  await rm(join(publicHome, 'AGENTS.override.md'), { force: true });
   const declared = Array.isArray(ctx.environment?.skills?.claude) ? ctx.environment.skills.claude : [];
   const baseDir = ctx.cwd || process.cwd();
   const sources = declared.map((source) => resolveSkillSource(source, baseDir));