markform 0.1.26 → 0.1.27

package/dist/render.d.mts

@@ -1,6 +1,6 @@
 
 import { At as ParsedForm } from "./coreTypes-CxpqKpBA.mjs";
-import { r as FillRecord } from "./fillRecord-V3vlyobd.mjs";
+import { r as FillRecord } from "./fillRecord-CncFQ23t.mjs";
 
 //#region src/render/renderUtils.d.ts
 /**

package/dist/{src-Dy3cDjDS.mjs → src-DMIq0BFC.mjs}

@@ -1,6 +1,6 @@
 
 import { A as MarkformSectionInputSchema, B as ProgressCountsSchema, R as PatchSchema, ht as StructureSummarySchema, z as PatchWarningSchema } from "./coreTypes-DIv9Aabl.mjs";
-import { $ as DEFAULT_RESEARCH_MAX_PATCHES_PER_TURN, A as tryParseSentinelResponse, B as isTagNode, D as detectSyntaxStyle, F as getBooleanAttr, G as DEFAULT_MAX_PARALLEL_AGENTS, H as AGENT_ROLE, I as getNumberAttr, J as DEFAULT_MAX_STEPS_PER_TURN, K as DEFAULT_MAX_PATCHES_PER_TURN, L as getStringArrayAttr, M as extractFenceValue, N as extractOptionItems, O as preprocessCommentSyntax, P as extractTableContent, Pt as wrapApiError, Q as DEFAULT_RESEARCH_MAX_ISSUES_PER_TURN, R as getStringAttr, S as computeStructureSummary, St as MarkformParseError, V as parseOptionText, W as DEFAULT_MAX_ISSUES_PER_TURN, Y as DEFAULT_MAX_TURNS, Z as DEFAULT_PRIORITY, _ as inspect, a as WEB_SEARCH_INSTRUCTIONS, c as filterIssuesByOrder, d as coerceInputContext, dt as transformHarnessConfigToTs, et as DEFAULT_ROLES, g as getFieldsForRoles, ht as getWebSearchConfig, i as SECTION_HEADERS, j as CHECKBOX_MARKERS, l as filterIssuesByScope, m as applyPatches, n as GENERAL_INSTRUCTIONS, o as getIssuesIntro, q as DEFAULT_MAX_RETRIES, r as ISSUES_HEADER, s as getPatchFormatHint, t as DEFAULT_SYSTEM_PROMPT, tt as DEFAULT_ROLE_INSTRUCTIONS, w as serializeForm, x as computeProgressSummary, yt as MarkformConfigError, z as getValidateAttr } from "./prompts-4jZmkGKW.mjs";
+import { $ as DEFAULT_RESEARCH_MAX_PATCHES_PER_TURN, A as tryParseSentinelResponse, B as isTagNode, D as detectSyntaxStyle, F as getBooleanAttr, G as DEFAULT_MAX_PARALLEL_AGENTS, H as AGENT_ROLE, I as getNumberAttr, J as DEFAULT_MAX_STEPS_PER_TURN, K as DEFAULT_MAX_PATCHES_PER_TURN, L as getStringArrayAttr, M as extractFenceValue, N as extractOptionItems, O as preprocessCommentSyntax, P as extractTableContent, Pt as wrapApiError, Q as DEFAULT_RESEARCH_MAX_ISSUES_PER_TURN, R as getStringAttr, S as computeStructureSummary, St as MarkformParseError, V as parseOptionText, W as DEFAULT_MAX_ISSUES_PER_TURN, Y as DEFAULT_MAX_TURNS, Z as DEFAULT_PRIORITY, _ as inspect, a as WEB_SEARCH_INSTRUCTIONS, c as filterIssuesByOrder, d as coerceInputContext, dt as transformHarnessConfigToTs, et as DEFAULT_ROLES, g as getFieldsForRoles, ht as getWebSearchConfig, i as SECTION_HEADERS, j as CHECKBOX_MARKERS, l as filterIssuesByScope, m as applyPatches, n as GENERAL_INSTRUCTIONS, o as getIssuesIntro, q as DEFAULT_MAX_RETRIES, r as ISSUES_HEADER, s as getPatchFormatHint, t as DEFAULT_SYSTEM_PROMPT, tt as DEFAULT_ROLE_INSTRUCTIONS, w as serializeForm, x as computeProgressSummary, yt as MarkformConfigError, z as getValidateAttr } from "./prompts-CwEV0X5z.mjs";
 import { z } from "zod";
 import Markdoc from "@markdoc/markdoc";
 import YAML from "yaml";
@@ -2717,6 +2717,18 @@ function generateSessionId() {
 //#endregion
 //#region src/harness/fillRecordCollector.ts
 /**
+* Attempt to produce a JSON-safe clone of a value.
+* Falls back to a string representation if serialization fails
+* (e.g., BigInt, circular references, class instances).
+*/
+function safeJsonValue(value) {
+	try {
+		return JSON.parse(JSON.stringify(value));
+	} catch {
+		return String(value);
+	}
+}
+/**
 * Collector for FillRecord data from async form fill operations.
 *
 * Uses an append-only event log pattern that safely handles interleaved
@@ -2735,6 +2747,8 @@ var FillRecordCollector = class {
 	events = [];
 	explicitStatus;
 	explicitStatusDetail;
+	explicitErrorType;
+	explicitErrorCode;
 	pendingToolCalls = /* @__PURE__ */ new Map();
 	pendingLlmCalls = /* @__PURE__ */ new Map();
 	constructor(options) {
@@ -2787,7 +2801,11 @@ var FillRecordCollector = class {
 			model: call.model,
 			inputTokens: call.inputTokens,
 			outputTokens: call.outputTokens,
-			executionId: call.executionId
+			executionId: call.executionId,
+			durationMs: call.durationMs,
+			responseId: call.responseId,
+			requestId: call.requestId,
+			error: call.error
 		});
 		this.pendingLlmCalls.delete(call.executionId);
 	}
