fix(sdk): point checkAgentsInstalled at ~/.claude/agents (#2401)
This commit is contained in:
@@ -19,8 +19,27 @@
|
||||
|
||||
import { join, relative, resolve, isAbsolute, normalize } from 'node:path';
|
||||
import { realpath } from 'node:fs/promises';
|
||||
import { homedir } from 'node:os';
|
||||
import { GSDError, ErrorClassification } from '../errors.js';
|
||||
|
||||
// ─── resolveAgentsDir ──────────────────────────────────────────────────────
|
||||
|
||||
/**
|
||||
* Resolve the Claude Code agents directory using the same precedence as the
|
||||
* installer (`bin/install.js` getGlobalDir for Claude):
|
||||
* 1. GSD_AGENTS_DIR — explicit SDK override
|
||||
* 2. CLAUDE_CONFIG_DIR/agents — matches installer's --config-dir / env
|
||||
* 3. ~/.claude/agents — default
|
||||
*
|
||||
* Must mirror `bin/install.js:389-396` for Claude. Used by both
|
||||
* `query/init.ts:checkAgentsInstalled` and `init-runner.ts`.
|
||||
*/
|
||||
export function resolveAgentsDir(): string {
|
||||
if (process.env.GSD_AGENTS_DIR) return process.env.GSD_AGENTS_DIR;
|
||||
if (process.env.CLAUDE_CONFIG_DIR) return join(process.env.CLAUDE_CONFIG_DIR, 'agents');
|
||||
return join(homedir(), '.claude', 'agents');
|
||||
}
|
||||
|
||||
// ─── Types ──────────────────────────────────────────────────────────────────
|
||||
|
||||
/** Paths to common .planning files. */
|
||||
|
||||
@@ -116,6 +116,95 @@ describe('withProjectRoot', () => {
|
||||
const enriched = withProjectRoot(tmpDir, result, {});
|
||||
expect(enriched.response_language).toBeUndefined();
|
||||
});
|
||||
|
||||
// Regression: #2400 — checkAgentsInstalled was looking at the wrong default
|
||||
// directory (~/.claude/get-shit-done/agents) while the installer writes to
|
||||
// ~/.claude/agents, causing agents_installed: false even on clean installs.
|
||||
it('reports agents_installed: true when all expected agents exist in GSD_AGENTS_DIR', async () => {
|
||||
const { MODEL_PROFILES } = await import('./config-query.js');
|
||||
const agentsDir = join(tmpDir, 'fake-agents');
|
||||
await mkdir(agentsDir, { recursive: true });
|
||||
for (const name of Object.keys(MODEL_PROFILES)) {
|
||||
await writeFile(join(agentsDir, `${name}.md`), '# stub');
|
||||
}
|
||||
const prev = process.env.GSD_AGENTS_DIR;
|
||||
process.env.GSD_AGENTS_DIR = agentsDir;
|
||||
try {
|
||||
const enriched = withProjectRoot(tmpDir, {});
|
||||
expect(enriched.agents_installed).toBe(true);
|
||||
expect(enriched.missing_agents).toEqual([]);
|
||||
} finally {
|
||||
if (prev === undefined) delete process.env.GSD_AGENTS_DIR;
|
||||
else process.env.GSD_AGENTS_DIR = prev;
|
||||
}
|
||||
});
|
||||
|
||||
it('reports missing agents when GSD_AGENTS_DIR is empty', async () => {
|
||||
const agentsDir = join(tmpDir, 'empty-agents');
|
||||
await mkdir(agentsDir, { recursive: true });
|
||||
const prev = process.env.GSD_AGENTS_DIR;
|
||||
process.env.GSD_AGENTS_DIR = agentsDir;
|
||||
try {
|
||||
const enriched = withProjectRoot(tmpDir, {}) as Record<string, unknown>;
|
||||
expect(enriched.agents_installed).toBe(false);
|
||||
expect((enriched.missing_agents as string[]).length).toBeGreaterThan(0);
|
||||
} finally {
|
||||
if (prev === undefined) delete process.env.GSD_AGENTS_DIR;
|
||||
else process.env.GSD_AGENTS_DIR = prev;
|
||||
}
|
||||
});
|
||||
|
||||
// Regression: #2400 follow-up — installer honors CLAUDE_CONFIG_DIR for custom
|
||||
// Claude install roots. The SDK check must follow the same precedence or it
|
||||
// false-negatives agent presence on non-default installs.
|
||||
it('honors CLAUDE_CONFIG_DIR when GSD_AGENTS_DIR is unset', async () => {
|
||||
const { MODEL_PROFILES } = await import('./config-query.js');
|
||||
const configDir = join(tmpDir, 'custom-claude');
|
||||
const agentsDir = join(configDir, 'agents');
|
||||
await mkdir(agentsDir, { recursive: true });
|
||||
for (const name of Object.keys(MODEL_PROFILES)) {
|
||||
await writeFile(join(agentsDir, `${name}.md`), '# stub');
|
||||
}
|
||||
const prevAgents = process.env.GSD_AGENTS_DIR;
|
||||
const prevClaude = process.env.CLAUDE_CONFIG_DIR;
|
||||
delete process.env.GSD_AGENTS_DIR;
|
||||
process.env.CLAUDE_CONFIG_DIR = configDir;
|
||||
try {
|
||||
const enriched = withProjectRoot(tmpDir, {}) as Record<string, unknown>;
|
||||
expect(enriched.agents_installed).toBe(true);
|
||||
expect(enriched.missing_agents).toEqual([]);
|
||||
} finally {
|
||||
if (prevAgents === undefined) delete process.env.GSD_AGENTS_DIR;
|
||||
else process.env.GSD_AGENTS_DIR = prevAgents;
|
||||
if (prevClaude === undefined) delete process.env.CLAUDE_CONFIG_DIR;
|
||||
else process.env.CLAUDE_CONFIG_DIR = prevClaude;
|
||||
}
|
||||
});
|
||||
|
||||
it('GSD_AGENTS_DIR takes precedence over CLAUDE_CONFIG_DIR', async () => {
|
||||
const { MODEL_PROFILES } = await import('./config-query.js');
|
||||
const winningDir = join(tmpDir, 'winning-agents');
|
||||
const losingDir = join(tmpDir, 'losing-config', 'agents');
|
||||
await mkdir(winningDir, { recursive: true });
|
||||
await mkdir(losingDir, { recursive: true });
|
||||
// Only populate the winning dir.
|
||||
for (const name of Object.keys(MODEL_PROFILES)) {
|
||||
await writeFile(join(winningDir, `${name}.md`), '# stub');
|
||||
}
|
||||
const prevAgents = process.env.GSD_AGENTS_DIR;
|
||||
const prevClaude = process.env.CLAUDE_CONFIG_DIR;
|
||||
process.env.GSD_AGENTS_DIR = winningDir;
|
||||
process.env.CLAUDE_CONFIG_DIR = join(tmpDir, 'losing-config');
|
||||
try {
|
||||
const enriched = withProjectRoot(tmpDir, {}) as Record<string, unknown>;
|
||||
expect(enriched.agents_installed).toBe(true);
|
||||
} finally {
|
||||
if (prevAgents === undefined) delete process.env.GSD_AGENTS_DIR;
|
||||
else process.env.GSD_AGENTS_DIR = prevAgents;
|
||||
if (prevClaude === undefined) delete process.env.CLAUDE_CONFIG_DIR;
|
||||
else process.env.CLAUDE_CONFIG_DIR = prevClaude;
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
describe('initExecutePhase', () => {
|
||||
|
||||
@@ -27,7 +27,7 @@ import { loadConfig } from '../config.js';
|
||||
import { resolveModel, MODEL_PROFILES } from './config-query.js';
|
||||
import { findPhase } from './phase.js';
|
||||
import { roadmapGetPhase, getMilestoneInfo } from './roadmap.js';
|
||||
import { planningPaths, normalizePhaseName, toPosixPath } from './helpers.js';
|
||||
import { planningPaths, normalizePhaseName, toPosixPath, resolveAgentsDir } from './helpers.js';
|
||||
import type { QueryHandler } from './utils.js';
|
||||
|
||||
// ─── Internal helpers ──────────────────────────────────────────────────────
|
||||
@@ -82,8 +82,7 @@ function getLatestCompletedMilestone(projectDir: string): { version: string; nam
|
||||
* Port of checkAgentsInstalled from core.cjs lines 1274-1306.
|
||||
*/
|
||||
function checkAgentsInstalled(): { agents_installed: boolean; missing_agents: string[] } {
|
||||
const agentsDir = process.env.GSD_AGENTS_DIR
|
||||
|| join(homedir(), '.claude', 'get-shit-done', 'agents');
|
||||
const agentsDir = resolveAgentsDir();
|
||||
const expectedAgents = Object.keys(MODEL_PROFILES);
|
||||
|
||||
if (!existsSync(agentsDir)) {
|
||||
|
||||
Reference in New Issue
Block a user