Skip to content

fix(#4528): pass timeoutMs to detectCcVersion in discoverCcAgents #4547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aegis-gh-agent merged 1 commit into from
Jun 1, 2026
Merged

fix(#4528): pass timeoutMs to detectCcVersion in discoverCcAgents #4547

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/runners/cc-agents-discovery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,11 @@ export function compareSemver(
*
* @returns Version string (e.g. "2.1.146") or null if not found.
*/
export async function detectCcVersion(claudePath?: string): Promise<string | null> {
export async function detectCcVersion(claudePath?: string, timeoutMs?: number): Promise<string | null> {
const bin = claudePath || 'claude';
try {
const { stdout } = await execFileAsync(bin, ['--version'], {
timeout: 5000,
timeout: timeoutMs ?? 5000,
encoding: 'utf-8',
});
// Output format: "2.1.146 (Claude Code)" or "2.1.146"
Expand All @@ -109,8 +109,10 @@ export async function detectCcVersion(claudePath?: string): Promise<string | nul
/**
* Check if the installed CC version supports `claude agents --json`.
*/
export async function isCcAgentsJsonSupported(claudePath?: string): Promise<boolean> {
const version = await detectCcVersion(claudePath);
export async function isCcAgentsJsonSupported(claudePath?: string): Promise<boolean>;
export async function isCcAgentsJsonSupported(version: string, _claudePath?: string): Promise<boolean>;
export async function isCcAgentsJsonSupported(claudePathOrVersion?: string, _claudePath?: string): Promise<boolean> {
const version = claudePathOrVersion?.match(/^\d+\.\d+\.\d+/) ? claudePathOrVersion : await detectCcVersion(claudePathOrVersion);
if (!version) return false;
const parsed = parseSemver(version);
const minParsed = parseSemver(MIN_CC_VERSION_FOR_AGENTS_JSON);
Expand All @@ -134,7 +136,7 @@ export async function discoverCcAgents(
const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;

// Check version first
const ccVersion = await detectCcVersion(bin);
const ccVersion = await detectCcVersion(bin, timeoutMs);
if (!ccVersion) {
return {
available: false,
Expand All @@ -143,9 +145,7 @@ export async function discoverCcAgents(
};
}

const parsed = parseSemver(ccVersion);
const minParsed = parseSemver(MIN_CC_VERSION_FOR_AGENTS_JSON);
if (!parsed || !minParsed || compareSemver(parsed, minParsed) < 0) {
if (!await isCcAgentsJsonSupported(ccVersion, bin)) {
return {
available: false,
sessions: [],
Expand Down
Loading