@zhixuan92/multi-model-agent-core 4.2.2 → 4.3.1
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/README.md +1 -1
- package/dist/bounded-execution/activity-tracker-types.d.ts +1 -1
- package/dist/bounded-execution/activity-tracker-types.d.ts.map +1 -1
- package/dist/bounded-execution/activity-tracker-types.js +4 -9
- package/dist/bounded-execution/activity-tracker-types.js.map +1 -1
- package/dist/config/schema.d.ts +1 -0
- package/dist/config/schema.d.ts.map +1 -1
- package/dist/config/schema.js +4 -3
- package/dist/config/schema.js.map +1 -1
- package/dist/error-codes.d.ts +1 -0
- package/dist/error-codes.d.ts.map +1 -1
- package/dist/error-codes.js +2 -0
- package/dist/error-codes.js.map +1 -1
- package/dist/events/cloud-events.d.ts +1 -1
- package/dist/events/event-builder.d.ts.map +1 -1
- package/dist/events/event-builder.js +26 -54
- package/dist/events/event-builder.js.map +1 -1
- package/dist/events/observability-events.d.ts +20 -85
- package/dist/events/observability-events.d.ts.map +1 -1
- package/dist/events/observability-events.js +6 -12
- package/dist/events/observability-events.js.map +1 -1
- package/dist/events/telemetry-types.d.ts +49 -83
- package/dist/events/telemetry-types.d.ts.map +1 -1
- package/dist/events/telemetry-types.js +17 -42
- package/dist/events/telemetry-types.js.map +1 -1
- package/dist/identity/auth-token-store.d.ts +36 -0
- package/dist/identity/auth-token-store.d.ts.map +1 -1
- package/dist/identity/auth-token-store.js +71 -2
- package/dist/identity/auth-token-store.js.map +1 -1
- package/dist/identity/cwd-validator.d.ts.map +1 -1
- package/dist/identity/cwd-validator.js +15 -3
- package/dist/identity/cwd-validator.js.map +1 -1
- package/dist/identity/main-model-resolver.d.ts +14 -0
- package/dist/identity/main-model-resolver.d.ts.map +1 -0
- package/dist/identity/main-model-resolver.js +100 -0
- package/dist/identity/main-model-resolver.js.map +1 -0
- package/dist/index.d.ts +3 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -2
- package/dist/index.js.map +1 -1
- package/dist/intake/brief-compiler-slots/delegate.d.ts +10 -11
- package/dist/intake/brief-compiler-slots/delegate.d.ts.map +1 -1
- package/dist/intake/brief-compiler-slots/delegate.js +12 -14
- package/dist/intake/brief-compiler-slots/delegate.js.map +1 -1
- package/dist/intake/brief-compiler-slots/execute-plan.js +3 -1
- package/dist/intake/brief-compiler-slots/execute-plan.js.map +1 -1
- package/dist/intake/context-overflow-estimator.d.ts +33 -0
- package/dist/intake/context-overflow-estimator.d.ts.map +1 -0
- package/dist/intake/context-overflow-estimator.js +36 -0
- package/dist/intake/context-overflow-estimator.js.map +1 -0
- package/dist/intake/pipeline.d.ts.map +1 -1
- package/dist/intake/pipeline.js +46 -0
- package/dist/intake/pipeline.js.map +1 -1
- package/dist/intake/plan-extractor.d.ts.map +1 -1
- package/dist/intake/plan-extractor.js +10 -1
- package/dist/intake/plan-extractor.js.map +1 -1
- package/dist/intake/types.d.ts +1 -0
- package/dist/intake/types.d.ts.map +1 -1
- package/dist/lifecycle/diff-tracker.d.ts +17 -1
- package/dist/lifecycle/diff-tracker.d.ts.map +1 -1
- package/dist/lifecycle/diff-tracker.js +115 -2
- package/dist/lifecycle/diff-tracker.js.map +1 -1
- package/dist/lifecycle/handlers/annotate-completion-handler.d.ts +9 -0
- package/dist/lifecycle/handlers/annotate-completion-handler.d.ts.map +1 -0
- package/dist/lifecycle/handlers/annotate-completion-handler.js +200 -0
- package/dist/lifecycle/handlers/annotate-completion-handler.js.map +1 -0
- package/dist/lifecycle/handlers/annotate-criteria-handler.d.ts +3 -0
- package/dist/lifecycle/handlers/annotate-criteria-handler.d.ts.map +1 -0
- package/dist/lifecycle/handlers/annotate-criteria-handler.js +79 -0
- package/dist/lifecycle/handlers/annotate-criteria-handler.js.map +1 -0
- package/dist/lifecycle/handlers/baseline-handlers.d.ts.map +1 -1
- package/dist/lifecycle/handlers/baseline-handlers.js +110 -71
- package/dist/lifecycle/handlers/baseline-handlers.js.map +1 -1
- package/dist/lifecycle/handlers/files-written-cross-check.d.ts +6 -0
- package/dist/lifecycle/handlers/files-written-cross-check.d.ts.map +1 -1
- package/dist/lifecycle/handlers/files-written-cross-check.js +7 -1
- package/dist/lifecycle/handlers/files-written-cross-check.js.map +1 -1
- package/dist/lifecycle/handlers/git-commit-handler.d.ts.map +1 -1
- package/dist/lifecycle/handlers/git-commit-handler.js +13 -0
- package/dist/lifecycle/handlers/git-commit-handler.js.map +1 -1
- package/dist/lifecycle/handlers/review-handler.d.ts +3 -0
- package/dist/lifecycle/handlers/review-handler.d.ts.map +1 -0
- package/dist/lifecycle/handlers/review-handler.js +175 -0
- package/dist/lifecycle/handlers/review-handler.js.map +1 -0
- package/dist/lifecycle/handlers/rework-handler.d.ts +3 -0
- package/dist/lifecycle/handlers/rework-handler.d.ts.map +1 -0
- package/dist/lifecycle/handlers/rework-handler.js +92 -0
- package/dist/lifecycle/handlers/rework-handler.js.map +1 -0
- package/dist/lifecycle/handlers/terminal-handlers.d.ts.map +1 -1
- package/dist/lifecycle/handlers/terminal-handlers.js +16 -3
- package/dist/lifecycle/handlers/terminal-handlers.js.map +1 -1
- package/dist/lifecycle/lifecycle-context.d.ts +4 -0
- package/dist/lifecycle/lifecycle-context.d.ts.map +1 -1
- package/dist/lifecycle/lifecycle-driver.d.ts.map +1 -1
- package/dist/lifecycle/lifecycle-driver.js +12 -7
- package/dist/lifecycle/lifecycle-driver.js.map +1 -1
- package/dist/lifecycle/merge-stage-stats.d.ts +3 -4
- package/dist/lifecycle/merge-stage-stats.d.ts.map +1 -1
- package/dist/lifecycle/merge-stage-stats.js +2 -2
- package/dist/lifecycle/merge-stage-stats.js.map +1 -1
- package/dist/lifecycle/parallel-criteria-routes.d.ts +1 -1
- package/dist/lifecycle/parallel-criteria-routes.d.ts.map +1 -1
- package/dist/lifecycle/parallel-criteria-routes.js +21 -1
- package/dist/lifecycle/parallel-criteria-routes.js.map +1 -1
- package/dist/lifecycle/shared-compute.d.ts +9 -0
- package/dist/lifecycle/shared-compute.d.ts.map +1 -1
- package/dist/lifecycle/shared-compute.js +35 -3
- package/dist/lifecycle/shared-compute.js.map +1 -1
- package/dist/lifecycle/stage-plan-builder.d.ts.map +1 -1
- package/dist/lifecycle/stage-plan-builder.js +65 -85
- package/dist/lifecycle/stage-plan-builder.js.map +1 -1
- package/dist/lifecycle/stage-plan-types.d.ts +48 -0
- package/dist/lifecycle/stage-plan-types.d.ts.map +1 -1
- package/dist/lifecycle/stage-progression.d.ts.map +1 -1
- package/dist/lifecycle/stage-progression.js +17 -24
- package/dist/lifecycle/stage-progression.js.map +1 -1
- package/dist/lifecycle/stage-stats.d.ts +3 -3
- package/dist/lifecycle/stage-stats.d.ts.map +1 -1
- package/dist/lifecycle/stage-stats.js +5 -8
- package/dist/lifecycle/stage-stats.js.map +1 -1
- package/dist/lifecycle/task-runner.d.ts.map +1 -1
- package/dist/lifecycle/task-runner.js +12 -1
- package/dist/lifecycle/task-runner.js.map +1 -1
- package/dist/model-profiles.json +192 -53
- package/dist/providers/anthropic-messages-adapter.d.ts +8 -0
- package/dist/providers/anthropic-messages-adapter.d.ts.map +1 -1
- package/dist/providers/anthropic-messages-adapter.js +16 -1
- package/dist/providers/anthropic-messages-adapter.js.map +1 -1
- package/dist/providers/base/result-builders.d.ts +1 -1
- package/dist/providers/base/result-builders.d.ts.map +1 -1
- package/dist/providers/file-tracker.d.ts +12 -0
- package/dist/providers/file-tracker.d.ts.map +1 -1
- package/dist/providers/file-tracker.js +16 -0
- package/dist/providers/file-tracker.js.map +1 -1
- package/dist/providers/provider-factory.d.ts.map +1 -1
- package/dist/providers/provider-factory.js +27 -2
- package/dist/providers/provider-factory.js.map +1 -1
- package/dist/providers/runner-shell-types.d.ts +14 -0
- package/dist/providers/runner-shell-types.d.ts.map +1 -1
- package/dist/providers/runner-shell.d.ts.map +1 -1
- package/dist/providers/runner-shell.js +38 -6
- package/dist/providers/runner-shell.js.map +1 -1
- package/dist/providers/runner-types.d.ts +1 -1
- package/dist/providers/runner-types.d.ts.map +1 -1
- package/dist/providers/tool-implementations.d.ts +12 -0
- package/dist/providers/tool-implementations.d.ts.map +1 -1
- package/dist/providers/tool-implementations.js +33 -0
- package/dist/providers/tool-implementations.js.map +1 -1
- package/dist/reporting/annotate-completion-parser.d.ts +39 -0
- package/dist/reporting/annotate-completion-parser.d.ts.map +1 -0
- package/dist/reporting/annotate-completion-parser.js +43 -0
- package/dist/reporting/annotate-completion-parser.js.map +1 -0
- package/dist/reporting/compose-running-headline.d.ts +15 -1
- package/dist/reporting/compose-running-headline.d.ts.map +1 -1
- package/dist/reporting/compose-running-headline.js +76 -1
- package/dist/reporting/compose-running-headline.js.map +1 -1
- package/dist/reporting/report-parser-slots/research-report.d.ts +1 -1
- package/dist/review/default-engines.d.ts.map +1 -1
- package/dist/review/default-engines.js +8 -4
- package/dist/review/default-engines.js.map +1 -1
- package/dist/review/parse-review-report.d.ts +6 -0
- package/dist/review/parse-review-report.d.ts.map +1 -0
- package/dist/review/parse-review-report.js +40 -0
- package/dist/review/parse-review-report.js.map +1 -0
- package/dist/review/reviewer-engine.d.ts +12 -3
- package/dist/review/reviewer-engine.d.ts.map +1 -1
- package/dist/review/reviewer-engine.js +4 -3
- package/dist/review/reviewer-engine.js.map +1 -1
- package/dist/review/templates/annotate-completion.d.ts +12 -0
- package/dist/review/templates/annotate-completion.d.ts.map +1 -0
- package/dist/review/templates/annotate-completion.js +72 -0
- package/dist/review/templates/annotate-completion.js.map +1 -0
- package/dist/review/templates/quality-review.d.ts +3 -0
- package/dist/review/templates/quality-review.d.ts.map +1 -0
- package/dist/review/templates/quality-review.js +40 -0
- package/dist/review/templates/quality-review.js.map +1 -0
- package/dist/review/templates/rework.d.ts +3 -0
- package/dist/review/templates/rework.d.ts.map +1 -0
- package/dist/review/templates/rework.js +42 -0
- package/dist/review/templates/rework.js.map +1 -0
- package/dist/review/templates/shared.d.ts +32 -0
- package/dist/review/templates/shared.d.ts.map +1 -1
- package/dist/review/templates/spec-review.d.ts +1 -16
- package/dist/review/templates/spec-review.d.ts.map +1 -1
- package/dist/review/templates/spec-review.js +23 -31
- package/dist/review/templates/spec-review.js.map +1 -1
- package/dist/stores/context-block-project-cap.d.ts +14 -0
- package/dist/stores/context-block-project-cap.d.ts.map +1 -0
- package/dist/stores/context-block-project-cap.js +68 -0
- package/dist/stores/context-block-project-cap.js.map +1 -0
- package/dist/stores/context-block-tool.d.ts +2 -0
- package/dist/stores/context-block-tool.d.ts.map +1 -1
- package/dist/stores/context-block-tool.js +3 -2
- package/dist/stores/context-block-tool.js.map +1 -1
- package/dist/stores/file-backed-context-block-store.d.ts +8 -1
- package/dist/stores/file-backed-context-block-store.d.ts.map +1 -1
- package/dist/stores/file-backed-context-block-store.js +116 -4
- package/dist/stores/file-backed-context-block-store.js.map +1 -1
- package/dist/tools/audit/plan-audit-criteria.d.ts +35 -0
- package/dist/tools/audit/plan-audit-criteria.d.ts.map +1 -0
- package/dist/tools/audit/plan-audit-criteria.js +136 -0
- package/dist/tools/audit/plan-audit-criteria.js.map +1 -0
- package/dist/tools/audit/plan-audit-verdict.d.ts +15 -0
- package/dist/tools/audit/plan-audit-verdict.d.ts.map +1 -0
- package/dist/tools/audit/plan-audit-verdict.js +44 -0
- package/dist/tools/audit/plan-audit-verdict.js.map +1 -0
- package/dist/tools/audit/schema.d.ts +1 -0
- package/dist/tools/audit/schema.d.ts.map +1 -1
- package/dist/tools/audit/schema.js +6 -3
- package/dist/tools/audit/schema.js.map +1 -1
- package/dist/tools/audit/tool-config.d.ts +3 -0
- package/dist/tools/audit/tool-config.d.ts.map +1 -1
- package/dist/tools/audit/tool-config.js +8 -0
- package/dist/tools/audit/tool-config.js.map +1 -1
- package/dist/tools/delegate/implementer-criteria.d.ts +31 -47
- package/dist/tools/delegate/implementer-criteria.d.ts.map +1 -1
- package/dist/tools/delegate/implementer-criteria.js +60 -88
- package/dist/tools/delegate/implementer-criteria.js.map +1 -1
- package/dist/tools/delegate/tool-config.js +4 -4
- package/dist/tools/delegate/tool-config.js.map +1 -1
- package/dist/tools/execute-plan/implementer-criteria.d.ts +42 -37
- package/dist/tools/execute-plan/implementer-criteria.d.ts.map +1 -1
- package/dist/tools/execute-plan/implementer-criteria.js +79 -79
- package/dist/tools/execute-plan/implementer-criteria.js.map +1 -1
- package/dist/tools/execute-plan/tool-config.d.ts.map +1 -1
- package/dist/tools/execute-plan/tool-config.js +23 -13
- package/dist/tools/execute-plan/tool-config.js.map +1 -1
- package/dist/types/enums.d.ts +3 -3
- package/dist/types/run-result.d.ts +59 -1
- package/dist/types/run-result.d.ts.map +1 -1
- package/dist/types/stage-stats.d.ts +10 -29
- package/dist/types/stage-stats.d.ts.map +1 -1
- package/dist/types/task-spec.d.ts +14 -0
- package/dist/types/task-spec.d.ts.map +1 -1
- package/dist/types.d.ts +10 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +5 -1
- package/dist/lifecycle/handlers/quality-chain-handlers.d.ts +0 -22
- package/dist/lifecycle/handlers/quality-chain-handlers.d.ts.map +0 -1
- package/dist/lifecycle/handlers/quality-chain-handlers.js +0 -369
- package/dist/lifecycle/handlers/quality-chain-handlers.js.map +0 -1
- package/dist/lifecycle/handlers/review-diff-handler.d.ts +0 -31
- package/dist/lifecycle/handlers/review-diff-handler.d.ts.map +0 -1
- package/dist/lifecycle/handlers/review-diff-handler.js +0 -168
- package/dist/lifecycle/handlers/review-diff-handler.js.map +0 -1
- package/dist/lifecycle/handlers/run-verify-command-handler.d.ts +0 -25
- package/dist/lifecycle/handlers/run-verify-command-handler.d.ts.map +0 -1
- package/dist/lifecycle/handlers/run-verify-command-handler.js +0 -84
- package/dist/lifecycle/handlers/run-verify-command-handler.js.map +0 -1
- package/dist/lifecycle/handlers/spec-chain-handlers.d.ts +0 -21
- package/dist/lifecycle/handlers/spec-chain-handlers.d.ts.map +0 -1
- package/dist/lifecycle/handlers/spec-chain-handlers.js +0 -287
- package/dist/lifecycle/handlers/spec-chain-handlers.js.map +0 -1
- package/dist/review/templates/diff-review.d.ts +0 -11
- package/dist/review/templates/diff-review.d.ts.map +0 -1
- package/dist/review/templates/diff-review.js +0 -39
- package/dist/review/templates/diff-review.js.map +0 -1
- package/dist/review/templates/quality-review-artifact.d.ts +0 -16
- package/dist/review/templates/quality-review-artifact.d.ts.map +0 -1
- package/dist/review/templates/quality-review-artifact.js +0 -46
- package/dist/review/templates/quality-review-artifact.js.map +0 -1
|
@@ -6,6 +6,12 @@ export interface CrossCheckInputs {
|
|
|
6
6
|
workerSelfAssessment: 'done' | 'in_progress' | 'no_op' | null | undefined;
|
|
7
7
|
toolsMode: 'full' | 'readonly' | 'none' | undefined;
|
|
8
8
|
autoCommit: boolean | undefined;
|
|
9
|
+
/** True iff the worker actually attempted any filesystem write — either a
|
|
10
|
+
* real path landed in `filesWritten`, the path-validity filter pushed at
|
|
11
|
+
* least one entry to `filesWrittenRejected`, or a shell heredoc fired.
|
|
12
|
+
* When false, the worker never tried to write — `writes_unverifiable` is
|
|
13
|
+
* a false positive (e.g., a chat-only response that didn't need a file). */
|
|
14
|
+
writeAttempted?: boolean;
|
|
9
15
|
}
|
|
10
16
|
export interface CrossCheckResult {
|
|
11
17
|
/** Possibly trimmed of nonexistent or absolute-path entries. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files-written-cross-check.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/handlers/files-written-cross-check.ts"],"names":[],"mappings":"AAgCA,MAAM,WAAW,gBAAgB;IAC/B,6CAA6C;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ,4EAA4E;IAC5E,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,oBAAoB,EAAE,MAAM,GAAG,aAAa,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;IAC1E,SAAS,EAAE,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,SAAS,CAAC;IACpD,UAAU,EAAE,OAAO,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"files-written-cross-check.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/handlers/files-written-cross-check.ts"],"names":[],"mappings":"AAgCA,MAAM,WAAW,gBAAgB;IAC/B,6CAA6C;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ,4EAA4E;IAC5E,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,oBAAoB,EAAE,MAAM,GAAG,aAAa,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;IAC1E,SAAS,EAAE,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,SAAS,CAAC;IACpD,UAAU,EAAE,OAAO,GAAG,SAAS,CAAC;IAChC;;;;iFAI6E;IAC7E,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAC/B,gEAAgE;IAChE,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,wEAAwE;IACxE,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,yCAAyC;IACzC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,qBAAqB,CAAC;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAOD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CA2DjF"}
|
|
@@ -63,9 +63,15 @@ export function crossCheckFilesWritten(inputs) {
|
|
|
63
63
|
let workerStatus;
|
|
64
64
|
let errorCode;
|
|
65
65
|
let errorMessage;
|
|
66
|
+
// When the caller can prove the worker never tried to write (no rejected
|
|
67
|
+
// paths, no successful writes, no shell heredocs), skip the downgrade —
|
|
68
|
+
// it's a false positive for chat-only responses. Default = true (preserve
|
|
69
|
+
// pre-existing callers that don't pass the flag).
|
|
70
|
+
const attempted = inputs.writeAttempted ?? true;
|
|
66
71
|
if (real.length === 0 &&
|
|
67
72
|
inputs.workerSelfAssessment === 'done' &&
|
|
68
|
-
inputs.toolsMode === 'full'
|
|
73
|
+
inputs.toolsMode === 'full' &&
|
|
74
|
+
attempted) {
|
|
69
75
|
workerStatus = 'error';
|
|
70
76
|
errorCode = 'writes_unverifiable';
|
|
71
77
|
errorMessage = WRITES_UNVERIFIABLE_MESSAGE;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files-written-cross-check.js","sourceRoot":"","sources":["../../../src/lifecycle/handlers/files-written-cross-check.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"files-written-cross-check.js","sourceRoot":"","sources":["../../../src/lifecycle/handlers/files-written-cross-check.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AA6BlC,MAAM,2BAA2B,GAC/B,uEAAuE;IACvE,0EAA0E;IAC1E,uEAAuE,CAAC;AAE1E,MAAM,UAAU,sBAAsB,CAAC,MAAwB;IAC7D,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;QACxC,iEAAiE;QACjE,iEAAiE;QACjE,+DAA+D;QAC/D,mEAAmE;QACnE,gCAAgC;QAChC,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACpB,SAAS;QACX,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC7C,IAAI,CAAC;YACH,MAAM,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAChC,IAAI,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC;gBACpC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnB,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACtB,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IAED,yCAAyC;IACzC,IAAI,YAAiC,CAAC;IACtC,IAAI,SAA4C,CAAC;IACjD,IAAI,YAAgC,CAAC;IACrC,yEAAyE;IACzE,wEAAwE;IACxE,0EAA0E;IAC1E,kDAAkD;IAClD,MAAM,SAAS,GAAG,MAAM,CAAC,cAAc,IAAI,IAAI,CAAC;IAChD,IACE,IAAI,CAAC,MAAM,KAAK,CAAC;QACjB,MAAM,CAAC,oBAAoB,KAAK,MAAM;QACtC,MAAM,CAAC,SAAS,KAAK,MAAM;QAC3B,SAAS,EACT,CAAC;QACD,YAAY,GAAG,OAAO,CAAC;QACvB,SAAS,GAAG,qBAAqB,CAAC;QAClC,YAAY,GAAG,2BAA2B,CAAC;IAC7C,CAAC;IAED,oEAAoE;IACpE,qEAAqE;IACrE,2DAA2D;IAC3D,KAAK,MAAM,CAAC,UAAU,CAAC;IAEvB,OAAO;QACL,YAAY,EAAE,IAAI;QAClB,mBAAmB,EAAE,OAAO;QAC5B,GAAG,CAAC,YAAY,KAAK,SAAS,IAAI,EAAE,YAAY,EAAE,CAAC;QACnD,GAAG,CAAC,SAAS,KAAK,SAAS,IAAI,EAAE,SAAS,EAAE,CAAC;QAC7C,GAAG,CAAC,YAAY,KAAK,SAAS,IAAI,EAAE,YAAY,EAAE,CAAC;KACpD,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-commit-handler.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/handlers/git-commit-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"git-commit-handler.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/handlers/git-commit-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAO7D;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CA6C3E"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { runCommitStage } from './commit-stage.js';
|
|
2
|
+
import { mergeStageStats } from '../merge-stage-stats.js';
|
|
2
3
|
/**
|
|
3
4
|
* StageHandler for row 5.2 (git_commit).
|
|
4
5
|
*
|
|
@@ -36,6 +37,7 @@ export async function gitCommitHandler(state) {
|
|
|
36
37
|
subject: 'automated commit',
|
|
37
38
|
body: '',
|
|
38
39
|
};
|
|
40
|
+
const startMs = Date.now();
|
|
39
41
|
try {
|
|
40
42
|
const result = await runCommitStage({
|
|
41
43
|
cwd: ctx.cwd,
|
|
@@ -43,6 +45,17 @@ export async function gitCommitHandler(state) {
|
|
|
43
45
|
commit: commitFields,
|
|
44
46
|
});
|
|
45
47
|
state.commits = [result];
|
|
48
|
+
mergeStageStats(state, 'committing', {
|
|
49
|
+
inputTokens: 0,
|
|
50
|
+
outputTokens: 0,
|
|
51
|
+
cachedReadTokens: 0,
|
|
52
|
+
cachedNonReadTokens: 0,
|
|
53
|
+
turnCount: 0,
|
|
54
|
+
toolCallCount: 0,
|
|
55
|
+
costUSD: null,
|
|
56
|
+
durationMs: Date.now() - startMs,
|
|
57
|
+
filesWrittenCount: filesWritten.length,
|
|
58
|
+
}, { tier: null, model: null });
|
|
46
59
|
}
|
|
47
60
|
catch (err) {
|
|
48
61
|
const message = err instanceof Error ? err.message : String(err);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-commit-handler.js","sourceRoot":"","sources":["../../../src/lifecycle/handlers/git-commit-handler.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAA0B,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"git-commit-handler.js","sourceRoot":"","sources":["../../../src/lifecycle/handlers/git-commit-handler.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAA0B,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAG1D;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,KAAqB;IAC1D,oEAAoE;IACpE,yEAAyE;IACzE,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO;IACrE,IAAI,OAAO,KAAK,CAAC,WAAW,KAAK,QAAQ;QAAE,OAAO;IAElD,MAAM,IAAI,GAAG,KAAK,CAAC,IAA4B,CAAC;IAChD,MAAM,GAAG,GAAG,KAAK,CAAC,gBAAgD,CAAC;IACnE,MAAM,IAAI,GAAG,KAAK,CAAC,aAAsC,CAAC;IAE1D,2EAA2E;IAC3E,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI;QAAE,OAAO;IAEnC,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/E,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAEtC,MAAM,YAAY,GAAkB,IAAI,CAAC,cAAmD,EAAE,MAAM,IAAI;QACtG,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,kBAAkB;QAC3B,IAAI,EAAE,EAAE;KACT,CAAC;IAEF,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC3B,IAAI,CAAC;QACH,MAAM,MAAM,GAAsB,MAAM,cAAc,CAAC;YACrD,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,YAAY;YACZ,MAAM,EAAE,YAAY;SACrB,CAAC,CAAC;QACH,KAAK,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC;QACzB,eAAe,CAAC,KAAK,EAAE,YAAY,EAAE;YACnC,WAAW,EAAE,CAAC;YACd,YAAY,EAAE,CAAC;YACf,gBAAgB,EAAE,CAAC;YACnB,mBAAmB,EAAE,CAAC;YACtB,SAAS,EAAE,CAAC;YACZ,aAAa,EAAE,CAAC;YAChB,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO;YAChC,iBAAiB,EAAE,YAAY,CAAC,MAAM;SACvC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAClC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjE,KAAK,CAAC,WAAW,GAAG,OAAO,CAAC;IAC9B,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"review-handler.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/handlers/review-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAiE7D,wBAAsB,aAAa,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAiIxE"}
|
|
@@ -0,0 +1,175 @@
|
|
|
1
|
+
import { delegateWithEscalation } from '../../escalation/delegate-with-escalation.js';
|
|
2
|
+
import { specLintTemplate } from '../../review/templates/spec-review.js';
|
|
3
|
+
import { qualityLintTemplate } from '../../review/templates/quality-review.js';
|
|
4
|
+
import { parseReviewReport } from '../../review/parse-review-report.js';
|
|
5
|
+
import { mergeStageStats } from '../merge-stage-stats.js';
|
|
6
|
+
async function runOneReviewer(state, ctx, task, source, diff, workerOutput) {
|
|
7
|
+
const template = source === 'spec' ? specLintTemplate : qualityLintTemplate;
|
|
8
|
+
const reviewerTier = ctx.assignedTier === 'standard' ? 'complex' : 'standard';
|
|
9
|
+
const provider = ctx.providers[reviewerTier];
|
|
10
|
+
if (!provider) {
|
|
11
|
+
return { transportError: `no provider available for tier ${reviewerTier}` };
|
|
12
|
+
}
|
|
13
|
+
const promptCtx = {
|
|
14
|
+
brief: task.prompt ?? '',
|
|
15
|
+
workerOutput,
|
|
16
|
+
diff,
|
|
17
|
+
planContext: task.planContext,
|
|
18
|
+
};
|
|
19
|
+
const fullPrompt = template.systemPrompt + '\n\n' + template.buildUserPrompt(promptCtx);
|
|
20
|
+
try {
|
|
21
|
+
return await delegateWithEscalation({
|
|
22
|
+
prompt: fullPrompt,
|
|
23
|
+
cwd: ctx.cwd,
|
|
24
|
+
agentType: reviewerTier,
|
|
25
|
+
briefQualityPolicy: 'off',
|
|
26
|
+
timeoutMs: ctx.timing.timeoutMs,
|
|
27
|
+
tools: 'readonly',
|
|
28
|
+
}, [provider], {
|
|
29
|
+
explicitlyPinned: true,
|
|
30
|
+
taskDeadlineMs: ctx.timing.deadlineMs,
|
|
31
|
+
abortSignal: ctx.stall.controller.signal,
|
|
32
|
+
assignedTier: reviewerTier,
|
|
33
|
+
...(ctx.bus && { bus: ctx.bus }),
|
|
34
|
+
...(ctx.batchId !== undefined && { batchId: ctx.batchId }),
|
|
35
|
+
...(ctx.taskIndex !== undefined && { taskIndex: ctx.taskIndex }),
|
|
36
|
+
stageLabel: 'Review',
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
catch (err) {
|
|
40
|
+
return { transportError: err instanceof Error ? err.message : String(err) };
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
export async function reviewHandler(state) {
|
|
44
|
+
if (state.terminal)
|
|
45
|
+
return;
|
|
46
|
+
if (state.reviewVerdict !== undefined)
|
|
47
|
+
return;
|
|
48
|
+
const ctx = state.executionContext;
|
|
49
|
+
const task = state.task;
|
|
50
|
+
const last = state.lastRunResult;
|
|
51
|
+
if (!ctx || !task || !last)
|
|
52
|
+
return;
|
|
53
|
+
let cumulativeDiff = '';
|
|
54
|
+
if (state.diffTracker) {
|
|
55
|
+
try {
|
|
56
|
+
cumulativeDiff = await state.diffTracker.cumulativeDiff();
|
|
57
|
+
}
|
|
58
|
+
catch {
|
|
59
|
+
cumulativeDiff = '';
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
const workerOutput = last.output ?? '';
|
|
63
|
+
const runSpec = state.reviewPolicy === 'full';
|
|
64
|
+
const runQuality = state.reviewPolicy === 'full'
|
|
65
|
+
|| state.reviewPolicy === 'quality_only'
|
|
66
|
+
|| state.reviewPolicy === 'diff_only';
|
|
67
|
+
if (!runSpec && !runQuality) {
|
|
68
|
+
state.reviewVerdict = 'approved';
|
|
69
|
+
state.reviewFindings = [];
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
const sources = [];
|
|
73
|
+
if (runSpec)
|
|
74
|
+
sources.push('spec');
|
|
75
|
+
if (runQuality)
|
|
76
|
+
sources.push('quality');
|
|
77
|
+
const isOk = (r) => !('transportError' in r) && r.status === 'ok';
|
|
78
|
+
const settled = await Promise.all(sources.map(async (source) => ({
|
|
79
|
+
source,
|
|
80
|
+
result: await runOneReviewer(state, ctx, task, source, cumulativeDiff, workerOutput),
|
|
81
|
+
})));
|
|
82
|
+
const retryNeeded = settled
|
|
83
|
+
.map((o, i) => ({ o, i }))
|
|
84
|
+
.filter(({ o }) => !isOk(o.result))
|
|
85
|
+
.map(({ i }) => i);
|
|
86
|
+
if (retryNeeded.length > 0) {
|
|
87
|
+
const retried = await Promise.all(retryNeeded.map(async (i) => ({
|
|
88
|
+
source: settled[i].source,
|
|
89
|
+
result: await runOneReviewer(state, ctx, task, settled[i].source, cumulativeDiff, workerOutput),
|
|
90
|
+
})));
|
|
91
|
+
retried.forEach((o, k) => { settled[retryNeeded[k]] = o; });
|
|
92
|
+
}
|
|
93
|
+
const findings = [];
|
|
94
|
+
const errors = [];
|
|
95
|
+
let anyChangesRequired = false;
|
|
96
|
+
let anySuccess = false;
|
|
97
|
+
for (const { source, result } of settled) {
|
|
98
|
+
if ('transportError' in result) {
|
|
99
|
+
if (source === 'spec')
|
|
100
|
+
state.specReviewError = result.transportError;
|
|
101
|
+
else
|
|
102
|
+
state.qualityReviewError = result.transportError;
|
|
103
|
+
errors.push(`${source}: ${result.transportError}`);
|
|
104
|
+
process.stderr.write(`[review-handler] ${source} transportError: ${result.transportError}\n`);
|
|
105
|
+
continue;
|
|
106
|
+
}
|
|
107
|
+
if (result.status !== 'ok') {
|
|
108
|
+
const errDetail = result.error ?? '(no error field)';
|
|
109
|
+
const msg = `reviewer status=${result.status}; error=${errDetail}`;
|
|
110
|
+
if (source === 'spec')
|
|
111
|
+
state.specReviewError = msg;
|
|
112
|
+
else
|
|
113
|
+
state.qualityReviewError = msg;
|
|
114
|
+
errors.push(`${source}: ${msg}`);
|
|
115
|
+
process.stderr.write(`[review-handler] ${source} ${msg}\n`);
|
|
116
|
+
continue;
|
|
117
|
+
}
|
|
118
|
+
anySuccess = true;
|
|
119
|
+
const parsed = parseReviewReport(result.output ?? '');
|
|
120
|
+
if (source === 'spec') {
|
|
121
|
+
state.specReviewerNotes = result.output;
|
|
122
|
+
state.specReviewVerdict = parsed.verdict;
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
state.qualityReviewerNotes = result.output;
|
|
126
|
+
state.qualityReviewVerdict = parsed.verdict;
|
|
127
|
+
}
|
|
128
|
+
if (parsed.verdict === 'changes_required')
|
|
129
|
+
anyChangesRequired = true;
|
|
130
|
+
for (const dev of parsed.deviations) {
|
|
131
|
+
findings.push({ source, text: dev });
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
state.reviewFindings = findings;
|
|
135
|
+
if (!anySuccess) {
|
|
136
|
+
state.reviewVerdict = 'changes_required';
|
|
137
|
+
state.reviewError = errors.join(' | ');
|
|
138
|
+
return;
|
|
139
|
+
}
|
|
140
|
+
state.reviewVerdict = anyChangesRequired ? 'changes_required' : 'approved';
|
|
141
|
+
let combinedInput = 0, combinedOutput = 0, combinedCached = 0, combinedNonRead = 0;
|
|
142
|
+
let combinedTurns = 0, combinedTools = 0;
|
|
143
|
+
let combinedCost = null;
|
|
144
|
+
let combinedDuration = 0;
|
|
145
|
+
for (const { result } of settled) {
|
|
146
|
+
if ('transportError' in result || result.status !== 'ok')
|
|
147
|
+
continue;
|
|
148
|
+
combinedInput += result.usage?.inputTokens ?? 0;
|
|
149
|
+
combinedOutput += result.usage?.outputTokens ?? 0;
|
|
150
|
+
combinedCached += result.usage?.cachedReadTokens ?? 0;
|
|
151
|
+
combinedNonRead += result.usage?.cachedNonReadTokens ?? 0;
|
|
152
|
+
combinedTurns += result.turns ?? 1;
|
|
153
|
+
combinedTools += Array.isArray(result.toolCalls) ? result.toolCalls.length : 0;
|
|
154
|
+
combinedDuration = Math.max(combinedDuration, result.durationMs ?? 0);
|
|
155
|
+
const c = result.costUSD;
|
|
156
|
+
if (c !== null && c !== undefined)
|
|
157
|
+
combinedCost = (combinedCost ?? 0) + c;
|
|
158
|
+
}
|
|
159
|
+
const reviewerTier = ctx.assignedTier === 'standard' ? 'complex' : 'standard';
|
|
160
|
+
mergeStageStats(state, 'review', {
|
|
161
|
+
inputTokens: combinedInput,
|
|
162
|
+
outputTokens: combinedOutput,
|
|
163
|
+
cachedReadTokens: combinedCached,
|
|
164
|
+
cachedNonReadTokens: combinedNonRead,
|
|
165
|
+
turnCount: combinedTurns,
|
|
166
|
+
toolCallCount: combinedTools,
|
|
167
|
+
costUSD: combinedCost,
|
|
168
|
+
durationMs: combinedDuration || null,
|
|
169
|
+
}, {
|
|
170
|
+
tier: reviewerTier,
|
|
171
|
+
model: ctx.providers[reviewerTier]?.config?.model ?? null,
|
|
172
|
+
verdict: state.reviewVerdict,
|
|
173
|
+
});
|
|
174
|
+
}
|
|
175
|
+
//# sourceMappingURL=review-handler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"review-handler.js","sourceRoot":"","sources":["../../../src/lifecycle/handlers/review-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rework-handler.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/handlers/rework-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAO7D,wBAAsB,aAAa,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CA0FxE"}
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
import { delegateWithEscalation } from '../../escalation/delegate-with-escalation.js';
|
|
2
|
+
import { replaceLastRunResultPreservingTrackers, mergeStageStats } from '../merge-stage-stats.js';
|
|
3
|
+
import { reworkTemplate } from '../../review/templates/rework.js';
|
|
4
|
+
export async function reworkHandler(state) {
|
|
5
|
+
if (state.terminal)
|
|
6
|
+
return;
|
|
7
|
+
if (state.reworkApplied !== undefined || state.reworkError !== undefined)
|
|
8
|
+
return;
|
|
9
|
+
if (state.reviewVerdict !== 'changes_required')
|
|
10
|
+
return;
|
|
11
|
+
const ctx = state.executionContext;
|
|
12
|
+
const task = state.task;
|
|
13
|
+
const last = state.lastRunResult;
|
|
14
|
+
if (!ctx || !task || !last)
|
|
15
|
+
return;
|
|
16
|
+
const findings = state.reviewFindings ?? [];
|
|
17
|
+
if (findings.length === 0) {
|
|
18
|
+
state.reworkApplied = false;
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
let cumulativeDiff = '';
|
|
22
|
+
if (state.diffTracker) {
|
|
23
|
+
try {
|
|
24
|
+
cumulativeDiff = await state.diffTracker.cumulativeDiff();
|
|
25
|
+
}
|
|
26
|
+
catch {
|
|
27
|
+
cumulativeDiff = '';
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
const reworkTier = 'complex';
|
|
31
|
+
const provider = ctx.providers[reworkTier];
|
|
32
|
+
if (!provider) {
|
|
33
|
+
state.reworkError = `no provider available for tier ${reworkTier}`;
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
const concerns = findings.map(f => `[${f.source}] ${f.text}`);
|
|
37
|
+
const promptCtx = {
|
|
38
|
+
brief: task.prompt ?? '',
|
|
39
|
+
workerOutput: last.output ?? '',
|
|
40
|
+
diff: cumulativeDiff,
|
|
41
|
+
planContext: task.planContext,
|
|
42
|
+
priorConcerns: concerns,
|
|
43
|
+
};
|
|
44
|
+
const fullPrompt = reworkTemplate.systemPrompt + '\n\n' + reworkTemplate.buildUserPrompt(promptCtx);
|
|
45
|
+
let result;
|
|
46
|
+
try {
|
|
47
|
+
result = await delegateWithEscalation({
|
|
48
|
+
prompt: fullPrompt,
|
|
49
|
+
cwd: ctx.cwd,
|
|
50
|
+
agentType: reworkTier,
|
|
51
|
+
briefQualityPolicy: 'off',
|
|
52
|
+
timeoutMs: ctx.timing.timeoutMs,
|
|
53
|
+
tools: 'full',
|
|
54
|
+
}, [provider], {
|
|
55
|
+
explicitlyPinned: true,
|
|
56
|
+
taskDeadlineMs: ctx.timing.deadlineMs,
|
|
57
|
+
abortSignal: ctx.stall.controller.signal,
|
|
58
|
+
assignedTier: reworkTier,
|
|
59
|
+
...(ctx.bus && { bus: ctx.bus }),
|
|
60
|
+
...(ctx.batchId !== undefined && { batchId: ctx.batchId }),
|
|
61
|
+
...(ctx.taskIndex !== undefined && { taskIndex: ctx.taskIndex }),
|
|
62
|
+
stageLabel: 'Rework',
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
catch (err) {
|
|
66
|
+
state.reworkError = err instanceof Error ? err.message : String(err);
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
if (result.status !== 'ok') {
|
|
70
|
+
state.reworkError = `rework returned status: ${result.status}`;
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
state.reworkApplied = true;
|
|
74
|
+
state.reworkOutput = result.output;
|
|
75
|
+
replaceLastRunResultPreservingTrackers(state, result);
|
|
76
|
+
mergeStageStats(state, 'rework', {
|
|
77
|
+
inputTokens: result.usage?.inputTokens ?? 0,
|
|
78
|
+
outputTokens: result.usage?.outputTokens ?? 0,
|
|
79
|
+
cachedReadTokens: result.usage?.cachedReadTokens ?? 0,
|
|
80
|
+
cachedNonReadTokens: result.usage?.cachedNonReadTokens ?? 0,
|
|
81
|
+
turnCount: result.turns ?? 1,
|
|
82
|
+
toolCallCount: Array.isArray(result.toolCalls) ? result.toolCalls.length : 0,
|
|
83
|
+
costUSD: result.costUSD ?? null,
|
|
84
|
+
durationMs: result.durationMs ?? null,
|
|
85
|
+
filesReadCount: Array.isArray(result.filesRead) ? result.filesRead.length : 0,
|
|
86
|
+
filesWrittenCount: Array.isArray(result.filesWritten) ? result.filesWritten.length : 0,
|
|
87
|
+
}, {
|
|
88
|
+
tier: reworkTier,
|
|
89
|
+
model: ctx.providers[reworkTier]?.config?.model ?? null,
|
|
90
|
+
});
|
|
91
|
+
}
|
|
92
|
+
//# sourceMappingURL=rework-handler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rework-handler.js","sourceRoot":"","sources":["../../../src/lifecycle/handlers/rework-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-handlers.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/handlers/terminal-handlers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAkC7D,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAqBxE;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"terminal-handlers.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/handlers/terminal-handlers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAkC7D,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAqBxE;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAyHnE;AAMD,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAkBzE;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAoCtE;AAqED,wBAAsB,qBAAqB,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBhF"}
|
|
@@ -42,12 +42,16 @@ export function emitTaskTerminalHandler(state) {
|
|
|
42
42
|
let outputTokens = 0;
|
|
43
43
|
let cachedReadTokens = 0;
|
|
44
44
|
let cachedNonReadTokens = 0;
|
|
45
|
-
let totalCostUSD = null;
|
|
46
45
|
let toolCallsTotal = 0;
|
|
47
46
|
let turnsTotal = 0;
|
|
48
47
|
let filesReadTotal = 0;
|
|
49
48
|
let filesWrittenTotal = 0;
|
|
50
49
|
const ss = last?.stageStats;
|
|
50
|
+
// A11.2: compute actualCostUSD as the sum of every stage's costUSD.
|
|
51
|
+
// costUSD and totalCostUSD are back-compat aliases for the same value.
|
|
52
|
+
// costDeltaVsMainUSD comes from the top-level cost field on RunResult.
|
|
53
|
+
let actualCostUSD = null;
|
|
54
|
+
let costDeltaVsMainUSD = null;
|
|
51
55
|
if (ss) {
|
|
52
56
|
for (const stage of Object.values(ss)) {
|
|
53
57
|
if (!stage || !stage['entered'])
|
|
@@ -62,9 +66,10 @@ export function emitTaskTerminalHandler(state) {
|
|
|
62
66
|
filesWrittenTotal += stage['filesWrittenCount'] ?? 0;
|
|
63
67
|
const stageCost = stage['costUSD'];
|
|
64
68
|
if (stageCost !== null && stageCost !== undefined) {
|
|
65
|
-
|
|
69
|
+
actualCostUSD = (actualCostUSD ?? 0) + stageCost;
|
|
66
70
|
}
|
|
67
71
|
}
|
|
72
|
+
costDeltaVsMainUSD = last?.cost?.costDeltaVsMainUSD ?? null;
|
|
68
73
|
}
|
|
69
74
|
// Fallback to last.usage when stageStats wasn't populated (legacy paths).
|
|
70
75
|
if (inputTokens === 0 && outputTokens === 0 && last?.usage) {
|
|
@@ -123,7 +128,15 @@ export function emitTaskTerminalHandler(state) {
|
|
|
123
128
|
outputTokens,
|
|
124
129
|
cachedReadTokens,
|
|
125
130
|
cachedNonReadTokens,
|
|
126
|
-
|
|
131
|
+
// A11.2 — populate the full cost surface on the task_completed envelope.
|
|
132
|
+
// actualCostUSD is the new canonical field (sum of every stage's costUSD).
|
|
133
|
+
// costUSD and totalCostUSD are back-compat aliases — emit all three so
|
|
134
|
+
// existing callers and new callers both get the value they expect.
|
|
135
|
+
// costDeltaVsMainUSD: delta vs estimated main-tier cost (from CostBreakdown).
|
|
136
|
+
actualCostUSD,
|
|
137
|
+
costUSD: actualCostUSD,
|
|
138
|
+
totalCostUSD: actualCostUSD,
|
|
139
|
+
costDeltaVsMainUSD,
|
|
127
140
|
taskMaxIdleMs: null,
|
|
128
141
|
stallTriggered: false,
|
|
129
142
|
stages,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-handlers.js","sourceRoot":"","sources":["../../../src/lifecycle/handlers/terminal-handlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAIzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AA+B1E,MAAM,UAAU,4BAA4B,CAAC,KAAqB;IAChE,IAAI,KAAK,CAAC,eAAe;QAAE,OAAO;IAClC,MAAM,GAAG,GAAG,KAAK,CAAC,gBAEL,CAAC;IACd,IAAI,CAAC,GAAG;QAAE,OAAO;IACjB,MAAM,IAAI,GAAG,KAAK,CAAC,aAAsC,CAAC;IAC1D,IAAI,CAAC,IAAI;QAAE,OAAO;IAElB,MAAM,EAAE,GAAG,YAAY,UAAU,EAAE,EAAE,CAAC;IACtC,KAAK,CAAC,eAAe,GAAG,EAAE,CAAC;IAE3B,MAAM,KAAK,GAAG,GAAG,CAAC,iBAAiB,CAAC;IACpC,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;QAClD,IAAI,CAAC;YACH,KAAK,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC,CAAC;QACrD,CAAC;QAAC,MAAM,CAAC;YACP,qEAAqE;YACrE,8DAA8D;QAChE,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,KAAqB;IAC3D,IAAI,KAAK,CAAC,mBAAmB;QAAE,OAAO;IACtC,MAAM,GAAG,GAAG,KAAK,CAAC,gBAAgB,CAAC;IACnC,IAAI,CAAC,GAAG;QAAE,OAAO;IACjB,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC;IACpB,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,KAAK,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAAC,iDAAiD;QACnF,OAAO;IACT,CAAC;IACD,MAAM,IAAI,GAAG,KAAK,CAAC,aAAsC,CAAC;IAE1D,8EAA8E;IAC9E,2EAA2E;IAC3E,2EAA2E;IAC3E,gEAAgE;IAChE,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,gBAAgB,GAAG,CAAC,CAAC;IACzB,IAAI,mBAAmB,GAAG,CAAC,CAAC;IAC5B,IAAI,
|
|
1
|
+
{"version":3,"file":"terminal-handlers.js","sourceRoot":"","sources":["../../../src/lifecycle/handlers/terminal-handlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { Provider, TaskSpec, MultiModelConfig, AgentType } from '../types.js';
|
|
2
2
|
import type { EventEmitter } from '../events/event-emitter.js';
|
|
3
3
|
import type { ActivityTracker, HeartbeatTickInfo } from '../bounded-execution/activity-tracker.js';
|
|
4
|
+
import type { WallClockGuard } from '../bounded-execution/wall-clock-guard.js';
|
|
4
5
|
import type { CanonicalIdentity } from '../config/canonical-model-identity.js';
|
|
5
6
|
import type { HttpServerLog } from '../events/http-server-log.js';
|
|
6
7
|
import type { ProjectContext } from '../stores/project-context-registry.js';
|
|
@@ -43,6 +44,9 @@ export interface ExecutionContext {
|
|
|
43
44
|
budgets: {
|
|
44
45
|
maxCostUSD: number | undefined;
|
|
45
46
|
};
|
|
47
|
+
/** Wall-clock budget guard. Throws GuardError once budgetMs since task start
|
|
48
|
+
* is exceeded. Stage entries + tool-call boundaries call checkOrThrow(). */
|
|
49
|
+
wallClockGuard: WallClockGuard;
|
|
46
50
|
stall: {
|
|
47
51
|
controller: AbortController;
|
|
48
52
|
/** ms timestamp of the most recent runner event; updated by markRunnerEvent. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lifecycle-context.d.ts","sourceRoot":"","sources":["../../src/lifecycle/lifecycle-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,QAAQ,EACR,gBAAgB,EAChB,SAAS,EACV,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AACnG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEzE;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,gBAAgB;IAE/B,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,gBAAgB,CAAC;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAEzB,oIAAoI;IACpI,YAAY,EAAE,SAAS,CAAC;IACxB,mBAAmB,EAAE,QAAQ,CAAC;IAC9B,iHAAiH;IACjH,kBAAkB,EAAE,QAAQ,GAAG,SAAS,CAAC;IACzC,uFAAuF;IACvF,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;IAChD,mBAAmB,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAGnD,MAAM,EAAE;QACN,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;QACnB,cAAc,EAAE,MAAM,CAAC;KACxB,CAAC;IACF,OAAO,EAAE;QACP,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;KAChC,CAAC;
|
|
1
|
+
{"version":3,"file":"lifecycle-context.d.ts","sourceRoot":"","sources":["../../src/lifecycle/lifecycle-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,QAAQ,EACR,gBAAgB,EAChB,SAAS,EACV,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AACnG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEzE;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,gBAAgB;IAE/B,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,gBAAgB,CAAC;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAEzB,oIAAoI;IACpI,YAAY,EAAE,SAAS,CAAC;IACxB,mBAAmB,EAAE,QAAQ,CAAC;IAC9B,iHAAiH;IACjH,kBAAkB,EAAE,QAAQ,GAAG,SAAS,CAAC;IACzC,uFAAuF;IACvF,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;IAChD,mBAAmB,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAGnD,MAAM,EAAE;QACN,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;QACnB,cAAc,EAAE,MAAM,CAAC;KACxB,CAAC;IACF,OAAO,EAAE;QACP,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;KAChC,CAAC;IAEF;iFAC6E;IAC7E,cAAc,EAAE,cAAc,CAAC;IAG/B,KAAK,EAAE;QACL,UAAU,EAAE,eAAe,CAAC;QAC5B,gFAAgF;QAChF,aAAa,EAAE,MAAM,CAAC;QACtB,4DAA4D;QAC5D,KAAK,EAAE,OAAO,CAAC;KAChB,CAAC;IAGF,mBAAmB,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;IAEvC,yFAAyF;IACzF,0BAA0B,CAAC,EAAE,CAAC,GAAG,EAAE;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,MAAM,CAAC;IAGtF,GAAG,EAAE,YAAY,GAAG,SAAS,CAAC;IAC9B,SAAS,EAAE,eAAe,GAAG,SAAS,CAAC;IACvC,8EAA8E;IAC9E,MAAM,EAAE,aAAa,GAAG,SAAS,CAAC;IAClC,uDAAuD;IACvD,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;OAIG;IACH,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAEpD,mFAAmF;IACnF,QAAQ,CAAC,EAAE;QACT,mBAAmB,EAAE,CAAC,MAAM,EAAE;YAC5B,KAAK,EAAE,MAAM,CAAC;YACd,QAAQ,EAAE,QAAQ,CAAC;YACnB,SAAS,EAAE,OAAO,aAAa,EAAE,SAAS,CAAC;YAC3C,MAAM,EAAE,MAAM,CAAC;YACf,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;YACzB,YAAY,CAAC,EAAE,MAAM,GAAG,cAAc,GAAG,WAAW,GAAG,MAAM,CAAC;YAC9D,oBAAoB,CAAC,EAAE,OAAO,CAAC;SAChC,KAAK,IAAI,CAAC;KACZ,CAAC;IAGF,aAAa,EAAE,MAAM,EAAE,CAAC;IAGxB,+FAA+F;IAC/F,cAAc,CAAC,EAAE,OAAO,8BAA8B,EAAE,cAAc,CAAC;IACvE,yEAAyE;IACzE,eAAe,CAAC,EAAE,OAAO,+BAA+B,EAAE,eAAe,CAAC;IAG1E,qFAAqF;IACrF,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,mFAAmF;IACnF,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,iFAAiF;IACjF,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lifecycle-driver.d.ts","sourceRoot":"","sources":["../../src/lifecycle/lifecycle-driver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"lifecycle-driver.d.ts","sourceRoot":"","sources":["../../src/lifecycle/lifecycle-driver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvE,MAAM,MAAM,YAAY,GAAG,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAE3E,qBAAa,eAAe;IACd,OAAO,CAAC,IAAI;IAAa,OAAO,CAAC,QAAQ;gBAAjC,IAAI,EAAE,SAAS,EAAU,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC;IAE7E,GAAG,CAAC,YAAY,EAAE,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;CAqBjE"}
|
|
@@ -8,13 +8,6 @@ export class LifecycleDriver {
|
|
|
8
8
|
async run(initialState) {
|
|
9
9
|
const state = initialState;
|
|
10
10
|
for (const row of this.plan.rows) {
|
|
11
|
-
// Rows marked runOnTerminal still evaluate their runCondition even
|
|
12
|
-
// after a prior row set state.terminal=true. This is how settle_*_chain,
|
|
13
|
-
// compose_response, register_terminal_block, emit_task_terminal,
|
|
14
|
-
// persist_to_batch_registry, and flush_telemetry continue to fire on
|
|
15
|
-
// hard-fail paths so chain-pass slots, response envelopes, and
|
|
16
|
-
// telemetry stay authoritative. Non-runOnTerminal rows are skipped
|
|
17
|
-
// (continue, not break) so later runOnTerminal rows still fire.
|
|
18
11
|
if (state.terminal && !row.runOnTerminal)
|
|
19
12
|
continue;
|
|
20
13
|
if (!row.runCondition(state))
|
|
@@ -22,6 +15,18 @@ export class LifecycleDriver {
|
|
|
22
15
|
const handler = this.handlers[row.handlerKey];
|
|
23
16
|
if (!handler)
|
|
24
17
|
throw new Error(`no handler registered for key '${row.handlerKey}'`);
|
|
18
|
+
const ctx = state.executionContext;
|
|
19
|
+
if (ctx && !row.runOnTerminal) {
|
|
20
|
+
try {
|
|
21
|
+
ctx.wallClockGuard.checkOrThrow();
|
|
22
|
+
}
|
|
23
|
+
catch (err) {
|
|
24
|
+
state.terminal = true;
|
|
25
|
+
state.errorCode = err.errorCode ?? 'guard_wall_clock';
|
|
26
|
+
state.error = err instanceof Error ? err.message : String(err);
|
|
27
|
+
continue;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
25
30
|
await handler(state);
|
|
26
31
|
}
|
|
27
32
|
return state;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lifecycle-driver.js","sourceRoot":"","sources":["../../src/lifecycle/lifecycle-driver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"lifecycle-driver.js","sourceRoot":"","sources":["../../src/lifecycle/lifecycle-driver.ts"],"names":[],"mappings":"AAKA,MAAM,OAAO,eAAe;IACN;IAAyB;IAA7C,YAAoB,IAAe,EAAU,QAAsC;QAA/D,SAAI,GAAJ,IAAI,CAAW;QAAU,aAAQ,GAAR,QAAQ,CAA8B;IAAG,CAAC;IAEvF,KAAK,CAAC,GAAG,CAAC,YAA4B;QACpC,MAAM,KAAK,GAAG,YAAY,CAAC;QAC3B,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACjC,IAAI,KAAK,CAAC,QAAQ,IAAI,CAAC,GAAG,CAAC,aAAa;gBAAE,SAAS;YACnD,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC;gBAAE,SAAS;YACvC,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAC9C,IAAI,CAAC,OAAO;gBAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,GAAG,CAAC,UAAU,GAAG,CAAC,CAAC;YACnF,MAAM,GAAG,GAAG,KAAK,CAAC,gBAAgD,CAAC;YACnE,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;gBAC9B,IAAI,CAAC;oBAAC,GAAG,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC;gBAAC,CAAC;gBAC1C,OAAO,GAAG,EAAE,CAAC;oBACX,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;oBACrB,KAAgC,CAAC,SAAS,GAAI,GAA8B,CAAC,SAAS,IAAI,kBAAkB,CAAC;oBAC7G,KAA4B,CAAC,KAAK,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBACvF,SAAS;gBACX,CAAC;YACH,CAAC;YACD,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { LifecycleState } from './stage-plan-types.js';
|
|
2
2
|
import type { RunResult } from '../types.js';
|
|
3
|
-
export type StageName = 'implementing' | '
|
|
3
|
+
export type StageName = 'implementing' | 'review' | 'rework' | 'annotating' | 'committing';
|
|
4
4
|
interface StageDelta {
|
|
5
5
|
inputTokens: number;
|
|
6
6
|
outputTokens: number;
|
|
@@ -17,10 +17,9 @@ interface StageOptions {
|
|
|
17
17
|
tier: 'standard' | 'complex' | null;
|
|
18
18
|
model: string | null;
|
|
19
19
|
modelFamily?: string | null;
|
|
20
|
-
/** For
|
|
20
|
+
/** For the `review` stage — combined verdict from parallel spec+quality sub-reviewers. */
|
|
21
21
|
verdict?: string;
|
|
22
|
-
/**
|
|
23
|
-
* per call so multi-round chains accumulate naturally. */
|
|
22
|
+
/** Defaults to +1 per call so the wire's `roundsUsed` reflects rounds taken. */
|
|
24
23
|
roundsDelta?: number;
|
|
25
24
|
}
|
|
26
25
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-stage-stats.d.ts","sourceRoot":"","sources":["../../src/lifecycle/merge-stage-stats.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,MAAM,SAAS,GACjB,cAAc,GACd,
|
|
1
|
+
{"version":3,"file":"merge-stage-stats.d.ts","sourceRoot":"","sources":["../../src/lifecycle/merge-stage-stats.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,MAAM,SAAS,GACjB,cAAc,GACd,QAAQ,GACR,QAAQ,GACR,YAAY,GACZ,YAAY,CAAC;AAEjB,UAAU,UAAU;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,UAAU,YAAY;IACpB,IAAI,EAAE,UAAU,GAAG,SAAS,GAAG,IAAI,CAAC;IACpC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,0FAA0F;IAC1F,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gFAAgF;IAChF,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,KAAK,EAAE,cAAc,EACrB,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,UAAU,EACjB,OAAO,EAAE,YAAY,GACpB,IAAI,CAsCN;AASD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,sCAAsC,CACpD,KAAK,EAAE,cAAc,EACrB,SAAS,EAAE,SAAS,GACnB,IAAI,CAiCN"}
|