@drbaher/draft-cli 0.6.0 → 0.8.0

package/CHANGELOG.md

@@ -4,6 +4,104 @@ All notable changes to this project will be documented in this file. The
 format is loosely based on [Keep a Changelog](https://keepachangelog.com/),
 and the project adheres to semantic versioning once it leaves 0.x.
 
+## 0.8.0 — 2026-05-17
+
+### Added
+
+- **LLM inference from a deal description** (last v2 item). New
+  `--from-deal PATH` flag reads a free-form deal description and
+  asks the configured T5 LLM provider to extract values for the
+  schema's declared placeholders:
+  ```sh
+  draft nda.md --from-deal deal-notes.txt --output draft.md
+  ```
+  Where `deal-notes.txt` is unstructured prose:
+  ```
+  Mutual NDA between Acme Corporation (DE) and Globex (UK), effective
+  June 1, 2026, for a 2-year term.
+  ```
+  The LLM is asked to fill `party_a`, `party_a_state`, `party_b`,
+  `effective_date`, etc. — only the keys already detected as
+  placeholders are extracted.
+- **Value-resolution precedence updated:**
+  `CLI flag > --params JSON > --from-deal (LLM) > --interactive > schema default > error`.
+  CLI / --params always win, so users can fix or override anything
+  the LLM got wrong.
+- **New public API:** `inferFromDeal(dealText, placeholders, providerCfg, { fetcher })`.
+
+### Decisions locked (V2_BRIEFS_REMAINING Q4.1–Q4.3)
+
+- **Q4.1 Provider:** same T5 provider config — `ANTHROPIC_API_KEY`,
+  `OPENAI_API_KEY`, or explicit `DRAFT_LLM_*`. No separate inference
+  provider; one network surface, one set of env vars.
+- **Q4.2 Extra keys:** keys the LLM emits that aren't in the
+  detected placeholders are **warned** to stderr (not dropped
+  silently). The LLM gets a fresh list of allowed keys in the
+  prompt so this is rare in practice.
+- **Q4.3 Auto-LLM:** `--from-deal` does **not** require an
+  explicit `--llm` flag — the inference is implicit. `--no-llm`
+  still disables it (the user can opt out of the network call).
+
+### Notes
+
+- `--from-deal` errors are fatal (`EXIT.LLM` for provider /
+  network / parse failures). Users with bad provider configs see
+  the issue immediately rather than silently running with no
+  inferred values.
+- Bundle mode (v0.7.0) does not yet thread `--from-deal` through
+  per-template inference. Deferred to a follow-up; the shared
+  parameter resolution makes the single-doc API already useful
+  for bundles via `--params`.
+
+## 0.7.0 — 2026-05-17
+
+### Added
+
+- **Multi-document bundles.** `draft --bundle <bundle.json>` reads a
+  bundle definition and fills multiple templates with the same set of
+  parameter values in one invocation:
+  ```json
+  {
+    "_meta": { "schema_version": 1 },
+    "outputs": [
+      { "template": "msa/v3.md",        "output": "out/msa.md" },
+      { "template": "order-form/v3.md", "output": "out/order-form.md" }
+    ]
+  }
+  ```
+  Each template runs through detection independently. Placeholders
+  across templates are unioned by key (so a key declared in any
+  template's schema applies to all — Q3.3 locked). Resolution,
+  typed-parameter normalization, and computed values all run once on
+  the union. Each output is then substituted using its own
+  template/tier and written to its own path. `parties.json` refs
+  (v0.6.0) resolve inside bundle entries too.
+- **Schema-union semantics.** A key declared/detected in any bundle
+  template applies to every template in the bundle. First-occurrence
+  metadata wins; resolved values flow to all templates that reference
+  the same key.
+- **`.docx` bundle entries** round-trip through `substituteDocxXml`
+  when the entry's `output` path has the `.docx` extension. Same
+  runs/styles preservation as single-doc `.docx` mode.
+- **New public API:** `loadBundle(path)`, `cmdBundle(opts, bundle,
+  paramsObj, envObj, io)`.
+
+### Decisions locked (V2_BRIEFS_REMAINING Q3.1–Q3.3)
+
+- **Q3.1 Bundle file format:** JSON object with `outputs` array of
+  `{template, output}` pairs. Each entry has its own output path,
+  enabling per-doc overrides without inventing a custom DSL.
+- **Q3.2 Partial-failure policy:** abort-all. Any pre-write error
+  (no detection in an entry, missing required param across the
+  union, type / computed / ref failure, positional mismatch, schema
+  orphan) exits 4 before any file is written. Write failures
+  mid-bundle exit 1; earlier successful writes are not rolled back
+  (best-effort atomicity at the filesystem boundary).
+- **Q3.3 Schema union semantics:** keys declared in any template's
+  schema (or detected as canonical-key matches without a schema)
+  apply across the bundle. Same value resolves into every template
+  that references the key.
+
 ## 0.6.0 — 2026-05-16
 
 ### Added

package/PARAM_SCHEMA.md

@@ -451,6 +451,135 @@ substitution always uses string output.
 Programmatic API: `loadParties(path)`, `resolveRef(value, parties)`,
 `resolveRefs(resolved, sources, parties)`.
 
+### Multi-document bundles (v0.7.0, opt-in)
+
+`draft --bundle <bundle.json>` reads a bundle definition and fills
+multiple templates with one shared set of parameter values:
+
+```json
+{
+  "_meta": { "schema_version": 1 },
+  "outputs": [
+    { "template": "msa/v3.md",        "output": "out/msa.md" },
+    { "template": "order-form/v3.md", "output": "out/order-form.md" },
+    { "template": "dpa/v2.docx",      "output": "out/dpa.docx" }
+  ]
+}
+```
+
+```sh
+draft --bundle deal.bundle.json --params deal.json --parties parties.json
+```
+
+**Q3.1 locked:** the bundle file is a JSON object with an `outputs`
+array of `{template, output}` pairs. Each entry has its own
+`template` (filesystem path or `template-vault get` ref) and own
+`output` path. No alternative shorter DSL — JSON is unambiguous and
+extensible.
+
+**Q3.2 locked:** abort-all. Any pre-write error (no detection in an
+entry, missing required param across the union, type validation
+failure, computed-value failure, ref-resolution failure, positional
+mismatch, schema orphan) returns exit 4 **before any file is
+written**. The bundle either writes all `outputs` or writes none.
+Filesystem write errors mid-bundle exit 1; earlier successful
+writes are not rolled back (best-effort atomicity at the filesystem
+boundary).
+
+**Q3.3 locked:** schema union. A key declared in any template's
+schema, or detected as a canonical-key match without a schema,
+applies across the entire bundle. The same resolved value flows to
+every template that references the key. First-occurrence metadata
+wins (`type`, `format`, `currency`, `computed`, `positions`, etc.);
+templates with richer aliases for the same key contribute their
+aliases for detection in their own body but don't redefine the key.
+
+**Per-template detection independence:** each bundle entry runs the
+full T1–T5 cascade against its own body. Different entries can land
+on different tiers (e.g. MSA on T1 brackets, DPA on T3 highlights).
+Positional addressing on T1/T2 still works per entry.
+
+**`.docx` entries** with a `.docx` output path round-trip via
+`substituteDocxXml` + `writeDocxBuffer`, preserving runs/styles.
+Mixing text and `.docx` entries in the same bundle works.
+
+**`parties.json` refs** (v0.6.0) resolve inside bundles too — load
+the same parties file once via `--parties PATH` (or the CWD
+default), and ref strings in any bundle template's schema default
+or in shared `--params` expand against it.
+
+**`--json`** for bundles emits a structured result listing each
+entry's template, output path, and tier, plus the union of resolved
+keys and their sources.
+
+Programmatic API: `loadBundle(path)` parses + validates; `cmdBundle`
+runs the orchestration with the same IO contract as `cmdDraft`.
+
+### LLM inference from a deal description (v0.8.0, opt-in)
+
+`--from-deal PATH` reads a free-form deal description and asks the
+configured T5 LLM provider to extract values for the schema's
+declared placeholders. The inverse of T5 detection — instead of
+inferring *where* placeholders are in a template, infer *what
+values* they should take from the deal prose:
+
+```sh
+draft nda.md --from-deal deal-notes.txt --output draft.md
+```
+
+```
+# deal-notes.txt
+Mutual NDA between Acme Corporation (DE) and Globex (UK),
+effective June 1, 2026, for a 2-year term.
+```
+
+Then `[Party A]` → `Acme Corporation`, `[Effective Date]` →
+`June 1, 2026`, etc., without any `--party-a` / `--effective-date`
+flags.
+
+**Value-resolution precedence** with `--from-deal`:
+
+```
+CLI flag  >  --params JSON  >  --from-deal (LLM)  >  --interactive  >  schema default  >  error
+```
+
+CLI / --params always win, so users can fix or override anything the
+LLM got wrong without re-running inference.
+
+**Q4.1 locked:** same T5 provider config (`ANTHROPIC_API_KEY`,
+`OPENAI_API_KEY`, or explicit `DRAFT_LLM_*`). One network surface,
+one set of env vars.
+
+**Q4.2 locked:** extra keys (LLM emits keys not in the detected
+placeholder list) are **warned** to stderr, not silently dropped.
+The LLM gets the allowed-key list in the prompt so this is rare in
+practice.
+
+**Q4.3 locked:** `--from-deal` does **not** require explicit
+`--llm` — the inference is implicit when the flag is present.
+`--no-llm` still disables the inference call (the user can opt
+out of the network).
+
+**Provider missing:** if no LLM provider is configured (no
+`ANTHROPIC_API_KEY` / `OPENAI_API_KEY` / `DRAFT_LLM_*` in env),
+`--from-deal` errors immediately with `EXIT.LLM` (exit 5) and a
+clear message. Same for network / HTTP errors / non-JSON LLM
+responses.
+
+**Resolution interaction with typed parameters:** inferred values
+go through the same typed-normalization step as user-supplied
+values. So an LLM that returns `"June 1, 2026"` for a `type: date`
+parameter with `format: yyyy-MM-d` gets normalized to `2026-06-1`
+before substitution.
+
+**Bundle mode (v0.7.0) interaction:** bundles do not currently
+thread `--from-deal` through per-template inference. The shared
+parameter resolution already accepts `--params` JSON, which is the
+simpler structured-data path for bundle workflows. Deferred to a
+future release.
+
+Programmatic API: `inferFromDeal(dealText, placeholders, providerCfg, { fetcher })`.
+
 ### Orphan handling (Q4 locked)
 
 Schema declares a key whose alias list matches no detected phrase →

package/draft-cli.mjs

@@ -70,7 +70,7 @@ import { fileURLToPath } from "node:url";
  */
 
 /** @type {string} */
-export const VERSION = "0.6.0";
+export const VERSION = "0.8.0";
 
 // ─── EXIT CODES ─────────────────────────────────────────────────────────────
 /**
@@ -278,6 +278,8 @@ export function parseArgs(argv) {
     if (a === "--diff") { opts.diff = true; continue; }
     if (a === "--params") { opts.params = argv[++i]; continue; }
     if (a === "--parties") { opts.parties = argv[++i]; continue; }
+    if (a === "--bundle") { opts.bundle = argv[++i]; continue; }
+    if (a === "--from-deal") { opts.fromDeal = argv[++i]; continue; }
     if (a === "--output" || a === "-o") { opts.output = argv[++i]; continue; }
     if (a === "--syntax") {
       const v = argv[++i];
@@ -807,6 +809,95 @@ ${body.slice(0, 12000)}`;
   return out;
 }
 
+/**
+ * v2 #4: LLM inference from a free-form deal description.
+ *
+ * Takes the prose deal description (the user's notes about parties, dates,
+ * amounts, etc.) and asks the configured T5 LLM provider to extract values
+ * for the placeholders the cascade has already detected. Returns
+ * `{values, extraKeys, warnings}`:
+ *
+ *   - values: `{key: string}` for every placeholder key the LLM filled
+ *   - extraKeys: any keys the LLM emitted that aren't in the placeholders list (Q4.2 → warn)
+ *   - warnings: human-readable messages for malformed entries
+ *
+ * Throws on missing provider config, missing `fetch`, network/HTTP error, or
+ * non-JSON LLM response — same failure boundaries as `detectLlm`.
+ *
+ * @param {string} dealText — free-form deal description
+ * @param {Placeholder[]} placeholders — the post-detection placeholder list
+ * @param {ReturnType<llmProviderFromEnv>} providerCfg
+ * @param {{ fetcher?: typeof fetch | null }} [opts]
+ * @returns {Promise<{ values: Object<string,string>, extraKeys: string[], warnings: string[] }>}
+ */
+export async function inferFromDeal(dealText, placeholders, providerCfg, { fetcher = (typeof fetch !== "undefined" ? fetch : null) } = {}) {
+  if (!fetcher) {
+    const e = new Error("fetch is not available; Node 18+ is required for --from-deal");
+    e.exitCode = EXIT.LLM;
+    throw e;
+  }
+  if (!providerCfg) {
+    const e = new Error("--from-deal requires an LLM provider; set ANTHROPIC_API_KEY / OPENAI_API_KEY / DRAFT_LLM_* in .env");
+    e.exitCode = EXIT.LLM;
+    throw e;
+  }
+  const wantedKeys = placeholders.map((p) => ({
+    key: p.key,
+    aliases: (p.aliases || []).slice(0, 4),
+    first_seen_as: p.first_seen_as,
+  }));
+  if (wantedKeys.length === 0) {
+    return { values: {}, extraKeys: [], warnings: [] };
+  }
+  const fieldList = wantedKeys.map((w) =>
+    `  - ${w.key} (template placeholder: "${w.first_seen_as}"${w.aliases.length > 1 ? `; aliases: ${w.aliases.join(", ")}` : ""})`
+  ).join("\n");
+  const prompt = `You are filling parameters for a legal-document drafting tool.
+A user has written prose describing a deal. Extract values for the following
+fields from the deal description. Output JSON ONLY in this exact shape, with
+no commentary:
+
+{"values":{"<key>":"<extracted_value>",...}}
+
+If a field can't be confidently extracted from the description, omit it (do
+NOT guess). Do not invent additional fields not in the list. Match the deal's
+language verbatim — don't reformat dates, currencies, or names.
+
+FIELDS:
+${fieldList}
+
+DEAL DESCRIPTION:
+${dealText.slice(0, 12000)}`;
+  const raw = await callLlm(providerCfg, prompt, fetcher);
+  let parsed;
+  try {
+    const jsonMatch = raw.match(/\{[\s\S]*\}/);
+    parsed = JSON.parse(jsonMatch ? jsonMatch[0] : raw);
+  } catch {
+    const e = new Error(`LLM returned non-JSON response for --from-deal`);
+    e.exitCode = EXIT.LLM;
+    throw e;
+  }
+  const rawValues = (parsed && typeof parsed.values === "object" && parsed.values) ? parsed.values : {};
+  const knownKeys = new Set(placeholders.map((p) => p.key));
+  const values = {};
+  const extraKeys = [];
+  const warnings = [];
+  for (const [k, v] of Object.entries(rawValues)) {
+    if (!knownKeys.has(k)) {
+      extraKeys.push(k);
+      continue;
+    }
+    if (v === null || v === undefined) continue;
+    if (typeof v !== "string" && typeof v !== "number") {
+      warnings.push(`--from-deal: value for "${k}" was ${typeof v}, expected string; skipped`);
+      continue;
+    }
+    values[k] = String(v);
+  }
+  return { values, extraKeys, warnings };
+}
+
 async function callLlm(cfg, prompt, fetcher) {
   if (cfg.provider === "anthropic") {
     const r = await fetcher("https://api.anthropic.com/v1/messages", {
@@ -1375,6 +1466,79 @@ export function resolveRefs(resolved, sources, parties) {
   return { ok: errors.length === 0, errors };
 }
 
+/**
+ * Load and validate a bundle definition (v2 #6). Bundles describe
+ * multiple templates that should be filled with the same set of
+ * parameter values in one invocation:
+ *
+ *   {
+ *     "_meta": { "schema_version": 1 },
+ *     "outputs": [
+ *       { "template": "msa/v3.md",        "output": "out/msa.md" },
+ *       { "template": "order-form/v3.md", "output": "out/order-form.md" }
+ *     ]
+ *   }
+ *
+ * Returns the parsed bundle. Throws on missing file, invalid JSON, no
+ * `outputs` array, empty `outputs`, missing `template`/`output` on an
+ * entry, or duplicate output paths.
+ *
+ * @param {string} path
+ * @returns {{ outputs: Array<{ template: string, output: string }> }}
+ * @throws {Error} with `.exitCode = EXIT.IO`
+ */
+export function loadBundle(path) {
+  if (!existsSync(path)) {
+    const e = new Error(`bundle file not found: ${path}`);
+    e.exitCode = EXIT.IO;
+    throw e;
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(readFileSync(path, "utf8"));
+  } catch (err) {
+    const e = new Error(`could not parse bundle ${path}: ${err.message}`);
+    e.exitCode = EXIT.IO;
+    throw e;
+  }
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+    const e = new Error(`bundle ${path} must be a JSON object`);
+    e.exitCode = EXIT.IO;
+    throw e;
+  }
+  if (!Array.isArray(parsed.outputs) || parsed.outputs.length === 0) {
+    const e = new Error(`bundle ${path}: missing or empty "outputs" array`);
+    e.exitCode = EXIT.IO;
+    throw e;
+  }
+  const seenOutputs = new Set();
+  for (let i = 0; i < parsed.outputs.length; i++) {
+    const o = parsed.outputs[i];
+    if (!o || typeof o !== "object" || Array.isArray(o)) {
+      const e = new Error(`bundle ${path}: outputs[${i}] must be an object`);
+      e.exitCode = EXIT.IO;
+      throw e;
+    }
+    if (typeof o.template !== "string" || !o.template) {
+      const e = new Error(`bundle ${path}: outputs[${i}].template must be a non-empty string`);
+      e.exitCode = EXIT.IO;
+      throw e;
+    }
+    if (typeof o.output !== "string" || !o.output) {
+      const e = new Error(`bundle ${path}: outputs[${i}].output must be a non-empty string`);
+      e.exitCode = EXIT.IO;
+      throw e;
+    }
+    if (seenOutputs.has(o.output)) {
+      const e = new Error(`bundle ${path}: outputs[${i}].output "${o.output}" is duplicated`);
+      e.exitCode = EXIT.IO;
+      throw e;
+    }
+    seenOutputs.add(o.output);
+  }
+  return { outputs: parsed.outputs.map(o => ({ template: o.template, output: o.output })) };
+}
+
 /**
  * Resolve a value for every placeholder using the locked precedence chain:
  * CLI flag > `--params` JSON > `--interactive` prompt > schema default >
@@ -1386,7 +1550,7 @@ export function resolveRefs(resolved, sources, parties) {
  * @param {{ prompter?: (p: Placeholder) => Promise<string|null> }} [io]
  * @returns {Promise<ResolvedValues>}
  */
-export async function resolveValues(placeholders, opts, paramsObj, { prompter = nodePrompter } = {}) {
+export async function resolveValues(placeholders, opts, paramsObj, { prompter = nodePrompter, inferred = null } = {}) {
   const resolved = {};
   const missing = [];
   const sources = {};
@@ -1401,6 +1565,12 @@ export async function resolveValues(placeholders, opts, paramsObj, { prompter =
       sources[p.key] = "params";
       continue;
     }
+    // v2 #4: --from-deal LLM-inferred values, between --params and --interactive.
+    if (inferred && Object.prototype.hasOwnProperty.call(inferred, p.key)) {
+      resolved[p.key] = String(inferred[p.key]);
+      sources[p.key] = "deal-llm";
+      continue;
+    }
     if (opts.interactive) {
       const v = await prompter(p);
       if (v !== null && v !== undefined && v !== "") {
@@ -2015,7 +2185,7 @@ export async function cmdListPlaceholders(opts, input, schema, envObj, { fetcher
   return EXIT.OK;
 }
 
-export async function cmdValidate(opts, input, schema, paramsObj, envObj, { fetcher, out, err, parties = null } = {}) {
+export async function cmdValidate(opts, input, schema, paramsObj, envObj, { fetcher, out, err, parties = null, dealText = null } = {}) {
   const result = await runCascade(input, opts, schema, envObj, { fetcher });
   if (result.tier === "none") {
     err.write(paint("error: no placeholders detected by any tier\n", "red", err));
@@ -2035,7 +2205,24 @@ export async function cmdValidate(opts, input, schema, paramsObj, envObj, { fetc
     }
     return EXIT.VALIDATION;
   }
-  const { resolved, missing, sources } = await resolveValues(result.placeholders, opts, paramsObj);
+  // v2 #4: --from-deal LLM inference (when dealText is present and
+  // --no-llm not set). Provider config comes from env. Errors are fatal
+  // to keep the user from running with partial inferred values.
+  let inferred = null;
+  if (dealText && !opts.noLlm) {
+    try {
+      const r = await inferFromDeal(dealText, result.placeholders, llmProviderFromEnv(envObj), { fetcher });
+      inferred = r.values;
+      for (const k of r.extraKeys) {
+        err.write(paint(`warning: --from-deal LLM emitted unknown key "${k}" (not in template/schema)\n`, "yellow", err));
+      }
+      for (const w of r.warnings) err.write(paint(`warning: ${w}\n`, "yellow", err));
+    } catch (e) {
+      err.write(paint(`error: ${e.message}\n`, "red", err));
+      return e.exitCode || EXIT.LLM;
+    }
+  }
+  const { resolved, missing, sources } = await resolveValues(result.placeholders, opts, paramsObj, { inferred });
   if (missing.length > 0) {
     printMissing(missing, err);
     if (opts.json) {
@@ -2096,7 +2283,7 @@ export async function cmdValidate(opts, input, schema, paramsObj, envObj, { fetc
   return EXIT.OK;
 }
 
-export async function cmdDraft(opts, input, schema, paramsObj, envObj, { fetcher, out, err, parties = null } = {}) {
+export async function cmdDraft(opts, input, schema, paramsObj, envObj, { fetcher, out, err, parties = null, dealText = null } = {}) {
   const result = await runCascade(input, opts, schema, envObj, { fetcher });
   if (result.tier === "none") {
     const hasProvider = Boolean(llmProviderFromEnv(envObj));
@@ -2147,7 +2334,25 @@ export async function cmdDraft(opts, input, schema, paramsObj, envObj, { fetcher
     return EXIT.VALIDATION;
   }
 
-  const { resolved, missing, sources } = await resolveValues(result.placeholders, opts, paramsObj);
+  // v2 #4: --from-deal LLM inference (when dealText is present and
+  // --no-llm not set). Provider config comes from env. Errors are fatal
+  // to keep the user from running with partial inferred values.
+  let inferred = null;
+  if (dealText && !opts.noLlm) {
+    try {
+      const r = await inferFromDeal(dealText, result.placeholders, llmProviderFromEnv(envObj), { fetcher });
+      inferred = r.values;
+      for (const k of r.extraKeys) {
+        err.write(paint(`warning: --from-deal LLM emitted unknown key "${k}" (not in template/schema)\n`, "yellow", err));
+      }
+      for (const w of r.warnings) err.write(paint(`warning: ${w}\n`, "yellow", err));
+    } catch (e) {
+      err.write(paint(`error: ${e.message}\n`, "red", err));
+      return e.exitCode || EXIT.LLM;
+    }
+  }
+
+  const { resolved, missing, sources } = await resolveValues(result.placeholders, opts, paramsObj, { inferred });
   // Footgun guard: flag --typo'd-key VALUE that didn't match any detected
   // placeholder. Without this warning, a typo'd flag is silently dropped and
   // the user sees only a "missing required" error without the connection.
@@ -2282,6 +2487,151 @@ export async function cmdDraft(opts, input, schema, paramsObj, envObj, { fetcher
   return EXIT.OK;
 }
 
+/**
+ * cmdBundle — orchestrate filling multiple templates with one shared
+ * parameter set (v2 #6). For each bundle entry:
+ *   1. resolveInput + loadSchema (per template)
+ *   2. runCascade (per template)
+ *   3. union placeholders by key
+ * Then resolve values once across the union (CLI/--params/interactive/
+ * default), run typed-param normalization + computed values, and write
+ * each output. Q3.2 locked: any pre-write error (no-detection in an
+ * entry, missing required param across the union, type / computed
+ * failure) aborts the whole bundle before any file is written.
+ *
+ * @param {Object} opts
+ * @param {{outputs: Array<{template: string, output: string}>}} bundle
+ * @param {Object} paramsObj
+ * @param {Object} envObj
+ * @returns {Promise<number>} exit code
+ */
+export async function cmdBundle(opts, bundle, paramsObj, envObj, { fetcher, out, err, spawner, stdinReader, parties = null } = {}) {
+  // Phase 1: load each template + schema, run detection.
+  const entries = [];
+  for (let i = 0; i < bundle.outputs.length; i++) {
+    const o = bundle.outputs[i];
+    let input, schema, cascade;
+    try {
+      input = await resolveInput(o.template, { spawner, stdinReader });
+      schema = loadSchema(input.path);
+    } catch (e) {
+      err.write(paint(`error: bundle entry ${i} "${o.template}": ${e.message}\n`, "red", err));
+      return e.exitCode || EXIT.IO;
+    }
+    cascade = await runCascade(input, opts, schema, envObj, { fetcher });
+    if (cascade.tier === "none") {
+      err.write(paint(`error: bundle entry ${i} "${o.template}": no placeholders detected by any tier\n`, "red", err));
+      return EXIT.VALIDATION;
+    }
+    // v2 #7 positional errors per template — abort early.
+    if (cascade.positional_errors && cascade.positional_errors.length > 0) {
+      for (const pe of cascade.positional_errors) {
+        err.write(paint(`error: bundle entry ${i} "${o.template}" positional placeholder "${pe.key}": ${pe.reason}\n`, "red", err));
+      }
+      return EXIT.VALIDATION;
+    }
+    // Orphan check per template (schema declares something not detected here).
+    const orphans = findOrphans(schema, cascade.placeholders, cascade.detected_schema_keys);
+    if (orphans.length > 0) {
+      for (const oo of orphans) {
+        err.write(paint(`error: bundle entry ${i} "${o.template}" schema declares "${oo.key}" but no matching phrase was detected by tier '${cascade.tier}'.\n`, "red", err));
+      }
+      return EXIT.VALIDATION;
+    }
+    entries.push({ output: o.output, input, schema, cascade });
+  }
+
+  // Phase 2: union placeholders by key. Q3.3 locked: union semantics —
+  // a key declared/detected in any template applies to all. First
+  // occurrence's metadata wins (required, default, type, format, etc.);
+  // a per-template later occurrence may have richer aliases but we keep
+  // the first canonical entry.
+  const unionPlaceholders = [];
+  const seenKeys = new Set();
+  for (const e of entries) {
+    for (const p of e.cascade.placeholders) {
+      if (seenKeys.has(p.key)) continue;
+      seenKeys.add(p.key);
+      unionPlaceholders.push(p);
+    }
+  }
+
+  // Phase 3: shared value resolution + footgun guard.
+  const { resolved, missing, sources } = await resolveValues(unionPlaceholders, opts, paramsObj);
+  const declaredKeys = new Set(unionPlaceholders.map((p) => p.key));
+  const unusedFlags = Object.keys(opts.paramFlags).filter((k) => !declaredKeys.has(k));
+  for (const u of unusedFlags) {
+    err.write(paint(`warning: flag --${u.replace(/_/g, "-")} did not match any placeholder in any bundle template (possible typo?)\n`, "yellow", err));
+  }
+  if (missing.length > 0) {
+    printMissing(missing, err);
+    return EXIT.VALIDATION;
+  }
+
+  // v2 #5: parties.json refs resolve across the union before typed
+  // normalization (same order as cmdDraft / cmdValidate).
+  const refCheck = resolveRefs(resolved, sources, parties);
+  if (!refCheck.ok) {
+    for (const re of refCheck.errors) {
+      err.write(paint(`error: parties reference failed for "${re.key}": ${re.message}\n`, "red", err));
+    }
+    return EXIT.VALIDATION;
+  }
+
+  // Phase 4: typed-parameter + computed pipelines (same as cmdDraft).
+  const typeCheck = normalizeTypedValues(unionPlaceholders, resolved);
+  if (!typeCheck.ok) {
+    for (const te of typeCheck.errors) {
+      err.write(paint(`error: type validation failed for "${te.key}": ${te.message}\n`, "red", err));
+    }
+    return EXIT.VALIDATION;
+  }
+  const computeCheck = computeValues(unionPlaceholders, resolved);
+  if (!computeCheck.ok) {
+    for (const ce of computeCheck.errors) {
+      err.write(paint(`error: computed value failed for "${ce.key}": ${ce.message}\n`, "red", err));
+    }
+    return EXIT.VALIDATION;
+  }
+
+  // Phase 5: substitute per template + write. Q3.2: any write failure
+  // exits with EXIT.IO; earlier successful writes are NOT rolled back
+  // (atomicity at the filesystem is best-effort).
+  for (let i = 0; i < entries.length; i++) {
+    const e = entries[i];
+    const outputText = substitute(e.input.body, e.cascade.placeholders, resolved, e.cascade.tier);
+    try {
+      // For .docx input with .docx output: round-trip via substituteDocxXml.
+      if (e.input.kind === "docx" && extname(e.output) === ".docx") {
+        const { xml: newXml, warnings: dw } = substituteDocxXml(
+          e.input.docxXml, e.cascade.placeholders, resolved, e.cascade.tier
+        );
+        if (dw.length) for (const w of dw) err.write(paint(`warning (entry ${i}): ${w}\n`, "yellow", err));
+        const buf = await writeDocxBuffer(e.input.path, newXml);
+        writeFileSync(e.output, buf);
+      } else {
+        writeFileSync(e.output, outputText, "utf8");
+      }
+    } catch (writeErr) {
+      err.write(paint(`error: bundle entry ${i} could not write ${e.output}: ${writeErr.message}\n`, "red", err));
+      return EXIT.IO;
+    }
+  }
+
+  if (!opts.silent && !opts.json) {
+    err.write(paint(`ok: wrote ${entries.length} document(s) — ${entries.map(e => e.output).join(", ")}\n`, "green", err));
+  }
+  if (opts.json) {
+    out.write(JSON.stringify({
+      ok: true,
+      outputs: entries.map(e => ({ template: e.input.path, output: e.output, tier: e.cascade.tier })),
+      resolved_keys: Object.keys(resolved),
+      sources,
+    }, null, 2) + "\n");
+  }
+  return EXIT.OK;
+}
+
 function describeInput(input) {
   if (input.path) return input.path;
   if (input.kind === "text") return "stdin";
@@ -2583,6 +2933,33 @@ export async function main(argv, io = {}) {
     return await runCheckLlm(envObj, out, err, { fetcher });
   }
 
+  // v2 #6: bundle mode. `--bundle PATH` reads a bundle definition and
+  // orchestrates filling each entry's template with shared parameters.
+  // In bundle mode, no positional template arg is required (the bundle
+  // declares them).
+  if (opts.bundle) {
+    if (opts.positional.length > 0) {
+      err.write(paint(`error: --bundle does not take a positional template arg (the bundle declares them)\n`, "red", err));
+      return EXIT.IO;
+    }
+    let bundle, paramsObj, envObj, parties;
+    try {
+      bundle = loadBundle(opts.bundle);
+      paramsObj = loadParamsFile(opts.params);
+      envObj = effectiveEnv(cwd, processEnv);
+      parties = loadParties(opts.parties || null);
+    } catch (e) {
+      err.write(paint(`error: ${e.message}\n`, "red", err));
+      return e.exitCode || EXIT.IO;
+    }
+    try {
+      return await cmdBundle(opts, bundle, paramsObj, envObj, { fetcher, out, err, spawner, stdinReader, parties });
+    } catch (e) {
+      err.write(paint(`error: ${e.message}\n`, "red", err));
+      return e.exitCode || EXIT.IO;
+    }
+  }
+
   if (opts.positional.length === 0) {
     err.write(paint(`error: no template given\n`, "red", err));
     err.write(`run \`draft --help\` for usage.\n`);
@@ -2593,13 +2970,22 @@ export async function main(argv, io = {}) {
     return EXIT.IO;
   }
 
-  let input, schema, paramsObj, envObj, parties;
+  let input, schema, paramsObj, envObj, parties, dealText;
   try {
     input = await resolveInput(opts.positional[0], { spawner, stdinReader });
     schema = loadSchema(input.path);
     paramsObj = loadParamsFile(opts.params);
     envObj = effectiveEnv(cwd, processEnv);
     parties = loadParties(opts.parties || null);
+    // v2 #4: --from-deal PATH reads a free-form deal description.
+    if (opts.fromDeal) {
+      if (!existsSync(opts.fromDeal)) {
+        const e = new Error(`deal description file not found: ${opts.fromDeal}`);
+        e.exitCode = EXIT.IO;
+        throw e;
+      }
+      dealText = readFileSync(opts.fromDeal, "utf8");
+    }
   } catch (e) {
     err.write(paint(`error: ${e.message}\n`, "red", err));
     return e.exitCode || EXIT.IO;
@@ -2610,9 +2996,9 @@ export async function main(argv, io = {}) {
       return await cmdListPlaceholders(opts, input, schema, envObj, { fetcher, out, err });
     }
     if (opts.validate) {
-      return await cmdValidate(opts, input, schema, paramsObj, envObj, { fetcher, out, err, parties });
+      return await cmdValidate(opts, input, schema, paramsObj, envObj, { fetcher, out, err, parties, dealText });
     }
-    return await cmdDraft(opts, input, schema, paramsObj, envObj, { fetcher, out, err, parties });
+    return await cmdDraft(opts, input, schema, paramsObj, envObj, { fetcher, out, err, parties, dealText });
   } catch (e) {
     err.write(paint(`error: ${e.message}\n`, "red", err));
     return e.exitCode || EXIT.IO;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drbaher/draft-cli",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "description": "Fill placeholders in a legal-document template with parameter values. Part of the contract-operations suite.",
   "type": "module",
   "bin": {