@drbaher/draft-cli 0.4.0 → 0.6.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.6.0 — 2026-05-16
+
+### Added
+
+- **Cross-template `parties.json` registry.** A repo-local
+  `parties.json` declares known parties once; templates' schemas
+  reference fields with `ref:parties.<key>.<field>`:
+  ```json
+  // parties.json
+  { "acme_corp": { "name": "Acme Corporation", "state": "Delaware" } }
+  ```
+  ```json
+  // <template>.params.json
+  {
+    "_meta": { "v": 1 },
+    "party_a":       { "aliases": ["Party A"],       "default": "ref:parties.acme_corp.name" },
+    "party_a_state": { "aliases": ["Party A State"], "default": "ref:parties.acme_corp.state" }
+  }
+  ```
+  Resolution happens between `resolveValues` and typed-parameter
+  normalization, so `ref:`-resolved values feed cleanly into
+  `type: date | money | party` flows.
+- **`--parties PATH` flag** overrides the default CWD/`parties.json`
+  lookup. Missing explicit path → exit 1 with a clear error.
+- **New public API:** `loadParties(path)`, `resolveRef(value, parties)`,
+  `resolveRefs(resolved, sources, parties)`.
+
+### Decisions locked (V2_BRIEFS_REMAINING Q2.1–Q2.3)
+
+- **Q2.1 File location:** default is `./parties.json` in CWD;
+  override with `--parties PATH`.
+- **Q2.2 Ref scope:** refs resolve in `--params` JSON and schema
+  `default` values only. CLI flag values with `ref:` prefix pass
+  through **unchanged** — they're treated as literal strings.
+- **Q2.3 Versioning:** out of scope for v0.6.0. When a party's
+  metadata changes in `parties.json`, all drafts that ref it produce
+  different output if re-run. Documented as a known property.
+
+### Schema-contract change
+
+`PARAM_SCHEMA.md` §5 gains a "Cross-template `parties.json` registry"
+subsection. v0.6.0 schemas are forward-compatible with v0.5.x
+readers — `ref:` strings just look like literal values to older
+readers (and won't substitute correctly, but won't error out either
+since "ref:..." is a valid string).
+
+## 0.5.0 — 2026-05-16
+
+### Added
+
+- **Positional addressing** for same-text placeholders with different
+  semantic roles. Long-form schema entries can declare a `positions`
+  array; each position gets its own canonical key (via `role`), so the
+  CLI uses standard `--<role>` flags. Validated against the YC SAFE
+  `$[_____________] × 2` case (valuation cap vs. purchase amount).
+  ```json
+  "blank": {
+    "aliases": ["_____________"],
+    "type": "money", "currency": "USD",
+    "positions": [
+      { "role": "valuation_cap" },
+      { "role": "purchase_amount" }
+    ]
+  }
+  ```
+  ```sh
+  draft safe.docx \
+    --valuation-cap 5000000 \
+    --purchase-amount 100000
+  ```
+  Decisions locked (V2_BRIEFS_REMAINING Q1.1–Q1.3):
+  - **Q1.1 Index base**: schema positions are 0-indexed internally;
+    the CLI uses role names, not numeric indices.
+  - **Q1.2 Length mismatch**: schema declares N positions but
+    detection finds M ≠ N occurrences → hard error (exit 4).
+  - **Q1.3 Bare-key CLI**: a `--<role>` flag targets its specific
+    position; values still flow through `--params` JSON or
+    `--interactive` normally.
+
+### Constraints
+
+- Positional addressing only works at tier T1 (bracket) and T2
+  (mustache) — those tiers carry per-hit byte indices needed for
+  position-specific substitution. T3 (docx-highlight), T4 (heuristic),
+  T5 (LLM) raise a positional error if a positional schema entry's
+  aliases are matched by them. `.docx` templates with `[X]` brackets
+  that fire T1 still work; `.docx` templates that rely on T3 highlights
+  for the same alias do not.
+
+### Schema-contract change
+
+`PARAM_SCHEMA.md` §5 gains a "Positional addressing" subsection. Long-
+form entries can now include a `positions` array; short form is
+unchanged. Forward-compatible with v0.4.x readers — they'll ignore the
+unknown field and treat the entry as a regular non-positional
+placeholder (which means the first detected occurrence wins for
+substitution, and ambiguity is unresolved).
+
 ## 0.4.0 — 2026-05-16
 
 ### Added