@@ -2835,9 +2853,11 @@ var FillRecordCollector = class {
 	/**
 	* Set explicit status (overrides auto-detection from progress).
 	*/
-	setStatus(status, detail) {
+	setStatus(status, detail, errorInfo) {
 		this.explicitStatus = status;
 		this.explicitStatusDetail = detail;
+		this.explicitErrorType = errorInfo?.errorType;
+		this.explicitErrorCode = errorInfo?.errorCode;
 	}
 	/**
 	* Assemble the complete FillRecord from collected events.
@@ -2859,6 +2879,8 @@ var FillRecordCollector = class {
 			form: this.form,
 			status,
 			statusDetail: this.explicitStatusDetail,
+			errorType: this.explicitErrorType,
+			errorCode: this.explicitErrorCode,
 			formProgress,
 			llm: {
 				provider: this.provider,
@@ -2871,7 +2893,8 @@ var FillRecordCollector = class {
 			timingBreakdown,
 			timeline,
 			execution,
-			customData: Object.keys(this.customData).length > 0 ? this.customData : void 0
+			customData: Object.keys(this.customData).length > 0 ? this.customData : void 0,
+			eventLog: this.sanitizeEventLog()
 		};
 	}
 	buildTimeline() {
@@ -2881,6 +2904,10 @@ var FillRecordCollector = class {
 		const turnStartEvents = /* @__PURE__ */ new Map();
 		const turnToolCalls = /* @__PURE__ */ new Map();
 		const turnTokens = /* @__PURE__ */ new Map();
+		const turnLlmDurationMs = /* @__PURE__ */ new Map();
+		const turnLlmCallCount = /* @__PURE__ */ new Map();
+		const turnResponseIds = /* @__PURE__ */ new Map();
+		const turnRequestIds = /* @__PURE__ */ new Map();
 		for (const event of this.events) if (event.type === "turn_start") {
 			const key = turnKey(event.executionId, event.turnNumber);
 			turnStartEvents.set(key, event);
@@ -2941,6 +2968,18 @@ var FillRecordCollector = class {
 					tokens.input += event.inputTokens;
 					tokens.output += event.outputTokens;
 				}
+				turnLlmCallCount.set(tk, (turnLlmCallCount.get(tk) ?? 0) + 1);
+				if (event.durationMs !== void 0) turnLlmDurationMs.set(tk, (turnLlmDurationMs.get(tk) ?? 0) + event.durationMs);
+				if (event.responseId) {
+					const ids = turnResponseIds.get(tk) ?? [];
+					ids.push(event.responseId);
+					turnResponseIds.set(tk, ids);
+				}
+				if (event.requestId) {
+					const ids = turnRequestIds.get(tk) ?? [];
+					ids.push(event.requestId);
+					turnRequestIds.set(tk, ids);
+				}
 			}
 		}
 		const turnCompleteByKey = /* @__PURE__ */ new Map();
@@ -2974,6 +3013,10 @@ var FillRecordCollector = class {
 					patchesApplied: completeEvent.patchesApplied,
 					patchesRejected: completeEvent.patchesRejected,
 					tokens,
+					llmCallDurationMs: turnLlmDurationMs.get(key),
+					llmCallCount: turnLlmCallCount.get(key),
+					responseIds: turnResponseIds.get(key)?.length ? turnResponseIds.get(key) : void 0,
+					requestIds: turnRequestIds.get(key)?.length ? turnRequestIds.get(key) : void 0,
 					toolCalls,
 					...completeEvent.coercionWarnings && completeEvent.coercionWarnings.length > 0 && { coercionWarnings: completeEvent.coercionWarnings }
 				};
@@ -3003,6 +3046,25 @@ var FillRecordCollector = class {
 			if (typeof obj.resultCount === "number") return { resultCount: obj.resultCount };
 		}
 	}
