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

17
runners/agent-runner/src/index.ts
View File

@@ -18,6 +18,7 @@ import fs from 'fs';
import path from 'path';
import { query } from '@anthropic-ai/claude-agent-sdk';
import {
EJCLAW_ENV,
IPC_CLOSE_SENTINEL,
IPC_INPUT_SUBDIR,
IPC_POLL_MS,
@@ -78,12 +79,12 @@ interface RunnerInput {
}
// Paths configurable via env vars.
const GROUP_DIR = process.env.EJCLAW_GROUP_DIR || '/workspace/group';
const IPC_DIR = process.env.EJCLAW_IPC_DIR || '/workspace/ipc';
const HOST_IPC_DIR = process.env.EJCLAW_HOST_IPC_DIR || IPC_DIR;
const GROUP_DIR = process.env[EJCLAW_ENV.groupDir] || '/workspace/group';
const IPC_DIR = process.env[EJCLAW_ENV.ipcDir] || '/workspace/ipc';
const HOST_IPC_DIR = process.env[EJCLAW_ENV.hostIpcDir] || IPC_DIR;
// Optional: override cwd (agent works in this directory instead of GROUP_DIR)
const WORK_DIR = process.env.EJCLAW_WORK_DIR || '';
const GROUP_FOLDER = process.env.EJCLAW_GROUP_FOLDER || '';
const WORK_DIR = process.env[EJCLAW_ENV.workDir] || '';
const GROUP_FOLDER = process.env[EJCLAW_ENV.groupFolder] || '';
const IPC_INPUT_DIR = path.join(IPC_DIR, IPC_INPUT_SUBDIR);
const IPC_INPUT_CLOSE_SENTINEL = path.join(IPC_INPUT_DIR, IPC_CLOSE_SENTINEL);
@@ -333,10 +334,10 @@ async function runQuery(
chatJid: runnerInput.chatJid,
groupFolder: runnerInput.groupFolder,
isMain: runnerInput.isMain,
agentType: process.env.EJCLAW_AGENT_TYPE || 'claude-code',
agentType: process.env[EJCLAW_ENV.agentType] || 'claude-code',
roomRole: runnerInput.roomRoleContext?.role || '',
ipcDir: process.env.EJCLAW_IPC_DIR,
hostIpcDir: process.env.EJCLAW_HOST_IPC_DIR,
ipcDir: process.env[EJCLAW_ENV.ipcDir],
hostIpcDir: process.env[EJCLAW_ENV.hostIpcDir],
}),
},
hooks: {

19
runners/agent-runner/src/ipc-mcp-stdio.ts
View File

@@ -10,6 +10,7 @@ import { z } from 'zod';
import fs from 'fs';
import path from 'path';
import { CronExpressionParser } from 'cron-parser';
import { EJCLAW_ENV } from 'ejclaw-runners-shared';
import {
buildCiWatchPrompt,
DEFAULT_WATCH_CI_CONTEXT_MODE,
@@ -34,15 +35,15 @@ const MESSAGES_DIR = path.join(HOST_IPC_DIR, 'messages');
const TASKS_DIR = path.join(HOST_IPC_DIR, 'tasks');
const HOST_EVIDENCE_RESPONSES_DIR =
resolveHostEvidenceResponsesDir(HOST_IPC_DIR);
const REPO_ROOT = process.env.EJCLAW_WORK_DIR || process.cwd();
const REPO_ROOT = process.env[EJCLAW_ENV.workDir] || process.cwd();
// Context from environment variables (set by the agent runner)
const chatJid = process.env.EJCLAW_CHAT_JID!;
const groupFolder = process.env.EJCLAW_GROUP_FOLDER!;
const isMain = process.env.EJCLAW_IS_MAIN === '1';
const agentType = process.env.EJCLAW_AGENT_TYPE || 'claude-code';
const roomRole = process.env.EJCLAW_ROOM_ROLE;
const runtimeTaskId = process.env.EJCLAW_RUNTIME_TASK_ID;
const chatJid = process.env[EJCLAW_ENV.chatJid]!;
const groupFolder = process.env[EJCLAW_ENV.groupFolder]!;
const isMain = process.env[EJCLAW_ENV.isMain] === '1';
const agentType = process.env[EJCLAW_ENV.agentType] || 'claude-code';
const roomRole = process.env[EJCLAW_ENV.roomRole];
const runtimeTaskId = process.env[EJCLAW_ENV.runtimeTaskId];
const allowGenericScheduling = agentType !== 'codex';
function currentAgentType(): 'claude-code' | 'codex' {
@@ -93,8 +94,8 @@ server.tool(
chatJid,
text: args.text,
sender: args.sender || undefined,
senderRole: process.env.EJCLAW_ROOM_ROLE || undefined,
runId: process.env.EJCLAW_RUN_ID || undefined,
senderRole: process.env[EJCLAW_ENV.roomRole] || undefined,
runId: process.env[EJCLAW_ENV.runId] || undefined,
groupFolder,
});

5
runners/agent-runner/src/ipc-paths.ts
View File

@@ -1,4 +1,5 @@
import path from 'path';
import { EJCLAW_ENV } from 'ejclaw-runners-shared';
export interface ResolvedIpcDirectories {
ipcDir: string;
@@ -13,8 +14,8 @@ export function isTaskScopedIpcDir(ipcDir: string): boolean {
export function resolveIpcDirectories(
env: NodeJS.ProcessEnv,
): ResolvedIpcDirectories {
const ipcDir = env.EJCLAW_IPC_DIR || '/workspace/ipc';
const hostIpcDir = env.EJCLAW_HOST_IPC_DIR;
const ipcDir = env[EJCLAW_ENV.ipcDir] || '/workspace/ipc';
const hostIpcDir = env[EJCLAW_ENV.hostIpcDir];
if (!hostIpcDir && isTaskScopedIpcDir(ipcDir)) {
throw new Error(

15
runners/agent-runner/src/mcp-config.ts
View File

@@ -1,4 +1,5 @@
import type { McpStdioServerConfig } from '@anthropic-ai/claude-agent-sdk';
import { EJCLAW_ENV } from 'ejclaw-runners-shared';
export interface EjclawMcpServerConfigInput {
chatJid: string;
@@ -19,16 +20,16 @@ export function buildEjclawMcpServerConfig(
args: [mcpServerPath],
alwaysLoad: true,
env: {
EJCLAW_CHAT_JID: input.chatJid,
EJCLAW_GROUP_FOLDER: input.groupFolder,
EJCLAW_IS_MAIN: input.isMain ? '1' : '0',
EJCLAW_AGENT_TYPE: input.agentType,
EJCLAW_ROOM_ROLE: input.roomRole,
[EJCLAW_ENV.chatJid]: input.chatJid,
[EJCLAW_ENV.groupFolder]: input.groupFolder,
[EJCLAW_ENV.isMain]: input.isMain ? '1' : '0',
[EJCLAW_ENV.agentType]: input.agentType,
[EJCLAW_ENV.roomRole]: input.roomRole,
...(input.ipcDir && {
EJCLAW_IPC_DIR: input.ipcDir,
[EJCLAW_ENV.ipcDir]: input.ipcDir,
}),
...(input.hostIpcDir && {
EJCLAW_HOST_IPC_DIR: input.hostIpcDir,
[EJCLAW_ENV.hostIpcDir]: input.hostIpcDir,
}),
},
};

15
runners/agent-runner/test/mcp-config.test.ts
View File

@@ -1,4 +1,5 @@
import { describe, expect, it } from 'vitest';
import { EJCLAW_ENV } from 'ejclaw-runners-shared';
import { buildEjclawMcpServerConfig } from '../src/mcp-config.js';
@@ -19,13 +20,13 @@ describe('ejclaw MCP config', () => {
args: ['/runner/dist/ipc-mcp-stdio.js'],
alwaysLoad: true,
env: {
EJCLAW_CHAT_JID: 'dc:room',
EJCLAW_GROUP_FOLDER: 'ejclaw',
EJCLAW_IS_MAIN: '1',
EJCLAW_AGENT_TYPE: 'claude-code',
EJCLAW_ROOM_ROLE: 'reviewer',
EJCLAW_IPC_DIR: '/tmp/ipc/task',
EJCLAW_HOST_IPC_DIR: '/tmp/ipc/host',
[EJCLAW_ENV.chatJid]: 'dc:room',
[EJCLAW_ENV.groupFolder]: 'ejclaw',
[EJCLAW_ENV.isMain]: '1',
[EJCLAW_ENV.agentType]: 'claude-code',
[EJCLAW_ENV.roomRole]: 'reviewer',
[EJCLAW_ENV.ipcDir]: '/tmp/ipc/task',
[EJCLAW_ENV.hostIpcDir]: '/tmp/ipc/host',
},
});
});