@shivaedev/work-board 0.6.0 → 0.6.1

package/CHANGELOG.md

@@ -4,8 +4,26 @@
 
 ### Changed
 
+- Prepare concrete step 11 visual-document source examples for discussion; the
+  proposed block conventions are not implemented or approved yet.
 - Record the approved Platform-first live client direction and its actual shared HTTP/browser fixture evidence; Work Board adopts that foundation in 0.5.0 below.
 
+## 0.6.1 - 2026-10-06
+
+### Changed
+
+- Adopt Antumbra's `react-markdown` and `remark-gfm` rendering stack on the
+  server, retaining no-JavaScript reading, local links/images, generated heading
+  anchors, scoped footnotes, raw-HTML details and Shiki highlighting. Search uses
+  the same Markdown/GFM processing and heading rules as the reader. Rendering
+  and search plugins now use unified transformers rather than Satteri visitors;
+  Satteri remains only for legacy heading-board source segmentation.
+- Match Antumbra's Mermaid error-rendering setting so parse failures show a local
+  diagnostic/source without inserting Mermaid's global error diagram. Existing
+  local assets, strict rendering and visual inspection remain available.
+- Keep the custom step 11 metric/progress/timeline source-format proposal open;
+  the renderer adoption does not settle that authoring contract.
+
 ## 0.6.0 - 2026-10-06
 
 ### Added

package/README.md

