markform 0.1.16 → 0.1.18

package/dist/bin.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 
-import { t as runCli } from "./cli-BsFessUW.mjs";
+import { t as runCli } from "./cli-D9w0Bp4J.mjs";
 import { resolve } from "node:path";
 import { existsSync } from "node:fs";
 import { config } from "dotenv";

package/dist/{cli-BsFessUW.mjs → cli-D9w0Bp4J.mjs}

@@ -1,8 +1,8 @@
 
-import { L as PatchSchema } from "./coreTypes-DiCddBKu.mjs";
-import { A as MAX_FORMS_IN_MENU, B as formatSuggestedLlms, C as DEFAULT_MAX_TURNS, D as DEFAULT_RESEARCH_MAX_PATCHES_PER_TURN, E as DEFAULT_RESEARCH_MAX_ISSUES_PER_TURN, F as deriveSchemaPath, H as hasWebSearchSupport, I as detectFileType, L as parseRolesFlag, M as USER_ROLE, N as deriveExportPath, P as deriveReportPath, R as SUGGESTED_LLMS, U as parseModelIdForDisplay, _ as validateSyntaxConsistency, b as DEFAULT_MAX_ISSUES_PER_TURN, d as serializeForm, f as serializeRawMarkdown, i as inspect, j as REPORT_EXTENSION, m as friendlyUrlAbbrev, n as getAllFields, p as serializeReport, t as applyPatches, v as AGENT_ROLE, w as DEFAULT_PORT, x as DEFAULT_MAX_PATCHES_PER_TURN, y as DEFAULT_FORMS_DIR, z as WEB_SEARCH_CONFIG } from "./apply-CXsI5N9x.mjs";
-import { D as parseForm, E as formToJsonSchema, a as resolveHarnessConfig, c as getProviderNames, d as createLiveAgent, h as createHarness, i as runResearch, l as resolveModel, n as isResearchForm, o as fillForm, p as createMockAgent, s as getProviderInfo, t as VERSION, u as buildMockWireFormat } from "./src-Dv3IZSQU.mjs";
-import { n as serializeSession } from "./session-XDrocA3j.mjs";
+import { L as PatchSchema } from "./coreTypes-SDB3KRRJ.mjs";
+import { B as WEB_SEARCH_CONFIG, D as DEFAULT_RESEARCH_MAX_ISSUES_PER_TURN, F as deriveReportPath, I as deriveSchemaPath, L as detectFileType, M as REPORT_EXTENSION, N as USER_ROLE, O as DEFAULT_RESEARCH_MAX_PATCHES_PER_TURN, P as deriveExportPath, R as parseRolesFlag, S as DEFAULT_MAX_PATCHES_PER_TURN, T as DEFAULT_PORT, U as hasWebSearchSupport, V as formatSuggestedLlms, W as parseModelIdForDisplay, _ as validateSyntaxConsistency, b as DEFAULT_MAX_ISSUES_PER_TURN, d as serializeForm, f as serializeRawMarkdown, i as inspect, j as MAX_FORMS_IN_MENU, m as friendlyUrlAbbrev, n as getAllFields, p as serializeReport, t as applyPatches, v as AGENT_ROLE, w as DEFAULT_MAX_TURNS, y as DEFAULT_FORMS_DIR, z as SUGGESTED_LLMS } from "./apply-BYgtU64w.mjs";
+import { A as formToJsonSchema, _ as createMockAgent, a as resolveHarnessConfig, d as getProviderNames, f as resolveModel, h as computeExecutionPlan, i as runResearch, j as parseForm, m as createLiveAgent, n as isResearchForm, o as fillForm, p as buildMockWireFormat, t as VERSION, u as getProviderInfo, y as createHarness } from "./src-DDxi-2ne.mjs";
+import { n as serializeSession } from "./session-Ci4B0Pna.mjs";
 import { _ as writeFile, a as formatPath, c as logError, d as logTiming, f as logVerbose, g as stripHtmlComments, h as shouldUseColors, i as formatOutput, l as logInfo, m as readFile$1, n as createSpinner, o as getCommandContext, p as logWarn, r as ensureFormsDir, s as logDryRun, t as OUTPUT_FORMATS, u as logSuccess } from "./shared-CCq4haEV.mjs";
 import Markdoc from "@markdoc/markdoc";
 import YAML from "yaml";
