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

fix: skip EXTRA_BASE scan when workDir is set

Browse Source 
Prevents the agent-runner from scanning all subdirectories of the
project as additionalDirectories, which caused SDK crashes.
This commit is contained in:
Eyejoker
2026-03-11 02:07:28 +09:00
parent cb51ef36f9
commit b748622523
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
container/agent-runner/src/index.ts
View File

@@ -407,23 +407,25 @@ async function runQuery(
globalClaudeMd = fs.readFileSync(globalClaudeMdPath, 'utf-8'); globalClaudeMd = fs.readFileSync(globalClaudeMdPath, 'utf-8');
} }
// Discover additional directories mounted at /workspace/extra/* // Discover additional directories
// These are passed to the SDK so their CLAUDE.md files are loaded automatically
const extraDirs: string[] = []; const extraDirs: string[] = [];
const extraBase = EXTRA_BASE;
if (fs.existsSync(extraBase)) {
for (const entry of fs.readdirSync(extraBase)) {
const fullPath = path.join(extraBase, entry);
if (fs.statSync(fullPath).isDirectory()) {
extraDirs.push(fullPath);
}
}
}
// When WORK_DIR is set, use it as cwd and include GROUP_DIR as additional directory // When WORK_DIR is set, use it as cwd and include GROUP_DIR as additional directory
const effectiveCwd = WORK_DIR || GROUP_DIR; const effectiveCwd = WORK_DIR || GROUP_DIR;
if (WORK_DIR && WORK_DIR !== GROUP_DIR) { if (WORK_DIR && WORK_DIR !== GROUP_DIR) {
extraDirs.push(GROUP_DIR); extraDirs.push(GROUP_DIR);
log(`Work directory override: ${WORK_DIR} (group dir added to additionalDirectories)`); log(`Work directory override: ${WORK_DIR} (group dir added to additionalDirectories)`);
} else {
// Only scan EXTRA_BASE when no WORK_DIR override (legacy container mount support)
const extraBase = EXTRA_BASE;
if (extraBase && fs.existsSync(extraBase)) {
for (const entry of fs.readdirSync(extraBase)) {
const fullPath = path.join(extraBase, entry);
if (fs.statSync(fullPath).isDirectory()) {
extraDirs.push(fullPath);
}
}
}
} }
if (extraDirs.length > 0) { if (extraDirs.length > 0) {
log(`Additional directories: ${extraDirs.join(', ')}`); log(`Additional directories: ${extraDirs.join(', ')}`);

4
src/db.ts
View File

@@ -130,9 +130,7 @@ function createSchema(database: Database.Database): void {
// Add work_dir column if it doesn't exist (migration for per-group working directory) // Add work_dir column if it doesn't exist (migration for per-group working directory)
try { try {
database.exec( database.exec(`ALTER TABLE registered_groups ADD COLUMN work_dir TEXT`);
`ALTER TABLE registered_groups ADD COLUMN work_dir TEXT`,
);
} catch { } catch {
/* column already exists */ /* column already exists */
} }