@generacy-ai/orchestrator 0.5.1 → 0.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/config/loader.d.ts.map +1 -1
- package/dist/config/loader.js +25 -0
- package/dist/config/loader.js.map +1 -1
- package/dist/config/schema.d.ts +54 -7
- package/dist/config/schema.d.ts.map +1 -1
- package/dist/index.d.ts +3 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -1
- package/dist/index.js.map +1 -1
- package/dist/routes/health.d.ts.map +1 -1
- package/dist/routes/health.js +5 -0
- package/dist/routes/health.js.map +1 -1
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +130 -26
- package/dist/server.js.map +1 -1
- package/dist/services/base-advance-monitor-service.d.ts +78 -0
- package/dist/services/base-advance-monitor-service.d.ts.map +1 -0
- package/dist/services/base-advance-monitor-service.js +233 -0
- package/dist/services/base-advance-monitor-service.js.map +1 -0
- package/dist/services/boot-resume-service.d.ts +19 -0
- package/dist/services/boot-resume-service.d.ts.map +1 -0
- package/dist/services/boot-resume-service.js +87 -0
- package/dist/services/boot-resume-service.js.map +1 -0
- package/dist/services/epic-completion-monitor-service.d.ts.map +1 -1
- package/dist/services/epic-completion-monitor-service.js +2 -0
- package/dist/services/epic-completion-monitor-service.js.map +1 -1
- package/dist/services/in-memory-queue-adapter.d.ts +4 -0
- package/dist/services/in-memory-queue-adapter.d.ts.map +1 -1
- package/dist/services/in-memory-queue-adapter.js +30 -3
- package/dist/services/in-memory-queue-adapter.js.map +1 -1
- package/dist/services/label-monitor-service.d.ts +3 -3
- package/dist/services/label-monitor-service.d.ts.map +1 -1
- package/dist/services/label-monitor-service.js +58 -41
- package/dist/services/label-monitor-service.js.map +1 -1
- package/dist/services/label-sync-service.d.ts.map +1 -1
- package/dist/services/label-sync-service.js +45 -10
- package/dist/services/label-sync-service.js.map +1 -1
- package/dist/services/merge-conflict-monitor-service.d.ts +73 -0
- package/dist/services/merge-conflict-monitor-service.d.ts.map +1 -0
- package/dist/services/merge-conflict-monitor-service.js +295 -0
- package/dist/services/merge-conflict-monitor-service.js.map +1 -0
- package/dist/services/orchestrator-version.d.ts +2 -0
- package/dist/services/orchestrator-version.d.ts.map +1 -0
- package/dist/services/orchestrator-version.js +23 -0
- package/dist/services/orchestrator-version.js.map +1 -0
- package/dist/services/phase-tracker-service.d.ts +10 -0
- package/dist/services/phase-tracker-service.d.ts.map +1 -1
- package/dist/services/phase-tracker-service.js +38 -0
- package/dist/services/phase-tracker-service.js.map +1 -1
- package/dist/services/post-activation-dispatch.d.ts +18 -0
- package/dist/services/post-activation-dispatch.d.ts.map +1 -0
- package/dist/services/post-activation-dispatch.js +30 -0
- package/dist/services/post-activation-dispatch.js.map +1 -0
- package/dist/services/pr-feedback-monitor-service.d.ts +13 -4
- package/dist/services/pr-feedback-monitor-service.d.ts.map +1 -1
- package/dist/services/pr-feedback-monitor-service.js +212 -26
- package/dist/services/pr-feedback-monitor-service.js.map +1 -1
- package/dist/services/redis-queue-adapter.d.ts +4 -0
- package/dist/services/redis-queue-adapter.d.ts.map +1 -1
- package/dist/services/redis-queue-adapter.js +90 -10
- package/dist/services/redis-queue-adapter.js.map +1 -1
- package/dist/services/worker-dispatcher.d.ts +14 -2
- package/dist/services/worker-dispatcher.d.ts.map +1 -1
- package/dist/services/worker-dispatcher.js +55 -2
- package/dist/services/worker-dispatcher.js.map +1 -1
- package/dist/types/api.d.ts +3 -0
- package/dist/types/api.d.ts.map +1 -1
- package/dist/types/api.js +1 -0
- package/dist/types/api.js.map +1 -1
- package/dist/types/index.d.ts +1 -1
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js.map +1 -1
- package/dist/types/monitor.d.ts +72 -4
- package/dist/types/monitor.d.ts.map +1 -1
- package/dist/worker/base-merge.d.ts +54 -0
- package/dist/worker/base-merge.d.ts.map +1 -0
- package/dist/worker/base-merge.js +99 -0
- package/dist/worker/base-merge.js.map +1 -0
- package/dist/worker/clarification-markers.d.ts +29 -0
- package/dist/worker/clarification-markers.d.ts.map +1 -0
- package/dist/worker/clarification-markers.js +44 -0
- package/dist/worker/clarification-markers.js.map +1 -0
- package/dist/worker/clarification-poster.d.ts.map +1 -1
- package/dist/worker/clarification-poster.js +266 -25
- package/dist/worker/clarification-poster.js.map +1 -1
- package/dist/worker/claude-cli-worker.d.ts +21 -2
- package/dist/worker/claude-cli-worker.d.ts.map +1 -1
- package/dist/worker/claude-cli-worker.js +149 -4
- package/dist/worker/claude-cli-worker.js.map +1 -1
- package/dist/worker/cli-spawner.d.ts +4 -0
- package/dist/worker/cli-spawner.d.ts.map +1 -1
- package/dist/worker/cli-spawner.js +51 -7
- package/dist/worker/cli-spawner.js.map +1 -1
- package/dist/worker/config.d.ts +101 -9
- package/dist/worker/config.d.ts.map +1 -1
- package/dist/worker/config.js +75 -4
- package/dist/worker/config.js.map +1 -1
- package/dist/worker/evidence-hash.d.ts +32 -0
- package/dist/worker/evidence-hash.d.ts.map +1 -0
- package/dist/worker/evidence-hash.js +139 -0
- package/dist/worker/evidence-hash.js.map +1 -0
- package/dist/worker/handler-outcome-assertion.d.ts +38 -0
- package/dist/worker/handler-outcome-assertion.d.ts.map +1 -0
- package/dist/worker/handler-outcome-assertion.js +58 -0
- package/dist/worker/handler-outcome-assertion.js.map +1 -0
- package/dist/worker/handler-outcome.d.ts +50 -0
- package/dist/worker/handler-outcome.d.ts.map +1 -0
- package/dist/worker/handler-outcome.js +2 -0
- package/dist/worker/handler-outcome.js.map +1 -0
- package/dist/worker/label-manager.d.ts +58 -2
- package/dist/worker/label-manager.d.ts.map +1 -1
- package/dist/worker/label-manager.js +225 -27
- package/dist/worker/label-manager.js.map +1 -1
- package/dist/worker/merge-conflict-handler.d.ts +141 -0
- package/dist/worker/merge-conflict-handler.d.ts.map +1 -0
- package/dist/worker/merge-conflict-handler.js +642 -0
- package/dist/worker/merge-conflict-handler.js.map +1 -0
- package/dist/worker/merge-conflict-prompt.d.ts +35 -0
- package/dist/worker/merge-conflict-prompt.d.ts.map +1 -0
- package/dist/worker/merge-conflict-prompt.js +71 -0
- package/dist/worker/merge-conflict-prompt.js.map +1 -0
- package/dist/worker/merge-conflict-remedy.d.ts +42 -0
- package/dist/worker/merge-conflict-remedy.d.ts.map +1 -0
- package/dist/worker/merge-conflict-remedy.js +28 -0
- package/dist/worker/merge-conflict-remedy.js.map +1 -0
- package/dist/worker/output-tail-synthesis.d.ts +15 -0
- package/dist/worker/output-tail-synthesis.d.ts.map +1 -0
- package/dist/worker/output-tail-synthesis.js +25 -0
- package/dist/worker/output-tail-synthesis.js.map +1 -0
- package/dist/worker/output-tail.d.ts +13 -0
- package/dist/worker/output-tail.d.ts.map +1 -0
- package/dist/worker/output-tail.js +31 -0
- package/dist/worker/output-tail.js.map +1 -0
- package/dist/worker/pause-context.d.ts +30 -0
- package/dist/worker/pause-context.d.ts.map +1 -0
- package/dist/worker/pause-context.js +98 -0
- package/dist/worker/pause-context.js.map +1 -0
- package/dist/worker/phase-loop.d.ts +66 -0
- package/dist/worker/phase-loop.d.ts.map +1 -1
- package/dist/worker/phase-loop.js +299 -31
- package/dist/worker/phase-loop.js.map +1 -1
- package/dist/worker/pr-feedback-handler.d.ts +46 -46
- package/dist/worker/pr-feedback-handler.d.ts.map +1 -1
- package/dist/worker/pr-feedback-handler.js +276 -105
- package/dist/worker/pr-feedback-handler.js.map +1 -1
- package/dist/worker/pr-manager.d.ts +5 -0
- package/dist/worker/pr-manager.d.ts.map +1 -1
- package/dist/worker/pr-manager.js +7 -0
- package/dist/worker/pr-manager.js.map +1 -1
- package/dist/worker/product-diff.d.ts +39 -0
- package/dist/worker/product-diff.d.ts.map +1 -0
- package/dist/worker/product-diff.js +43 -0
- package/dist/worker/product-diff.js.map +1 -0
- package/dist/worker/provisioning-failure.d.ts +14 -0
- package/dist/worker/provisioning-failure.d.ts.map +1 -0
- package/dist/worker/provisioning-failure.js +2 -0
- package/dist/worker/provisioning-failure.js.map +1 -0
- package/dist/worker/repo-checkout.d.ts +14 -0
- package/dist/worker/repo-checkout.d.ts.map +1 -1
- package/dist/worker/repo-checkout.js +19 -1
- package/dist/worker/repo-checkout.js.map +1 -1
- package/dist/worker/stage-comment-manager.d.ts +42 -1
- package/dist/worker/stage-comment-manager.d.ts.map +1 -1
- package/dist/worker/stage-comment-manager.js +205 -1
- package/dist/worker/stage-comment-manager.js.map +1 -1
- package/dist/worker/terminal-label-op-error.d.ts +23 -0
- package/dist/worker/terminal-label-op-error.d.ts.map +1 -0
- package/dist/worker/terminal-label-op-error.js +27 -0
- package/dist/worker/terminal-label-op-error.js.map +1 -0
- package/dist/worker/types.d.ts +161 -2
- package/dist/worker/types.d.ts.map +1 -1
- package/dist/worker/types.js +11 -0
- package/dist/worker/types.js.map +1 -1
- package/dist/worker/validate-fix-handler.d.ts +79 -0
- package/dist/worker/validate-fix-handler.d.ts.map +1 -0
- package/dist/worker/validate-fix-handler.js +320 -0
- package/dist/worker/validate-fix-handler.js.map +1 -0
- package/dist/worker/worker-result.d.ts +39 -0
- package/dist/worker/worker-result.d.ts.map +1 -0
- package/dist/worker/worker-result.js +10 -0
- package/dist/worker/worker-result.js.map +1 -0
- package/package.json +7 -6
|
@@ -2,9 +2,11 @@ import { spawn } from 'node:child_process';
|
|
|
2
2
|
import { existsSync } from 'node:fs';
|
|
3
3
|
import { promises as fs } from 'node:fs';
|
|
4
4
|
import path from 'node:path';
|
|
5
|
-
import { resolveSiblingWorkdirs, tryLoadWorkspaceConfig, findWorkspaceConfigPath } from '@generacy-ai/config';
|
|
5
|
+
import { resolveSiblingWorkdirs, tryLoadWorkspaceConfig, tryLoadOrchestratorSettings, findWorkspaceConfigPath } from '@generacy-ai/config';
|
|
6
6
|
import { createGitHubClient, createFeature, registerProcessLauncher, clearProcessLauncher, siblingFanoutHandler, FilesystemWorkflowStore } from '@generacy-ai/workflow-engine';
|
|
7
|
+
import { ValidateFixHandler } from './validate-fix-handler.js';
|
|
7
8
|
import { getPhaseSequence } from './types.js';
|
|
9
|
+
import { applyRepoValidateOverrides } from './config.js';
|
|
8
10
|
import { PhaseResolver } from './phase-resolver.js';
|
|
9
11
|
import { LabelManager } from './label-manager.js';
|
|
10
12
|
import { StageCommentManager } from './stage-comment-manager.js';
|
|
@@ -15,6 +17,8 @@ import { RepoCheckout } from './repo-checkout.js';
|
|
|
15
17
|
import { PhaseLoop } from './phase-loop.js';
|
|
16
18
|
import { PrManager } from './pr-manager.js';
|
|
17
19
|
import { PrFeedbackHandler } from './pr-feedback-handler.js';
|
|
20
|
+
import { MergeConflictHandler } from './merge-conflict-handler.js';
|
|
21
|
+
import { readPauseContext, clearPauseContext } from './pause-context.js';
|
|
18
22
|
import { EpicPostTasks } from './epic-post-tasks.js';
|
|
19
23
|
import { ConversationLogger } from './conversation-logger.js';
|
|
20
24
|
import { createAgentLauncher } from '../launcher/launcher-setup.js';
|
|
@@ -22,6 +26,7 @@ import { CredhelperHttpClient } from '../launcher/credhelper-client.js';
|
|
|
22
26
|
import { CredhelperUnavailableError } from '../launcher/credhelper-errors.js';
|
|
23
27
|
import { JitTokenError } from '@generacy-ai/control-plane';
|
|
24
28
|
import { conversationProcessFactory } from '../conversation/process-factory.js';
|
|
29
|
+
import { isTerminalLabelOpError } from './terminal-label-op-error.js';
|
|
25
30
|
/**
|
|
26
31
|
* Load linkedPRs from workflow state files in the checkout directory.
|
|
27
32
|
* Reads `.generacy/workflow-state-*.json` files and returns the first
|
|
@@ -105,6 +110,7 @@ export class ClaudeCliWorker {
|
|
|
105
110
|
sseEmitter;
|
|
106
111
|
jobEventEmitter;
|
|
107
112
|
tokenProvider;
|
|
113
|
+
phaseTracker;
|
|
108
114
|
repoCheckout;
|
|
109
115
|
phaseResolver;
|
|
110
116
|
agentLauncher;
|
|
@@ -115,6 +121,7 @@ export class ClaudeCliWorker {
|
|
|
115
121
|
this.sseEmitter = deps.sseEmitter;
|
|
116
122
|
this.jobEventEmitter = deps.jobEventEmitter;
|
|
117
123
|
this.tokenProvider = deps.tokenProvider;
|
|
124
|
+
this.phaseTracker = deps.phaseTracker;
|
|
118
125
|
this.repoCheckout = new RepoCheckout(config.workspaceDir, logger);
|
|
119
126
|
this.phaseResolver = new PhaseResolver();
|
|
120
127
|
// Credential role fail-fast check: if role is configured, the daemon must be reachable
|
|
@@ -175,6 +182,16 @@ export class ClaudeCliWorker {
|
|
|
175
182
|
* - Creates a WorkerContext
|
|
176
183
|
* - Resolves the starting phase from issue labels
|
|
177
184
|
* - Runs the phase loop to completion (or gate/error)
|
|
185
|
+
*
|
|
186
|
+
* Returns a `WorkerResult` discriminated union:
|
|
187
|
+
* - `{ status: 'completed' }` — happy path (incl. gate hits and phase failures
|
|
188
|
+
* that self-terminated cleanly).
|
|
189
|
+
* - `{ status: 'failed-terminal', failureMetadata }` — a `TerminalLabelOpError`
|
|
190
|
+
* was caught inside the phase loop or the outer catch. The dispatcher marks
|
|
191
|
+
* the item completed (not released) and emits the `stage: 'label-op'` alert.
|
|
192
|
+
*
|
|
193
|
+
* All other unhandled throws propagate; the dispatcher catches them and
|
|
194
|
+
* releases the item (unchanged behavior for generic errors).
|
|
178
195
|
*/
|
|
179
196
|
async handle(item) {
|
|
180
197
|
const workerId = crypto.randomUUID();
|
|
@@ -206,6 +223,7 @@ export class ClaudeCliWorker {
|
|
|
206
223
|
let labelManager;
|
|
207
224
|
let phasesCompleted = false;
|
|
208
225
|
let gateHit = false;
|
|
226
|
+
let workerResult = { status: 'completed' };
|
|
209
227
|
try {
|
|
210
228
|
// 1. Clone the default branch first (always works, even on first run)
|
|
211
229
|
const defaultBranch = await this.repoCheckout.getDefaultBranch(item.owner, item.repo);
|
|
@@ -227,7 +245,72 @@ export class ClaudeCliWorker {
|
|
|
227
245
|
totalPhases: 1,
|
|
228
246
|
},
|
|
229
247
|
});
|
|
230
|
-
return;
|
|
248
|
+
return { status: 'completed' };
|
|
249
|
+
}
|
|
250
|
+
// 2b. #898: route resolve-merge-conflicts to MergeConflictHandler.
|
|
251
|
+
if (item.command === 'resolve-merge-conflicts') {
|
|
252
|
+
workerLogger.info('Routing to MergeConflictHandler for merge-conflict resolution');
|
|
253
|
+
// #902 FR-003: read the pause-context sidecar written by the phase-loop
|
|
254
|
+
// pause site. Populates `metadata.phase` — the single source of truth
|
|
255
|
+
// for the interrupted phase. Absence triggers the handler's fail-loud
|
|
256
|
+
// path (FR-004) — never re-derived from labels.
|
|
257
|
+
const pauseContext = await readPauseContext(checkoutPath, workflowId);
|
|
258
|
+
if (pauseContext) {
|
|
259
|
+
item.metadata = {
|
|
260
|
+
...(item.metadata ?? {}),
|
|
261
|
+
phase: pauseContext.phase,
|
|
262
|
+
};
|
|
263
|
+
workerLogger.info({ pausePhase: pauseContext.phase, writtenAt: pauseContext.writtenAt }, '#902: loaded pause-context sidecar — populated metadata.phase');
|
|
264
|
+
}
|
|
265
|
+
else {
|
|
266
|
+
workerLogger.warn({ workflowId }, '#902: pause-context sidecar missing — MergeConflictHandler will enter fail-loud path');
|
|
267
|
+
}
|
|
268
|
+
const mergeConflictHandler = new MergeConflictHandler(this.config, workerLogger, this.agentLauncher, this.sseEmitter);
|
|
269
|
+
const outcome = await mergeConflictHandler.handle(item, checkoutPath);
|
|
270
|
+
workerLogger.info({ outcome: outcome.outcome }, 'Merge-conflict resolution completed');
|
|
271
|
+
this.sseEmitter?.({
|
|
272
|
+
type: 'workflow:completed',
|
|
273
|
+
workflowId,
|
|
274
|
+
data: {
|
|
275
|
+
command: 'resolve-merge-conflicts',
|
|
276
|
+
lastPhase: 'resolve-merge-conflicts',
|
|
277
|
+
totalPhases: 1,
|
|
278
|
+
},
|
|
279
|
+
});
|
|
280
|
+
// #902 FR-002/FR-008: on re-armed, build the rearm item and hand it to
|
|
281
|
+
// the dispatcher via `postComplete`. Dispatcher fires `enqueueIfAbsent`
|
|
282
|
+
// AFTER `queue.complete()` — the current itemKey is freed first, so no
|
|
283
|
+
// self-collision on the shared itemKey `<owner>/<repo>#<issue>`.
|
|
284
|
+
if (outcome.outcome === 're-armed') {
|
|
285
|
+
const rearmItem = {
|
|
286
|
+
owner: item.owner,
|
|
287
|
+
repo: item.repo,
|
|
288
|
+
issueNumber: item.issueNumber,
|
|
289
|
+
workflowName: item.workflowName,
|
|
290
|
+
command: 'continue',
|
|
291
|
+
priority: Date.now(),
|
|
292
|
+
enqueuedAt: new Date().toISOString(),
|
|
293
|
+
queueReason: 'resume',
|
|
294
|
+
userId: item.userId,
|
|
295
|
+
metadata: {
|
|
296
|
+
startPhase: outcome.startPhase,
|
|
297
|
+
resumeReason: 'merge-conflict-resolved',
|
|
298
|
+
},
|
|
299
|
+
};
|
|
300
|
+
// Best-effort sidecar cleanup — a stale file left behind is
|
|
301
|
+
// overwritten by the next pause (writes are unconditional).
|
|
302
|
+
try {
|
|
303
|
+
await clearPauseContext(checkoutPath, workflowId);
|
|
304
|
+
}
|
|
305
|
+
catch (err) {
|
|
306
|
+
workerLogger.warn({ err: String(err), workflowId }, '#902: failed to clear pause-context sidecar — will be overwritten on next pause');
|
|
307
|
+
}
|
|
308
|
+
return {
|
|
309
|
+
status: 'completed',
|
|
310
|
+
postComplete: { kind: 'rearm', rearmItem },
|
|
311
|
+
};
|
|
312
|
+
}
|
|
313
|
+
return { status: 'completed' };
|
|
231
314
|
}
|
|
232
315
|
// 3. Get issue details and resolve description
|
|
233
316
|
const issue = await github.getIssue(item.owner, item.repo, item.issueNumber);
|
|
@@ -279,7 +362,25 @@ export class ClaudeCliWorker {
|
|
|
279
362
|
}
|
|
280
363
|
}
|
|
281
364
|
}
|
|
365
|
+
// 5c. Apply per-repo validate-command overrides from the target repo's
|
|
366
|
+
// .generacy/config.yaml. The orchestrator's global validate defaults are
|
|
367
|
+
// monorepo-shaped (`pnpm test && pnpm build`); repos with a different
|
|
368
|
+
// shape (e.g. a single-package Astro site with no `test` script) override
|
|
369
|
+
// them so the validate phase doesn't fail on a missing script.
|
|
370
|
+
const orchSettings = configPath ? tryLoadOrchestratorSettings(configPath) : null;
|
|
371
|
+
const effectiveConfig = applyRepoValidateOverrides(this.config, orchSettings);
|
|
372
|
+
if (effectiveConfig !== this.config) {
|
|
373
|
+
workerLogger.info({
|
|
374
|
+
validateCommand: effectiveConfig.validateCommand,
|
|
375
|
+
preValidateCommand: effectiveConfig.preValidateCommand,
|
|
376
|
+
}, 'Applied per-repo validate-command override from .generacy/config.yaml');
|
|
377
|
+
}
|
|
282
378
|
// 6. Build WorkerContext
|
|
379
|
+
// #892: surface resume identity so PhaseLoop's validate `catch` can gate
|
|
380
|
+
// the ValidateFixHandler on the base-advance path.
|
|
381
|
+
const md = (item.metadata ?? {});
|
|
382
|
+
const resumeReason = md['resumeReason'] === 'base-advance' ? 'base-advance' : undefined;
|
|
383
|
+
const baseSha = typeof md['baseSha'] === 'string' ? md['baseSha'] : undefined;
|
|
283
384
|
const context = {
|
|
284
385
|
workerId,
|
|
285
386
|
jobId,
|
|
@@ -289,9 +390,12 @@ export class ClaudeCliWorker {
|
|
|
289
390
|
logger: workerLogger,
|
|
290
391
|
signal: abortController.signal,
|
|
291
392
|
checkoutPath,
|
|
393
|
+
branch: featureResult.branch_name,
|
|
292
394
|
issueUrl: `https://github.com/${item.owner}/${item.repo}/issues/${item.issueNumber}`,
|
|
293
395
|
description,
|
|
294
396
|
siblingWorkdirs,
|
|
397
|
+
...(resumeReason ? { resumeReason } : {}),
|
|
398
|
+
...(baseSha ? { baseSha } : {}),
|
|
295
399
|
};
|
|
296
400
|
// Helper to build job event base payload
|
|
297
401
|
const jobEventBase = () => ({
|
|
@@ -350,13 +454,27 @@ export class ClaudeCliWorker {
|
|
|
350
454
|
status: 'completed',
|
|
351
455
|
currentStep: 'tasks',
|
|
352
456
|
});
|
|
353
|
-
return;
|
|
457
|
+
return { status: 'completed' };
|
|
354
458
|
}
|
|
355
459
|
}
|
|
356
460
|
// 8. Execute the phase loop
|
|
357
461
|
const phaseSequence = getPhaseSequence(item.workflowName);
|
|
358
462
|
const phaseLoop = new PhaseLoop(workerLogger);
|
|
359
|
-
|
|
463
|
+
// #892: construct ValidateFixHandler only when PhaseTracker is available.
|
|
464
|
+
// The handler's dedupe surface requires it; without Redis the fix-cycle
|
|
465
|
+
// degrades to "same as today" (base-advance re-runs still occur).
|
|
466
|
+
const jobEmitter = this.jobEventEmitter;
|
|
467
|
+
const validateFixEmit = jobEmitter
|
|
468
|
+
? (channel, payload) => {
|
|
469
|
+
// Payload shape is always an object literal at the call site; cast
|
|
470
|
+
// it into the record shape the JobEventEmitter expects.
|
|
471
|
+
jobEmitter(channel, payload);
|
|
472
|
+
}
|
|
473
|
+
: undefined;
|
|
474
|
+
const validateFixHandler = this.phaseTracker
|
|
475
|
+
? new ValidateFixHandler(effectiveConfig, this.agentLauncher, this.phaseTracker, workerLogger, validateFixEmit)
|
|
476
|
+
: undefined;
|
|
477
|
+
const loopResult = await phaseLoop.executeLoop(context, effectiveConfig, {
|
|
360
478
|
labelManager,
|
|
361
479
|
stageCommentManager,
|
|
362
480
|
gateChecker,
|
|
@@ -365,6 +483,7 @@ export class ClaudeCliWorker {
|
|
|
365
483
|
prManager,
|
|
366
484
|
conversationLogger,
|
|
367
485
|
jobEventEmitter: this.jobEventEmitter,
|
|
486
|
+
...(validateFixHandler ? { validateFixHandler } : {}),
|
|
368
487
|
phaseAfterHandlers: [
|
|
369
488
|
// Fan-out: commit sibling changes, push, open draft PRs, persist linkedPRs to state.
|
|
370
489
|
async () => {
|
|
@@ -397,6 +516,17 @@ export class ClaudeCliWorker {
|
|
|
397
516
|
},
|
|
398
517
|
],
|
|
399
518
|
}, phaseSequence);
|
|
519
|
+
// 9. Handle terminal label-op failure (#889): translate into WorkerResult
|
|
520
|
+
// so the dispatcher completes the item instead of releasing it. The
|
|
521
|
+
// dispatcher's terminalFailureHandler emits the operator-facing alert.
|
|
522
|
+
if (loopResult.status === 'failed-terminal' && loopResult.failureMetadata) {
|
|
523
|
+
workerLogger.error({ failureMetadata: loopResult.failureMetadata }, 'Phase loop returned failed-terminal — surfacing as WorkerResult.failed-terminal');
|
|
524
|
+
workerResult = {
|
|
525
|
+
status: 'failed-terminal',
|
|
526
|
+
failureMetadata: loopResult.failureMetadata,
|
|
527
|
+
};
|
|
528
|
+
return workerResult;
|
|
529
|
+
}
|
|
400
530
|
// 9. Handle completion
|
|
401
531
|
if (loopResult.completed) {
|
|
402
532
|
phasesCompleted = true;
|
|
@@ -485,6 +615,20 @@ export class ClaudeCliWorker {
|
|
|
485
615
|
workerLogger.warn({ error: String(error) }, 'Post-completion step failed (all phases completed successfully)');
|
|
486
616
|
}
|
|
487
617
|
}
|
|
618
|
+
else if (isTerminalLabelOpError(error)) {
|
|
619
|
+
// #889: LabelManager retry exhaustion outside the phase loop (e.g. in
|
|
620
|
+
// onResumeStart or onWorkflowComplete). Translate into WorkerResult so
|
|
621
|
+
// the dispatcher completes the item instead of releasing it.
|
|
622
|
+
workerLogger.error({ site: error.site, labelOp: error.labelOp, ghStderr: error.ghStderr }, 'Worker caught TerminalLabelOpError — surfacing as WorkerResult.failed-terminal');
|
|
623
|
+
workerResult = {
|
|
624
|
+
status: 'failed-terminal',
|
|
625
|
+
failureMetadata: {
|
|
626
|
+
site: error.site,
|
|
627
|
+
labelOp: error.labelOp,
|
|
628
|
+
ghStderr: error.ghStderr,
|
|
629
|
+
},
|
|
630
|
+
};
|
|
631
|
+
}
|
|
488
632
|
else {
|
|
489
633
|
workerLogger.error({ error: String(error) }, 'Worker encountered an unhandled error');
|
|
490
634
|
this.sseEmitter?.({
|
|
@@ -518,6 +662,7 @@ export class ClaudeCliWorker {
|
|
|
518
662
|
await labelManager.ensureCleanup();
|
|
519
663
|
}
|
|
520
664
|
}
|
|
665
|
+
return workerResult;
|
|
521
666
|
}
|
|
522
667
|
}
|
|
523
668
|
//# sourceMappingURL=claude-cli-worker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-cli-worker.js","sourceRoot":"","sources":["../../src/worker/claude-cli-worker.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"claude-cli-worker.js","sourceRoot":"","sources":["../../src/worker/claude-cli-worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,2BAA2B,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC3I,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAI/K,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE9C,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEzE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAEhF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAEtE;;;;GAIG;AACH,KAAK,UAAU,sBAAsB,CAAC,YAAoB,EAAE,MAAc;IACxE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IACtD,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACzC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBACjE,IAAI,CAAC;oBACH,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;oBACtE,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAA+B,CAAC;oBAC/D,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBAC/D,MAAM,CAAC,IAAI,CACT,EAAE,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,EACzD,sCAAsC,CACvC,CAAC;wBACF,OAAO,IAAI,CAAC,SAAS,CAAC;oBACxB,CAAC;gBACH,CAAC;gBAAC,MAAM,CAAC;oBACP,6BAA6B;gBAC/B,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,wDAAwD;IAC1D,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAmB;IACnD,KAAK,CACH,OAAe,EACf,IAAc,EACd,OAA2H;QAE3H,MAAM,KAAK,GAAiB,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE;YAC/C,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;YACjC,GAAG,CAAC,OAAO,CAAC,GAAG,KAAK,SAAS,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;YACtD,GAAG,CAAC,OAAO,CAAC,GAAG,KAAK,SAAS,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;YACtD,GAAG,CAAC,OAAO,CAAC,QAAQ,KAAK,SAAS,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC;SACtE,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,IAAI,OAAO,CAAgB,CAAC,OAAO,EAAE,EAAE;YACzD,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBACxB,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;YACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBACrB,OAAO,CAAC,CAAC,CAAC,CAAC;YACb,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO;YACL,KAAK,EAAE,IAAI;YACX,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,IAAI,EAAE,CAAC,MAAuB,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC;YACrD,WAAW;SACZ,CAAC;IACJ,CAAC;CACF,CAAC;AAqBF;;;;;;;;;;;;;;GAcG;AACH,MAAM,OAAO,eAAe;IAWP;IACA;IAXF,cAAc,CAAiB;IAC/B,UAAU,CAAmB;IAC7B,eAAe,CAAmB;IAClC,aAAa,CAAqC;IAClD,YAAY,CAAgB;IAC5B,YAAY,CAAe;IAC3B,aAAa,CAAgB;IAC7B,aAAa,CAAgB;IAE9C,YACmB,MAAoB,EACpB,MAAc,EAC/B,OAA4B,EAAE;QAFb,WAAM,GAAN,MAAM,CAAc;QACpB,WAAM,GAAN,MAAM,CAAQ;QAG/B,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,IAAI,qBAAqB,CAAC;QACnE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC;QAC5C,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QACxC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACtC,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAClE,IAAI,CAAC,aAAa,GAAG,IAAI,aAAa,EAAE,CAAC;QAEzC,uFAAuF;QACvF,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,IAAI,uCAAuC,CAAC;QACxG,IAAI,gBAAkD,CAAC;QACvD,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;YAC1B,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC5B,MAAM,IAAI,0BAA0B,CAAC,UAAU,CAAC,CAAC;YACnD,CAAC;YACD,gBAAgB,GAAG,IAAI,oBAAoB,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;QAC9D,CAAC;aAAM,IAAI,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YAClC,iFAAiF;YACjF,gBAAgB,GAAG,IAAI,oBAAoB,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;QAC9D,CAAC;QAED,+CAA+C;QAC/C,IAAI,CAAC,aAAa,GAAG,mBAAmB,CAAC;YACvC,OAAO,EAAE,IAAI,CAAC,cAAc;YAC5B,WAAW,EAAE,0BAA0B;SACxC,EAAE,gBAAgB,CAAC,CAAC;QAErB,yEAAyE;QACzE,oBAAoB,EAAE,CAAC;QACvB,uBAAuB,CAAC,KAAK,EAAE,OAA8B,EAAiC,EAAE;YAC9F,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;gBACnD,MAAM,EAAE;oBACN,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,oBAAoB;wBACvC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;wBACxB,CAAC,CAAC,EAAE,CAAC;oBACP,GAAG,EAAE,OAAO,CAAC,GAAG;oBAChB,QAAQ,EAAE,OAAO,CAAC,QAAQ;iBACoB;gBAChD,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,QAAQ,EAAE,OAAO,CAAC,QAAQ;aAC3B,CAAC,CAAC;YACH,OAAO;gBACL,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,MAAM;gBACnC,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,MAAM;gBACnC,GAAG,EAAE,YAAY,CAAC,OAAO,CAAC,GAAG;gBAC7B,IAAI,EAAE,CAAC,GAAoB,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;gBAC9D,WAAW,EAAE,YAAY,CAAC,OAAO,CAAC,WAAW;aAC9C,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,KAAK,CAAC,MAAM,CAAC,IAAe;QAC1B,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QACrC,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QAClC,MAAM,UAAU,GAAG,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;QAEpE,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;YACrC,QAAQ;YACR,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,KAAK,EAAE,IAAI,CAAC,WAAW;YACvB,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAC;QAEH,YAAY,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;QAE1D,kCAAkC;QAClC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,IAAI,EAAE,kBAAkB;YACxB,UAAU;YACV,IAAI,EAAE;gBACJ,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB;SACF,CAAC,CAAC;QAEH,0DAA0D;QAC1D,IAAI,YAAgC,CAAC;QACrC,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;QAC9C,IAAI,YAAsC,CAAC;QAC3C,IAAI,eAAe,GAAG,KAAK,CAAC;QAC5B,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,YAAY,GAAiB,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;QAEzD,IAAI,CAAC;YACH,sEAAsE;YACtE,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACtF,YAAY,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CACnD,QAAQ,EACR,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,IAAI,EACT,aAAa,CACd,CAAC;YAEF,8CAA8C;YAC9C,MAAM,MAAM,GAAG,kBAAkB,CAAC,YAAY,CAAC,CAAC;YAEhD,mEAAmE;YACnE,IAAI,IAAI,CAAC,OAAO,KAAK,qBAAqB,EAAE,CAAC;gBAC3C,YAAY,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;gBAE7E,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,CAC7C,IAAI,CAAC,MAAM,EACX,YAAY,EACZ,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,UAAU,CAChB,CAAC;gBAEF,MAAM,iBAAiB,CAAC,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;gBAEnD,YAAY,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;gBAEtD,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,IAAI,EAAE,oBAAoB;oBAC1B,UAAU;oBACV,IAAI,EAAE;wBACJ,OAAO,EAAE,qBAAqB;wBAC9B,SAAS,EAAE,qBAAqB;wBAChC,WAAW,EAAE,CAAC;qBACf;iBACF,CAAC,CAAC;gBAEH,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;YACjC,CAAC;YAED,mEAAmE;YACnE,IAAI,IAAI,CAAC,OAAO,KAAK,yBAAyB,EAAE,CAAC;gBAC/C,YAAY,CAAC,IAAI,CAAC,+DAA+D,CAAC,CAAC;gBAEnF,wEAAwE;gBACxE,sEAAsE;gBACtE,sEAAsE;gBACtE,gDAAgD;gBAChD,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;gBACtE,IAAI,YAAY,EAAE,CAAC;oBACjB,IAAI,CAAC,QAAQ,GAAG;wBACd,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC;wBACxB,KAAK,EAAE,YAAY,CAAC,KAAK;qBAC1B,CAAC;oBACF,YAAY,CAAC,IAAI,CACf,EAAE,UAAU,EAAE,YAAY,CAAC,KAAK,EAAE,SAAS,EAAE,YAAY,CAAC,SAAS,EAAE,EACrE,+DAA+D,CAChE,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,YAAY,CAAC,IAAI,CACf,EAAE,UAAU,EAAE,EACd,sFAAsF,CACvF,CAAC;gBACJ,CAAC;gBAED,MAAM,oBAAoB,GAAG,IAAI,oBAAoB,CACnD,IAAI,CAAC,MAAM,EACX,YAAY,EACZ,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,UAAU,CAChB,CAAC;gBAEF,MAAM,OAAO,GAAmB,MAAM,oBAAoB,CAAC,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;gBAEtF,YAAY,CAAC,IAAI,CACf,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,EAC5B,qCAAqC,CACtC,CAAC;gBAEF,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,IAAI,EAAE,oBAAoB;oBAC1B,UAAU;oBACV,IAAI,EAAE;wBACJ,OAAO,EAAE,yBAAyB;wBAClC,SAAS,EAAE,yBAAyB;wBACpC,WAAW,EAAE,CAAC;qBACf;iBACF,CAAC,CAAC;gBAEH,uEAAuE;gBACvE,wEAAwE;gBACxE,uEAAuE;gBACvE,iEAAiE;gBACjE,IAAI,OAAO,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;oBACnC,MAAM,SAAS,GAAc;wBAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;wBACjB,IAAI,EAAE,IAAI,CAAC,IAAI;wBACf,WAAW,EAAE,IAAI,CAAC,WAAW;wBAC7B,YAAY,EAAE,IAAI,CAAC,YAAY;wBAC/B,OAAO,EAAE,UAAU;wBACnB,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE;wBACpB,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;wBACpC,WAAW,EAAE,QAAQ;wBACrB,MAAM,EAAE,IAAI,CAAC,MAAM;wBACnB,QAAQ,EAAE;4BACR,UAAU,EAAE,OAAO,CAAC,UAAU;4BAC9B,YAAY,EAAE,yBAAyB;yBACxC;qBACF,CAAC;oBAEF,4DAA4D;oBAC5D,4DAA4D;oBAC5D,IAAI,CAAC;wBACH,MAAM,iBAAiB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;oBACpD,CAAC;oBAAC,OAAO,GAAG,EAAE,CAAC;wBACb,YAAY,CAAC,IAAI,CACf,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,UAAU,EAAE,EAChC,iFAAiF,CAClF,CAAC;oBACJ,CAAC;oBAED,OAAO;wBACL,MAAM,EAAE,WAAW;wBACnB,YAAY,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE;qBAC3C,CAAC;gBACJ,CAAC;gBAED,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;YACjC,CAAC;YAED,+CAA+C;YAC/C,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YAC7E,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACpC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CACnC,CAAC;YAEF,+EAA+E;YAC/E,iEAAiE;YACjE,MAAM,WAAW,GAAI,IAAI,CAAC,QAAQ,EAAE,WAAsB;mBACrD,KAAK,CAAC,IAAI;mBACV,KAAK,CAAC,KAAK;mBACX,UAAU,IAAI,CAAC,WAAW,EAAE,CAAC;YAClC,YAAY,CAAC,IAAI,CACf,EAAE,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,EAAE,EAC9D,4BAA4B,CAC7B,CAAC;YAEF,4DAA4D;YAC5D,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,OAAiC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;YAC3H,YAAY,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,yBAAyB,CAAC,CAAC;YAErE,iEAAiE;YACjE,EAAE;YACF,oEAAoE;YACpE,qEAAqE;YACrE,qEAAqE;YACrE,uEAAuE;YACvE,qEAAqE;YACrE,EAAE;YACF,mEAAmE;YACnE,+DAA+D;YAC/D,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC;gBACxC,WAAW;gBACX,MAAM,EAAE,IAAI,CAAC,WAAW;gBACxB,GAAG,EAAE,YAAY;aAClB,CAAC,CAAC;YAEH,IAAI,aAAa,CAAC,OAAO,EAAE,CAAC;gBAC1B,YAAY,CAAC,IAAI,CACf;oBACE,MAAM,EAAE,aAAa,CAAC,WAAW;oBACjC,OAAO,EAAE,aAAa,CAAC,kBAAkB;oBACzC,UAAU,EAAE,aAAa,CAAC,WAAW;iBACtC,EACD,+BAA+B,CAChC,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CACb,6CAA6C,IAAI,CAAC,WAAW,KAAK,aAAa,CAAC,KAAK,IAAI,eAAe,EAAE,CAC3G,CAAC;YACJ,CAAC;YAED,qDAAqD;YACrD,IAAI,eAAe,GAA2B,EAAE,CAAC;YACjD,MAAM,UAAU,GAAG,uBAAuB,CAAC,YAAY,CAAC,CAAC;YACzD,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,eAAe,GAAG,sBAAsB,CAAC,UAAU,CAAC,CAAC;gBAC3D,IAAI,eAAe,EAAE,CAAC;oBACpB,eAAe,GAAG,sBAAsB,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;oBACxE,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBAC5C,YAAY,CAAC,IAAI,CACf,EAAE,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,EAC7F,iDAAiD,CAClD,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;YAED,uEAAuE;YACvE,yEAAyE;YACzE,sEAAsE;YACtE,0EAA0E;YAC1E,+DAA+D;YAC/D,MAAM,YAAY,GAAG,UAAU,CAAC,CAAC,CAAC,2BAA2B,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACjF,MAAM,eAAe,GAAG,0BAA0B,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;YAC9E,IAAI,eAAe,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;gBACpC,YAAY,CAAC,IAAI,CACf;oBACE,eAAe,EAAE,eAAe,CAAC,eAAe;oBAChD,kBAAkB,EAAE,eAAe,CAAC,kBAAkB;iBACvD,EACD,uEAAuE,CACxE,CAAC;YACJ,CAAC;YAED,yBAAyB;YACzB,yEAAyE;YACzE,mDAAmD;YACnD,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAA4B,CAAC;YAC5D,MAAM,YAAY,GAAG,EAAE,CAAC,cAAc,CAAC,KAAK,cAAc,CAAC,CAAC,CAAC,cAAuB,CAAC,CAAC,CAAC,SAAS,CAAC;YACjG,MAAM,OAAO,GAAG,OAAO,EAAE,CAAC,SAAS,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAE,EAAE,CAAC,SAAS,CAAY,CAAC,CAAC,CAAC,SAAS,CAAC;YAE1F,MAAM,OAAO,GAAkB;gBAC7B,QAAQ;gBACR,KAAK;gBACL,IAAI;gBACJ,UAAU;gBACV,MAAM;gBACN,MAAM,EAAE,YAAY;gBACpB,MAAM,EAAE,eAAe,CAAC,MAAM;gBAC9B,YAAY;gBACZ,MAAM,EAAE,aAAa,CAAC,WAAW;gBACjC,QAAQ,EAAE,sBAAsB,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,WAAW,IAAI,CAAC,WAAW,EAAE;gBACpF,WAAW;gBACX,eAAe;gBACf,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACzC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAChC,CAAC;YAEF,yCAAyC;YACzC,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,CAAC;gBAC1B,KAAK;gBACL,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,WAAW,EAAE,IAAI,CAAC,WAAW;aAC9B,CAAC,CAAC;YAEH,mBAAmB;YACnB,IAAI,CAAC,eAAe,EAAE,CAAC,aAAa,EAAE;gBACpC,GAAG,YAAY,EAAE;gBACjB,MAAM,EAAE,QAAQ;gBAChB,WAAW,EAAE,UAAU;aACxB,CAAC,CAAC;YAEH,2BAA2B;YAC3B,YAAY,GAAG,IAAI,YAAY,CAC7B,MAAM,EACN,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,WAAW,EAChB,YAAY,CACb,CAAC;YAEF,MAAM,mBAAmB,GAAG,IAAI,mBAAmB,CACjD,MAAM,EACN,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,WAAW,EAChB,YAAY,CACb,CAAC;YAEF,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,YAAY,CAAC,CAAC;YAElD,MAAM,UAAU,GAAG,IAAI,UAAU,CAC/B,IAAI,CAAC,aAAa,EAClB,YAAY,EACZ,IAAI,CAAC,MAAM,CAAC,qBAAqB,EACjC,IAAI,CAAC,MAAM,CAAC,cAAc,CAC3B,CAAC;YAEF,MAAM,kBAAkB,GAAG,aAAa,CAAC,WAAW;gBAClD,CAAC,CAAC,IAAI,kBAAkB,CAAC,aAAa,CAAC,WAAW,CAAC;gBACnD,CAAC,CAAC,SAAS,CAAC;YAEd,MAAM,aAAa,GAAG,IAAI,aAAa,CACrC,UAAU,EACV,YAAY,EACZ,IAAI,CAAC,UAAU,EACf,kBAAkB,CACnB,CAAC;YAEF,MAAM,SAAS,GAAG,IAAI,SAAS,CAC7B,MAAM,EACN,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,WAAW,EAChB,YAAY,CACb,CAAC;YAEF,qEAAqE;YACrE,IAAI,IAAI,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;gBAChC,MAAM,YAAY,CAAC,aAAa,EAAE,CAAC;YACrC,CAAC;YAED,uDAAuD;YACvD,4EAA4E;YAC5E,0EAA0E;YAC1E,2EAA2E;YAC3E,IAAI,IAAI,CAAC,YAAY,KAAK,cAAc,IAAI,IAAI,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;gBACxE,IAAI,MAAM,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EAAE,CAAC;oBAC9C,YAAY,CAAC,IAAI,CAAC,gEAAgE,CAAC,CAAC;oBACpF,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC,YAAY,CAAC,CAAC;oBACtD,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBAE7D,IAAI,eAAe,CAAC,OAAO,EAAE,CAAC;wBAC5B,YAAY,CAAC,IAAI,CACf,EAAE,WAAW,EAAE,eAAe,CAAC,WAAW,CAAC,MAAM,EAAE,EACnD,oDAAoD,CACrD,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACN,YAAY,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;oBACzE,CAAC;oBAED,IAAI,CAAC,UAAU,EAAE,CAAC;wBAChB,IAAI,EAAE,oBAAoB;wBAC1B,UAAU;wBACV,IAAI,EAAE;4BACJ,OAAO,EAAE,IAAI,CAAC,OAAO;4BACrB,SAAS,EAAE,OAAO;4BAClB,WAAW,EAAE,CAAC;yBACf;qBACF,CAAC,CAAC;oBAEH,IAAI,CAAC,eAAe,EAAE,CAAC,eAAe,EAAE;wBACtC,GAAG,YAAY,EAAE;wBACjB,MAAM,EAAE,WAAW;wBACnB,WAAW,EAAE,OAAO;qBACrB,CAAC,CAAC;oBAEH,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;gBACjC,CAAC;YACH,CAAC;YAED,4BAA4B;YAC5B,MAAM,aAAa,GAAG,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC1D,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,YAAY,CAAC,CAAC;YAE9C,0EAA0E;YAC1E,wEAAwE;YACxE,kEAAkE;YAClE,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC;YACxC,MAAM,eAAe,GAAG,UAAU;gBAChC,CAAC,CAAC,CAAC,OAAe,EAAE,OAAgB,EAAQ,EAAE;oBAC1C,mEAAmE;oBACnE,wDAAwD;oBACxD,UAAU,CAAC,OAAO,EAAE,OAAkC,CAAC,CAAC;gBAC1D,CAAC;gBACH,CAAC,CAAC,SAAS,CAAC;YACd,MAAM,kBAAkB,GAAG,IAAI,CAAC,YAAY;gBAC1C,CAAC,CAAC,IAAI,kBAAkB,CACpB,eAAe,EACf,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,YAAY,EACjB,YAAY,EACZ,eAAe,CAChB;gBACH,CAAC,CAAC,SAAS,CAAC;YAEd,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,eAAe,EAAE;gBACvE,YAAY;gBACZ,mBAAmB;gBACnB,WAAW;gBACX,UAAU;gBACV,aAAa;gBACb,SAAS;gBACT,kBAAkB;gBAClB,eAAe,EAAE,IAAI,CAAC,eAAe;gBACrC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACrD,kBAAkB,EAAE;oBAClB,qFAAqF;oBACrF,KAAK,IAAI,EAAE;wBACT,MAAM,QAAQ,GAAG,OAAO,CAAC,eAAe,IAAI,EAAE,CAAC;wBAC/C,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC;4BAAE,OAAO;wBAC/C,MAAM,KAAK,GAAG,IAAI,uBAAuB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;wBAChE,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;wBAC3C,IAAI,CAAC,KAAK;4BAAE,OAAO;wBACnB,MAAM,SAAS,GAAyB;4BACtC,cAAc,EAAE,OAAO,CAAC,YAAY;4BACpC,eAAe,EAAE,QAAQ;4BACzB,WAAW,EAAE,IAAI,CAAC,WAAW;4BAC7B,eAAe,EAAE,IAAI,CAAC,IAAI;4BAC1B,GAAG,EAAE,IAAI,CAAC,KAAK;4BACf,aAAa,EAAE,KAAK;4BACpB,aAAa,EAAE,KAAK;4BACpB,MAAM,EAAE,YAAY;4BACpB,aAAa,EAAE,IAAI,CAAC,aAAa;yBAClC,CAAC;wBACF,MAAM,oBAAoB,CAAC,SAAS,CAAC,CAAC;oBACxC,CAAC;oBACD,wFAAwF;oBACxF,KAAK,IAAI,EAAE;wBACT,MAAM,SAAS,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;wBACnF,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BACzB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;wBAChC,CAAC;oBACH,CAAC;iBACF;aACF,EAAE,aAAa,CAAC,CAAC;YAElB,0EAA0E;YAC1E,uEAAuE;YACvE,0EAA0E;YAC1E,IAAI,UAAU,CAAC,MAAM,KAAK,iBAAiB,IAAI,UAAU,CAAC,eAAe,EAAE,CAAC;gBAC1E,YAAY,CAAC,KAAK,CAChB,EAAE,eAAe,EAAE,UAAU,CAAC,eAAe,EAAE,EAC/C,iFAAiF,CAClF,CAAC;gBACF,YAAY,GAAG;oBACb,MAAM,EAAE,iBAAiB;oBACzB,eAAe,EAAE,UAAU,CAAC,eAAe;iBAC5C,CAAC;gBACF,OAAO,YAAY,CAAC;YACtB,CAAC;YAED,uBAAuB;YACvB,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;gBACzB,eAAe,GAAG,IAAI,CAAC;gBAEvB,IAAI,IAAI,CAAC,YAAY,KAAK,cAAc,EAAE,CAAC;oBACzC,4FAA4F;oBAC5F,YAAY,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;oBACnE,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC,YAAY,CAAC,CAAC;oBACtD,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBAE7D,IAAI,eAAe,CAAC,OAAO,EAAE,CAAC;wBAC5B,YAAY,CAAC,IAAI,CACf,EAAE,WAAW,EAAE,eAAe,CAAC,WAAW,CAAC,MAAM,EAAE,EACnD,6DAA6D,CAC9D,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACN,YAAY,CAAC,KAAK,CAAC,4DAA4D,CAAC,CAAC;oBACnF,CAAC;oBAED,IAAI,CAAC,UAAU,EAAE,CAAC;wBAChB,IAAI,EAAE,oBAAoB;wBAC1B,UAAU;wBACV,IAAI,EAAE;4BACJ,OAAO,EAAE,IAAI,CAAC,OAAO;4BACrB,SAAS,EAAE,UAAU,CAAC,SAAS;4BAC/B,WAAW,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM;yBACvC;qBACF,CAAC,CAAC;oBAEH,IAAI,CAAC,eAAe,EAAE,CAAC,eAAe,EAAE;wBACtC,GAAG,YAAY,EAAE;wBACjB,MAAM,EAAE,WAAW;wBACnB,WAAW,EAAE,UAAU,CAAC,SAAS;qBAClC,CAAC,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACN,+CAA+C;oBAC/C,MAAM,YAAY,CAAC,kBAAkB,EAAE,CAAC;oBACxC,YAAY,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;oBACpD,MAAM,SAAS,CAAC,kBAAkB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;oBACtD,YAAY,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;oBAEvE,IAAI,CAAC,UAAU,EAAE,CAAC;wBAChB,IAAI,EAAE,oBAAoB;wBAC1B,UAAU;wBACV,IAAI,EAAE;4BACJ,OAAO,EAAE,IAAI,CAAC,OAAO;4BACrB,SAAS,EAAE,UAAU,CAAC,SAAS;4BAC/B,WAAW,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM;yBACvC;qBACF,CAAC,CAAC;oBAEH,IAAI,CAAC,eAAe,EAAE,CAAC,eAAe,EAAE;wBACtC,GAAG,YAAY,EAAE;wBACjB,MAAM,EAAE,WAAW;wBACnB,WAAW,EAAE,UAAU,CAAC,SAAS;qBAClC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;iBAAM,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;gBAC9B,OAAO,GAAG,IAAI,CAAC;gBACf,YAAY,CAAC,IAAI,CACf,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,EACnC,gCAAgC,CACjC,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,gBAAgB;gBAChB,YAAY,CAAC,KAAK,CAChB,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,EACnC,uCAAuC,CACxC,CAAC;gBAEF,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,IAAI,EAAE,iBAAiB;oBACvB,UAAU;oBACV,IAAI,EAAE;wBACJ,OAAO,EAAE,IAAI,CAAC,OAAO;wBACrB,SAAS,EAAE,UAAU,CAAC,SAAS;wBAC/B,WAAW,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM;qBACvC;iBACF,CAAC,CAAC;gBAEH,IAAI,CAAC,eAAe,EAAE,CAAC,YAAY,EAAE;oBACnC,GAAG,YAAY,EAAE;oBACjB,MAAM,EAAE,QAAQ;oBAChB,WAAW,EAAE,UAAU,CAAC,SAAS;oBACjC,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,IAAI,eAAe;iBACpE,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,eAAe,EAAE,CAAC;gBACpB,wEAAwE;gBACxE,sEAAsE;gBACtE,sEAAsE;gBACtE,sBAAsB;gBACtB,IAAI,KAAK,YAAY,aAAa,EAAE,CAAC;oBACnC,YAAY,CAAC,IAAI,CACf,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,EAC5C,iGAAiG,CAClG,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,YAAY,CAAC,IAAI,CACf,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,EACxB,iEAAiE,CAClE,CAAC;gBACJ,CAAC;YACH,CAAC;iBAAM,IAAI,sBAAsB,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzC,sEAAsE;gBACtE,uEAAuE;gBACvE,6DAA6D;gBAC7D,YAAY,CAAC,KAAK,CAChB,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,EACtE,gFAAgF,CACjF,CAAC;gBACF,YAAY,GAAG;oBACb,MAAM,EAAE,iBAAiB;oBACzB,eAAe,EAAE;wBACf,IAAI,EAAE,KAAK,CAAC,IAAI;wBAChB,OAAO,EAAE,KAAK,CAAC,OAAO;wBACtB,QAAQ,EAAE,KAAK,CAAC,QAAQ;qBACzB;iBACF,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,YAAY,CAAC,KAAK,CAChB,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,EACxB,uCAAuC,CACxC,CAAC;gBAEF,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,IAAI,EAAE,iBAAiB;oBACvB,UAAU;oBACV,IAAI,EAAE;wBACJ,OAAO,EAAE,IAAI,CAAC,OAAO;wBACrB,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;qBAC9D;iBACF,CAAC,CAAC;gBAEH,IAAI,CAAC,eAAe,EAAE,CAAC,YAAY,EAAE;oBACnC,KAAK;oBACL,YAAY,EAAE,IAAI,CAAC,YAAY;oBAC/B,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,WAAW,EAAE,IAAI,CAAC,WAAW;oBAC7B,MAAM,EAAE,QAAQ;oBAChB,WAAW,EAAE,SAAS;oBACtB,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;iBAC9D,CAAC,CAAC;gBAEH,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,0CAA0C;YAC1C,eAAe,CAAC,KAAK,EAAE,CAAC;YAExB,6DAA6D;YAC7D,2EAA2E;YAC3E,yFAAyF;YACzF,IAAI,YAAY,IAAI,CAAC,OAAO,EAAE,CAAC;gBAC7B,MAAM,YAAY,CAAC,aAAa,EAAE,CAAC;YACrC,CAAC;QACH,CAAC;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;CAEF"}
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import type { CliSpawnOptions, Logger, PhaseResult, WorkflowPhase } from './types.js';
|
|
2
2
|
import type { OutputCapture } from './output-capture.js';
|
|
3
3
|
import type { AgentLauncher } from '../launcher/agent-launcher.js';
|
|
4
|
+
/** Default timeout for the validate phase (10 minutes). */
|
|
5
|
+
export declare const DEFAULT_VALIDATE_TIMEOUT_MS = 600000;
|
|
6
|
+
/** Default timeout for pre-validate dependency installation (5 minutes). */
|
|
7
|
+
export declare const DEFAULT_INSTALL_TIMEOUT_MS = 300000;
|
|
4
8
|
/**
|
|
5
9
|
* Spawns Claude CLI processes (or shell commands for validation) and manages
|
|
6
10
|
* their lifecycle: stdout/stderr capture, timeout with SIGTERM then SIGKILL,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-spawner.d.ts","sourceRoot":"","sources":["../../src/worker/cli-spawner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cli-spawner.d.ts","sourceRoot":"","sources":["../../src/worker/cli-spawner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,eAAe,EAEf,MAAM,EACN,WAAW,EACX,aAAa,EACd,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAWnE,2DAA2D;AAC3D,eAAO,MAAM,2BAA2B,SAAU,CAAC;AAEnD,4EAA4E;AAC5E,eAAO,MAAM,0BAA0B,SAAU,CAAC;AAElD;;;;GAIG;AACH,qBAAa,UAAU;IAEnB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;gBAHf,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM,EACd,qBAAqB,GAAE,MAAa,EACpC,cAAc,CAAC,EAAE,MAAM,YAAA;IAG1C;;;;;;OAMG;IACG,UAAU,CACd,KAAK,EAAE,OAAO,CAAC,aAAa,EAAE,UAAU,CAAC,EACzC,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,WAAW,CAAC;IAkCvB;;;;;OAKG;IACG,gBAAgB,CACpB,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,WAAW,CAAC;IAoBvB;;;;;OAKG;IACG,qBAAqB,CACzB,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,WAAW,CAAC;IAwBvB;;;;;;OAMG;YACW,aAAa;IAmJ3B;;;OAGG;IACH,OAAO,CAAC,YAAY;CAgBrB"}
|
|
@@ -1,8 +1,15 @@
|
|
|
1
|
+
import { Buffer } from 'node:buffer';
|
|
1
2
|
import { buildLaunchCredentials } from './credentials-helper.js';
|
|
3
|
+
/**
|
|
4
|
+
* Pre-cap ring buffer capacity for shell-path merged stdout+stderr capture.
|
|
5
|
+
* Deliberately larger than the 4 KiB post-cap bound so `boundOutputTail`'s
|
|
6
|
+
* last-30-lines slicing has real data to work with when lines are long.
|
|
7
|
+
*/
|
|
8
|
+
const RING_BYTES = 8192;
|
|
2
9
|
/** Default timeout for the validate phase (10 minutes). */
|
|
3
|
-
const DEFAULT_VALIDATE_TIMEOUT_MS = 600_000;
|
|
10
|
+
export const DEFAULT_VALIDATE_TIMEOUT_MS = 600_000;
|
|
4
11
|
/** Default timeout for pre-validate dependency installation (5 minutes). */
|
|
5
|
-
const DEFAULT_INSTALL_TIMEOUT_MS = 300_000;
|
|
12
|
+
export const DEFAULT_INSTALL_TIMEOUT_MS = 300_000;
|
|
6
13
|
/**
|
|
7
14
|
* Spawns Claude CLI processes (or shell commands for validation) and manages
|
|
8
15
|
* their lifecycle: stdout/stderr capture, timeout with SIGTERM then SIGKILL,
|
|
@@ -104,23 +111,56 @@ export class CliSpawner {
|
|
|
104
111
|
async manageProcess(child, phase, timeoutMs, signal, capture) {
|
|
105
112
|
const startTime = Date.now();
|
|
106
113
|
let stderrBuffer = '';
|
|
114
|
+
// #892: buffer raw stdout when no OutputCapture is attached — the
|
|
115
|
+
// validate + install paths need it as evidence for the fix cycle.
|
|
116
|
+
let stdoutBuffer = '';
|
|
117
|
+
// ---- Merged stdout+stderr ring buffer (shell paths only) ----
|
|
118
|
+
// #890: populated when capture is undefined. Chunks are appended in Node
|
|
119
|
+
// `data`-event arrival order (best-effort per FR-004, Q5→A) into one Buffer.
|
|
120
|
+
// The buffer holds at most RING_BYTES = 8192 bytes — older bytes are sliced off.
|
|
121
|
+
// Feeds `error.output`; the separate stdout/stderr buffers above feed #892's
|
|
122
|
+
// `capturedStdout`/`capturedStderr`.
|
|
123
|
+
let outputRing = Buffer.alloc(0);
|
|
124
|
+
const appendRing = (data) => {
|
|
125
|
+
const buf = typeof data === 'string' ? Buffer.from(data, 'utf8') : data;
|
|
126
|
+
outputRing = Buffer.concat([outputRing, buf]);
|
|
127
|
+
if (outputRing.length > RING_BYTES) {
|
|
128
|
+
outputRing = outputRing.subarray(outputRing.length - RING_BYTES);
|
|
129
|
+
}
|
|
130
|
+
};
|
|
107
131
|
// ---- stdout ----
|
|
108
132
|
if (child.stdout && capture) {
|
|
109
133
|
child.stdout.on('data', (data) => {
|
|
110
134
|
capture.processChunk(typeof data === 'string' ? data : data.toString('utf-8'));
|
|
111
135
|
});
|
|
112
136
|
}
|
|
113
|
-
//
|
|
114
|
-
//
|
|
137
|
+
// Shell paths (runValidatePhase, no OutputCapture): capture raw stdout for
|
|
138
|
+
// two consumers — #890's merged evidence ring buffer (`error.output`) and
|
|
139
|
+
// #892's raw `stdoutBuffer` feeding the ValidateFixHandler evidence
|
|
140
|
+
// pipeline (bounded to a soft limit to avoid unbounded memory growth).
|
|
141
|
+
const STDOUT_CAP_BYTES = 5 * 1024 * 1024; // 5 MiB
|
|
115
142
|
if (child.stdout && !capture) {
|
|
116
|
-
child.stdout.on('data', () => {
|
|
117
|
-
|
|
143
|
+
child.stdout.on('data', (data) => {
|
|
144
|
+
appendRing(data);
|
|
145
|
+
if (stdoutBuffer.length < STDOUT_CAP_BYTES) {
|
|
146
|
+
const chunk = typeof data === 'string' ? data : data.toString('utf-8');
|
|
147
|
+
stdoutBuffer += chunk;
|
|
148
|
+
}
|
|
118
149
|
});
|
|
119
150
|
}
|
|
120
151
|
// ---- stderr ----
|
|
121
152
|
if (child.stderr) {
|
|
122
153
|
child.stderr.on('data', (data) => {
|
|
154
|
+
// #892: raw stderr for `capturedStderr` (validate + install paths).
|
|
123
155
|
stderrBuffer += typeof data === 'string' ? data : data.toString('utf-8');
|
|
156
|
+
if (!capture) {
|
|
157
|
+
// Shell path: interleave into the merged ring buffer.
|
|
158
|
+
appendRing(data);
|
|
159
|
+
}
|
|
160
|
+
// CLI path: no ring buffer; stderr tail is not populated for CLI phases.
|
|
161
|
+
// Their diagnostic surface is `PhaseResult.output` (parsed JSON events),
|
|
162
|
+
// from which `buildErrorEvidence` synthesizes `outputTail` via
|
|
163
|
+
// `synthesizeOutputTail` at evidence-build time.
|
|
124
164
|
});
|
|
125
165
|
}
|
|
126
166
|
// ---- Timeout handling ----
|
|
@@ -169,6 +209,10 @@ export class CliSpawner {
|
|
|
169
209
|
output: capture ? capture.getOutput() : [],
|
|
170
210
|
sessionId: capture?.sessionId,
|
|
171
211
|
implementResult: capture?.implementResult,
|
|
212
|
+
// #892: expose the raw non-CLI stdout/stderr for the validate-fix
|
|
213
|
+
// evidence pipeline. Empty strings when OutputCapture was used.
|
|
214
|
+
capturedStdout: capture ? undefined : stdoutBuffer,
|
|
215
|
+
capturedStderr: stderrBuffer,
|
|
172
216
|
};
|
|
173
217
|
if (!success) {
|
|
174
218
|
let message = `Phase "${phase}" failed with exit code ${resolvedExitCode}`;
|
|
@@ -180,7 +224,7 @@ export class CliSpawner {
|
|
|
180
224
|
}
|
|
181
225
|
result.error = {
|
|
182
226
|
message,
|
|
183
|
-
|
|
227
|
+
output: capture ? '' : outputRing.toString('utf8'),
|
|
184
228
|
phase,
|
|
185
229
|
};
|
|
186
230
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-spawner.js","sourceRoot":"","sources":["../../src/worker/cli-spawner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cli-spawner.js","sourceRoot":"","sources":["../../src/worker/cli-spawner.ts"],"names":[],"mappings":"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"}
|