From 77211b1c262b0bdfe147bfa2ed67aea958782f8e Mon Sep 17 00:00:00 2001 From: pku-xht Date: Tue, 18 Aug 2026 03:06:34 +0800 Subject: [PATCH] fix(subagent): expose startup cleanup failure facts --- .../subagent/subagent-claude-code/src/run.ts | 19 +++++++++---------- .../tests/subagent-claude-code.spec.ts | 9 +++++++++ 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/packages/subagent/subagent-claude-code/src/run.ts b/packages/subagent/subagent-claude-code/src/run.ts index 8fc38e5358..2604e59397 100644 --- a/packages/subagent/subagent-claude-code/src/run.ts +++ b/packages/subagent/subagent-claude-code/src/run.ts @@ -453,9 +453,10 @@ export async function startClaudeCodeRun( await disposeClaudeCodeChild(query, child) } catch (disposeError: unknown) { const failure = startupFailure() + const cleanupFailure = thrown(disposeError) throw new AggregateError( - [failure, thrown(disposeError)], - `${failure.message}; startup cleanup also failed`, + [failure, cleanupFailure], + `${failure.message}; ${cleanupFailure.message}`, ) } } else if (query !== undefined) { @@ -463,15 +464,13 @@ export async function startClaudeCodeRun( query.close() } catch (disposeError: unknown) { const failure = startupFailure() + const cleanupFailure = new ClaudeCodeFailure({ + stage: 'teardown', + category: 'unknown', + }, thrown(disposeError)) throw new AggregateError( - [ - failure, - new ClaudeCodeFailure({ - stage: 'teardown', - category: 'unknown', - }, thrown(disposeError)), - ], - `${failure.message}; startup cleanup also failed`, + [failure, cleanupFailure], + `${failure.message}; ${cleanupFailure.message}`, ) } } diff --git a/packages/subagent/subagent-claude-code/tests/subagent-claude-code.spec.ts b/packages/subagent/subagent-claude-code/tests/subagent-claude-code.spec.ts index 7325456afd..786f19d37c 100644 --- a/packages/subagent/subagent-claude-code/tests/subagent-claude-code.spec.ts +++ b/packages/subagent/subagent-claude-code/tests/subagent-claude-code.spec.ts @@ -1087,6 +1087,9 @@ describe('run publication, cancellation, and settlement', () => { }) await expect(noChild) .rejects.toThrow(expectedFailureDiagnostic('query-start', 'unknown')) + await expect(noChild).rejects.toThrow( + `${expectedFailureDiagnostic('query-start', 'unknown')}; subagent-claude-code: ${expectedFailureDiagnostic('teardown', 'unknown')}`, + ) await expect(noChild).rejects.toBeInstanceOf(AggregateError) const startupAbort = new AbortController() @@ -1129,6 +1132,9 @@ describe('run publication, cancellation, and settlement', () => { .rejects.toBeInstanceOf(AggregateError) await expect(cancelledCleanupFailure) .rejects.toThrow(expectedFailureDiagnostic('query-start', 'unknown')) + await expect(cancelledCleanupFailure).rejects.toThrow( + `${expectedFailureDiagnostic('query-start', 'unknown')}; subagent-claude-code: ${expectedFailureDiagnostic('teardown', 'unknown', { exitCode: 0, signal: null })}`, + ) await expect(cancelledCleanupFailure) .rejects.not.toThrow('SECRET_TOKEN') @@ -1196,6 +1202,9 @@ describe('run publication, cancellation, and settlement', () => { const failedStartup = startClaudeCodeRun(request(), failed.spec) await expect(failedStartup) .rejects.toThrow(expectedFailureDiagnostic('query-start', 'unknown')) + await expect(failedStartup).rejects.toThrow( + `${expectedFailureDiagnostic('query-start', 'unknown')}; subagent-claude-code: ${expectedFailureDiagnostic('teardown', 'unknown')}`, + ) await expect(failedStartup).rejects.toBeInstanceOf(AggregateError) expect(failed.close).toHaveBeenCalledOnce() })