markform 0.1.12 → 0.1.13

package/dist/{src-DMQCFp2l.mjs → src-DuA3kv-E.mjs}

@@ -1,6 +1,6 @@
 
-import { L as PatchSchema, V as RunModeSchema } from "./coreTypes-Z8SvQyoL.mjs";
-import { C as DEFAULT_RESEARCH_MAX_PATCHES_PER_TURN, L as getWebSearchConfig, S as DEFAULT_RESEARCH_MAX_ISSUES_PER_TURN, T as DEFAULT_ROLE_INSTRUCTIONS, V as MarkformConfigError, W as MarkformParseError, _ as DEFAULT_MAX_ISSUES_PER_TURN, d as serializeForm, i as inspect, m as AGENT_ROLE, r as getFieldsForRoles, t as applyPatches, v as DEFAULT_MAX_PATCHES_PER_TURN, w as DEFAULT_ROLES, x as DEFAULT_PRIORITY, y as DEFAULT_MAX_TURNS } from "./apply-WeeBXwXg.mjs";
+import { L as PatchSchema, V as RunModeSchema } from "./coreTypes-Big8sgih.mjs";
+import { C as DEFAULT_RESEARCH_MAX_ISSUES_PER_TURN, E as DEFAULT_ROLE_INSTRUCTIONS, G as MarkformParseError, H as MarkformConfigError, R as getWebSearchConfig, S as DEFAULT_PRIORITY, T as DEFAULT_ROLES, _ as DEFAULT_MAX_ISSUES_PER_TURN, b as DEFAULT_MAX_TURNS, d as serializeForm, i as inspect, m as AGENT_ROLE, r as getFieldsForRoles, t as applyPatches, v as DEFAULT_MAX_PATCHES_PER_TURN, w as DEFAULT_RESEARCH_MAX_PATCHES_PER_TURN, y as DEFAULT_MAX_STEPS_PER_TURN } from "./apply-D5FLd9Yp.mjs";
 import { z } from "zod";
 import Markdoc from "@markdoc/markdoc";
 import YAML from "yaml";
