npm - @doodle-engine/cli - Versions diffs - 0.0.8 → 0.0.9 - Mend

@doodle-engine/cli 0.0.8 → 0.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/CHANGELOG.md +9 -0
package/dist/cli.js +375 -444
package/dist/commands/build.d.ts.map +1 -1
package/dist/commands/dev.d.ts.map +1 -1
package/dist/tsconfig.tsbuildinfo +1 -1
package/dist/validate.d.ts.map +1 -1
package/package.json +3 -3

package/dist/cli.js CHANGED Viewed

@@ -1,358 +1,255 @@
 #!/usr/bin/env node
-import { Command as I } from "commander";
-import { crayon as i } from "crayon.js";
-import { createServer as x, build as G } from "vite";
-import $ from "@vitejs/plugin-react";
-import { watch as R } from "chokidar";
-import { readdir as y, readFile as f, mkdir as j, writeFile as h } from "fs/promises";
-import { join as s, extname as p, relative as w } from "path";
+import { Command as G } from "commander";
+import { crayon as c } from "crayon.js";
+import { createServer as j, build as $ } from "vite";
+import A from "@vitejs/plugin-react";
+import { watch as H } from "chokidar";
+import { readdir as y, readFile as p, mkdir as R, writeFile as g } from "fs/promises";
+import { join as s, extname as f, relative as w } from "path";
 import { parse as b } from "yaml";
