@zhixuan92/multi-model-agent-core 4.6.0 → 4.7.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 +6 -8
- package/dist/bounded-execution/activity-tracker.d.ts +1 -0
- package/dist/bounded-execution/activity-tracker.d.ts.map +1 -1
- package/dist/bounded-execution/activity-tracker.js +5 -0
- package/dist/bounded-execution/activity-tracker.js.map +1 -1
- package/dist/bounded-execution/file-artifact-check.d.ts +4 -11
- package/dist/bounded-execution/file-artifact-check.d.ts.map +1 -1
- package/dist/bounded-execution/file-artifact-check.js +7 -22
- package/dist/bounded-execution/file-artifact-check.js.map +1 -1
- package/dist/bounded-execution/progress-events-subscriber.d.ts +41 -0
- package/dist/bounded-execution/progress-events-subscriber.d.ts.map +1 -0
- package/dist/bounded-execution/progress-events-subscriber.js +53 -0
- package/dist/bounded-execution/progress-events-subscriber.js.map +1 -0
- package/dist/bounded-execution/progress-watchdog.d.ts.map +1 -1
- package/dist/bounded-execution/progress-watchdog.js +60 -27
- package/dist/bounded-execution/progress-watchdog.js.map +1 -1
- package/dist/bounded-execution/stall-watchdog.d.ts.map +1 -1
- package/dist/bounded-execution/stall-watchdog.js +29 -12
- package/dist/bounded-execution/stall-watchdog.js.map +1 -1
- package/dist/bounded-execution/wall-clock-guard.d.ts +4 -0
- package/dist/bounded-execution/wall-clock-guard.d.ts.map +1 -1
- package/dist/bounded-execution/wall-clock-guard.js +1 -1
- package/dist/bounded-execution/wall-clock-guard.js.map +1 -1
- package/dist/config/canonical-model-identity.d.ts.map +1 -1
- package/dist/config/canonical-model-identity.js.map +1 -1
- package/dist/config/config-resolver.d.ts +1 -41
- package/dist/config/config-resolver.d.ts.map +1 -1
- package/dist/config/config-resolver.js +1 -43
- package/dist/config/config-resolver.js.map +1 -1
- package/dist/config/load.d.ts +0 -2
- package/dist/config/load.d.ts.map +1 -1
- package/dist/config/load.js +0 -4
- package/dist/config/load.js.map +1 -1
- package/dist/config/model-profile-registry.d.ts.map +1 -1
- package/dist/config/model-profile-registry.js +13 -7
- package/dist/config/model-profile-registry.js.map +1 -1
- package/dist/config/schema.d.ts +1 -19
- package/dist/config/schema.d.ts.map +1 -1
- package/dist/config/schema.js +12 -38
- package/dist/config/schema.js.map +1 -1
- package/dist/error-codes.d.ts +0 -1
- package/dist/error-codes.d.ts.map +1 -1
- package/dist/error-codes.js +0 -1
- package/dist/error-codes.js.map +1 -1
- package/dist/events/cloud-events.d.ts +0 -1
- package/dist/events/cloud-events.d.ts.map +1 -1
- package/dist/events/cloud-events.js +1 -1
- package/dist/events/cloud-events.js.map +1 -1
- package/dist/events/event-builder.js +1 -2
- package/dist/events/event-builder.js.map +1 -1
- package/dist/events/event-emitter.d.ts +2 -1
- package/dist/events/event-emitter.d.ts.map +1 -1
- package/dist/events/event-emitter.js +6 -1
- package/dist/events/event-emitter.js.map +1 -1
- package/dist/events/observability-events.d.ts +0 -26
- package/dist/events/observability-events.d.ts.map +1 -1
- package/dist/events/observability-events.js +1 -11
- package/dist/events/observability-events.js.map +1 -1
- package/dist/events/telemetry-types.d.ts +0 -7
- package/dist/events/telemetry-types.d.ts.map +1 -1
- package/dist/events/telemetry-types.js +1 -1
- package/dist/events/telemetry-types.js.map +1 -1
- package/dist/index.d.ts +4 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -3
- package/dist/index.js.map +1 -1
- package/dist/intake/resolve.d.ts.map +1 -1
- package/dist/intake/resolve.js +0 -1
- package/dist/intake/resolve.js.map +1 -1
- package/dist/lifecycle/handlers/{annotator.d.ts → annotate-stage.d.ts} +1 -1
- package/dist/lifecycle/handlers/annotate-stage.d.ts.map +1 -0
- package/dist/lifecycle/handlers/{annotator.js → annotate-stage.js} +1 -1
- package/dist/lifecycle/handlers/annotate-stage.js.map +1 -0
- package/dist/lifecycle/handlers/{task-executor.d.ts → implement-stage.d.ts} +1 -1
- package/dist/lifecycle/handlers/implement-stage.d.ts.map +1 -0
- package/dist/lifecycle/handlers/{task-executor.js → implement-stage.js} +31 -2
- package/dist/lifecycle/handlers/implement-stage.js.map +1 -0
- package/dist/lifecycle/handlers/{review-handler.d.ts → review-stage.d.ts} +1 -1
- package/dist/lifecycle/handlers/review-stage.d.ts.map +1 -0
- package/dist/lifecycle/handlers/{review-handler.js → review-stage.js} +1 -1
- package/dist/lifecycle/handlers/review-stage.js.map +1 -0
- package/dist/lifecycle/handlers/{rework-handler.d.ts → rework-stage.d.ts} +1 -1
- package/dist/lifecycle/handlers/rework-stage.d.ts.map +1 -0
- package/dist/lifecycle/handlers/{rework-handler.js → rework-stage.js} +1 -1
- package/dist/lifecycle/handlers/rework-stage.js.map +1 -0
- package/dist/lifecycle/lifecycle-context.d.ts +10 -4
- package/dist/lifecycle/lifecycle-context.d.ts.map +1 -1
- package/dist/lifecycle/lifecycle-dispatcher.d.ts +1 -1
- package/dist/lifecycle/lifecycle-dispatcher.d.ts.map +1 -1
- package/dist/lifecycle/lifecycle-dispatcher.js +1 -1
- package/dist/lifecycle/lifecycle-dispatcher.js.map +1 -1
- package/dist/lifecycle/lifecycle-driver.d.ts.map +1 -1
- package/dist/lifecycle/lifecycle-driver.js +77 -2
- package/dist/lifecycle/lifecycle-driver.js.map +1 -1
- package/dist/lifecycle/normalize-output-targets.d.ts +2 -0
- package/dist/lifecycle/normalize-output-targets.d.ts.map +1 -0
- package/dist/lifecycle/normalize-output-targets.js +14 -0
- package/dist/lifecycle/normalize-output-targets.js.map +1 -0
- package/dist/lifecycle/perform-implementation.d.ts.map +1 -1
- package/dist/lifecycle/perform-implementation.js +62 -26
- package/dist/lifecycle/perform-implementation.js.map +1 -1
- package/dist/lifecycle/rework-budget.d.ts +3 -0
- package/dist/lifecycle/rework-budget.d.ts.map +1 -0
- package/dist/lifecycle/rework-budget.js +9 -0
- package/dist/lifecycle/rework-budget.js.map +1 -0
- package/dist/lifecycle/stage-io.d.ts +3 -2
- package/dist/lifecycle/stage-io.d.ts.map +1 -1
- package/dist/lifecycle/stage-io.js.map +1 -1
- package/dist/lifecycle/stage-plan-builder.js +4 -4
- package/dist/lifecycle/stage-plan-builder.js.map +1 -1
- package/dist/lifecycle/stage-plan-types.d.ts +1 -4
- package/dist/lifecycle/stage-plan-types.d.ts.map +1 -1
- package/dist/lifecycle/task-completion-summary.d.ts.map +1 -1
- package/dist/lifecycle/task-completion-summary.js +0 -1
- package/dist/lifecycle/task-completion-summary.js.map +1 -1
- package/dist/lifecycle/task-executor.d.ts.map +1 -1
- package/dist/lifecycle/task-executor.js +2 -1
- package/dist/lifecycle/task-executor.js.map +1 -1
- package/dist/lifecycle/task-runner.d.ts +5 -1
- package/dist/lifecycle/task-runner.d.ts.map +1 -1
- package/dist/lifecycle/task-runner.js +102 -46
- package/dist/lifecycle/task-runner.js.map +1 -1
- package/dist/providers/agent-resolver.d.ts.map +1 -0
- package/dist/{escalation → providers}/agent-resolver.js +1 -1
- package/dist/providers/agent-resolver.js.map +1 -0
- package/dist/providers/assemble-run-result.js +0 -2
- package/dist/providers/assemble-run-result.js.map +1 -1
- package/dist/providers/claude-session.d.ts +12 -0
- package/dist/providers/claude-session.d.ts.map +1 -1
- package/dist/providers/claude-session.js +38 -1
- package/dist/providers/claude-session.js.map +1 -1
- package/dist/providers/codex-cli-session.d.ts +16 -1
- package/dist/providers/codex-cli-session.d.ts.map +1 -1
- package/dist/providers/codex-cli-session.js +75 -6
- package/dist/providers/codex-cli-session.js.map +1 -1
- package/dist/providers/normalize-claude.js +1 -1
- package/dist/providers/normalize-claude.js.map +1 -1
- package/dist/providers/provider-factory.d.ts +8 -0
- package/dist/providers/provider-factory.d.ts.map +1 -1
- package/dist/providers/provider-factory.js +64 -3
- package/dist/providers/provider-factory.js.map +1 -1
- package/dist/providers/run-annotator-turn.d.ts.map +1 -1
- package/dist/providers/run-annotator-turn.js +2 -1
- package/dist/providers/run-annotator-turn.js.map +1 -1
- package/dist/providers/run-worker-turn.d.ts +1 -1
- package/dist/providers/run-worker-turn.d.ts.map +1 -1
- package/dist/providers/run-worker-turn.js +0 -1
- package/dist/providers/run-worker-turn.js.map +1 -1
- package/dist/providers/runner-types.d.ts +5 -6
- package/dist/providers/runner-types.d.ts.map +1 -1
- package/dist/providers/stall-detector.d.ts +1 -1
- package/dist/providers/stall-detector.d.ts.map +1 -1
- package/dist/providers/stall-detector.js +1 -1
- package/dist/providers/stall-detector.js.map +1 -1
- package/dist/reporting/derive-investigate-status.d.ts +1 -1
- package/dist/reporting/derive-investigate-status.d.ts.map +1 -1
- package/dist/reporting/headline-templates/investigate.d.ts +1 -1
- package/dist/reporting/headline-templates/investigate.d.ts.map +1 -1
- package/dist/reporting/headline-templates/research.d.ts.map +1 -1
- package/dist/reporting/headline-templates/research.js +0 -1
- package/dist/reporting/headline-templates/research.js.map +1 -1
- package/dist/reporting/terminal-status-deriver.d.ts +1 -1
- package/dist/reporting/terminal-status-deriver.d.ts.map +1 -1
- package/dist/reporting/terminal-status-deriver.js +1 -4
- package/dist/reporting/terminal-status-deriver.js.map +1 -1
- package/dist/review/run-reviewer.d.ts.map +1 -1
- package/dist/review/run-reviewer.js +4 -3
- package/dist/review/run-reviewer.js.map +1 -1
- package/dist/stores/batch-registry.d.ts +15 -1
- package/dist/stores/batch-registry.d.ts.map +1 -1
- package/dist/stores/batch-registry.js +27 -0
- package/dist/stores/batch-registry.js.map +1 -1
- package/dist/tool-surface/tool-surface-registry.d.ts +1 -1
- package/dist/tool-surface/tool-surface-registry.d.ts.map +1 -1
- package/dist/tools/audit/tool-config.d.ts.map +1 -1
- package/dist/tools/audit/tool-config.js +0 -1
- package/dist/tools/audit/tool-config.js.map +1 -1
- package/dist/tools/debug/tool-config.d.ts.map +1 -1
- package/dist/tools/debug/tool-config.js +0 -1
- package/dist/tools/debug/tool-config.js.map +1 -1
- package/dist/tools/delegate/schema.d.ts +1 -1
- package/dist/tools/delegate/schema.d.ts.map +1 -1
- package/dist/tools/delegate/schema.js +2 -1
- package/dist/tools/delegate/schema.js.map +1 -1
- package/dist/tools/delegate/tool-config.d.ts +0 -1
- package/dist/tools/delegate/tool-config.d.ts.map +1 -1
- package/dist/tools/delegate/tool-config.js +0 -2
- package/dist/tools/delegate/tool-config.js.map +1 -1
- package/dist/tools/execute-plan/schema.d.ts +1 -1
- package/dist/tools/execute-plan/schema.d.ts.map +1 -1
- package/dist/tools/execute-plan/schema.js +2 -2
- package/dist/tools/execute-plan/schema.js.map +1 -1
- package/dist/tools/execute-plan/tool-config.d.ts.map +1 -1
- package/dist/tools/execute-plan/tool-config.js +0 -1
- package/dist/tools/execute-plan/tool-config.js.map +1 -1
- package/dist/tools/investigate/tool-config.d.ts.map +1 -1
- package/dist/tools/investigate/tool-config.js +0 -1
- package/dist/tools/investigate/tool-config.js.map +1 -1
- package/dist/tools/register-context-block/tool-config.d.ts.map +1 -1
- package/dist/tools/register-context-block/tool-config.js +0 -1
- package/dist/tools/register-context-block/tool-config.js.map +1 -1
- package/dist/tools/research/tool-config.d.ts.map +1 -1
- package/dist/tools/research/tool-config.js +0 -1
- package/dist/tools/research/tool-config.js.map +1 -1
- package/dist/tools/retry/tool-config.d.ts.map +1 -1
- package/dist/tools/retry/tool-config.js +0 -1
- package/dist/tools/retry/tool-config.js.map +1 -1
- package/dist/tools/review/tool-config.d.ts.map +1 -1
- package/dist/tools/review/tool-config.js +0 -1
- package/dist/tools/review/tool-config.js.map +1 -1
- package/dist/types/config.d.ts +0 -1
- package/dist/types/config.d.ts.map +1 -1
- package/dist/types/enums.d.ts +0 -3
- package/dist/types/enums.d.ts.map +1 -1
- package/dist/types/enums.js +3 -3
- package/dist/types/enums.js.map +1 -1
- package/dist/types/run-result.d.ts +14 -1
- package/dist/types/run-result.d.ts.map +1 -1
- package/dist/types/task-spec.d.ts +1 -1
- package/dist/types/task-spec.d.ts.map +1 -1
- package/package.json +1 -1
- package/dist/bounded-execution/cost-meter.d.ts +0 -20
- package/dist/bounded-execution/cost-meter.d.ts.map +0 -1
- package/dist/bounded-execution/cost-meter.js +0 -21
- package/dist/bounded-execution/cost-meter.js.map +0 -1
- package/dist/bounded-execution/error-classifier.d.ts +0 -11
- package/dist/bounded-execution/error-classifier.d.ts.map +0 -1
- package/dist/bounded-execution/error-classifier.js +0 -23
- package/dist/bounded-execution/error-classifier.js.map +0 -1
- package/dist/bounded-execution/idle-guard.d.ts +0 -8
- package/dist/bounded-execution/idle-guard.d.ts.map +0 -1
- package/dist/bounded-execution/idle-guard.js +0 -18
- package/dist/bounded-execution/idle-guard.js.map +0 -1
- package/dist/bounded-execution/index.d.ts +0 -10
- package/dist/bounded-execution/index.d.ts.map +0 -1
- package/dist/bounded-execution/index.js +0 -11
- package/dist/bounded-execution/index.js.map +0 -1
- package/dist/bounded-execution/safety-max-turns.d.ts +0 -17
- package/dist/bounded-execution/safety-max-turns.d.ts.map +0 -1
- package/dist/bounded-execution/safety-max-turns.js +0 -17
- package/dist/bounded-execution/safety-max-turns.js.map +0 -1
- package/dist/cleanup/batch-retention-sweeper.d.ts +0 -7
- package/dist/cleanup/batch-retention-sweeper.d.ts.map +0 -1
- package/dist/cleanup/batch-retention-sweeper.js +0 -10
- package/dist/cleanup/batch-retention-sweeper.js.map +0 -1
- package/dist/cleanup/context-block-gc-sweeper.d.ts +0 -8
- package/dist/cleanup/context-block-gc-sweeper.d.ts.map +0 -1
- package/dist/cleanup/context-block-gc-sweeper.js +0 -12
- package/dist/cleanup/context-block-gc-sweeper.js.map +0 -1
- package/dist/cleanup/index.d.ts +0 -5
- package/dist/cleanup/index.d.ts.map +0 -1
- package/dist/cleanup/index.js +0 -6
- package/dist/cleanup/index.js.map +0 -1
- package/dist/cleanup/project-idle-cleanup.d.ts +0 -7
- package/dist/cleanup/project-idle-cleanup.d.ts.map +0 -1
- package/dist/cleanup/project-idle-cleanup.js +0 -15
- package/dist/cleanup/project-idle-cleanup.js.map +0 -1
- package/dist/cleanup/shutdown-coordinator.d.ts +0 -7
- package/dist/cleanup/shutdown-coordinator.d.ts.map +0 -1
- package/dist/cleanup/shutdown-coordinator.js +0 -13
- package/dist/cleanup/shutdown-coordinator.js.map +0 -1
- package/dist/config/index.d.ts +0 -8
- package/dist/config/index.d.ts.map +0 -1
- package/dist/config/index.js +0 -9
- package/dist/config/index.js.map +0 -1
- package/dist/config/pricing-table.d.ts +0 -16
- package/dist/config/pricing-table.d.ts.map +0 -1
- package/dist/config/pricing-table.js +0 -51
- package/dist/config/pricing-table.js.map +0 -1
- package/dist/escalation/agent-resolver.d.ts.map +0 -1
- package/dist/escalation/agent-resolver.js.map +0 -1
- package/dist/escalation/delegate-with-escalation.d.ts +0 -52
- package/dist/escalation/delegate-with-escalation.d.ts.map +0 -1
- package/dist/escalation/delegate-with-escalation.js +0 -201
- package/dist/escalation/delegate-with-escalation.js.map +0 -1
- package/dist/escalation/escalation-policy.d.ts +0 -18
- package/dist/escalation/escalation-policy.d.ts.map +0 -1
- package/dist/escalation/escalation-policy.js +0 -33
- package/dist/escalation/escalation-policy.js.map +0 -1
- package/dist/escalation/fallback-helpers.d.ts +0 -22
- package/dist/escalation/fallback-helpers.d.ts.map +0 -1
- package/dist/escalation/fallback-helpers.js +0 -47
- package/dist/escalation/fallback-helpers.js.map +0 -1
- package/dist/escalation/fallback-types.d.ts +0 -60
- package/dist/escalation/fallback-types.d.ts.map +0 -1
- package/dist/escalation/fallback-types.js +0 -11
- package/dist/escalation/fallback-types.js.map +0 -1
- package/dist/escalation/fallback.d.ts +0 -5
- package/dist/escalation/fallback.d.ts.map +0 -1
- package/dist/escalation/fallback.js +0 -387
- package/dist/escalation/fallback.js.map +0 -1
- package/dist/escalation/index.d.ts +0 -3
- package/dist/escalation/index.d.ts.map +0 -1
- package/dist/escalation/index.js +0 -4
- package/dist/escalation/index.js.map +0 -1
- package/dist/escalation/policy.d.ts +0 -37
- package/dist/escalation/policy.d.ts.map +0 -1
- package/dist/escalation/policy.js +0 -67
- package/dist/escalation/policy.js.map +0 -1
- package/dist/escalation/types.d.ts +0 -15
- package/dist/escalation/types.d.ts.map +0 -1
- package/dist/escalation/types.js +0 -2
- package/dist/escalation/types.js.map +0 -1
- package/dist/events/running-headline-sink.d.ts +0 -27
- package/dist/events/running-headline-sink.d.ts.map +0 -1
- package/dist/events/running-headline-sink.js +0 -156
- package/dist/events/running-headline-sink.js.map +0 -1
- package/dist/lifecycle/handlers/annotator.d.ts.map +0 -1
- package/dist/lifecycle/handlers/annotator.js.map +0 -1
- package/dist/lifecycle/handlers/review-handler.d.ts.map +0 -1
- package/dist/lifecycle/handlers/review-handler.js.map +0 -1
- package/dist/lifecycle/handlers/rework-handler.d.ts.map +0 -1
- package/dist/lifecycle/handlers/rework-handler.js.map +0 -1
- package/dist/lifecycle/handlers/task-executor.d.ts.map +0 -1
- package/dist/lifecycle/handlers/task-executor.js.map +0 -1
- package/dist/lifecycle/metadata-repair.d.ts +0 -15
- package/dist/lifecycle/metadata-repair.d.ts.map +0 -1
- package/dist/lifecycle/metadata-repair.js +0 -33
- package/dist/lifecycle/metadata-repair.js.map +0 -1
- /package/dist/{escalation → providers}/agent-resolver.d.ts +0 -0
|
@@ -28,6 +28,10 @@ import { resolveRateCard, priceTokens } from '../bounded-execution/cost-compute.
|
|
|
28
28
|
import { buildCodexCliLaunch } from './codex-cli-launch.js';
|
|
29
29
|
import { parseCodexCliEvent } from './codex-cli-event.js';
|
|
30
30
|
const SIGKILL_GRACE_MS = 3000;
|
|
31
|
+
/** Grace window during session.close() between SIGTERM and SIGKILL. Keeps
|
|
32
|
+
* task teardown bounded so the spec invariant "task done → children die"
|
|
33
|
+
* holds within 2s for normal teardown. */
|
|
34
|
+
const CLOSE_GRACE_MS = 2000;
|
|
31
35
|
function busOf(opts) {
|
|
32
36
|
const b = opts.bus;
|
|
33
37
|
return b && typeof b.emit === 'function' ? b : undefined;
|
|
@@ -37,6 +41,10 @@ export class CodexCliSession {
|
|
|
37
41
|
threadId;
|
|
38
42
|
closed = false;
|
|
39
43
|
tempDir;
|
|
44
|
+
/** Active codex CLI subprocess for the currently-running turn. Captured so
|
|
45
|
+
* close() can synchronously kill the child (SIGTERM then SIGKILL after
|
|
46
|
+
* CLOSE_GRACE_MS). Undefined between turns. */
|
|
47
|
+
activeProc;
|
|
40
48
|
cumulativeUsage = {
|
|
41
49
|
inputTokens: 0,
|
|
42
50
|
outputTokens: 0,
|
|
@@ -46,6 +54,15 @@ export class CodexCliSession {
|
|
|
46
54
|
constructor(args) {
|
|
47
55
|
this.args = args;
|
|
48
56
|
}
|
|
57
|
+
/** Returns task identity (batchId/taskIndex) from SessionOpts for event tagging.
|
|
58
|
+
* The stall watchdog filters bus events by these fields — every emit must carry them
|
|
59
|
+
* or stuck detection re-breaks under concurrent load. */
|
|
60
|
+
taskTag() {
|
|
61
|
+
return {
|
|
62
|
+
...(this.args.opts.batchId !== undefined && { batchId: this.args.opts.batchId }),
|
|
63
|
+
...(this.args.opts.taskIndex !== undefined && { taskIndex: this.args.opts.taskIndex }),
|
|
64
|
+
};
|
|
65
|
+
}
|
|
49
66
|
async send(instruction, _turnOpts) {
|
|
50
67
|
if (this.closed)
|
|
51
68
|
throw new Error('codex-cli-session: send() on closed session');
|
|
@@ -60,7 +77,8 @@ export class CodexCliSession {
|
|
|
60
77
|
...(this.threadId && { resumeSessionId: this.threadId }),
|
|
61
78
|
});
|
|
62
79
|
const bus = busOf(this.args.opts);
|
|
63
|
-
const
|
|
80
|
+
const tag = this.taskTag();
|
|
81
|
+
const tracker = new TurnTracker(this.cumulativeUsage, bus, tag);
|
|
64
82
|
bus?.emit({
|
|
65
83
|
event: 'codex_subprocess_starting',
|
|
66
84
|
ts: new Date().toISOString(),
|
|
@@ -68,6 +86,7 @@ export class CodexCliSession {
|
|
|
68
86
|
cwd: this.args.opts.cwd,
|
|
69
87
|
resume: Boolean(this.threadId),
|
|
70
88
|
...(this.threadId && { threadId: this.threadId }),
|
|
89
|
+
...tag,
|
|
71
90
|
});
|
|
72
91
|
let proc;
|
|
73
92
|
try {
|
|
@@ -97,6 +116,7 @@ export class CodexCliSession {
|
|
|
97
116
|
ts: new Date().toISOString(),
|
|
98
117
|
code: e.code ?? 'unknown',
|
|
99
118
|
message: e.message ?? String(err),
|
|
119
|
+
...tag,
|
|
100
120
|
});
|
|
101
121
|
return this.finalizeError(tracker, startMs, e.code === 'ENOENT' ? 'codex_not_installed' : 'spawn_failed', e.message ?? String(err));
|
|
102
122
|
}
|
|
@@ -104,7 +124,9 @@ export class CodexCliSession {
|
|
|
104
124
|
event: 'codex_subprocess_started',
|
|
105
125
|
ts: new Date().toISOString(),
|
|
106
126
|
pid: proc.pid ?? -1,
|
|
127
|
+
...tag,
|
|
107
128
|
});
|
|
129
|
+
this.activeProc = proc;
|
|
108
130
|
proc.stdin?.write(instruction);
|
|
109
131
|
proc.stdin?.end();
|
|
110
132
|
const cleanupGuards = this.armGuards(proc, tracker);
|
|
@@ -114,6 +136,7 @@ export class CodexCliSession {
|
|
|
114
136
|
}
|
|
115
137
|
finally {
|
|
116
138
|
cleanupGuards();
|
|
139
|
+
this.activeProc = undefined;
|
|
117
140
|
}
|
|
118
141
|
if (tracker.threadId)
|
|
119
142
|
this.threadId = tracker.threadId;
|
|
@@ -125,6 +148,8 @@ export class CodexCliSession {
|
|
|
125
148
|
terminationReason: tracker.terminationReason,
|
|
126
149
|
...(tracker.errorCode && { errorCode: tracker.errorCode }),
|
|
127
150
|
...(stderrBufRef.value && { stderrTail: stderrBufRef.value.slice(-500) }),
|
|
151
|
+
...(proc.pid !== undefined && { pid: proc.pid }),
|
|
152
|
+
...tag,
|
|
128
153
|
});
|
|
129
154
|
const finalMessage = tracker.lastAgentMessage || await readOutputFile(outputFile);
|
|
130
155
|
const turnUsage = tracker.flushUsageDelta();
|
|
@@ -154,12 +179,49 @@ export class CodexCliSession {
|
|
|
154
179
|
if (this.closed)
|
|
155
180
|
return;
|
|
156
181
|
this.closed = true;
|
|
182
|
+
const proc = this.activeProc;
|
|
183
|
+
this.activeProc = undefined;
|
|
184
|
+
// Synchronous child termination guarantee: SIGTERM, then SIGKILL after
|
|
185
|
+
// CLOSE_GRACE_MS if still alive. Without this, close() leaked codex
|
|
186
|
+
// children — see 2026-05-16 leak post-mortem.
|
|
187
|
+
if (proc && proc.exitCode === null && !proc.killed) {
|
|
188
|
+
try {
|
|
189
|
+
killGracefully(proc);
|
|
190
|
+
}
|
|
191
|
+
catch { /* ignore */ }
|
|
192
|
+
await new Promise((resolve) => {
|
|
193
|
+
let settled = false;
|
|
194
|
+
const settle = () => { if (!settled) {
|
|
195
|
+
settled = true;
|
|
196
|
+
clearTimeout(t);
|
|
197
|
+
resolve();
|
|
198
|
+
} };
|
|
199
|
+
proc.once('exit', settle);
|
|
200
|
+
const t = setTimeout(() => {
|
|
201
|
+
if (settled)
|
|
202
|
+
return;
|
|
203
|
+
try {
|
|
204
|
+
// SIGKILL the whole process group (proc was spawned detached).
|
|
205
|
+
if (typeof proc.pid === 'number')
|
|
206
|
+
process.kill(-proc.pid, 'SIGKILL');
|
|
207
|
+
}
|
|
208
|
+
catch { /* ignore */ }
|
|
209
|
+
settle();
|
|
210
|
+
}, CLOSE_GRACE_MS);
|
|
211
|
+
t.unref();
|
|
212
|
+
});
|
|
213
|
+
}
|
|
157
214
|
if (this.tempDir) {
|
|
158
215
|
const dir = this.tempDir;
|
|
159
216
|
this.tempDir = undefined;
|
|
160
217
|
await rm(dir, { recursive: true, force: true }).catch(() => { });
|
|
161
218
|
}
|
|
162
219
|
}
|
|
220
|
+
/** OS pid of the currently-active codex CLI subprocess, if any. Undefined
|
|
221
|
+
* between turns. Used by shutdown drain to SIGKILL stragglers. */
|
|
222
|
+
getPid() {
|
|
223
|
+
return this.activeProc?.pid;
|
|
224
|
+
}
|
|
163
225
|
armGuards(proc, tracker) {
|
|
164
226
|
const onAbort = () => {
|
|
165
227
|
if (tracker.terminationReason === 'ok') {
|
|
@@ -300,6 +362,7 @@ function killGracefully(proc) {
|
|
|
300
362
|
class TurnTracker {
|
|
301
363
|
cumulative;
|
|
302
364
|
bus;
|
|
365
|
+
tag;
|
|
303
366
|
threadId;
|
|
304
367
|
turns = 0;
|
|
305
368
|
lastAgentMessage = '';
|
|
@@ -310,9 +373,10 @@ class TurnTracker {
|
|
|
310
373
|
errorCode;
|
|
311
374
|
errorMessage;
|
|
312
375
|
snapshot;
|
|
313
|
-
constructor(cumulative, bus) {
|
|
376
|
+
constructor(cumulative, bus, tag = {}) {
|
|
314
377
|
this.cumulative = cumulative;
|
|
315
378
|
this.bus = bus;
|
|
379
|
+
this.tag = tag;
|
|
316
380
|
this.snapshot = { ...cumulative };
|
|
317
381
|
}
|
|
318
382
|
consume(ev) {
|
|
@@ -321,11 +385,11 @@ class TurnTracker {
|
|
|
321
385
|
case 'thread_started':
|
|
322
386
|
if (ev.threadId)
|
|
323
387
|
this.threadId = ev.threadId;
|
|
324
|
-
this.bus?.emit({ event: 'codex_thread_started', ts, threadId: ev.threadId });
|
|
388
|
+
this.bus?.emit({ event: 'codex_thread_started', ts, threadId: ev.threadId, ...this.tag });
|
|
325
389
|
break;
|
|
326
390
|
case 'turn_started':
|
|
327
391
|
this.turns += 1;
|
|
328
|
-
this.bus?.emit({ event: 'codex_turn_started', ts, turn: this.turns });
|
|
392
|
+
this.bus?.emit({ event: 'codex_turn_started', ts, turn: this.turns, ...this.tag });
|
|
329
393
|
break;
|
|
330
394
|
case 'item_started':
|
|
331
395
|
if (ev.item.type === 'command_execution') {
|
|
@@ -333,6 +397,7 @@ class TurnTracker {
|
|
|
333
397
|
event: 'codex_command_started',
|
|
334
398
|
ts,
|
|
335
399
|
command: String(ev.item.command ?? '').slice(0, 500),
|
|
400
|
+
...this.tag,
|
|
336
401
|
});
|
|
337
402
|
}
|
|
338
403
|
break;
|
|
@@ -348,6 +413,7 @@ class TurnTracker {
|
|
|
348
413
|
inputTokens: ev.usage.input_tokens ?? 0,
|
|
349
414
|
outputTokens: (ev.usage.output_tokens ?? 0) + (ev.usage.reasoning_output_tokens ?? 0),
|
|
350
415
|
cachedInputTokens: ev.usage.cached_input_tokens ?? 0,
|
|
416
|
+
...this.tag,
|
|
351
417
|
});
|
|
352
418
|
break;
|
|
353
419
|
case 'turn_failed':
|
|
@@ -356,7 +422,7 @@ class TurnTracker {
|
|
|
356
422
|
this.errorCode = 'turn_failed';
|
|
357
423
|
this.errorMessage = ev.error.message;
|
|
358
424
|
}
|
|
359
|
-
this.bus?.emit({ event: 'codex_turn_failed', ts, message: ev.error.message });
|
|
425
|
+
this.bus?.emit({ event: 'codex_turn_failed', ts, message: ev.error.message, ...this.tag });
|
|
360
426
|
break;
|
|
361
427
|
case 'error':
|
|
362
428
|
if (this.terminationReason === 'ok') {
|
|
@@ -364,7 +430,7 @@ class TurnTracker {
|
|
|
364
430
|
this.errorCode = 'codex_error';
|
|
365
431
|
this.errorMessage = ev.message;
|
|
366
432
|
}
|
|
367
|
-
this.bus?.emit({ event: 'codex_error', ts, message: ev.message });
|
|
433
|
+
this.bus?.emit({ event: 'codex_error', ts, message: ev.message, ...this.tag });
|
|
368
434
|
break;
|
|
369
435
|
default:
|
|
370
436
|
break;
|
|
@@ -379,6 +445,7 @@ class TurnTracker {
|
|
|
379
445
|
ts,
|
|
380
446
|
chars: item.text.length,
|
|
381
447
|
preview: item.text.slice(0, 200),
|
|
448
|
+
...this.tag,
|
|
382
449
|
});
|
|
383
450
|
}
|
|
384
451
|
else if (item.type === 'command_execution') {
|
|
@@ -388,6 +455,7 @@ class TurnTracker {
|
|
|
388
455
|
ts,
|
|
389
456
|
command: String(item.command ?? '').slice(0, 500),
|
|
390
457
|
exitCode: item.exit_code ?? null,
|
|
458
|
+
...this.tag,
|
|
391
459
|
});
|
|
392
460
|
}
|
|
393
461
|
else if (item.type === 'file_change') {
|
|
@@ -398,6 +466,7 @@ class TurnTracker {
|
|
|
398
466
|
event: 'codex_file_change',
|
|
399
467
|
ts,
|
|
400
468
|
...(typeof item.path === 'string' && { path: item.path }),
|
|
469
|
+
...this.tag,
|
|
401
470
|
});
|
|
402
471
|
}
|
|
403
472
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-cli-session.js","sourceRoot":"","sources":["../../src/providers/codex-cli-session.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"codex-cli-session.js","sourceRoot":"","sources":["../../src/providers/codex-cli-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,7 +55,7 @@ export function normalizeClaudeTurn(events, args) {
|
|
|
55
55
|
errorCode = 'sdk_max_turns';
|
|
56
56
|
}
|
|
57
57
|
else if (subtype === 'error_max_budget_usd') {
|
|
58
|
-
sdkTermination = '
|
|
58
|
+
sdkTermination = 'error';
|
|
59
59
|
errorCode = 'sdk_max_budget';
|
|
60
60
|
}
|
|
61
61
|
else if (subtype === 'error_during_execution') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-claude.js","sourceRoot":"","sources":["../../src/providers/normalize-claude.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"normalize-claude.js","sourceRoot":"","sources":["../../src/providers/normalize-claude.ts"],"names":[],"mappings":"AAAA,sEAAsE;AACtE,EAAE;AACF,yEAAyE;AACzE,wEAAwE;AACxE,0DAA0D;AAK1D,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AACrD,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC;AAE5D,MAAM,UAAU,mBAAmB,CACjC,MAAoB,EACpB,IAQC;IAED,IAAI,UAAU,GAAG,EAAE,CAAC;IACpB,MAAM,KAAK,GAAe,EAAE,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,mBAAmB,EAAE,CAAC,EAAE,CAAC;IAC3G,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;IACvC,MAAM,eAAe,GAA2B,EAAE,CAAC;IACnD,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,cAAc,GAAoC,IAAI,CAAC;IAC3D,IAAI,SAA6B,CAAC;IAClC,IAAI,YAAgC,CAAC;IAErC,KAAK,MAAM,EAAE,IAAI,MAAM,EAAE,CAAC;QACxB,IAAI,EAAE,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YAC5B,MAAM,MAAM,GAAK,EAAE,CAAC,OAA+F,EAAE,OAAO,IAAI,EAAE,CAAC;YACnI,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;gBACvB,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM;oBAAE,UAAU,IAAK,CAAuB,CAAC,IAAI,IAAI,EAAE,CAAC;gBACzE,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;oBAC1B,MAAM,IAAI,GAAG,CAAE,CAAuB,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC;oBAC1D,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;oBACzD,MAAM,KAAK,GAAI,CAA0D,CAAC,KAAK,CAAC;oBAChF,MAAM,IAAI,GAAG,KAAK,EAAE,SAAS,IAAI,KAAK,EAAE,OAAO,CAAC;oBAChD,IAAI,IAAI,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC;wBAAE,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBACtD,IAAI,IAAI,IAAI,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC;wBAAE,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAC5D,CAAC;YACH,CAAC;YACD,KAAK,IAAI,CAAC,CAAC;QACb,CAAC;aAAM,IAAI,EAAE,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAChC,MAAM,CAAC,GAAI,EAA4I,CAAC,KAAK,CAAC;YAC9J,IAAI,CAAC,EAAE,CAAC;gBACN,KAAK,CAAC,WAAW,IAAI,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC;gBACzC,KAAK,CAAC,YAAY,IAAI,CAAC,CAAC,aAAa,IAAI,CAAC,CAAC;gBAC3C,KAAK,CAAC,gBAAgB,IAAI,CAAC,CAAC,uBAAuB,IAAI,CAAC,CAAC;gBACzD,KAAK,CAAC,mBAAmB,IAAI,CAAC,CAAC,2BAA2B,IAAI,CAAC,CAAC;YAClE,CAAC;YACD,MAAM,OAAO,GAAI,EAA0B,CAAC,OAAO,CAAC;YACpD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;gBAC1B,cAAc,GAAG,IAAI,CAAC;gBACtB,yEAAyE;gBACzE,MAAM,SAAS,GAAI,EAA0B,CAAC,MAAM,CAAC;gBACrD,IAAI,SAAS,IAAI,CAAC,UAAU;oBAAE,UAAU,GAAG,SAAS,CAAC;YACvD,CAAC;iBAAM,IAAI,OAAO,KAAK,iBAAiB,EAAE,CAAC;gBACzC,cAAc,GAAG,OAAO,CAAC;gBAAC,SAAS,GAAG,eAAe,CAAC;YACxD,CAAC;iBAAM,IAAI,OAAO,KAAK,sBAAsB,EAAE,CAAC;gBAC9C,cAAc,GAAG,OAAO,CAAC;gBAAC,SAAS,GAAG,gBAAgB,CAAC;YACzD,CAAC;iBAAM,IAAI,OAAO,KAAK,wBAAwB,EAAE,CAAC;gBAChD,cAAc,GAAG,OAAO,CAAC;gBAAC,SAAS,GAAG,qBAAqB,CAAC;gBAC5D,MAAM,IAAI,GAAI,EAA4B,CAAC,MAAM,CAAC;gBAClD,IAAI,IAAI,EAAE,MAAM;oBAAE,YAAY,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YAC3C,CAAC;iBAAM,IAAI,OAAO,KAAK,qCAAqC,EAAE,CAAC;gBAC7D,cAAc,GAAG,OAAO,CAAC;gBAAC,SAAS,GAAG,mCAAmC,CAAC;YAC5E,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,sBAAsB,IAAI,cAAc,CAAC;IACvE,OAAO;QACL,MAAM,EAAE,UAAU;QAClB,KAAK;QACL,SAAS,EAAE,CAAC,GAAG,SAAS,CAAC;QACzB,YAAY,EAAE,CAAC,GAAG,YAAY,CAAC;QAC/B,eAAe;QACf,KAAK;QACL,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,iBAAiB,EAAE,gBAAgB;QACnC,GAAG,CAAC,SAAS,IAAI,EAAE,SAAS,EAAE,CAAC;QAC/B,GAAG,CAAC,YAAY,IAAI,EAAE,YAAY,EAAE,CAAC;QACrC,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC;KACzC,CAAC;AACJ,CAAC"}
|
|
@@ -1,4 +1,12 @@
|
|
|
1
1
|
import type { AgentType, Provider, MultiModelConfig } from '../types.js';
|
|
2
|
+
/** Test-only — number of currently-live CLI children. */
|
|
3
|
+
export declare function __liveChildren(): number;
|
|
4
|
+
/** Test-only — process-wide safety ceiling. */
|
|
5
|
+
export declare function __safetyCeiling(): number;
|
|
6
|
+
export declare class SafetyCeilingExceededError extends Error {
|
|
7
|
+
readonly code = "safety_ceiling_exceeded";
|
|
8
|
+
constructor(current: number, ceiling: number);
|
|
9
|
+
}
|
|
2
10
|
export declare function __setCoreTestProviderOverride(provider: Provider | null): void;
|
|
3
11
|
export declare function __setCoreTestProviderOverrideMap(map: Map<AgentType, Provider> | null): void;
|
|
4
12
|
export declare function createProvider(slot: AgentType, config: MultiModelConfig): Provider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-factory.d.ts","sourceRoot":"","sources":["../../src/providers/provider-factory.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,SAAS,EAAE,QAAQ,EAAE,gBAAgB,EACtC,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"provider-factory.d.ts","sourceRoot":"","sources":["../../src/providers/provider-factory.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,SAAS,EAAE,QAAQ,EAAE,gBAAgB,EACtC,MAAM,aAAa,CAAC;AAoBrB,yDAAyD;AACzD,wBAAgB,cAAc,IAAI,MAAM,CAAyB;AACjE,+CAA+C;AAC/C,wBAAgB,eAAe,IAAI,MAAM,CAA2B;AAEpE,qBAAa,0BAA2B,SAAQ,KAAK;IACnD,QAAQ,CAAC,IAAI,6BAA6B;gBAC9B,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAG7C;AA0CD,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI,CAG7E;AAED,wBAAgB,gCAAgC,CAAC,GAAG,EAAE,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,IAAI,GAAG,IAAI,CAG3F;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,gBAAgB,GAAG,QAAQ,CA4ClF"}
|
|
@@ -5,6 +5,67 @@ import { makeClaudeProvider } from './claude.js';
|
|
|
5
5
|
import { makeCodexProvider } from './codex.js';
|
|
6
6
|
let coreTestProviderOverride = null;
|
|
7
7
|
let coreTestProviderOverrideMap = null;
|
|
8
|
+
// ─── Safety ceiling ────────────────────────────────────────────────────────
|
|
9
|
+
// Process-wide counter of live CLI children (codex + claude combined). When
|
|
10
|
+
// the count would exceed SAFETY_CEILING, openSession refuses with
|
|
11
|
+
// safety_ceiling_exceeded. This is a "should never happen" guard — the per-
|
|
12
|
+
// task close-on-end invariant + stuck-detection watchdog should keep us far
|
|
13
|
+
// below this in normal operation. Capped at 100 children → up to 50
|
|
14
|
+
// concurrent tasks (each task uses ≤2 sessions: 1 standard + 1 complex).
|
|
15
|
+
//
|
|
16
|
+
const SAFETY_CEILING = 100;
|
|
17
|
+
let liveChildren = 0;
|
|
18
|
+
/** Test-only — number of currently-live CLI children. */
|
|
19
|
+
export function __liveChildren() { return liveChildren; }
|
|
20
|
+
/** Test-only — process-wide safety ceiling. */
|
|
21
|
+
export function __safetyCeiling() { return SAFETY_CEILING; }
|
|
22
|
+
export class SafetyCeilingExceededError extends Error {
|
|
23
|
+
code = 'safety_ceiling_exceeded';
|
|
24
|
+
constructor(current, ceiling) {
|
|
25
|
+
super(`safety_ceiling_exceeded: liveChildren=${current} ceiling=${ceiling}`);
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
function wrapWithSafetyCeiling(p) {
|
|
29
|
+
return {
|
|
30
|
+
name: p.name,
|
|
31
|
+
config: p.config,
|
|
32
|
+
openSession(opts) {
|
|
33
|
+
if (liveChildren >= SAFETY_CEILING) {
|
|
34
|
+
// Bus may not be available — emit through opts.bus if present.
|
|
35
|
+
const bus = opts.bus;
|
|
36
|
+
bus?.emit?.({
|
|
37
|
+
event: 'safety_ceiling_hit',
|
|
38
|
+
ts: new Date().toISOString(),
|
|
39
|
+
severity: 'error',
|
|
40
|
+
liveChildren,
|
|
41
|
+
ceiling: SAFETY_CEILING,
|
|
42
|
+
...(opts.batchId !== undefined && { batchId: opts.batchId }),
|
|
43
|
+
...(opts.taskIndex !== undefined && { taskIndex: opts.taskIndex }),
|
|
44
|
+
});
|
|
45
|
+
throw new SafetyCeilingExceededError(liveChildren, SAFETY_CEILING);
|
|
46
|
+
}
|
|
47
|
+
liveChildren++;
|
|
48
|
+
const inner = p.openSession(opts);
|
|
49
|
+
let decremented = false;
|
|
50
|
+
const dec = () => { if (!decremented) {
|
|
51
|
+
decremented = true;
|
|
52
|
+
liveChildren--;
|
|
53
|
+
} };
|
|
54
|
+
return {
|
|
55
|
+
send: inner.send.bind(inner),
|
|
56
|
+
async close() {
|
|
57
|
+
try {
|
|
58
|
+
await inner.close();
|
|
59
|
+
}
|
|
60
|
+
finally {
|
|
61
|
+
dec();
|
|
62
|
+
}
|
|
63
|
+
},
|
|
64
|
+
...(inner.getPid && { getPid: inner.getPid.bind(inner) }),
|
|
65
|
+
};
|
|
66
|
+
},
|
|
67
|
+
};
|
|
68
|
+
}
|
|
8
69
|
function assertTestProviderEnabled() {
|
|
9
70
|
if (process.env.MMAGENT_TEST_PROVIDER_OVERRIDE !== '1') {
|
|
10
71
|
throw new Error('MMAGENT_TEST_PROVIDER_OVERRIDE must be set to 1 to use the test provider override');
|
|
@@ -20,9 +81,9 @@ export function __setCoreTestProviderOverrideMap(map) {
|
|
|
20
81
|
}
|
|
21
82
|
export function createProvider(slot, config) {
|
|
22
83
|
if (coreTestProviderOverrideMap?.has(slot))
|
|
23
|
-
return coreTestProviderOverrideMap.get(slot);
|
|
84
|
+
return wrapWithSafetyCeiling(coreTestProviderOverrideMap.get(slot));
|
|
24
85
|
if (coreTestProviderOverride)
|
|
25
|
-
return coreTestProviderOverride;
|
|
86
|
+
return wrapWithSafetyCeiling(coreTestProviderOverride);
|
|
26
87
|
const agentConfig = config.agents[slot];
|
|
27
88
|
if (!agentConfig) {
|
|
28
89
|
throw new Error(`Unknown agent slot: "${slot}". Config must have "standard" and "complex".`);
|
|
@@ -58,6 +119,6 @@ export function createProvider(slot, config) {
|
|
|
58
119
|
}
|
|
59
120
|
// Preserve the legacy convention: `name = slot` (not `<provider>:<model>`)
|
|
60
121
|
// so existing call sites (e.g., `p.name === 'standard'`) keep working.
|
|
61
|
-
return { ...provider, name: slot };
|
|
122
|
+
return wrapWithSafetyCeiling({ ...provider, name: slot });
|
|
62
123
|
}
|
|
63
124
|
//# sourceMappingURL=provider-factory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-factory.js","sourceRoot":"","sources":["../../src/providers/provider-factory.ts"],"names":[],"mappings":"AAAA,yEAAyE;AACzE,2EAA2E;AAC3E,iEAAiE;
|
|
1
|
+
{"version":3,"file":"provider-factory.js","sourceRoot":"","sources":["../../src/providers/provider-factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-annotator-turn.d.ts","sourceRoot":"","sources":["../../src/providers/run-annotator-turn.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"run-annotator-turn.d.ts","sourceRoot":"","sources":["../../src/providers/run-annotator-turn.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAG1E,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,gBAAgB,CAAC;IACtB,IAAI,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAC1B;IACE,IAAI,EAAE,IAAI,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;CAC7B,GACD;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC;AAK7D,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA0B5F"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
// Used by the annotator handler when the LLM judge layer is enabled
|
|
6
6
|
// (config.enableLLMAnnotate / default-on path); falls back to the
|
|
7
7
|
// deterministic parser when this helper returns transport_error.
|
|
8
|
+
import { HUMAN_LABEL } from '../lifecycle/stage-labels.js';
|
|
8
9
|
const TRANSPORT_RETRY_RE = /transport|network|5\d\d|timeout|ECONNREFUSED|ECONNRESET|EAI_AGAIN|ETIMEDOUT|fetch failed/i;
|
|
9
10
|
const BACKOFF_MS = [0, 1000, 2000];
|
|
10
11
|
export async function runAnnotatorTurn(input) {
|
|
@@ -15,7 +16,7 @@ export async function runAnnotatorTurn(input) {
|
|
|
15
16
|
await sleep(BACKOFF_MS[attempt]);
|
|
16
17
|
try {
|
|
17
18
|
const session = input.ctx.getSession(input.tier ?? 'standard');
|
|
18
|
-
const turn = await session.send(input.prompt, { stageLabel:
|
|
19
|
+
const turn = await session.send(input.prompt, { stageLabel: HUMAN_LABEL.annotating });
|
|
19
20
|
return {
|
|
20
21
|
kind: 'ok',
|
|
21
22
|
text: turn.output ?? '',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-annotator-turn.js","sourceRoot":"","sources":["../../src/providers/run-annotator-turn.ts"],"names":[],"mappings":"AAAA,oDAAoD;AACpD,EAAE;AACF,yEAAyE;AACzE,kEAAkE;AAClE,oEAAoE;AACpE,kEAAkE;AAClE,iEAAiE;
|
|
1
|
+
{"version":3,"file":"run-annotator-turn.js","sourceRoot":"","sources":["../../src/providers/run-annotator-turn.ts"],"names":[],"mappings":"AAAA,oDAAoD;AACpD,EAAE;AACF,yEAAyE;AACzE,kEAAkE;AAClE,oEAAoE;AACpE,kEAAkE;AAClE,iEAAiE;AAGjE,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAuB3D,MAAM,kBAAkB,GAAG,2FAA2F,CAAC;AACvH,MAAM,UAAU,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAEnC,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,KAAwB;IAC7D,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACtB,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC;QAC7D,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC;YAAE,MAAM,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;QAC9D,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,IAAI,UAAU,CAAC,CAAC;YAC/D,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,UAAU,EAAE,CAAC,CAAC;YACtF,OAAO;gBACL,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,IAAI,CAAC,MAAM,IAAI,EAAE;gBACvB,OAAO,EAAE,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;gBAC/D,SAAS,EAAE,IAAI,CAAC,KAAK,IAAI,CAAC;gBAC1B,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE;gBACnB,KAAK,EAAE,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;gBACzD,WAAW,EAAE,IAAI,CAAC,KAAK,EAAE,WAAW,IAAI,CAAC;gBACzC,YAAY,EAAE,IAAI,CAAC,KAAK,EAAE,YAAY,IAAI,CAAC;gBAC3C,gBAAgB,EAAE,IAAI,CAAC,KAAK,EAAE,gBAAgB,IAAI,CAAC;gBACnD,mBAAmB,EAAE,IAAI,CAAC,KAAK,EAAE,mBAAmB,IAAI,CAAC;aAC1D,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC3D,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC;gBAAE,MAAM,CAAU,6BAA6B;QACtF,CAAC;IACH,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAO,IAAI,uBAAuB,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC;AACvG,CAAC;AAED,SAAS,KAAK,CAAC,EAAU;IACvB,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AAC7C,CAAC"}
|
|
@@ -14,7 +14,7 @@ export type WorkerTurnResult = {
|
|
|
14
14
|
text: string;
|
|
15
15
|
costUSD: number;
|
|
16
16
|
turnsUsed: number;
|
|
17
|
-
stopReason: 'normal' | 'turn_cap' | '
|
|
17
|
+
stopReason: 'normal' | 'turn_cap' | 'timeout';
|
|
18
18
|
} | {
|
|
19
19
|
kind: 'transport_error';
|
|
20
20
|
message: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-worker-turn.d.ts","sourceRoot":"","sources":["../../src/providers/run-worker-turn.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,gBAAgB,CAAC;IACzB,GAAG,EAAE,gBAAgB,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,uFAAuF;IACvF,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GACxB;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,QAAQ,GAAG,UAAU,GAAG,
|
|
1
|
+
{"version":3,"file":"run-worker-turn.d.ts","sourceRoot":"","sources":["../../src/providers/run-worker-turn.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,gBAAgB,CAAC;IACzB,GAAG,EAAE,gBAAgB,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,uFAAuF;IACvF,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GACxB;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS,CAAA;CAAE,GAC/G;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC5C;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAwBhD,wBAAsB,aAAa,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAyBrF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-worker-turn.js","sourceRoot":"","sources":["../../src/providers/run-worker-turn.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAC9E,8BAA8B;AAoB9B,MAAM,yBAAyB,GAAG;IAChC,8BAA8B;IAC9B,oDAAoD;IACpD,+DAA+D;IAC/D,sDAAsD;IACtD,EAAE;IACF,gCAAgC;IAChC,qEAAqE;IACrE,SAAS;IACT,GAAG;IACH,sCAAsC;IACtC,8CAA8C;IAC9C,6CAA6C;IAC7C,2CAA2C;IAC3C,uBAAuB;IACvB,iDAAiD;IACjD,gEAAgE;IAChE,+BAA+B;IAC/B,GAAG;IACH,KAAK;CACN,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,KAAsB;IACxD,IAAI,CAAC;QACH,MAAM,YAAY,GAAI,KAAK,CAAC,IAAkC,CAAC,YAAY,IAAI,EAAE,CAAC;QAClF,MAAM,WAAW,GAAI,KAAK,CAAC,IAAiC,CAAC,WAAW,IAAI,EAAE,CAAC;QAC/E,MAAM,IAAI,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,OAAO,WAAW,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;QACzF,MAAM,WAAW,GAAG,IAAI,GAAG,yBAAyB,CAAC;QAErD,MAAM,MAAM,GAAG,KAAK,CAAC,cAAc,IAAI,WAAW,CAAC;QACnD,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAC7D,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAExC,MAAM,SAAS,GAAG,IAAyF,CAAC;QAE5G,OAAO;YACL,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,SAAS,CAAC,MAAM,IAAI,EAAE;YAC5B,OAAO,EAAE,SAAS,CAAC,OAAO,IAAI,CAAC;YAC/B,SAAS,EAAE,SAAS,CAAC,KAAK,IAAI,CAAC;YAC/B,UAAU,EAAE,aAAa,CAAC,SAAS,CAAC,iBAAiB,CAAC;SACvD,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7D,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC;YAAE,OAAO,EAAE,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;QAClF,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;IACnD,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,CAAU;IAC/B,QAAQ,CAAC,EAAE,CAAC;QACV,KAAK,IAAI,CAAC,CAAC,OAAO,QAAQ,CAAC;QAC3B,KAAK,eAAe,CAAC,CAAC,OAAO,UAAU,CAAC;QACxC,KAAK,eAAe,CAAC,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"run-worker-turn.js","sourceRoot":"","sources":["../../src/providers/run-worker-turn.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAC9E,8BAA8B;AAoB9B,MAAM,yBAAyB,GAAG;IAChC,8BAA8B;IAC9B,oDAAoD;IACpD,+DAA+D;IAC/D,sDAAsD;IACtD,EAAE;IACF,gCAAgC;IAChC,qEAAqE;IACrE,SAAS;IACT,GAAG;IACH,sCAAsC;IACtC,8CAA8C;IAC9C,6CAA6C;IAC7C,2CAA2C;IAC3C,uBAAuB;IACvB,iDAAiD;IACjD,gEAAgE;IAChE,+BAA+B;IAC/B,GAAG;IACH,KAAK;CACN,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,KAAsB;IACxD,IAAI,CAAC;QACH,MAAM,YAAY,GAAI,KAAK,CAAC,IAAkC,CAAC,YAAY,IAAI,EAAE,CAAC;QAClF,MAAM,WAAW,GAAI,KAAK,CAAC,IAAiC,CAAC,WAAW,IAAI,EAAE,CAAC;QAC/E,MAAM,IAAI,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,OAAO,WAAW,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;QACzF,MAAM,WAAW,GAAG,IAAI,GAAG,yBAAyB,CAAC;QAErD,MAAM,MAAM,GAAG,KAAK,CAAC,cAAc,IAAI,WAAW,CAAC;QACnD,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAC7D,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAExC,MAAM,SAAS,GAAG,IAAyF,CAAC;QAE5G,OAAO;YACL,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,SAAS,CAAC,MAAM,IAAI,EAAE;YAC5B,OAAO,EAAE,SAAS,CAAC,OAAO,IAAI,CAAC;YAC/B,SAAS,EAAE,SAAS,CAAC,KAAK,IAAI,CAAC;YAC/B,UAAU,EAAE,aAAa,CAAC,SAAS,CAAC,iBAAiB,CAAC;SACvD,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7D,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC;YAAE,OAAO,EAAE,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;QAClF,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;IACnD,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,CAAU;IAC/B,QAAQ,CAAC,EAAE,CAAC;QACV,KAAK,IAAI,CAAC,CAAC,OAAO,QAAQ,CAAC;QAC3B,KAAK,eAAe,CAAC,CAAC,OAAO,UAAU,CAAC;QACxC,KAAK,eAAe,CAAC,CAAC,OAAO,SAAS,CAAC;QACvC,OAAO,CAAC,CAAC,OAAO,QAAQ,CAAC;IAC3B,CAAC;AACH,CAAC"}
|
|
@@ -2,7 +2,7 @@ import type { ContextBlockStore } from '../stores/context-block-tool.js';
|
|
|
2
2
|
import type { AgentType, Effort, FormatConstraints, SandboxPolicy, TaskSpec, ToolMode } from '../types.js';
|
|
3
3
|
import type { ResearchToolDefinition } from '../research/types.js';
|
|
4
4
|
import type { EventEmitter } from '../events/event-emitter.js';
|
|
5
|
-
export type RunStatus = 'ok' | 'incomplete' | 'timeout' | 'api_aborted' | 'api_error' | 'provider_transport_failure' | 'error' | 'brief_too_vague' | '
|
|
5
|
+
export type RunStatus = 'ok' | 'incomplete' | 'timeout' | 'api_aborted' | 'api_error' | 'provider_transport_failure' | 'error' | 'brief_too_vague' | 'unavailable';
|
|
6
6
|
/** Canonical 4-field token-count shape. reasoningTokens are summed into
|
|
7
7
|
* outputTokens by each runner before emitting. totalTokens, cachedTokens,
|
|
8
8
|
* and per-provider breakdowns are computed on demand — they are not stored.
|
|
@@ -40,7 +40,7 @@ export interface CostBreakdown {
|
|
|
40
40
|
export interface TerminationReason {
|
|
41
41
|
/** Why the task stopped. 'finished' means the worker returned normally — check
|
|
42
42
|
* workerSelfAssessment for the worker's own view of completion. */
|
|
43
|
-
cause: 'finished' | 'incomplete' | 'timeout' | '
|
|
43
|
+
cause: 'finished' | 'incomplete' | 'timeout' | 'time_ceiling' | 'degenerate_exhausted' | 'api_error' | 'provider_transport_failure' | 'api_aborted' | 'brief_too_vague' | 'error';
|
|
44
44
|
turnsUsed: number;
|
|
45
45
|
hasFileArtifacts: boolean;
|
|
46
46
|
usedShell: boolean;
|
|
@@ -86,7 +86,6 @@ export interface RunOptions {
|
|
|
86
86
|
sha256: string;
|
|
87
87
|
}) => void;
|
|
88
88
|
mainModel?: string;
|
|
89
|
-
maxCostUSD?: number;
|
|
90
89
|
formatConstraints?: FormatConstraints;
|
|
91
90
|
/** External abort signal — when fired, the runner force-salvages and
|
|
92
91
|
* returns a `timeout` result via the same path as the per-call timeout.
|
|
@@ -112,9 +111,9 @@ export interface RunOptions {
|
|
|
112
111
|
cacheableSystemPrompt?: boolean;
|
|
113
112
|
};
|
|
114
113
|
/** Bus for emitting per-turn / per-runner-call observability events. When
|
|
115
|
-
* present, the runner
|
|
116
|
-
* `
|
|
117
|
-
*
|
|
114
|
+
* present, the runner + adapter emit provider-specific events (e.g.
|
|
115
|
+
* `claude_turn_started`, `claude_turn_completed`) that the server's
|
|
116
|
+
* VerboseLogChannel + LocalLogSink + TelemetrySink consume. */
|
|
118
117
|
bus?: EventEmitter;
|
|
119
118
|
/** Identifies the in-flight batch in emitted runner events. Plumbed
|
|
120
119
|
* through delegateWithEscalation so consumers can correlate runner-shell
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner-types.d.ts","sourceRoot":"","sources":["../../src/providers/runner-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,KAAK,EACV,SAAS,EACT,MAAM,EACN,iBAAiB,EACjB,aAAa,EACb,QAAQ,EACR,QAAQ,EACT,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,MAAM,MAAM,SAAS,GACjB,IAAI,GACJ,YAAY,GACZ,SAAS,GACT,aAAa,GACb,WAAW,GACX,4BAA4B,GAC5B,OAAO,GACP,iBAAiB,GACjB,
|
|
1
|
+
{"version":3,"file":"runner-types.d.ts","sourceRoot":"","sources":["../../src/providers/runner-types.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ export declare const COMPLETED_WORK_TOOLS: Set<string>;
|
|
|
8
8
|
* the cap should be generous enough for that pattern. 6 covers heavy-read
|
|
9
9
|
* tasks (plan implementation, wide refactors) while still bounding truly-stuck
|
|
10
10
|
* runs. Complex-tier runners that hit this cap fast are still bounded by
|
|
11
|
-
*
|
|
11
|
+
* timeoutMs. */
|
|
12
12
|
export declare const MAX_DEGENERATE_RETRIES = 6;
|
|
13
13
|
/** Number of consecutive turns with no new file interactions before injecting a stall warning. */
|
|
14
14
|
export declare const STALL_DETECTION_TURNS = 5;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stall-detector.d.ts","sourceRoot":"","sources":["../../src/providers/stall-detector.ts"],"names":[],"mappings":"AAKA;mFACmF;AACnF,eAAO,MAAM,oBAAoB,aAAiD,CAAC;AAEnF;;;;;;;
|
|
1
|
+
{"version":3,"file":"stall-detector.d.ts","sourceRoot":"","sources":["../../src/providers/stall-detector.ts"],"names":[],"mappings":"AAKA;mFACmF;AACnF,eAAO,MAAM,oBAAoB,aAAiD,CAAC;AAEnF;;;;;;;iBAOiB;AACjB,eAAO,MAAM,sBAAsB,IAAI,CAAC;AAExC,kGAAkG;AAClG,eAAO,MAAM,qBAAqB,IAAI,CAAC;AAEvC,wBAAgB,eAAe,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAG7D;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAE7D;AAED,uFAAuF;AACvF,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,UAAU,GAAE,MAAU,GAAG,OAAO,CAQvF;AAED;qGACqG;AACrG,wBAAgB,kBAAkB,CAChC,eAAe,EAAE,MAAM,EACvB,kBAAkB,EAAE,MAAM,EAC1B,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,GACtB,OAAO,CAET"}
|
|
@@ -12,7 +12,7 @@ export const COMPLETED_WORK_TOOLS = new Set(['writeFile', 'editFile', 'runShell'
|
|
|
12
12
|
* the cap should be generous enough for that pattern. 6 covers heavy-read
|
|
13
13
|
* tasks (plan implementation, wide refactors) while still bounding truly-stuck
|
|
14
14
|
* runs. Complex-tier runners that hit this cap fast are still bounded by
|
|
15
|
-
*
|
|
15
|
+
* timeoutMs. */
|
|
16
16
|
export const MAX_DEGENERATE_RETRIES = 6;
|
|
17
17
|
/** Number of consecutive turns with no new file interactions before injecting a stall warning. */
|
|
18
18
|
export const STALL_DETECTION_TURNS = 5;
|