@doodle-engine/cli 0.0.15 → 0.0.17

package/dist/cli.js

@@ -1,84 +1,84 @@
 #!/usr/bin/env node
-import { Command as q } from "commander";
-import { crayon as i } from "crayon.js";
-import { createServer as G, build as $ } from "vite";
+import { Command as x } from "commander";
+import { crayon as s } from "crayon.js";
+import { createServer as q, build as $ } from "vite";
 import S from "@vitejs/plugin-react";
 import { watch as H } from "chokidar";
-import { readdir as p, readFile as f, mkdir as D, writeFile as k } from "fs/promises";
-import { join as u, extname as g, relative as b, dirname as M } from "path";
-import { parse as y } from "yaml";
-import { parseDialogue as E } from "@doodle-engine/core";
+import { readdir as p, readFile as f, mkdir as D, writeFile as w } from "fs/promises";
+import { join as h, extname as g, relative as y, dirname as M } from "path";
+import { parse as b } from "yaml";
+import { parseDialogue as k } from "@doodle-engine/core";
 import F from "prompts";
-function I(t, a) {
+function N(n, a) {
   const r = [];
-  for (const o of Object.values(t.dialogues)) {
-    const n = a.get(o.id) || `dialogue:${o.id}`;
-    r.push(...P(o, n));
+  for (const o of Object.values(n.dialogues)) {
+    const t = a.get(o.id) || `dialogue:${o.id}`;
+    r.push(...B(o, t));
   }
-  for (const o of Object.values(t.characters))
-    if (o.dialogue && !t.dialogues[o.dialogue]) {
-      const n = a.get(o.id) || `character:${o.id}`;
+  for (const o of Object.values(n.characters))
+    if (o.dialogue && !n.dialogues[o.dialogue]) {
+      const t = a.get(o.id) || `character:${o.id}`;
       r.push({
-        file: n,
+        file: t,
         message: `Character "${o.id}" references non-existent dialogue "${o.dialogue}"`,
         suggestion: `Create dialogue "${o.dialogue}" or fix the reference`
       });
     }
-  return r.push(...W(t, a)), r;
+  return r.push(...W(n, a)), r;
 }
-function P(t, a) {
+function B(n, a) {
   const r = [], o = /* @__PURE__ */ new Set();
-  for (const n of t.nodes)
-    o.has(n.id) && r.push({
+  for (const t of n.nodes)
+    o.has(t.id) && r.push({
       file: a,
-      message: `Duplicate node ID "${n.id}"`,
+      message: `Duplicate node ID "${t.id}"`,
       suggestion: "Node IDs must be unique within a dialogue"
-    }), o.add(n.id);
-  o.has(t.startNode) || r.push({
+    }), o.add(t.id);
+  o.has(n.startNode) || r.push({
     file: a,
-    message: `Start node "${t.startNode}" not found`,
-    suggestion: `Add a NODE ${t.startNode} or fix the startNode reference`
+    message: `Start node "${n.startNode}" not found`,
+    suggestion: `Add a NODE ${n.startNode} or fix the startNode reference`
   });
-  for (const n of t.nodes)
-    r.push(...B(n, o, a));
+  for (const t of n.nodes)
+    r.push(...L(t, o, a));
   return r;
 }
-function B(t, a, r) {
+function L(n, a, r) {
   const o = [];
-  if (t.next && !a.has(t.next) && o.push({
+  if (n.next && !a.has(n.next) && o.push({
     file: r,
-    message: `Node "${t.id}" GOTO "${t.next}" points to non-existent node`,
-    suggestion: `Add NODE ${t.next} or fix the GOTO target`
-  }), t.conditionalNext)
-    for (const n of t.conditionalNext)
-      a.has(n.next) || o.push({
+    message: `Node "${n.id}" GOTO "${n.next}" points to non-existent node`,
+    suggestion: `Add NODE ${n.next} or fix the GOTO target`
+  }), n.conditionalNext)
+    for (const t of n.conditionalNext)
+      a.has(t.next) || o.push({
         file: r,
-        message: `Node "${t.id}" IF block GOTO "${n.next}" points to non-existent node`,
-        suggestion: `Add NODE ${n.next} or fix the GOTO target`
-      }), o.push(...v(n.condition, t.id, r));
-  for (const n of t.choices) {
-    if (!n.effects?.some(
+        message: `Node "${n.id}" IF block GOTO "${t.next}" points to non-existent node`,
+        suggestion: `Add NODE ${t.next} or fix the GOTO target`
+      }), o.push(...v(t.condition, n.id, r));
+  for (const t of n.choices) {
+    if (!t.effects?.some(
       (e) => e.type === "endDialogue" || e.type === "goToLocation" || e.type === "startDialogue"
-    ) && n.next && !a.has(n.next) && o.push({
+    ) && t.next && !a.has(t.next) && o.push({
       file: r,
-      message: `Node "${t.id}" choice "${n.id}" GOTO "${n.next}" points to non-existent node`,
-      suggestion: `Add NODE ${n.next} or fix the GOTO target`
-    }), n.conditions)
-      for (const e of n.conditions)
-        o.push(...v(e, t.id, r));
-    if (n.effects)
-      for (const e of n.effects)
-        o.push(...C(e, t.id, r));
+      message: `Node "${n.id}" choice "${t.id}" GOTO "${t.next}" points to non-existent node`,
+      suggestion: `Add NODE ${t.next} or fix the GOTO target`
+    }), t.conditions)
+      for (const e of t.conditions)
+        o.push(...v(e, n.id, r));
+    if (t.effects)
+      for (const e of t.effects)
+        o.push(...C(e, n.id, r));
   }
-  if (t.conditions)
-    for (const n of t.conditions)
-      o.push(...v(n, t.id, r));
-  if (t.effects)
-    for (const n of t.effects)
-      o.push(...C(n, t.id, r));
+  if (n.conditions)
+    for (const t of n.conditions)
+      o.push(...v(t, n.id, r));
+  if (n.effects)
+    for (const t of n.effects)
+      o.push(...C(t, n.id, r));
   return o;
 }
-const L = {
+const P = {
   hasFlag: ["flag"],
   notFlag: ["flag"],
   hasItem: ["itemId"],
@@ -123,137 +123,141 @@ const L = {
   showInterlude: ["interludeId"],
   roll: ["variable", "min", "max"]
 };
-function v(t, a, r) {
+function v(n, a, r) {
   const o = [];
-  if (!t.type)
+  if (!n.type)
     return o.push({
       file: r,
       message: `Node "${a}" has condition with missing type`
     }), o;
-  if (t.type === "timeIs")
-    return t.hour === void 0 && t.day === void 0 && o.push({
+  if (n.type === "timeIs")
+    return n.hour === void 0 && n.day === void 0 && o.push({
       file: r,
       message: `Node "${a}" condition "timeIs" must have at least one of "hour" or "day" argument`
     }), o;
-  const n = L[t.type];
-  if (!n)
+  const t = P[n.type];
+  if (!t)
     return o;
-  for (const s of n)
-    (t[s] === void 0 || t[s] === null || t[s] === "") && o.push({
+  for (const i of t)
+    (n[i] === void 0 || n[i] === null || n[i] === "") && o.push({
       file: r,
-      message: `Node "${a}" condition "${t.type}" missing required "${s}" argument`
+      message: `Node "${a}" condition "${n.type}" missing required "${i}" argument`
     });
   return o;
 }
-function C(t, a, r) {
+function C(n, a, r) {
   const o = [];
-  if (!t.type)
+  if (!n.type)
     return o.push({
       file: r,
       message: `Node "${a}" has effect with missing type`
     }), o;
-  const n = U[t.type];
-  if (!n)
+  const t = U[n.type];
+  if (!t)
     return o;
-  for (const s of n)
-    (t[s] === void 0 || t[s] === null || t[s] === "") && o.push({
+  for (const i of t)
+    (n[i] === void 0 || n[i] === null || n[i] === "") && o.push({
       file: r,
-      message: `Node "${a}" effect "${t.type}" missing required "${s}" argument`
+      message: `Node "${a}" effect "${n.type}" missing required "${i}" argument`
     });
   return o;
 }
-function W(t, a) {
+function W(n, a) {
   const r = [], o = /* @__PURE__ */ new Set();
-  for (const e of Object.values(t.locales))
+  for (const e of Object.values(n.locales))
     for (const c of Object.keys(e))
       o.add(c);
-  const n = (e) => e.startsWith("@"), s = (e, c, l) => {
+  const t = (e) => e.startsWith("@"), i = (e, c, l) => {
     const d = e.slice(1);
     if (!o.has(d)) {
-      const h = a.get(c) || `${l}:${c}`;
+      const u = a.get(c) || `${l}:${c}`;
       r.push({
-        file: h,
+        file: u,
         message: `Localization key "${e}" not found in any locale file`,
         suggestion: `Add "${d}: ..." to your locale files`
       });
     }
   };
-  for (const e of Object.values(t.locations))
-    n(e.name) && s(e.name, e.id, "location"), n(e.description) && s(e.description, e.id, "location");
-  for (const e of Object.values(t.characters))
-    n(e.name) && s(e.name, e.id, "character"), n(e.biography) && s(e.biography, e.id, "character");
-  for (const e of Object.values(t.items))
-    n(e.name) && s(e.name, e.id, "item"), n(e.description) && s(e.description, e.id, "item");
-  for (const e of Object.values(t.quests)) {
-    n(e.name) && s(e.name, e.id, "quest"), n(e.description) && s(e.description, e.id, "quest");
+  for (const e of Object.values(n.locations))
+    t(e.name) && i(e.name, e.id, "location"), t(e.description) && i(e.description, e.id, "location");
+  for (const e of Object.values(n.characters))
+    t(e.name) && i(e.name, e.id, "character"), t(e.biography) && i(e.biography, e.id, "character");
+  for (const e of Object.values(n.items))
+    t(e.name) && i(e.name, e.id, "item"), t(e.description) && i(e.description, e.id, "item");
+  for (const e of Object.values(n.quests)) {
+    t(e.name) && i(e.name, e.id, "quest"), t(e.description) && i(e.description, e.id, "quest");
     for (const c of e.stages)
-      n(c.description) && s(c.description, e.id, "quest");
+      t(c.description) && i(c.description, e.id, "quest");
   }
-  for (const e of Object.values(t.journalEntries))
-    n(e.title) && s(e.title, e.id, "journal"), n(e.text) && s(e.text, e.id, "journal");
-  for (const e of Object.values(t.dialogues))
+  for (const e of Object.values(n.journalEntries))
+    t(e.title) && i(e.title, e.id, "journal"), t(e.text) && i(e.text, e.id, "journal");
+  for (const e of Object.values(n.dialogues))
     for (const c of e.nodes) {
-      n(c.text) && s(c.text, e.id, "dialogue");
+      t(c.text) && i(c.text, e.id, "dialogue");
       for (const l of c.choices)
-        n(l.text) && s(l.text, e.id, "dialogue");
+        t(l.text) && i(l.text, e.id, "dialogue");
     }
-  for (const e of Object.values(t.interludes))
-    n(e.text) && s(e.text, e.id, "interlude");
+  for (const e of Object.values(n.interludes))
+    t(e.text) && i(e.text, e.id, "interlude");
   return r;
 }
-function N(t) {
-  if (t.length === 0) {
-    console.log(i.green("✓ No validation errors"));
+function I(n) {
+  if (n.length === 0) {
+    console.log(s.green("✓ No validation errors"));
     return;
   }
-  console.log(i.red(`
-✗ Found ${t.length} validation error${t.length === 1 ? "" : "s"}:
+  console.log(s.red(`
+✗ Found ${n.length} validation error${n.length === 1 ? "" : "s"}:
 `));
-  for (const a of t)
-    console.log(i.bold(a.file) + (a.line ? `:${a.line}` : "")), console.log("  " + i.red(a.message)), a.suggestion && console.log("  " + i.dim(a.suggestion)), console.log();
+  for (const a of n)
+    console.log(s.bold(a.file) + (a.line ? `:${a.line}` : "")), console.log("  " + s.red(a.message)), a.suggestion && console.log("  " + s.dim(a.suggestion)), console.log();
 }
 const R = "🐾", J = "✨", Q = "✏️", Y = "➕";
 async function V() {
-  const t = process.cwd(), a = u(t, "content");
-  console.log(""), console.log(i.bold.magenta(`  ${R} Doodle Engine Dev Server ${R}`)), console.log("");
+  const n = process.cwd(), a = h(n, "content");
+  console.log(""), console.log(s.bold.magenta(`  ${R} Doodle Engine Dev Server ${R}`)), console.log("");
   const r = {
     name: "doodle-content-loader",
-    configureServer(n) {
-      n.middlewares.use("/api/content", async (l, d) => {
+    configureServer(t) {
+      t.middlewares.use("/api/content", async (d, u) => {
         try {
-          const h = await K(a);
-          d.setHeader("Content-Type", "application/json"), d.end(JSON.stringify(h));
-        } catch (h) {
-          console.error(i.red("  Error loading content:"), h), d.statusCode = 500, d.end(JSON.stringify({ error: "Failed to load content" }));
+          const m = await K(a);
+          u.setHeader("Content-Type", "application/json"), u.end(JSON.stringify(m));
+        } catch (m) {
+          console.error(s.red("  Error loading content:"), m), u.statusCode = 500, u.end(JSON.stringify({ error: "Failed to load content" }));
         }
       });
-      const s = H(a, {
+      const i = H(a, {
         ignored: /(^|[\/\\])\../,
         persistent: !0
       });
-      let e = null;
-      const c = (l) => {
-        e && clearTimeout(e), e = setTimeout(async () => {
-          e = null, console.log(l), await z(a), n.ws.send({ type: "full-reload", path: "*" });
+      let e = !1;
+      i.on("ready", () => {
+        e = !0;
+      });
+      let c = null;
+      const l = (d) => {
+        c && clearTimeout(c), c = setTimeout(async () => {
+          c = null, console.log(d), await z(a), t.ws.send({ type: "full-reload", path: "*" });
         }, 50);
       };
-      s.on("change", (l) => {
-        c(i.yellow(`  ${Q} Content changed: ${l}`));
-      }), s.on("add", (l) => {
-        c(i.green(`  ${Y} Content added: ${l}`));
+      i.on("change", (d) => {
+        l(s.yellow(`  ${Q} Content changed: ${d}`));
+      }), i.on("add", (d) => {
+        e && l(s.green(`  ${Y} Content added: ${d}`));
       });
     }
-  }, o = await G({
-    root: t,
+  }, o = await q({
+    root: n,
     plugins: [S(), r],
     server: {
       port: 3e3,
       open: !0
     }
   });
-  await o.listen(), o.printUrls(), console.log(""), console.log(i.dim(`  ${J} Watching content files for changes...`)), console.log("");
+  await o.listen(), o.printUrls(), console.log(""), console.log(s.dim(`  ${J} Watching content files for changes...`)), console.log("");
 }
-async function K(t) {
+async function K(n) {
   const a = {
     locations: {},
     characters: {},
@@ -275,41 +279,41 @@ async function K(t) {
     { dir: "journal", key: "journalEntries" },
     { dir: "interludes", key: "interludes" }
   ];
-  for (const { dir: n, key: s } of o) {
-    const e = u(t, n);
+  for (const { dir: t, key: i } of o) {
+    const e = h(n, t);
     try {
       const c = await p(e);
       for (const l of c)
         if (g(l) === ".yaml" || g(l) === ".yml") {
-          const d = u(e, l), h = await f(d, "utf-8"), m = y(h);
-          m && m.id && (a[s][m.id] = m);
+          const d = h(e, l), u = await f(d, "utf-8"), m = b(u);
+          m && m.id && (a[i][m.id] = m);
         }
     } catch {
     }
   }
   try {
-    const n = u(t, "locales"), s = await p(n);
-    for (const e of s)
+    const t = h(n, "locales"), i = await p(t);
+    for (const e of i)
       if (g(e) === ".yaml" || g(e) === ".yml") {
-        const c = u(n, e), l = await f(c, "utf-8"), d = y(l), h = e.replace(/\.(yaml|yml)$/, "");
-        a.locales[h] = d ?? {};
+        const c = h(t, e), l = await f(c, "utf-8"), d = b(l), u = e.replace(/\.(yaml|yml)$/, "");
+        a.locales[u] = d ?? {};
       }
   } catch {
   }
   try {
-    const n = u(t, "dialogues"), s = await p(n);
-    for (const e of s)
+    const t = h(n, "dialogues"), i = await p(t);
+    for (const e of i)
       if (g(e) === ".dlg") {
-        const c = u(n, e), l = await f(c, "utf-8"), d = e.replace(".dlg", ""), h = E(l, d);
-        a.dialogues[h.id] = h;
+        const c = h(t, e), l = await f(c, "utf-8"), d = e.replace(".dlg", ""), u = k(l, d);
+        a.dialogues[u.id] = u;
       }
   } catch {
   }
   try {
-    const n = u(t, "game.yaml"), s = await f(n, "utf-8");
-    r = y(s);
+    const t = h(n, "game.yaml"), i = await f(t, "utf-8");
+    r = b(i);
   } catch {
-    console.warn(i.yellow("  No game.yaml found, using defaults")), r = {
+    console.warn(s.yellow("  No game.yaml found, using defaults")), r = {
       startLocation: "tavern",
       startTime: { day: 1, hour: 8 },
       startFlags: {},
@@ -319,15 +323,15 @@ async function K(t) {
   }
   return { registry: a, config: r };
 }
-async function z(t) {
+async function z(n) {
   try {
-    const { registry: a, fileMap: r } = await X(t), o = I(a, r);
-    o.length > 0 && (console.log(""), N(o), console.log(""));
+    const { registry: a, fileMap: r } = await X(n), o = N(a, r);
+    o.length > 0 && (console.log(""), I(o), console.log(""));
   } catch (a) {
-    console.error(i.red("  Error running validation:"), a);
+    console.error(s.red("  Error running validation:"), a);
   }
 }
-async function X(t) {
+async function X(n) {
   const a = {
     locations: {},
     characters: {},
@@ -347,65 +351,65 @@ async function X(t) {
     { dir: "journal", key: "journalEntries" },
     { dir: "interludes", key: "interludes" }
   ];
-  for (const { dir: n, key: s } of o) {
-    const e = u(t, n);
+  for (const { dir: t, key: i } of o) {
+    const e = h(n, t);
     try {
       const c = await p(e);
       for (const l of c)
         if (g(l) === ".yaml" || g(l) === ".yml") {
-          const d = u(e, l), h = await f(d, "utf-8"), m = y(h);
-          m && m.id && (a[s][m.id] = m, r.set(m.id, b(process.cwd(), d)));
+          const d = h(e, l), u = await f(d, "utf-8"), m = b(u);
+          m && m.id && (a[i][m.id] = m, r.set(m.id, y(process.cwd(), d)));
         }
     } catch {
     }
   }
   try {
-    const n = u(t, "locales"), s = await p(n);
-    for (const e of s)
+    const t = h(n, "locales"), i = await p(t);
+    for (const e of i)
       if (g(e) === ".yaml" || g(e) === ".yml") {
-        const c = u(n, e), l = await f(c, "utf-8"), d = y(l), h = e.replace(/\.(yaml|yml)$/, "");
-        a.locales[h] = d ?? {};
+        const c = h(t, e), l = await f(c, "utf-8"), d = b(l), u = e.replace(/\.(yaml|yml)$/, "");
+        a.locales[u] = d ?? {};
       }
   } catch {
   }
   try {
-    const n = u(t, "dialogues"), s = await p(n);
-    for (const e of s)
+    const t = h(n, "dialogues"), i = await p(t);
+    for (const e of i)
       if (g(e) === ".dlg") {
-        const c = u(n, e), l = await f(c, "utf-8"), d = e.replace(".dlg", ""), h = E(l, d);
-        a.dialogues[h.id] = h, r.set(h.id, b(process.cwd(), c));
+        const c = h(t, e), l = await f(c, "utf-8"), d = e.replace(".dlg", ""), u = k(l, d);
+        a.dialogues[u.id] = u, r.set(u.id, y(process.cwd(), c));
       }
   } catch {
   }
   return { registry: a, fileMap: r };
 }
 async function Z() {
-  const t = process.cwd(), a = u(t, "content");
-  console.log(""), console.log(i.bold.magenta("🐕 Building Doodle Engine game...")), console.log(""), console.log(i.dim("Validating content..."));
+  const n = process.cwd(), a = h(n, "content");
+  console.log(""), console.log(s.bold.magenta("🐕 Building Doodle Engine game...")), console.log(""), console.log(s.dim("Validating content..."));
   let r;
   try {
-    const { registry: o, fileMap: n, config: s } = await ee(a), e = I(o, n);
-    N(e), e.length > 0 && (console.log(i.red("Build failed due to validation errors.")), console.log(""), process.exit(1)), r = { registry: o, config: s };
+    const { registry: o, fileMap: t, config: i } = await ee(a), e = N(o, t);
+    I(e), e.length > 0 && (console.log(s.red("Build failed due to validation errors.")), console.log(""), process.exit(1)), r = { registry: o, config: i };
   } catch (o) {
-    console.error(i.red("Error loading content:"), o), process.exit(1);
+    console.error(s.red("Error loading content:"), o), process.exit(1);
   }
   console.log("");
   try {
     await $({
-      root: t,
+      root: n,
       plugins: [S()],
       build: {
         outDir: "dist",
         emptyOutDir: !0
       }
     });
-    const o = u(t, "dist", "api");
-    await D(o, { recursive: !0 }), await k(u(o, "content"), JSON.stringify(r)), 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 o = h(n, "dist", "api");
+    await D(o, { recursive: !0 }), await w(h(o, "content"), JSON.stringify(r)), console.log(""), console.log(s.green("✅ Build complete! Output in dist/")), console.log(""), console.log("To preview the build:"), console.log(s.dim("  yarn preview")), console.log("");
   } catch (o) {
-    console.error(i.red("Build failed:"), o), process.exit(1);
+    console.error(s.red("Build failed:"), o), process.exit(1);
   }
 }
-async function ee(t) {
+async function ee(n) {
   const a = {
     locations: {},
     characters: {},
@@ -425,56 +429,56 @@ async function ee(t) {
     { dir: "journal", key: "journalEntries" },
     { dir: "interludes", key: "interludes" }
   ];
-  for (const { dir: s, key: e } of o) {
-    const c = u(t, s);
+  for (const { dir: i, key: e } of o) {
+    const c = h(n, i);
     try {
       const l = await p(c);
       for (const d of l)
         if (g(d) === ".yaml" || g(d) === ".yml") {
-          const h = u(c, d), m = await f(h, "utf-8"), w = y(m);
-          w && w.id && (a[e][w.id] = w, r.set(w.id, b(process.cwd(), h)));
+          const u = h(c, d), m = await f(u, "utf-8"), E = b(m);
+          E && E.id && (a[e][E.id] = E, r.set(E.id, y(process.cwd(), u)));
         }
     } catch {
     }
   }
   try {
-    const s = u(t, "locales"), e = await p(s);
+    const i = h(n, "locales"), e = await p(i);
     for (const c of e)
       if (g(c) === ".yaml" || g(c) === ".yml") {
-        const l = u(s, c), d = await f(l, "utf-8"), h = y(d), m = c.replace(/\.(yaml|yml)$/, "");
-        a.locales[m] = h ?? {};
+        const l = h(i, c), d = await f(l, "utf-8"), u = b(d), m = c.replace(/\.(yaml|yml)$/, "");
+        a.locales[m] = u ?? {};
       }
   } catch {
   }
   try {
-    const s = u(t, "dialogues"), e = await p(s);
+    const i = h(n, "dialogues"), e = await p(i);
     for (const c of e)
       if (g(c) === ".dlg") {
-        const l = u(s, c), d = await f(l, "utf-8"), h = c.replace(".dlg", ""), m = E(d, h);
-        a.dialogues[m.id] = m, r.set(m.id, b(process.cwd(), l));
+        const l = h(i, c), d = await f(l, "utf-8"), u = c.replace(".dlg", ""), m = k(d, u);
+        a.dialogues[m.id] = m, r.set(m.id, y(process.cwd(), l));
       }
   } catch {
   }
-  let n = null;
+  let t = null;
   try {
-    const s = u(t, "game.yaml"), e = await f(s, "utf-8");
-    n = y(e);
+    const i = h(n, "game.yaml"), e = await f(i, "utf-8");
+    t = b(e);
   } catch {
-    n = { id: "game", startLocation: "", startTime: { day: 1, hour: 8 }, startFlags: {}, startVariables: {}, startInventory: [] };
+    t = { id: "game", startLocation: "", startTime: { day: 1, hour: 8 }, startFlags: {}, startVariables: {}, startInventory: [] };
   }
-  return { registry: a, fileMap: r, config: n };
+  return { registry: a, fileMap: r, config: t };
 }
-async function te() {
-  const t = process.cwd(), a = u(t, "content");
-  console.log(""), console.log(i.bold.magenta("🐾 Validating Doodle Engine content...")), console.log("");
+async function ne() {
+  const n = process.cwd(), a = h(n, "content");
+  console.log(""), console.log(s.bold.magenta("🐾 Validating Doodle Engine content...")), console.log("");
   try {
-    const { registry: r, fileMap: o } = await ne(a), n = I(r, o);
-    N(n), n.length > 0 && process.exit(1);
+    const { registry: r, fileMap: o } = await te(a), t = N(r, o);
+    I(t), t.length > 0 && process.exit(1);
   } catch (r) {
-    console.error(i.red("Error loading content:"), r), process.exit(1);
+    console.error(s.red("Error loading content:"), r), process.exit(1);
   }
 }
-async function ne(t) {
+async function te(n) {
   const a = {
     locations: {},
     characters: {},
@@ -492,33 +496,33 @@ async function ne(t) {
     { dir: "quests", key: "quests" },
     { dir: "journal", key: "journalEntries" }
   ];
-  for (const { dir: n, key: s } of o) {
-    const e = u(t, n);
+  for (const { dir: t, key: i } of o) {
+    const e = h(n, t);
     try {
       const c = await p(e);
       for (const l of c)
         if (g(l) === ".yaml" || g(l) === ".yml") {
-          const d = u(e, l), h = await f(d, "utf-8"), m = y(h);
-          m && m.id && (a[s][m.id] = m, r.set(m.id, b(process.cwd(), d)));
+          const d = h(e, l), u = await f(d, "utf-8"), m = b(u);
+          m && m.id && (a[i][m.id] = m, r.set(m.id, y(process.cwd(), d)));
         }
     } catch {
     }
   }
   try {
-    const n = u(t, "locales"), s = await p(n);
-    for (const e of s)
+    const t = h(n, "locales"), i = await p(t);
+    for (const e of i)
       if (g(e) === ".yaml" || g(e) === ".yml") {
-        const c = u(n, e), l = await f(c, "utf-8"), d = y(l), h = e.replace(/\.(yaml|yml)$/, "");
-        a.locales[h] = d ?? {};
+        const c = h(t, e), l = await f(c, "utf-8"), d = b(l), u = e.replace(/\.(yaml|yml)$/, "");
+        a.locales[u] = d ?? {};
       }
   } catch {
   }
   try {
-    const n = u(t, "dialogues"), s = await p(n);
-    for (const e of s)
+    const t = h(n, "dialogues"), i = await p(t);
+    for (const e of i)
       if (g(e) === ".dlg") {
-        const c = u(n, e), l = await f(c, "utf-8"), d = e.replace(".dlg", ""), h = E(l, d);
-        a.dialogues[h.id] = h, r.set(h.id, b(process.cwd(), c));
+        const c = h(t, e), l = await f(c, "utf-8"), d = e.replace(".dlg", ""), u = k(l, d);
+        a.dialogues[u.id] = u, r.set(u.id, y(process.cwd(), c));
       }
   } catch {
   }
@@ -557,14 +561,14 @@ dist
   },
   "include": ["src"]
 }
-`, se = `id: bartender
+`, ie = `id: bartender
 name: "@character.bartender.name"
 biography: "@character.bartender.bio"
 portrait: ""
 location: tavern
 dialogue: bartender_greeting
 stats: {}
-`, ie = `id: merchant
+`, se = `id: merchant
 name: "@character.merchant.name"
 biography: "@character.merchant.bio"
 portrait: ""
@@ -648,9 +652,9 @@ NODE order_drink
     GOTO after_drink
   END
 
-  # Try to bluff a free drink — launches the skill check dialogue (demonstrates: START dialogue)
+  # Try to bluff a free drink — rolls dice inline (demonstrates: ROLL + GOTO within one dialogue)
   CHOICE @bartender.choice.try_bluff
-    START dialogue bluff_check
+    GOTO bluff_attempt
   END
 
   # Always available as an out
@@ -658,6 +662,41 @@ NODE order_drink
     GOTO start
   END
 
+NODE bluff_attempt
+  # Roll happens immediately on entering this node — auto-advances to success or failure
+  ROLL bluffRoll 1 20
+  IF variableGreaterThan bluffRoll 14
+    GOTO bluff_success
+  END
+  GOTO bluff_failure
+
+NODE bluff_success
+  BARTENDER: @bluff.success.bartender
+  ADD relationship bartender 2
+  SET flag bluffedMarcus
+
+  CHOICE @bluff.choice.cheers
+    GOTO start
+  END
+
+NODE bluff_failure
+  BARTENDER: @bluff.failure.bartender
+
+  CHOICE @bluff.choice.fine_pay
+    REQUIRE variableGreaterThan gold 4
+    ADD variable gold -5
+    ADD variable _drinksBought 1
+    ADD variable reputation 1
+    SET flag hadDrink
+    ADD relationship bartender 1
+    NOTIFY @notification.bought_drink
+    GOTO start
+  END
+
+  CHOICE @bluff.choice.walk_away
+    GOTO start
+  END
+
 NODE after_drink
   BARTENDER: @bartender.after_drink
 
@@ -718,13 +757,17 @@ NODE work_done
 NODE farewell
   BARTENDER: @bartender.farewell
   END dialogue
-`, le = `# Skill check example — demonstrates dice rolling and variable interpolation.
+`, le = `# Standalone skill-check demo — demonstrates dice syntax in isolation.
 #
 # ROLL <variable> <min> <max>  — rolls a random integer and stores it in a variable.
 # {varName}                    — in dialogue text, replaced with the variable's value.
 # roll <min> <max> <threshold> — condition: rolls and returns true if result >= threshold.
 #
-# This dialogue is NOT auto-triggered — start it from another node with:
+# The actual bluff check in this scaffold is inlined into bartender_greeting.dlg
+# so it can flow back into the bartender conversation (GOTO after_drink, GOTO start).
+#
+# Use START dialogue to launch a self-contained dialogue that doesn't need to
+# return to the caller. For example, from a CHOICE in another dialogue:
 #   START dialogue bluff_check
 
 NODE start
@@ -753,14 +796,31 @@ NODE resolve
   GOTO failure
 
 NODE success
-  NARRATOR: @bluff.success
+  NARRATOR: @bluff.success.narration
+  BARTENDER: @bluff.success.bartender
   ADD relationship bartender 2
   SET flag bluffedMarcus
-  END dialogue
+
+  CHOICE @bluff.choice.cheers
+    END dialogue
+  END
 
 NODE failure
-  NARRATOR: @bluff.failure
-  END dialogue
+  NARRATOR: @bluff.failure.narration
+  BARTENDER: @bluff.failure.bartender
+
+  # Still have to pay — or just walk away
+  CHOICE @bluff.choice.fine_pay
+    REQUIRE variableGreaterThan gold 4
+    ADD variable gold -5
+    SET flag hadDrink
+    NOTIFY @notification.bought_drink
+    END dialogue
+  END
+
+  CHOICE @bluff.choice.walk_away
+    END dialogue
+  END
 `, de = `# One-time narrator intro for the market. Same pattern as tavern_intro.dlg.
 
 TRIGGER market
@@ -958,11 +1018,11 @@ stats: {}
 title: "@journal.market_square.title"
 text: "@journal.market_square.text"
 category: places
-`, ye = `id: odd_jobs_accepted
+`, be = `id: odd_jobs_accepted
 title: "@journal.odd_jobs_accepted.title"
 text: "@journal.odd_jobs_accepted.text"
 category: quests
-`, be = `id: tavern_discovery
+`, ye = `id: tavern_discovery
 title: "@journal.tavern_discovery.title"
 text: "@journal.tavern_discovery.text"
 category: places
@@ -1104,21 +1164,26 @@ bluff.choice.attempt: "Try to bluff him."
 bluff.choice.back_down: "Actually, never mind."
 bluff.backed_down: "Some fights aren't worth picking."
 bluff.rolled: "You spin the tale with {bluffRoll} on your roll — and Marcus listens carefully."
-bluff.success: "The story lands perfectly. Marcus laughs and slides a free drink across the bar. Not bad at all, he admits."
-bluff.failure: "Marcus raises an eyebrow, entirely unconvinced. That will be five gold, he says flatly."
-`, we = `id: market
+bluff.success.narration: "The story lands perfectly. Marcus laughs and slides a free drink across the bar."
+bluff.success.bartender: "Sure, this one's on the house."
+bluff.failure.narration: "Marcus raises an eyebrow, entirely unconvinced."
+bluff.failure.bartender: "Nope. That'll be five gold."
+bluff.choice.cheers: "Cheers!"
+bluff.choice.fine_pay: "Fine. Here's five gold."
+bluff.choice.walk_away: "Never mind then."
+`, Ee = `id: market
 name: "@location.market.name"
 description: "@location.market.description"
 banner: ""
 music: ""
 ambient: ""
-`, ke = `id: tavern
+`, we = `id: tavern
 name: "@location.tavern.name"
 description: "@location.tavern.description"
 banner: ""
 music: ""
 ambient: ""
-`, Ee = `id: town
+`, ke = `id: town
 name: "@map.town.name"
 image: ""
 scale: 1
@@ -1268,7 +1333,7 @@ export function App() {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
-`, Ie = `import { StrictMode } from 'react'
+`, Ne = `import { StrictMode } from 'react'
 import { createRoot } from 'react-dom/client'
 import { App } from './App'
 import './index.css'
@@ -1278,12 +1343,12 @@ createRoot(document.getElementById('root')!).render(
     <App />
   </StrictMode>,
 )
-`, O = "🐾", Ne = "🐕", j = "🦴", Ce = "✨", x = "📁", T = "✅", Re = "🚀", A = /* @__PURE__ */ Object.assign({
+`, O = "🐾", Ie = "🐕", j = "🦴", Ce = "✨", G = "📁", T = "✅", Re = "🚀", A = /* @__PURE__ */ Object.assign({
   "./templates/_root/_gitignore": oe,
   "./templates/_root/index.html": ae,
   "./templates/_root/tsconfig.json": re,
-  "./templates/content/characters/bartender.yaml": se,
-  "./templates/content/characters/merchant.yaml": ie,
+  "./templates/content/characters/bartender.yaml": ie,
+  "./templates/content/characters/merchant.yaml": se,
   "./templates/content/dialogues/bartender_greeting.dlg": ce,
   "./templates/content/dialogues/bluff_check.dlg": le,
   "./templates/content/dialogues/market_intro.dlg": de,
@@ -1293,20 +1358,20 @@ createRoot(document.getElementById('root')!).render(
   "./templates/content/interludes/chapter_one.yaml": ge,
   "./templates/content/items/old_coin.yaml": fe,
   "./templates/content/journal/market_square.yaml": pe,
-  "./templates/content/journal/odd_jobs_accepted.yaml": ye,
-  "./templates/content/journal/tavern_discovery.yaml": be,
+  "./templates/content/journal/odd_jobs_accepted.yaml": be,
+  "./templates/content/journal/tavern_discovery.yaml": ye,
   "./templates/content/locales/en.yaml": _e,
-  "./templates/content/locations/market.yaml": we,
-  "./templates/content/locations/tavern.yaml": ke,
-  "./templates/content/maps/town.yaml": Ee,
+  "./templates/content/locations/market.yaml": Ee,
+  "./templates/content/locations/tavern.yaml": we,
+  "./templates/content/maps/town.yaml": ke,
   "./templates/content/quests/odd_jobs.yaml": ve,
   "./templates/src/App.custom.tsx": Oe,
   "./templates/src/App.default.tsx": De,
   "./templates/src/index.css": Te,
-  "./templates/src/main.tsx": Ie
+  "./templates/src/main.tsx": Ne
 });
-function Ae(t) {
-  const a = t.replace("./templates/", "");
+function Ae(n) {
+  const a = n.replace("./templates/", "");
   if (a === "src/App.default.tsx" || a === "src/App.custom.tsx") return null;
   if (a.startsWith("_root/")) {
     const r = a.slice(6);
@@ -1314,19 +1379,19 @@ function Ae(t) {
   }
   return a;
 }
-async function Se(t) {
-  const a = u(process.cwd(), t);
-  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(`  ${Ne} Creating new game: ${i.bold.cyan(t)}`), console.log("");
+async function Se(n) {
+  const a = h(process.cwd(), n);
+  console.log(""), console.log(s.bold.magenta(`  ${O} Doodle Engine ${O}`)), console.log(s.dim("  Text-based RPG and Adventure Game Scaffolder")), console.log(""), console.log(`  ${Ie} Creating new game: ${s.bold.cyan(n)}`), console.log("");
   const { useDefaultRenderer: r } = await F({
     type: "confirm",
     name: "useDefaultRenderer",
     message: "Use default renderer?",
     initial: !0
   });
-  r === void 0 && (console.log(i.yellow(`
-  ${j} No worries, maybe next time! Woof!`)), process.exit(0)), console.log(""), await je(a, t, r), console.log(""), console.log(i.bold.green(`  ${T} Project created successfully!`)), console.log(""), console.log(i.dim(`  ${x} ${a}`)), console.log(""), console.log(i.bold("  Next steps:")), console.log(i.cyan(`    cd ${t}`)), 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(`  ${Re} Happy game making! ${O}`)), console.log("");
+  r === void 0 && (console.log(s.yellow(`
+  ${j} No worries, maybe next time! Woof!`)), process.exit(0)), console.log(""), await je(a, n, r), console.log(""), console.log(s.bold.green(`  ${T} Project created successfully!`)), console.log(""), console.log(s.dim(`  ${G} ${a}`)), console.log(""), console.log(s.bold("  Next steps:")), console.log(s.cyan(`    cd ${n}`)), console.log(s.cyan("    npm install       ") + s.dim("# or: yarn install / pnpm install")), console.log(s.cyan("    npm run dev        ") + s.dim("# or: yarn dev / pnpm dev")), console.log(""), console.log(s.dim(`  ${Re} Happy game making! ${O}`)), console.log("");
 }
-async function je(t, a, r) {
+async function je(n, a, r) {
   const o = [
     "content/locations",
     "content/characters",
@@ -1346,11 +1411,11 @@ async function je(t, a, r) {
     "assets/audio/voice",
     "src"
   ];
-  console.log(`  ${x} ${i.bold("Creating directories...")}`);
+  console.log(`  ${G} ${s.bold("Creating directories...")}`);
   for (const e of o)
-    await D(u(t, e), { recursive: !0 });
-  console.log(i.green(`  ${T} Directories created`)), console.log("");
-  const n = {
+    await D(h(n, e), { recursive: !0 });
+  console.log(s.green(`  ${T} Directories created`)), console.log("");
+  const t = {
     name: a,
     version: "0.1.0",
     type: "module",
@@ -1374,20 +1439,20 @@ async function je(t, a, r) {
       vite: "^6.0.0"
     }
   };
-  console.log(`  ${Ce} ${i.bold("Writing project files...")}`), await k(u(t, "package.json"), JSON.stringify(n, null, 2));
+  console.log(`  ${Ce} ${s.bold("Writing project files...")}`), await w(h(n, "package.json"), JSON.stringify(t, null, 2));
   for (const [e, c] of Object.entries(A)) {
     const l = Ae(e);
     if (l === null) continue;
-    const d = u(t, l);
-    await D(M(d), { recursive: !0 }), await k(d, c);
+    const d = h(n, l);
+    await D(M(d), { recursive: !0 }), await w(d, c);
   }
-  const s = r ? "./templates/src/App.default.tsx" : "./templates/src/App.custom.tsx";
-  await k(u(t, "src/App.tsx"), A[s]), console.log(i.green(`  ${T} Source files created`)), console.log(""), console.log(`  ${j} ${i.bold("Starter content written")}`), 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 with 2 locations)")), console.log(i.dim("    1 quest      (odd jobs, 3 stages)")), console.log(i.dim("    3 journal entries")), console.log(i.dim("    1 interlude  (chapter one, auto-triggers at tavern)")), console.log(i.dim("    5 dialogues  (2 narrator intros, 2 NPC conversations, 1 skill check)")), console.log(i.dim("    English locale with all strings"));
+  const i = r ? "./templates/src/App.default.tsx" : "./templates/src/App.custom.tsx";
+  await w(h(n, "src/App.tsx"), A[i]), console.log(s.green(`  ${T} Source files created`)), console.log(""), console.log(`  ${j} ${s.bold("Starter content written")}`), console.log(""), console.log(s.dim("  Content includes:")), console.log(s.dim("    2 locations  (tavern, market)")), console.log(s.dim("    2 characters (bartender, merchant)")), console.log(s.dim("    1 item       (old coin)")), console.log(s.dim("    1 map        (town with 2 locations)")), console.log(s.dim("    1 quest      (odd jobs, 3 stages)")), console.log(s.dim("    3 journal entries")), console.log(s.dim("    1 interlude  (chapter one, auto-triggers at tavern)")), console.log(s.dim("    5 dialogues  (2 narrator intros, 2 NPC conversations, 1 skill check)")), console.log(s.dim("    English locale with all strings"));
 }
-const _ = new q();
-_.name("doodle").description(i.magenta("🐾 Doodle Engine") + i.dim(" — Narrative RPG development tools")).version("0.0.1");
-_.command("create <project-name>").description("Scaffold a new Doodle Engine game project").action(async (t) => {
-  await Se(t);
+const _ = new x();
+_.name("doodle").description(s.magenta("🐾 Doodle Engine") + s.dim(" — Narrative RPG development tools")).version("0.0.1");
+_.command("create <project-name>").description("Scaffold a new Doodle Engine game project").action(async (n) => {
+  await Se(n);
 });
 _.command("dev").description("Start development server with hot reload").action(async () => {
   await V();
@@ -1396,6 +1461,6 @@ _.command("build").description("Build game for production").action(async () => {
   await Z();
 });
 _.command("validate").description("Validate game content").action(async () => {
-  await te();
+  await ne();
 });
 _.parse();