@zhixuan92/multi-model-agent-core 4.7.0 → 4.7.2
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 -6
- 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/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 +63 -0
- package/dist/bounded-execution/progress-events-subscriber.js.map +1 -0
- package/dist/bounded-execution/stall-watchdog.d.ts +4 -2
- package/dist/bounded-execution/stall-watchdog.d.ts.map +1 -1
- package/dist/bounded-execution/stall-watchdog.js +55 -31
- package/dist/bounded-execution/stall-watchdog.js.map +1 -1
- package/dist/events/envelope-bus.d.ts +22 -0
- package/dist/events/envelope-bus.d.ts.map +1 -0
- package/dist/events/envelope-bus.js +35 -0
- package/dist/events/envelope-bus.js.map +1 -0
- package/dist/events/log-writer.d.ts +24 -0
- package/dist/events/log-writer.d.ts.map +1 -0
- package/dist/events/log-writer.js +52 -0
- package/dist/events/log-writer.js.map +1 -0
- package/dist/events/plain-log-entry.d.ts +45 -0
- package/dist/events/plain-log-entry.d.ts.map +1 -0
- package/dist/events/plain-log-entry.js +45 -0
- package/dist/events/plain-log-entry.js.map +1 -0
- package/dist/events/task-envelope.d.ts +174 -0
- package/dist/events/task-envelope.d.ts.map +1 -0
- package/dist/events/task-envelope.js +152 -0
- package/dist/events/task-envelope.js.map +1 -0
- package/dist/events/telemetry-uploader.d.ts +24 -0
- package/dist/events/telemetry-uploader.d.ts.map +1 -0
- package/dist/events/telemetry-uploader.js +31 -0
- package/dist/events/telemetry-uploader.js.map +1 -0
- package/dist/events/to-wire-record.d.ts +42 -0
- package/dist/events/to-wire-record.d.ts.map +1 -0
- package/dist/events/to-wire-record.js +167 -0
- package/dist/events/to-wire-record.js.map +1 -0
- package/dist/events/{telemetry-types.d.ts → wire-schema.d.ts} +23 -36
- package/dist/events/wire-schema.d.ts.map +1 -0
- package/dist/events/{telemetry-types.js → wire-schema.js} +2 -9
- package/dist/events/wire-schema.js.map +1 -0
- package/dist/identity/{auth-token-store.d.ts → claude-oauth.d.ts} +1 -24
- package/dist/identity/claude-oauth.d.ts.map +1 -0
- package/dist/identity/claude-oauth.js +71 -0
- package/dist/identity/claude-oauth.js.map +1 -0
- package/dist/index.d.ts +9 -10
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -7
- package/dist/index.js.map +1 -1
- package/dist/lifecycle/handlers/annotate-stage.d.ts.map +1 -1
- package/dist/lifecycle/handlers/annotate-stage.js +11 -17
- package/dist/lifecycle/handlers/annotate-stage.js.map +1 -1
- package/dist/lifecycle/handlers/git-commit-handler.d.ts.map +1 -1
- package/dist/lifecycle/handlers/git-commit-handler.js +0 -15
- package/dist/lifecycle/handlers/git-commit-handler.js.map +1 -1
- package/dist/lifecycle/handlers/review-stage.d.ts.map +1 -1
- package/dist/lifecycle/handlers/review-stage.js +0 -17
- package/dist/lifecycle/handlers/review-stage.js.map +1 -1
- package/dist/lifecycle/handlers/rework-stage.d.ts.map +1 -1
- package/dist/lifecycle/handlers/rework-stage.js +2 -18
- package/dist/lifecycle/handlers/rework-stage.js.map +1 -1
- package/dist/lifecycle/handlers/terminal-handlers.d.ts +5 -4
- package/dist/lifecycle/handlers/terminal-handlers.d.ts.map +1 -1
- package/dist/lifecycle/handlers/terminal-handlers.js +34 -71
- package/dist/lifecycle/handlers/terminal-handlers.js.map +1 -1
- package/dist/lifecycle/lifecycle-context.d.ts +11 -5
- package/dist/lifecycle/lifecycle-context.d.ts.map +1 -1
- package/dist/lifecycle/lifecycle-driver.d.ts.map +1 -1
- package/dist/lifecycle/lifecycle-driver.js +151 -9
- package/dist/lifecycle/lifecycle-driver.js.map +1 -1
- package/dist/lifecycle/perform-implementation.d.ts.map +1 -1
- package/dist/lifecycle/perform-implementation.js +2 -3
- package/dist/lifecycle/perform-implementation.js.map +1 -1
- package/dist/lifecycle/task-completion-summary.js +1 -1
- package/dist/lifecycle/task-completion-summary.js.map +1 -1
- package/dist/lifecycle/task-runner.d.ts +11 -6
- package/dist/lifecycle/task-runner.d.ts.map +1 -1
- package/dist/lifecycle/task-runner.js +12 -0
- package/dist/lifecycle/task-runner.js.map +1 -1
- package/dist/providers/claude-session.d.ts +1 -0
- package/dist/providers/claude-session.d.ts.map +1 -1
- package/dist/providers/claude-session.js +29 -27
- package/dist/providers/claude-session.js.map +1 -1
- package/dist/providers/claude.js +1 -1
- package/dist/providers/claude.js.map +1 -1
- package/dist/providers/codex-cli-session.d.ts +4 -2
- package/dist/providers/codex-cli-session.d.ts.map +1 -1
- package/dist/providers/codex-cli-session.js +47 -46
- package/dist/providers/codex-cli-session.js.map +1 -1
- package/dist/providers/runner-types.d.ts +3 -3
- package/dist/providers/runner-types.d.ts.map +1 -1
- package/dist/reporting/structured-report.d.ts +3 -3
- package/dist/stores/batch-registry.d.ts +37 -29
- package/dist/stores/batch-registry.d.ts.map +1 -1
- package/dist/stores/batch-registry.js +18 -23
- package/dist/stores/batch-registry.js.map +1 -1
- package/dist/tools/audit/schema.d.ts +1 -1
- package/dist/tools/review/schema.d.ts +1 -1
- package/dist/transport/http-listener.d.ts +1 -1
- package/dist/types/enums.d.ts +16 -16
- package/dist/types/run-result.d.ts +3 -0
- package/dist/types/run-result.d.ts.map +1 -1
- package/package.json +21 -29
- package/dist/events/caller-response-channel.d.ts +0 -17
- package/dist/events/caller-response-channel.d.ts.map +0 -1
- package/dist/events/caller-response-channel.js +0 -10
- package/dist/events/caller-response-channel.js.map +0 -1
- package/dist/events/clamp.d.ts +0 -13
- package/dist/events/clamp.d.ts.map +0 -1
- package/dist/events/clamp.js +0 -24
- package/dist/events/clamp.js.map +0 -1
- package/dist/events/cloud-events.d.ts +0 -108
- package/dist/events/cloud-events.d.ts.map +0 -1
- package/dist/events/cloud-events.js +0 -58
- package/dist/events/cloud-events.js.map +0 -1
- package/dist/events/concern-classifier.d.ts +0 -9
- package/dist/events/concern-classifier.d.ts.map +0 -1
- package/dist/events/concern-classifier.js +0 -26
- package/dist/events/concern-classifier.js.map +0 -1
- package/dist/events/diagnostics-types.d.ts +0 -65
- package/dist/events/diagnostics-types.d.ts.map +0 -1
- package/dist/events/diagnostics-types.js +0 -2
- package/dist/events/diagnostics-types.js.map +0 -1
- package/dist/events/event-base.d.ts +0 -14
- package/dist/events/event-base.d.ts.map +0 -1
- package/dist/events/event-base.js +0 -24
- package/dist/events/event-base.js.map +0 -1
- package/dist/events/event-builder.d.ts +0 -55
- package/dist/events/event-builder.d.ts.map +0 -1
- package/dist/events/event-builder.js +0 -557
- package/dist/events/event-builder.js.map +0 -1
- package/dist/events/event-emitter.d.ts +0 -31
- package/dist/events/event-emitter.d.ts.map +0 -1
- package/dist/events/event-emitter.js +0 -63
- package/dist/events/event-emitter.js.map +0 -1
- package/dist/events/http-server-log.d.ts +0 -63
- package/dist/events/http-server-log.d.ts.map +0 -1
- package/dist/events/http-server-log.js +0 -188
- package/dist/events/http-server-log.js.map +0 -1
- package/dist/events/index.d.ts +0 -6
- package/dist/events/index.d.ts.map +0 -1
- package/dist/events/index.js +0 -7
- package/dist/events/index.js.map +0 -1
- package/dist/events/local-log-sink.d.ts +0 -10
- package/dist/events/local-log-sink.d.ts.map +0 -1
- package/dist/events/local-log-sink.js +0 -11
- package/dist/events/local-log-sink.js.map +0 -1
- package/dist/events/normalize.d.ts +0 -18
- package/dist/events/normalize.d.ts.map +0 -1
- package/dist/events/normalize.js +0 -18
- package/dist/events/normalize.js.map +0 -1
- package/dist/events/observability-events.d.ts +0 -1324
- package/dist/events/observability-events.d.ts.map +0 -1
- package/dist/events/observability-events.js +0 -446
- package/dist/events/observability-events.js.map +0 -1
- package/dist/events/privacy-filter.d.ts +0 -2
- package/dist/events/privacy-filter.d.ts.map +0 -1
- package/dist/events/privacy-filter.js +0 -10
- package/dist/events/privacy-filter.js.map +0 -1
- package/dist/events/request-spill.d.ts +0 -16
- package/dist/events/request-spill.d.ts.map +0 -1
- package/dist/events/request-spill.js +0 -23
- package/dist/events/request-spill.js.map +0 -1
- package/dist/events/telemetry-channel.d.ts +0 -9
- package/dist/events/telemetry-channel.d.ts.map +0 -1
- package/dist/events/telemetry-channel.js +0 -16
- package/dist/events/telemetry-channel.js.map +0 -1
- package/dist/events/telemetry-sink.d.ts +0 -12
- package/dist/events/telemetry-sink.d.ts.map +0 -1
- package/dist/events/telemetry-sink.js +0 -24
- package/dist/events/telemetry-sink.js.map +0 -1
- package/dist/events/telemetry-types.d.ts.map +0 -1
- package/dist/events/telemetry-types.js.map +0 -1
- package/dist/events/verbose-line.d.ts +0 -13
- package/dist/events/verbose-line.d.ts.map +0 -1
- package/dist/events/verbose-line.js +0 -99
- package/dist/events/verbose-line.js.map +0 -1
- package/dist/events/verbose-log-channel.d.ts +0 -29
- package/dist/events/verbose-log-channel.d.ts.map +0 -1
- package/dist/events/verbose-log-channel.js +0 -63
- package/dist/events/verbose-log-channel.js.map +0 -1
- package/dist/identity/auth-token-store.d.ts.map +0 -1
- package/dist/identity/auth-token-store.js +0 -136
- package/dist/identity/auth-token-store.js.map +0 -1
- package/dist/identity/cwd-validator.d.ts +0 -6
- package/dist/identity/cwd-validator.d.ts.map +0 -1
- package/dist/identity/cwd-validator.js +0 -28
- package/dist/identity/cwd-validator.js.map +0 -1
- package/dist/identity/host-allowlist.d.ts +0 -6
- package/dist/identity/host-allowlist.d.ts.map +0 -1
- package/dist/identity/host-allowlist.js +0 -11
- package/dist/identity/host-allowlist.js.map +0 -1
- package/dist/identity/index.d.ts +0 -6
- package/dist/identity/index.d.ts.map +0 -1
- package/dist/identity/index.js +0 -7
- package/dist/identity/index.js.map +0 -1
- package/dist/identity/ssrf-guard.d.ts +0 -4
- package/dist/identity/ssrf-guard.d.ts.map +0 -1
- package/dist/identity/ssrf-guard.js +0 -19
- package/dist/identity/ssrf-guard.js.map +0 -1
package/README.md
CHANGED
|
@@ -228,13 +228,13 @@ mmagent logs --follow --batch=<id> # tail + filter
|
|
|
228
228
|
|
|
229
229
|
As of 3.4.0 every task-execution event the worker emits to the verbose stderr stream is also written to the JSONL log via a single `emit(TaskEvent)` writer — schema parity across both sinks. Crash/disconnect events (`startup`, `request_start`, `request_complete`, `shutdown`, `error`) are written unconditionally; per-task events (`heartbeat`, `stage_change`, `tool_call`, `turn_complete`, etc.) flow through the same writer.
|
|
230
230
|
|
|
231
|
-
## What's new in 4.7.
|
|
231
|
+
## What's new in 4.7.2
|
|
232
232
|
|
|
233
|
-
- **
|
|
234
|
-
- **
|
|
235
|
-
-
|
|
236
|
-
- **
|
|
237
|
-
- **From 4.
|
|
233
|
+
- **Events/lifecycle pipeline rewrite.** The legacy `event-emitter` + sinks fan-out is replaced by `TaskEnvelope` + `EnvelopeBus` + `LogWriter` + `TelemetryUploader`. Lifecycle handlers (`stall-watchdog`, `annotate-stage`, `lifecycle-driver`, `heartbeat`, provider sessions, terminal handler) now mutate the envelope directly; the recorder only seals on terminal. `BatchEntry` is slimmed to `taskEnvelopes` plus required infrastructure.
|
|
234
|
+
- **New subpath exports.** `./events/task-envelope`, `./events/envelope-bus`, `./events/log-writer`, `./events/telemetry-uploader`, `./events/wire-schema`. About 20 deleted files (old `event-emitter`, every sink class, `telemetry-channel`, `http-server-log`, dual schemas) are gone.
|
|
235
|
+
- **identity/ slimmed to two files.** `claude-oauth.ts` (was `auth-token-store.ts`, now Claude-OAuth-only — Codex auth is handled by the `codex` CLI subprocess per `providers/codex.ts:9`) and `secret-redactor.ts`. The dormant `cwd-validator.ts`, `host-allowlist.ts`, `ssrf-guard.ts`, `index.ts` are deleted; `getClaudeAuth`/`getCodexAuth`/`ClaudeAuth`/`CodexAuth`/`claudeOAuth`/`codexOAuth` exports removed. The live `getClaudeOAuth()` body is byte-for-byte unchanged; six-case keychain test coverage added.
|
|
236
|
+
- **From 4.7.1:** polling headline `(N/M)` stage counter and live `read/write/tool calls` counters update during a stage; `ActivityTracker.recordFileWrite()` added.
|
|
237
|
+
- **From 4.7.0 (BREAKING):** USD cost caps removed end-to-end — `maxCostUSD`, `cost_cap`/`cost_exceeded`/`cost_check`, `pricingSchema` all deleted; `outputTargets` contract on `/delegate`/`/execute-plan`; `packages/core/src/escalation/` removed.
|
|
238
238
|
|
|
239
239
|
Full history: [CHANGELOG](https://github.com/zhixuan312/multi-model-agent/blob/master/CHANGELOG.md).
|
|
240
240
|
|
|
@@ -44,6 +44,7 @@ export declare class ActivityTracker {
|
|
|
44
44
|
updateProgress(filesRead: number, filesWritten: number, toolCalls: number): void;
|
|
45
45
|
updateCost(costUSD: number | null, costDeltaVsMainUSD: number | null): void;
|
|
46
46
|
recordFileRead(): void;
|
|
47
|
+
recordFileWrite(): void;
|
|
47
48
|
recordToolCall(): void;
|
|
48
49
|
applyCost(cost: {
|
|
49
50
|
costUSD: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity-tracker.d.ts","sourceRoot":"","sources":["../../src/bounded-execution/activity-tracker.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"activity-tracker.d.ts","sourceRoot":"","sources":["../../src/bounded-execution/activity-tracker.ts"],"names":[],"mappings":"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"}
|
|
@@ -231,6 +231,11 @@ export class ActivityTracker {
|
|
|
231
231
|
return;
|
|
232
232
|
this.filesRead++;
|
|
233
233
|
}
|
|
234
|
+
recordFileWrite() {
|
|
235
|
+
if (!this.started || this.stopped)
|
|
236
|
+
return;
|
|
237
|
+
this.filesWritten++;
|
|
238
|
+
}
|
|
234
239
|
recordToolCall() {
|
|
235
240
|
if (!this.started || this.stopped)
|
|
236
241
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity-tracker.js","sourceRoot":"","sources":["../../src/bounded-execution/activity-tracker.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"activity-tracker.js","sourceRoot":"","sources":["../../src/bounded-execution/activity-tracker.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import type { EnvelopeBus } from '../events/envelope-bus.js';
|
|
2
|
+
import type { ActivityTracker } from './activity-tracker.js';
|
|
3
|
+
/**
|
|
4
|
+
* Bridges runner-emitted bus events to ActivityTracker progress counters
|
|
5
|
+
* so the per-task polling headline updates live during a stage instead
|
|
6
|
+
* of jumping from 0/0/0 to the final value only at stage transition.
|
|
7
|
+
*
|
|
8
|
+
* Pattern mirrors stall-watchdog.ts:
|
|
9
|
+
* - Listens on EnvelopeBus for runner progress events.
|
|
10
|
+
* - Filters by batchId + taskIndex (bus is process-wide; without filter
|
|
11
|
+
* every task's events would increment every other task's counters).
|
|
12
|
+
* - Calls tracker.recordFileRead / recordFileWrite / recordToolCall /
|
|
13
|
+
* markEvent based on event name.
|
|
14
|
+
* - Returns a disposer; the caller MUST invoke it in a finally{} so the
|
|
15
|
+
* subscription is released on the success path too.
|
|
16
|
+
*
|
|
17
|
+
* Event → tracker mapping:
|
|
18
|
+
* claude_tool_call (Read tool) → recordFileRead + recordToolCall + markEvent('tool')
|
|
19
|
+
* claude_tool_call (Write/Edit) → recordFileWrite + recordToolCall + markEvent('tool')
|
|
20
|
+
* claude_tool_call (other) → recordToolCall + markEvent('tool')
|
|
21
|
+
* codex_command_completed → recordToolCall + markEvent('tool')
|
|
22
|
+
* codex_file_change → recordFileWrite + markEvent('tool')
|
|
23
|
+
* claude_text_emission → markEvent('text')
|
|
24
|
+
* codex_agent_message → markEvent('text')
|
|
25
|
+
* claude_turn_started → markEvent('llm')
|
|
26
|
+
* codex_turn_started → markEvent('llm')
|
|
27
|
+
*
|
|
28
|
+
* NOTE: file-read events are not emitted by the codex runner (codex's shell
|
|
29
|
+
* tool doesn't distinguish read vs write at the event layer). We only
|
|
30
|
+
* recognize the explicit claude_tool_call(Read) signal. This is a known
|
|
31
|
+
* gap — codex tasks will undercount filesRead in the live headline; the
|
|
32
|
+
* end-of-stage updateProgress() call still snaps to the correct totals.
|
|
33
|
+
*/
|
|
34
|
+
export interface ProgressEventsSubscriberContext {
|
|
35
|
+
bus: EnvelopeBus;
|
|
36
|
+
tracker: ActivityTracker;
|
|
37
|
+
batchId?: string;
|
|
38
|
+
taskIndex?: number;
|
|
39
|
+
}
|
|
40
|
+
export declare function startProgressEventsSubscriber(ctx: ProgressEventsSubscriberContext): () => void;
|
|
41
|
+
//# sourceMappingURL=progress-events-subscriber.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"progress-events-subscriber.d.ts","sourceRoot":"","sources":["../../src/bounded-execution/progress-events-subscriber.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAM,WAAW,+BAA+B;IAC9C,GAAG,EAAE,WAAW,CAAC;IACjB,OAAO,EAAE,eAAe,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAKD,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,+BAA+B,GACnC,MAAM,IAAI,CAyDZ"}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
const READ_TOOLS = new Set(['Read']);
|
|
2
|
+
const WRITE_TOOLS = new Set(['Write', 'Edit', 'MultiEdit', 'NotebookEdit']);
|
|
3
|
+
export function startProgressEventsSubscriber(ctx) {
|
|
4
|
+
const handler = (event) => {
|
|
5
|
+
const eventName = typeof event.event === 'string' ? event.event : '';
|
|
6
|
+
if (!eventName)
|
|
7
|
+
return;
|
|
8
|
+
// Filter by task identity — same logic as stall-watchdog.ts.
|
|
9
|
+
if (ctx.batchId !== undefined && event['batchId'] !== ctx.batchId)
|
|
10
|
+
return;
|
|
11
|
+
if (ctx.taskIndex !== undefined && event['taskIndex'] !== ctx.taskIndex)
|
|
12
|
+
return;
|
|
13
|
+
switch (eventName) {
|
|
14
|
+
case 'claude_tool_call': {
|
|
15
|
+
const tool = typeof event['tool'] === 'string' ? event['tool'] : '';
|
|
16
|
+
ctx.tracker.recordToolCall();
|
|
17
|
+
if (READ_TOOLS.has(tool))
|
|
18
|
+
ctx.tracker.recordFileRead();
|
|
19
|
+
else if (WRITE_TOOLS.has(tool))
|
|
20
|
+
ctx.tracker.recordFileWrite();
|
|
21
|
+
ctx.tracker.markEvent('tool');
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
case 'codex_command_completed': {
|
|
25
|
+
ctx.tracker.recordToolCall();
|
|
26
|
+
ctx.tracker.markEvent('tool');
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
case 'codex_file_change': {
|
|
30
|
+
ctx.tracker.recordFileWrite();
|
|
31
|
+
ctx.tracker.markEvent('tool');
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
case 'claude_text_emission':
|
|
35
|
+
case 'codex_agent_message': {
|
|
36
|
+
ctx.tracker.markEvent('text');
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
case 'claude_turn_started':
|
|
40
|
+
case 'codex_turn_started': {
|
|
41
|
+
ctx.tracker.markEvent('llm');
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
default:
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
};
|
|
48
|
+
// EnvelopeBus replaces the old EventEmitter on/off API with subscribe().
|
|
49
|
+
// The subscriber receives BusMessage; only envelope snapshots are relevant
|
|
50
|
+
// here, so map them into the handler's old event shape on the fly.
|
|
51
|
+
const sub = ctx.bus.subscribe({
|
|
52
|
+
name: 'progress-events-subscriber',
|
|
53
|
+
receive(msg) {
|
|
54
|
+
if (msg.type === 'envelope') {
|
|
55
|
+
// Synthesize a coarse "envelope_updated" event for the handler so it
|
|
56
|
+
// still has a reason to refresh its progress signal.
|
|
57
|
+
handler({ event: 'envelope_updated', reason: msg.reason });
|
|
58
|
+
}
|
|
59
|
+
},
|
|
60
|
+
});
|
|
61
|
+
return () => { sub(); };
|
|
62
|
+
}
|
|
63
|
+
//# sourceMappingURL=progress-events-subscriber.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"progress-events-subscriber.js","sourceRoot":"","sources":["../../src/bounded-execution/progress-events-subscriber.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { EnvelopeBus } from '../events/envelope-bus.js';
|
|
2
|
+
import type { TaskEnvelopeStore } from '../events/task-envelope.js';
|
|
2
3
|
export interface StallWatchdogContext {
|
|
3
4
|
stall: {
|
|
4
5
|
controller: AbortController;
|
|
@@ -8,7 +9,8 @@ export interface StallWatchdogContext {
|
|
|
8
9
|
timing: {
|
|
9
10
|
stallTimeoutMs: number;
|
|
10
11
|
};
|
|
11
|
-
bus?:
|
|
12
|
+
bus?: EnvelopeBus;
|
|
13
|
+
envelope?: TaskEnvelopeStore;
|
|
12
14
|
batchId?: string;
|
|
13
15
|
taskIndex?: number;
|
|
14
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stall-watchdog.d.ts","sourceRoot":"","sources":["../../src/bounded-execution/stall-watchdog.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"stall-watchdog.d.ts","sourceRoot":"","sources":["../../src/bounded-execution/stall-watchdog.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAsCpE,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE;QAAE,UAAU,EAAE,eAAe,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,CAAC;IAC9E,MAAM,EAAE;QAAE,cAAc,EAAE,MAAM,CAAA;KAAE,CAAC;IACnC,GAAG,CAAC,EAAE,WAAW,CAAC;IAClB,QAAQ,CAAC,EAAE,iBAAiB,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,oBAAoB,GAAG,MAAM,IAAI,CA8ExE"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Wires the long-declared-but-previously-inert orchestrator stall watchdog.
|
|
3
3
|
*
|
|
4
|
-
* Listens on the
|
|
4
|
+
* Listens on the EnvelopeBus for runner progress events; resets
|
|
5
5
|
* `lastEventAtMs` on each one. A polling timer fires
|
|
6
6
|
* `controller.abort()` when no resetting event has arrived for longer
|
|
7
7
|
* than `stallTimeoutMs` — i.e. the runner is hung at the network layer
|
|
@@ -33,27 +33,33 @@ const RESET_EVENTS = new Set([
|
|
|
33
33
|
'claude_tool_call',
|
|
34
34
|
]);
|
|
35
35
|
export function startStallWatchdog(ctx) {
|
|
36
|
-
ctx.
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
36
|
+
const taskId = ctx.batchId ? `${ctx.batchId}:${ctx.taskIndex ?? 0}` : '';
|
|
37
|
+
const bus = ctx.bus;
|
|
38
|
+
if (bus?.emitPlainEntry) {
|
|
39
|
+
// EnvelopeBus — new API
|
|
40
|
+
bus.emitPlainEntry({
|
|
41
|
+
ts: new Date().toISOString(),
|
|
42
|
+
kind: 'stall_watchdog_armed',
|
|
43
|
+
fields: {
|
|
44
|
+
task_id: taskId,
|
|
45
|
+
idle_threshold_ms: ctx.timing.stallTimeoutMs,
|
|
46
|
+
},
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
else if (bus?.emit) {
|
|
50
|
+
// EnvelopeBus — old API (fallback for compatibility)
|
|
51
|
+
bus.emit({
|
|
52
|
+
event: 'stall_watchdog_armed',
|
|
53
|
+
ts: new Date().toISOString(),
|
|
54
|
+
batchId: ctx.batchId,
|
|
55
|
+
taskIndex: ctx.taskIndex,
|
|
56
|
+
stallTimeoutMs: ctx.timing.stallTimeoutMs,
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
// Note: EnvelopeBus emits envelope snapshots and plain entries; we no longer
|
|
60
|
+
// subscribe to provider events for stall-watchdog detection. Provider event
|
|
61
|
+
// filtering will be handled by heartbeat tracking in execution-context.ts.
|
|
62
|
+
// This handler is a no-op for the new bus design.
|
|
57
63
|
// Poll interval: fine enough to fire promptly, coarse enough to avoid
|
|
58
64
|
// burning CPU on idle batches. Clamped to [1s, 5s].
|
|
59
65
|
const pollIntervalMs = Math.min(5_000, Math.max(1_000, Math.floor(ctx.timing.stallTimeoutMs / 60)));
|
|
@@ -68,19 +74,37 @@ export function startStallWatchdog(ctx) {
|
|
|
68
74
|
if (idleMs >= ctx.timing.stallTimeoutMs) {
|
|
69
75
|
ctx.stall.fired = true;
|
|
70
76
|
ctx.stall.controller.abort();
|
|
71
|
-
ctx.
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
77
|
+
const taskId = ctx.batchId ? `${ctx.batchId}:${ctx.taskIndex ?? 0}` : '';
|
|
78
|
+
const bus = ctx.bus;
|
|
79
|
+
if (bus?.emitPlainEntry) {
|
|
80
|
+
// EnvelopeBus — new API
|
|
81
|
+
bus.emitPlainEntry({
|
|
82
|
+
ts: new Date().toISOString(),
|
|
83
|
+
kind: 'stall_watchdog_fired',
|
|
84
|
+
fields: {
|
|
85
|
+
task_id: taskId,
|
|
86
|
+
idle_ms_observed: idleMs,
|
|
87
|
+
},
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
else if (bus?.emit) {
|
|
91
|
+
// EnvelopeBus — old API (fallback for compatibility)
|
|
92
|
+
bus.emit({
|
|
93
|
+
event: 'stall_watchdog_fired',
|
|
94
|
+
ts: new Date().toISOString(),
|
|
95
|
+
batchId: ctx.batchId,
|
|
96
|
+
taskIndex: ctx.taskIndex,
|
|
97
|
+
idleMs,
|
|
98
|
+
stallTimeoutMs: ctx.timing.stallTimeoutMs,
|
|
99
|
+
});
|
|
100
|
+
}
|
|
101
|
+
if (ctx.envelope) {
|
|
102
|
+
ctx.envelope.recordStall({ atMs: Date.now(), idleMs });
|
|
103
|
+
}
|
|
79
104
|
}
|
|
80
105
|
}, pollIntervalMs);
|
|
81
106
|
return () => {
|
|
82
107
|
clearInterval(interval);
|
|
83
|
-
ctx.bus?.off(busHandler);
|
|
84
108
|
};
|
|
85
109
|
}
|
|
86
110
|
//# sourceMappingURL=stall-watchdog.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stall-watchdog.js","sourceRoot":"","sources":["../../src/bounded-execution/stall-watchdog.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"stall-watchdog.js","sourceRoot":"","sources":["../../src/bounded-execution/stall-watchdog.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import type { TaskEnvelope } from './task-envelope.js';
|
|
2
|
+
import type { PlainLogEntry } from './plain-log-entry.js';
|
|
3
|
+
export type BusMessage = {
|
|
4
|
+
type: 'envelope';
|
|
5
|
+
envelope: TaskEnvelope;
|
|
6
|
+
reason: string;
|
|
7
|
+
} | {
|
|
8
|
+
type: 'plain';
|
|
9
|
+
entry: PlainLogEntry;
|
|
10
|
+
};
|
|
11
|
+
export interface Subscriber {
|
|
12
|
+
readonly name: string;
|
|
13
|
+
receive(msg: BusMessage): void;
|
|
14
|
+
}
|
|
15
|
+
export declare class EnvelopeBus {
|
|
16
|
+
private subs;
|
|
17
|
+
subscribe(s: Subscriber): () => void;
|
|
18
|
+
unsubscribe(s: Subscriber): void;
|
|
19
|
+
emitEnvelopeSnapshot(envelope: TaskEnvelope, reason: string): void;
|
|
20
|
+
emitPlainEntry(entry: PlainLogEntry): void;
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=envelope-bus.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"envelope-bus.d.ts","sourceRoot":"","sources":["../../src/events/envelope-bus.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,MAAM,MAAM,UAAU,GAClB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,YAAY,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAC5D;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,aAAa,CAAA;CAAE,CAAC;AAE5C,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,GAAG,EAAE,UAAU,GAAG,IAAI,CAAC;CAChC;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,IAAI,CAAoB;IAEhC,SAAS,CAAC,CAAC,EAAE,UAAU,GAAG,MAAM,IAAI;IAKpC,WAAW,CAAC,CAAC,EAAE,UAAU,GAAG,IAAI;IAKhC,oBAAoB,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IASlE,cAAc,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;CAQ3C"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
export class EnvelopeBus {
|
|
2
|
+
subs = [];
|
|
3
|
+
subscribe(s) {
|
|
4
|
+
this.subs.push(s);
|
|
5
|
+
return () => this.unsubscribe(s);
|
|
6
|
+
}
|
|
7
|
+
unsubscribe(s) {
|
|
8
|
+
const i = this.subs.indexOf(s);
|
|
9
|
+
if (i !== -1)
|
|
10
|
+
this.subs.splice(i, 1);
|
|
11
|
+
}
|
|
12
|
+
emitEnvelopeSnapshot(envelope, reason) {
|
|
13
|
+
const msg = { type: 'envelope', envelope, reason };
|
|
14
|
+
for (const s of this.subs) {
|
|
15
|
+
try {
|
|
16
|
+
s.receive(msg);
|
|
17
|
+
}
|
|
18
|
+
catch (err) {
|
|
19
|
+
process.stderr.write(`[mmagent] bus_subscriber_error sub=${s.name} reason=${reason} err=${err.message}\n`);
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
emitPlainEntry(entry) {
|
|
24
|
+
const msg = { type: 'plain', entry };
|
|
25
|
+
for (const s of this.subs) {
|
|
26
|
+
try {
|
|
27
|
+
s.receive(msg);
|
|
28
|
+
}
|
|
29
|
+
catch (err) {
|
|
30
|
+
process.stderr.write(`[mmagent] bus_subscriber_error sub=${s.name} kind=${entry.kind} err=${err.message}\n`);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
//# sourceMappingURL=envelope-bus.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"envelope-bus.js","sourceRoot":"","sources":["../../src/events/envelope-bus.ts"],"names":[],"mappings":"AAaA,MAAM,OAAO,WAAW;IACd,IAAI,GAAiB,EAAE,CAAC;IAEhC,SAAS,CAAC,CAAa;QACrB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IACnC,CAAC;IAED,WAAW,CAAC,CAAa;QACvB,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAI,CAAC,KAAK,CAAC,CAAC;YAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,oBAAoB,CAAC,QAAsB,EAAE,MAAc;QACzD,MAAM,GAAG,GAAe,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;QAC/D,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC;gBAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAAC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACnC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC,IAAI,WAAW,MAAM,QAAS,GAAa,CAAC,OAAO,IAAI,CAAC,CAAC;YACxH,CAAC;QACH,CAAC;IACH,CAAC;IAED,cAAc,CAAC,KAAoB;QACjC,MAAM,GAAG,GAAe,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACjD,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC;gBAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAAC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACnC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC,IAAI,SAAS,KAAK,CAAC,IAAI,QAAS,GAAa,CAAC,OAAO,IAAI,CAAC,CAAC;YAC1H,CAAC;QACH,CAAC;IACH,CAAC;CACF"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import type { Subscriber, BusMessage } from './envelope-bus.js';
|
|
2
|
+
export interface LogWriterOpts {
|
|
3
|
+
diagnosticsLog: boolean;
|
|
4
|
+
logDir?: string;
|
|
5
|
+
}
|
|
6
|
+
export declare class LogWriter implements Subscriber {
|
|
7
|
+
private opts;
|
|
8
|
+
readonly name = "log-writer";
|
|
9
|
+
private writer;
|
|
10
|
+
private requestSpillDir;
|
|
11
|
+
constructor(opts: LogWriterOpts);
|
|
12
|
+
receive(msg: BusMessage): void;
|
|
13
|
+
/** Spill an oversized request body to disk and return the path. */
|
|
14
|
+
spillRequestBody(input: {
|
|
15
|
+
batchId: string;
|
|
16
|
+
body: unknown;
|
|
17
|
+
}): Promise<{
|
|
18
|
+
path: string;
|
|
19
|
+
bytes: number;
|
|
20
|
+
}>;
|
|
21
|
+
inlineBodyLimit(): number;
|
|
22
|
+
private serialize;
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=log-writer.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"log-writer.d.ts","sourceRoot":"","sources":["../../src/events/log-writer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAMhE,MAAM,WAAW,aAAa;IAC5B,cAAc,EAAE,OAAO,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,SAAU,YAAW,UAAU;IAK9B,OAAO,CAAC,IAAI;IAJxB,QAAQ,CAAC,IAAI,gBAAgB;IAC7B,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,eAAe,CAAS;gBAEZ,IAAI,EAAE,aAAa;IAMvC,OAAO,CAAC,GAAG,EAAE,UAAU,GAAG,IAAI;IAa9B,mEAAmE;IAC7D,gBAAgB,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAQ3G,eAAe,IAAI,MAAM;IAEzB,OAAO,CAAC,SAAS;CAIlB"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
// packages/core/src/events/log-writer.ts
|
|
2
|
+
import { homedir } from 'node:os';
|
|
3
|
+
import { join } from 'node:path';
|
|
4
|
+
import { promises as fsp } from 'node:fs';
|
|
5
|
+
import { JsonlWriter } from './jsonl-writer.js';
|
|
6
|
+
import { redactSecrets } from '../identity/secret-redactor.js';
|
|
7
|
+
const INLINE_BODY_LIMIT_BYTES = 16_384;
|
|
8
|
+
export class LogWriter {
|
|
9
|
+
opts;
|
|
10
|
+
name = 'log-writer';
|
|
11
|
+
writer = null;
|
|
12
|
+
requestSpillDir;
|
|
13
|
+
constructor(opts) {
|
|
14
|
+
this.opts = opts;
|
|
15
|
+
const baseDir = opts.logDir ?? join(homedir(), '.multi-model', 'logs');
|
|
16
|
+
if (opts.diagnosticsLog)
|
|
17
|
+
this.writer = new JsonlWriter({ dir: baseDir });
|
|
18
|
+
this.requestSpillDir = join(baseDir, 'requests');
|
|
19
|
+
}
|
|
20
|
+
receive(msg) {
|
|
21
|
+
const record = this.serialize(msg);
|
|
22
|
+
// redactSecrets is a recursive walker that returns the redacted value at the same shape.
|
|
23
|
+
const redactedRecord = redactSecrets(record);
|
|
24
|
+
if (this.writer) {
|
|
25
|
+
try {
|
|
26
|
+
this.writer.writeLine(redactedRecord);
|
|
27
|
+
}
|
|
28
|
+
catch (err) {
|
|
29
|
+
process.stderr.write(`[mmagent] log_writer_error: ${err.message}\n`);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
process.stderr.write(JSON.stringify(redactedRecord) + '\n');
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
/** Spill an oversized request body to disk and return the path. */
|
|
37
|
+
async spillRequestBody(input) {
|
|
38
|
+
await fsp.mkdir(this.requestSpillDir, { recursive: true, mode: 0o700 });
|
|
39
|
+
const path = join(this.requestSpillDir, `${input.batchId}.json`);
|
|
40
|
+
const buf = Buffer.from(JSON.stringify(input.body), 'utf8');
|
|
41
|
+
await fsp.writeFile(path, buf, { mode: 0o600, flag: 'wx' }).catch(err => { if (err.code !== 'EEXIST')
|
|
42
|
+
throw err; });
|
|
43
|
+
return { path, bytes: buf.byteLength };
|
|
44
|
+
}
|
|
45
|
+
inlineBodyLimit() { return INLINE_BODY_LIMIT_BYTES; }
|
|
46
|
+
serialize(msg) {
|
|
47
|
+
if (msg.type === 'envelope')
|
|
48
|
+
return { ts: new Date().toISOString(), kind: 'envelope_snapshot', reason: msg.reason, envelope: msg.envelope };
|
|
49
|
+
return { ts: msg.entry.ts, kind: msg.entry.kind, fields: msg.entry.fields };
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
//# sourceMappingURL=log-writer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"log-writer.js","sourceRoot":"","sources":["../../src/events/log-writer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
export declare const PlainLogKindEnum: z.ZodEnum<{
|
|
3
|
+
server_started: "server_started";
|
|
4
|
+
server_stopped: "server_stopped";
|
|
5
|
+
batch_created: "batch_created";
|
|
6
|
+
request_received: "request_received";
|
|
7
|
+
request_spilled: "request_spilled";
|
|
8
|
+
batch_completed: "batch_completed";
|
|
9
|
+
batch_failed: "batch_failed";
|
|
10
|
+
project_evicted: "project_evicted";
|
|
11
|
+
stall_watchdog_armed: "stall_watchdog_armed";
|
|
12
|
+
stall_watchdog_fired: "stall_watchdog_fired";
|
|
13
|
+
provider_event: "provider_event";
|
|
14
|
+
server_error: "server_error";
|
|
15
|
+
}>;
|
|
16
|
+
export type PlainLogKind = z.infer<typeof PlainLogKindEnum>;
|
|
17
|
+
export declare const PlainLogEntrySchema: z.ZodObject<{
|
|
18
|
+
ts: z.ZodString;
|
|
19
|
+
kind: z.ZodEnum<{
|
|
20
|
+
server_started: "server_started";
|
|
21
|
+
server_stopped: "server_stopped";
|
|
22
|
+
batch_created: "batch_created";
|
|
23
|
+
request_received: "request_received";
|
|
24
|
+
request_spilled: "request_spilled";
|
|
25
|
+
batch_completed: "batch_completed";
|
|
26
|
+
batch_failed: "batch_failed";
|
|
27
|
+
project_evicted: "project_evicted";
|
|
28
|
+
stall_watchdog_armed: "stall_watchdog_armed";
|
|
29
|
+
stall_watchdog_fired: "stall_watchdog_fired";
|
|
30
|
+
provider_event: "provider_event";
|
|
31
|
+
server_error: "server_error";
|
|
32
|
+
}>;
|
|
33
|
+
fields: z.ZodRecord<z.ZodString, z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodNull]>>;
|
|
34
|
+
}, z.core.$strict>;
|
|
35
|
+
export type PlainLogEntry = z.infer<typeof PlainLogEntrySchema>;
|
|
36
|
+
export declare const PROVIDER_EVENT_NAMES: readonly ["claude_session_starting", "claude_turn_started", "claude_error", "claude_turn_completed", "claude_text_emission", "claude_tool_call", "claude_session_closed", "codex_subprocess_starting", "codex_spawn_failed", "codex_subprocess_started", "codex_subprocess_exited", "codex_thread_started", "codex_turn_started", "codex_command_started", "codex_command_completed", "codex_turn_completed", "codex_turn_failed", "codex_error", "codex_agent_message", "codex_file_change"];
|
|
37
|
+
export type ProviderEventName = (typeof PROVIDER_EVENT_NAMES)[number];
|
|
38
|
+
/** Per-event field shapes are NOT pre-declared — `mapProviderEventToPlainEntry`
|
|
39
|
+
* passes through all primitive fields from the raw event payload (object-valued
|
|
40
|
+
* fields become `<name>_json`). The names list above is the closed schema; field
|
|
41
|
+
* shapes are discovered from the provider files at migration time (T11) and
|
|
42
|
+
* asserted by tests/events/provider-event-mapping.test.ts.
|
|
43
|
+
*/
|
|
44
|
+
export declare function mapProviderEventToPlainEntry(provider: 'claude' | 'codex', event: ProviderEventName, rawFields: Record<string, unknown>): PlainLogEntry;
|
|
45
|
+
//# sourceMappingURL=plain-log-entry.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"plain-log-entry.d.ts","sourceRoot":"","sources":["../../src/events/plain-log-entry.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;EAQ3B,CAAC;AACH,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAG5D,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;kBAIrB,CAAC;AACZ,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE,eAAO,MAAM,oBAAoB,+dAQvB,CAAC;AACX,MAAM,MAAM,iBAAiB,GAAG,CAAC,OAAO,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEtE;;;;;GAKG;AAEH,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,QAAQ,GAAG,OAAO,EAC5B,KAAK,EAAE,iBAAiB,EACxB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACjC,aAAa,CAUf"}
|