@zhixuan92/multi-model-agent-core 4.0.1 → 4.0.3

package/dist/providers/provider-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider-factory.d.ts","sourceRoot":"","sources":["../../src/providers/provider-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAa,gBAAgB,EAAkB,MAAM,aAAa,CAAC;AAOpG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAWzD,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI,CAG7E;AAED,wBAAgB,gCAAgC,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,IAAI,GAAG,IAAI,CAGxF;AAED,wBAAgB,YAAY,CAAC,WAAW,EAAE;IACxC,IAAI,EAAE,mBAAmB,GAAG,QAAQ,GAAG,mBAAmB,GAAG,OAAO,CAAC;IACrE,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,aAAa,CA+BhB;AAQD,wBAAgB,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,gBAAgB,GAAG,QAAQ,CA4ElF"}
+{"version":3,"file":"provider-factory.d.ts","sourceRoot":"","sources":["../../src/providers/provider-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAa,gBAAgB,EAAkB,MAAM,aAAa,CAAC;AAOpG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAYzD,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI,CAG7E;AAED,wBAAgB,gCAAgC,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,IAAI,GAAG,IAAI,CAGxF;AAcD,wBAAgB,YAAY,CAAC,WAAW,EAAE;IACxC,IAAI,EAAE,mBAAmB,GAAG,QAAQ,GAAG,mBAAmB,GAAG,OAAO,CAAC;IACrE,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,aAAa,CA4ChB;AAQD,wBAAgB,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,gBAAgB,GAAG,QAAQ,CAuFlF"}

package/dist/providers/provider-factory.js

@@ -3,6 +3,7 @@ import { AnthropicMessagesAdapter } from './anthropic-messages-adapter.js';
 import { OpenAIChatAdapter } from './openai-chat-adapter.js';
 import { OpenAIResponsesAdapter } from './openai-responses-adapter.js';
 import { makeToolDefinitions } from './tool-definitions.js';
+import { getCodexAuth } from '../identity/auth-token-store.js';
 let coreTestProviderOverride = null;
 let coreTestProviderOverrideMap = null;
 function assertTestProviderEnabled() {
@@ -18,10 +19,20 @@ export function __setCoreTestProviderOverrideMap(map) {
     assertTestProviderEnabled();
     coreTestProviderOverrideMap = map;
 }
+// No output-token caps anywhere — the only worker bounds are the
+// task-level wall-clock deadline and (when set) the per-task cost
+// ceiling. OpenAI Chat + Responses adapters omit max_tokens entirely
+// so the model uses its full output budget. Anthropic Messages
+// **requires** max_tokens per API spec, so we pass a value high
+// enough to never bite in practice (matches the largest documented
+// ceiling across the Claude family). If a model accepts less, the
+// API rejects loudly — easier to triage than a silent truncation,
+// which is the failure mode 4.0.x hit at the 4096 default when
+// deepseek-v4-pro burned its budget on a thinking block.
+const ANTHROPIC_MAX_TOKENS_REQUIRED = 64000;
 export function buildAdapter(agentConfig) {
     const apiKey = agentConfig.apiKey
         ?? (agentConfig.apiKeyEnv ? process.env[agentConfig.apiKeyEnv] : undefined);
-    const maxOutputTokens = 4096;
     switch (agentConfig.type) {
         case 'claude':
         case 'claude-compatible':
@@ -29,7 +40,7 @@ export function buildAdapter(agentConfig) {
                 apiKey: apiKey || 'not-needed',
                 baseURL: agentConfig.baseUrl,
                 model: agentConfig.model,
-                maxOutputTokens,
+                maxOutputTokens: ANTHROPIC_MAX_TOKENS_REQUIRED,
                 providerType: agentConfig.type,
             });
         case 'openai-compatible':
@@ -37,16 +48,30 @@ export function buildAdapter(agentConfig) {
                 apiKey: apiKey || 'not-needed',
                 baseURL: agentConfig.baseUrl,
                 model: agentConfig.model,
-                maxOutputTokens,
                 providerType: 'openai-compatible',
             });
-        case 'codex':
+        case 'codex': {
+            // Prefer ChatGPT/Codex OAuth (~/.codex/auth.json) — this is how
+            // users who logged in via `codex` CLI authenticate. Without it, the
+            // request hits api.openai.com with a placeholder key and 401s. If
+            // OAuth is missing, fall back to whatever apiKey the user supplied
+            // (so the codex type can also be pointed at api.openai.com with a
+            // real key, or any other OpenAI-Responses-compatible endpoint).
+            const oauth = getCodexAuth();
+            if (oauth && !apiKey && !agentConfig.baseUrl) {
+                return new OpenAIResponsesAdapter({
+                    apiKey: oauth.accessToken,
+                    baseURL: 'https://chatgpt.com/backend-api/codex',
+                    model: agentConfig.model,
+                    defaultHeaders: { 'chatgpt-account-id': oauth.accountId },
+                });
+            }
             return new OpenAIResponsesAdapter({
                 apiKey: apiKey || 'not-needed',
                 baseURL: agentConfig.baseUrl,
                 model: agentConfig.model,
-                maxOutputTokens,
             });
+        }
     }
 }
 const SYSTEM_PROMPT = [
@@ -77,13 +102,20 @@ export function createProvider(slot, config) {
                 ? `${SYSTEM_PROMPT}\n\n${options.instructionsSuffix}`
                 : SYSTEM_PROMPT;
             const adapter = buildAdapter(agentConfig);
-            const shell = new RunnerShell(adapter);
+            const shell = new RunnerShell(adapter, providerConfig.model);
             const result = await shell.run({
                 systemPrompt: effectiveSystemPrompt,
                 userMessage: prompt,
                 toolDefinitions,
                 maxTurns,
                 cwd,
+                ...(options.abortSignal && { abortSignal: options.abortSignal }),
+                ...(options.bus && { bus: options.bus }),
+                ...(options.batchId !== undefined && { batchId: options.batchId }),
+                ...(options.taskIndex !== undefined && { taskIndex: options.taskIndex }),
+                ...(options.tier !== undefined && { tier: options.tier }),
+                ...(options.stageLabel !== undefined && { stageLabel: options.stageLabel }),
+                model: providerConfig.model,
             });
             const toolCallSummaries = result.toolCalls.map(tc => {
                 const inputPreview = typeof tc.input === 'object' && tc.input !== null
@@ -95,15 +127,19 @@ export function createProvider(slot, config) {
                 output: result.finalAssistantText,
                 status: result.workerStatus === 'done' ? 'ok' : 'incomplete',
                 usage: result.usage,
-                turns: result.toolCalls.length,
-                filesRead: [],
-                filesWritten: [],
+                turns: result.turns,
+                durationMs: result.durationMs,
+                filesRead: result.filesRead,
+                filesWritten: result.filesWritten,
                 toolCalls: toolCallSummaries,
                 outputIsDiagnostic: false,
                 escalationLog: [],
                 parsedFindings: null,
                 workerStatus: result.workerStatus,
                 errorCode: result.errorCode,
+                ...(result.costUSD !== null && {
+                    cost: { costUSD: result.costUSD, costDeltaVsMainUSD: null },
+                }),
             };
         }
         catch (err) {

package/dist/providers/provider-factory.js.map

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

package/dist/providers/runner-adapter.d.ts

@@ -26,6 +26,16 @@ export interface AdapterTurnResult {
     usage: TokenUsage;
     finishReason: 'stop' | 'tool_use' | 'max_tokens' | 'error';
     errorCode?: string;
+    /** Provider-side response shape for verbose diagnostics. Adapters report
+     *  the raw stop_reason and a count of each content block type so the
+     *  runner-shell can emit a `runner_response_received` event when the
+     *  bus is wired. Lets operators see e.g. `{ text: 0, thinking: 1 }`
+     *  when a provider returns reasoning-only and no narrative — the
+     *  signature failure mode that produced silent empty output in 4.0.x. */
+    responseShape?: {
+        stopReason?: string;
+        contentBlocks?: Record<string, number>;
+    };
 }
 export interface AdapterCapabilities {
     cache_control: boolean;

package/dist/providers/runner-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner-adapter.d.ts","sourceRoot":"","sources":["../../src/providers/runner-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE9D,MAAM,WAAW,iBAAiB;IAChC,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;CACrE;AAED,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,eAAe,EAAE,cAAc,EAAE,CAAC;IAClC,YAAY,EAAE,mBAAmB,CAAC;IAClC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAChC,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,EAAE,CAAC;IAC9C,KAAK,EAAE,UAAU,CAAC;IAClB,YAAY,EAAE,MAAM,GAAG,UAAU,GAAG,YAAY,GAAG,OAAO,CAAC;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,mBAAmB;IAClC,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,YAAY,EAAE,QAAQ,GAAG,mBAAmB,GAAG,QAAQ,GAAG,mBAAmB,GAAG,OAAO,CAAC;IACjG,IAAI,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;CAC3D"}
+{"version":3,"file":"runner-adapter.d.ts","sourceRoot":"","sources":["../../src/providers/runner-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE9D,MAAM,WAAW,iBAAiB;IAChC,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;CACrE;AAED,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,eAAe,EAAE,cAAc,EAAE,CAAC;IAClC,YAAY,EAAE,mBAAmB,CAAC;IAClC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAChC,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,EAAE,CAAC;IAC9C,KAAK,EAAE,UAAU,CAAC;IAClB,YAAY,EAAE,MAAM,GAAG,UAAU,GAAG,YAAY,GAAG,OAAO,CAAC;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;;6EAKyE;IACzE,aAAa,CAAC,EAAE;QACd,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KACxC,CAAC;CACH;AAED,MAAM,WAAW,mBAAmB;IAClC,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,YAAY,EAAE,QAAQ,GAAG,mBAAmB,GAAG,QAAQ,GAAG,mBAAmB,GAAG,OAAO,CAAC;IACjG,IAAI,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;CAC3D"}

package/dist/providers/runner-shell-types.d.ts

@@ -1,4 +1,5 @@
 import type { TokenUsage } from './runner-types.js';
+import type { EventEmitter } from '../events/event-emitter.js';
 export type WorkerStatus = 'done' | 'done_with_concerns' | 'needs_context' | 'blocked' | 'failed';
 export interface RunInput {
     systemPrompt: string;
@@ -9,6 +10,25 @@ export interface RunInput {
     capabilities?: import('./runner-adapter.js').AdapterCapabilities;
     abortSignal?: AbortSignal;
     deadlineMs?: number;
+    /** Bus for per-turn / per-runner-call observability events. When present,
+     *  shell + adapter emit `runner_turn_started` / `runner_response_received`
+     *  / `runner_turn_completed` events so VerboseLogChannel surfaces them
+     *  on stderr in real time during a long task run. */
+    bus?: EventEmitter;
+    /** Identifies the in-flight batch in emitted events. */
+    batchId?: string;
+    /** Identifies which task within a batch is running. Carried through to
+     *  every emitted event so polling can show per-task progress when a
+     *  batch has multiple parallel tasks. */
+    taskIndex?: number;
+    /** Tier label (`'standard'` | `'complex'`) included in emitted events. */
+    tier?: string;
+    /** Provider model id included in emitted events. */
+    model?: string;
+    /** Lifecycle stage label (e.g. 'Implementing', 'Spec review'). Surfaced
+     *  on the running-headline polling response so the main agent's poll
+     *  loop shows which lifecycle stage is currently active. */
+    stageLabel?: string;
 }
 export interface RunResult {
     workerStatus: WorkerStatus;
@@ -16,6 +36,19 @@ export interface RunResult {
     toolCalls: ToolCall[];
     usage: TokenUsage;
     errorCode?: ErrorCode;
+    /** Number of LLM turns executed (one per adapter.turn() call). Distinct
+     *  from toolCalls.length — a turn can return multiple tool calls or none. */
+    turns: number;
+    /** Wall-clock for the entire shell.run() invocation. */
+    durationMs: number;
+    /** Files read during this run (paths from successful read_file/readFile tool calls). */
+    filesRead: string[];
+    /** Files written during this run (paths from successful write_file/writeFile/edit_file tool calls). */
+    filesWritten: string[];
+    /** USD cost computed from usage tokens and the model's rate card.
+     *  null when the model isn't in the rate-card registry (treated as honest-null
+     *  by the wire, not zero). */
+    costUSD: number | null;
 }
 export interface ToolDefinition {
     name: string;

package/dist/providers/runner-shell-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner-shell-types.d.ts","sourceRoot":"","sources":["../../src/providers/runner-shell-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,oBAAoB,GAAG,eAAe,GAAG,SAAS,GAAG,QAAQ,CAAC;AAElG,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,cAAc,EAAE,CAAC;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,OAAO,qBAAqB,EAAE,mBAAmB,CAAC;IACjE,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,SAAS;IACxB,YAAY,EAAE,YAAY,CAAC;IAC3B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAClE;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC"}
+{"version":3,"file":"runner-shell-types.d.ts","sourceRoot":"","sources":["../../src/providers/runner-shell-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,oBAAoB,GAAG,eAAe,GAAG,SAAS,GAAG,QAAQ,CAAC;AAElG,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,cAAc,EAAE,CAAC;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,OAAO,qBAAqB,EAAE,mBAAmB,CAAC;IACjE,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;yDAGqD;IACrD,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB,wDAAwD;IACxD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;6CAEyC;IACzC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0EAA0E;IAC1E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,oDAAoD;IACpD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;gEAE4D;IAC5D,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,SAAS;IACxB,YAAY,EAAE,YAAY,CAAC;IAC3B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB;iFAC6E;IAC7E,KAAK,EAAE,MAAM,CAAC;IACd,wDAAwD;IACxD,UAAU,EAAE,MAAM,CAAC;IACnB,wFAAwF;IACxF,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,uGAAuG;IACvG,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB;;kCAE8B;IAC9B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAClE;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC"}

package/dist/providers/runner-shell.d.ts

@@ -1,8 +1,17 @@
 import type { RunInput, RunResult } from './runner-shell-types.js';
 import type { RunnerAdapter } from './runner-adapter.js';
+export declare function shellCommandWritesFs(command: string): boolean;
 export declare class RunnerShell {
     private adapter;
-    constructor(adapter: RunnerAdapter);
+    /** Default model id used for cost computation when input.model is absent.
+     *  Reviewer/annotator engines call shell.run() without setting input.model,
+     *  so without this default every reviewer-side stage would record costUSD=null. */
+    private defaultModel?;
+    constructor(adapter: RunnerAdapter, 
+    /** Default model id used for cost computation when input.model is absent.
+     *  Reviewer/annotator engines call shell.run() without setting input.model,
+     *  so without this default every reviewer-side stage would record costUSD=null. */
+    defaultModel?: string | undefined);
     run(input: RunInput): Promise<RunResult>;
 }
 //# sourceMappingURL=runner-shell.d.ts.map

package/dist/providers/runner-shell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner-shell.d.ts","sourceRoot":"","sources":["../../src/providers/runner-shell.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAA8B,MAAM,yBAAyB,CAAC;AAC/F,OAAO,KAAK,EAAE,aAAa,EAA6D,MAAM,qBAAqB,CAAC;AAMpH,qBAAa,WAAW;IACV,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,aAAa;IAEpC,GAAG,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;CA0E/C"}
+{"version":3,"file":"runner-shell.d.ts","sourceRoot":"","sources":["../../src/providers/runner-shell.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAA8B,MAAM,yBAAyB,CAAC;AAC/F,OAAO,KAAK,EAAE,aAAa,EAA6D,MAAM,qBAAqB,CAAC;AAoEpH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAM7D;AAaD,qBAAa,WAAW;IAEpB,OAAO,CAAC,OAAO;IACf;;uFAEmF;IACnF,OAAO,CAAC,YAAY,CAAC;gBAJb,OAAO,EAAE,aAAa;IAC9B;;uFAEmF;IAC3E,YAAY,CAAC,EAAE,MAAM,YAAA;IAGzB,GAAG,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;CAqN/C"}

package/dist/providers/runner-shell.js

@@ -1,18 +1,123 @@
+import { resolveRateCard, priceTokens } from '../bounded-execution/cost-compute.js';
 const DEFAULT_CAPABILITIES = {
     cache_control: false, thinking: false, vision: false, tool_use: true, streaming: false, other: [],
 };
+// Tool-name sets are centralized in `tool-name-sets.ts` so the
+// runner-shell + running-headline-sink can't drift. Note: this
+// runner's READ list is intentionally narrower than the central
+// READ_TOOL_NAMES — runner-shell tracks filesRead by extractable
+// path, and grep/glob/listFiles don't have a single "file" arg. The
+// central set is for the polling headline's read activity counter,
+// which counts every read-class tool call regardless of args.
+import { WRITE_TOOL_NAMES, SHELL_TOOL_NAMES } from './tool-name-sets.js';
+const READ_TOOL_NAMES = new Set(['readFile', 'read_file']);
+function extractPathFromToolInput(input) {
+    if (typeof input !== 'object' || input === null)
+        return undefined;
+    const obj = input;
+    for (const key of ['path', 'file_path', 'filePath']) {
+        const v = obj[key];
+        if (typeof v === 'string')
+            return v;
+    }
+    return undefined;
+}
+/**
+ * Heuristic: does the given shell command write to the filesystem?
+ *
+ * Gap 11 fix (4.0.3+): the polling headline tracks file writes by tool
+ * name (writeFile/write_file/edit_file). Workers that bypass these and
+ * write via run_shell (cat >, sed -i, tee, etc.) used to show "0 write"
+ * for the entire run despite actively producing artifacts. This
+ * heuristic looks for common write patterns in the command string;
+ * false positives are acceptable (operator gets a slightly noisy count)
+ * but false negatives are not (the headline lies about progress).
+ *
+ * Patterns detected:
+ *   - Output redirects: `> file`, `>> file`, `&> file`, `>| file`
+ *   - Heredoc to file: `<<EOF > file`, `cat <<...> file`
+ *   - `sed -i` / `sed -i ''` (in-place edit)
+ *   - `awk -i inplace` / `gawk -i inplace`
+ *   - `tee file`, `tee -a file`
+ *   - `cp/mv/touch/install` (file creation/moves)
+ *   - `mkdir`, `rm`, `chmod`, `chown` (filesystem mutation)
+ *   - `git checkout/reset/restore/pull/merge` (modifies files)
+ *   - `python/node -c '... open(... "w") ...'` is NOT detected — too
+ *     ambiguous; keeps false-positive rate low.
+ */
+const SHELL_WRITE_PATTERNS = [
+    /[^&|>]>>?\s*[^&|>\s]/, // > file or >> file (excluding 2>&1, &> handled below)
+    /&>\s*[^&|>\s]/, // &> file
+    />\|\s*[^&|>\s]/, // >| file
+    /\bsed\s+(?:-[a-z]*i[a-z]*\b|--in-place\b)/i, // sed -i / sed --in-place
+    /\b(?:awk|gawk|nawk)\s+-i\s+inplace\b/i,
+    /\btee\b/,
+    /\b(?:cp|mv|touch|install|ln)\s+/,
+    /\bmkdir\s+/,
+    /\brm\s+/,
+    /\bchmod\s+/,
+    /\bchown\s+/,
+    /\bgit\s+(?:checkout|reset|restore|pull|merge|clean|stash|cherry-pick|rebase|apply)\b/,
+    /\bnpm\s+(?:install|i|ci|uninstall|update|run\s+build|run\s+test)\b/,
+    /\bpnpm\s+(?:install|add|remove|update|run)\b/,
+    /\byarn\s+(?:install|add|remove|upgrade)\b/,
+];
+export function shellCommandWritesFs(command) {
+    if (!command || command.length === 0)
+        return false;
+    for (const pattern of SHELL_WRITE_PATTERNS) {
+        if (pattern.test(command))
+            return true;
+    }
+    return false;
+}
+function extractShellCommand(input) {
+    if (typeof input !== 'object' || input === null)
+        return undefined;
+    const obj = input;
+    for (const key of ['command', 'cmd', 'shell']) {
+        const v = obj[key];
+        if (typeof v === 'string')
+            return v;
+        if (Array.isArray(v))
+            return v.join(' ');
+    }
+    return undefined;
+}
 export class RunnerShell {
     adapter;
-    constructor(adapter) {
+    defaultModel;
+    constructor(adapter, 
+    /** Default model id used for cost computation when input.model is absent.
+     *  Reviewer/annotator engines call shell.run() without setting input.model,
+     *  so without this default every reviewer-side stage would record costUSD=null. */
+    defaultModel) {
         this.adapter = adapter;
+        this.defaultModel = defaultModel;
     }
     async run(input) {
+        const startMs = Date.now();
+        const modelForCost = input.model ?? this.defaultModel;
         const ctx = { cwd: input.cwd, callCache: new Map() };
         const usage = { inputTokens: 0, outputTokens: 0, cachedReadTokens: 0, cachedNonReadTokens: 0 };
         const allToolCalls = [];
+        const filesRead = [];
+        const filesWritten = [];
+        let turns = 0;
         const history = [];
         let finalText = '';
         let stoppedByAdapter = false;
+        // Common fields stamped on every emitted bus event so VerboseLogChannel
+        // surfaces enough context for an operator to see which run a line belongs
+        // to without grepping back to the originating request.
+        const baseEventFields = {
+            ...(input.batchId !== undefined && { batchId: input.batchId }),
+            ...(input.taskIndex !== undefined && { taskIndex: input.taskIndex }),
+            ...(input.tier !== undefined && { tier: input.tier }),
+            ...(input.model !== undefined && { model: input.model }),
+            ...(input.stageLabel !== undefined && { stageLabel: input.stageLabel }),
+            providerType: this.adapter.providerType,
+        };
         for (let turn = 0; turn < input.maxTurns; turn++) {
             if (input.abortSignal?.aborted) {
                 return {
@@ -21,8 +126,28 @@ export class RunnerShell {
                     toolCalls: allToolCalls,
                     usage,
                     errorCode: 'aborted',
+                    turns,
+                    durationMs: Date.now() - startMs,
+                    filesRead,
+                    filesWritten,
+                    costUSD: computeCost(modelForCost, usage),
                 };
             }
+            // Three-event-per-turn lifecycle so verbose stderr surfaces every
+            // state change. `runner_turn_started` fires before the LLM call so
+            // operators see "now waiting on the model" in real time. After the
+            // adapter returns, `runner_response_received` carries the raw
+            // provider response shape (stop_reason + content-block tally). After
+            // local tool execution, `runner_turn_completed` carries per-tool
+            // counts (read vs write etc.) so operators can see what work the
+            // model is doing without grepping the JSONL log.
+            input.bus?.emit({
+                event: 'runner_turn_started',
+                ts: new Date().toISOString(),
+                ...baseEventFields,
+                turnIndex: turn,
+            });
+            turns++;
             const turnResult = await this.adapter.turn({
                 systemPrompt: input.systemPrompt,
                 userMessage: input.userMessage,
@@ -37,34 +162,131 @@ export class RunnerShell {
             usage.cachedReadTokens += turnResult.usage.cachedReadTokens;
             usage.cachedNonReadTokens += turnResult.usage.cachedNonReadTokens;
             finalText = turnResult.assistantText;
+            input.bus?.emit({
+                event: 'runner_response_received',
+                ts: new Date().toISOString(),
+                ...baseEventFields,
+                turnIndex: turn,
+                finishReason: turnResult.finishReason,
+                assistantTextLen: turnResult.assistantText.length,
+                toolCallCount: turnResult.toolCalls.length,
+                ...(turnResult.responseShape?.stopReason !== undefined && { stopReason: turnResult.responseShape.stopReason }),
+                ...(turnResult.responseShape?.contentBlocks !== undefined && { contentBlocks: turnResult.responseShape.contentBlocks }),
+                usage: turnResult.usage,
+            });
             const turnRecord = {
                 assistantText: turnResult.assistantText,
                 toolCalls: [],
             };
-            if (turnResult.toolCalls.length === 0) {
+            const willTerminate = turnResult.toolCalls.length === 0;
+            if (willTerminate) {
                 history.push(turnRecord);
                 stoppedByAdapter = true;
-                break;
             }
-            for (const call of turnResult.toolCalls) {
-                const def = input.toolDefinitions.find(d => d.name === call.name);
-                let result;
-                if (!def) {
-                    result = { error: `unknown tool: ${call.name}` };
-                }
-                else {
-                    try {
-                        result = await def.execute(call.input, ctx);
+            else {
+                for (const call of turnResult.toolCalls) {
+                    const def = input.toolDefinitions.find(d => d.name === call.name);
+                    let result;
+                    if (!def) {
+                        result = { error: `unknown tool: ${call.name}` };
+                    }
+                    else {
+                        try {
+                            result = await def.execute(call.input, ctx);
+                        }
+                        catch (err) {
+                            result = { error: `tool execution failed: ${err instanceof Error ? err.message : String(err)}` };
+                        }
                     }
-                    catch (err) {
-                        result = { error: `tool execution failed: ${err instanceof Error ? err.message : String(err)}` };
+                    const enriched = { name: call.name, input: call.input, result };
+                    allToolCalls.push(enriched);
+                    turnRecord.toolCalls.push(enriched);
+                    // Track file ops so the wire telemetry's filesReadCount /
+                    // filesWrittenCount aren't perpetually 0. Only count successful
+                    // calls (a tool that threw produced { error: ... } as result).
+                    const succeeded = !(typeof result === 'object' && result !== null && 'error' in result);
+                    if (succeeded) {
+                        const path = extractPathFromToolInput(call.input);
+                        if (READ_TOOL_NAMES.has(call.name) && path)
+                            filesRead.push(path);
+                        else if (WRITE_TOOL_NAMES.has(call.name) && path)
+                            filesWritten.push(path);
+                        else if (SHELL_TOOL_NAMES.has(call.name)) {
+                            // Gap 11 fix (4.0.3+): workers writing via run_shell
+                            // (cat >, sed -i, tee, etc.) used to show "0 write" in
+                            // polling for the entire run despite actively producing
+                            // artifacts. Detect common write patterns in the command
+                            // arg and attribute as a synthetic write entry tagged
+                            // `shell:` so callers can distinguish it from explicit
+                            // write_file calls. False positives acceptable; false
+                            // negatives are not — the headline must reflect reality.
+                            const command = extractShellCommand(call.input);
+                            if (command && shellCommandWritesFs(command)) {
+                                filesWritten.push(`shell:${command.slice(0, 80)}`);
+                            }
+                        }
                     }
                 }
-                const enriched = { name: call.name, input: call.input, result };
-                allToolCalls.push(enriched);
-                turnRecord.toolCalls.push(enriched);
+                history.push(turnRecord);
+            }
+            // Per-tool counts for THIS turn so operators see "5 readFile, 1 grep"
+            // instead of the bare "tool_call_count=6". The user can immediately
+            // tell read vs write activity without inspecting the JSONL log.
+            const toolCallsByName = {};
+            // Gap 11 (4.0.3+): also count shell calls that wrote to the
+            // filesystem so the headline reflects worker-produced artifacts
+            // even when the worker bypassed write_file/edit_file.
+            let shellWritesThisTurn = 0;
+            for (const tc of turnResult.toolCalls) {
+                toolCallsByName[tc.name] = (toolCallsByName[tc.name] ?? 0) + 1;
+                if (SHELL_TOOL_NAMES.has(tc.name)) {
+                    const cmd = extractShellCommand(tc.input);
+                    if (cmd && shellCommandWritesFs(cmd))
+                        shellWritesThisTurn += 1;
+                }
             }
-            history.push(turnRecord);
+            input.bus?.emit({
+                event: 'runner_turn_completed',
+                ts: new Date().toISOString(),
+                ...baseEventFields,
+                turnIndex: turn,
+                terminated: willTerminate,
+                toolCallCount: turnResult.toolCalls.length,
+                ...(turnResult.toolCalls.length > 0 && { toolCalls: toolCallsByName }),
+                ...(shellWritesThisTurn > 0 && { shellWrites: shellWritesThisTurn }),
+            });
+            if (willTerminate)
+                break;
+        }
+        // Empty-output regression guard (4.0.3). The 4.0.x runner-shell
+        // unconditionally reported `workerStatus: 'done'` whenever the adapter
+        // returned no tool calls — even when assistantText was empty. Combined
+        // with the anthropic-messages adapter's text-only extraction, a
+        // reasoning model that emitted thinking blocks with no text block (or
+        // any provider that returned end_turn with empty content) silently
+        // produced an "ok" RunResult carrying `output: ''`. The reviewer
+        // engine then approved that empty output and the audit/delegate
+        // looked successful while emitting nothing useful.
+        //
+        // 3.12.7's claude-agent-sdk owned the agent loop and didn't have this
+        // failure mode. This branch restores the missing check: stopping with
+        // empty narrative AND no tool calls is `incomplete`, surfaced as a
+        // structured error with errorCode `empty_output` so callers can tell
+        // the difference between "model finished cleanly" and "model returned
+        // nothing usable".
+        if (stoppedByAdapter && finalText.trim() === '' && allToolCalls.length === 0) {
+            return {
+                workerStatus: 'failed',
+                finalAssistantText: '',
+                toolCalls: allToolCalls,
+                usage,
+                errorCode: 'empty_output',
+                turns,
+                durationMs: Date.now() - startMs,
+                filesRead,
+                filesWritten,
+                costUSD: computeCost(modelForCost, usage),
+            };
         }
         return {
             workerStatus: stoppedByAdapter ? 'done' : 'blocked',
@@ -72,7 +294,18 @@ export class RunnerShell {
             toolCalls: allToolCalls,
             usage,
             ...(stoppedByAdapter ? {} : { errorCode: 'max_turns_exhausted' }),
+            turns,
+            durationMs: Date.now() - startMs,
+            filesRead,
+            filesWritten,
+            costUSD: computeCost(modelForCost, usage),
         };
     }
 }
+function computeCost(model, usage) {
+    const card = resolveRateCard(model ?? null);
+    if (!card)
+        return null;
+    return priceTokens(usage, card);
+}
 //# sourceMappingURL=runner-shell.js.map

package/dist/providers/runner-shell.js.map

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