claude-bot/EJClaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: centralize EJClaw runtime env names (#192)

Browse Source
This commit is contained in:
Eyejoker
2026-05-29 22:00:15 +09:00
committed by GitHub
parent e876a509a5
commit fb87e94c5a
11 changed files with 100 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/agent-runner-environment.test.ts
View File

@@ -3,6 +3,7 @@ import os from 'os';
import path from 'path';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { EJCLAW_ENV } from 'ejclaw-runners-shared';
const { mockReadEnvFile, mockGetActiveCodexAuthPath } = vi.hoisted(() => ({
mockReadEnvFile: vi.fn<() => Record<string, string>>(),
@@ -455,7 +456,7 @@ describe('prepareGroupEnvironment Codex MCP room role env', () => {
roomRole: 'owner',
});
expect(readCodexConfigToml()).toContain('EJCLAW_ROOM_ROLE = "owner"');
expect(readCodexConfigToml()).toContain(`${EJCLAW_ENV.roomRole} = "owner"`);
});
it('omits room role from non-paired Codex MCP config env', () => {
@@ -464,7 +465,7 @@ describe('prepareGroupEnvironment Codex MCP room role env', () => {
prepareGroupEnvironment(group, true, 'dc:test');
expect(readCodexConfigToml()).not.toContain('EJCLAW_ROOM_ROLE');
expect(readCodexConfigToml()).not.toContain(EJCLAW_ENV.roomRole);
});
});
@@ -741,7 +742,7 @@ command = "node"
args = ["old-ipc.js"]
[mcp_servers.ejclaw.env]
EJCLAW_IPC_DIR = "/old/ipc"
${EJCLAW_ENV.ipcDir} = "/old/ipc"
[mcp_servers.other]
command = "node"
@@ -780,10 +781,10 @@ args = ["other.js"]
expect(toml).toContain('model = "gpt-5.4"');
expect(toml).toContain('[mcp_servers.other]');
expect(toml).toContain('[mcp_servers.ejclaw]');
expect(toml).toContain('EJCLAW_IPC_DIR = "/workspace/ipc"');
expect(toml).toContain('EJCLAW_GROUP_FOLDER = "codex-test-group"');
expect(toml).toContain('EJCLAW_ROOM_ROLE = "reviewer"');
expect(toml).toContain('EJCLAW_WORK_DIR = "/workspace/project"');
expect(toml).toContain(`${EJCLAW_ENV.ipcDir} = "/workspace/ipc"`);
expect(toml).toContain(`${EJCLAW_ENV.groupFolder} = "codex-test-group"`);
expect(toml).toContain(`${EJCLAW_ENV.roomRole} = "reviewer"`);
expect(toml).toContain(`${EJCLAW_ENV.workDir} = "/workspace/project"`);
expect(toml).not.toContain('old-ipc.js');
expect(toml).not.toContain('"/old/ipc"');
expect(toml.match(/\[mcp_servers\.ejclaw\]/g)).toHaveLength(1);

45
src/agent-runner-environment.ts
View File

@@ -1,6 +1,7 @@
import fs from 'fs';
import os from 'os';
import path from 'path';
import { EJCLAW_ENV } from 'ejclaw-runners-shared';
import {
GROUPS_DIR,
@@ -210,20 +211,22 @@ function upsertEjclawMcpServerSection(args: {
? fs.readFileSync(args.sessionConfigPath, 'utf-8')
: '';
toml = stripEjclawMcpServerSections(toml);
const tomlEnvLine = (name: string, value: string): string =>
`${name} = ${JSON.stringify(value)}`;
const mcpSection = `
[mcp_servers.ejclaw]
command = "node"
args = [${JSON.stringify(args.mcpServerPath)}]
[mcp_servers.ejclaw.env]
EJCLAW_IPC_DIR = ${JSON.stringify(args.ipcDir)}
EJCLAW_HOST_IPC_DIR = ${JSON.stringify(args.hostIpcDir)}
EJCLAW_CHAT_JID = ${JSON.stringify(args.chatJid)}
EJCLAW_GROUP_FOLDER = ${JSON.stringify(args.groupFolder)}
EJCLAW_IS_MAIN = ${JSON.stringify(args.isMain ? '1' : '0')}
EJCLAW_AGENT_TYPE = ${JSON.stringify(args.agentType)}
${args.roomRole ? `EJCLAW_ROOM_ROLE = ${JSON.stringify(args.roomRole)}\n` : ''}
${args.workDir ? `EJCLAW_WORK_DIR = ${JSON.stringify(args.workDir)}\n` : ''}
${tomlEnvLine(EJCLAW_ENV.ipcDir, args.ipcDir)}
${tomlEnvLine(EJCLAW_ENV.hostIpcDir, args.hostIpcDir)}
${tomlEnvLine(EJCLAW_ENV.chatJid, args.chatJid)}
${tomlEnvLine(EJCLAW_ENV.groupFolder, args.groupFolder)}
${tomlEnvLine(EJCLAW_ENV.isMain, args.isMain ? '1' : '0')}
${tomlEnvLine(EJCLAW_ENV.agentType, args.agentType)}
${args.roomRole ? `${tomlEnvLine(EJCLAW_ENV.roomRole, args.roomRole)}\n` : ''}
${args.workDir ? `${tomlEnvLine(EJCLAW_ENV.workDir, args.workDir)}\n` : ''}
`;
fs.writeFileSync(args.sessionConfigPath, toml.trimEnd() + '\n' + mcpSection);
}
@@ -263,18 +266,18 @@ function buildBaseRunnerEnv(args: {
: currentPath,
TZ: TIMEZONE,
HOME: os.homedir(),
EJCLAW_GROUP_DIR: args.groupDir,
EJCLAW_IPC_DIR: args.groupIpcDir,
EJCLAW_HOST_IPC_DIR: args.hostIpcDir,
EJCLAW_GLOBAL_DIR: args.globalDir,
...(args.group.workDir ? { EJCLAW_WORK_DIR: args.group.workDir } : {}),
EJCLAW_CHAT_JID: args.chatJid,
EJCLAW_GROUP_FOLDER: args.group.folder,
EJCLAW_IS_MAIN: args.isMain ? '1' : '0',
EJCLAW_AGENT_TYPE: args.agentType,
[EJCLAW_ENV.groupDir]: args.groupDir,
[EJCLAW_ENV.ipcDir]: args.groupIpcDir,
[EJCLAW_ENV.hostIpcDir]: args.hostIpcDir,
[EJCLAW_ENV.globalDir]: args.globalDir,
...(args.group.workDir ? { [EJCLAW_ENV.workDir]: args.group.workDir } : {}),
[EJCLAW_ENV.chatJid]: args.chatJid,
[EJCLAW_ENV.groupFolder]: args.group.folder,
[EJCLAW_ENV.isMain]: args.isMain ? '1' : '0',
[EJCLAW_ENV.agentType]: args.agentType,
CLAUDE_CONFIG_DIR: args.groupSessionsDir,
...(args.runtimeTaskId
? { EJCLAW_RUNTIME_TASK_ID: args.runtimeTaskId }
? { [EJCLAW_ENV.runtimeTaskId]: args.runtimeTaskId }
: {}),
};
}
@@ -486,15 +489,15 @@ function prepareCodexSessionEnvironment(args: {
upsertEjclawMcpServerSection({
sessionConfigPath,
mcpServerPath,
ipcDir: args.env.EJCLAW_IPC_DIR,
hostIpcDir: args.env.EJCLAW_HOST_IPC_DIR,
ipcDir: args.env[EJCLAW_ENV.ipcDir],
hostIpcDir: args.env[EJCLAW_ENV.hostIpcDir],
chatJid: args.chatJid,
groupFolder: args.group.folder,
isMain: args.isMain,
agentType: 'codex',
roomRole: args.roomRole,
workDir:
args.env.EJCLAW_WORK_DIR || args.group.workDir || args.projectRoot,
args.env[EJCLAW_ENV.workDir] || args.group.workDir || args.projectRoot,
});
}

15
src/agent-runner.ts
View File

@@ -2,7 +2,10 @@ import { ChildProcess, spawn } from 'child_process';
import fs from 'fs';
import path from 'path';
import { isUnsafeHostPairedModeEnabled } from 'ejclaw-runners-shared';
import {
EJCLAW_ENV,
isUnsafeHostPairedModeEnabled,
} from 'ejclaw-runners-shared';
/**
* Agent Process Runner for EJClaw
@@ -122,9 +125,9 @@ export async function runAgentProcess(
agentType: group.agentType || 'claude-code',
memoryBriefing: input.memoryBriefing,
role: input.roomRoleContext.role,
ipcDir: env.EJCLAW_IPC_DIR,
hostIpcDir: env.EJCLAW_HOST_IPC_DIR,
workDir: envOverrides.EJCLAW_WORK_DIR || env.EJCLAW_WORK_DIR,
ipcDir: env[EJCLAW_ENV.ipcDir],
hostIpcDir: env[EJCLAW_ENV.hostIpcDir],
workDir: envOverrides[EJCLAW_ENV.workDir] || env[EJCLAW_ENV.workDir],
skillOverrides,
});
if ((group.agentType || 'claude-code') === 'codex') {
@@ -135,7 +138,7 @@ export async function runAgentProcess(
}
}
if (input.runId) {
env.EJCLAW_RUN_ID = input.runId;
env[EJCLAW_ENV.runId] = input.runId;
}
const safeName = group.folder.replace(/[^a-zA-Z0-9-]/g, '-');
@@ -179,7 +182,7 @@ export async function runAgentProcess(
env,
});
onProcess(proc, processName, env.EJCLAW_IPC_DIR);
onProcess(proc, processName, env[EJCLAW_ENV.ipcDir]);
const runnerInput: AgentInput = {
...input,