@@ -394,3 +394,11 @@ sets the waves, acceptance criteria, and open design decisions.
 [Experience designs and mockups](https://github.com/ShivaeDev/platform/blob/main/packages/work-board/docs/vision/experience.md)
 illustrate the target with fictional data. These are future plans; the sections
 above describe the package's current behavior.
+
+### Markdown rendering
+
+Work Board uses Antumbra's `react-markdown` and `remark-gfm` libraries for
+server-rendered Markdown, with locally served Mermaid for ordinary `mermaid`
+fences. Existing local links, images, heading anchors, footnotes, raw-HTML details
+and Shiki code highlighting remain available without React client state. Mermaid
+rendering and inspection need JavaScript; its source remains readable without it.

package/dist/cli.js

@@ -3,7 +3,7 @@ import { NodeRuntime, NodeServices } from "@effect/platform-node";
 import { Effect, Layer, Option, Path } from "effect";
 import { Argument, Command, Flag } from "effect/unstable/cli";
 import { HOST, serveBoard } from "./serve.js";
-const VERSION = "0.6.0";
+const VERSION = "0.6.1";
 const serve = Effect.fn("WorkBoard.serve")(function* (input) {
     const path = yield* Path.Path;
     return yield* Layer.launch(serveBoard({ home: Option.getOrUndefined(input.home), port: input.port, root: path.resolve(input.dir) }));

package/dist/page/diagrams.d.ts

@@ -1,2 +1,2 @@
-export declare const diagrams = "\nimport { diagramTools } from \"/_board/visuals.js\";\nconst rendered = new Map();\nconst dark = matchMedia(\"(prefers-color-scheme: dark)\");\nlet mermaid;\nlet counter = 0;\n\nconst token = (name) => getComputedStyle(document.documentElement).getPropertyValue(name).trim();\n\nconst load = async () => {\n  mermaid ??= (await import(\"/_board/mermaid/mermaid.esm.min.mjs\")).default;\n  mermaid.initialize({\n    startOnLoad: false,\n    securityLevel: \"strict\",\n    theme: \"base\",\n    themeVariables: {\n      darkMode: schemeNow() === \"dark\",\n      background: token(\"--bg\"),\n      primaryColor: token(\"--surface\"),\n      primaryTextColor: token(\"--text\"),\n      primaryBorderColor: token(\"--border\"),\n      lineColor: token(\"--muted\"),\n      textColor: token(\"--text\"),\n      fontFamily: token(\"--sans\"),\n    },\n  });\n  return mermaid;\n};\n\nconst schemeNow = () => document.documentElement.dataset.scheme ?? (dark.matches ? \"dark\" : \"light\");\nlet lastScheme = schemeNow();\n\nconst draw = async (figure) => {\n  const source = figure.querySelector(\".diagram-source\").textContent;\n  const scheme = schemeNow();\n  const key = scheme + \":\" + source;\n  if (!rendered.has(key)) {\n    rendered.set(key, load().then((engine) => engine.render(\"diagram-\" + ++counter, source)).then((result) => result.svg));\n  }\n  try {\n    const svg = await rendered.get(key);\n    if (scheme !== schemeNow()) {\n      rendered.delete(key);\n      return;\n    }\n    figure.querySelector(\".diagram-svg\")?.remove();\n    figure.querySelector(\"[data-diagram-error]\")?.remove();\n    figure.insertAdjacentHTML(\"afterbegin\", '<div class=\"diagram-svg\">' + svg + \"</div>\");\n    figure.dataset.state = \"drawn\";\n    diagramTools(figure);\n  } catch (error) {\n    rendered.delete(key);\n    if (scheme !== schemeNow()) return;\n    figure.querySelector(\".diagram-svg\")?.remove();\n    figure.dataset.state = \"failed\";\n    figure.dataset.error = String(error?.message ?? error);\n    figure.querySelector(\"[data-diagram-error]\")?.remove();\n    const message = document.createElement(\"p\"); message.setAttribute(\"data-diagram-error\", \"\"); message.setAttribute(\"role\", \"status\");\n    message.textContent = \"Diagram could not be drawn: \" + figure.dataset.error; figure.append(message);\n    diagramTools(figure);\n  }\n};\n\nconst forget = (root) => {\n  const shown = new Set([...root.querySelectorAll(\"figure.diagram .diagram-source\")].map((source) => source.textContent));\n  for (const key of rendered.keys()) {\n    if (!shown.has(key.slice(key.indexOf(\":\") + 1))) rendered.delete(key);\n  }\n};\n\nexport const renderDiagrams = (root, selector = \"figure.diagram:not([data-state=drawn])\") => {\n  forget(root);\n  return Promise.all([...root.querySelectorAll(selector)].map(draw));\n};\n\nconst themeChanged = () => {\n  const scheme = schemeNow();\n  if (lastScheme === scheme) return;\n  lastScheme = scheme;\n  const doc = document.getElementById(\"doc\");\n  if (doc) doc.dataset.scheme = scheme;\n  mermaid = undefined;\n  renderDiagrams(document, \"figure.diagram\");\n};\ndocument.addEventListener(\"board-theme\", themeChanged);\ndark.addEventListener(\"change\", themeChanged);\n";
+export declare const diagrams = "\nimport { diagramTools } from \"/_board/visuals.js\";\nconst rendered = new Map();\nconst dark = matchMedia(\"(prefers-color-scheme: dark)\");\nlet mermaid;\nlet counter = 0;\n\nconst token = (name) => getComputedStyle(document.documentElement).getPropertyValue(name).trim();\n\nconst load = async () => {\n  mermaid ??= (await import(\"/_board/mermaid/mermaid.esm.min.mjs\")).default;\n  mermaid.initialize({\n    startOnLoad: false,\n    suppressErrorRendering: true,\n    securityLevel: \"strict\",\n    theme: \"base\",\n    themeVariables: {\n      darkMode: schemeNow() === \"dark\",\n      background: token(\"--bg\"),\n      primaryColor: token(\"--surface\"),\n      primaryTextColor: token(\"--text\"),\n      primaryBorderColor: token(\"--border\"),\n      lineColor: token(\"--muted\"),\n      textColor: token(\"--text\"),\n      fontFamily: token(\"--sans\"),\n    },\n  });\n  return mermaid;\n};\n\nconst schemeNow = () => document.documentElement.dataset.scheme ?? (dark.matches ? \"dark\" : \"light\");\nlet lastScheme = schemeNow();\n\nconst draw = async (figure) => {\n  const source = figure.querySelector(\".diagram-source\").textContent;\n  const scheme = schemeNow();\n  const key = scheme + \":\" + source;\n  if (!rendered.has(key)) {\n    rendered.set(key, load().then((engine) => engine.render(\"diagram-\" + ++counter, source)).then((result) => result.svg));\n  }\n  try {\n    const svg = await rendered.get(key);\n    if (scheme !== schemeNow()) {\n      rendered.delete(key);\n      return;\n    }\n    figure.querySelector(\".diagram-svg\")?.remove();\n    figure.querySelector(\"[data-diagram-error]\")?.remove();\n    figure.insertAdjacentHTML(\"afterbegin\", '<div class=\"diagram-svg\">' + svg + \"</div>\");\n    figure.dataset.state = \"drawn\";\n    diagramTools(figure);\n  } catch (error) {\n    rendered.delete(key);\n    if (scheme !== schemeNow()) return;\n    figure.querySelector(\".diagram-svg\")?.remove();\n    figure.dataset.state = \"failed\";\n    figure.dataset.error = String(error?.message ?? error);\n    figure.querySelector(\"[data-diagram-error]\")?.remove();\n    const message = document.createElement(\"p\"); message.setAttribute(\"data-diagram-error\", \"\"); message.setAttribute(\"role\", \"status\");\n    message.textContent = \"Diagram could not be drawn: \" + figure.dataset.error; figure.append(message);\n    diagramTools(figure);\n  }\n};\n\nconst forget = (root) => {\n  const shown = new Set([...root.querySelectorAll(\"figure.diagram .diagram-source\")].map((source) => source.textContent));\n  for (const key of rendered.keys()) {\n    if (!shown.has(key.slice(key.indexOf(\":\") + 1))) rendered.delete(key);\n  }\n};\n\nexport const renderDiagrams = (root, selector = \"figure.diagram:not([data-state=drawn])\") => {\n  forget(root);\n  return Promise.all([...root.querySelectorAll(selector)].map(draw));\n};\n\nconst themeChanged = () => {\n  const scheme = schemeNow();\n  if (lastScheme === scheme) return;\n  lastScheme = scheme;\n  const doc = document.getElementById(\"doc\");\n  if (doc) doc.dataset.scheme = scheme;\n  mermaid = undefined;\n  renderDiagrams(document, \"figure.diagram\");\n};\ndocument.addEventListener(\"board-theme\", themeChanged);\ndark.addEventListener(\"change\", themeChanged);\n";
 //# sourceMappingURL=diagrams.d.ts.map

package/dist/page/diagrams.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diagrams.d.ts","sourceRoot":"","sources":["../../src/page/diagrams.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,QAAQ,4rGAsFpB,CAAC"}
+{"version":3,"file":"diagrams.d.ts","sourceRoot":"","sources":["../../src/page/diagrams.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,QAAQ,+tGAuFpB,CAAC"}

package/dist/page/diagrams.js

@@ -11,6 +11,7 @@ const load = async () => {
   mermaid ??= (await import("/_board/mermaid/mermaid.esm.min.mjs")).default;
   mermaid.initialize({
     startOnLoad: false,
+    suppressErrorRendering: true,
     securityLevel: "strict",
     theme: "base",
     themeVariables: {

package/dist/page/diagrams.js.map

@@ -1 +1 @@
-{"version":3,"file":"diagrams.js","sourceRoot":"","sources":["../../src/page/diagrams.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsFvB,CAAC"}
+{"version":3,"file":"diagrams.js","sourceRoot":"","sources":["../../src/page/diagrams.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuFvB,CAAC"}

package/dist/render/code.d.ts

@@ -1,10 +1,4 @@
-import type { Element } from "hast";
+import type { Root } from "hast";
 import { type Highlighter as Shiki } from "shiki";
-export declare const codeBlocks: (highlighter: Shiki) => {
-    element: {
-        filter: string[];
-        visit: (pre: Readonly<Element>) => Promise<import("hast").RootContent | undefined>;
-    };
-    name: string;
-};
+export declare const codeBlocks: (highlighter: Shiki) => () => (tree: Root) => Promise<void>;
 //# sourceMappingURL=code.d.ts.map

package/dist/render/code.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"code.d.ts","sourceRoot":"","sources":["../../src/render/code.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAkB,MAAM,MAAM,CAAC;AAEpD,OAAO,EAA0C,KAAK,WAAW,IAAI,KAAK,EAAE,MAAM,OAAO,CAAC;AAiC1F,eAAO,MAAM,UAAU,GAAI,aAAa,KAAK;;;;;;CAkB1C,CAAC"}
+{"version":3,"file":"code.d.ts","sourceRoot":"","sources":["../../src/render/code.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA2B,IAAI,EAAE,MAAM,MAAM,CAAC;AAC1D,OAAO,EAA0C,KAAK,WAAW,IAAI,KAAK,EAAE,MAAM,OAAO,CAAC;AA+C1F,eAAO,MAAM,UAAU,GAAI,aAAa,KAAK,YAAkB,MAAM,IAAI,kBAexE,CAAC"}

package/dist/render/code.js

@@ -1,5 +1,5 @@
-import { defineHastPlugin } from "satteri";
 import { bundledLanguages } from "shiki";
+import { visit as visitElements } from "unist-util-visit";
 import { THEMES } from "./highlighter.js";
 const languageOf = (code) => {
     const classes = code.properties.className;
@@ -26,22 +26,30 @@ const highlighted = async (highlighter, source, language) => {
     await highlighter.loadLanguage(language);
     return highlighter.codeToHast(source, { defaultColor: false, lang: language, themes: THEMES }).children.at(0);
 };
-export const codeBlocks = (highlighter) => defineHastPlugin({
-    element: {
-        filter: ["pre"],
-        visit: async (pre) => {
-            const [code] = pre.children;
-            if (code?.type !== "element" || code.tagName !== "code") {
-                return undefined;
-            }
-            const language = languageOf(code);
-            const source = textOf(code);
-            if (language === "mermaid") {
-                return diagram(source);
+async function renderedCode(highlighter, pre) {
+    const [code] = pre.children;
+    if (code?.type !== "element" || code.tagName !== "code") {
+        return undefined;
+    }
+    const language = languageOf(code);
+    const source = textOf(code);
+    if (language === "mermaid") {
+        return diagram(source);
+    }
+    return language === undefined ? undefined : await highlighted(highlighter, source, language);
+}
+export const codeBlocks = (highlighter) => () => async (tree) => {
+    const work = [];
+    visitElements(tree, "element", (pre, index, parent) => {
+        if (pre.tagName !== "pre" || index === undefined || parent === undefined) {
+            return;
+        }
+        work.push(renderedCode(highlighter, pre).then((result) => {
+            if (result?.type === "element") {
+                parent.children[index] = result;
             }
-            return language === undefined ? undefined : await highlighted(highlighter, source, language);
-        },
-    },
-    name: "work-board-code",
-});
+        }));
+    });
+    await Promise.all(work);
+};
 //# sourceMappingURL=code.js.map

package/dist/render/code.js.map

@@ -1 +1 @@
-{"version":3,"file":"code.js","sourceRoot":"","sources":["../../src/render/code.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"code.js","sourceRoot":"","sources":["../../src/render/code.ts"],"names":[],"mappings":"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"}