@@ -263,22 +361,25 @@ suite ([cli.drbaher.com](https://cli.drbaher.com)).
   that contains at least one letter. False positives are filtered with
   the schema file; false negatives in this domain are higher-cost.
 
-## Deferred (v2 candidates)
-
-- **`.docx` output round-trip.** v1 writes plain markdown even from a
-  `.docx` input. Re-writing back into a `.docx` (preserving styles,
-  numbering, and run formatting) is a separate problem.
-- **Computed placeholders** (`[Effective Date + 2 years]`). The long-form
-  schema reserves a future `"computed"` field.
-- **Typed parameters** (`party`, `date`, `money` with format validation).
-  Schema reserves a future `"type"` field.
-- **LLM-assisted parameter inference from a deal description.** v1's T5
-  only suggests placeholders from template text — not from external prose
-  describing the deal.
-- **Cross-template parameter registry** (`parties.json` remembering
-  addresses, e-signature contacts, etc.). Additive — would layer
-  underneath `--params` in precedence.
-- **Multi-document bundles** (MSA + SOW sharing parameters in one call).
-  v1 is one document per invocation.
+## Deferred (post-v0.4.0 candidates)
+
+Three of the original seven v1 "Deferred" entries shipped in v0.2.0,
+v0.3.2, and v0.4.0 (see entries above). The four remaining items are
+the next chunk of design work, with briefs in `V2_BRIEFS_REMAINING.md`:
+
+- **Positional addressing.** Disambiguate same-text placeholders by
+  index in the schema. The validated case: YC SAFE has
+  `$[_____________]` twice — once for the valuation cap, once for
+  the purchase amount. Smallest of the four (~150 LOC).
+- **Cross-template `parties.json` registry.** Declare parties once
+  with `ref:parties.<key>.<field>` references from schemas. Eliminates
+  duplicating party metadata across every template (~250 LOC).
+- **Multi-document bundles.** Resolve placeholders once and emit
+  multiple documents in one call (MSA + Order Form + DPA with shared
+  parameter values) (~250 LOC).
+- **LLM inference from a deal description.** `--from-deal <path>`
+  reads free-form deal text and asks the T5 LLM provider to fill the
+  schema's parameters. Inverse of the existing T5 detection (~250 LOC).
 - **`.docx` highlight detection beyond yellow/green/cyan/magenta.** v1
-  ignores other colors (black/white/none) by design.
+  ignores other colors (black/white/none) by design. Backlog, not in
+  V2_BRIEFS_REMAINING (low priority).

package/PARAM_SCHEMA.md

@@ -331,6 +331,126 @@ that format).
 Programmatic API for drivers: `parseDuration`, `addDuration`,
 `computeValues`.
 
+### Positional addressing (v0.5.0, opt-in)
+
+Some templates have the same placeholder text appearing multiple times
+with *different* semantic roles. The validated YC SAFE case:
+`$[_____________]` appears twice — once as valuation cap, once as
+purchase amount. Long-form entries can declare a `positions` array
+that splits each occurrence into its own canonical-keyed placeholder.
+
+```json
+{
+  "_meta": { "schema_version": 1 },
+  "blank": {
+    "aliases": ["_____________"],
+    "type": "money", "currency": "USD",
+    "positions": [
+      { "role": "valuation_cap" },
+      { "role": "purchase_amount" }
+    ]
+  }
+}
+```
+
+CLI uses standard `--<role>` flags (no special `@N` grammar):
+
+```sh
+draft safe.docx --valuation-cap 5000000 --purchase-amount 100000
+```
+
+**Q1.1 locked:** index base is 0 internally; the CLI uses role names,
+not numeric indices.
+
+**Q1.2 locked:** count mismatch (schema declares N positions but
+detection finds M ≠ N occurrences of the alias) is a **hard error**
+(exit 4). The schema and the template are out of sync; silently filling
+or trimming hides the bug.
+
+**Q1.3 locked:** there is no bare-key CLI variant (`--<parent-key>
+VALUE` with no role). The CLI uses role-named flags. Bare `--<role>`
+targets that role's position; values can also come from `--params`
+JSON keyed by role, or `--interactive`.
+
+**Tier constraint:** positional addressing only works at T1 (bracket)
+or T2 (mustache). T3/T4/T5 detection paths don't carry per-hit byte
+indices needed for position-specific substitution; if a positional
+schema entry's aliases are matched by those tiers, the command exits 4
+with a clear error.
+
+**Validation:** at schema parse time, positions must be a non-empty
+array of `{role: string}` objects; roles must be valid snake_case keys
+and unique within the entry.
+
+Programmatic API: positions flow through detection and resolution as
+normal `Placeholder` objects with `position_parent` (parent schema key)
+and `position_index` (0-based) fields. `substitute` switches to
+byte-index substitution for these, which `substituteDocxXml` does not
+currently support.
+
+### Cross-template `parties.json` registry (v0.6.0, opt-in)
+
+A repo-local `parties.json` declares known parties once; templates'
+schemas reference fields with `ref:parties.<party_key>.<field>`.
+Eliminates duplicating party metadata (name, state, CIK, signing
+contact) across every template.
+
+```json
+// parties.json
+{
+  "acme_corp": {
+    "name": "Acme Corporation",
+    "state": "Delaware",
+    "cik": "0001234567"
+  }
+}
+```
+
+```json
+// <template>.params.json
+{
+  "_meta": { "schema_version": 1 },
+  "party_a":       { "aliases": ["Party A"],       "default": "ref:parties.acme_corp.name" },
+  "party_a_state": { "aliases": ["Party A State"], "default": "ref:parties.acme_corp.state" }
+}
+```
+
+**Q2.1 locked:** default file location is `./parties.json` in the
+process CWD. Override with `--parties PATH`. Missing explicit path
+is exit 1 (`EXIT.IO`); missing default file silently means "no
+registry loaded" (refs then fail at resolution time with a clear hint).
+
+**Q2.2 locked:** refs resolve in `--params` JSON values and schema
+`default` values only. **CLI flag values pass through unchanged** —
+`--party-a "ref:parties.acme.name"` is treated as a literal string
+that happens to start with `ref:`. This keeps CLI parsing
+unambiguous and avoids users accidentally leaking parties data on
+the command line.
+
+**Q2.3 locked:** versioning is out of scope for v0.6.0. When a
+party's metadata changes in `parties.json`, all drafts that ref it
+produce different output if re-run. This is by design (single source
+of truth for party info), but worth knowing — historical drafts may
+diverge from their original `parties.json` values.
+
+**Ref syntax:** `ref:parties.<party_key>.<field>` where both
+`<party_key>` and `<field>` match `[A-Za-z_][A-Za-z0-9_]*`. Malformed
+refs, unknown party keys, and unknown fields all surface as hard
+errors before substitution (exit 4).
+
+**Resolution order:** value resolution → ref expansion → typed-param
+normalization → computed values → substitute. Refs run before typed
+normalization so a ref returning `"2027-01-15"` can still flow
+through `type: date` formatting.
+
+**Field-value coercion:** ref'd fields are coerced to strings via
+`String(value)` (e.g. `cik: 1234567` becomes `"1234567"`). The
+parties registry can store non-string values for ergonomics, but
+substitution always uses string output.
+
+Programmatic API: `loadParties(path)`, `resolveRef(value, parties)`,
+`resolveRefs(resolved, sources, parties)`.
+
 ### 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.4.0";
+export const VERSION = "0.6.0";
 
 // ─── EXIT CODES ─────────────────────────────────────────────────────────────
 /**
@@ -277,6 +277,7 @@ export function parseArgs(argv) {
     if (a === "--silent" || a === "-q") { opts.silent = true; continue; }
     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 === "--output" || a === "-o") { opts.output = argv[++i]; continue; }
     if (a === "--syntax") {
       const v = argv[++i];
@@ -914,6 +915,40 @@ export function parseSchema(parsed, sourceLabel = "<schema>") {
         e.exitCode = EXIT.IO;
         throw e;
       }
+      // v2 #7: positional addressing. Optional `positions` array; each
+      // element declares a role (its own canonical key) for the Nth detected
+      // occurrence of this entry's aliases. Roles must be valid keys and
+      // unique within the entry.
+      let positions = null;
+      if (v.positions !== undefined) {
+        if (!Array.isArray(v.positions) || v.positions.length === 0) {
+          const e = new Error(`${sourceLabel}: long-form entry '${k}' positions must be a non-empty array`);
+          e.exitCode = EXIT.IO;
+          throw e;
+        }
+        const roleSet = new Set();
+        positions = [];
+        for (let pi = 0; pi < v.positions.length; pi++) {
+          const pos = v.positions[pi];
+          if (!pos || typeof pos !== "object" || Array.isArray(pos)) {
+            const e = new Error(`${sourceLabel}: '${k}'.positions[${pi}] must be an object with a 'role' string`);
+            e.exitCode = EXIT.IO;
+            throw e;
+          }
+          if (typeof pos.role !== "string" || !validKey(pos.role)) {
+            const e = new Error(`${sourceLabel}: '${k}'.positions[${pi}].role must be a valid snake_case key`);
+            e.exitCode = EXIT.IO;
+            throw e;
+          }
+          if (roleSet.has(pos.role)) {
+            const e = new Error(`${sourceLabel}: '${k}'.positions has duplicate role '${pos.role}'`);
+            e.exitCode = EXIT.IO;
+            throw e;
+          }
+          roleSet.add(pos.role);
+          positions.push({ role: pos.role });
+        }
+      }
       // v2 #2: computed placeholders. Optional `computed` block on long-form
       // entries; { from: <other-key>, op: "+"|"-", value: "<n> <unit>" }.
       let computed = null;
@@ -951,6 +986,7 @@ export function parseSchema(parsed, sourceLabel = "<schema>") {
         format: typeof v.format === "string" ? v.format : null,
         currency: typeof v.currency === "string" ? v.currency : null,
         computed,
+        positions,
       };
     } else {
       if (!Array.isArray(v)) {
@@ -958,7 +994,7 @@ export function parseSchema(parsed, sourceLabel = "<schema>") {
         e.exitCode = EXIT.IO;
         throw e;
       }
-      entries[k] = { aliases: v.slice(), required: true, default: null, type: null, format: null, currency: null, computed: null };
+      entries[k] = { aliases: v.slice(), required: true, default: null, type: null, format: null, currency: null, computed: null, positions: null };
     }
   }
   // v2 #2: validate computed references (point to existing keys; no cycles).
@@ -1126,6 +1162,7 @@ function assemble(tier, hits, schema, warnings, fromLlm = false) {
         format: resolved.format,
         currency: resolved.currency,
         computed: resolved.computed,
+        positions: resolved.positions,
         hits: [],
       });
     }
@@ -1133,7 +1170,52 @@ function assemble(tier, hits, schema, warnings, fromLlm = false) {
     entry.occurrences += 1;
     entry.hits.push(h);
   }
-  return { tier, placeholders: [...byKey.values()], warnings, unmapped };
+  // v2 #7: expand positional entries. Each detected occurrence becomes a
+  // separate role-keyed placeholder. Count mismatch → positional_errors;
+  // tier T3/T4/T5 (no per-hit index) → positional_errors (not supported).
+  const placeholders = [];
+  const positional_errors = [];
+  const detected_schema_keys = [...byKey.keys()];
+  for (const p of byKey.values()) {
+    if (!p.positions) {
+      placeholders.push(p);
+      continue;
+    }
+    if (tier !== "bracket" && tier !== "mustache") {
+      positional_errors.push({
+        key: p.key,
+        reason: `tier '${tier}' does not carry per-hit index info; positional addressing requires T1 (bracket) or T2 (mustache) detection`,
+      });
+      continue;
+    }
+    if (p.hits.length !== p.positions.length) {
+      positional_errors.push({
+        key: p.key,
+        reason: `schema declares ${p.positions.length} position(s) but detected ${p.hits.length} occurrence(s) of "${p.aliases[0] || p.key}"`,
+      });
+      continue;
+    }
+    for (let i = 0; i < p.positions.length; i++) {
+      placeholders.push({
+        key: p.positions[i].role,
+        first_seen_as: p.hits[i].inner,
+        occurrences: 1,
+        tier,
+        required: true,
+        default: null,
+        aliases: p.aliases.slice(),
+        type: p.type,
+        format: p.format,
+        currency: p.currency,
+        computed: null,
+        positions: null, // expanded; no further re-expansion
+        hits: [p.hits[i]],
+        position_parent: p.key,
+        position_index: i,
+      });
+    }
+  }
+  return { tier, placeholders, warnings, unmapped, positional_errors, detected_schema_keys };
 }
 
 function resolveKey(hit, schema, fromLlm) {
@@ -1149,6 +1231,7 @@ function resolveKey(hit, schema, fromLlm) {
           format: entry.format || null,
           currency: entry.currency || null,
           computed: entry.computed || null,
+          positions: entry.positions || null,
         };
       }
     }
@@ -1156,7 +1239,7 @@ function resolveKey(hit, schema, fromLlm) {
   }
   const key = fromLlm && hit.suggested_key ? hit.suggested_key : canonicalKey(hit.inner);
   if (!validKey(key)) return null;
-  return { key, required: true, default: null, aliases: [hit.inner], type: null, format: null, currency: null, computed: null };
+  return { key, required: true, default: null, aliases: [hit.inner], type: null, format: null, currency: null, computed: null, positions: null };
 }
 
 // ─── VALUE RESOLUTION (CLI > JSON > prompt > default) ───────────────────────
@@ -1190,6 +1273,108 @@ export function loadParamsFile(path) {
   }
 }
 
+/**
+ * Load a `parties.json` registry (v2 #5). Returns the parsed object or
+ * `null` if no file is present. Explicit `--parties PATH` errors if
+ * the path doesn't exist; the default `./parties.json` is treated as
+ * absent if the file isn't there (no error).
+ *
+ * @param {string | null} explicitPath — value of `--parties PATH`, or null
+ *   to auto-detect `./parties.json` in CWD.
+ * @returns {Object<string, Object<string, *>> | null}
+ * @throws {Error} with `.exitCode = EXIT.IO` on missing explicit file or invalid JSON.
+ */
+export function loadParties(explicitPath) {
+  const fallback = "parties.json";
+  const path = explicitPath || (existsSync(fallback) ? fallback : null);
+  if (!path) return null;
+  if (!existsSync(path)) {
+    const e = new Error(`parties 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 ${path}: ${err.message}`);
+    e.exitCode = EXIT.IO;
+    throw e;
+  }
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+    const e = new Error(`parties file ${path} must be a JSON object`);
+    e.exitCode = EXIT.IO;
+    throw e;
+  }
+  // Reject non-object party entries early so downstream `ref:` resolution
+  // can safely lookup fields without a per-call shape check.
+  for (const [partyKey, party] of Object.entries(parsed)) {
+    if (!party || typeof party !== "object" || Array.isArray(party)) {
+      const e = new Error(`parties file ${path}: entry "${partyKey}" must be a JSON object`);
+      e.exitCode = EXIT.IO;
+      throw e;
+    }
+  }
+  return parsed;
+}
+
+/**
+ * Resolve a `ref:parties.<party>.<field>` reference against a loaded
+ * parties object. Throws on malformed ref, missing parties registry,
+ * unknown party, or unknown field. Non-`ref:` strings pass through
+ * unchanged.
+ *
+ * @param {string} value
+ * @param {Object<string, Object<string, *>> | null} parties
+ * @returns {string}
+ * @throws {Error} on malformed or unresolvable reference.
+ */
+export function resolveRef(value, parties) {
+  if (typeof value !== "string" || !value.startsWith("ref:")) return value;
+  if (!parties) {
+    throw new Error(`reference "${value}" but no parties.json loaded (pass --parties PATH or put parties.json in cwd)`);
+  }
+  const m = /^ref:parties\.([A-Za-z_][A-Za-z0-9_]*)\.([A-Za-z_][A-Za-z0-9_]*)$/.exec(value);
+  if (!m) {
+    throw new Error(`malformed reference "${value}" (expected "ref:parties.<party_key>.<field>")`);
+  }
+  const [, partyKey, fieldKey] = m;
+  const party = parties[partyKey];
+  if (!party) {
+    throw new Error(`unknown party "${partyKey}" in reference "${value}"`);
+  }
+  if (!(fieldKey in party)) {
+    throw new Error(`unknown field "${fieldKey}" on party "${partyKey}" in reference "${value}"`);
+  }
+  const out = party[fieldKey];
+  return out == null ? "" : String(out);
+}
+
+/**
+ * Walk a resolved-values map and replace any `ref:` strings with their
+ * resolved values from the parties registry. CLI-sourced values are
+ * left alone (Q2.2: refs are params/default only, never CLI). Collects
+ * all errors before returning so the user sees every failure at once.
+ *
+ * @param {Object<string,string>} resolved — mutated in place.
+ * @param {Object<string,string>} sources — from `resolveValues`.
+ * @param {Object<string, Object<string, *>> | null} parties
+ * @returns {{ ok: boolean, errors: Array<{ key: string, message: string }> }}
+ */
+export function resolveRefs(resolved, sources, parties) {
+  const errors = [];
+  for (const [key, value] of Object.entries(resolved)) {
+    if (sources[key] === "cli") continue; // Q2.2: CLI values pass through
+    if (typeof value !== "string" || !value.startsWith("ref:")) continue;
+    try {
+      resolved[key] = resolveRef(value, parties);
+    } catch (e) {
+      errors.push({ key, message: e.message });
+    }
+  }
+  return { ok: errors.length === 0, errors };
+}
+
 /**
  * Resolve a value for every placeholder using the locked precedence chain:
  * CLI flag > `--params` JSON > `--interactive` prompt > schema default >
@@ -1592,9 +1777,17 @@ async function nodePrompter(placeholder) {
  * @param {Placeholder[]} placeholders
  * @returns {Array<{key: string, aliases: string[]}>}
  */
