@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
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import { LifecycleDispatcher } from './lifecycle-dispatcher.js';
|
|
2
2
|
import { WallClockGuard } from '../bounded-execution/wall-clock-guard.js';
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
3
|
+
import { ActivityTracker } from '../bounded-execution/activity-tracker.js';
|
|
4
|
+
import { ATTEMPT_BUDGETS } from './rework-budget.js';
|
|
5
|
+
import { resolveAgent } from '../providers/agent-resolver.js';
|
|
5
6
|
import { expandContextBlocks } from '../stores/expand-context-blocks.js';
|
|
6
7
|
import { startStallWatchdog } from '../bounded-execution/stall-watchdog.js';
|
|
8
|
+
import { startProgressEventsSubscriber } from '../bounded-execution/progress-events-subscriber.js';
|
|
9
|
+
import { normalizeOutputTargets } from './normalize-output-targets.js';
|
|
7
10
|
export function errorResult(error) {
|
|
8
11
|
return {
|
|
9
12
|
output: `Sub-agent error: ${error}`,
|
|
@@ -154,6 +157,8 @@ function buildExecutionContext(input) {
|
|
|
154
157
|
idleStallTimeoutMs: stallTimeoutMs,
|
|
155
158
|
abortSignal: stallController.signal,
|
|
156
159
|
...(input.bus && { bus: input.bus }),
|
|
160
|
+
...(input.batchId !== undefined && { batchId: input.batchId }),
|
|
161
|
+
...(input.taskIndex !== undefined && { taskIndex: input.taskIndex }),
|
|
157
162
|
});
|
|
158
163
|
sessions.set(tier, session);
|
|
159
164
|
return session;
|
|
@@ -163,6 +168,31 @@ function buildExecutionContext(input) {
|
|
|
163
168
|
sessions.clear();
|
|
164
169
|
await Promise.allSettled(entries.map(([, s]) => s.close()));
|
|
165
170
|
};
|
|
171
|
+
const getActivePids = () => {
|
|
172
|
+
const pids = [];
|
|
173
|
+
for (const sess of sessions.values()) {
|
|
174
|
+
const pid = sess.getPid?.();
|
|
175
|
+
if (typeof pid === 'number' && pid > 0)
|
|
176
|
+
pids.push(pid);
|
|
177
|
+
}
|
|
178
|
+
return pids;
|
|
179
|
+
};
|
|
180
|
+
const heartbeat = input.recordHeartbeat
|
|
181
|
+
? new ActivityTracker(
|
|
182
|
+
// onProgress: internal-only tick hook. The recordHeartbeat callback
|
|
183
|
+
// (passed via options) is the canonical channel for headline updates.
|
|
184
|
+
// We deliberately do NOT forward ticks to the observability bus —
|
|
185
|
+
// the tick shape (kind: 'heartbeat') does not conform to the bus
|
|
186
|
+
// event schema (event: 'heartbeat') and is not part of the JSONL
|
|
187
|
+
// contract consumed by telemetry/observability sinks.
|
|
188
|
+
() => { }, {
|
|
189
|
+
provider: resolved.provider.name,
|
|
190
|
+
...(input.mainModel && { mainModel: input.mainModel }),
|
|
191
|
+
intervalMs: 5000,
|
|
192
|
+
recordHeartbeat: input.recordHeartbeat,
|
|
193
|
+
...(input.batchId !== undefined && { batchId: input.batchId }),
|
|
194
|
+
})
|
|
195
|
+
: undefined;
|
|
166
196
|
return {
|
|
167
197
|
task,
|
|
168
198
|
taskIndex: input.taskIndex,
|
|
@@ -180,20 +210,20 @@ function buildExecutionContext(input) {
|
|
|
180
210
|
implementerIdentity: undefined,
|
|
181
211
|
getSession,
|
|
182
212
|
closeSessions,
|
|
213
|
+
getActivePids,
|
|
183
214
|
timing: { startMs: startMsAt, timeoutMs, deadlineMs: deadlineAt, stallTimeoutMs },
|
|
184
|
-
budgets: { maxCostUSD: task.maxCostUSD ?? config.defaults?.maxCostUSD },
|
|
185
215
|
wallClockGuard: new WallClockGuard(timeoutMs),
|
|
186
216
|
stall: { controller: stallController, lastEventAtMs: startMsAt, fired: false },
|
|
187
217
|
implementerToolMode: task.tools,
|
|
188
218
|
...(input.qualityReviewPromptBuilder && { qualityReviewPromptBuilder: input.qualityReviewPromptBuilder }),
|
|
189
219
|
bus: input.bus,
|
|
190
|
-
heartbeat
|
|
220
|
+
heartbeat,
|
|
191
221
|
logger: input.logger,
|
|
192
222
|
verboseStream: input.verboseStream ?? ((line) => { process.stderr.write(line); }),
|
|
193
223
|
verbose: true,
|
|
194
224
|
...(input.recordHeartbeat && { recordHeartbeat: input.recordHeartbeat }),
|
|
195
225
|
...(input.recorder && { recorder: input.recorder }),
|
|
196
|
-
outputTargets:
|
|
226
|
+
outputTargets: normalizeOutputTargets(task.outputTargets, cwd),
|
|
197
227
|
};
|
|
198
228
|
}
|
|
199
229
|
export async function runTaskViaDispatcher(input, dispatcher = new LifecycleDispatcher()) {
|
|
@@ -209,6 +239,12 @@ export async function runTaskViaDispatcher(input, dispatcher = new LifecycleDisp
|
|
|
209
239
|
const route = input.route ?? '';
|
|
210
240
|
const toolCategory = toolCategoryForRoute(route);
|
|
211
241
|
void ATTEMPT_BUDGETS[toolCategory];
|
|
242
|
+
// Register this task's ExecutionContext on the BatchRegistry so shutdown
|
|
243
|
+
// drain (serve.ts cleanupSignal) can find every in-flight task and call
|
|
244
|
+
// closeSessions() on it before the daemon exits. Detached in finally{}.
|
|
245
|
+
if (input.batchRegistry && input.batchId !== undefined) {
|
|
246
|
+
input.batchRegistry.attachExecutionContext(input.batchId, input.taskIndex, executionContext);
|
|
247
|
+
}
|
|
212
248
|
// Arm the orchestrator stall watchdog. Spec §4.7: the AbortController on
|
|
213
249
|
// ctx.stall has been declared since v3.x but never armed; this wires the
|
|
214
250
|
// timer that fires .abort() after stallTimeoutMs of no runner events.
|
|
@@ -220,51 +256,71 @@ export async function runTaskViaDispatcher(input, dispatcher = new LifecycleDisp
|
|
|
220
256
|
...(executionContext.batchId !== undefined && { batchId: executionContext.batchId }),
|
|
221
257
|
...(executionContext.taskIndex !== undefined && { taskIndex: executionContext.taskIndex }),
|
|
222
258
|
});
|
|
259
|
+
executionContext.heartbeat?.start(1);
|
|
260
|
+
const stopProgressEvents = (executionContext.heartbeat && executionContext.bus)
|
|
261
|
+
? startProgressEventsSubscriber({
|
|
262
|
+
bus: executionContext.bus,
|
|
263
|
+
tracker: executionContext.heartbeat,
|
|
264
|
+
...(executionContext.batchId !== undefined && { batchId: executionContext.batchId }),
|
|
265
|
+
...(executionContext.taskIndex !== undefined && { taskIndex: executionContext.taskIndex }),
|
|
266
|
+
})
|
|
267
|
+
: () => { };
|
|
223
268
|
let out;
|
|
224
269
|
try {
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
270
|
+
try {
|
|
271
|
+
out = await dispatcher.dispatch({
|
|
272
|
+
route,
|
|
273
|
+
toolCategory,
|
|
274
|
+
rawRequest: { tasks: [expandedTask] },
|
|
275
|
+
context: { task: expandedTask, executionContext },
|
|
276
|
+
});
|
|
277
|
+
}
|
|
278
|
+
finally {
|
|
279
|
+
stopWatchdog();
|
|
280
|
+
stopProgressEvents();
|
|
281
|
+
// v4.4 session reuse: ExecutionContext owns the per-tier Session
|
|
282
|
+
// cache that handlers populate via ctx.getSession(tier). Close them
|
|
283
|
+
// here at task end so codex CLI subprocesses + claude-agent-sdk
|
|
284
|
+
// query handles release. Errors swallowed so disposal can't mask
|
|
285
|
+
// the task's real result.
|
|
286
|
+
await executionContext.closeSessions().catch(() => { });
|
|
287
|
+
// Detach from BatchRegistry — closeSessions already ran, so shutdown
|
|
288
|
+
// drain shouldn't re-close.
|
|
289
|
+
if (input.batchRegistry && input.batchId !== undefined) {
|
|
290
|
+
input.batchRegistry.detachExecutionContext(input.batchId, input.taskIndex);
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
// v5: dispatcher.dispatch returns ComposePayload as `body` and the full
|
|
294
|
+
// LifecycleState as `finalState`. The runtime mirror (RuntimeRunResult
|
|
295
|
+
// with workerStatus / stageStats / usage etc.) lives on
|
|
296
|
+
// finalState.lastRunResult — populated by performImplementation.
|
|
297
|
+
// Downstream consumers (executeTask, recorder, headline composer) still
|
|
298
|
+
// expect the runtime mirror, so return it directly.
|
|
299
|
+
const last = out.finalState?.lastRunResult;
|
|
300
|
+
if (last && typeof last === 'object' && 'output' in last) {
|
|
301
|
+
return last;
|
|
302
|
+
}
|
|
303
|
+
const body = out.body;
|
|
304
|
+
if (body && typeof body === 'object' && 'output' in body) {
|
|
305
|
+
return body;
|
|
306
|
+
}
|
|
307
|
+
return {
|
|
308
|
+
output: '',
|
|
309
|
+
status: 'error',
|
|
310
|
+
usage: { inputTokens: 0, outputTokens: 0 },
|
|
311
|
+
turns: 0,
|
|
312
|
+
filesRead: [],
|
|
313
|
+
filesWritten: [],
|
|
314
|
+
toolCalls: [],
|
|
315
|
+
outputIsDiagnostic: true,
|
|
316
|
+
escalationLog: [],
|
|
317
|
+
error: 'dispatcher produced no RuntimeRunResult',
|
|
318
|
+
errorCode: 'runner_crash',
|
|
319
|
+
workerStatus: 'failed',
|
|
320
|
+
};
|
|
231
321
|
}
|
|
232
322
|
finally {
|
|
233
|
-
|
|
234
|
-
// v4.4 session reuse: ExecutionContext owns the per-tier Session
|
|
235
|
-
// cache that handlers populate via ctx.getSession(tier). Close them
|
|
236
|
-
// here at task end so codex CLI subprocesses + claude-agent-sdk
|
|
237
|
-
// query handles release. Errors swallowed so disposal can't mask
|
|
238
|
-
// the task's real result.
|
|
239
|
-
await executionContext.closeSessions().catch(() => { });
|
|
240
|
-
}
|
|
241
|
-
// v5: dispatcher.dispatch returns ComposePayload as `body` and the full
|
|
242
|
-
// LifecycleState as `finalState`. The runtime mirror (RuntimeRunResult
|
|
243
|
-
// with workerStatus / stageStats / usage etc.) lives on
|
|
244
|
-
// finalState.lastRunResult — populated by performImplementation.
|
|
245
|
-
// Downstream consumers (executeTask, recorder, headline composer) still
|
|
246
|
-
// expect the runtime mirror, so return it directly.
|
|
247
|
-
const last = out.finalState?.lastRunResult;
|
|
248
|
-
if (last && typeof last === 'object' && 'output' in last) {
|
|
249
|
-
return last;
|
|
323
|
+
executionContext.heartbeat?.stop();
|
|
250
324
|
}
|
|
251
|
-
const body = out.body;
|
|
252
|
-
if (body && typeof body === 'object' && 'output' in body) {
|
|
253
|
-
return body;
|
|
254
|
-
}
|
|
255
|
-
return {
|
|
256
|
-
output: '',
|
|
257
|
-
status: 'error',
|
|
258
|
-
usage: { inputTokens: 0, outputTokens: 0 },
|
|
259
|
-
turns: 0,
|
|
260
|
-
filesRead: [],
|
|
261
|
-
filesWritten: [],
|
|
262
|
-
toolCalls: [],
|
|
263
|
-
outputIsDiagnostic: true,
|
|
264
|
-
escalationLog: [],
|
|
265
|
-
error: 'dispatcher produced no RuntimeRunResult',
|
|
266
|
-
errorCode: 'runner_crash',
|
|
267
|
-
workerStatus: 'failed',
|
|
268
|
-
};
|
|
269
325
|
}
|
|
270
326
|
//# sourceMappingURL=task-runner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-runner.js","sourceRoot":"","sources":["../../src/lifecycle/task-runner.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"task-runner.js","sourceRoot":"","sources":["../../src/lifecycle/task-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agent-resolver.d.ts","sourceRoot":"","sources":["../../src/providers/agent-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGzE,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,wBAAgB,YAAY,CAC1B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,gBAAgB,GACvB,aAAa,CAaf"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agent-resolver.js","sourceRoot":"","sources":["../../src/providers/agent-resolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAOvD,MAAM,UAAU,YAAY,CAC1B,SAAoB,EACpB,MAAwB;IAExB,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC7B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACtE,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;IACnC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,gCAAgC,SAAS,uBAAuB,CAAC,CAAC;IACpF,CAAC;IACD,OAAO;QACL,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,cAAc,CAAC,SAAS,EAAE,MAAM,CAAC;KAC5C,CAAC;AACJ,CAAC"}
|
|
@@ -49,7 +49,6 @@ export function assembleRunResult(turn, parsed = {}) {
|
|
|
49
49
|
function mapStatus(r, errorCode) {
|
|
50
50
|
switch (r) {
|
|
51
51
|
case 'ok': return 'ok';
|
|
52
|
-
case 'cost_exceeded': return 'cost_exceeded';
|
|
53
52
|
case 'time_exceeded': return 'timeout';
|
|
54
53
|
case 'cap_exhausted': return 'incomplete';
|
|
55
54
|
case 'stalled': return 'incomplete';
|
|
@@ -78,7 +77,6 @@ function mapIncompleteReason(r) {
|
|
|
78
77
|
function mapTermination(r) {
|
|
79
78
|
switch (r) {
|
|
80
79
|
case 'time_exceeded': return 'time_ceiling';
|
|
81
|
-
case 'cost_exceeded': return 'cost_ceiling';
|
|
82
80
|
case 'aborted': return 'all_tiers_unavailable';
|
|
83
81
|
case 'error': return 'all_tiers_unavailable';
|
|
84
82
|
default: return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assemble-run-result.js","sourceRoot":"","sources":["../../src/providers/assemble-run-result.ts"],"names":[],"mappings":"AAAA,iFAAiF;AACjF,uEAAuE;AACvE,gDAAgD;AAChD,EAAE;AACF,kFAAkF;AAClF,2EAA2E;AAC3E,2EAA2E;AAC3E,yEAAyE;AACzE,sBAAsB;AAgBtB,MAAM,UAAU,iBAAiB,CAC/B,IAAgB,EAChB,SAA6B,EAAE;IAE/B,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAEjE,kFAAkF;IAClF,uEAAuE;IACvE,kDAAkD;IAClD,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC;QACjE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE;YAAE,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvD,CAAC;IAED,mEAAmE;IACnE,MAAM,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC;IAClC,MAAM,WAAW,GAAG,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,eAAe,IAAI,EAAE,KAAK,SAAS,CAAC;IAC9E,MAAM,iBAAiB,GAAG,WAAW;QACnC,CAAC,CAAC,SAAS;QACX,CAAC,CAAE,cAAc,CAAC,EAAE,CAA2C,CAAC;IAElE,MAAM,YAAY,GAChB,IAAI,CAAC,oBAAoB;QACvB,CAAC,CAAE,IAAI,CAAC,oBAA0C;QAClD,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAEzC,OAAO;QACL,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,MAAM;QACN,KAAK,EAAE,IAAI,CAAC,KAAmB;QAC/B,aAAa,EAAE,IAAI,CAAC,OAAO;QAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,SAAS;QACT,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,IAAI,KAAK;QACpD,aAAa,EAAE,EAAE;QACjB,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,iBAAiB,EAAE,EAAE;QACrB,GAAG,CAAC,YAAY,IAAI,EAAE,YAAY,EAAE,YAAiC,EAAE,CAAC;QACxE,GAAG,CAAC,iBAAiB,IAAI,EAAE,iBAAiB,EAAE,CAAC;QAC/C,GAAG,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC;QACpD,GAAG,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC;QACtD,GAAG,MAAM;KACqB,CAAC;AACnC,CAAC;AAED,SAAS,SAAS,CAAC,CAAS,EAAE,SAAkB;IAC9C,QAAQ,CAAC,EAAE,CAAC;QACV,KAAK,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC;QACvB,KAAK,eAAe,CAAC,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"assemble-run-result.js","sourceRoot":"","sources":["../../src/providers/assemble-run-result.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,11 +5,18 @@ export declare class ClaudeSession implements Session {
|
|
|
5
5
|
private turns;
|
|
6
6
|
private sessionId?;
|
|
7
7
|
private readonly bus;
|
|
8
|
+
/** Active SDK query handle for the in-flight turn. Captured so close() can
|
|
9
|
+
* force-shut the query (releases the underlying SDK worker / network
|
|
10
|
+
* resources). Undefined between turns. */
|
|
11
|
+
private activeQuery?;
|
|
8
12
|
constructor(args: {
|
|
9
13
|
model: string;
|
|
10
14
|
opts: SessionOpts;
|
|
11
15
|
oauthAccessToken?: string;
|
|
12
16
|
});
|
|
17
|
+
/** Returns task identity (batchId/taskIndex) from SessionOpts for event tagging.
|
|
18
|
+
* Required so the stall watchdog can filter the shared bus by task. */
|
|
19
|
+
private taskTag;
|
|
13
20
|
send(instruction: string, _opts?: TurnOpts): Promise<TurnResult>;
|
|
14
21
|
/**
|
|
15
22
|
* Translate a single SDKMessage from claude-agent-sdk into mma
|
|
@@ -19,5 +26,10 @@ export declare class ClaudeSession implements Session {
|
|
|
19
26
|
*/
|
|
20
27
|
private emitEventTelemetry;
|
|
21
28
|
close(): Promise<void>;
|
|
29
|
+
/** ClaudeSession runs entirely in-process via the SDK; there's no separate
|
|
30
|
+
* CLI subprocess to expose a pid for. Returning undefined tells the
|
|
31
|
+
* shutdown drain there is nothing to SIGKILL externally — close() handles
|
|
32
|
+
* it via the SDK query handle. */
|
|
33
|
+
getPid(): number | undefined;
|
|
22
34
|
}
|
|
23
35
|
//# sourceMappingURL=claude-session.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-session.d.ts","sourceRoot":"","sources":["../../src/providers/claude-session.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAWzF,qBAAa,aAAc,YAAW,OAAO;
|
|
1
|
+
{"version":3,"file":"claude-session.d.ts","sourceRoot":"","sources":["../../src/providers/claude-session.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAWzF,qBAAa,aAAc,YAAW,OAAO;IAU/B,OAAO,CAAC,QAAQ,CAAC,IAAI;IATjC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,KAAK,CAAK;IAClB,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAsB;IAC1C;;+CAE2C;IAC3C,OAAO,CAAC,WAAW,CAAC,CAA4B;gBAEnB,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,WAAW,CAAC;QAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;KAAE;IAYlG;4EACwE;IACxE,OAAO,CAAC,OAAO;IAOT,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;IAqGtE;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IAkCpB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAW5B;;;uCAGmC;IACnC,MAAM,IAAI,MAAM,GAAG,SAAS;CAG7B"}
|
|
@@ -27,6 +27,10 @@ export class ClaudeSession {
|
|
|
27
27
|
turns = 0;
|
|
28
28
|
sessionId;
|
|
29
29
|
bus;
|
|
30
|
+
/** Active SDK query handle for the in-flight turn. Captured so close() can
|
|
31
|
+
* force-shut the query (releases the underlying SDK worker / network
|
|
32
|
+
* resources). Undefined between turns. */
|
|
33
|
+
activeQuery;
|
|
30
34
|
constructor(args) {
|
|
31
35
|
this.args = args;
|
|
32
36
|
if (args.oauthAccessToken)
|
|
@@ -37,8 +41,17 @@ export class ClaudeSession {
|
|
|
37
41
|
ts: new Date().toISOString(),
|
|
38
42
|
model: args.model,
|
|
39
43
|
cwd: args.opts.cwd,
|
|
44
|
+
...this.taskTag(),
|
|
40
45
|
});
|
|
41
46
|
}
|
|
47
|
+
/** Returns task identity (batchId/taskIndex) from SessionOpts for event tagging.
|
|
48
|
+
* Required so the stall watchdog can filter the shared bus by task. */
|
|
49
|
+
taskTag() {
|
|
50
|
+
return {
|
|
51
|
+
...(this.args.opts.batchId !== undefined && { batchId: this.args.opts.batchId }),
|
|
52
|
+
...(this.args.opts.taskIndex !== undefined && { taskIndex: this.args.opts.taskIndex }),
|
|
53
|
+
};
|
|
54
|
+
}
|
|
42
55
|
async send(instruction, _opts) {
|
|
43
56
|
if (this.closed)
|
|
44
57
|
throw new Error('claude-session: send() on closed session');
|
|
@@ -51,6 +64,7 @@ export class ClaudeSession {
|
|
|
51
64
|
turn: turnIndex,
|
|
52
65
|
resume: Boolean(this.sessionId),
|
|
53
66
|
...(this.sessionId && { sessionId: this.sessionId }),
|
|
67
|
+
...this.taskTag(),
|
|
54
68
|
});
|
|
55
69
|
// Single-shot prompt iterable. The SDK iterates this once to pull the
|
|
56
70
|
// user message, then runs to `result`. Closing the iterable after the
|
|
@@ -66,6 +80,7 @@ export class ClaudeSession {
|
|
|
66
80
|
const q = query({
|
|
67
81
|
prompt: promptIterable(),
|
|
68
82
|
options: {
|
|
83
|
+
// (lifecycle: capture this handle so close() can force-shut)
|
|
69
84
|
model: this.args.model,
|
|
70
85
|
// v4.4: mma operates headlessly — never prompt the user for
|
|
71
86
|
// tool permission. bypassPermissions tells the SDK to run every
|
|
@@ -79,6 +94,7 @@ export class ClaudeSession {
|
|
|
79
94
|
...(this.sessionId && { resume: this.sessionId }),
|
|
80
95
|
},
|
|
81
96
|
});
|
|
97
|
+
this.activeQuery = q;
|
|
82
98
|
const events = [];
|
|
83
99
|
try {
|
|
84
100
|
for await (const ev of q) {
|
|
@@ -103,17 +119,20 @@ export class ClaudeSession {
|
|
|
103
119
|
ts: new Date().toISOString(),
|
|
104
120
|
name: e.name ?? 'unknown',
|
|
105
121
|
message: e.message ?? String(err),
|
|
122
|
+
...this.taskTag(),
|
|
106
123
|
});
|
|
107
124
|
try {
|
|
108
125
|
q.close();
|
|
109
126
|
}
|
|
110
127
|
catch { /* ignore */ }
|
|
128
|
+
this.activeQuery = undefined;
|
|
111
129
|
throw err;
|
|
112
130
|
}
|
|
113
131
|
try {
|
|
114
132
|
q.close();
|
|
115
133
|
}
|
|
116
134
|
catch { /* ignore */ }
|
|
135
|
+
this.activeQuery = undefined;
|
|
117
136
|
const rateCard = resolveRateCard(this.args.model);
|
|
118
137
|
const norm = normalizeClaudeTurn(events, {
|
|
119
138
|
durationMs: Date.now() - startMs,
|
|
@@ -133,6 +152,7 @@ export class ClaudeSession {
|
|
|
133
152
|
filesRead: norm.filesRead.length,
|
|
134
153
|
filesWritten: norm.filesWritten.length,
|
|
135
154
|
...(norm.errorCode && { errorCode: norm.errorCode }),
|
|
155
|
+
...this.taskTag(),
|
|
136
156
|
});
|
|
137
157
|
return norm;
|
|
138
158
|
}
|
|
@@ -160,6 +180,7 @@ export class ClaudeSession {
|
|
|
160
180
|
turn: this.turns,
|
|
161
181
|
chars: b.text.length,
|
|
162
182
|
preview: b.text.slice(0, 200),
|
|
183
|
+
...this.taskTag(),
|
|
163
184
|
});
|
|
164
185
|
}
|
|
165
186
|
else if (b.type === 'tool_use' && typeof b.name === 'string') {
|
|
@@ -172,6 +193,7 @@ export class ClaudeSession {
|
|
|
172
193
|
turn: this.turns,
|
|
173
194
|
tool: b.name,
|
|
174
195
|
input: inputPreview,
|
|
196
|
+
...this.taskTag(),
|
|
175
197
|
});
|
|
176
198
|
}
|
|
177
199
|
}
|
|
@@ -180,7 +202,22 @@ export class ClaudeSession {
|
|
|
180
202
|
if (this.closed)
|
|
181
203
|
return;
|
|
182
204
|
this.closed = true;
|
|
183
|
-
|
|
205
|
+
const q = this.activeQuery;
|
|
206
|
+
this.activeQuery = undefined;
|
|
207
|
+
if (q && typeof q.close === 'function') {
|
|
208
|
+
try {
|
|
209
|
+
q.close();
|
|
210
|
+
}
|
|
211
|
+
catch { /* ignore */ }
|
|
212
|
+
}
|
|
213
|
+
this.bus?.emit({ event: 'claude_session_closed', ts: new Date().toISOString(), ...this.taskTag() });
|
|
214
|
+
}
|
|
215
|
+
/** ClaudeSession runs entirely in-process via the SDK; there's no separate
|
|
216
|
+
* CLI subprocess to expose a pid for. Returning undefined tells the
|
|
217
|
+
* shutdown drain there is nothing to SIGKILL externally — close() handles
|
|
218
|
+
* it via the SDK query handle. */
|
|
219
|
+
getPid() {
|
|
220
|
+
return undefined;
|
|
184
221
|
}
|
|
185
222
|
}
|
|
186
223
|
//# sourceMappingURL=claude-session.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-session.js","sourceRoot":"","sources":["../../src/providers/claude-session.ts"],"names":[],"mappings":"AAAA,sEAAsE;AACtE,EAAE;AACF,yEAAyE;AACzE,uEAAuE;AACvE,sEAAsE;AACtE,sEAAsE;AACtE,oEAAoE;AACpE,+DAA+D;AAC/D,oEAAoE;AACpE,EAAE;AACF,cAAc;AACd,sEAAsE;AACtE,qEAAqE;AACrE,+BAA+B;AAC/B,qEAAqE;AACrE,oDAAoD;AAEpD,OAAO,EAAE,KAAK,EAAwC,MAAM,gCAAgC,CAAC;AAE7F,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAIpF,SAAS,KAAK,CAAC,IAAiB;IAC9B,MAAM,CAAC,GAAG,IAAI,CAAC,GAAqC,CAAC;IACrD,OAAO,CAAC,IAAI,OAAO,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAE,CAAa,CAAC,CAAC,CAAC,SAAS,CAAC;AACxE,CAAC;AAED,MAAM,OAAO,aAAa;
|
|
1
|
+
{"version":3,"file":"claude-session.js","sourceRoot":"","sources":["../../src/providers/claude-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,13 +10,24 @@ export declare class CodexCliSession implements Session {
|
|
|
10
10
|
private threadId?;
|
|
11
11
|
private closed;
|
|
12
12
|
private tempDir?;
|
|
13
|
+
/** Active codex CLI subprocess for the currently-running turn. Captured so
|
|
14
|
+
* close() can synchronously kill the child (SIGTERM then SIGKILL after
|
|
15
|
+
* CLOSE_GRACE_MS). Undefined between turns. */
|
|
16
|
+
private activeProc?;
|
|
13
17
|
private readonly cumulativeUsage;
|
|
14
18
|
constructor(args: {
|
|
15
19
|
cfg: CodexCliConfig;
|
|
16
20
|
opts: SessionOpts;
|
|
17
21
|
});
|
|
22
|
+
/** Returns task identity (batchId/taskIndex) from SessionOpts for event tagging.
|
|
23
|
+
* The stall watchdog filters bus events by these fields — every emit must carry them
|
|
24
|
+
* or stuck detection re-breaks under concurrent load. */
|
|
25
|
+
private taskTag;
|
|
18
26
|
send(instruction: string, _turnOpts?: TurnOpts): Promise<TurnResult>;
|
|
19
27
|
close(): Promise<void>;
|
|
28
|
+
/** OS pid of the currently-active codex CLI subprocess, if any. Undefined
|
|
29
|
+
* between turns. Used by shutdown drain to SIGKILL stragglers. */
|
|
30
|
+
getPid(): number | undefined;
|
|
20
31
|
private armGuards;
|
|
21
32
|
private finalizeError;
|
|
22
33
|
}
|
|
@@ -28,6 +39,7 @@ declare function killGracefully(proc: ChildProcess): void;
|
|
|
28
39
|
declare class TurnTracker {
|
|
29
40
|
private readonly cumulative;
|
|
30
41
|
private readonly bus?;
|
|
42
|
+
private readonly tag;
|
|
31
43
|
threadId?: string;
|
|
32
44
|
turns: number;
|
|
33
45
|
lastAgentMessage: string;
|
|
@@ -38,7 +50,10 @@ declare class TurnTracker {
|
|
|
38
50
|
errorCode?: string;
|
|
39
51
|
errorMessage?: string;
|
|
40
52
|
private readonly snapshot;
|
|
41
|
-
constructor(cumulative: TokenUsage, bus?: BusLike | undefined
|
|
53
|
+
constructor(cumulative: TokenUsage, bus?: BusLike | undefined, tag?: {
|
|
54
|
+
batchId?: string;
|
|
55
|
+
taskIndex?: number;
|
|
56
|
+
});
|
|
42
57
|
consume(ev: CodexCliEvent): void;
|
|
43
58
|
private absorbItem;
|
|
44
59
|
private absorbUsage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-cli-session.d.ts","sourceRoot":"","sources":["../../src/providers/codex-cli-session.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAWvD,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAErG,OAAO,EAAuB,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACjF,OAAO,EAAsB,KAAK,aAAa,EAAmC,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"codex-cli-session.d.ts","sourceRoot":"","sources":["../../src/providers/codex-cli-session.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAWvD,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAErG,OAAO,EAAuB,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACjF,OAAO,EAAsB,KAAK,aAAa,EAAmC,MAAM,sBAAsB,CAAC;AAQ/G,UAAU,OAAO;IAAG,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAA;CAAE;AAOhE,qBAAa,eAAgB,YAAW,OAAO;IAejC,OAAO,CAAC,QAAQ,CAAC,IAAI;IAdjC,OAAO,CAAC,QAAQ,CAAC,CAAS;IAC1B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB;;oDAEgD;IAChD,OAAO,CAAC,UAAU,CAAC,CAAe;IAClC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAK9B;gBAE2B,IAAI,EAAE;QAAE,GAAG,EAAE,cAAc,CAAC;QAAC,IAAI,EAAE,WAAW,CAAA;KAAE;IAE7E;;8DAE0D;IAC1D,OAAO,CAAC,OAAO;IAOT,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;IAyHpE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAgC5B;uEACmE;IACnE,MAAM,IAAI,MAAM,GAAG,SAAS;IAI5B,OAAO,CAAC,SAAS;IAgCjB,OAAO,CAAC,aAAa;CAkBtB;AAUD,iBAAS,aAAa,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA4C5G;AAED,iBAAS,cAAc,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI,CAoBhD;AAED,iEAAiE;AACjE,cAAM,WAAW;IAab,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAdtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,SAAK;IACV,gBAAgB,SAAM;IACtB,SAAS,cAAqB;IAC9B,YAAY,cAAqB;IACjC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;IAC7C,iBAAiB,EAAE,UAAU,CAAC,mBAAmB,CAAC,CAAQ;IAC1D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAa;gBAGnB,UAAU,EAAE,UAAU,EACtB,GAAG,CAAC,EAAE,OAAO,YAAA,EACb,GAAG,GAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAO;IAKrE,OAAO,CAAC,EAAE,EAAE,aAAa,GAAG,IAAI;IAyDhC,OAAO,CAAC,UAAU;IAgClB,OAAO,CAAC,WAAW;IAyBnB,eAAe,IAAI,UAAU;CAQ9B;AAID,eAAO,MAAM,MAAM;;;;CAAiD,CAAC;AAErE;;;yEAGyE;AACzE,wBAAsB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAIlF"}
|