@zhixuan92/multi-model-agent-core 4.3.1 → 4.5.0

package/README.md

@@ -40,7 +40,7 @@ for (const r of results) {
 - **Routing engine** — capability filter → agent type → cheapest qualifier
 - **`runTasks`** — parallel dispatch, returns per-task results with usage, cost, files touched, status, and escalation log
 - **Reviewed lifecycle** — parallel spec + quality lint review by a different tier, conditional rework when verdicts demand changes, annotator-scored commit gate, file artifact verification
-- **Executors** — pure `execute<Tool>(ctx, input)` functions for delegate, audit, review, verify, debug, execute-plan, retry, investigate, research (used by the HTTP server package)
+- **Executors** — pure `execute<Tool>(ctx, input)` functions for delegate, audit, review, debug, execute-plan, retry, investigate, research (used by the HTTP server package)
 - **Tool schemas** — Zod-validated input shapes for each tool, exportable via `./tool-schemas/*`
 - **BatchRegistry** — server-wide state machine for pending / awaiting_clarification / complete / failed / expired batches with context-block refcount pinning
 - **Sandboxed tools** — `readFile`, `writeFile`, `grep`, `glob`, `listFiles`, `runShell` with `cwd-only` confinement
@@ -91,13 +91,13 @@ const engine = createDefaultReviewerEngine();
 
 ### AnnotatorEngine
 
-Read-only annotation pass for **non-artifact-producing** tools (`audit`, `review`, `verify`, `debug`, `investigate`). Verdict is always `'annotated'` (success) or `'error'` (transport failure); never gates rework.
+Read-only annotation pass for **non-artifact-producing** tools (`audit`, `review`, `debug`, `investigate`, `research`, `explore`). Verdict is always `'annotated'` (success) or `'error'` (transport failure); never gates rework.
 
 | Method | Description |
 |---|---|
-| `annotate(shell, input)` | Runs an annotation pass, re-judging severity and scoring confidence per finding |
+| `annotate(session, input)` | Runs an annotation pass, re-judging severity and scoring confidence per finding |
 
-Accepts a `RunnerShell` and an `AnnotatorInput` (`{ workerOutput, brief, cwd, route, abortSignal?, deadlineMs? }`). Returns `AnnotatorCallResult` with parsed findings, raw assistant text, and cost breakdown.
+Accepts a `Session` (opened via the v4.4 provider boundary) and an `AnnotatorInput` (`{ workerOutput, brief, cwd, route, abortSignal?, deadlineMs? }`). Returns `AnnotatorCallResult` with parsed findings, raw assistant text, and cost breakdown.
 
 ```ts
 import { AnnotatorEngine } from '@zhixuan92/multi-model-agent-core/review';
@@ -137,7 +137,7 @@ Per-tool configuration interface that drives `executeTask`. Each tool exports it
 ```ts
 interface ToolConfig<Input, Brief, Report> {
   name: string;                                              // tool name
-  category: 'artifact_producing' | 'read_only' | 'research' | 'assist';
+  category: 'artifact_producing' | 'read_only' | 'assist';
   agentType: AgentType;                                      // 'standard' | 'complex'
   briefSlot: BriefSlotFiller<Input, Brief[]>;                // input → briefs
   buildTaskSpec: (brief: Brief, ctx: ExecutionContext) => TaskSpec;
@@ -160,7 +160,6 @@ Each tool's config lives at `@zhixuan92/multi-model-agent-core/tools/<tool>/tool
 | delegate | `./tools/delegate/tool-config` |
 | review | `./tools/review/tool-config` |
 | audit | `./tools/audit/tool-config` |
-| verify | `./tools/verify/tool-config` |
 | debug | `./tools/debug/tool-config` |
 | investigate | `./tools/investigate/tool-config` |
 | research | `./tools/research/tool-config` |
@@ -187,7 +186,7 @@ Each tool's config lives at `@zhixuan92/multi-model-agent-core/tools/<tool>/tool
 | `./intake/classify` | `classifyDraft` — deterministic classification heuristic |
 | `./intake/confirm` | `processConfirmations` — clarification resume processing |
 | `./intake/clarification-store` | `ClarificationStore` — TTL/LRU state for clarification sets |
-| `./intake/compilers/*` | Route compilers: `delegate`, `review`, `debug`, `verify`, `audit`, `execute-plan`, `investigate`, `research` |
+| `./intake/compilers/*` | Route compilers: `delegate`, `review`, `debug`, `audit`, `execute-plan`, `investigate`, `research` |
 | `./reporting/parse-investigation-report` | `parseInvestigationReport`, `parseCitations`, `parseConfidence` (3.4.0) |
 | `./auto-commit` | `autoCommitFiles` — git commit helper for worker file changes |
 | `./file-artifact-check` | `partitionFilePaths`, `checkOutputTargets` — output target verification |
@@ -197,7 +196,7 @@ Each tool's config lives at `@zhixuan92/multi-model-agent-core/tools/<tool>/tool
 | `./review` | `ReviewerEngine`, `AnnotatorEngine` — v4 review surface (see Engine API below) |
 | `./lifecycle/task-executor` | `executeTask` — generic per-tool orchestrator driven by a `ToolConfig` |
 | `./lifecycle/executor-output-types` | `ExecutorOutput`, `BatchTimings`, `BatchAggregateCost` |
-| `./tools/<tool>/tool-config` | Per-tool `ToolConfig` objects (delegate, review, audit, verify, debug, investigate, research, execute-plan, retry, register-context-block) |
+| `./tools/<tool>/tool-config` | Per-tool `ToolConfig` objects (delegate, review, audit, debug, investigate, research, execute-plan, retry, register-context-block) |
 
 ## Diagnostic logging
 
@@ -229,23 +228,13 @@ mmagent logs --follow --batch=<id>   # tail + filter
 
 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.
 
-## What's new in 4.0.5
+## What's new in 4.5.0
 
-- **`/research` — single-task external research route.** New `POST /research` endpoint and `toolConfig` at `tools/research/tool-config.ts`. Schema at `tools/research/schema.ts`, brief compiler at `intake/brief-compiler-slots/research.ts`, report parser at `reporting/report-parser-slots/research-report.ts`, headline template at `reporting/headline-templates/research.ts`. Replaces the 3-worker `/explore` orchestrator.
-- **`mma-research` skill + `mma-explore` skill rewrite.** `mma-research` is a thin 1:1 wrapper around `/research`. `mma-explore` is now a main-agent playbook that fans out `mma-investigate` + `mma-research` in parallel; synthesis moves from a worker to the main agent.
-- **`/explore` HTTP route removed.** `tools/explore/`, `intake/brief-compiler-slots/explore.ts`, `reporting/parse-explore-report.ts`, `reporting/report-parser-slots/explore-report.ts`, `reporting/headline-templates/explore.ts`, `research/explore-orchestrator.ts`, and the HTTP handler removed. 8 explore-specific telemetry events removed from `observability-events.ts` and `telemetry-types.ts`.
-
-**Migration from 4.0.4:** library consumers referencing `tools/explore/`, `explore-orchestrator`, or explore-route enums must update to `tools/research/`. `RouteName` drops `'explore_internal' | 'explore_external' | 'explore_synthesize'` and adds `'research'`.
-
-Full history: [CHANGELOG](https://github.com/zhixuan312/multi-model-agent/blob/master/CHANGELOG.md).
-
-## What's new in 4.0.0
-
-- **Closed enums everywhere.** `reviewPolicy` → `'full' | 'quality_only' | 'diff_only' | 'none'` (removed `'spec_only'` and `'off'`); `agentType` → `'standard' | 'complex'`; `tier` drops `'main'`; `mainModelFamily` drops `'gpt-5'`.
-- **4-field `TokenUsage`.** `{inputTokens, outputTokens, cachedReadTokens, cachedNonReadTokens}` — `outputTokens` includes reasoning; `reasoningTokens` and `cachedCreationTokens` removed. SCHEMA_VERSION → 4.
-- **Clarification flow removed.** `confirm_clarifications` route, `mma-clarifications` skill, and `proposedInterpretation` field gone. Intake resolves ambiguity by picking the most likely interpretation.
-- **Engine API.** New `ReviewerEngine` (gating reviews for artifact-producing tools) + `AnnotatorEngine` (read-only annotation passes) replace ad-hoc review functions. Per-tool executors collapsed into a single `executeTask` orchestrator driven by `ToolConfig` slot objects. See [Engine API](#v4-engine-api) above.
-- **Internals.** Declarative `StagePlan` driven by a single `LifecycleDriver`; `RunnerShell` + 3 thin adapters replaces three parallel runner files. `ReadinessClassifier`, `EffortInferer`, `AttemptRecorder`, `RequestPipeline`, `TelemetryFlushWorker`, `CrossTierGuard` removed.
+- **`getRealFilesChanged(state)` helper (`lifecycle/real-diff.ts`).** Derives the canonical written-files list from `git diff --name-only <preTaskHeadSha>` + filtered untracked files (snapshot-diffed against `state.preTaskUntrackedFiles` captured at task entry). Returns `{files, source}` with source ∈ `'git_diff' | 'self_report' | 'git_error'`. `git-commit-handler` and the telemetry event-builder both route through this helper, so commit decisions and `filesWrittenCount` cannot disagree with the actual git state.
+- **`progress-watchdog` (`bounded-execution/progress-watchdog.ts`).** New module mirroring the stall-watchdog shape: `startProgressWatchdog(ctx) → disposer` arms a setInterval poller (5–30s) that aborts via `controller.abort()` when `wallClockMs > thrashWallClockMs` AND `git diff` empty (signal 1). `recordPostHocSignals` checks turn-count thrash (signal 2) and scope violations against `normalizeScopeEntry` / `isInScope` from `lifecycle/scope-match.ts` (signal 3). Wired around `delegateWithEscalation()` in `task-runner.ts` and `session.send()` in `rework-handler.ts`. Skip gates: `!config.enabled`, `toolCategory !== 'artifact_producing'`, missing `preTaskHeadSha` / `preTaskUntrackedFiles`.
+- **Four new `defaults.*` config fields.** `progressWatchdogEnabled` (default `true`), `thrashTurns` (`25`), `thrashWallClockMs` (`1_200_000`), `thrashSoftTurns` (`10`). All optional.
+- **Per-stage `mainEquivalentCostUSD` on `stageStats`.** Each stage entry carries the per-stage main-model-equivalent cost alongside `costUSD` so the frontend slices per-model savings without re-running rate-card math.
+- **`LifecycleState` watchdog fields.** `preTaskUntrackedFiles`, `preStopReason`, `thrashingDetected`, `scopeViolations[]` — all optional, only populated when the watchdog fires.
 
 Full history: [CHANGELOG](https://github.com/zhixuan312/multi-model-agent/blob/master/CHANGELOG.md).
 

package/dist/bounded-execution/cost-compute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cost-compute.d.ts","sourceRoot":"","sources":["../../src/bounded-execution/cost-compute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE/D,MAAM,WAAW,QAAQ;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,wBAAwB,EAAE,MAAM,CAAC;CAClC;AAID,wBAAgB,eAAe,CAC7B,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAChC,QAAQ,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,GAC3B,QAAQ,GAAG,IAAI,CA8BjB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,GAAG,UAAU,CAoB5E;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,GAAG,MAAM,CAO9D"}
+{"version":3,"file":"cost-compute.d.ts","sourceRoot":"","sources":["../../src/bounded-execution/cost-compute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE/D,MAAM,WAAW,QAAQ;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,wBAAwB,EAAE,MAAM,CAAC;CAClC;AAID,wBAAgB,eAAe,CAC7B,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAChC,QAAQ,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,GAC3B,QAAQ,GAAG,IAAI,CAwCjB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,GAAG,UAAU,CAoB5E;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,GAAG,MAAM,CAO9D"}

package/dist/bounded-execution/cost-compute.js

@@ -17,7 +17,17 @@ export function resolveRateCard(model, override) {
     const output = (reasoning !== undefined && Number.isFinite(reasoning) && reasoning > rawOutput)
         ? reasoning
         : rawOutput;
+    // Cache-read default: 0.1× input — matches Anthropic's 5-min/1-hour
+    // cache-read rate and OpenAI's gpt-5.x 90% discount. Explicit per-model
+    // overrides in model-profiles.json take precedence.
     const cachedRead = override?.cachedReadCostPerMTok ?? profile.cachedReadCostPerMTok ?? input * 0.10;
+    // Cache-write default: 1.0× input. Anthropic charges 1.25× (5-min TTL)
+    // or 2.0× (1-hour TTL) for cache writes, but the Anthropic premium is
+    // encoded on the `claude` parent profile (`cachedNonRead: 3.75` = 1.25×
+    // base $3) and inherited by every claude-* model — so this fallback is
+    // only reached for non-Anthropic models that don't emit cache writes
+    // (OpenAI/codex doesn't emit a cache-write field) or for unknown
+    // providers. For those, "no premium" is the safe default.
     const cachedNonRead = override?.cachedNonReadCostPerMTok ?? profile.cachedNonReadCostPerMTok ?? input;
     return {
         inputCostPerMTok: input,

package/dist/bounded-execution/cost-compute.js.map

@@ -1 +1 @@
-{"version":3,"file":"cost-compute.js","sourceRoot":"","sources":["../../src/bounded-execution/cost-compute.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cost-compute.js","sourceRoot":"","sources":["../../src/bounded-execution/cost-compute.ts"],"names":[],"mappings":"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"}

package/dist/bounded-execution/index.d.ts

@@ -6,4 +6,5 @@ export * from './file-artifact-check.js';
 export * from './error-classifier.js';
 export * from './safety-max-turns.js';
 export * from './stall-watchdog.js';
+export * from './progress-watchdog.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/bounded-execution/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bounded-execution/index.ts"],"names":[],"mappings":"AAEA,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bounded-execution/index.ts"],"names":[],"mappings":"AAEA,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC"}

package/dist/bounded-execution/index.js

@@ -7,4 +7,5 @@ export * from './file-artifact-check.js';
 export * from './error-classifier.js';
 export * from './safety-max-turns.js';
 export * from './stall-watchdog.js';
+export * from './progress-watchdog.js';
 //# sourceMappingURL=index.js.map

package/dist/bounded-execution/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/bounded-execution/index.ts"],"names":[],"mappings":"AAAA,mFAAmF;AAEnF,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/bounded-execution/index.ts"],"names":[],"mappings":"AAAA,mFAAmF;AAEnF,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC"}

package/dist/bounded-execution/progress-watchdog.d.ts

@@ -0,0 +1,43 @@
+import type { LifecycleState } from '../lifecycle/stage-plan-types.js';
+export interface ProgressWatchdogConfig {
+    enabled: boolean;
+    thrashTurns: number;
+    thrashWallClockMs: number;
+    thrashSoftWallClockMs: number;
+}
+export interface ProgressWatchdogContext {
+    state: LifecycleState;
+    controller: AbortController;
+    emit: (event: Record<string, unknown>) => void;
+    config: ProgressWatchdogConfig;
+    taskIndex: number;
+    batchId?: string;
+    /** State the watchdog mutates: `fired` so post-hoc code knows the abort came from us. */
+    state2: {
+        fired: boolean;
+    };
+}
+/**
+ * Starts the progress watchdog. Returns a disposer that MUST be called in a
+ * finally{} block. Mirrors startStallWatchdog(): same shape, single function
+ * call, returns cleanup. The watchdog polls on a setInterval; when conditions
+ * trip, it fires `controller.abort()` to interrupt the in-flight session.send().
+ *
+ * Post-hoc signals (turn-count thrash detection and scope-violation analysis)
+ * are handled by recordPostHocSignals() below, called AFTER session.send()
+ * returns. They mutate state for the annotator to consume.
+ */
+export declare function startProgressWatchdog(ctx: ProgressWatchdogContext): () => void;
+/**
+ * Post-hoc finalization called AFTER session.send() returns. Three things:
+ *
+ * 1. Turn-count thrash detection (since we can't observe turns mid-flight).
+ *    If turns > thrashTurns AND real diff is empty AND watchdog didn't already
+ *    trip mid-flight, mark state.thrashingDetected = true so the annotator
+ *    surfaces it. No abort (the session already finished); this is informative.
+ * 2. Scope-violation analysis. Compute out-of-scope files from the final diff
+ *    against declared filePaths; populate state.scopeViolations[].
+ * 3. Emit observability events for both.
+ */
+export declare function recordPostHocSignals(state: LifecycleState, turnsUsed: number, config: ProgressWatchdogConfig, emit: (event: Record<string, unknown>) => void, taskIndex: number, batchId?: string): Promise<void>;
+//# sourceMappingURL=progress-watchdog.d.ts.map

package/dist/bounded-execution/progress-watchdog.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"progress-watchdog.d.ts","sourceRoot":"","sources":["../../src/bounded-execution/progress-watchdog.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAEvE,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,cAAc,CAAC;IACtB,UAAU,EAAE,eAAe,CAAC;IAC5B,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IAC/C,MAAM,EAAE,sBAAsB,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,yFAAyF;IACzF,MAAM,EAAE;QAAE,KAAK,EAAE,OAAO,CAAA;KAAE,CAAC;CAC5B;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,uBAAuB,GAAG,MAAM,IAAI,CA8E9E;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,cAAc,EACrB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,sBAAsB,EAC9B,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,EAC9C,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAqCf"}

package/dist/bounded-execution/progress-watchdog.js

@@ -0,0 +1,137 @@
+// packages/core/src/bounded-execution/progress-watchdog.ts
+import { spawnSync } from 'node:child_process';
+import { getRealFilesChanged } from '../lifecycle/real-diff.js';
+import { normalizeScopeEntry, isInScope } from '../lifecycle/scope-match.js';
+/**
+ * Starts the progress watchdog. Returns a disposer that MUST be called in a
+ * finally{} block. Mirrors startStallWatchdog(): same shape, single function
+ * call, returns cleanup. The watchdog polls on a setInterval; when conditions
+ * trip, it fires `controller.abort()` to interrupt the in-flight session.send().
+ *
+ * Post-hoc signals (turn-count thrash detection and scope-violation analysis)
+ * are handled by recordPostHocSignals() below, called AFTER session.send()
+ * returns. They mutate state for the annotator to consume.
+ */
+export function startProgressWatchdog(ctx) {
+    const ts = () => new Date().toISOString();
+    const meta = {
+        ...(ctx.batchId !== undefined && { batchId: ctx.batchId }),
+        taskIndex: ctx.taskIndex,
+    };
+    // Three skip conditions evaluated once at arm:
+    if (!ctx.config.enabled) {
+        ctx.emit({ event: 'progress_watchdog_skipped_disabled', ts: ts(), reason: 'config_disabled', ...meta });
+        return () => undefined;
+    }
+    if (ctx.state.toolCategory !== 'artifact_producing') {
+        return () => undefined; // silent no-op for read-only routes
+    }
+    if (!ctx.state.preTaskHeadSha || !ctx.state.preTaskUntrackedFiles) {
+        ctx.emit({ event: 'progress_watchdog_skipped_non_git', ts: ts(), reason: 'non_git_cwd', ...meta });
+        return () => undefined;
+    }
+    ctx.emit({ event: 'progress_watchdog_armed', ts: ts(), toolCategory: ctx.state.toolCategory, ...meta });
+    const startedAtMs = Date.now();
+    let warned = false;
+    // Poll interval clamped to [5s, 30s]. Coarser than stall-watchdog's [1s, 5s]
+    // because git diff is heavier than just checking idle time. Total cost: a
+    // few git invocations per task — negligible.
+    const pollIntervalMs = Math.min(30_000, Math.max(5_000, Math.floor(ctx.config.thrashWallClockMs / 60)));
+    const interval = setInterval(() => {
+        if (ctx.state2.fired)
+            return;
+        if (ctx.controller.signal.aborted) {
+            ctx.state2.fired = true;
+            return;
+        }
+        const wallClockMs = Date.now() - startedAtMs;
+        // Cheap pre-check: only call git when we're past the soft threshold (no
+        // point grepping git every 30s during the first few minutes of a task).
+        if (wallClockMs < ctx.config.thrashSoftWallClockMs)
+            return;
+        // Synchronous git diff via spawnSync — same pattern real-diff uses.
+        const cwd = ctx.state.cwd ?? '';
+        const preSha = ctx.state.preTaskHeadSha;
+        const r = spawnSync('git', ['diff', '--name-only', `${preSha}..`], { cwd, encoding: 'utf8' });
+        const diffEmpty = r.status === 0 && r.stdout.trim().length === 0;
+        if (!diffEmpty)
+            return; // diff is non-empty; not thrashing
+        // Signal 2: soft warn (fires once per task)
+        if (!warned && wallClockMs >= ctx.config.thrashSoftWallClockMs) {
+            warned = true;
+            ctx.emit({ event: 'progress_watchdog_warn', ts: ts(), wallClockMs, ...meta });
+        }
+        // Signal 1: hard thrash — wall-clock exceeded + diff still empty → abort
+        if (wallClockMs >= ctx.config.thrashWallClockMs) {
+            ctx.state2.fired = true;
+            ctx.state.thrashingDetected = true;
+            ctx.state.preStopReason = 'thrashing';
+            ctx.controller.abort();
+            ctx.emit({
+                event: 'progress_watchdog_fired_thrash',
+                ts: ts(),
+                wallClockMs,
+                threshold: 'wallclock',
+                ...meta,
+            });
+        }
+    }, pollIntervalMs);
+    return () => {
+        clearInterval(interval);
+        ctx.emit({
+            event: 'progress_watchdog_disarmed',
+            ts: ts(),
+            reason: ctx.state2.fired ? 'thrash' : 'normal',
+            ...meta,
+        });
+    };
+}
+/**
+ * Post-hoc finalization called AFTER session.send() returns. Three things:
+ *
+ * 1. Turn-count thrash detection (since we can't observe turns mid-flight).
+ *    If turns > thrashTurns AND real diff is empty AND watchdog didn't already
+ *    trip mid-flight, mark state.thrashingDetected = true so the annotator
+ *    surfaces it. No abort (the session already finished); this is informative.
+ * 2. Scope-violation analysis. Compute out-of-scope files from the final diff
+ *    against declared filePaths; populate state.scopeViolations[].
+ * 3. Emit observability events for both.
+ */
+export async function recordPostHocSignals(state, turnsUsed, config, emit, taskIndex, batchId) {
+    if (!config.enabled)
+        return;
+    if (state.toolCategory !== 'artifact_producing')
+        return;
+    if (!state.preTaskHeadSha || !state.preTaskUntrackedFiles)
+        return;
+    const meta = {
+        ...(batchId !== undefined && { batchId }),
+        taskIndex,
+    };
+    const ts = () => new Date().toISOString();
+    const realFiles = await getRealFilesChanged(state);
+    if (realFiles.source !== 'git_diff')
+        return;
+    // (1) Post-hoc turn-count thrash (only if watchdog didn't already trip)
+    if (!state.thrashingDetected && turnsUsed > config.thrashTurns && realFiles.files.length === 0) {
+        state.thrashingDetected = true;
+        emit({
+            event: 'progress_watchdog_fired_thrash',
+            ts: ts(),
+            turnsUsed,
+            threshold: 'turns_post_hoc',
+            ...meta,
+        });
+    }
+    // (2) Scope-violation analysis
+    const taskSpec = state.task;
+    const declaredScope = (taskSpec?.filePaths ?? []).map((entry) => normalizeScopeEntry(state.cwd ?? '', entry));
+    if (declaredScope.length > 0 && realFiles.files.length > 0) {
+        const violations = realFiles.files.filter((f) => !isInScope(f, declaredScope));
+        if (violations.length > 0) {
+            state.scopeViolations = violations;
+            emit({ event: 'progress_watchdog_scope_violation', ts: ts(), outOfScope: violations, ...meta });
+        }
+    }
+}
+//# sourceMappingURL=progress-watchdog.js.map

package/dist/bounded-execution/progress-watchdog.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"progress-watchdog.js","sourceRoot":"","sources":["../../src/bounded-execution/progress-watchdog.ts"],"names":[],"mappings":"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"}

package/dist/config/config-resolver.d.ts

@@ -23,10 +23,12 @@ export type MainAgentModelResolution = {
     reason: string;
 };
 /**
- * Return the names of openai-compatible agents carrying an inline `apiKey`
- * instead of using `apiKeyEnv`. The schema permits both, but plaintext API
- * keys in a config file are a backup/dotfile/git footgun — serve surfaces
- * this once at startup so the operator can react.
+ * Return the names of agents carrying an inline `apiKey` instead of using
+ * `apiKeyEnv`. The schema permits both, but plaintext API keys in a config
+ * file are a backup/dotfile/git footgun — serve surfaces this once at
+ * startup so the operator can react. Applies to any agent (claude/codex)
+ * that has been configured against a non-default backend (`baseUrl` set)
+ * and chosen to inline the key.
  */
 export declare function collectInlineApiKeyOffenders(config: MultiModelConfig): string[];
 /**

package/dist/config/config-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-resolver.d.ts","sourceRoot":"","sources":["../../src/config/config-resolver.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,MAAM,MAAM,OAAO,GAAG;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,uBAAuB,EAAE,MAAM,CAAC;IAChC,0BAA0B,EAAE,MAAM,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAChC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,GACpD;IAAE,IAAI,EAAE,wBAAwB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACpF;IAAE,IAAI,EAAE,kBAAkB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,GAC7D;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAErC;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,EAAE,CAW/E;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,OAAO,GAAG,SAAS,EAChC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,GACnC,wBAAwB,CAgB1B;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAEzD"}
+{"version":3,"file":"config-resolver.d.ts","sourceRoot":"","sources":["../../src/config/config-resolver.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,MAAM,MAAM,OAAO,GAAG;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,uBAAuB,EAAE,MAAM,CAAC;IAChC,0BAA0B,EAAE,MAAM,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAChC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,GACpD;IAAE,IAAI,EAAE,wBAAwB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACpF;IAAE,IAAI,EAAE,kBAAkB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,GAC7D;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAErC;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,EAAE,CAQ/E;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,OAAO,GAAG,SAAS,EAChC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,GACnC,wBAAwB,CAgB1B;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAEzD"}

package/dist/config/config-resolver.js

@@ -4,16 +4,17 @@
 // (decide-which-source-wins) live here.
 import { pricingSchema } from './schema.js';
 /**
- * Return the names of openai-compatible agents carrying an inline `apiKey`
- * instead of using `apiKeyEnv`. The schema permits both, but plaintext API
- * keys in a config file are a backup/dotfile/git footgun — serve surfaces
- * this once at startup so the operator can react.
+ * Return the names of agents carrying an inline `apiKey` instead of using
+ * `apiKeyEnv`. The schema permits both, but plaintext API keys in a config
+ * file are a backup/dotfile/git footgun — serve surfaces this once at
+ * startup so the operator can react. Applies to any agent (claude/codex)
+ * that has been configured against a non-default backend (`baseUrl` set)
+ * and chosen to inline the key.
  */
 export function collectInlineApiKeyOffenders(config) {
     const offenders = [];
     for (const [name, agent] of Object.entries(config.agents)) {
-        if ((agent.type === 'openai-compatible' || agent.type === 'claude-compatible') &&
-            typeof agent.apiKey === 'string') {
+        if (typeof agent.apiKey === 'string') {
             offenders.push(name);
         }
     }

package/dist/config/config-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"config-resolver.js","sourceRoot":"","sources":["../../src/config/config-resolver.ts"],"names":[],"mappings":"AAAA,8CAA8C;AAC9C,sDAAsD;AACtD,sEAAsE;AACtE,wCAAwC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAgB5C;;;;;GAKG;AACH,MAAM,UAAU,4BAA4B,CAAC,MAAwB;IACnE,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1D,IACE,CAAC,KAAK,CAAC,IAAI,KAAK,mBAAmB,IAAI,KAAK,CAAC,IAAI,KAAK,mBAAmB,CAAC;YAC1E,OAAQ,KAA8B,CAAC,MAAM,KAAK,QAAQ,EAC1D,CAAC;YACD,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,qBAAqB,CACnC,OAAe,EACf,WAAgC,EAChC,cAAoC;IAEpC,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC1C,IAAI,KAAK,IAAI,CAAC,WAAW;QAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IACtF,IAAI,KAAK,IAAI,WAAW,EAAE,CAAC;QACzB,OAAO;YACL,IAAI,EAAE,wBAAwB;YAC9B,KAAK,EAAE,OAAO;YACd,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,0CAA0C,OAAO,oDAAoD;SAC/G,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,KAAK,IAAI,WAAW;QAAE,OAAO,EAAE,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IACrG,OAAO;QACL,IAAI,EAAE,MAAM;QACZ,MAAM,EAAE,mBAAmB,OAAO,iGAAiG;KACpI,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,GAAY;IAC9C,OAAO,aAAa,CAAC,KAAK,CAAC,GAAG,CAAY,CAAC;AAC7C,CAAC"}
+{"version":3,"file":"config-resolver.js","sourceRoot":"","sources":["../../src/config/config-resolver.ts"],"names":[],"mappings":"AAAA,8CAA8C;AAC9C,sDAAsD;AACtD,sEAAsE;AACtE,wCAAwC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAgB5C;;;;;;;GAOG;AACH,MAAM,UAAU,4BAA4B,CAAC,MAAwB;IACnE,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1D,IAAI,OAAQ,KAA8B,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/D,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,qBAAqB,CACnC,OAAe,EACf,WAAgC,EAChC,cAAoC;IAEpC,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC1C,IAAI,KAAK,IAAI,CAAC,WAAW;QAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IACtF,IAAI,KAAK,IAAI,WAAW,EAAE,CAAC;QACzB,OAAO;YACL,IAAI,EAAE,wBAAwB;YAC9B,KAAK,EAAE,OAAO;YACd,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,0CAA0C,OAAO,oDAAoD;SAC/G,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,KAAK,IAAI,WAAW;QAAE,OAAO,EAAE,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IACrG,OAAO;QACL,IAAI,EAAE,MAAM;QACZ,MAAM,EAAE,mBAAmB,OAAO,iGAAiG;KACpI,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,GAAY;IAC9C,OAAO,aAAa,CAAC,KAAK,CAAC,GAAG,CAAY,CAAC;AAC7C,CAAC"}

package/dist/config/schema.d.ts

@@ -83,26 +83,6 @@ export declare const serverConfigSchema: z.ZodObject<{
 export declare const multiModelConfigSchema: z.ZodObject<{
     agents: z.ZodObject<{
         standard: z.ZodDiscriminatedUnion<[z.ZodObject<{
-            model: z.ZodString;
-            effort: z.ZodOptional<z.ZodEnum<{
-                none: "none";
-                low: "low";
-                medium: "medium";
-                high: "high";
-            }>>;
-            inputCostPerMTok: z.ZodOptional<z.ZodNumber>;
-            outputCostPerMTok: z.ZodOptional<z.ZodNumber>;
-            timeoutMs: z.ZodOptional<z.ZodNumber>;
-            sandboxPolicy: z.ZodOptional<z.ZodEnum<{
-                none: "none";
-                "cwd-only": "cwd-only";
-            }>>;
-            inputTokenSoftLimit: z.ZodOptional<z.ZodNumber>;
-            type: z.ZodLiteral<"openai-compatible">;
-            baseUrl: z.ZodString;
-            apiKey: z.ZodOptional<z.ZodString>;
-            apiKeyEnv: z.ZodOptional<z.ZodString>;
-        }, z.core.$strip>, z.ZodObject<{
             model: z.ZodString;
             effort: z.ZodOptional<z.ZodEnum<{
                 none: "none";
@@ -119,24 +99,7 @@ export declare const multiModelConfigSchema: z.ZodObject<{
             }>>;
             inputTokenSoftLimit: z.ZodOptional<z.ZodNumber>;
             type: z.ZodLiteral<"claude">;
-        }, z.core.$strict>, z.ZodObject<{
-            model: z.ZodString;
-            effort: z.ZodOptional<z.ZodEnum<{
-                none: "none";
-                low: "low";
-                medium: "medium";
-                high: "high";
-            }>>;
-            inputCostPerMTok: z.ZodOptional<z.ZodNumber>;
-            outputCostPerMTok: z.ZodOptional<z.ZodNumber>;
-            timeoutMs: z.ZodOptional<z.ZodNumber>;
-            sandboxPolicy: z.ZodOptional<z.ZodEnum<{
-                none: "none";
-                "cwd-only": "cwd-only";
-            }>>;
-            inputTokenSoftLimit: z.ZodOptional<z.ZodNumber>;
-            type: z.ZodLiteral<"claude-compatible">;
-            baseUrl: z.ZodString;
+            baseUrl: z.ZodOptional<z.ZodString>;
             apiKey: z.ZodOptional<z.ZodString>;
             apiKeyEnv: z.ZodOptional<z.ZodString>;
         }, z.core.$strict>, z.ZodObject<{
@@ -156,28 +119,11 @@ export declare const multiModelConfigSchema: z.ZodObject<{
             }>>;
             inputTokenSoftLimit: z.ZodOptional<z.ZodNumber>;
             type: z.ZodLiteral<"codex">;
-        }, z.core.$strict>], "type">;
-        complex: z.ZodDiscriminatedUnion<[z.ZodObject<{
-            model: z.ZodString;
-            effort: z.ZodOptional<z.ZodEnum<{
-                none: "none";
-                low: "low";
-                medium: "medium";
-                high: "high";
-            }>>;
-            inputCostPerMTok: z.ZodOptional<z.ZodNumber>;
-            outputCostPerMTok: z.ZodOptional<z.ZodNumber>;
-            timeoutMs: z.ZodOptional<z.ZodNumber>;
-            sandboxPolicy: z.ZodOptional<z.ZodEnum<{
-                none: "none";
-                "cwd-only": "cwd-only";
-            }>>;
-            inputTokenSoftLimit: z.ZodOptional<z.ZodNumber>;
-            type: z.ZodLiteral<"openai-compatible">;
-            baseUrl: z.ZodString;
+            baseUrl: z.ZodOptional<z.ZodString>;
             apiKey: z.ZodOptional<z.ZodString>;
             apiKeyEnv: z.ZodOptional<z.ZodString>;
-        }, z.core.$strip>, z.ZodObject<{
+        }, z.core.$strict>], "type">;
+        complex: z.ZodDiscriminatedUnion<[z.ZodObject<{
             model: z.ZodString;
             effort: z.ZodOptional<z.ZodEnum<{
                 none: "none";
@@ -194,24 +140,7 @@ export declare const multiModelConfigSchema: z.ZodObject<{
             }>>;
             inputTokenSoftLimit: z.ZodOptional<z.ZodNumber>;
             type: z.ZodLiteral<"claude">;
-        }, z.core.$strict>, z.ZodObject<{
-            model: z.ZodString;
-            effort: z.ZodOptional<z.ZodEnum<{
-                none: "none";
-                low: "low";
-                medium: "medium";
-                high: "high";
-            }>>;
-            inputCostPerMTok: z.ZodOptional<z.ZodNumber>;
-            outputCostPerMTok: z.ZodOptional<z.ZodNumber>;
-            timeoutMs: z.ZodOptional<z.ZodNumber>;
-            sandboxPolicy: z.ZodOptional<z.ZodEnum<{
-                none: "none";
-                "cwd-only": "cwd-only";
-            }>>;
-            inputTokenSoftLimit: z.ZodOptional<z.ZodNumber>;
-            type: z.ZodLiteral<"claude-compatible">;
-            baseUrl: z.ZodString;
+            baseUrl: z.ZodOptional<z.ZodString>;
             apiKey: z.ZodOptional<z.ZodString>;
             apiKeyEnv: z.ZodOptional<z.ZodString>;
         }, z.core.$strict>, z.ZodObject<{
@@ -231,6 +160,9 @@ export declare const multiModelConfigSchema: z.ZodObject<{
             }>>;
             inputTokenSoftLimit: z.ZodOptional<z.ZodNumber>;
             type: z.ZodLiteral<"codex">;
+            baseUrl: z.ZodOptional<z.ZodString>;
+            apiKey: z.ZodOptional<z.ZodString>;
+            apiKeyEnv: z.ZodOptional<z.ZodString>;
         }, z.core.$strict>], "type">;
     }, z.core.$strip>;
     defaults: z.ZodDefault<z.ZodObject<{
@@ -249,6 +181,10 @@ export declare const multiModelConfigSchema: z.ZodObject<{
         }>>;
         largeResponseThresholdChars: z.ZodOptional<z.ZodNumber>;
         mainModel: z.ZodOptional<z.ZodString>;
+        progressWatchdogEnabled: z.ZodOptional<z.ZodBoolean>;
+        thrashTurns: z.ZodOptional<z.ZodNumber>;
+        thrashWallClockMs: z.ZodOptional<z.ZodNumber>;
+        thrashSoftTurns: z.ZodOptional<z.ZodNumber>;
     }, z.core.$strip>>;
     diagnostics: z.ZodOptional<z.ZodObject<{
         log: z.ZodDefault<z.ZodBoolean>;

package/dist/config/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EACV,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAErB;;;;;0BAK0B;AAC1B,eAAO,MAAM,uBAAuB,UAAY,CAAC;AAEjD;;;iEAGiE;AACjE,eAAO,MAAM,wBAAwB,UAAY,CAAC;AAElD;oDACoD;AACpD,eAAO,MAAM,oBAAoB,KAAK,CAAC;AAEvC;;;;;iCAKiC;AACjC,eAAO,MAAM,sBAAsB,MAAO,CAAC;AAE3C;;;yEAGyE;AACzE,eAAO,MAAM,sBAAsB,MAAO,CAAC;AAuE3C,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;mBAqC9B,CAAC;AAEJ,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AASlE,eAAO,MAAM,aAAa;;;;;kBAKf,CAAC;AA4EZ,4DAA4D;AAC5D,eAAO,MAAM,2BAA2B,QAAa,CAAC;AAsCtD,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;kBAUpB,CAAC;AAEZ,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBA2BxB,CAAC;AAEZ,mEAAmE;AACnE,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAE9D,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,gBAAgB,CAAA;IACxB,OAAO,EAAE,IAAI,CAAA;CACd;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,KAAK,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;CACd;AAED,MAAM,MAAM,iBAAiB,GAAG,mBAAmB,GAAG,mBAAmB,CAAA;AAEzE;;;GAGG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,CAE1D"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EACV,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAErB;;;;;0BAK0B;AAC1B,eAAO,MAAM,uBAAuB,UAAY,CAAC;AAEjD;;;iEAGiE;AACjE,eAAO,MAAM,wBAAwB,UAAY,CAAC;AAElD;oDACoD;AACpD,eAAO,MAAM,oBAAoB,KAAK,CAAC;AAEvC;;;;;iCAKiC;AACjC,eAAO,MAAM,sBAAsB,MAAO,CAAC;AAE3C;;;yEAGyE;AACzE,eAAO,MAAM,sBAAsB,MAAO,CAAC;AAuE3C,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;mBAqC9B,CAAC;AAEJ,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AASlE,eAAO,MAAM,aAAa;;;;;kBAKf,CAAC;AAuEZ,4DAA4D;AAC5D,eAAO,MAAM,2BAA2B,QAAa,CAAC;AAsCtD,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;kBAUpB,CAAC;AAEZ,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBA2BxB,CAAC;AAEZ,mEAAmE;AACnE,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAE9D,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,gBAAgB,CAAA;IACxB,OAAO,EAAE,IAAI,CAAA;CACd;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,KAAK,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;CACd;AAED,MAAM,MAAM,iBAAiB,GAAG,mBAAmB,GAAG,mBAAmB,CAAA;AAEzE;;;GAGG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,CAE1D"}

package/dist/config/schema.js

@@ -149,36 +149,29 @@ const baseAgentFields = {
     sandboxPolicy: sandboxPolicySchema,
     inputTokenSoftLimit: z.number().int().positive().optional(),
 };
-const openAICompatibleAgentSchema = z.object({
-    type: z.literal('openai-compatible'),
-    baseUrl: z.string().min(1, 'baseUrl is required for openai-compatible agents'),
-    apiKey: z.string().optional(),
-    apiKeyEnv: z.string().optional(),
-    ...baseAgentFields,
-});
+// v4.4: two provider types only. `claude` covers Anthropic API + any
+// Anthropic-compatible proxy (set baseUrl). `codex` covers ChatGPT
+// subscription + OpenAI API + any OpenAI-compatible endpoint (Groq,
+// DeepSeek, OpenRouter, Together, LM Studio, Ollama — set baseUrl +
+// apiKeyEnv to enable). The compatibility variants from earlier
+// releases have been removed — collapse all of them onto `claude` or
+// `codex` with the appropriate `baseUrl` set.
 const claudeAgentSchema = z.object({
     type: z.literal('claude'),
-    ...baseAgentFields,
-}).strict();
-// `claude-compatible` targets an Anthropic-format endpoint hosted by another
-// vendor (e.g. DeepSeek's https://api.deepseek.com/anthropic). It mirrors
-// `openai-compatible`: required baseUrl + apiKey/apiKeyEnv, talks the same
-// wire format as the canonical provider.
-const claudeCompatibleAgentSchema = z.object({
-    type: z.literal('claude-compatible'),
-    baseUrl: z.string().min(1, 'baseUrl is required for claude-compatible agents'),
+    baseUrl: z.string().min(1).optional(),
     apiKey: z.string().optional(),
     apiKeyEnv: z.string().optional(),
     ...baseAgentFields,
 }).strict();
 const codexAgentSchema = z.object({
     type: z.literal('codex'),
+    baseUrl: z.string().min(1).optional(),
+    apiKey: z.string().optional(),
+    apiKeyEnv: z.string().optional(),
     ...baseAgentFields,
 }).strict();
 const agentConfigSchema = z.discriminatedUnion('type', [
-    openAICompatibleAgentSchema,
     claudeAgentSchema,
-    claudeCompatibleAgentSchema,
     codexAgentSchema,
 ]);
 // === MultiModelConfig schema ===
@@ -193,6 +186,10 @@ const defaultsSchema = z.object({
     // in the resolver chain. Headers + per-client auto-detection take
     // precedence; this is the explicit operator override / last resort.
     mainModel: z.string().min(1).optional(),
+    progressWatchdogEnabled: z.boolean().optional(),
+    thrashTurns: z.number().int().positive().optional(),
+    thrashWallClockMs: z.number().int().positive().optional(),
+    thrashSoftTurns: z.number().int().positive().optional(),
 }).default(() => ({
     timeoutMs: DEFAULT_TASK_TIMEOUT_MS,
     stallTimeoutMs: DEFAULT_STALL_TIMEOUT_MS,