markform 0.1.27 → 0.1.29

package/dist/{src-DMIq0BFC.mjs → src-eBNM0w2R.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-CwEV0X5z.mjs";
+import { $ as DEFAULT_MAX_TURNS, A as extractTableHeaderLabels, B as getNumberAttr, Ct as MarkformConfigError, D as detectSyntaxStyle, Et as MarkformParseError, F as CHECKBOX_MARKERS, G as parseOptionText, H as getStringAttr, I as extractFenceValue, K as AGENT_ROLE, L as extractOptionItems, M as parseMarkdownTable, O as preprocessCommentSyntax, P as tryParseSentinelResponse, Q as DEFAULT_MAX_STEPS_PER_TURN, R as extractTableContent, Rt as wrapApiError, S as computeStructureSummary, U as getValidateAttr, V as getStringArrayAttr, W as isTagNode, X as DEFAULT_MAX_PARALLEL_AGENTS, Y as DEFAULT_MAX_ISSUES_PER_TURN, Z as DEFAULT_MAX_PATCHES_PER_TURN, _ as inspect, a as WEB_SEARCH_INSTRUCTIONS, at as DEFAULT_ROLE_INSTRUCTIONS, c as filterIssuesByOrder, d as coerceInputContext, g as getFieldsForRoles, ht as transformHarnessConfigToTs, i as SECTION_HEADERS, it as DEFAULT_ROLES, l as filterIssuesByScope, m as applyPatches, n as GENERAL_INSTRUCTIONS, nt as DEFAULT_RESEARCH_MAX_ISSUES_PER_TURN, o as getIssuesIntro, r as ISSUES_HEADER, rt as DEFAULT_RESEARCH_MAX_PATCHES_PER_TURN, s as getPatchFormatHint, t as DEFAULT_SYSTEM_PROMPT, tt as DEFAULT_PRIORITY, w as serializeForm, x as computeProgressSummary, yt as getWebSearchConfig, z as getBooleanAttr } from "./prompts-BR5xYbvY.mjs";
 import { z } from "zod";
 import Markdoc from "@markdoc/markdoc";
 import YAML from "yaml";
@@ -34,228 +34,6 @@ const FIELD_KINDS = [
 	"table"
 ];
 
-//#endregion
-//#region src/engine/table/parseTable.ts
-/** Sentinel pattern: %SKIP% or %SKIP:reason% or %SKIP(reason)% */
-const SKIP_PATTERN = /^%SKIP(?:[:(](.*))?[)]?%$/i;
-/** Sentinel pattern: %ABORT% or %ABORT:reason% or %ABORT(reason)% */
-const ABORT_PATTERN = /^%ABORT(?:[:(](.*))?[)]?%$/i;
-/** Markdown link pattern: [text](url) */
-const MARKDOWN_LINK_PATTERN = /^\[([^\]]*)\]\(([^)]+)\)$/;
-/**
-* Extract URL from markdown link format if present.
-* Returns the URL part from [text](url) format, or the original value if not a markdown link.
-*/
-function extractUrlFromMarkdownLink(value) {
-	const match = MARKDOWN_LINK_PATTERN.exec(value);
-	if (match) return match[2];
-	return value;
-}
-/**
-* Detect if a cell value is a sentinel.
-*/
-function parseSentinel(value) {
-	const trimmed = value.trim();
-	const skipMatch = SKIP_PATTERN.exec(trimmed);
-	if (skipMatch) return {
-		type: "skip",
-		reason: skipMatch[1]
-	};
-	const abortMatch = ABORT_PATTERN.exec(trimmed);
-	if (abortMatch) return {
-		type: "abort",
-		reason: abortMatch[1]
-	};
-	return null;
-}
-/**
-* Parse a cell value according to its column type.
-* Returns a CellResponse with appropriate state.
-*/
-function parseCellValue(rawValue, columnType) {
-	const trimmed = rawValue.trim();
-	if (!trimmed) return { state: "skipped" };
-	const sentinel = parseSentinel(trimmed);
-	if (sentinel) return {
-		state: sentinel.type === "skip" ? "skipped" : "aborted",
-		reason: sentinel.reason
-	};
-	const unescaped = trimmed.replace(/\\[|]/g, "|").replace(/<br\s*\/?>/gi, "\n");
-	switch (columnType) {
-		case "string": return {
-			state: "answered",
-			value: unescaped
-		};
-		case "number": {
-			const num = parseFloat(trimmed);
-			if (isNaN(num)) return {
-				state: "answered",
-				value: trimmed
-			};
-			return {
-				state: "answered",
-				value: num
-			};
-		}
-		case "url": return {
-			state: "answered",
-			value: extractUrlFromMarkdownLink(trimmed)
-		};
-		case "date": return {
-			state: "answered",
-			value: trimmed
-		};
-		case "year": {
-			const year = parseInt(trimmed, 10);
-			if (isNaN(year) || !Number.isInteger(year)) return {
-				state: "answered",
-				value: trimmed
-			};
-			return {
-				state: "answered",
-				value: year
-			};
-		}
-	}
-}
-/**
-* Parse a table row into cell values.
-* Handles leading/trailing pipes and cell trimming.
-*/
-function parseTableRow(line) {
-	let trimmed = line.trim();
-	if (trimmed.startsWith("|")) trimmed = trimmed.slice(1);
-	if (trimmed.endsWith("|")) trimmed = trimmed.slice(0, -1);
-	return trimmed.split("|").map((cell) => cell.trim());
-}
-/**
-* Extract header labels from table content.
-* Returns array of header labels from the first row, or empty array if no valid header.
-*/
-function extractTableHeaderLabels(content) {
-	if (!content || content.trim() === "") return [];
-	const lines = content.trim().split("\n").filter((line) => line.trim());
-	if (lines.length === 0) return [];
-	return parseTableRow(lines[0]);
-}
-/**
-* Check if a line is a valid table separator row.
-* Each cell should contain only dashes and optional colons for alignment.
-*/
-function isValidSeparator(line, expectedCols) {
-	const cells = parseTableRow(line);
-	if (cells.length !== expectedCols) return false;
-	const separatorPattern = /^:?-+:?$/;
-	return cells.every((cell) => separatorPattern.test(cell.trim()));
-}
-/**
-* Parse a markdown table with column schema for type coercion.
-*
-* @param content - The markdown table content
-* @param columns - Column definitions from the table field schema
-* @param dataStartLine - Optional line index where data rows start (skips header validation)
-* @returns Parsed table value with typed cells
-*/
-function parseMarkdownTable(content, columns, dataStartLine) {
-	const lines = content.trim().split("\n").filter((line) => line.trim());
-	if (lines.length === 0) return {
-		ok: true,
-		value: {
-			kind: "table",
-			rows: []
-		}
-	};
-	if (lines.length < 2) return {
-		ok: false,
-		error: "Table must have at least a header and separator row"
-	};
-	const headerLine = lines[0];
-	const headers = parseTableRow(headerLine);
-	const separatorLine = lines[1];
-	if (!isValidSeparator(separatorLine, headers.length)) return {
-		ok: false,
-		error: "Invalid table separator row"
-	};
-	if (dataStartLine !== void 0) {
-		const rows = [];
-		for (let i = dataStartLine; i < lines.length; i++) {
-			const rawCells = parseTableRow(lines[i]);
-			const row = {};
-			for (let j = 0; j < columns.length; j++) {
-				const column = columns[j];
-				const rawValue = rawCells[j] ?? "";
-				row[column.id] = parseCellValue(rawValue, column.type);
-			}
-			rows.push(row);
-		}
-		return {
-			ok: true,
-			value: {
-				kind: "table",
-				rows
-			}
-		};
-	}
-	const columnIdToIndex = /* @__PURE__ */ new Map();
-	for (let i = 0; i < headers.length; i++) {
-		const header = headers[i];
-		const column = columns.find((c) => c.id === header || c.label === header);
-		if (column) columnIdToIndex.set(column.id, i);
-	}
-	const rows = [];
-	for (let i = 2; i < lines.length; i++) {
-		const rawCells = parseTableRow(lines[i]);
-		const row = {};
-		for (const column of columns) {
-			const cellIndex = columnIdToIndex.get(column.id);
-			const rawValue = cellIndex !== void 0 ? rawCells[cellIndex] ?? "" : "";
-			row[column.id] = parseCellValue(rawValue, column.type);
-		}
-		rows.push(row);
-	}
-	return {
-		ok: true,
-		value: {
-			kind: "table",
-			rows
-		}
-	};
-}
-/**
-* Parse just the raw table structure without schema.
-* Useful for validation and error reporting.
-*/
-function parseRawTable(content) {
-	const lines = content.trim().split("\n").filter((line) => line.trim());
-	if (lines.length === 0) return {
-		ok: true,
-		headers: [],
-		rows: []
-	};
-	if (lines.length < 2) return {
-		ok: false,
-		error: "Table must have at least a header and separator row"
-	};
-	const headers = parseTableRow(lines[0]);
-	const separatorLine = lines[1];
-	if (!isValidSeparator(separatorLine, headers.length)) return {
-		ok: false,
-		error: "Invalid table separator row"
-	};
-	const rows = [];
-	for (let i = 2; i < lines.length; i++) {
-		const row = parseTableRow(lines[i]);
-		while (row.length < headers.length) row.push("");
-		if (row.length > headers.length) row.length = headers.length;
-		rows.push(row);
-	}
-	return {
-		ok: true,
-		headers,
-		rows
-	};
-}
-
 //#endregion
 //#region src/engine/parseFields.ts
 /**
@@ -8482,7 +8260,7 @@ var LiveAgent = class {
 		this.additionalTools = config.additionalTools ?? {};
 		this.callbacks = config.callbacks;
 		this.executionId = config.executionId ?? "0-serial";
-		this.maxRetries = config.maxRetries ?? DEFAULT_MAX_RETRIES;
+		this.maxRetries = config.maxRetries;
 		this.signal = config.signal;
 		this.toolChoice = config.toolChoice ?? "required";
 		if (this.enableWebSearch) {
@@ -9760,7 +9538,8 @@ async function fillForm(options) {
 		callbacks: mergedCallbacks,
 		maxStepsPerTurn: options.maxStepsPerTurn,
 		toolChoice: options.toolChoice,
-		signal: options.signal
+		signal: options.signal,
+		maxRetries: options.maxRetries
 	});
 	let turnCount = startingTurnNumber;
 	let turnsThisCall = 0;
@@ -9952,7 +9731,8 @@ async function fillFormParallel(form, model, provider, providerTools, options, i
 			maxStepsPerTurn: options.maxStepsPerTurn,
 			executionId,
 			toolChoice: options.toolChoice,
-			signal: options.signal
+			signal: options.signal,
+			maxRetries: options.maxRetries
 		});
 	};
 	for (const order of plan.orderLevels) {
@@ -10148,6 +9928,15 @@ async function runMultiTurnForItems(form, agent, items, targetRoles, maxPatchesP
 				}
 			};
 		}
+		if (mergedCallbacks?.onPatchesGenerated) try {
+			mergedCallbacks.onPatchesGenerated({
+				turnNumber: startTurn + turnsUsed + 1,
+				patches: response.patches,
+				stats: response.stats
+			});
+		} catch (cbError) {
+			warnCallbackError("onPatchesGenerated", cbError);
+		}
 		let lastCoercionWarnings;
 		if (response.patches.length > 0) {
 			const applyResult = applyPatches(form, response.patches);
@@ -10640,7 +10429,8 @@ async function runResearch(form, options) {
 		provider,
 		targetRole: config.targetRoles?.[0] ?? AGENT_ROLE,
 		enableWebSearch: options.enableWebSearch,
-		additionalTools: options.additionalTools
+		additionalTools: options.additionalTools,
+		maxRetries: options.maxRetries
 	});
 	const availableTools = agent.getAvailableToolNames();
 	let totalInputTokens = 0;
@@ -10727,8 +10517,8 @@ function validateResearchForm(form) {
 //#endregion
 //#region src/index.ts
 /** Markform version (injected at build time). */
-const VERSION = "0.1.27";
+const VERSION = "0.1.29";
 
 //#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-DMIq0BFC.mjs.map
+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, 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, 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-eBNM0w2R.mjs.map