-export function findOrphans(schema, placeholders) {
+export function findOrphans(schema, placeholders, detectedSchemaKeys = null) {
   if (!schema) return [];
-  const present = new Set(placeholders.map((p) => p.key));
+  // v2 #7: for positional entries we check `detectedSchemaKeys` (the
+  // pre-expansion key set) since the placeholders list shows role keys,
+  // not the parent positional key. When detectedSchemaKeys is not given
+  // (older callers / no schema-expansion path), fall back to the
+  // placeholders list — same behavior as before v0.5.0.
+  const presentForPositional = detectedSchemaKeys
+    ? new Set(detectedSchemaKeys)
+    : new Set(placeholders.map((p) => p.key));
+  const presentForRegular = new Set(placeholders.map((p) => p.key));
   // v2 #2: an entry that another entry's `computed.from` points at is
   // legitimately not in the template — it's a "feeder" used only for
   // computation. Exempt those from the orphan check.
@@ -1604,8 +1797,9 @@ export function findOrphans(schema, placeholders) {
   }
   const orphans = [];
   for (const [key, entry] of Object.entries(schema.entries)) {
-    if (present.has(key)) continue;
     if (computedFromTargets.has(key)) continue;
+    const present = entry.positions ? presentForPositional : presentForRegular;
+    if (present.has(key)) continue;
     orphans.push({ key, aliases: entry.aliases.slice() });
   }
   return orphans;
@@ -1625,8 +1819,30 @@ export function findOrphans(schema, placeholders) {
  * @returns {string} the substituted body.
  */
 export function substitute(body, placeholders, values, tier) {
+  // v2 #7: positional placeholders (`position_index !== undefined`) substitute
+  // at a specific byte index, not by global replace. Collect them first,
+  // apply in reverse-index order so earlier hits' indices stay stable. Then
+  // the remaining (non-positional) placeholders use the original
+  // replaceAll/regex logic, which is safe because positional hits all share
+  // the same alias text — and after the index-based substitution, only the
+  // exact bytes at each position have been replaced.
   let out = body;
+  const positionalSubs = [];
+  for (const p of placeholders) {
+    if (p.position_index === undefined) continue;
+    const v = values[p.key];
+    if (v === undefined) continue;
+    for (const h of p.hits) {
+      if (typeof h.index !== "number") continue;
+      positionalSubs.push({ index: h.index, length: h.match.length, value: v });
+    }
+  }
+  positionalSubs.sort((a, b) => b.index - a.index);
+  for (const s of positionalSubs) {
+    out = out.slice(0, s.index) + s.value + out.slice(s.index + s.length);
+  }
   for (const p of placeholders) {
+    if (p.position_index !== undefined) continue; // already handled above
     const v = values[p.key];
     if (v === undefined) continue;
     for (const h of p.hits) {
@@ -1799,13 +2015,20 @@ export async function cmdListPlaceholders(opts, input, schema, envObj, { fetcher
   return EXIT.OK;
 }
 
-export async function cmdValidate(opts, input, schema, paramsObj, envObj, { fetcher, out, err } = {}) {
+export async function cmdValidate(opts, input, schema, paramsObj, envObj, { fetcher, out, err, parties = 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));
     return EXIT.VALIDATION;
   }
-  const orphans = findOrphans(schema, result.placeholders);
+  // v2 #7: positional addressing errors (count mismatch, unsupported tier).
+  if (result.positional_errors && result.positional_errors.length > 0) {
+    for (const pe of result.positional_errors) {
+      err.write(paint(`error: positional placeholder "${pe.key}": ${pe.reason}\n`, "red", err));
+    }
+    return EXIT.VALIDATION;
+  }
+  const orphans = findOrphans(schema, result.placeholders, result.detected_schema_keys);
   if (orphans.length > 0) {
     for (const o of orphans) {
       err.write(paint(`error: schema declares "${o.key}" with aliases [${o.aliases.map(a => `"${a}"`).join(",")}], but no matching phrase was detected by tier '${result.tier}'.\n`, "red", err));
@@ -1820,6 +2043,22 @@ export async function cmdValidate(opts, input, schema, paramsObj, envObj, { fetc
     }
     return EXIT.VALIDATION;
   }
+  // v2 #5: parties.json ref resolution. Refs like
+  // `ref:parties.acme_corp.name` in --params or schema defaults expand
+  // before typed normalization. CLI values pass through unchanged.
+  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));
+    }
+    if (opts.json) {
+      out.write(JSON.stringify({
+        ok: false,
+        ref_errors: refCheck.errors.map(({ key, message }) => ({ key, message })),
+      }, null, 2) + "\n");
+    }
+    return EXIT.VALIDATION;
+  }
   // v2 #3: typed-parameter validation. Mirror what cmdDraft does so
   // `--validate` catches type errors before the user runs draft.
   const typeCheck = normalizeTypedValues(result.placeholders, resolved);
@@ -1857,7 +2096,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 } = {}) {
+export async function cmdDraft(opts, input, schema, paramsObj, envObj, { fetcher, out, err, parties = null } = {}) {
   const result = await runCascade(input, opts, schema, envObj, { fetcher });
   if (result.tier === "none") {
     const hasProvider = Boolean(llmProviderFromEnv(envObj));
@@ -1891,8 +2130,15 @@ export async function cmdDraft(opts, input, schema, paramsObj, envObj, { fetcher
     }
   }
 
+  // v2 #7: positional addressing errors (count mismatch, unsupported tier).
+  if (result.positional_errors && result.positional_errors.length > 0) {
+    for (const pe of result.positional_errors) {
+      err.write(paint(`error: positional placeholder "${pe.key}": ${pe.reason}\n`, "red", err));
+    }
+    return EXIT.VALIDATION;
+  }
   // Orphan check.
-  const orphans = findOrphans(schema, result.placeholders);
+  const orphans = findOrphans(schema, result.placeholders, result.detected_schema_keys);
   if (orphans.length > 0) {
     for (const o of orphans) {
       err.write(paint(`error: schema declares "${o.key}" with aliases [${o.aliases.map(a => `"${a}"`).join(",")}], but no matching phrase was detected by tier '${result.tier}'.\n`, "red", err));
@@ -1918,6 +2164,18 @@ export async function cmdDraft(opts, input, schema, paramsObj, envObj, { fetcher
     return EXIT.VALIDATION;
   }
 
+  // v2 #5: parties.json ref resolution. Refs like
+  // `ref:parties.acme_corp.name` in --params or schema defaults expand
+  // before typed normalization. CLI values pass through unchanged
+  // (Q2.2 lock).
+  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;
+  }
+
   // v2 #3: typed-parameter normalization. Schema entries can declare
   // `type: date | money | party`. Inputs are validated and normalized
   // before substitution. Hard error on bad input (Q3.3 decision).
@@ -2335,12 +2593,13 @@ export async function main(argv, io = {}) {
     return EXIT.IO;
   }
 
-  let input, schema, paramsObj, envObj;
+  let input, schema, paramsObj, envObj, parties;
   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);
   } catch (e) {
     err.write(paint(`error: ${e.message}\n`, "red", err));
     return e.exitCode || EXIT.IO;
@@ -2351,9 +2610,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 });
+      return await cmdValidate(opts, input, schema, paramsObj, envObj, { fetcher, out, err, parties });
     }
-    return await cmdDraft(opts, input, schema, paramsObj, envObj, { fetcher, out, err });
+    return await cmdDraft(opts, input, schema, paramsObj, envObj, { fetcher, out, err, parties });
   } 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.4.0",
+  "version": "0.6.0",
   "description": "Fill placeholders in a legal-document template with parameter values. Part of the contract-operations suite.",
   "type": "module",
   "bin": {