@@ -2538,12 +2538,12 @@ var FormHarness = class {
 		if (this.state !== "wait") throw new Error(`Cannot apply in state: ${this.state}`);
 		if (patches.length > this.config.maxPatchesPerTurn) throw new Error(`Too many patches: ${patches.length} > ${this.config.maxPatchesPerTurn}`);
 		const applyResult = applyPatches(this.form, patches);
-		const patchesActuallyApplied = applyResult.applyStatus === "applied" ? patches.length : 0;
+		const patchesActuallyApplied = applyResult.appliedPatches.length;
 		const result = inspect(this.form, { targetRoles: this.config.targetRoles });
 		const stepResult = this.computeStepResult(result);
 		stepResult.patchesApplied = patchesActuallyApplied;
 		stepResult.rejectedPatches = applyResult.rejectedPatches;
-		this.recordTurn(issues, patches, result, llmStats, context, applyResult.rejectedPatches, wire);
+		this.recordTurn(issues, patches, result, llmStats, context, applyResult.rejectedPatches, applyResult.warnings, wire);
 		if (stepResult.issues.length === 0 || this.turnNumber >= this.config.maxTurns) this.state = "complete";
 		else this.state = "wait";
 		return stepResult;
@@ -2567,7 +2567,7 @@ var FormHarness = class {
 	/**
 	* Record a turn in the session transcript.
 	*/
-	recordTurn(issues, patches, result, llmStats, context, rejectedPatches, wire) {
+	recordTurn(issues, patches, result, llmStats, context, rejectedPatches, warnings, wire) {
 		const hash = sha256(serializeForm(this.form));
 		const requiredIssueCount = result.issues.filter((i) => i.severity === "required").length;
 		const turn = {
@@ -2575,7 +2575,8 @@ var FormHarness = class {
 			inspect: { issues },
 			apply: {
 				patches,
-				...rejectedPatches && rejectedPatches.length > 0 && { rejectedPatches }
+				...rejectedPatches && rejectedPatches.length > 0 && { rejectedPatches },
+				...warnings && warnings.length > 0 && { warnings }
 			},
 			after: {
 				requiredIssueCount,
@@ -8011,7 +8012,7 @@ var LiveAgent = class {
 	callbacks;
 	constructor(config) {
 		this.model = config.model;
-		this.maxStepsPerTurn = config.maxStepsPerTurn ?? 3;
+		this.maxStepsPerTurn = config.maxStepsPerTurn ?? DEFAULT_MAX_STEPS_PER_TURN;
 		this.systemPromptAddition = config.systemPromptAddition;
 		this.targetRole = config.targetRole ?? AGENT_ROLE;
 		this.provider = config.provider;
@@ -8728,7 +8729,8 @@ async function fillForm(options) {
 		provider,
 		enableWebSearch: options.enableWebSearch,
 		additionalTools: options.additionalTools,
-		callbacks: options.callbacks
+		callbacks: options.callbacks,
+		maxStepsPerTurn: options.maxStepsPerTurn
 	});
 	let turnCount = startingTurnNumber;
 	let turnsThisCall = 0;
@@ -8957,7 +8959,7 @@ function validateResearchForm(form) {
 //#endregion
 //#region src/index.ts
 /** Markform version (injected at build time). */
-const VERSION = "0.1.12";
+const VERSION = "0.1.13";
 
 //#endregion
 export { parseRawTable as A, parseScopeRef as C, parseForm as D, formToJsonSchema as E, parseCellValue as O, isQualifiedRef as S, fieldToJsonSchema as T, coerceToFieldPatch as _, resolveHarnessConfig as a, isCellRef as b, getProviderNames as c, createLiveAgent as d, MockAgent as f, coerceInputContext as g, createHarness as h, runResearch as i, parseMarkdownTable as k, resolveModel as l, FormHarness as m, isResearchForm as n, fillForm as o, createMockAgent as p, validateResearchForm as r, getProviderInfo as s, VERSION as t, buildMockWireFormat as u, findFieldById as v, serializeScopeRef as w, isFieldRef as x, getFieldId as y };

package/docs/markform-apis.md

@@ -199,6 +199,7 @@ const result = await fillForm({
 | `startingTurnNumber` | `number` | `0` | Starting turn for progress tracking |
 | `maxPatchesPerTurn` | `number` | `20` | Maximum patches per turn |
 | `maxIssuesPerTurn` | `number` | `10` | Maximum issues shown per turn |
+| `maxStepsPerTurn` | `number` | `20` | Maximum AI SDK steps (tool call rounds) per turn |
 | `targetRoles` | `string[]` | `['agent']` | Roles to fill |
 | `fillMode` | `FillMode` | `'continue'` | `'continue'` or `'overwrite'` |
 | `callbacks` | `FillCallbacks` | `undefined` | Progress callbacks |

package/examples/rejection-test/rejection-test.session.yaml

@@ -45,9 +45,9 @@ turns:
             - score
             - votes
     after:
-      required_issue_count: 2
-      markdown_sha256: 4edc8e8f1e858aafa657f32e1c2e56c4bfbe93b37224e1010eb6883c111e1c86
-      answered_field_count: 0
+      required_issue_count: 1
+      markdown_sha256: 6dea4cae87738069d3c212e817ac7a59a77fcd3c78d7fac506adf4f5b36caf27
+      answered_field_count: 1
       skipped_field_count: 0
     context:
       system_prompt: |-
@@ -125,7 +125,7 @@ turns:
           Type: table
           Columns: source, score, votes
           Rows: min: 1, max: 5
-          Set: { op: "set_table", fieldId: "ratings", rows: [{ "source": "...", "score": "...", "votes": "..." }, ...] }
+          Set: { op: "set_table", fieldId: "ratings", value: [{ "source": "...", "score": "...", "votes": "..." }, ...] }
           This field is required.
 
         - **title** (field): Required field "Title" is empty
@@ -215,7 +215,7 @@ turns:
             Type: table
             Columns: source, score, votes
             Rows: min: 1, max: 5
-            Set: { op: "set_table", fieldId: "ratings", rows: [{ "source": "...", "score": "...", "votes": "..." }, ...] }
+            Set: { op: "set_table", fieldId: "ratings", value: [{ "source": "...", "score": "...", "votes": "..." }, ...] }
             This field is required.
 
           - **title** (field): Required field "Title" is empty
@@ -238,7 +238,7 @@ turns:
               properties:
                 patches:
                   description: Array of patches to apply to the form
-                  value:
+                  items:
                     $ref: '#/$defs/patch'
                   type: array
               required:
@@ -270,12 +270,6 @@ turns:
           message: Required field "Ratings" is empty
           severity: required
           priority: 1
-        - ref: title
-          scope: field
-          reason: required_missing
-          message: Required field "Title" is empty
-          severity: required
-          priority: 1
     apply:
       patches:
         - op: set_table
@@ -287,9 +281,6 @@ turns:
             - source: Rotten Tomatoes
               score: 92
               votes: 450
-        - op: set_string
-          field_id: title
-          value: Test Movie
     after:
       required_issue_count: 0
       markdown_sha256: f45e7cd87b036d57564e3340dec33c1dc5c2094d880e52b903f64da19b3b8ec0
@@ -331,7 +322,7 @@ turns:
 
         - **Error:** Cannot apply set_string to table field "ratings"
           **Correction:** This field is type "table". Use set_table instead.
-          **Correct format:** { op: "set_table", fieldId: "ratings", rows: [{ "source": "...", "score": "...", "votes": "..." }, ...] }
+          **Correct format:** { op: "set_table", fieldId: "ratings", value: [{ "source": "...", "score": "...", "votes": "..." }, ...] }
 
         # Current Form State
 
@@ -362,7 +353,11 @@ turns:
         Enter rating data with source name, score (0-100), and vote count.
         {% /instructions %}
 
-        {% field kind="string" id="title" label="Title" required=true %}{% /field %}
+        {% field kind="string" id="title" label="Title" required=true %}
+        ```value
+        Test Movie
+        ```
+        {% /field %}
 
         {% /group %}
 
@@ -372,20 +367,14 @@ turns:
 
         # Current Form Issues
 
-        You need to address 2 issues. Here are the current issues:
+        You need to address 1 issue. Here are the current issues:
 
         - **ratings** (field): Required field "Ratings" is empty
           Severity: required, Priority: P1
           Type: table
           Columns: source, score, votes
           Rows: min: 1, max: 5
-          Set: { op: "set_table", fieldId: "ratings", rows: [{ "source": "...", "score": "...", "votes": "..." }, ...] }
-          This field is required.
-
-        - **title** (field): Required field "Title" is empty
-          Severity: required, Priority: P1
-          Type: string
-          Set: { op: "set_string", fieldId: "title", value: "..." }
+          Set: { op: "set_table", fieldId: "ratings", value: [{ "source": "...", "score": "...", "votes": "..." }, ...] }
           This field is required.
 
         # General Instructions
@@ -429,7 +418,7 @@ turns:
 
           - **Error:** Cannot apply set_string to table field "ratings"
             **Correction:** This field is type "table". Use set_table instead.
-            **Correct format:** { op: "set_table", fieldId: "ratings", rows: [{ "source": "...", "score": "...", "votes": "..." }, ...] }
+            **Correct format:** { op: "set_table", fieldId: "ratings", value: [{ "source": "...", "score": "...", "votes": "..." }, ...] }
 
           # Current Form State
 
@@ -460,7 +449,11 @@ turns:
           Enter rating data with source name, score (0-100), and vote count.
           {% /instructions %}
 
-          {% field kind="string" id="title" label="Title" required=true %}{% /field %}
+          {% field kind="string" id="title" label="Title" required=true %}
+          ```value
+          Test Movie
+          ```
+          {% /field %}
 
           {% /group %}
 
@@ -470,20 +463,14 @@ turns:
 
           # Current Form Issues
 
-          You need to address 2 issues. Here are the current issues:
+          You need to address 1 issue. Here are the current issues:
 
           - **ratings** (field): Required field "Ratings" is empty
             Severity: required, Priority: P1
             Type: table
             Columns: source, score, votes
             Rows: min: 1, max: 5
-            Set: { op: "set_table", fieldId: "ratings", rows: [{ "source": "...", "score": "...", "votes": "..." }, ...] }
-            This field is required.
-
-          - **title** (field): Required field "Title" is empty
-            Severity: required, Priority: P1
-            Type: string
-            Set: { op: "set_string", fieldId: "title", value: "..." }
+            Set: { op: "set_table", fieldId: "ratings", value: [{ "source": "...", "score": "...", "votes": "..." }, ...] }
             This field is required.
 
           # General Instructions
@@ -500,7 +487,7 @@ turns:
               properties:
                 patches:
                   description: Array of patches to apply to the form
-                  value:
+                  items:
                     $ref: '#/$defs/patch'
                   type: array
               required:
@@ -521,9 +508,6 @@ turns:
                         - score: 92
                           source: Rotten Tomatoes
                           votes: 450
-                    - field_id: title
-                      op: set_string
-                      value: Test Movie
             tool_results: []
             text: null
         usage:

package/examples/simple/simple-mock-filled.schema.json

@@ -93,29 +93,49 @@
       "properties": {
         "research": {
           "anyOf": [
-            { "type": "string", "enum": ["todo", "done", "incomplete", "active", "na"] },
-            { "type": "boolean" }
+            {
+              "type": "string",
+              "enum": ["todo", "done", "incomplete", "active", "na"]
+            },
+            {
+              "type": "boolean"
+            }
           ],
           "title": "Research"
         },
         "design": {
           "anyOf": [
-            { "type": "string", "enum": ["todo", "done", "incomplete", "active", "na"] },
-            { "type": "boolean" }
+            {
+              "type": "string",
+              "enum": ["todo", "done", "incomplete", "active", "na"]
+            },
+            {
+              "type": "boolean"
+            }
           ],
           "title": "Design"
         },
         "implement": {
           "anyOf": [
-            { "type": "string", "enum": ["todo", "done", "incomplete", "active", "na"] },
-            { "type": "boolean" }
+            {
+              "type": "string",
+              "enum": ["todo", "done", "incomplete", "active", "na"]
+            },
+            {
+              "type": "boolean"
+            }
           ],
           "title": "Implement"
         },
         "test": {
           "anyOf": [
-            { "type": "string", "enum": ["todo", "done", "incomplete", "active", "na"] },
-            { "type": "boolean" }
+            {
+              "type": "string",
+              "enum": ["todo", "done", "incomplete", "active", "na"]
+            },
+            {
+              "type": "boolean"
+            }
           ],
           "title": "Test"
         }
@@ -131,11 +151,27 @@
       "type": "object",
       "properties": {
         "read_guidelines": {
-          "anyOf": [{ "type": "string", "enum": ["todo", "done"] }, { "type": "boolean" }],
+          "anyOf": [
+            {
+              "type": "string",
+              "enum": ["todo", "done"]
+            },
+            {
+              "type": "boolean"
+            }
+          ],
           "title": "I have read the guidelines"
         },
         "agree_terms": {
-          "anyOf": [{ "type": "string", "enum": ["todo", "done"] }, { "type": "boolean" }],
+          "anyOf": [
+            {
+              "type": "string",
+              "enum": ["todo", "done"]
+            },
+            {
+              "type": "boolean"
+            }
+          ],
           "title": "I agree to the terms"
         }
       },
@@ -150,11 +186,27 @@
       "type": "object",
       "properties": {
         "backed_up": {
-          "anyOf": [{ "type": "string", "enum": ["unfilled", "yes", "no"] }, { "type": "boolean" }],
+          "anyOf": [
+            {
+              "type": "string",
+              "enum": ["unfilled", "yes", "no"]
+            },
+            {
+              "type": "boolean"
+            }
+          ],
           "title": "Data has been backed up"
         },
         "notified": {
-          "anyOf": [{ "type": "string", "enum": ["unfilled", "yes", "no"] }, { "type": "boolean" }],
+          "anyOf": [
+            {
+              "type": "string",
+              "enum": ["unfilled", "yes", "no"]
+            },
+            {
+              "type": "boolean"
+            }
+          ],
           "title": "Stakeholders notified"
         }
       },

package/examples/simple/simple-skipped-filled.schema.json

@@ -93,29 +93,49 @@
       "properties": {
         "research": {
           "anyOf": [
-            { "type": "string", "enum": ["todo", "done", "incomplete", "active", "na"] },
-            { "type": "boolean" }
+            {
+              "type": "string",
+              "enum": ["todo", "done", "incomplete", "active", "na"]
+            },
+            {
+              "type": "boolean"
+            }
           ],
           "title": "Research"
         },
         "design": {
           "anyOf": [
-            { "type": "string", "enum": ["todo", "done", "incomplete", "active", "na"] },
-            { "type": "boolean" }
+            {
+              "type": "string",
+              "enum": ["todo", "done", "incomplete", "active", "na"]
+            },
+            {
+              "type": "boolean"
+            }
           ],
           "title": "Design"
         },
         "implement": {
           "anyOf": [
-            { "type": "string", "enum": ["todo", "done", "incomplete", "active", "na"] },
-            { "type": "boolean" }
+            {
+              "type": "string",
+              "enum": ["todo", "done", "incomplete", "active", "na"]
+            },
+            {
+              "type": "boolean"
+            }
           ],
           "title": "Implement"
         },
         "test": {
           "anyOf": [
-            { "type": "string", "enum": ["todo", "done", "incomplete", "active", "na"] },
-            { "type": "boolean" }
+            {
+              "type": "string",
+              "enum": ["todo", "done", "incomplete", "active", "na"]
+            },
+            {
+              "type": "boolean"
+            }
           ],
           "title": "Test"
         }
@@ -131,11 +151,27 @@
       "type": "object",
       "properties": {
         "read_guidelines": {
-          "anyOf": [{ "type": "string", "enum": ["todo", "done"] }, { "type": "boolean" }],
+          "anyOf": [
+            {
+              "type": "string",
+              "enum": ["todo", "done"]
+            },
+            {
+              "type": "boolean"
+            }
+          ],
           "title": "I have read the guidelines"
         },
         "agree_terms": {
-          "anyOf": [{ "type": "string", "enum": ["todo", "done"] }, { "type": "boolean" }],
+          "anyOf": [
+            {
+              "type": "string",
+              "enum": ["todo", "done"]
+            },
+            {
+              "type": "boolean"
+            }
+          ],
           "title": "I agree to the terms"
         }
       },
@@ -150,11 +186,27 @@
       "type": "object",
       "properties": {
         "backed_up": {
-          "anyOf": [{ "type": "string", "enum": ["unfilled", "yes", "no"] }, { "type": "boolean" }],
+          "anyOf": [
+            {
+              "type": "string",
+              "enum": ["unfilled", "yes", "no"]
+            },
+            {
+              "type": "boolean"
+            }
+          ],
           "title": "Data has been backed up"
         },
         "notified": {
-          "anyOf": [{ "type": "string", "enum": ["unfilled", "yes", "no"] }, { "type": "boolean" }],
+          "anyOf": [
+            {
+              "type": "string",
+              "enum": ["unfilled", "yes", "no"]
+            },
+            {
+              "type": "boolean"
+            }
+          ],
           "title": "Stakeholders notified"
         }
       },