@@ -227,7 +227,7 @@ function formatConsoleReport$3(report, useColors) {
 * Register the apply command.
 */
 function registerApplyCommand(program) {
-	program.command("apply <file>").description("Apply patches to a form").option("--patch <json>", "JSON array of patches to apply").option("-o, --output <file>", "Output file (defaults to stdout)").option("--report", "Output apply result report instead of modified form").action(async (file, options, cmd) => {
+	program.command("apply <file>").description("Apply patches to a form").option("--patch <json>", "JSON array of patches to apply").option("-o, --output <file>", "Output file (defaults to stdout)").option("--report", "Output apply result report instead of modified form").option("--normalize", "Regenerate form without preserving external content").action(async (file, options, cmd) => {
 		const ctx = getCommandContext(cmd);
 		try {
 			if (!options.patch) {
@@ -293,7 +293,7 @@ function registerApplyCommand(program) {
 					logSuccess(ctx, `Report written to ${options.output}`);
 				} else console.log(output);
 			} else {
-				const output = serializeForm(form);
+				const output = serializeForm(form, { preserveContent: !options.normalize });
 				if (options.output) {
 					await writeFile(options.output, output);
 					logSuccess(ctx, `Modified form written to ${options.output}`);
@@ -2637,7 +2637,7 @@ function registerExamplesCommand(program) {
 * Register the export command.
 */
 function registerExportCommand(program) {
-	program.command("export <file>").description("Export form as markform (default), markdown (readable), or json/yaml for structured data").option("--compact", "Output compact JSON (no formatting, only for JSON format)").action(async (file, options, cmd) => {
+	program.command("export <file>").description("Export form as markform (default), markdown (readable), or json/yaml for structured data").option("--compact", "Output compact JSON (no formatting, only for JSON format)").option("--normalize", "Regenerate form without preserving external content").action(async (file, options, cmd) => {
 		const ctx = getCommandContext(cmd);
 		let format = "markform";
 		if (ctx.format === "json") format = "json";
@@ -2650,7 +2650,7 @@ function registerExportCommand(program) {
 			logVerbose(ctx, "Parsing form...");
 			const form = parseForm(content);
 			if (format === "markform") {
-				console.log(serializeForm(form));
+				console.log(serializeForm(form, { preserveContent: !options.normalize }));
 				return;
 			}
 			if (format === "markdown") {
@@ -2683,7 +2683,7 @@ function registerExportCommand(program) {
 				schema,
 				values,
 				notes: form.notes,
-				markdown: serializeForm(form)
+				markdown: serializeForm(form, { preserveContent: !options.normalize })
 			};
 			if (format === "json") if (options.compact) console.log(JSON.stringify(output));
 			else console.log(JSON.stringify(output, null, 2));
@@ -2768,7 +2768,7 @@ function formatConsoleSession(transcript, useColors) {
 * Register the fill command.
 */
 function registerFillCommand(program) {
-	program.command("fill <file>").description("Run an agent to autonomously fill a form").option("--mock", "Use mock agent (requires --mock-source)").option("--model <id>", "Model ID for live agent (format: provider/model-id, e.g. openai/gpt-5-mini)").option("--mock-source <file>", "Path to completed form for mock agent").option("--record <file>", "Record session transcript to file").option("--max-turns <n>", `Maximum turns (default: ${DEFAULT_MAX_TURNS})`, String(DEFAULT_MAX_TURNS)).option("--max-patches <n>", `Maximum patches per turn (default: ${DEFAULT_MAX_PATCHES_PER_TURN})`, String(DEFAULT_MAX_PATCHES_PER_TURN)).option("--max-issues <n>", `Maximum issues shown per turn (default: ${DEFAULT_MAX_ISSUES_PER_TURN})`, String(DEFAULT_MAX_ISSUES_PER_TURN)).option("--max-fields <n>", "Maximum unique fields per turn (applied before --max-issues)").option("--max-groups <n>", "Maximum unique groups per turn (applied before --max-issues)").option("--roles <roles>", "Target roles to fill (comma-separated, or '*' for all; default: 'agent', or 'user' in --interactive mode)").option("--mode <mode>", "Fill mode: continue (skip filled fields) or overwrite (re-fill; default: continue)").option("-o, --output <file>", "Write final form to file").option("--prompt <file>", "Path to custom system prompt file (appends to default)").option("--instructions <text>", "Inline system prompt (appends to default; takes precedence over --prompt)").option("-i, --interactive", "Interactive mode: prompt user for field values (defaults to user role)").action(async (file, options, cmd) => {
+	program.command("fill <file>").description("Run an agent to autonomously fill a form").option("--mock", "Use mock agent (requires --mock-source)").option("--model <id>", "Model ID for live agent (format: provider/model-id, e.g. openai/gpt-5-mini)").option("--mock-source <file>", "Path to completed form for mock agent").option("--record <file>", "Record session transcript to file").option("--max-turns <n>", `Maximum turns (default: ${DEFAULT_MAX_TURNS})`, String(DEFAULT_MAX_TURNS)).option("--max-patches <n>", `Maximum patches per turn (default: ${DEFAULT_MAX_PATCHES_PER_TURN})`, String(DEFAULT_MAX_PATCHES_PER_TURN)).option("--max-issues <n>", `Maximum issues shown per turn (default: ${DEFAULT_MAX_ISSUES_PER_TURN})`, String(DEFAULT_MAX_ISSUES_PER_TURN)).option("--max-fields <n>", "Maximum unique fields per turn (applied before --max-issues)").option("--max-groups <n>", "Maximum unique groups per turn (applied before --max-issues)").option("--roles <roles>", "Target roles to fill (comma-separated, or '*' for all; default: 'agent', or 'user' in --interactive mode)").option("--mode <mode>", "Fill mode: continue (skip filled fields) or overwrite (re-fill; default: continue)").option("-o, --output <file>", "Write final form to file").option("--prompt <file>", "Path to custom system prompt file (appends to default)").option("--instructions <text>", "Inline system prompt (appends to default; takes precedence over --prompt)").option("-i, --interactive", "Interactive mode: prompt user for field values (defaults to user role)").option("--normalize", "Regenerate form without preserving external content").action(async (file, options, cmd) => {
 		const ctx = getCommandContext(cmd);
 		const filePath = resolve(file);
 		try {
@@ -3006,7 +3006,7 @@ function registerFillCommand(program) {
 				await ensureFormsDir(formsDir);
 				outputPath = generateVersionedPathInFormsDir(filePath, formsDir);
 			}
-			const formMarkdown = serializeForm(harness.getForm());
+			const formMarkdown = serializeForm(harness.getForm(), { preserveContent: !options.normalize });
 			if (ctx.dryRun) logInfo(ctx, `[DRY RUN] Would write form to: ${outputPath}`);
 			else {
 				await writeFile(outputPath, formMarkdown);
@@ -3535,6 +3535,191 @@ function registerModelsCommand(program) {
 	});
 }
 
+//#endregion
+//#region src/cli/commands/plan.ts
+/**
+* Get the response status string for a field.
+*/
+function getFieldStatus(form, fieldId) {
+	const response = form.responsesByFieldId[fieldId];
+	if (!response) return "unanswered";
+	return response.state;
+}
+/**
+* Check if a field still needs work (not yet answered).
+*/
+function fieldNeedsWork(form, fieldId) {
+	const response = form.responsesByFieldId[fieldId];
+	if (!response) return true;
+	return response.state !== "answered";
+}
+/**
+* Get all field IDs for an execution plan item.
+*/
+function getFieldIdsForItem(form, item) {
+	if (item.itemType === "field") return [item.itemId];
+	const group = form.schema.groups.find((g) => g.id === item.itemId);
+	if (!group) return [];
+	return group.children.map((f) => f.id);
+}
+/**
+* Get field metadata from the form schema.
+*/
+function getFieldMeta(form, fieldId) {
+	for (const group of form.schema.groups) {
+		const field = group.children.find((f) => f.id === fieldId);
+		if (field) return field;
+	}
+}
+/**
+* Build a PlanItemJson, including only fields that need work.
+* Returns undefined if no fields need work.
+*/
+function buildPlanItem(form, item) {
+	const remainingFieldIds = getFieldIdsForItem(form, item).filter((id) => fieldNeedsWork(form, id));
+	if (remainingFieldIds.length === 0) return;
+	const planItem = {
+		itemId: item.itemId,
+		itemType: item.itemType
+	};
+	if (item.itemType === "group") planItem.fields = remainingFieldIds.map((id) => {
+		const meta = getFieldMeta(form, id);
+		return {
+			fieldId: id,
+			label: meta?.label,
+			status: getFieldStatus(form, id),
+			required: meta?.required ?? false
+		};
+	});
+	return planItem;
+}
+function formatConsolePlan(report, useColors) {
+	const lines = [];
+	const bold = useColors ? pc.bold : (s$1) => s$1;
+	const dim = useColors ? pc.dim : (s$1) => s$1;
+	const cyan = useColors ? pc.cyan : (s$1) => s$1;
+	const yellow = useColors ? pc.yellow : (s$1) => s$1;
+	const titlePart = report.title ? ` (${report.title})` : "";
+	lines.push(bold(cyan(`Plan: ${report.formId}${titlePart}`)));
+	lines.push("");
+	if (report.orderLevels.length === 0) {
+		lines.push(dim("No remaining work — all fields are complete."));
+		return lines.join("\n");
+	}
+	for (const level of report.orderLevels) {
+		const itemCount = level.looseSerial.length + level.parallelBatches.reduce((sum, b) => sum + b.items.length, 0);
+		lines.push(bold(`Order level ${level.order} (${itemCount} items):`));
+		if (level.looseSerial.length > 0) {
+			lines.push(`  Loose serial (primary agent):`);
+			for (const item of level.looseSerial) formatItem(lines, item, dim, yellow, "    ");
+		}
+		for (const batch of level.parallelBatches) {
+			lines.push(`  Parallel batch "${batch.batchId}" (${batch.items.length} items, ${batch.items.length} agents):`);
+			for (const item of batch.items) formatItem(lines, item, dim, yellow, "    ");
+		}
+		lines.push("");
+	}
+	const s = report.summary;
+	lines.push(dim(`Summary: ${s.orderLevelCount} order level${s.orderLevelCount !== 1 ? "s" : ""}, ${s.parallelBatchCount} parallel batch${s.parallelBatchCount !== 1 ? "es" : ""}, ${s.remainingFields} remaining field${s.remainingFields !== 1 ? "s" : ""}`));
+	return lines.join("\n");
+}
+function formatItem(lines, item, dim, yellow, indent) {
+	if (item.itemType === "group" && item.fields) {
+		lines.push(`${indent}- ${item.itemId} [group]`);
+		for (const f of item.fields) {
+			const label = f.label ? ` (${f.label})` : "";
+			const req = f.required ? yellow("required") + ", " : "";
+			lines.push(`${indent}    ${f.fieldId}${label} — ${req}${dim(f.status)}`);
+		}
+	} else {
+		const meta = item;
+		lines.push(`${indent}- ${meta.itemId}`);
+	}
+}
+/**
+* Register the plan command.
+*/
+function registerPlanCommand(program) {
+	program.command("plan <file>").description("Show the idealized execution plan for a form (parallel batches, order levels)").action(async (file, _options, cmd) => {
+		const ctx = getCommandContext(cmd);
+		try {
+			logVerbose(ctx, `Reading file: ${file}`);
+			const content = await readFile$1(file);
+			logVerbose(ctx, "Parsing and validating form...");
+			const form = parseForm(content);
+			const parseErrors = inspect(form).issues.filter((i) => i.reason === "validation_error");
+			if (parseErrors.length > 0) {
+				logError(`Form has validation errors. Fix them before planning:\n` + parseErrors.map((e) => `  - ${e.message}`).join("\n"));
+				process.exit(1);
+			}
+			logVerbose(ctx, "Computing execution plan...");
+			const executionPlan = computeExecutionPlan(form);
+			const orderLevels = [];
+			let totalItems = 0;
+			let totalRemainingFields = 0;
+			let totalBatches = 0;
+			for (const order of executionPlan.orderLevels) {
+				const looseItems = [];
+				for (const item of executionPlan.looseSerial) {
+					if (item.order !== order) continue;
+					const planItem = buildPlanItem(form, item);
+					if (planItem) {
+						looseItems.push(planItem);
+						totalItems++;
+						totalRemainingFields += countRemainingFields(form, item);
+					}
+				}
+				const batches = [];
+				for (const batch of executionPlan.parallelBatches) {
+					const batchItems = [];
+					for (const item of batch.items) {
+						if (item.order !== order) continue;
+						const planItem = buildPlanItem(form, item);
+						if (planItem) {
+							batchItems.push(planItem);
+							totalItems++;
+							totalRemainingFields += countRemainingFields(form, item);
+						}
+					}
+					if (batchItems.length > 0) {
+						batches.push({
+							batchId: batch.batchId,
+							items: batchItems
+						});
+						totalBatches++;
+					}
+				}
+				if (looseItems.length > 0 || batches.length > 0) orderLevels.push({
+					order,
+					looseSerial: looseItems,
+					parallelBatches: batches
+				});
+			}
+			const output = formatOutput(ctx, {
+				formId: form.schema.id,
+				title: form.schema.title,
+				orderLevels,
+				summary: {
+					orderLevelCount: orderLevels.length,
+					parallelBatchCount: totalBatches,
+					totalItems,
+					remainingFields: totalRemainingFields
+				}
+			}, (data, useColors) => formatConsolePlan(data, useColors));
+			console.log(output);
+		} catch (error) {
+			logError(error instanceof Error ? error.message : String(error));
+			process.exit(1);
+		}
+	});
+}
+/**
+* Count remaining fields for an execution plan item.
+*/
+function countRemainingFields(form, item) {
+	return getFieldIdsForItem(form, item).filter((id) => fieldNeedsWork(form, id)).length;
+}
+
 //#endregion
 //#region src/cli/commands/serve.ts
 /**
@@ -5664,7 +5849,7 @@ function registerResearchCommand(program) {
 			console.log(`  ${formPath}  ${pc.dim("(filled markform source)")}`);
 			console.log(`  ${schemaPath}  ${pc.dim("(JSON Schema)")}`);
 			if (options.transcript && result.transcript) {
-				const { serializeSession: serializeSession$1 } = await import("./session-B7aR6hno.mjs");
+				const { serializeSession: serializeSession$1 } = await import("./session-CW9AQw6i.mjs");
 				const transcriptPath = outputPath.replace(/\.form\.md$/, ".session.yaml");
 				const { writeFile: writeFile$1 } = await import("./shared-fUKfJ1UA.mjs");
 				await writeFile$1(transcriptPath, serializeSession$1(result.transcript));
@@ -6053,6 +6238,7 @@ function createProgram() {
 	registerFillCommand(program);
 	registerInspectCommand(program);
 	registerModelsCommand(program);
+	registerPlanCommand(program);
 	registerRenderCommand(program);
 	registerReportCommand(program);
 	registerResearchCommand(program);
@@ -6072,4 +6258,4 @@ async function runCli() {
 
 //#endregion
 export { runCli as t };
-//# sourceMappingURL=cli-BsFessUW.mjs.map
+//# sourceMappingURL=cli-D9w0Bp4J.mjs.map