@drbaher/draft-cli 0.2.0 → 0.4.0

package/CHANGELOG.md

@@ -4,6 +4,116 @@ 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.4.0 — 2026-05-16
+
+### Added
+
+- **Computed placeholders.** Long-form schema entries can declare a
+  `computed` block referencing another key:
+  ```json
+  "term_end": {
+    "aliases": ["Term End"],
+    "type": "date",
+    "format": "MMMM d, yyyy",
+    "computed": { "from": "effective_date", "op": "+", "value": "2 years" }
+  }
+  ```
+  At substitution time, if no value was supplied via CLI / `--params`
+  / interactive / default, the computed entry's value is derived from
+  the `from` placeholder. Explicit CLI / `--params` values still win —
+  computed only fills the gap. Q2.1 locked: expression syntax lives
+  in the schema only, not in template text — keeps T1 detection
+  unchanged. Q2.2 locked: v0.4.0 supports date arithmetic only
+  (`+` / `-` with `<n> day|week|month|year[s]` durations). Money
+  math and string concat deferred to a future release.
+- **Schema-time cycle detection.** `parseSchema` throws if any
+  `computed.from` chain revisits a key (e.g. `a → b → a`), or if
+  `computed.from` references a key that doesn't exist in the same
+  schema. Catches misconfiguration before substitution starts.
+- **Orphan-check exemption.** Schema entries that are referenced only
+  as another entry's `computed.from` source (and never appear as
+  detected aliases in the template) are no longer reported as
+  orphans. They're "feeders" — declared so a computed entry can
+  reference them, even though the template doesn't show them.
+- **New public API:** `parseDuration(raw)`, `addDuration(date, op, dur)`,
+  `computeValues(placeholders, resolved)`.
+
+### Schema-contract change
+
+`PARAM_SCHEMA.md` §5 gains a "Computed placeholders" section. Long-
+form entries can now include a `computed: { from, op, value }` block;
+short form is unchanged. v0.4.0 schemas are forward-compatible with
+v0.3.x readers (which will silently ignore the `computed` field as
+unrecognized long-form metadata, treating the entry as a regular
+placeholder — but then the user has to supply a value, since v0.3.x
+won't compute one).
+
+## 0.3.2 — 2026-05-16
+
+### Fixed
+
+- **Publish auth: restored `NODE_AUTH_TOKEN` env block.** v0.3.1's
+  hotfix bumped `publish.yml` Node from 20 to 22 on the hypothesis
+  that npm CLI 11.5.1+ would auto-detect OIDC and ignore the
+  setup-node placeholder. It didn't: Node 22's npm 11.x still sent
+  the literal `XXXXX-XXXXX-XXXXX-XXXXX` placeholder and got the
+  same 404 from npm. Root cause is *not* Node version; either
+  `setup-node@v6` always writes the placeholder env into the
+  publish step, or npm CLI prefers the `.npmrc` token over OIDC
+  even when both are available. Under investigation.
+- **v0.3.1 tag exists on GitHub but did NOT publish to npm.** Skip
+  it. Registry latest is `0.2.0` until v0.3.2 ships.
+
+Pragmatic call: v0.3.2 ships via the bootstrap `NPM_TOKEN` path.
+Trusted Publisher stays configured on npm so the switch back to
+pure OIDC is a one-line change in `publish.yml` once we understand
+why npm CLI isn't using OIDC. `feedback_oidc_setup_node_v6_placeholder.md`
+in memory tracks the symptom + workarounds tried.
+
+## 0.3.1 — 2026-05-16
+
+### Fixed
+
+- **`publish.yml` now uses Node 22 instead of Node 20.** npm
+  Trusted Publishing requires npm CLI 11.5.1 or later, which ships
+  with Node 22.14+. Node 20 (npm 10.x) silently falls back to
+  `NODE_AUTH_TOKEN` when configured for a registry, and to
+  `setup-node@v6`'s placeholder value (`XXXXX-...`) when the env
+  isn't set — producing a 404 from npm masking the actual 401.
+- **v0.3.0 tag exists on GitHub but did NOT publish to npm.** v0.3.0
+  was the first publish attempt without an `NPM_TOKEN` fallback
+  (PR #10 reverted the bootstrap); the npm-CLI-too-old issue
+  surfaced immediately. No package was uploaded. v0.3.1 is the
+  rebrand of v0.3.0's typed-parameter feature with the workflow
+  fix applied. Skip v0.3.0.
+
+## 0.3.0 — 2026-05-16
+
+### Added
+
+- **Typed parameters (`type: date | money | party`).** Long-form
+  schema entries can declare a `type`, with optional `format` (date)
+  or `currency` (money). Inputs are validated and normalized between
+  value resolution and substitution; bad inputs hard-error with a
+  per-key message (exit 4). See `PARAM_SCHEMA.md` §5 for the accepted
+  shapes per type, the rejected ambiguous forms (Q3.1: US
+  `MM/DD/YYYY` and European `DD/MM/YYYY` are rejected as ambiguous),
+  and the v2 currency scope (Q3.2: USD only).
+- **`--validate` now catches type errors** before draft runs. With
+  `--json`, errors are emitted as a `type_errors` array on the
+  result payload.
+- **New public API:** `parseDateValue(raw)`, `formatDateValue(date, fmt)`,
+  `parseMoneyValue(raw)` → minor units, `formatMoneyValue(minor, currency)`,
+  `normalizeTypedValue(raw, placeholder)`, `normalizeTypedValues(placeholders, resolved)`.
+
+### Schema-contract change
+
+`PARAM_SCHEMA.md` §5 gains a "Typed parameters" section. Long-form
+entries can now include `type`, `format`, and `currency` fields; short
+form is unchanged. v0.3.0 schemas are forward-compatible with v0.2.x
+readers (which will silently ignore the new fields, since they're
+opt-in metadata on the long-form entry).
+
 ## 0.2.0 — 2026-05-16
 
 ### Added

package/PARAM_SCHEMA.md

@@ -237,6 +237,100 @@ its own alias list (Q3 locked) — list it explicitly if needed.
 Parser selects long form iff a top-level `_meta` key is present. Short
 and long are not mixable within one file.
 
+### Typed parameters (v0.3.0, opt-in)
+
+Long-form entries can declare `type`, with optional `format` (`date`)
+or `currency` (`money`). Inputs are validated and normalized between
+value resolution and substitution. Bad input → exit 4
+(`EXIT.VALIDATION`) with a per-key error message; all type errors are
+collected before exit so the user sees every issue at once.
+
+```json
+{
+  "_meta": { "schema_version": 1 },
+  "effective_date":  { "aliases": ["Effective Date"],  "type": "date",  "format": "MMMM d, yyyy" },
+  "purchase_amount": { "aliases": ["Purchase Amount"], "type": "money", "currency": "USD" },
+  "party_a":         { "aliases": ["Party A"],         "type": "party" }
+}
+```
+
+| `type`   | Accepts                                                              | Normalizes to                          | Notes |
+| -------- | -------------------------------------------------------------------- | -------------------------------------- | ----- |
+| `date`   | ISO (`2027-01-15`) or spelled (`January 15, 2027`, `Jan 15 2027`)    | `format` field (default `MMMM d, yyyy`) | Q3.1 locked: US (`MM/DD/YYYY`) and European (`DD/MM/YYYY`) numeric forms are **rejected** as ambiguous. |
+| `money`  | `$5,000`, `5000.50`, `$5M`, `2.5K`, `1B`; rejects `$$5`, `5,00`, etc. | `currency`-formatted (e.g. `$5,000,000.00`) | Q3.2 locked: v0.3.0 supports `currency: "USD"` only. |
+| `party`  | Non-empty after trim; no markdown links `[text](url)`; no trailing punctuation `.,;:!?` | Trimmed string | Q3.3 locked: hard error on bad input — typed params are opt-in. |
+
+`format` for `date` supports `yyyy`, `MMMM`, `MM`, `d` tokens (matched
+in a single pass — `MM` doesn't accidentally consume `MMMM`, `d`
+doesn't leak into month names). Other literal characters pass through
+unchanged. Other tokens (e.g. `HH:mm`, `dd`, `EEEE`) are deferred to
+future versions.
+
+Programmatic API for drivers: `parseDateValue`, `formatDateValue`,
+`parseMoneyValue`, `formatMoneyValue`, `normalizeTypedValue`,
+`normalizeTypedValues`.
+
+### Computed placeholders (v0.4.0, opt-in)
+
+Long-form entries can declare a `computed` block referencing another
+key in the same schema. At substitution time, if no value was
+supplied via CLI / `--params` / interactive / default, the computed
+entry's value is derived from the `from` placeholder via simple
+date arithmetic. Explicit user-supplied values still win — computed
+only fills the gap.
+
+```json
+{
+  "_meta": { "schema_version": 1 },
+  "effective_date": {
+    "aliases": ["Effective Date"],
+    "type": "date", "format": "MMMM d, yyyy"
+  },
+  "term_end": {
+    "aliases": ["Term End"],
+    "type": "date", "format": "MMMM d, yyyy",
+    "computed": { "from": "effective_date", "op": "+", "value": "2 years" }
+  }
+}
+```
+
+| Field   | Type     | Required | Notes |
+| ------- | -------- | -------- | ----- |
+| `from`  | string   | yes      | Key of another entry in the same schema. Schema validation rejects unknown references. |
+| `op`    | `"+"`/`"-"` | yes   | Add or subtract the duration from the `from` value. |
+| `value` | string   | yes      | Duration in `<n> <unit>` form, where `<unit>` is `day`, `week`, `month`, or `year` (singular or plural; case-insensitive). |
+
+**Q2.1 locked:** Expression syntax lives in the schema, **not** in
+template text. T1 bracket detection treats `[Term End]` as an
+ordinary placeholder; the schema-level `computed` block decides how
+its value is derived.
+
+**Q2.2 locked:** v0.4.0 supports **date arithmetic only**. Money
+math (`+ 10%`) and string concat (`Party A + " Inc."`) are deferred
+to a future release once the date-arithmetic design is proven against
+real templates.
+
+**Resolution order:** value resolution → typed-parameter normalization
+(§ above) → computed-placeholder evaluation → substitution.
+
+**Cycle and reference safety:** `parseSchema` walks every
+`computed.from` chain and throws at load time if a chain revisits a
+key (e.g. `a → b → a`) or references a non-existent key. Caught
+before substitution.
+
+**Orphan-check exemption:** an entry that's referenced only as
+another entry's `computed.from` (never appears in the template) is
+**not** an orphan. It's a feeder used solely for computation.
+
+**Format inheritance:** the computed entry's `format` field is used
+to render the result. If the computed entry doesn't declare `format`,
+the default `MMMM d, yyyy` applies. The `from` entry's `format` is
+used for parsing the source value (since by then it's normalized to
+that format).
+
+Programmatic API for drivers: `parseDuration`, `addDuration`,
+`computeValues`.
+
 ### 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.2.0";
+export const VERSION = "0.4.0";
 
 // ─── EXIT CODES ─────────────────────────────────────────────────────────────
 /**
@@ -914,10 +914,43 @@ export function parseSchema(parsed, sourceLabel = "<schema>") {
         e.exitCode = EXIT.IO;
         throw e;
       }
+      // v2 #2: computed placeholders. Optional `computed` block on long-form
+      // entries; { from: <other-key>, op: "+"|"-", value: "<n> <unit>" }.
+      let computed = null;
+      if (v.computed !== undefined) {
+        if (!v.computed || typeof v.computed !== "object" || Array.isArray(v.computed)) {
+          const e = new Error(`${sourceLabel}: long-form entry '${k}' has invalid 'computed' (must be an object)`);
+          e.exitCode = EXIT.IO;
+          throw e;
+        }
+        if (typeof v.computed.from !== "string") {
+          const e = new Error(`${sourceLabel}: long-form entry '${k}' computed.from must be a string (key of another schema entry)`);
+          e.exitCode = EXIT.IO;
+          throw e;
+        }
+        if (v.computed.op !== "+" && v.computed.op !== "-") {
+          const e = new Error(`${sourceLabel}: long-form entry '${k}' computed.op must be "+" or "-"`);
+          e.exitCode = EXIT.IO;
+          throw e;
+        }
+        if (typeof v.computed.value !== "string") {
+          const e = new Error(`${sourceLabel}: long-form entry '${k}' computed.value must be a string (duration like "2 years")`);
+          e.exitCode = EXIT.IO;
+          throw e;
+        }
+        computed = { from: v.computed.from, op: v.computed.op, value: v.computed.value };
+      }
       entries[k] = {
         aliases: v.aliases.slice(),
         required: v.required !== false,
         default: Object.prototype.hasOwnProperty.call(v, "default") ? v.default : null,
+        // v2 #3: typed parameters. `type` is one of `date|money|party` (or
+        // absent → no validation/normalization). `format` (date) and
+        // `currency` (money) are optional.
+        type: typeof v.type === "string" ? v.type : null,
+        format: typeof v.format === "string" ? v.format : null,
+        currency: typeof v.currency === "string" ? v.currency : null,
+        computed,
       };
     } else {
       if (!Array.isArray(v)) {
@@ -925,7 +958,30 @@ export function parseSchema(parsed, sourceLabel = "<schema>") {
         e.exitCode = EXIT.IO;
         throw e;
       }
-      entries[k] = { aliases: v.slice(), required: true, default: null };
+      entries[k] = { aliases: v.slice(), required: true, default: null, type: null, format: null, currency: null, computed: null };
+    }
+  }
+  // v2 #2: validate computed references (point to existing keys; no cycles).
+  for (const [key, entry] of Object.entries(entries)) {
+    if (!entry.computed) continue;
+    if (!entries[entry.computed.from]) {
+      const e = new Error(`${sourceLabel}: '${key}'.computed.from = "${entry.computed.from}" does not match any other key in this schema`);
+      e.exitCode = EXIT.IO;
+      throw e;
+    }
+    // Walk the computed.from chain from this key; bail if we revisit.
+    const visited = [key];
+    let cursor = entry.computed.from;
+    while (cursor) {
+      if (visited.includes(cursor)) {
+        const e = new Error(`${sourceLabel}: computed cycle detected: ${[...visited, cursor].join(" → ")}`);
+        e.exitCode = EXIT.IO;
+        throw e;
+      }
+      visited.push(cursor);
+      const next = entries[cursor];
+      if (!next || !next.computed) break;
+      cursor = next.computed.from;
     }
   }
   return { form: long ? "long" : "short", entries };
@@ -1066,6 +1122,10 @@ function assemble(tier, hits, schema, warnings, fromLlm = false) {
         required: resolved.required,
         default: resolved.default,
         aliases: resolved.aliases,
+        type: resolved.type,
+        format: resolved.format,
+        currency: resolved.currency,
+        computed: resolved.computed,
         hits: [],
       });
     }
@@ -1080,14 +1140,23 @@ function resolveKey(hit, schema, fromLlm) {
   if (schema) {
     for (const [key, entry] of Object.entries(schema.entries)) {
       if (entry.aliases.includes(hit.inner)) {
-        return { key, required: entry.required, default: entry.default, aliases: entry.aliases };
+        return {
+          key,
+          required: entry.required,
+          default: entry.default,
+          aliases: entry.aliases,
+          type: entry.type || null,
+          format: entry.format || null,
+          currency: entry.currency || null,
+          computed: entry.computed || null,
+        };
       }
     }
     return null;
   }
   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] };
+  return { key, required: true, default: null, aliases: [hit.inner], type: null, format: null, currency: null, computed: null };
 }
 
 // ─── VALUE RESOLUTION (CLI > JSON > prompt > default) ───────────────────────
@@ -1160,11 +1229,350 @@ export async function resolveValues(placeholders, opts, paramsObj, { prompter =
       sources[p.key] = "default";
       continue;
     }
-    if (p.required) missing.push(p);
+    // v2 #2: computed placeholders auto-resolve later via `computeValues`.
+    // Don't count them as missing here even though no source supplied a value.
+    if (p.required && !p.computed) missing.push(p);
   }
   return { resolved, missing, sources };
 }
 
+// ─── TYPED-PARAMETER NORMALIZATION (v2 #3) ──────────────────────────────────
+// Schema entries can declare `type: date | money | party` with optional
+// `format` (date) or `currency` (money). Inputs are validated and normalized
+// after value resolution and before substitution. Hard error (exit 4) on
+// invalid input — typed params are opt-in; the user asked for validation.
+
+const MONTH_NAMES = ["January", "February", "March", "April", "May", "June",
+                     "July", "August", "September", "October", "November", "December"];
+const MONTH_INDEX = (() => {
+  const m = {};
+  MONTH_NAMES.forEach((name, i) => {
+    m[name.toLowerCase()] = i;
+    m[name.slice(0, 3).toLowerCase()] = i;
+  });
+  // "Sept" is a common 4-letter abbrev.
+  m.sept = 8;
+  return m;
+})();
+
+/**
+ * Parse a date input. Accepts ISO `YYYY-MM-DD` or spelled
+ * `Month D, YYYY` / `Mon D YYYY`. Returns a UTC `Date` on success or `null`
+ * on failure. Q3.1: US (`MM/DD/YYYY`) and European (`DD/MM/YYYY`) numeric
+ * formats are NOT accepted — they're ambiguous and footgun-y. Use ISO for
+ * machine input, spelled for human input.
+ *
+ * @param {string} raw
+ * @returns {Date | null}
+ */
+export function parseDateValue(raw) {
+  const s = String(raw).trim();
+  const iso = /^(\d{4})-(\d{2})-(\d{2})$/.exec(s);
+  if (iso) {
+    const [, y, m, d] = iso;
+    const date = new Date(Date.UTC(+y, +m - 1, +d));
+    // Reject impossible dates (e.g. 2026-02-31 round-trips to 2026-03-03).
+    if (date.getUTCFullYear() !== +y || date.getUTCMonth() !== +m - 1 || date.getUTCDate() !== +d) return null;
+    return date;
+  }
+  const spelled = /^([A-Za-z]+)\s+(\d{1,2}),?\s+(\d{4})$/.exec(s);
+  if (spelled) {
+    const month = MONTH_INDEX[spelled[1].toLowerCase()];
+    if (month === undefined) return null;
+    const date = new Date(Date.UTC(+spelled[3], month, +spelled[2]));
+    if (date.getUTCMonth() !== month || date.getUTCDate() !== +spelled[2]) return null;
+    return date;
+  }
+  return null;
+}
+
+/**
+ * Format a `Date` per a simple format string. Supported tokens:
+ * `yyyy` (year), `MMMM` (full month name), `MM` (2-digit month), `d` (day).
+ * Order doesn't matter; tokens are matched in a single pass so MMMM doesn't
+ * accidentally consume MM, and `d` doesn't leak into month names.
+ *
+ * @param {Date} date
+ * @param {string} format
+ * @returns {string}
+ */
+export function formatDateValue(date, format) {
+  const y = date.getUTCFullYear();
+  const m = date.getUTCMonth();
+  const d = date.getUTCDate();
+  return format.replace(/yyyy|MMMM|MM|d/g, (token) => {
+    if (token === "yyyy") return String(y);
+    if (token === "MMMM") return MONTH_NAMES[m];
+    if (token === "MM") return String(m + 1).padStart(2, "0");
+    if (token === "d") return String(d);
+    return token;
+  });
+}
+
+/**
+ * Parse a duration string for computed placeholders (v2 #2).
+ * Accepts `<n> <unit>` where unit is one of `day | week | month | year`
+ * (singular or plural). Returns an object with the unit as plural key.
+ * Returns `null` on parse failure.
+ *
+ * @param {string} raw
+ * @returns {{ days?: number, weeks?: number, months?: number, years?: number } | null}
+ */
+export function parseDuration(raw) {
+  const m = /^(\d+)\s+(day|week|month|year)s?$/i.exec(String(raw).trim());
+  if (!m) return null;
+  const n = parseInt(m[1], 10);
+  if (!isFinite(n) || n < 0) return null;
+  const unit = m[2].toLowerCase();
+  return { [`${unit}s`]: n };
+}
+
+/**
+ * Add or subtract a duration from a Date. Uses UTC field manipulation
+ * via `setUTC*` methods, so day/month/year overflow follows JavaScript's
+ * default behavior (e.g. Jan 31 + 1 month = Mar 3, not Feb 28). For
+ * legal-doc use cases ("2 years from effective date") this is the
+ * expected behavior; anniversary dates are unambiguous.
+ *
+ * @param {Date} date
+ * @param {"+"|"-"} op
+ * @param {{ days?: number, weeks?: number, months?: number, years?: number }} dur
+ * @returns {Date}
+ */
+export function addDuration(date, op, dur) {
+  const sign = op === "-" ? -1 : 1;
+  const d = new Date(date.getTime());
+  if (dur.years) d.setUTCFullYear(d.getUTCFullYear() + sign * dur.years);
+  if (dur.months) d.setUTCMonth(d.getUTCMonth() + sign * dur.months);
+  if (dur.weeks) d.setUTCDate(d.getUTCDate() + sign * dur.weeks * 7);
+  if (dur.days) d.setUTCDate(d.getUTCDate() + sign * dur.days);
+  return d;
+}
+
+/**
+ * Parse a money input. Accepts `$5,000`, `5000.50`, `$5M`, `2.5K`, etc.
+ * Handles `K`/`M`/`B` suffixes (case-insensitive). Returns the value in
+ * minor units (cents for USD) as an integer, or `null` on failure.
+ *
+ * @param {string} raw
+ * @returns {number | null}
+ */
+export function parseMoneyValue(raw) {
+  const s = String(raw).trim();
+  if (!s) return null;
+  // Strict shape: optional minus, optional single $, digits (with optional
+  // thousand-comma groups), optional decimal, optional K/M/B. Rejects
+  // doubled `$`, ad-hoc comma placement, multiple decimals, words.
+  if (!/^-?\$?(?:\d{1,3}(?:,\d{3})+|\d+)(?:\.\d+)?[KMB]?$/i.test(s)) return null;
+  let core = s.replace(/[$,\s]/g, "");
+  let mult = 1;
+  if (/[KMB]$/i.test(core)) {
+    mult = { K: 1e3, M: 1e6, B: 1e9 }[core.slice(-1).toUpperCase()];
+    core = core.slice(0, -1);
+  }
+  const n = parseFloat(core);
+  if (!isFinite(n)) return null;
+  return Math.round(n * mult * 100);
+}
+
+/**
+ * Format a money value (in minor units, e.g. cents for USD) per a currency.
+ * Q3.2: v2 supports USD only. Adds thousand separators and always renders
+ * two decimal places.
+ *
+ * @param {number} minor — value in minor units (cents).
+ * @param {string} currency — currency code (only "USD" supported in v2).
+ * @returns {string}
+ * @throws {Error} on unsupported currency.
+ */
+export function formatMoneyValue(minor, currency) {
+  if (currency !== "USD") {
+    throw new Error(`only USD is supported in v0.3.0; got currency="${currency}"`);
+  }
+  const sign = minor < 0 ? "-" : "";
+  const abs = Math.abs(minor);
+  const dollars = Math.floor(abs / 100);
+  const cents = abs % 100;
+  const intPart = String(dollars).replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+  return `${sign}$${intPart}.${String(cents).padStart(2, "0")}`;
+}
+
+/**
+ * Normalize a raw value per a placeholder's schema-declared type. Returns
+ * the normalized string. Throws on invalid input (Q3.3 → hard error).
+ * If no `type` is declared on the placeholder, returns the raw value
+ * unchanged.
+ *
+ * @param {string} rawValue
+ * @param {{ type?: string|null, format?: string|null, currency?: string|null, key?: string }} placeholder
+ * @returns {string}
+ * @throws {Error} with `.exitCode = EXIT.VALIDATION` on bad input.
+ */
+export function normalizeTypedValue(rawValue, placeholder) {
+  const type = placeholder && placeholder.type;
+  if (!type) return rawValue;
+  if (type === "date") {
+    const date = parseDateValue(rawValue);
+    if (!date) {
+      const e = new Error(
+        `could not parse "${rawValue}" as a date. expected ISO ` +
+        `(2027-01-15) or spelled ("January 15, 2027"). ` +
+        `US ("01/15/2027") and European ("15/01/2027") forms are not ` +
+        `accepted — they're ambiguous.`
+      );
+      e.exitCode = EXIT.VALIDATION;
+      throw e;
+    }
+    return formatDateValue(date, placeholder.format || "MMMM d, yyyy");
+  }
+  if (type === "money") {
+    const minor = parseMoneyValue(rawValue);
+    if (minor === null) {
+      const e = new Error(
+        `could not parse "${rawValue}" as money. expected like ` +
+        `"$5,000", "5000.50", "$5M", "2.5K".`
+      );
+      e.exitCode = EXIT.VALIDATION;
+      throw e;
+    }
+    return formatMoneyValue(minor, placeholder.currency || "USD");
+  }
+  if (type === "party") {
+    const s = String(rawValue).trim();
+    if (!s) {
+      const e = new Error(`party value must be non-empty`);
+      e.exitCode = EXIT.VALIDATION;
+      throw e;
+    }
+    if (/\]\(/.test(s)) {
+      const e = new Error(`party value "${rawValue}" contains a markdown link; pass the bare party name instead.`);
+      e.exitCode = EXIT.VALIDATION;
+      throw e;
+    }
+    if (/[.!?,;:]$/.test(s)) {
+      const e = new Error(`party value "${rawValue}" has trailing punctuation; remove it before passing.`);
+      e.exitCode = EXIT.VALIDATION;
+      throw e;
+    }
+    return s;
+  }
+  const e = new Error(`unknown type "${type}" on placeholder${placeholder.key ? ` "${placeholder.key}"` : ""}. expected one of: date, money, party.`);
+  e.exitCode = EXIT.IO;
+  throw e;
+}
+
+/**
+ * Run {@link normalizeTypedValue} across every resolved placeholder value.
+ * Mutates `resolved` in place with normalized strings. Collects all errors
+ * before returning so the user sees every type failure at once.
+ *
+ * @param {Placeholder[]} placeholders
+ * @param {Object<string,string>} resolved
+ * @returns {{ ok: boolean, errors: Array<{ key: string, message: string }>, normalized: Object<string,{from: string, to: string, type: string}> }}
+ */
+export function normalizeTypedValues(placeholders, resolved) {
+  const errors = [];
+  const normalized = {};
+  for (const p of placeholders) {
+    if (!p.type) continue;
+    if (resolved[p.key] === undefined) continue;
+    const raw = resolved[p.key];
+    try {
+      const norm = normalizeTypedValue(raw, p);
+      if (norm !== raw) normalized[p.key] = { from: raw, to: norm, type: p.type };
+      resolved[p.key] = norm;
+    } catch (e) {
+      errors.push({ key: p.key, message: e.message });
+    }
+  }
+  return { ok: errors.length === 0, errors, normalized };
+}
+
+// ─── COMPUTED PLACEHOLDERS (v2 #2) ──────────────────────────────────────────
+// Schema entries can declare a `computed` block referencing another key in
+// the same schema:
+//
+//   "term_end": { "aliases": ["Term End"], "type": "date",
+//                 "computed": { "from": "effective_date", "op": "+", "value": "2 years" } }
+//
+// At substitution time, if no value was supplied via CLI/--params/interactive/
+// default, the computed entry's value is derived from its `from` placeholder.
+// CLI/--params explicit values still win — computed only fills the gap.
+//
+// Cycles in `from` references are detected at parseSchema time. Missing-`from`
+// errors and bad-duration errors surface at compute time with a per-key
+// message; like typed-param errors, all errors are collected before returning
+// so the user sees every failure at once.
+
+/**
+ * Run computed-placeholder evaluation on already-resolved values. Mutates
+ * `resolved` in place with computed values for any placeholder that has a
+ * `computed` block and no existing value. Iterative — handles chains
+ * (B from A, C from B) without an explicit topological sort.
+ *
+ * @param {Placeholder[]} placeholders
+ * @param {Object<string,string>} resolved
+ * @returns {{ ok: boolean, errors: Array<{ key: string, message: string }>, computed: Object<string,{from: string, op: string, value: string, to: string}> }}
+ */
+export function computeValues(placeholders, resolved) {
+  const errors = [];
+  const computed = {};
+  const pending = placeholders.filter(
+    (p) => p.computed && resolved[p.key] === undefined
+  );
+  if (pending.length === 0) return { ok: true, errors: [], computed: {} };
+
+  let progress = true;
+  while (progress && pending.length > 0) {
+    progress = false;
+    for (let i = pending.length - 1; i >= 0; i--) {
+      const p = pending[i];
+      const fromKey = p.computed.from;
+      const fromValue = resolved[fromKey];
+      if (fromValue === undefined) continue;
+      try {
+        const result = computeOneValue(p, fromValue);
+        resolved[p.key] = result;
+        computed[p.key] = { from: fromKey, op: p.computed.op, value: p.computed.value, to: result };
+        pending.splice(i, 1);
+        progress = true;
+      } catch (e) {
+        errors.push({ key: p.key, message: e.message });
+        pending.splice(i, 1);
+      }
+    }
+  }
+  for (const p of pending) {
+    errors.push({
+      key: p.key,
+      message: `cannot compute: depends on "${p.computed.from}" which is unresolved`,
+    });
+  }
+  return { ok: errors.length === 0, errors, computed };
+}
+
+function computeOneValue(p, fromValue) {
+  // v2: dates only. Future expansions (money math, string concat) would
+  // dispatch on placeholder type here.
+  const date = parseDateValue(fromValue);
+  if (!date) {
+    throw new Error(
+      `cannot parse "${fromValue}" as a date (from "${p.computed.from}"). ` +
+      `Computed placeholders need a date-shaped source value.`
+    );
+  }
+  const dur = parseDuration(p.computed.value);
+  if (!dur) {
+    throw new Error(
+      `cannot parse duration "${p.computed.value}". Expected ` +
+      `"<n> <unit>" where unit is day, week, month, or year (singular ` +
+      `or plural).`
+    );
+  }
+  const result = addDuration(date, p.computed.op, dur);
+  return formatDateValue(result, p.format || "MMMM d, yyyy");
+}
+
 async function nodePrompter(placeholder) {
   if (!process.stdin.isTTY) return null;
   const rl = createInterface({ input: process.stdin, output: process.stderr });
@@ -1187,9 +1595,18 @@ async function nodePrompter(placeholder) {
 export function findOrphans(schema, placeholders) {
   if (!schema) return [];
   const present = 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.
+  const computedFromTargets = new Set();
+  for (const entry of Object.values(schema.entries)) {
+    if (entry.computed && entry.computed.from) computedFromTargets.add(entry.computed.from);
+  }
   const orphans = [];
   for (const [key, entry] of Object.entries(schema.entries)) {
-    if (!present.has(key)) orphans.push({ key, aliases: entry.aliases.slice() });
+    if (present.has(key)) continue;
+    if (computedFromTargets.has(key)) continue;
+    orphans.push({ key, aliases: entry.aliases.slice() });
   }
   return orphans;
 }
@@ -1403,6 +1820,35 @@ export async function cmdValidate(opts, input, schema, paramsObj, envObj, { fetc
     }
     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);
+  if (!typeCheck.ok) {
+    for (const te of typeCheck.errors) {
+      err.write(paint(`error: type validation failed for "${te.key}": ${te.message}\n`, "red", err));
+    }
+    if (opts.json) {
+      out.write(JSON.stringify({
+        ok: false,
+        type_errors: typeCheck.errors.map(({ key, message }) => ({ key, message })),
+      }, null, 2) + "\n");
+    }
+    return EXIT.VALIDATION;
+  }
+  // v2 #2: computed-placeholder validation (same gate as cmdDraft).
+  const computeCheck = computeValues(result.placeholders, 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));
+    }
+    if (opts.json) {
+      out.write(JSON.stringify({
+        ok: false,
+        computed_errors: computeCheck.errors.map(({ key, message }) => ({ key, message })),
+      }, null, 2) + "\n");
+    }
+    return EXIT.VALIDATION;
+  }
   if (opts.json) {
     out.write(JSON.stringify({ ok: true, resolved: Object.keys(resolved), sources }, null, 2) + "\n");
   } else {
@@ -1472,6 +1918,30 @@ export async function cmdDraft(opts, input, schema, paramsObj, envObj, { fetcher
     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).
+  const typeCheck = normalizeTypedValues(result.placeholders, 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;
+  }
+
+  // v2 #2: computed placeholders. Fill any computed entries whose value
+  // wasn't already supplied via CLI / --params / --interactive / default.
+  // Runs after typed normalization so the source values are in canonical
+  // form (e.g. a "date" type is already in the format string before we
+  // parse it back for arithmetic).
+  const computeCheck = computeValues(result.placeholders, 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;
+  }
+
   // Diff mode: print a substitution table and exit without writing output.
   if (opts.diff) {
     if (opts.json) {

package/package.json

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