From e7200a1ed88545c221afeef7c690a1319c6384c7 Mon Sep 17 00:00:00 2001
From: Eyejoker <phj1081@gmail.com>
Date: Thu, 19 Mar 2026 14:35:30 +0900
Subject: [PATCH] Fix Codex task target JID injection

---
 src/agent-runner.test.ts | 44 ++++++++++++++++++++++++++++++++++++++++
 src/agent-runner.ts      |  2 +-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/agent-runner.test.ts b/src/agent-runner.test.ts
index 622d6b2..25fad00 100644
--- a/src/agent-runner.test.ts
+++ b/src/agent-runner.test.ts
@@ -252,4 +252,48 @@ describe('agent-runner timeout behavior', () => {
       'Platform Claude Rules\n\n---\n\nGlobal Claude Memory\n',
     );
   });
+
+  it('injects the real chat JID into Codex MCP config', async () => {
+    vi.mocked(fs.existsSync).mockImplementation((p: fs.PathLike) => {
+      const path = String(p);
+      return (
+        path.includes('dist/index.js') ||
+        path.endsWith('/runners/agent-runner/dist/ipc-mcp-stdio.js')
+      );
+    });
+    vi.mocked(fs.readFileSync).mockReturnValue('');
+
+    const codexGroup: RegisteredGroup = {
+      ...testGroup,
+      folder: 'eyejokerdb-4',
+      agentType: 'codex',
+    };
+    const codexInput = {
+      ...testInput,
+      groupFolder: 'eyejokerdb-4',
+      chatJid: 'dc:1481348008183595170',
+    };
+
+    const resultPromise = runAgentProcess(
+      codexGroup,
+      codexInput,
+      () => {},
+      undefined,
+    );
+
+    fakeProc.emit('close', 0);
+    await vi.advanceTimersByTimeAsync(10);
+    await resultPromise;
+
+    expect(fs.writeFileSync).toHaveBeenCalledWith(
+      '/tmp/ejclaw-test-data/sessions/eyejokerdb-4/.codex/config.toml',
+      expect.stringContaining(
+        'NANOCLAW_CHAT_JID = "dc:1481348008183595170"',
+      ),
+    );
+    expect(fs.writeFileSync).toHaveBeenCalledWith(
+      '/tmp/ejclaw-test-data/sessions/eyejokerdb-4/.codex/config.toml',
+      expect.stringContaining('NANOCLAW_GROUP_FOLDER = "eyejokerdb-4"'),
+    );
+  });
 });
diff --git a/src/agent-runner.ts b/src/agent-runner.ts
index bb53272..f7e08a2 100644
--- a/src/agent-runner.ts
+++ b/src/agent-runner.ts
@@ -323,7 +323,7 @@ args = [${JSON.stringify(mcpServerPath)}]
 
 [mcp_servers.nanoclaw.env]
 NANOCLAW_IPC_DIR = ${JSON.stringify(env.NANOCLAW_IPC_DIR)}
-NANOCLAW_CHAT_JID = ${JSON.stringify(group.folder)}
+NANOCLAW_CHAT_JID = ${JSON.stringify(chatJid)}
 NANOCLAW_GROUP_FOLDER = ${JSON.stringify(group.folder)}
 NANOCLAW_IS_MAIN = ${JSON.stringify(isMain ? '1' : '0')}
 `;