-import { parseDialogue as E } from "@doodle-engine/core";
-import H from "prompts";
-function N(e, o) {
-  const a = [];
-  for (const n of Object.values(e.dialogues)) {
-    const r = o.get(n.id) || `dialogue:${n.id}`;
-    a.push(...M(n, r));
+import { parseDialogue as v } from "@doodle-engine/core";
+import M from "prompts";
+function I(e, n) {
+  const i = [];
+  for (const a of Object.values(e.dialogues)) {
+    const o = n.get(a.id) || `dialogue:${a.id}`;
+    i.push(...F(a, o));
   }
-  for (const n of Object.values(e.characters))
-    if (n.dialogue && !e.dialogues[n.dialogue]) {
-      const r = o.get(n.id) || `character:${n.id}`;
-      a.push({
-        file: r,
-        message: `Character "${n.id}" references non-existent dialogue "${n.dialogue}"`,
-        suggestion: `Create dialogue "${n.dialogue}" or fix the reference`
+  for (const a of Object.values(e.characters))
+    if (a.dialogue && !e.dialogues[a.dialogue]) {
+      const o = n.get(a.id) || `character:${a.id}`;
+      i.push({
+        file: o,
+        message: `Character "${a.id}" references non-existent dialogue "${a.dialogue}"`,
+        suggestion: `Create dialogue "${a.dialogue}" or fix the reference`
       });
     }
-  return a.push(...B(e, o)), a;
+  return i.push(...J(e, n)), i;
 }
-function M(e, o) {
-  const a = [], n = /* @__PURE__ */ new Set();
-  for (const r of e.nodes)
-    n.has(r.id) && a.push({
-      file: o,
-      message: `Duplicate node ID "${r.id}"`,
+function F(e, n) {
+  const i = [], a = /* @__PURE__ */ new Set();
+  for (const o of e.nodes)
+    a.has(o.id) && i.push({
+      file: n,
+      message: `Duplicate node ID "${o.id}"`,
       suggestion: "Node IDs must be unique within a dialogue"
-    }), n.add(r.id);
-  n.has(e.startNode) || a.push({
-    file: o,
+    }), a.add(o.id);
+  a.has(e.startNode) || i.push({
+    file: n,
     message: `Start node "${e.startNode}" not found`,
     suggestion: `Add a NODE ${e.startNode} or fix the startNode reference`
   });
-  for (const r of e.nodes)
-    a.push(...F(r, n, o));
-  return a;
+  for (const o of e.nodes)
+    i.push(...B(o, a, n));
+  return i;
 }
-function F(e, o, a) {
-  const n = [];
-  if (e.next && !o.has(e.next) && n.push({
-    file: a,
+function B(e, n, i) {
+  const a = [];
+  if (e.next && !n.has(e.next) && a.push({
+    file: i,
     message: `Node "${e.id}" GOTO "${e.next}" points to non-existent node`,
     suggestion: `Add NODE ${e.next} or fix the GOTO target`
   }), e.conditionalNext)
-    for (const r of e.conditionalNext)
-      o.has(r.next) || n.push({
-        file: a,
-        message: `Node "${e.id}" IF block GOTO "${r.next}" points to non-existent node`,
-        suggestion: `Add NODE ${r.next} or fix the GOTO target`
-      }), n.push(...v(r.condition, e.id, a));
-  for (const r of e.choices) {
-    if (o.has(r.next) || n.push({
-      file: a,
-      message: `Node "${e.id}" choice "${r.id}" GOTO "${r.next}" points to non-existent node`,
-      suggestion: `Add NODE ${r.next} or fix the GOTO target`
-    }), r.conditions)
-      for (const c of r.conditions)
-        n.push(...v(c, e.id, a));
-    if (r.effects)
-      for (const c of r.effects)
-        n.push(...T(c, e.id, a));
+    for (const o of e.conditionalNext)
+      n.has(o.next) || a.push({
+        file: i,
+        message: `Node "${e.id}" IF block GOTO "${o.next}" points to non-existent node`,
+        suggestion: `Add NODE ${o.next} or fix the GOTO target`
+      }), a.push(...O(o.condition, e.id, i));
+  for (const o of e.choices) {
+    if (!o.effects?.some(
+      (t) => t.type === "endDialogue" || t.type === "goToLocation"
+    ) && !n.has(o.next) && a.push({
+      file: i,
+      message: `Node "${e.id}" choice "${o.id}" GOTO "${o.next}" points to non-existent node`,
+      suggestion: `Add NODE ${o.next} or fix the GOTO target`
+    }), o.conditions)
+      for (const t of o.conditions)
+        a.push(...O(t, e.id, i));
+    if (o.effects)
+      for (const t of o.effects)
+        a.push(...C(t, e.id, i));
   }
   if (e.conditions)
-    for (const r of e.conditions)
-      n.push(...v(r, e.id, a));
+    for (const o of e.conditions)
+      a.push(...O(o, e.id, i));
   if (e.effects)
-    for (const r of e.effects)
-      n.push(...T(r, e.id, a));
-  return n;
+    for (const o of e.effects)
+      a.push(...C(o, e.id, i));
+  return a;
 }
-function v(e, o, a) {
-  const n = [];
+const L = {
+  hasFlag: ["flag"],
+  notFlag: ["flag"],
+  hasItem: ["itemId"],
+  notItem: ["itemId"],
+  variableEquals: ["variable", "value"],
+  variableGreaterThan: ["variable", "value"],
+  variableLessThan: ["variable", "value"],
+  questAtStage: ["questId", "stageId"],
+  atLocation: ["locationId"],
+  characterAt: ["characterId", "locationId"],
+  characterInParty: ["characterId"],
+  relationshipAbove: ["characterId", "value"],
+  relationshipBelow: ["characterId", "value"],
+  itemAt: ["itemId", "locationId"]
+}, U = {
+  setFlag: ["flag"],
+  clearFlag: ["flag"],
+  setVariable: ["variable", "value"],
+  addVariable: ["variable", "value"],
+  addItem: ["itemId"],
+  removeItem: ["itemId"],
+  moveItem: ["itemId", "locationId"],
+  goToLocation: ["locationId"],
+  advanceTime: ["hours"],
+  setQuestStage: ["questId", "stageId"],
+  addJournalEntry: ["entryId"],
+  startDialogue: ["dialogueId"],
+  endDialogue: [],
+  setCharacterLocation: ["characterId", "locationId"],
+  addToParty: ["characterId"],
+  removeFromParty: ["characterId"],
+  setRelationship: ["characterId", "value"],
+  addRelationship: ["characterId", "value"],
+  setCharacterStat: ["characterId", "stat", "value"],
+  addCharacterStat: ["characterId", "stat", "value"],
+  setMapEnabled: ["enabled"],
+  playMusic: ["track"],
+  playSound: ["sound"],
+  notify: ["message"],
+  playVideo: ["file"]
+};
+function O(e, n, i) {
+  const a = [];
   if (!e.type)
-    return n.push({
-      file: a,
-      message: `Node "${o}" has condition with missing type`
-    }), n;
-  switch (e.type) {
-    case "hasFlag":
-    case "notFlag":
-      e.flag || n.push({
-        file: a,
-        message: `Node "${o}" condition "${e.type}" missing required "flag" argument`
-      });
-      break;
-    case "hasItem":
-    case "notItem":
-      e.item || n.push({
-        file: a,
-        message: `Node "${o}" condition "${e.type}" missing required "item" argument`
-      });
-      break;
-    case "questAtStage":
-      e.quest || n.push({
-        file: a,
-        message: `Node "${o}" condition "questAtStage" missing required "quest" argument`
-      }), e.stage || n.push({
-        file: a,
-        message: `Node "${o}" condition "questAtStage" missing required "stage" argument`
-      });
-      break;
-    case "variableEquals":
-    case "variableGreaterThan":
-    case "variableLessThan":
-      e.variable || n.push({
-        file: a,
-        message: `Node "${o}" condition "${e.type}" missing required "variable" argument`
-      }), e.value === void 0 && n.push({
-        file: a,
-        message: `Node "${o}" condition "${e.type}" missing required "value" argument`
-      });
-      break;
-  }
-  return n;
+    return a.push({
+      file: i,
+      message: `Node "${n}" has condition with missing type`
+    }), a;
+  if (e.type === "timeIs")
+    return e.hour === void 0 && e.day === void 0 && a.push({
+      file: i,
+      message: `Node "${n}" condition "timeIs" must have at least one of "hour" or "day" argument`
+    }), a;
+  const o = L[e.type];
+  if (!o)
+    return a;
+  for (const r of o)
+    (e[r] === void 0 || e[r] === null || e[r] === "") && a.push({
+      file: i,
+      message: `Node "${n}" condition "${e.type}" missing required "${r}" argument`
+    });
+  return a;
 }
-function T(e, o, a) {
-  const n = [];
+function C(e, n, i) {
+  const a = [];
   if (!e.type)
-    return n.push({
-      file: a,
-      message: `Node "${o}" has effect with missing type`
-    }), n;
-  switch (e.type) {
-    case "setFlag":
-    case "clearFlag":
-      e.flag || n.push({
-        file: a,
-        message: `Node "${o}" effect "${e.type}" missing required "flag" argument`
-      });
-      break;
-    case "setVariable":
-    case "addVariable":
-      e.variable || n.push({
-        file: a,
-        message: `Node "${o}" effect "${e.type}" missing required "variable" argument`
-      }), e.value === void 0 && n.push({
-        file: a,
-        message: `Node "${o}" effect "${e.type}" missing required "value" argument`
-      });
-      break;
-    case "addItem":
-    case "removeItem":
-      e.item || n.push({
-        file: a,
-        message: `Node "${o}" effect "${e.type}" missing required "item" argument`
-      });
-      break;
-    case "moveItem":
-      e.item || n.push({
-        file: a,
-        message: `Node "${o}" effect "moveItem" missing required "item" argument`
-      }), e.location || n.push({
-        file: a,
-        message: `Node "${o}" effect "moveItem" missing required "location" argument`
-      });
-      break;
-    case "setQuestStage":
-      e.quest || n.push({
-        file: a,
-        message: `Node "${o}" effect "setQuestStage" missing required "quest" argument`
-      }), e.stage || n.push({
-        file: a,
-        message: `Node "${o}" effect "setQuestStage" missing required "stage" argument`
-      });
-      break;
-    case "addJournalEntry":
-      e.entry || n.push({
-        file: a,
-        message: `Node "${o}" effect "addJournalEntry" missing required "entry" argument`
-      });
-      break;
-    case "setCharacterLocation":
-      e.character || n.push({
-        file: a,
-        message: `Node "${o}" effect "setCharacterLocation" missing required "character" argument`
-      }), e.location || n.push({
-        file: a,
-        message: `Node "${o}" effect "setCharacterLocation" missing required "location" argument`
-      });
-      break;
-    case "addToParty":
-    case "removeFromParty":
-      e.character || n.push({
-        file: a,
-        message: `Node "${o}" effect "${e.type}" missing required "character" argument`
-      });
-      break;
-    case "setRelationship":
-    case "addRelationship":
-      e.character || n.push({
-        file: a,
-        message: `Node "${o}" effect "${e.type}" missing required "character" argument`
-      }), e.value === void 0 && n.push({
-        file: a,
-        message: `Node "${o}" effect "${e.type}" missing required "value" argument`
-      });
-      break;
-    case "setCharacterStat":
-    case "addCharacterStat":
-      e.character || n.push({
-        file: a,
-        message: `Node "${o}" effect "${e.type}" missing required "character" argument`
-      }), e.stat || n.push({
-        file: a,
-        message: `Node "${o}" effect "${e.type}" missing required "stat" argument`
-      }), e.value === void 0 && n.push({
-        file: a,
-        message: `Node "${o}" effect "${e.type}" missing required "value" argument`
-      });
-      break;
-    case "setMapEnabled":
-      e.enabled === void 0 && n.push({
-        file: a,
-        message: `Node "${o}" effect "setMapEnabled" missing required "enabled" argument`
-      });
-      break;
-    case "advanceTime":
-      e.hours === void 0 && n.push({
-        file: a,
-        message: `Node "${o}" effect "advanceTime" missing required "hours" argument`
-      });
-      break;
-    case "goToLocation":
-      e.location || n.push({
-        file: a,
-        message: `Node "${o}" effect "goToLocation" missing required "location" argument`
-      });
-      break;
-    case "startDialogue":
-      e.dialogue || n.push({
-        file: a,
-        message: `Node "${o}" effect "startDialogue" missing required "dialogue" argument`
-      });
-      break;
-    case "playMusic":
-    case "playSound":
-      e.file || n.push({
-        file: a,
-        message: `Node "${o}" effect "${e.type}" missing required "file" argument`
-      });
-      break;
-    case "playVideo":
-      e.file || n.push({
-        file: a,
-        message: `Node "${o}" effect "playVideo" missing required "file" argument`
-      });
-      break;
-    case "notify":
-      e.message || n.push({
-        file: a,
-        message: `Node "${o}" effect "notify" missing required "message" argument`
-      });
-      break;
-  }
-  return n;
+    return a.push({
+      file: i,
+      message: `Node "${n}" has effect with missing type`
+    }), a;
+  const o = U[e.type];
+  if (!o)
+    return a;
+  for (const r of o)
+    (e[r] === void 0 || e[r] === null || e[r] === "") && a.push({
+      file: i,
+      message: `Node "${n}" effect "${e.type}" missing required "${r}" argument`
+    });
+  return a;
 }
-function B(e, o) {
-  const a = [], n = /* @__PURE__ */ new Set();
+function J(e, n) {
+  const i = [], a = /* @__PURE__ */ new Set();
   for (const t of Object.values(e.locales))
     for (const l of Object.keys(t))
-      n.add(l);
-  const r = (t) => t.startsWith("@"), c = (t, l, d) => {
-    const m = t.slice(1);
-    if (!n.has(m)) {
-      const u = o.get(l) || `${d}:${l}`;
-      a.push({
-        file: u,
+      a.add(l);
+  const o = (t) => t.startsWith("@"), r = (t, l, d) => {
+    const u = t.slice(1);
+    if (!a.has(u)) {
+      const h = n.get(l) || `${d}:${l}`;
+      i.push({
+        file: h,
         message: `Localization key "${t}" not found in any locale file`,
-        suggestion: `Add "${m}: ..." to your locale files`
+        suggestion: `Add "${u}: ..." to your locale files`
       });
     }
   };
   for (const t of Object.values(e.locations))
-    r(t.name) && c(t.name, t.id, "location"), r(t.description) && c(t.description, t.id, "location");
+    o(t.name) && r(t.name, t.id, "location"), o(t.description) && r(t.description, t.id, "location");
   for (const t of Object.values(e.characters))
-    r(t.name) && c(t.name, t.id, "character"), r(t.biography) && c(t.biography, t.id, "character");
+    o(t.name) && r(t.name, t.id, "character"), o(t.biography) && r(t.biography, t.id, "character");
   for (const t of Object.values(e.items))
-    r(t.name) && c(t.name, t.id, "item"), r(t.description) && c(t.description, t.id, "item");
+    o(t.name) && r(t.name, t.id, "item"), o(t.description) && r(t.description, t.id, "item");
   for (const t of Object.values(e.quests)) {
-    r(t.name) && c(t.name, t.id, "quest"), r(t.description) && c(t.description, t.id, "quest");
+    o(t.name) && r(t.name, t.id, "quest"), o(t.description) && r(t.description, t.id, "quest");
     for (const l of t.stages)
-      r(l.description) && c(l.description, t.id, "quest");
+      o(l.description) && r(l.description, t.id, "quest");
   }
   for (const t of Object.values(e.journalEntries))
-    r(t.title) && c(t.title, t.id, "journal"), r(t.text) && c(t.text, t.id, "journal");
+    o(t.title) && r(t.title, t.id, "journal"), o(t.text) && r(t.text, t.id, "journal");
   for (const t of Object.values(e.dialogues))
     for (const l of t.nodes) {
-      r(l.text) && c(l.text, t.id, "dialogue");
+      o(l.text) && r(l.text, t.id, "dialogue");
       for (const d of l.choices)
-        r(d.text) && c(d.text, t.id, "dialogue");
+        o(d.text) && r(d.text, t.id, "dialogue");
     }
-  return a;
+  return i;
 }
-function D(e) {
+function T(e) {
   if (e.length === 0) {
-    console.log(i.green("✓ No validation errors"));
+    console.log(c.green("✓ No validation errors"));
     return;
   }
-  console.log(i.red(`
+  console.log(c.red(`
 ✗ Found ${e.length} validation error${e.length === 1 ? "" : "s"}:
 `));
-  for (const o of e)
-    console.log(i.bold(o.file) + (o.line ? `:${o.line}` : "")), console.log("  " + i.red(o.message)), o.suggestion && console.log("  " + i.dim(o.suggestion)), console.log();
+  for (const n of e)
+    console.log(c.bold(n.file) + (n.line ? `:${n.line}` : "")), console.log("  " + c.red(n.message)), n.suggestion && console.log("  " + c.dim(n.suggestion)), console.log();
 }
-const C = "🐾", L = "✨", J = "✏️", U = "➕";
-async function W() {
-  const e = process.cwd(), o = s(e, "content");
-  console.log(""), console.log(i.bold.magenta(`  ${C} Doodle Engine Dev Server ${C}`)), console.log("");
-  const a = {
+const N = "🐾", W = "✨", Q = "✏️", V = "➕";
+async function Y() {
+  const e = process.cwd(), n = s(e, "content");
+  console.log(""), console.log(c.bold.magenta(`  ${N} Doodle Engine Dev Server ${N}`)), console.log("");
+  const i = {
     name: "doodle-content-loader",
-    configureServer(r) {
-      r.middlewares.use("/api/content", async (t, l) => {
+    configureServer(o) {
+      o.middlewares.use("/api/content", async (t, l) => {
         try {
-          const d = await Q(o);
+          const d = await P(n);
           l.setHeader("Content-Type", "application/json"), l.end(JSON.stringify(d));
         } catch (d) {
-          console.error(i.red("  Error loading content:"), d), l.statusCode = 500, l.end(JSON.stringify({ error: "Failed to load content" }));
+          console.error(c.red("  Error loading content:"), d), l.statusCode = 500, l.end(JSON.stringify({ error: "Failed to load content" }));
         }
       });
-      const c = R(s(o, "**/*"), {
+      const r = H(n, {
         ignored: /(^|[\/\\])\../,
         persistent: !0
       });
-      c.on("change", async (t) => {
-        console.log(i.yellow(`  ${J} Content changed: ${t}`)), await q(o), r.ws.send({
+      r.on("change", async (t) => {
+        console.log(c.yellow(`  ${Q} Content changed: ${t}`)), await S(n), o.ws.send({
           type: "full-reload",
           path: "*"
         });
-      }), c.on("add", async (t) => {
-        console.log(i.green(`  ${U} Content added: ${t}`)), await q(o), r.ws.send({
+      }), r.on("add", async (t) => {
+        console.log(c.green(`  ${V} Content added: ${t}`)), await S(n), o.ws.send({
           type: "full-reload",
           path: "*"
         });
       });
     }
-  }, n = await x({
+  }, a = await j({
     root: e,
-    plugins: [$(), a],
+    plugins: [A(), i],
     server: {
       port: 3e3,
       open: !0
     }
   });
-  await n.listen(), n.printUrls(), console.log(""), console.log(i.dim(`  ${L} Watching content files for changes...`)), console.log("");
+  await a.listen(), a.printUrls(), console.log(""), console.log(c.dim(`  ${W} Watching content files for changes...`)), console.log("");
 }
-async function Q(e) {
-  const o = {
+async function P(e) {
+  const n = {
     locations: {},
     characters: {},
     items: {},
@@ -362,8 +259,8 @@ async function Q(e) {
     journalEntries: {},
     locales: {}
   };
-  let a = null;
-  const n = [
+  let i = null;
+  const a = [
     { dir: "locations", key: "locations" },
     { dir: "characters", key: "characters" },
     { dir: "items", key: "items" },
@@ -371,41 +268,41 @@ async function Q(e) {
     { dir: "quests", key: "quests" },
     { dir: "journal", key: "journalEntries" }
   ];
-  for (const { dir: r, key: c } of n) {
-    const t = s(e, r);
+  for (const { dir: o, key: r } of a) {
+    const t = s(e, o);
     try {
       const l = await y(t);
       for (const d of l)
-        if (p(d) === ".yaml" || p(d) === ".yml") {
-          const m = s(t, d), u = await f(m, "utf-8"), g = b(u);
-          g && g.id && (o[c][g.id] = g);
+        if (f(d) === ".yaml" || f(d) === ".yml") {
+          const u = s(t, d), h = await p(u, "utf-8"), m = b(h);
+          m && m.id && (n[r][m.id] = m);
         }
     } catch {
     }
   }
   try {
-    const r = s(e, "locales"), c = await y(r);
-    for (const t of c)
-      if (p(t) === ".yaml" || p(t) === ".yml") {
-        const l = s(r, t), d = await f(l, "utf-8"), m = b(d), u = t.replace(/\.(yaml|yml)$/, "");
-        o.locales[u] = m ?? {};
+    const o = s(e, "locales"), r = await y(o);
+    for (const t of r)
+      if (f(t) === ".yaml" || f(t) === ".yml") {
+        const l = s(o, t), d = await p(l, "utf-8"), u = b(d), h = t.replace(/\.(yaml|yml)$/, "");
+        n.locales[h] = u ?? {};
       }
   } catch {
   }
   try {
-    const r = s(e, "dialogues"), c = await y(r);
-    for (const t of c)
-      if (p(t) === ".dlg") {
-        const l = s(r, t), d = await f(l, "utf-8"), m = t.replace(".dlg", ""), u = E(d, m);
-        o.dialogues[u.id] = u;
+    const o = s(e, "dialogues"), r = await y(o);
+    for (const t of r)
+      if (f(t) === ".dlg") {
+        const l = s(o, t), d = await p(l, "utf-8"), u = t.replace(".dlg", ""), h = v(d, u);
+        n.dialogues[h.id] = h;
       }
   } catch {
   }
   try {
-    const r = s(e, "game.yaml"), c = await f(r, "utf-8");
-    a = b(c);
+    const o = s(e, "game.yaml"), r = await p(o, "utf-8");
+    i = b(r);
   } catch {
-    console.warn(i.yellow("  No game.yaml found, using defaults")), a = {
+    console.warn(c.yellow("  No game.yaml found, using defaults")), i = {
       startLocation: "tavern",
       startTime: { day: 1, hour: 8 },
       startFlags: {},
@@ -413,18 +310,18 @@ async function Q(e) {
       startInventory: []
     };
   }
-  return { registry: o, config: a };
+  return { registry: n, config: i };
 }
-async function q(e) {
+async function S(e) {
   try {
-    const { registry: o, fileMap: a } = await V(e), n = N(o, a);
-    n.length > 0 && (console.log(""), D(n), console.log(""));
-  } catch (o) {
-    console.error(i.red("  Error running validation:"), o);
+    const { registry: n, fileMap: i } = await K(e), a = I(n, i);
+    a.length > 0 && (console.log(""), T(a), console.log(""));
+  } catch (n) {
+    console.error(c.red("  Error running validation:"), n);
   }
 }
-async function V(e) {
-  const o = {
+async function K(e) {
+  const n = {
     locations: {},
     characters: {},
     items: {},
@@ -433,7 +330,7 @@ async function V(e) {
     quests: {},
     journalEntries: {},
     locales: {}
-  }, a = /* @__PURE__ */ new Map(), n = [
+  }, i = /* @__PURE__ */ new Map(), a = [
     { dir: "locations", key: "locations" },
     { dir: "characters", key: "characters" },
     { dir: "items", key: "items" },
@@ -441,63 +338,66 @@ async function V(e) {
     { dir: "quests", key: "quests" },
     { dir: "journal", key: "journalEntries" }
   ];
-  for (const { dir: r, key: c } of n) {
-    const t = s(e, r);
+  for (const { dir: o, key: r } of a) {
+    const t = s(e, o);
     try {
       const l = await y(t);
       for (const d of l)
-        if (p(d) === ".yaml" || p(d) === ".yml") {
-          const m = s(t, d), u = await f(m, "utf-8"), g = b(u);
-          g && g.id && (o[c][g.id] = g, a.set(g.id, w(process.cwd(), m)));
+        if (f(d) === ".yaml" || f(d) === ".yml") {
+          const u = s(t, d), h = await p(u, "utf-8"), m = b(h);
+          m && m.id && (n[r][m.id] = m, i.set(m.id, w(process.cwd(), u)));
         }
     } catch {
     }
   }
   try {
-    const r = s(e, "locales"), c = await y(r);
-    for (const t of c)
-      if (p(t) === ".yaml" || p(t) === ".yml") {
-        const l = s(r, t), d = await f(l, "utf-8"), m = b(d), u = t.replace(/\.(yaml|yml)$/, "");
-        o.locales[u] = m ?? {};
+    const o = s(e, "locales"), r = await y(o);
+    for (const t of r)
+      if (f(t) === ".yaml" || f(t) === ".yml") {
+        const l = s(o, t), d = await p(l, "utf-8"), u = b(d), h = t.replace(/\.(yaml|yml)$/, "");
+        n.locales[h] = u ?? {};
       }
   } catch {
   }
   try {
-    const r = s(e, "dialogues"), c = await y(r);
-    for (const t of c)
-      if (p(t) === ".dlg") {
-        const l = s(r, t), d = await f(l, "utf-8"), m = t.replace(".dlg", ""), u = E(d, m);
-        o.dialogues[u.id] = u, a.set(u.id, w(process.cwd(), l));
+    const o = s(e, "dialogues"), r = await y(o);
+    for (const t of r)
+      if (f(t) === ".dlg") {
+        const l = s(o, t), d = await p(l, "utf-8"), u = t.replace(".dlg", ""), h = v(d, u);
+        n.dialogues[h.id] = h, i.set(h.id, w(process.cwd(), l));
       }
   } catch {
   }
-  return { registry: o, fileMap: a };
+  return { registry: n, fileMap: i };
 }
-async function Y() {
-  const e = process.cwd(), o = s(e, "content");
-  console.log(""), console.log(i.bold.magenta("🐕 Building Doodle Engine game...")), console.log(""), console.log(i.dim("Validating content..."));
+async function z() {
+  const e = process.cwd(), n = s(e, "content");
+  console.log(""), console.log(c.bold.magenta("🐕 Building Doodle Engine game...")), console.log(""), console.log(c.dim("Validating content..."));
+  let i;
   try {
-    const { registry: a, fileMap: n } = await P(o), r = N(a, n);
-    D(r), r.length > 0 && (console.log(i.red("Build failed due to validation errors.")), console.log(""), process.exit(1));
+    const { registry: a, fileMap: o, config: r } = await X(n), t = I(a, o);
+    T(t), t.length > 0 && (console.log(c.red("Build failed due to validation errors.")), console.log(""), process.exit(1)), i = { registry: a, config: r };
   } catch (a) {
-    console.error(i.red("Error loading content:"), a), process.exit(1);
+    console.error(c.red("Error loading content:"), a), process.exit(1);
   }
   console.log("");
   try {
-    await G({
+    await $({
       root: e,
-      plugins: [$()],
+      plugins: [A()],
       build: {
         outDir: "dist",
         emptyOutDir: !0
       }
-    }), console.log(""), console.log(i.green("✅ Build complete! Output in dist/")), console.log(""), console.log("To preview the build:"), console.log(i.dim("  yarn preview")), console.log("");
+    });
+    const a = s(e, "dist", "api");
+    await R(a, { recursive: !0 }), await g(s(a, "content"), JSON.stringify(i)), console.log(""), console.log(c.green("✅ Build complete! Output in dist/")), console.log(""), console.log("To preview the build:"), console.log(c.dim("  yarn preview")), console.log("");
   } catch (a) {
-    console.error(i.red("Build failed:"), a), process.exit(1);
+    console.error(c.red("Build failed:"), a), process.exit(1);
   }
 }
-async function P(e) {
-  const o = {
+async function X(e) {
+  const n = {
     locations: {},
     characters: {},
     items: {},
@@ -506,7 +406,7 @@ async function P(e) {
     quests: {},
     journalEntries: {},
     locales: {}
-  }, a = /* @__PURE__ */ new Map(), n = [
+  }, i = /* @__PURE__ */ new Map(), a = [
     { dir: "locations", key: "locations" },
     { dir: "characters", key: "characters" },
     { dir: "items", key: "items" },
@@ -514,50 +414,57 @@ async function P(e) {
     { dir: "quests", key: "quests" },
     { dir: "journal", key: "journalEntries" }
   ];
-  for (const { dir: r, key: c } of n) {
-    const t = s(e, r);
+  for (const { dir: r, key: t } of a) {
+    const l = s(e, r);
     try {
-      const l = await y(t);
-      for (const d of l)
-        if (p(d) === ".yaml" || p(d) === ".yml") {
-          const m = s(t, d), u = await f(m, "utf-8"), g = b(u);
-          g && g.id && (o[c][g.id] = g, a.set(g.id, w(process.cwd(), m)));
+      const d = await y(l);
+      for (const u of d)
+        if (f(u) === ".yaml" || f(u) === ".yml") {
+          const h = s(l, u), m = await p(h, "utf-8"), k = b(m);
+          k && k.id && (n[t][k.id] = k, i.set(k.id, w(process.cwd(), h)));
         }
     } catch {
     }
   }
   try {
-    const r = s(e, "locales"), c = await y(r);
-    for (const t of c)
-      if (p(t) === ".yaml" || p(t) === ".yml") {
-        const l = s(r, t), d = await f(l, "utf-8"), m = b(d), u = t.replace(/\.(yaml|yml)$/, "");
-        o.locales[u] = m ?? {};
+    const r = s(e, "locales"), t = await y(r);
+    for (const l of t)
+      if (f(l) === ".yaml" || f(l) === ".yml") {
+        const d = s(r, l), u = await p(d, "utf-8"), h = b(u), m = l.replace(/\.(yaml|yml)$/, "");
+        n.locales[m] = h ?? {};
       }
   } catch {
   }
   try {
-    const r = s(e, "dialogues"), c = await y(r);
-    for (const t of c)
-      if (p(t) === ".dlg") {
-        const l = s(r, t), d = await f(l, "utf-8"), m = t.replace(".dlg", ""), u = E(d, m);
-        o.dialogues[u.id] = u, a.set(u.id, w(process.cwd(), l));
+    const r = s(e, "dialogues"), t = await y(r);
+    for (const l of t)
+      if (f(l) === ".dlg") {
+        const d = s(r, l), u = await p(d, "utf-8"), h = l.replace(".dlg", ""), m = v(u, h);
+        n.dialogues[m.id] = m, i.set(m.id, w(process.cwd(), d));
       }
   } catch {
   }
-  return { registry: o, fileMap: a };
+  let o = null;
+  try {
+    const r = s(e, "game.yaml"), t = await p(r, "utf-8");
+    o = b(t);
+  } catch {
+    o = { id: "game", startLocation: "", startTime: { day: 1, hour: 8 }, startFlags: {}, startVariables: {}, startInventory: [] };
+  }
+  return { registry: n, fileMap: i, config: o };
 }
-async function K() {
-  const e = process.cwd(), o = s(e, "content");
-  console.log(""), console.log(i.bold.magenta("🐾 Validating Doodle Engine content...")), console.log("");
+async function Z() {
+  const e = process.cwd(), n = s(e, "content");
+  console.log(""), console.log(c.bold.magenta("🐾 Validating Doodle Engine content...")), console.log("");
   try {
-    const { registry: a, fileMap: n } = await z(o), r = N(a, n);
-    D(r), r.length > 0 && process.exit(1);
-  } catch (a) {
-    console.error(i.red("Error loading content:"), a), process.exit(1);
+    const { registry: i, fileMap: a } = await ee(n), o = I(i, a);
+    T(o), o.length > 0 && process.exit(1);
+  } catch (i) {
+    console.error(c.red("Error loading content:"), i), process.exit(1);
   }
 }
-async function z(e) {
-  const o = {
+async function ee(e) {
+  const n = {
     locations: {},
     characters: {},
     items: {},
@@ -566,7 +473,7 @@ async function z(e) {
     quests: {},
     journalEntries: {},
     locales: {}
-  }, a = /* @__PURE__ */ new Map(), n = [
+  }, i = /* @__PURE__ */ new Map(), a = [
     { dir: "locations", key: "locations" },
     { dir: "characters", key: "characters" },
     { dir: "items", key: "items" },
@@ -574,53 +481,53 @@ async function z(e) {
     { dir: "quests", key: "quests" },
     { dir: "journal", key: "journalEntries" }
   ];
-  for (const { dir: r, key: c } of n) {
-    const t = s(e, r);
+  for (const { dir: o, key: r } of a) {
+    const t = s(e, o);
     try {
       const l = await y(t);
       for (const d of l)
-        if (p(d) === ".yaml" || p(d) === ".yml") {
-          const m = s(t, d), u = await f(m, "utf-8"), g = b(u);
-          g && g.id && (o[c][g.id] = g, a.set(g.id, w(process.cwd(), m)));
+        if (f(d) === ".yaml" || f(d) === ".yml") {
+          const u = s(t, d), h = await p(u, "utf-8"), m = b(h);
+          m && m.id && (n[r][m.id] = m, i.set(m.id, w(process.cwd(), u)));
         }
     } catch {
     }
   }
   try {
-    const r = s(e, "locales"), c = await y(r);
-    for (const t of c)
-      if (p(t) === ".yaml" || p(t) === ".yml") {
-        const l = s(r, t), d = await f(l, "utf-8"), m = b(d), u = t.replace(/\.(yaml|yml)$/, "");
-        o.locales[u] = m ?? {};
+    const o = s(e, "locales"), r = await y(o);
+    for (const t of r)
+      if (f(t) === ".yaml" || f(t) === ".yml") {
+        const l = s(o, t), d = await p(l, "utf-8"), u = b(d), h = t.replace(/\.(yaml|yml)$/, "");
+        n.locales[h] = u ?? {};
       }
   } catch {
   }
   try {
-    const r = s(e, "dialogues"), c = await y(r);
-    for (const t of c)
-      if (p(t) === ".dlg") {
-        const l = s(r, t), d = await f(l, "utf-8"), m = t.replace(".dlg", ""), u = E(d, m);
-        o.dialogues[u.id] = u, a.set(u.id, w(process.cwd(), l));
+    const o = s(e, "dialogues"), r = await y(o);
+    for (const t of r)
+      if (f(t) === ".dlg") {
+        const l = s(o, t), d = await p(l, "utf-8"), u = t.replace(".dlg", ""), h = v(d, u);
+        n.dialogues[h.id] = h, i.set(h.id, w(process.cwd(), l));
       }
   } catch {
   }
-  return { registry: o, fileMap: a };
+  return { registry: n, fileMap: i };
 }
-const O = "🐾", X = "🐕", S = "🦴", Z = "✨", A = "📁", _ = "✅", ee = "🚀";
-async function te(e) {
-  const o = s(process.cwd(), e);
-  console.log(""), console.log(i.bold.magenta(`  ${O} Doodle Engine ${O}`)), console.log(i.dim("  Text-based RPG and Adventure Game Scaffolder")), console.log(""), console.log(`  ${X} Creating new game: ${i.bold.cyan(e)}`), console.log("");
-  const { useDefaultRenderer: a } = await H({
+const D = "🐾", te = "🐕", q = "🦴", oe = "✨", x = "📁", _ = "✅", ae = "🚀";
+async function ne(e) {
+  const n = s(process.cwd(), e);
+  console.log(""), console.log(c.bold.magenta(`  ${D} Doodle Engine ${D}`)), console.log(c.dim("  Text-based RPG and Adventure Game Scaffolder")), console.log(""), console.log(`  ${te} Creating new game: ${c.bold.cyan(e)}`), console.log("");
+  const { useDefaultRenderer: i } = await M({
     type: "confirm",
     name: "useDefaultRenderer",
     message: "Use default renderer?",
     initial: !0
   });
-  a === void 0 && (console.log(i.yellow(`
-  ${S} No worries, maybe next time! Woof!`)), process.exit(0)), console.log(""), await oe(o, e, a), console.log(""), console.log(i.bold.green(`  ${_} Project created successfully!`)), console.log(""), console.log(i.dim(`  ${A} ${o}`)), console.log(""), console.log(i.bold("  Next steps:")), console.log(i.cyan(`    cd ${e}`)), console.log(i.cyan("    npm install       ") + i.dim("# or: yarn install / pnpm install")), console.log(i.cyan("    npm run dev        ") + i.dim("# or: yarn dev / pnpm dev")), console.log(""), console.log(i.dim(`  ${ee} Happy game making! ${O}`)), console.log("");
+  i === void 0 && (console.log(c.yellow(`
+  ${q} No worries, maybe next time! Woof!`)), process.exit(0)), console.log(""), await re(n, e, i), console.log(""), console.log(c.bold.green(`  ${_} Project created successfully!`)), console.log(""), console.log(c.dim(`  ${x} ${n}`)), console.log(""), console.log(c.bold("  Next steps:")), console.log(c.cyan(`    cd ${e}`)), console.log(c.cyan("    npm install       ") + c.dim("# or: yarn install / pnpm install")), console.log(c.cyan("    npm run dev        ") + c.dim("# or: yarn dev / pnpm dev")), console.log(""), console.log(c.dim(`  ${ae} Happy game making! ${D}`)), console.log("");
 }
-async function oe(e, o, a) {
-  const n = [
+async function re(e, n, i) {
+  const a = [
     "content/locations",
     "content/characters",
     "content/items",
@@ -638,12 +545,12 @@ async function oe(e, o, a) {
     "assets/audio/voice",
     "src"
   ];
-  console.log(`  ${A} ${i.bold("Creating directories...")}`);
-  for (const u of n)
-    await j(s(e, u), { recursive: !0 });
-  console.log(i.green(`  ${_} Directories created`)), console.log("");
-  const r = {
-    name: o,
+  console.log(`  ${x} ${c.bold("Creating directories...")}`);
+  for (const h of a)
+    await R(s(e, h), { recursive: !0 });
+  console.log(c.green(`  ${_} Directories created`)), console.log("");
+  const o = {
+    name: n,
     version: "0.1.0",
     type: "module",
     scripts: {
@@ -666,11 +573,11 @@ async function oe(e, o, a) {
       vite: "^6.0.0"
     }
   };
-  console.log(`  ${Z} ${i.bold("Writing project files...")}`), await h(
+  console.log(`  ${oe} ${c.bold("Writing project files...")}`), await g(
     s(e, "package.json"),
-    JSON.stringify(r, null, 2)
+    JSON.stringify(o, null, 2)
   );
-  const c = {
+  const r = {
     compilerOptions: {
       target: "ES2024",
       lib: ["ES2024", "DOM", "DOM.Iterable"],
@@ -687,10 +594,10 @@ async function oe(e, o, a) {
     },
     include: ["src"]
   };
-  await h(
+  await g(
     s(e, "tsconfig.json"),
-    JSON.stringify(c, null, 2)
-  ), await h(s(e, "index.html"), `<!doctype html>
+    JSON.stringify(r, null, 2)
+  ), await g(s(e, "index.html"), `<!doctype html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
@@ -702,7 +609,7 @@ async function oe(e, o, a) {
     <script type="module" src="/src/main.tsx"><\/script>
   </body>
 </html>
-`), await h(s(e, "src/main.tsx"), `import { StrictMode } from 'react'
+`), await g(s(e, "src/main.tsx"), `import { StrictMode } from 'react'
 import { createRoot } from 'react-dom/client'
 import { App } from './App'
 import './index.css'
@@ -714,9 +621,9 @@ createRoot(document.getElementById('root')!).render(
 )
 `);
   let d;
-  a ? d = `import { useEffect, useState } from 'react'
+  i ? d = `import { useEffect, useState } from 'react'
 import type { ContentRegistry, GameConfig } from '@doodle-engine/core'
-import { GameShell } from '@doodle-engine/react'
+import { GameShell, LoadingScreen } from '@doodle-engine/react'
 export function App() {
   const [content, setContent] = useState<{ registry: ContentRegistry; config: GameConfig } | null>(null)
@@ -728,7 +635,7 @@ export function App() {
   }, [])
   if (!content) {
-    return <div style={{ padding: '2rem', fontFamily: 'sans-serif' }}>Loading game...</div>
+    return <LoadingScreen />
   }
   return (
@@ -739,13 +646,14 @@ export function App() {
       subtitle="A text-based adventure"
       splashDuration={2000}
       availableLocales={[{ code: 'en', label: 'English' }]}
+      devTools={import.meta.env.DEV}
     />
   )
 }
 ` : d = `import { useEffect, useState } from 'react'
 import { Engine } from '@doodle-engine/core'
 import type { GameState, Snapshot } from '@doodle-engine/core'
-import { GameProvider, useGame } from '@doodle-engine/react'
+import { GameProvider, LoadingScreen, useGame } from '@doodle-engine/react'
 export function App() {
   const [game, setGame] = useState<{ engine: Engine; snapshot: Snapshot } | null>(null)
@@ -761,11 +669,11 @@ export function App() {
   }, [])
   if (!game) {
-    return <div style={{ padding: '2rem', fontFamily: 'sans-serif' }}>Loading game...</div>
+    return <LoadingScreen />
   }
   return (
-    <GameProvider engine={game.engine} initialSnapshot={game.snapshot}>
+    <GameProvider engine={game.engine} initialSnapshot={game.snapshot} devTools={import.meta.env.DEV}>
       <GameUI />
     </GameProvider>
   )
@@ -833,7 +741,7 @@ function createEmptyState(): GameState {
     currentLocale: 'en',
   }
 }
-`, await h(s(e, "src/App.tsx"), d), await h(s(e, "src/index.css"), `body {
+`, await g(s(e, "src/App.tsx"), d), await g(s(e, "src/index.css"), `body {
   margin: 0;
   font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
     'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
@@ -841,7 +749,7 @@ function createEmptyState(): GameState {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
-`), console.log(i.green(`  ${_} Source files created`)), console.log(""), console.log(`  ${S} ${i.bold("Writing starter content...")}`), await h(s(e, "content/game.yaml"), `# Game Configuration
+`), console.log(c.green(`  ${_} Source files created`)), console.log(""), console.log(`  ${q} ${c.bold("Writing starter content...")}`), await g(s(e, "content/game.yaml"), `# Game Configuration
 startLocation: tavern
 startTime:
   day: 1
@@ -852,40 +760,40 @@ startVariables:
   reputation: 0
   _drinksBought: 0
 startInventory: []
-`), await h(s(e, "content/locations/tavern.yaml"), `id: tavern
+`), await g(s(e, "content/locations/tavern.yaml"), `id: tavern
 name: "@location.tavern.name"
 description: "@location.tavern.description"
 banner: ""
 music: ""
 ambient: ""
-`), await h(s(e, "content/locations/market.yaml"), `id: market
+`), await g(s(e, "content/locations/market.yaml"), `id: market
 name: "@location.market.name"
 description: "@location.market.description"
 banner: ""
 music: ""
 ambient: ""
-`), await h(s(e, "content/characters/bartender.yaml"), `id: bartender
+`), await g(s(e, "content/characters/bartender.yaml"), `id: bartender
 name: "@character.bartender.name"
 biography: "@character.bartender.bio"
 portrait: ""
 location: tavern
 dialogue: bartender_greeting
 stats: {}
-`), await h(s(e, "content/characters/merchant.yaml"), `id: merchant
+`), await g(s(e, "content/characters/merchant.yaml"), `id: merchant
 name: "@character.merchant.name"
 biography: "@character.merchant.bio"
 portrait: ""
 location: market
 dialogue: merchant_intro
 stats: {}
-`), await h(s(e, "content/items/old_coin.yaml"), `id: old_coin
+`), await g(s(e, "content/items/old_coin.yaml"), `id: old_coin
 name: "@item.old_coin.name"
 description: "@item.old_coin.description"
 icon: ""
 image: ""
 location: tavern
 stats: {}
-`), await h(s(e, "content/maps/town.yaml"), `id: town
+`), await g(s(e, "content/maps/town.yaml"), `id: town
 name: "@map.town.name"
 image: ""
 scale: 1
@@ -896,7 +804,7 @@ locations:
   - id: market
     x: 300
     y: 150
-`), await h(s(e, "content/quests/odd_jobs.yaml"), `id: odd_jobs
+`), await g(s(e, "content/quests/odd_jobs.yaml"), `id: odd_jobs
 name: "@quest.odd_jobs.name"
 description: "@quest.odd_jobs.description"
 stages:
@@ -906,40 +814,60 @@ stages:
     description: "@quest.odd_jobs.stage.talked_to_merchant"
   - id: complete
     description: "@quest.odd_jobs.stage.complete"
-`), await h(s(e, "content/journal/tavern_discovery.yaml"), `id: tavern_discovery
+`), await g(s(e, "content/journal/tavern_discovery.yaml"), `id: tavern_discovery
 title: "@journal.tavern_discovery.title"
 text: "@journal.tavern_discovery.text"
 category: places
-`), await h(s(e, "content/journal/odd_jobs_accepted.yaml"), `id: odd_jobs_accepted
+`), await g(s(e, "content/journal/odd_jobs_accepted.yaml"), `id: odd_jobs_accepted
 title: "@journal.odd_jobs_accepted.title"
 text: "@journal.odd_jobs_accepted.text"
 category: quests
-`), await h(s(e, "content/journal/market_square.yaml"), `id: market_square
+`), await g(s(e, "content/journal/market_square.yaml"), `id: market_square
 title: "@journal.market_square.title"
 text: "@journal.market_square.text"
 category: places
-`), await h(s(e, "content/dialogues/tavern_intro.dlg"), `TRIGGER tavern
+`), await g(s(e, "content/dialogues/tavern_intro.dlg"), `# This dialogue triggers automatically when the player enters the tavern.
+# TRIGGER <locationId> fires on arrival. REQUIRE conditions guard the trigger.
+# Use notFlag to make it a one-time intro.
+TRIGGER tavern
 REQUIRE notFlag seenTavernIntro
+# Each NODE is a conversation point. The first NODE is always the start.
 NODE start
+  # NARRATOR: has no speaker — used for scene-setting text.
+  # @narrator.tavern_intro is a localization key defined in content/locales/en.yaml.
+  # You can also write text inline: NARRATOR: "The tavern is warm and smells of ale."
   NARRATOR: @narrator.tavern_intro
+  # Effects run immediately when this node is reached, before choices are shown.
   SET flag seenTavernIntro
+  # CHOICE text can use a @key or "inline text".
+  # A choice with END dialogue is a terminal choice — no GOTO needed.
   CHOICE @narrator.choice.look_around
     END dialogue
   END
-`), await h(s(e, "content/dialogues/market_intro.dlg"), `TRIGGER market
+`), await g(s(e, "content/dialogues/market_intro.dlg"), `# One-time narrator intro for the market. Same pattern as tavern_intro.dlg.
+TRIGGER market
 REQUIRE notFlag seenMarketIntro
 NODE start
   NARRATOR: @narrator.market_intro
   SET flag seenMarketIntro
+  # ADD journalEntry unlocks a journal entry for the player.
   ADD journalEntry market_square
   CHOICE @narrator.choice.look_around
     END dialogue
   END
-`), await h(s(e, "content/dialogues/bartender_greeting.dlg"), `NODE start
+`), await g(s(e, "content/dialogues/bartender_greeting.dlg"), `# This dialogue is triggered by clicking the bartender character.
+# SPEAKER: lines set who's talking — matched to character ID (case-insensitive).
+# Nodes can have multiple CHOICE blocks; REQUIRE hides a choice if the condition fails.
+NODE start
   BARTENDER: @bartender.greeting
   # Always available — ask for rumors (demonstrates: flag, relationship, journalEntry)
@@ -1077,7 +1005,10 @@ NODE work_done
 NODE farewell
   BARTENDER: @bartender.farewell
   END dialogue
-`), await h(s(e, "content/dialogues/merchant_intro.dlg"), `NODE start
+`), await g(s(e, "content/dialogues/merchant_intro.dlg"), `# Merchant dialogue. Same speaker-line and CHOICE syntax as bartender_greeting.dlg.
+# The quest choices here demonstrate multi-stage quest gating with questAtStage.
+NODE start
   MERCHANT: @merchant.greeting
   CHOICE @merchant.choice.browse_wares
@@ -1177,7 +1108,7 @@ NODE about_market
 NODE farewell
   MERCHANT: @merchant.farewell
   END dialogue
-`), await h(s(e, "content/locales/en.yaml"), `# ===================
+`), await g(s(e, "content/locales/en.yaml"), `# ===================
 # Narrator Intros
 # ===================
 narrator.tavern_intro: "You push open the heavy oak door and step inside. The warmth hits you first, then the smell — stale ale, wood smoke, and something frying in the kitchen. A few patrons hunch over their mugs. Behind the bar, a broad-shouldered man wipes down glasses, watching you with quiet interest."
@@ -1305,24 +1236,24 @@ notification.quest_updated: "Quest Updated: Odd Jobs"
 notification.quest_complete: "Quest Complete: Odd Jobs (+50 gold, +10 reputation)"
 notification.bought_drink: "Bought a drink (-5 gold)"
 notification.bought_map: "Bought a map (-20 gold)"
-`), console.log(i.green(`  ${_} Starter content created`)), console.log(""), console.log(i.dim("  Content includes:")), console.log(i.dim("    2 locations (tavern, market)")), console.log(i.dim("    2 characters (bartender, merchant)")), console.log(i.dim("    1 item (old coin)")), console.log(i.dim("    1 map (town)")), console.log(i.dim("    1 quest with 3 stages")), console.log(i.dim("    3 journal entries")), console.log(i.dim("    4 dialogues (2 narrator intros, 2 NPC conversations)")), console.log(i.dim("    English locale with all strings")), await h(s(e, ".gitignore"), `node_modules
+`), console.log(c.green(`  ${_} Starter content created`)), console.log(""), console.log(c.dim("  Content includes:")), console.log(c.dim("    2 locations (tavern, market)")), console.log(c.dim("    2 characters (bartender, merchant)")), console.log(c.dim("    1 item (old coin)")), console.log(c.dim("    1 map (town)")), console.log(c.dim("    1 quest with 3 stages")), console.log(c.dim("    3 journal entries")), console.log(c.dim("    4 dialogues (2 narrator intros, 2 NPC conversations)")), console.log(c.dim("    English locale with all strings")), await g(s(e, ".gitignore"), `node_modules
 dist
 .DS_Store
 *.log
 `);
 }
-const k = new I();
-k.name("doodle").description(i.magenta("🐾 Doodle Engine") + i.dim(" — Narrative RPG development tools")).version("0.0.1");
-k.command("create <project-name>").description("Scaffold a new Doodle Engine game project").action(async (e) => {
-  await te(e);
-});
-k.command("dev").description("Start development server with hot reload").action(async () => {
-  await W();
+const E = new G();
+E.name("doodle").description(c.magenta("🐾 Doodle Engine") + c.dim(" — Narrative RPG development tools")).version("0.0.1");
+E.command("create <project-name>").description("Scaffold a new Doodle Engine game project").action(async (e) => {
+  await ne(e);
 });
-k.command("build").description("Build game for production").action(async () => {
+E.command("dev").description("Start development server with hot reload").action(async () => {
   await Y();
 });
-k.command("validate").description("Validate game content").action(async () => {
-  await K();
+E.command("build").description("Build game for production").action(async () => {
+  await z();
+});
+E.command("validate").description("Validate game content").action(async () => {
+  await Z();
 });
-k.parse();
+E.parse();