@zhixuan92/multi-model-agent-core 4.5.4 → 4.7.0

package/dist/lifecycle/worker-output-contract.d.ts

@@ -1,25 +1,19 @@
 import { z } from 'zod';
-export declare const ValidationRunSchema: z.ZodObject<{
-    name: z.ZodString;
-    passed: z.ZodBoolean;
-    output: z.ZodString;
-}, z.core.$strip>;
 export declare const WorkerOutputSchema: z.ZodObject<{
-    summary: z.ZodString;
-    workerStatus: z.ZodEnum<{
+    workerSelfAssessment: z.ZodEnum<{
         failed: "failed";
         done: "done";
-        done_with_concerns: "done_with_concerns";
-        blocked: "blocked";
     }>;
+    summary: z.ZodString;
     filesChanged: z.ZodDefault<z.ZodArray<z.ZodString>>;
-    validationsRun: z.ZodDefault<z.ZodArray<z.ZodObject<{
-        name: z.ZodString;
-        passed: z.ZodBoolean;
-        output: z.ZodString;
+    findings: z.ZodDefault<z.ZodArray<z.ZodUnknown>>;
+    citations: z.ZodDefault<z.ZodArray<z.ZodUnknown>>;
+    criteriaSucceeded: z.ZodDefault<z.ZodArray<z.ZodString>>;
+    criteriaErrors: z.ZodDefault<z.ZodArray<z.ZodObject<{
+        criterion: z.ZodString;
+        error: z.ZodString;
     }, z.core.$strip>>>;
-    unresolved: z.ZodDefault<z.ZodArray<z.ZodString>>;
-    commitMessage: z.ZodOptional<z.ZodString>;
+    sourcesUsed: z.ZodDefault<z.ZodArray<z.ZodString>>;
 }, z.core.$strip>;
 export type WorkerOutput = z.infer<typeof WorkerOutputSchema>;
 export declare function parseWorkerOutput(workerText: string): WorkerOutput;

package/dist/lifecycle/worker-output-contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker-output-contract.d.ts","sourceRoot":"","sources":["../../src/lifecycle/worker-output-contract.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,mBAAmB;;;;iBAI9B,CAAC;AAEH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;iBAO7B,CAAC;AAEH,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAc9D,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,YAAY,CA2ClE"}
+{"version":3,"file":"worker-output-contract.d.ts","sourceRoot":"","sources":["../../src/lifecycle/worker-output-contract.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;iBAW7B,CAAC;AAEH,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAU9D,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,YAAY,CA8DlE"}

package/dist/lifecycle/worker-output-contract.js

@@ -1,4 +1,4 @@
-// v4.4.x — intermediate contract between the worker (Implementing /
+// v4.5 — intermediate contract between the worker (Implementing /
 // Rework) and Annotating. Workers emit a JSON-fenced markdown block at
 // the end of their final assistant text; parseWorkerOutput extracts the
 // LAST block, parses it, and returns a normalized WorkerOutput.
@@ -6,18 +6,17 @@
 // Three fallback branches keep Annotating non-crashing on imperfect
 // worker output — see the design doc's "Parser contract" section.
 import { z } from 'zod';
-export const ValidationRunSchema = z.object({
-    name: z.string(),
-    passed: z.boolean(),
-    output: z.string(),
-});
 export const WorkerOutputSchema = z.object({
+    workerSelfAssessment: z.enum(['done', 'failed']),
     summary: z.string(),
-    workerStatus: z.enum(['done', 'done_with_concerns', 'blocked', 'failed']),
+    // write-route fields (optional; default empty)
     filesChanged: z.array(z.string()).default([]),
-    validationsRun: z.array(ValidationRunSchema).default([]),
-    unresolved: z.array(z.string()).default([]),
-    commitMessage: z.string().optional(),
+    // read-route fields (optional; default empty)
+    findings: z.array(z.unknown()).default([]),
+    citations: z.array(z.unknown()).default([]),
+    criteriaSucceeded: z.array(z.string()).default([]),
+    criteriaErrors: z.array(z.object({ criterion: z.string(), error: z.string() })).default([]),
+    sourcesUsed: z.array(z.string()).default([]),
 });
 const JSON_BLOCK_RE = /```json\n([\s\S]*?)\n```/g;
 function findLastJsonBlock(text) {
@@ -26,14 +25,20 @@ function findLastJsonBlock(text) {
         last = m[1];
     return last;
 }
-function synthesizeFailed(summary, reason) {
-    return { summary, workerStatus: 'failed', filesChanged: [], validationsRun: [], unresolved: [reason] };
-}
 export function parseWorkerOutput(workerText) {
     const block = findLastJsonBlock(workerText);
     if (!block) {
-        const preview = workerText.trim().slice(0, 200) || '[empty]';
-        return synthesizeFailed(preview, 'no structured output emitted');
+        const preview = workerText.trim().slice(0, 2000) || '[empty]';
+        return {
+            workerSelfAssessment: 'failed',
+            summary: preview,
+            filesChanged: [],
+            findings: [],
+            citations: [],
+            criteriaSucceeded: [],
+            criteriaErrors: [],
+            sourcesUsed: [],
+        };
     }
     let raw;
     try {
@@ -41,33 +46,43 @@ export function parseWorkerOutput(workerText) {
     }
     catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
-        return synthesizeFailed(workerText.trim().slice(0, 200) || '[empty]', `structured output not valid JSON: ${msg}`);
+        return {
+            workerSelfAssessment: 'failed',
+            summary: workerText.trim().slice(0, 2000) || '[empty]',
+            filesChanged: [],
+            findings: [],
+            citations: [],
+            criteriaSucceeded: [],
+            criteriaErrors: [],
+            sourcesUsed: [],
+        };
     }
     const parsed = WorkerOutputSchema.safeParse(raw);
     if (parsed.success)
         return parsed.data;
-    // Schema-invalid: salvage what we can.
+    // Schema-invalid but has summary: return failed with salvaged fields.
     const obj = (typeof raw === 'object' && raw !== null) ? raw : {};
     const issues = parsed.error.issues.map((i) => `${i.path.join('.') || '(root)'}: ${i.message}`);
-    const summaryStr = typeof obj.summary === 'string' && obj.summary.length > 0 ? obj.summary : '[empty]';
-    const hasSummary = summaryStr !== '[empty]' && summaryStr.trim().length > 0;
+    const summaryStr = typeof obj.summary === 'string' && obj.summary.length > 0 ? obj.summary : workerText.trim().slice(0, 2000) || '[empty]';
     return {
+        workerSelfAssessment: 'failed',
         summary: summaryStr,
-        workerStatus: hasSummary ? 'done_with_concerns' : 'failed',
         filesChanged: Array.isArray(obj.filesChanged)
             ? obj.filesChanged.filter((x) => typeof x === 'string')
             : [],
-        validationsRun: Array.isArray(obj.validationsRun)
-            ? obj.validationsRun.filter((v) => v !== null && typeof v === 'object'
-                && typeof v.name === 'string'
-                && typeof v.passed === 'boolean'
-                && typeof v.output === 'string')
+        findings: Array.isArray(obj.findings) ? obj.findings : [],
+        citations: Array.isArray(obj.citations) ? obj.citations : [],
+        criteriaSucceeded: Array.isArray(obj.criteriaSucceeded)
+            ? obj.criteriaSucceeded.filter((x) => typeof x === 'string')
+            : [],
+        criteriaErrors: Array.isArray(obj.criteriaErrors)
+            ? obj.criteriaErrors.filter((v) => v !== null && typeof v === 'object'
+                && typeof v.criterion === 'string'
+                && typeof v.error === 'string')
+            : [],
+        sourcesUsed: Array.isArray(obj.sourcesUsed)
+            ? obj.sourcesUsed.filter((x) => typeof x === 'string')
             : [],
-        unresolved: [
-            ...(Array.isArray(obj.unresolved) ? obj.unresolved.filter((x) => typeof x === 'string') : []),
-            `schema validation failed: ${issues.join('; ')}`,
-        ],
-        ...(typeof obj.commitMessage === 'string' && { commitMessage: obj.commitMessage }),
     };
 }
 //# sourceMappingURL=worker-output-contract.js.map

package/dist/lifecycle/worker-output-contract.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker-output-contract.js","sourceRoot":"","sources":["../../src/lifecycle/worker-output-contract.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worker-output-contract.js","sourceRoot":"","sources":["../../src/lifecycle/worker-output-contract.ts"],"names":[],"mappings":"AAAA,kEAAkE;AAClE,uEAAuE;AACvE,wEAAwE;AACxE,gEAAgE;AAChE,EAAE;AACF,oEAAoE;AACpE,kEAAkE;AAElE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,oBAAoB,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAChD,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;IACnB,+CAA+C;IAC/C,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IAC7C,8CAA8C;IAC9C,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IAC1C,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IAC3C,iBAAiB,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IAClD,cAAc,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IAC3F,WAAW,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;CAC7C,CAAC,CAAC;AAIH,MAAM,aAAa,GAAG,2BAA2B,CAAC;AAElD,SAAS,iBAAiB,CAAC,IAAY;IACrC,IAAI,IAAI,GAAkB,IAAI,CAAC;IAC/B,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC;QAAE,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1D,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,UAAkB;IAClD,MAAM,KAAK,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;IAC5C,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,SAAS,CAAC;QAC9D,OAAO;YACL,oBAAoB,EAAE,QAAiB;YACvC,OAAO,EAAE,OAAO;YAChB,YAAY,EAAE,EAAE;YAChB,QAAQ,EAAE,EAAE;YACZ,SAAS,EAAE,EAAE;YACb,iBAAiB,EAAE,EAAE;YACrB,cAAc,EAAE,EAAE;YAClB,WAAW,EAAE,EAAE;SAChB,CAAC;IACJ,CAAC;IACD,IAAI,GAAY,CAAC;IACjB,IAAI,CAAC;QACH,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7D,OAAO;YACL,oBAAoB,EAAE,QAAiB;YACvC,OAAO,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,SAAS;YACtD,YAAY,EAAE,EAAE;YAChB,QAAQ,EAAE,EAAE;YACZ,SAAS,EAAE,EAAE;YACb,iBAAiB,EAAE,EAAE;YACrB,cAAc,EAAE,EAAE;YAClB,WAAW,EAAE,EAAE;SAChB,CAAC;IACJ,CAAC;IACD,MAAM,MAAM,GAAG,kBAAkB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACjD,IAAI,MAAM,CAAC,OAAO;QAAE,OAAO,MAAM,CAAC,IAAI,CAAC;IAEvC,sEAAsE;IACtE,MAAM,GAAG,GAAG,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,CAAE,GAA+B,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9F,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,QAAQ,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IAC/F,MAAM,UAAU,GAAG,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,SAAS,CAAC;IAE3I,OAAO;QACL,oBAAoB,EAAE,QAAiB;QACvC,OAAO,EAAE,UAAU;QACnB,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;YAC3C,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC;YACpE,CAAC,CAAC,EAAE;QACN,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;QACzD,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;QAC5D,iBAAiB,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;YACrD,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC;YACzE,CAAC,CAAC,EAAE;QACN,cAAc,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;YAC/C,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,MAAM,CACvB,CAAC,CAAC,EAA6C,EAAE,CAC/C,CAAC,KAAK,IAAI,IAAI,OAAO,CAAC,KAAK,QAAQ;mBAChC,OAAQ,CAA4B,CAAC,SAAS,KAAK,QAAQ;mBAC3D,OAAQ,CAAwB,CAAC,KAAK,KAAK,QAAQ,CACzD;YACH,CAAC,CAAC,EAAE;QACN,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;YACzC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC;YACnE,CAAC,CAAC,EAAE;KACP,CAAC;AACJ,CAAC"}

package/dist/providers/agent-resolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent-resolver.d.ts","sourceRoot":"","sources":["../../src/providers/agent-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGzE,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,wBAAgB,YAAY,CAC1B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,gBAAgB,GACvB,aAAa,CAaf"}

package/dist/{escalation → providers}/agent-resolver.js

@@ -1,4 +1,4 @@
-import { createProvider } from '../providers/provider-factory.js';
+import { createProvider } from './provider-factory.js';
 export function resolveAgent(agentType, config) {
     const agents = config.agents;
     if (!agents) {

package/dist/providers/agent-resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent-resolver.js","sourceRoot":"","sources":["../../src/providers/agent-resolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAOvD,MAAM,UAAU,YAAY,CAC1B,SAAoB,EACpB,MAAwB;IAExB,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC7B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACtE,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;IACnC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,gCAAgC,SAAS,uBAAuB,CAAC,CAAC;IACpF,CAAC;IACD,OAAO;QACL,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,cAAc,CAAC,SAAS,EAAE,MAAM,CAAC;KAC5C,CAAC;AACJ,CAAC"}

package/dist/providers/assemble-run-result.d.ts

@@ -1,4 +1,4 @@
-import type { TurnResult, RunResult } from '../types/run-result.js';
+import type { TurnResult, RuntimeRunResult } from '../types/run-result.js';
 /** Per-stage parsed-report fields the handler may supply. All optional;
  *  handlers that don't parse (e.g. task-executor.ts) pass `{}` or nothing. */
 export interface ParsedReportFields {
@@ -11,7 +11,7 @@ export interface ParsedReportFields {
     qualityReviewerNotes?: string;
     reworkOutput?: string;
     reworkApplied?: boolean;
-    verifyResult?: NonNullable<RunResult['verifyResult']>;
+    verifyResult?: NonNullable<RuntimeRunResult['verifyResult']>;
 }
-export declare function assembleRunResult(turn: TurnResult, parsed?: ParsedReportFields): RunResult;
+export declare function assembleRunResult(turn: TurnResult, parsed?: ParsedReportFields): RuntimeRunResult;
 //# sourceMappingURL=assemble-run-result.d.ts.map

package/dist/providers/assemble-run-result.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assemble-run-result.d.ts","sourceRoot":"","sources":["../../src/providers/assemble-run-result.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAc,MAAM,wBAAwB,CAAC;AAEhF;8EAC8E;AAC9E,MAAM,WAAW,kBAAkB;IACjC,aAAa,CAAC,EAAE,UAAU,GAAG,kBAAkB,CAAC;IAChD,cAAc,CAAC,EAAE,KAAK,CAAC;QAAE,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACrE,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC;CACvD;AAED,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,UAAU,EAChB,MAAM,GAAE,kBAAuB,GAC9B,SAAS,CAiCX"}
+{"version":3,"file":"assemble-run-result.d.ts","sourceRoot":"","sources":["../../src/providers/assemble-run-result.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAc,MAAM,wBAAwB,CAAC;AAEvF;8EAC8E;AAC9E,MAAM,WAAW,kBAAkB;IACjC,aAAa,CAAC,EAAE,UAAU,GAAG,kBAAkB,CAAC;IAChD,cAAc,CAAC,EAAE,KAAK,CAAC;QAAE,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACrE,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,WAAW,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,CAAC;CAC9D;AAED,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,UAAU,EAChB,MAAM,GAAE,kBAAuB,GAC9B,gBAAgB,CA0ClB"}

package/dist/providers/assemble-run-result.js

@@ -1,15 +1,15 @@
-// v4.4 helper. Build mma's public RunResult shape from one SDK turn block
+// v4.4 helper. Build mma's public RuntimeRunResult shape from one SDK turn block
 // (TurnResult) plus optional per-stage parsed-report fields. Lifecycle
 // handlers call this once per `session.send()`.
 //
-// The RunResult shape preserves every field downstream code expects (50+).
+// The RuntimeRunResult shape preserves every field downstream code expects (50+).
 // This helper populates the machine-readable subset (output, usage, files,
 // tool counts, cost, termination) and merges in the parser-supplied subset
 // when the handler has it. Optional fields not relevant to a given stage
 // remain `undefined`.
 export function assembleRunResult(turn, parsed = {}) {
     const status = mapStatus(turn.terminationReason, turn.errorCode);
-    // RunResult.toolCalls is a string[] per the current shape (each entry like
+    // RuntimeRunResult.toolCalls is a string[] per the current shape (each entry like
     // "toolName(<input-preview>)"). With v4.4 dropping per-call detail, we
     // synthesize one entry per toolCallsByName count.
     const toolCalls = [];
@@ -17,7 +17,15 @@ export function assembleRunResult(turn, parsed = {}) {
         for (let i = 0; i < count; i++)
             toolCalls.push(name);
     }
-    const workerStatus = turn.workerSelfAssessment ?? (turn.terminationReason === 'ok' ? 'done' : undefined);
+    // Map SDK termination reason; derived once to avoid recomputation.
+    const tr = turn.terminationReason;
+    const mapsToCause = tr === 'ok' || tr === 'cap_exhausted' || tr === 'stalled';
+    const terminationReason = mapsToCause
+        ? undefined
+        : mapTermination(tr);
+    const workerStatus = turn.workerSelfAssessment
+        ? turn.workerSelfAssessment
+        : (tr === 'ok' ? 'done' : undefined);
     return {
         output: turn.output,
         status,
@@ -31,8 +39,8 @@ export function assembleRunResult(turn, parsed = {}) {
         escalationLog: [],
         durationMs: turn.durationMs,
         directoriesListed: [],
-        ...(workerStatus && { workerStatus }),
-        ...(turn.terminationReason !== 'ok' && { terminationReason: mapTermination(turn.terminationReason) }),
+        ...(workerStatus && { workerStatus: workerStatus }),
+        ...(terminationReason && { terminationReason }),
         ...(turn.errorCode && { errorCode: turn.errorCode }),
         ...(turn.errorMessage && { error: turn.errorMessage }),
         ...parsed,
@@ -41,7 +49,6 @@ export function assembleRunResult(turn, parsed = {}) {
 function mapStatus(r, errorCode) {
     switch (r) {
         case 'ok': return 'ok';
-        case 'cost_exceeded': return 'cost_exceeded';
         case 'time_exceeded': return 'timeout';
         case 'cap_exhausted': return 'incomplete';
         case 'stalled': return 'incomplete';
@@ -53,6 +60,11 @@ function mapStatus(r, errorCode) {
                 return errorCode;
             }
             return 'error';
+        default:
+            // Unknown SDK termination reasons: degrade gracefully to 'error'.
+            // This is the safe choice — the run is non-ok, and error is the
+            // catch-all that lifecycle handlers inspect.
+            return 'error';
     }
 }
 function mapIncompleteReason(r) {
@@ -64,13 +76,10 @@ function mapIncompleteReason(r) {
 }
 function mapTermination(r) {
     switch (r) {
-        case 'ok': return undefined;
         case 'time_exceeded': return 'time_ceiling';
-        case 'cost_exceeded': return 'cost_ceiling';
-        case 'cap_exhausted': return undefined;
-        case 'stalled': return undefined;
         case 'aborted': return 'all_tiers_unavailable';
         case 'error': return 'all_tiers_unavailable';
+        default: return undefined;
     }
 }
 //# sourceMappingURL=assemble-run-result.js.map

package/dist/providers/assemble-run-result.js.map

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

package/dist/providers/claude-session.d.ts

@@ -5,11 +5,18 @@ export declare class ClaudeSession implements Session {
     private turns;
     private sessionId?;
     private readonly bus;
+    /** Active SDK query handle for the in-flight turn. Captured so close() can
+     *  force-shut the query (releases the underlying SDK worker / network
+     *  resources). Undefined between turns. */
+    private activeQuery?;
     constructor(args: {
         model: string;
         opts: SessionOpts;
         oauthAccessToken?: string;
     });
+    /** Returns task identity (batchId/taskIndex) from SessionOpts for event tagging.
+     *  Required so the stall watchdog can filter the shared bus by task. */
+    private taskTag;
     send(instruction: string, _opts?: TurnOpts): Promise<TurnResult>;
     /**
      * Translate a single SDKMessage from claude-agent-sdk into mma
@@ -19,5 +26,10 @@ export declare class ClaudeSession implements Session {
      */
     private emitEventTelemetry;
     close(): Promise<void>;
+    /** ClaudeSession runs entirely in-process via the SDK; there's no separate
+     *  CLI subprocess to expose a pid for. Returning undefined tells the
+     *  shutdown drain there is nothing to SIGKILL externally — close() handles
+     *  it via the SDK query handle. */
+    getPid(): number | undefined;
 }
 //# sourceMappingURL=claude-session.d.ts.map

package/dist/providers/claude-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude-session.d.ts","sourceRoot":"","sources":["../../src/providers/claude-session.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAWzF,qBAAa,aAAc,YAAW,OAAO;IAM/B,OAAO,CAAC,QAAQ,CAAC,IAAI;IALjC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,KAAK,CAAK;IAClB,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAsB;gBAEb,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,WAAW,CAAC;QAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;KAAE;IAW5F,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;IA6FtE;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IAgCpB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7B"}
+{"version":3,"file":"claude-session.d.ts","sourceRoot":"","sources":["../../src/providers/claude-session.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAWzF,qBAAa,aAAc,YAAW,OAAO;IAU/B,OAAO,CAAC,QAAQ,CAAC,IAAI;IATjC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,KAAK,CAAK;IAClB,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAsB;IAC1C;;+CAE2C;IAC3C,OAAO,CAAC,WAAW,CAAC,CAA4B;gBAEnB,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,WAAW,CAAC;QAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;KAAE;IAYlG;4EACwE;IACxE,OAAO,CAAC,OAAO;IAOT,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;IAqGtE;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IAkCpB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAW5B;;;uCAGmC;IACnC,MAAM,IAAI,MAAM,GAAG,SAAS;CAG7B"}

package/dist/providers/claude-session.js

@@ -27,6 +27,10 @@ export class ClaudeSession {
     turns = 0;
     sessionId;
     bus;
+    /** Active SDK query handle for the in-flight turn. Captured so close() can
+     *  force-shut the query (releases the underlying SDK worker / network
+     *  resources). Undefined between turns. */
+    activeQuery;
     constructor(args) {
         this.args = args;
         if (args.oauthAccessToken)
@@ -37,8 +41,17 @@ export class ClaudeSession {
             ts: new Date().toISOString(),
             model: args.model,
             cwd: args.opts.cwd,
+            ...this.taskTag(),
         });
     }
+    /** Returns task identity (batchId/taskIndex) from SessionOpts for event tagging.
+     *  Required so the stall watchdog can filter the shared bus by task. */
+    taskTag() {
+        return {
+            ...(this.args.opts.batchId !== undefined && { batchId: this.args.opts.batchId }),
+            ...(this.args.opts.taskIndex !== undefined && { taskIndex: this.args.opts.taskIndex }),
+        };
+    }
     async send(instruction, _opts) {
         if (this.closed)
             throw new Error('claude-session: send() on closed session');
@@ -51,6 +64,7 @@ export class ClaudeSession {
             turn: turnIndex,
             resume: Boolean(this.sessionId),
             ...(this.sessionId && { sessionId: this.sessionId }),
+            ...this.taskTag(),
         });
         // Single-shot prompt iterable. The SDK iterates this once to pull the
         // user message, then runs to `result`. Closing the iterable after the
@@ -66,6 +80,7 @@ export class ClaudeSession {
         const q = query({
             prompt: promptIterable(),
             options: {
+                // (lifecycle: capture this handle so close() can force-shut)
                 model: this.args.model,
                 // v4.4: mma operates headlessly — never prompt the user for
                 // tool permission. bypassPermissions tells the SDK to run every
@@ -79,6 +94,7 @@ export class ClaudeSession {
                 ...(this.sessionId && { resume: this.sessionId }),
             },
         });
+        this.activeQuery = q;
         const events = [];
         try {
             for await (const ev of q) {
@@ -103,21 +119,25 @@ export class ClaudeSession {
                 ts: new Date().toISOString(),
                 name: e.name ?? 'unknown',
                 message: e.message ?? String(err),
+                ...this.taskTag(),
             });
             try {
                 q.close();
             }
             catch { /* ignore */ }
+            this.activeQuery = undefined;
             throw err;
         }
         try {
             q.close();
         }
         catch { /* ignore */ }
+        this.activeQuery = undefined;
         const rateCard = resolveRateCard(this.args.model);
         const norm = normalizeClaudeTurn(events, {
             durationMs: Date.now() - startMs,
             costUSD: 0,
+            model: this.args.model,
         });
         norm.costUSD = rateCard ? priceTokens(norm.usage, rateCard) : 0;
         this.bus?.emit({
@@ -132,6 +152,7 @@ export class ClaudeSession {
             filesRead: norm.filesRead.length,
             filesWritten: norm.filesWritten.length,
             ...(norm.errorCode && { errorCode: norm.errorCode }),
+            ...this.taskTag(),
         });
         return norm;
     }
@@ -159,6 +180,7 @@ export class ClaudeSession {
                     turn: this.turns,
                     chars: b.text.length,
                     preview: b.text.slice(0, 200),
+                    ...this.taskTag(),
                 });
             }
             else if (b.type === 'tool_use' && typeof b.name === 'string') {
@@ -171,6 +193,7 @@ export class ClaudeSession {
                     turn: this.turns,
                     tool: b.name,
                     input: inputPreview,
+                    ...this.taskTag(),
                 });
             }
         }
@@ -179,7 +202,22 @@ export class ClaudeSession {
         if (this.closed)
             return;
         this.closed = true;
-        this.bus?.emit({ event: 'claude_session_closed', ts: new Date().toISOString() });
+        const q = this.activeQuery;
+        this.activeQuery = undefined;
+        if (q && typeof q.close === 'function') {
+            try {
+                q.close();
+            }
+            catch { /* ignore */ }
+        }
+        this.bus?.emit({ event: 'claude_session_closed', ts: new Date().toISOString(), ...this.taskTag() });
+    }
+    /** ClaudeSession runs entirely in-process via the SDK; there's no separate
+     *  CLI subprocess to expose a pid for. Returning undefined tells the
+     *  shutdown drain there is nothing to SIGKILL externally — close() handles
+     *  it via the SDK query handle. */
+    getPid() {
+        return undefined;
     }
 }
 //# sourceMappingURL=claude-session.js.map

package/dist/providers/claude-session.js.map

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

package/dist/providers/claude.js.map

@@ -1 +1 @@
-{"version":3,"file":"claude.js","sourceRoot":"","sources":["../../src/providers/claude.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,uEAAuE;AACvE,yEAAyE;AACzE,EAAE;AACF,mBAAmB;AACnB,0EAA0E;AAC1E,yEAAyE;AACzE,kEAAkE;AAIlE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE,MAAM,UAAU,kBAAkB,CAAC,GAAyB;IAC1D,OAAO;QACL,IAAI,EAAE,UAAU,GAAG,CAAC,KAAK,EAAE;QAC3B,MAAM,EAAE,GAAgC;QACxC,WAAW,CAAC,IAAiB;YAC3B,IAAI,gBAAoC,CAAC;YACzC,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,GAAG,CAAC,MAAM,CAAC;YAC7C,CAAC;iBAAM,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;gBACxB,mEAAmE;gBACnE,sEAAsE;gBACtE,MAAM,KAAK,GAAG,cAAc,EAAE,CAAC;gBAC/B,IAAI,KAAK;oBAAE,gBAAgB,GAAG,KAAK,CAAC,WAAW,CAAC;YAClD,CAAC;YACD,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;gBAChB,uDAAuD;gBACvD,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAG,GAAG,CAAC,OAAO,CAAC;YAC/C,CAAC;YACD,OAAO,IAAI,aAAa,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,gBAAgB,IAAI,EAAE,gBAAgB,EAAE,CAAC,EAAE,CAAC,CAAC;QACtG,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"claude.js","sourceRoot":"","sources":["../../src/providers/claude.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,uEAAuE;AACvE,yEAAyE;AACzE,EAAE;AACF,mBAAmB;AACnB,0EAA0E;AAC1E,yEAAyE;AACzE,kEAAkE;AAIlE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE,MAAM,UAAU,kBAAkB,CAAC,GAAyB;IAC1D,OAAO;QACL,IAAI,EAAE,UAAU,GAAG,CAAC,KAAK,EAAE;QAC3B,MAAM,EAAE,GAAG;QACX,WAAW,CAAC,IAAiB;YAC3B,IAAI,gBAAoC,CAAC;YACzC,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,GAAG,CAAC,MAAM,CAAC;YAC7C,CAAC;iBAAM,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;gBACxB,mEAAmE;gBACnE,sEAAsE;gBACtE,MAAM,KAAK,GAAG,cAAc,EAAE,CAAC;gBAC/B,IAAI,KAAK;oBAAE,gBAAgB,GAAG,KAAK,CAAC,WAAW,CAAC;YAClD,CAAC;YACD,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;gBAChB,uDAAuD;gBACvD,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAG,GAAG,CAAC,OAAO,CAAC;YAC/C,CAAC;YACD,OAAO,IAAI,aAAa,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,gBAAgB,IAAI,EAAE,gBAAgB,EAAE,CAAC,EAAE,CAAC,CAAC;QACtG,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/providers/codex-cli-launch.js

@@ -14,7 +14,7 @@ export function buildCodexCliLaunch(input) {
     // Working directory + sandbox apply only on the initial turn. `resume`
     // inherits cwd + sandbox from the stored session record.
     if (!resumeSessionId) {
-        args.push('-C', opts.cwd, '-s', 'workspace-write');
+        args.push('-C', opts.cwd ?? process.cwd(), '-s', 'workspace-write');
     }
     args.push('-m', cfg.model);
     if (schemaFile)

package/dist/providers/codex-cli-launch.js.map

@@ -1 +1 @@
-{"version":3,"file":"codex-cli-launch.js","sourceRoot":"","sources":["../../src/providers/codex-cli-launch.ts"],"names":[],"mappings":"AAAA,yEAAyE;AACzE,uEAAuE;AACvE,EAAE;AACF,mEAAmE;AACnE,yEAAyE;AACzE,wEAAwE;AA8BxE,MAAM,oBAAoB,GAAG,YAAY,CAAC;AAE1C,MAAM,UAAU,mBAAmB,CAAC,KAAuB;IACzD,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,eAAe,EAAE,GAAG,KAAK,CAAC;IAErE,MAAM,IAAI,GAAa,CAAC,MAAM,CAAC,CAAC;IAChC,IAAI,eAAe;QAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;IAE1D,IAAI,CAAC,IAAI,CACP,QAAQ,EACR,uBAAuB,EACvB,4CAA4C,EAC5C,sBAAsB,EACtB,gBAAgB,CACjB,CAAC;IAEF,uEAAuE;IACvE,yDAAyD;IACzD,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC;IACrD,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;IAE3B,IAAI,UAAU;QAAE,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IACzD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAE5B,mCAAmC;IACnC,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;QAChB,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,IAAI,gBAAgB,CAAC;QACjD,MAAM,cAAc,GAAG;YACrB,SAAS,oBAAoB,GAAG;YAChC,aAAa,GAAG,CAAC,OAAO,GAAG;YAC3B,YAAY,MAAM,GAAG;YACrB,sBAAsB;SACvB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACZ,IAAI,CAAC,IAAI,CACP,IAAI,EAAE,mBAAmB,oBAAoB,KAAK,cAAc,GAAG,EACnE,IAAI,EAAE,mBAAmB,oBAAoB,GAAG,CACjD,CAAC;IACJ,CAAC;IAED,MAAM,GAAG,GAA2B,EAAE,CAAC;IACvC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACjD,IAAI,OAAO,CAAC,KAAK,QAAQ;YAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACxC,CAAC;IACD,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,SAAS;QAAE,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC;IAEjE,OAAO;QACL,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,OAAO;QACjD,IAAI;QACJ,GAAG;KACJ,CAAC;AACJ,CAAC"}
+{"version":3,"file":"codex-cli-launch.js","sourceRoot":"","sources":["../../src/providers/codex-cli-launch.ts"],"names":[],"mappings":"AAAA,yEAAyE;AACzE,uEAAuE;AACvE,EAAE;AACF,mEAAmE;AACnE,yEAAyE;AACzE,wEAAwE;AA8BxE,MAAM,oBAAoB,GAAG,YAAY,CAAC;AAE1C,MAAM,UAAU,mBAAmB,CAAC,KAAuB;IACzD,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,eAAe,EAAE,GAAG,KAAK,CAAC;IAErE,MAAM,IAAI,GAAa,CAAC,MAAM,CAAC,CAAC;IAChC,IAAI,eAAe;QAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;IAE1D,IAAI,CAAC,IAAI,CACP,QAAQ,EACR,uBAAuB,EACvB,4CAA4C,EAC5C,sBAAsB,EACtB,gBAAgB,CACjB,CAAC;IAEF,uEAAuE;IACvE,yDAAyD;IACzD,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC;IACtE,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;IAE3B,IAAI,UAAU;QAAE,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IACzD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAE5B,mCAAmC;IACnC,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;QAChB,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,IAAI,gBAAgB,CAAC;QACjD,MAAM,cAAc,GAAG;YACrB,SAAS,oBAAoB,GAAG;YAChC,aAAa,GAAG,CAAC,OAAO,GAAG;YAC3B,YAAY,MAAM,GAAG;YACrB,sBAAsB;SACvB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACZ,IAAI,CAAC,IAAI,CACP,IAAI,EAAE,mBAAmB,oBAAoB,KAAK,cAAc,GAAG,EACnE,IAAI,EAAE,mBAAmB,oBAAoB,GAAG,CACjD,CAAC;IACJ,CAAC;IAED,MAAM,GAAG,GAA2B,EAAE,CAAC;IACvC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACjD,IAAI,OAAO,CAAC,KAAK,QAAQ;YAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACxC,CAAC;IACD,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,SAAS;QAAE,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC;IAEjE,OAAO;QACL,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,OAAO;QACjD,IAAI;QACJ,GAAG;KACJ,CAAC;AACJ,CAAC"}

package/dist/providers/codex-cli-session.d.ts

@@ -10,22 +10,36 @@ export declare class CodexCliSession implements Session {
     private threadId?;
     private closed;
     private tempDir?;
+    /** Active codex CLI subprocess for the currently-running turn. Captured so
+     *  close() can synchronously kill the child (SIGTERM then SIGKILL after
+     *  CLOSE_GRACE_MS). Undefined between turns. */
+    private activeProc?;
     private readonly cumulativeUsage;
     constructor(args: {
         cfg: CodexCliConfig;
         opts: SessionOpts;
     });
+    /** Returns task identity (batchId/taskIndex) from SessionOpts for event tagging.
+     *  The stall watchdog filters bus events by these fields — every emit must carry them
+     *  or stuck detection re-breaks under concurrent load. */
+    private taskTag;
     send(instruction: string, _turnOpts?: TurnOpts): Promise<TurnResult>;
     close(): Promise<void>;
+    /** OS pid of the currently-active codex CLI subprocess, if any. Undefined
+     *  between turns. Used by shutdown drain to SIGKILL stragglers. */
+    getPid(): number | undefined;
     private armGuards;
-    private consumeStream;
     private finalizeError;
 }
+declare function consumeStream(proc: ChildProcess, tracker: TurnTracker, stderrRef: {
+    value: string;
+}): Promise<void>;
 declare function killGracefully(proc: ChildProcess): void;
 /** Internal — visible only to the test harness via re-export. */
 declare class TurnTracker {
     private readonly cumulative;
     private readonly bus?;
+    private readonly tag;
     threadId?: string;
     turns: number;
     lastAgentMessage: string;
@@ -36,7 +50,10 @@ declare class TurnTracker {
     errorCode?: string;
     errorMessage?: string;
     private readonly snapshot;
-    constructor(cumulative: TokenUsage, bus?: BusLike | undefined);
+    constructor(cumulative: TokenUsage, bus?: BusLike | undefined, tag?: {
+        batchId?: string;
+        taskIndex?: number;
+    });
     consume(ev: CodexCliEvent): void;
     private absorbItem;
     private absorbUsage;
@@ -45,6 +62,7 @@ declare class TurnTracker {
 export declare const __test: {
     TurnTracker: typeof TurnTracker;
     killGracefully: typeof killGracefully;
+    consumeStream: typeof consumeStream;
 };
 /** Helper for tests/probes: write a JSON-schema object to a temp file
  *  and return its path. Used when callers want `--output-schema`. The

package/dist/providers/codex-cli-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-cli-session.d.ts","sourceRoot":"","sources":["../../src/providers/codex-cli-session.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAWvD,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAErG,OAAO,EAAuB,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACjF,OAAO,EAAsB,KAAK,aAAa,EAAmC,MAAM,sBAAsB,CAAC;AAI/G,UAAU,OAAO;IAAG,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAA;CAAE;AAOhE,qBAAa,eAAgB,YAAW,OAAO;IAWjC,OAAO,CAAC,QAAQ,CAAC,IAAI;IAVjC,OAAO,CAAC,QAAQ,CAAC,CAAS;IAC1B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAK9B;gBAE2B,IAAI,EAAE;QAAE,GAAG,EAAE,cAAc,CAAC;QAAC,IAAI,EAAE,WAAW,CAAA;KAAE;IAEvE,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;IA0GpE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAU5B,OAAO,CAAC,SAAS;IA+BjB,OAAO,CAAC,aAAa;IAsCrB,OAAO,CAAC,aAAa;CAkBtB;AAUD,iBAAS,cAAc,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI,CAShD;AAED,iEAAiE;AACjE,cAAM,WAAW;IAYH,OAAO,CAAC,QAAQ,CAAC,UAAU;IAAc,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;IAX1E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,SAAK;IACV,gBAAgB,SAAM;IACtB,SAAS,cAAqB;IAC9B,YAAY,cAAqB;IACjC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;IAC7C,iBAAiB,EAAE,UAAU,CAAC,mBAAmB,CAAC,CAAQ;IAC1D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAa;gBAET,UAAU,EAAE,UAAU,EAAmB,GAAG,CAAC,EAAE,OAAO,YAAA;IAInF,OAAO,CAAC,EAAE,EAAE,aAAa,GAAG,IAAI;IAuDhC,OAAO,CAAC,UAAU;IA6BlB,OAAO,CAAC,WAAW;IAyBnB,eAAe,IAAI,UAAU;CAQ9B;AAID,eAAO,MAAM,MAAM;;;CAAkC,CAAC;AAEtD;;;yEAGyE;AACzE,wBAAsB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAIlF"}
+{"version":3,"file":"codex-cli-session.d.ts","sourceRoot":"","sources":["../../src/providers/codex-cli-session.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAWvD,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAErG,OAAO,EAAuB,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACjF,OAAO,EAAsB,KAAK,aAAa,EAAmC,MAAM,sBAAsB,CAAC;AAQ/G,UAAU,OAAO;IAAG,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAA;CAAE;AAOhE,qBAAa,eAAgB,YAAW,OAAO;IAejC,OAAO,CAAC,QAAQ,CAAC,IAAI;IAdjC,OAAO,CAAC,QAAQ,CAAC,CAAS;IAC1B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB;;oDAEgD;IAChD,OAAO,CAAC,UAAU,CAAC,CAAe;IAClC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAK9B;gBAE2B,IAAI,EAAE;QAAE,GAAG,EAAE,cAAc,CAAC;QAAC,IAAI,EAAE,WAAW,CAAA;KAAE;IAE7E;;8DAE0D;IAC1D,OAAO,CAAC,OAAO;IAOT,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;IAyHpE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAgC5B;uEACmE;IACnE,MAAM,IAAI,MAAM,GAAG,SAAS;IAI5B,OAAO,CAAC,SAAS;IAgCjB,OAAO,CAAC,aAAa;CAkBtB;AAUD,iBAAS,aAAa,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA4C5G;AAED,iBAAS,cAAc,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI,CAoBhD;AAED,iEAAiE;AACjE,cAAM,WAAW;IAab,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAdtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,SAAK;IACV,gBAAgB,SAAM;IACtB,SAAS,cAAqB;IAC9B,YAAY,cAAqB;IACjC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;IAC7C,iBAAiB,EAAE,UAAU,CAAC,mBAAmB,CAAC,CAAQ;IAC1D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAa;gBAGnB,UAAU,EAAE,UAAU,EACtB,GAAG,CAAC,EAAE,OAAO,YAAA,EACb,GAAG,GAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAO;IAKrE,OAAO,CAAC,EAAE,EAAE,aAAa,GAAG,IAAI;IAyDhC,OAAO,CAAC,UAAU;IAgClB,OAAO,CAAC,WAAW;IAyBnB,eAAe,IAAI,UAAU;CAQ9B;AAID,eAAO,MAAM,MAAM;;;;CAAiD,CAAC;AAErE;;;yEAGyE;AACzE,wBAAsB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAIlF"}