+	/**
+	* Sanitize event log for JSON serialization.
+	* Tool input/output values are typed as `unknown` and may contain
+	* non-JSON-safe values (BigInt, circular objects, class instances)
+	* from custom tools. Sanitize these before exposing in the fill record.
+	*/
+	sanitizeEventLog() {
+		return this.events.map((event) => {
+			if (event.type === "tool_start") return {
+				...event,
+				input: safeJsonValue(event.input)
+			};
+			if (event.type === "tool_end") return {
+				...event,
+				output: safeJsonValue(event.output)
+			};
+			return event;
+		});
+	}
 	calculateLlmTotals() {
 		let totalCalls = 0;
 		let inputTokens = 0;
@@ -8409,6 +8471,7 @@ var LiveAgent = class {
 	executionId;
 	toolChoice;
 	maxRetries;
+	signal;
 	constructor(config) {
 		this.model = config.model;
 		this.maxStepsPerTurn = config.maxStepsPerTurn ?? DEFAULT_MAX_STEPS_PER_TURN;
@@ -8420,6 +8483,7 @@ var LiveAgent = class {
 		this.callbacks = config.callbacks;
 		this.executionId = config.executionId ?? "0-serial";
 		this.maxRetries = config.maxRetries ?? DEFAULT_MAX_RETRIES;
+		this.signal = config.signal;
 		this.toolChoice = config.toolChoice ?? "required";
 		if (this.enableWebSearch) {
 			if (config.providerTools) this.webSearchTools = config.providerTools;
@@ -8472,6 +8536,7 @@ var LiveAgent = class {
 			});
 		} catch {}
 		let result;
+		const llmCallStartMs = Date.now();
 		try {
 			result = await generateText({
 				model: this.model,
@@ -8480,17 +8545,34 @@ var LiveAgent = class {
 				tools,
 				toolChoice: this.toolChoice,
 				maxRetries: this.maxRetries,
-				stopWhen: stepCountIs(this.maxStepsPerTurn)
+				stopWhen: stepCountIs(this.maxStepsPerTurn),
+				abortSignal: this.signal
 			});
 		} catch (error) {
+			const llmCallDurationMs = Date.now() - llmCallStartMs;
+			if (this.callbacks?.onLlmCallEnd) try {
+				this.callbacks.onLlmCallEnd({
+					model: modelId,
+					inputTokens: 0,
+					outputTokens: 0,
+					executionId: this.executionId,
+					durationMs: llmCallDurationMs,
+					error: error instanceof Error ? error.message : String(error)
+				});
+			} catch {}
+			if (error instanceof Error && error.name === "AbortError") throw error;
 			throw wrapApiError(error, this.provider ?? "unknown", modelId);
 		}
+		const llmCallDurationMs = Date.now() - llmCallStartMs;
 		if (this.callbacks?.onLlmCallEnd) try {
 			this.callbacks.onLlmCallEnd({
 				model: modelId,
 				inputTokens: result.usage?.inputTokens ?? 0,
 				outputTokens: result.usage?.outputTokens ?? 0,
-				executionId: this.executionId
+				executionId: this.executionId,
+				durationMs: llmCallDurationMs,
+				responseId: result.response?.id,
+				requestId: result.response?.headers?.["x-request-id"]
 			});
 		} catch {}
 		const patches = [];
@@ -9677,7 +9759,8 @@ async function fillForm(options) {
 		additionalTools: options.additionalTools,
 		callbacks: mergedCallbacks,
 		maxStepsPerTurn: options.maxStepsPerTurn,
-		toolChoice: options.toolChoice
+		toolChoice: options.toolChoice,
+		signal: options.signal
 	});
 	let turnCount = startingTurnNumber;
 	let turnsThisCall = 0;
@@ -9726,11 +9809,27 @@ async function fillForm(options) {
 		try {
 			response = await agent.fillFormTool(turnIssues, form, maxPatchesPerTurn, previousRejections);
 		} catch (error) {
+			if (options.signal?.aborted) {
+				let record;
+				if (collector) {
+					collector.setStatus("cancelled");
+					record = collector.getRecord(getProgressCounts(form, targetRoles));
+				}
+				return buildResult(form, turnCount, totalPatches, {
+					ok: false,
+					reason: "cancelled"
+				}, inputContextWarnings, turnIssues, record);
+			}
 			const errorMessage = error instanceof Error ? error.message : String(error);
 			const errorObj = error instanceof Error ? error : void 0;
+			const errorType = error instanceof Error ? error.name : void 0;
+			const errorCode = error?.statusCode?.toString() ?? error?.code ?? void 0;
 			let record;
 			if (collector) {
-				collector.setStatus("failed", errorMessage);
+				collector.setStatus("failed", errorMessage, {
+					errorType,
+					errorCode
+				});
 				record = collector.getRecord(getProgressCounts(form, targetRoles));
 			}
 			if (errorObj && mergedCallbacks?.onError) try {
@@ -9742,7 +9841,9 @@ async function fillForm(options) {
 				ok: false,
 				reason: "error",
 				message: errorMessage,
-				error: errorObj
+				error: errorObj,
+				errorType,
+				errorCode
 			}, inputContextWarnings, turnIssues, record);
 		}
 		const { patches, stats } = response;
@@ -9850,7 +9951,8 @@ async function fillFormParallel(form, model, provider, providerTools, options, i
 			callbacks: mergedCallbacks,
 			maxStepsPerTurn: options.maxStepsPerTurn,
 			executionId,
-			toolChoice: options.toolChoice
+			toolChoice: options.toolChoice,
+			signal: options.signal
 		});
 	};
 	for (const order of plan.orderLevels) {
@@ -10014,8 +10116,19 @@ async function runMultiTurnForItems(form, agent, items, targetRoles, maxPatchesP
 		try {
 			response = await agent.fillFormTool(scopedIssues, form, maxPatchesPerTurn, previousRejections);
 		} catch (error) {
+			if (options.signal?.aborted) return {
+				patchesApplied,
+				turnsUsed,
+				aborted: true,
+				status: {
+					ok: false,
+					reason: "cancelled"
+				}
+			};
 			const errorMessage = error instanceof Error ? error.message : String(error);
 			const errorObj = error instanceof Error ? error : void 0;
+			const errorType = error instanceof Error ? error.name : void 0;
+			const errorCode = error?.statusCode?.toString() ?? error?.code ?? void 0;
 			if (errorObj && mergedCallbacks?.onError) try {
 				mergedCallbacks.onError(errorObj, { turnNumber: startTurn + turnsUsed + 1 });
 			} catch (cbError) {
@@ -10029,7 +10142,9 @@ async function runMultiTurnForItems(form, agent, items, targetRoles, maxPatchesP
 					ok: false,
 					reason: "error",
 					message: errorMessage,
-					error: errorObj
+					error: errorObj,
+					errorType,
+					errorCode
 				}
 			};
 		}
@@ -10273,6 +10388,10 @@ const TimelineEntrySchema = z.object({
 		input: z.number().int().nonnegative(),
 		output: z.number().int().nonnegative()
 	}),
+	llmCallDurationMs: z.number().int().nonnegative().optional(),
+	llmCallCount: z.number().int().nonnegative().optional(),
+	responseIds: z.array(z.string()).optional(),
+	requestIds: z.array(z.string()).optional(),
 	toolCalls: z.array(ToolCallRecordSchema),
 	coercionWarnings: z.array(PatchWarningSchema).optional()
 });
@@ -10323,6 +10442,80 @@ const ExecutionMetadataSchema = z.object({
 	executionThreads: z.array(z.string())
 });
 /**
+* Zod schemas for the raw event log captured during fill execution.
+* Mirror the CollectorEvent interfaces in fillRecordCollector.ts.
+*/
+const EventTurnStartSchema = z.object({
+	type: z.literal("turn_start"),
+	timestamp: z.string().datetime(),
+	turnNumber: z.number().int().positive(),
+	issuesCount: z.number().int().nonnegative(),
+	order: z.number().int().nonnegative(),
+	executionId: z.string()
+});
+const EventTurnCompleteSchema = z.object({
+	type: z.literal("turn_complete"),
+	timestamp: z.string().datetime(),
+	turnNumber: z.number().int().positive(),
+	patchesApplied: z.number().int().nonnegative(),
+	patchesRejected: z.number().int().nonnegative(),
+	issuesAddressed: z.number().int().nonnegative(),
+	coercionWarnings: z.array(PatchWarningSchema).optional(),
+	executionId: z.string().optional()
+});
+const EventLlmCallStartSchema = z.object({
+	type: z.literal("llm_call_start"),
+	timestamp: z.string().datetime(),
+	model: z.string(),
+	executionId: z.string()
+});
+const EventLlmCallEndSchema = z.object({
+	type: z.literal("llm_call_end"),
+	timestamp: z.string().datetime(),
+	model: z.string(),
+	inputTokens: z.number().int().nonnegative(),
+	outputTokens: z.number().int().nonnegative(),
+	executionId: z.string(),
+	durationMs: z.number().int().nonnegative().optional(),
+	responseId: z.string().optional(),
+	requestId: z.string().optional(),
+	error: z.string().optional()
+});
+const EventToolStartSchema = z.object({
+	type: z.literal("tool_start"),
+	timestamp: z.string().datetime(),
+	name: z.string(),
+	input: z.unknown(),
+	executionId: z.string()
+});
+const EventToolEndSchema = z.object({
+	type: z.literal("tool_end"),
+	timestamp: z.string().datetime(),
+	name: z.string(),
+	output: z.unknown(),
+	durationMs: z.number().int().nonnegative(),
+	error: z.string().optional(),
+	executionId: z.string()
+});
+const EventWebSearchSchema = z.object({
+	type: z.literal("web_search"),
+	timestamp: z.string().datetime(),
+	query: z.string(),
+	resultCount: z.number().int().nonnegative(),
+	provider: z.string(),
+	executionId: z.string()
+});
+/** Schema for the discriminated union of all collector event types. */
+const CollectorEventSchema = z.discriminatedUnion("type", [
+	EventTurnStartSchema,
+	EventTurnCompleteSchema,
+	EventLlmCallStartSchema,
+	EventLlmCallEndSchema,
+	EventToolStartSchema,
+	EventToolEndSchema,
+	EventWebSearchSchema
+]);
+/**
 * Fill status enum.
 */
 const FillRecordStatusSchema = z.enum([
@@ -10353,6 +10546,8 @@ const FillRecordSchema = z.object({
 	}),
 	status: FillRecordStatusSchema,
 	statusDetail: z.string().optional(),
+	errorType: z.string().optional(),
+	errorCode: z.string().optional(),
 	formProgress: ProgressCountsSchema,
 	llm: z.object({
 		provider: z.string(),
@@ -10365,7 +10560,8 @@ const FillRecordSchema = z.object({
 	timingBreakdown: TimingBreakdownSchema,
 	timeline: z.array(TimelineEntrySchema),
 	execution: ExecutionMetadataSchema,
-	customData: z.record(z.string(), z.unknown()).optional()
+	customData: z.record(z.string(), z.unknown()).optional(),
+	eventLog: z.array(CollectorEventSchema).optional()
 });
 /**
 * Strip unstable fields from FillRecord for golden test comparisons.
@@ -10402,6 +10598,8 @@ function stripUnstableFillRecordFields(record) {
 		form: record.form,
 		status: record.status,
 		statusDetail: record.statusDetail,
+		errorType: record.errorType,
+		errorCode: record.errorCode,
 		formProgress: record.formProgress,
 		llm: record.llm,
 		toolSummary: stableToolSummary,
@@ -10529,8 +10727,8 @@ function validateResearchForm(form) {
 //#endregion
 //#region src/index.ts
 /** Markform version (injected at build time). */
-const VERSION = "0.1.26";
+const VERSION = "0.1.27";
 
 //#endregion
 export { MockAgent as A, fieldToJsonSchema as B, getProviderInfo as C, createLiveAgent as D, buildMockWireFormat as E, isCellRef as F, injectHeaderIds as G, parseForm as H, isFieldRef as I, parseCellValue as J, findAllHeadings as K, isQualifiedRef as L, FormHarness as M, createHarness as N, FillRecordCollector as O, getFieldId as P, parseScopeRef as R, BUILT_IN_PROVIDERS as S, resolveModel as T, findAllCheckboxes as U, formToJsonSchema as V, injectCheckboxIds as W, parseRawTable as X, parseMarkdownTable as Y, resolveHarnessConfig as _, ExecutionMetadataSchema as a, createParallelHarness as b, TimelineEntrySchema as c, ToolCallRecordSchema as d, ToolStatsSchema as f, formatFillRecordSummary as g, stripUnstableFillRecordFields as h, runResearch as i, createMockAgent as j, computeExecutionPlan as k, TimingBreakdownItemSchema as l, isEmptyFillRecord as m, isResearchForm as n, FillRecordSchema as o, ToolSummarySchema as p, findEnclosingHeadings as q, validateResearchForm as r, FillRecordStatusSchema as s, VERSION as t, TimingBreakdownSchema as u, fillForm as v, getProviderNames as w, scopeIssuesForItem as x, ParallelHarness as y, serializeScopeRef as z };
-//# sourceMappingURL=src-Dy3cDjDS.mjs.map
+//# sourceMappingURL=src-DMIq0BFC.mjs.map