[pull] develop from mermaid-js:develop

.changeset/agentflow-redux-colors.md

@@ -0,0 +1,5 @@
+---
+'mermaid': minor
+---
+
+feat(agentflow): take the redux colour palette. Under `redux-color` and `redux-dark-color`, every agentflow node kind — tool, task, decision, input, refdoc, connector, action — gets its own colour from a fixed palette slot, so colour says what an element _is_ and stays put when the diagram is edited around it. Containers cycle a counter in declaration order, the way flowchart subgraphs do, from the slots above the kind range so a container frame never matches a node inside it. A collapsed container keeps its slot. `redux-dark-color` carries borders but no fills, so nodes there take palette strokes over the theme's own background. Agentflow also takes `redux-color` and `neo` as its own per-diagram defaults, so an agentflow diagram that sets neither renders with the palette; anything set in front matter, a directive or `initialize()` still wins.

.changeset/block-redux-color-palette.md

@@ -0,0 +1,5 @@
+---
+'mermaid': patch
+---
+
+fix(block): apply the redux colour palette to composite blocks. Composites now take a per-container colour under `redux-color` and `redux-dark-color`, matching how flowchart subgraphs are coloured — one counter over containers, in declaration order, with the plain shapes left on the flat theme colour. The palette is opt-in: block does not default to `redux-color` the way flowchart and several other diagram types do, so set `theme: redux-color` (or `redux-dark-color`) explicitly to see it. `classDef`/`style` still win.

.changeset/dark-theme-drift-and-palette-indexing.md

@@ -0,0 +1,5 @@
+---
+'mermaid': patch
+---
+
+fix(themes): `redux-dark`, `redux-dark-color` and `neo-dark` shipped `secondBkg` as the literal string `calculated`, so railroad rendered the invalid `fill: calculated`; it is now computed as `theme-dark` does. The same three themes had gantt done-task labels at 1.07:1 contrast — a light fill under their light task ink — now 5.7:1 or better. The ER and requirement stylesheets also validate `look` before interpolating it into a CSS selector.

.changeset/er-requirement-palette-css.md

@@ -2,9 +2,11 @@
 'mermaid': patch
 ---
 
-fix(er, requirement, timeline): stop the ER, requirement and timeline stylesheets emitting invalid CSS for the colour themes.
+fix(er, requirement, timeline): stop the ER, requirement and timeline stylesheets emitting CSS the browser discards for the colour themes.
 
-All three generate one rule per palette slot, looping to `THEME_COLOR_LIMIT` and indexing the palette by the loop counter. Indexing raw means a palette with fewer entries than that limit emits `stroke: undefined` for the overflow slots; all three now wrap at the palette length, and bail before the loop for an empty palette — wrapping alone is not enough there, because `i % 0` is `NaN` and `[][NaN]` is `undefined`.
+All three generate one rule per palette slot. ER and requirement looped to `THEME_COLOR_LIMIT` and indexed the palette by the loop counter, which goes wrong in both directions: a palette shorter than the limit emitted `stroke: undefined` for the overflow slots, and a palette _longer_ than it left entities stamped with a slot that had no rule at all, rendering unstyled beside coloured neighbours. Both now take the loop bound from the palette itself, which is the same length the boxes stamp with — so the rules emitted and the slots stamped cannot disagree. Both also bail before the loop for an empty palette, since wrapping alone is not enough there: `i % 0` is `NaN` and `[][NaN]` is `undefined`.
+
+Timeline keeps looping to `THEME_COLOR_LIMIT` and wrapping, because it numbers `.section-N` classes rather than palette slots — nothing stamps those, so the palette cycles across however many sections exist.
 
 `requirement` also emitted `fill: ;` — a property with no value, which is invalid — whenever there was no background palette. That is the live case for `redux-dark-color`, which ships a border palette and no background palette so that it colours outlines only. The declaration is now omitted instead.
 

.changeset/per-diagram-appearance-defaults.md

@@ -0,0 +1,7 @@
+---
+'mermaid': minor
+---
+
+**`theme`, `look` and `layout` can now be set per diagram type**, in each diagram's config section — `mermaid.initialize({ look: 'classic', flowchart: { look: 'handDrawn' } })`, or the same under `config` in front matter. The schema uses the same mechanism to give a diagram type its own default. Resolution, highest first: front matter or directive, `initialize()`, the diagram type's default, the global default; a diagram-scoped value beats a global one set in the same layer.
+
+Swimlanes take `layout: swimlane` from that schema default instead of having it forced by their `init` hook, so `swimlane: { layout: ... }` and a `layout` in front matter are now honoured. An unregistered layout also always falls back to `dagre` with a warning rather than throwing — state diagrams skipped that fallback, and mindmaps threw when `cose-bilkent` was absent, as it is in `@mermaid-js/tiny`.

.changeset/redux-color-becomes-default-theme.md

@@ -0,0 +1,7 @@
+---
+'mermaid': major
+---
+
+**`redux-color` is now the default theme and `neo` the default look for ten diagram types** — flowchart, swimlane, class, ER, requirement, sequence, state, use case, Venn and agentflow. Those rendered without an explicit `theme` and `look` change appearance; every other diagram type keeps `default` and `classic`. To keep the previous appearance, set both explicitly — `mermaid.initialize({ theme: 'default', look: 'classic' })`, or the same two keys under `config` in front matter.
+
+An unrecognised `theme` name now resolves to the default theme in name as well as in variables; previously the invalid name stayed in place while the default's variables were loaded, and every palette-aware stylesheet gates on the name. `theme: 'null'`, the documented way to disable the pre-defined themes, is unaffected. Note that `neo` paints node strokes with a gradient when the theme sets `useGradient`, which `base` does; setting a custom `nodeBorder` on `base` turns the gradient off.

.changeset/redux-color-state-composites.md

@@ -0,0 +1,11 @@
+---
+'mermaid': minor
+---
+
+feat(themes): composite states now take a per-container colour under the `redux-color` and `redux-dark-color` themes, as flowchart subgraphs already do. Each composite gets the palette's border colour on its outline and its background tint behind the title strip; nested composites each take the next colour, so depth stays readable. The body keeps the theme's own `compositeBackground`. `redux-dark-color` colours the outlines only, matching how it treats ER, requirement and sequence.
+
+The concurrency regions produced by a `--` divider share the colour of the composite they split, rather than taking one of their own — the author wrote a single composite, so it is drawn as one thing in parts. Adding a `--` therefore leaves every other composite's colour untouched.
+
+Under the `handDrawn` look, concurrency regions are now filled solid rather than hatched, so that they can carry the palette tint the same way every other look does.
+
+States inside a composite stay uniform. A composite carrying its own `classDef` or `style` keeps those colours and takes no palette slot, and neither do its concurrency regions; the slot is still spent, so styling one composite does not shift the colours of the ones after it. Note that this opt-out is all-or-nothing: a `classDef` that sets only text properties, such as `font-weight`, still takes that composite out of the palette.

.changeset/redux-color-swimlane-lanes.md

@@ -0,0 +1,5 @@
+---
+'mermaid': minor
+---
+
+feat(themes): swimlane lanes take a per-lane colour under the `redux-color` and `redux-dark-color` themes, cycling every 12 as flowchart subgraphs do. The lane holding ungrouped nodes takes its own slot and now follows the diagram's `look`.

.changeset/redux-color-venn.md

@@ -0,0 +1,5 @@
+---
+'mermaid': patch
+---
+
+fix(themes): venn circles follow the `redux-color` and `redux-dark-color` palettes. Neither theme defined any `venn*` variable, so every circle rendered in one flat colour.

.changeset/sequence-neo-redux-fixes.md

@@ -0,0 +1,10 @@
+---
+'mermaid': patch
+---
+
+fix: sequence diagram actors under the `neo` look and `redux` themes. Notes no longer render bold,
+a `rect` section band is no longer drawn white on white, and participants follow one vertical
+model: every lifeline starts and ends on a shared line, all participant glyphs are one size with
+their feet on a common edge, single-line labels share one baseline in the header and in the
+mirrored footer, and a multiline label grows away from the lifeline instead of moving it. The
+`classic` look is unchanged.

.changeset/usecase-role-colors.md

@@ -0,0 +1,5 @@
+---
+'mermaid': minor
+---
+
+feat(usecase): use case diagrams now take colour by role — actors, use cases and system boundaries each get their own colour from the new `usecaseActorBkg`/`usecaseActorBorder`, `usecaseBkg`/`usecaseBorder` and `usecaseBoundaryBkg`/`usecaseBoundaryBorder` theme variables, with `usecaseIncludeLine`/`usecaseExtendLine` separating the two dashed relationship kinds by hue. `redux-color` and `redux-dark-color` set them; every other theme is unchanged. Colour is keyed to the kind of element, so editing a diagram never recolours the elements around the edit. Set `usecase.colorScheme: 'rotate'` for the per-element palette cycle instead, and `classDef`/`style` still wins over both.

.esbuild/dev-explorer/diagram-viewer.ts

@@ -103,9 +103,12 @@
   | 'forest'
   | 'neutral'
   | 'base'
+  | 'neo'
+  | 'neo-dark'
   | 'redux'
   | 'redux-dark'
-  | 'redux-color';
+  | 'redux-color'
+  | 'redux-dark-color';
 type MermaidLayout = 'dagre' | 'elk' | 'domus' | 'hola' | 'swimlane';
 type MermaidLook = 'classic' | 'handDrawn' | 'neo';
 type MermaidLogLevel = 'trace' | 'debug' | 'info' | 'warn' | 'error' | 'fatal';
@@ -292,9 +295,12 @@
     v === 'forest' ||
     v === 'neutral' ||
     v === 'base' ||
+    v === 'neo' ||
+    v === 'neo-dark' ||
     v === 'redux' ||
     v === 'redux-dark' ||
-    v === 'redux-color'
+    v === 'redux-color' ||
+    v === 'redux-dark-color'
   );
 }
 
@@ -620,14 +626,14 @@
     this.activeTab = tab;
     if (tab === 'code') {
       void this.updateComplete.then(() => {
         const editor = this.querySelector('dev-code-editor') as any;
         editor?.requestMeasure?.();
       });
     }
   }
 
   #syncConsolePanelFilters() {
     const panel = this.querySelector('dev-console-panel') as any;
     if (!panel) return;
     // This is intentionally opinionated: less noise by default as logLevel increases.
     if (
@@ -653,7 +659,7 @@
   }
 
   #appendLog(entry: LogEntry) {
     const panel = this.querySelector('dev-console-panel') as any;
     panel?.append?.(entry);
   }
 
@@ -681,11 +687,11 @@
     // Capture those too (map debug/info/log -> panel "info").
     console.log = (...args) => {
       capture('info', args);
       this.#originalConsole!.log.apply(console, args as any);
     };
     console.info = (...args) => {
       capture('info', args);
       this.#originalConsole!.info.apply(console, args as any);
     };
     console.debug = (...args) => {
       capture('info', args);
@@ -1245,9 +1251,12 @@
               <sl-option value="forest">forest</sl-option>
               <sl-option value="neutral">neutral</sl-option>
               <sl-option value="base">base</sl-option>
+              <sl-option value="neo">neo</sl-option>
+              <sl-option value="neo-dark">neo-dark</sl-option>
               <sl-option value="redux">redux</sl-option>
               <sl-option value="redux-dark">redux-dark</sl-option>
               <sl-option value="redux-color">redux-color</sl-option>
+              <sl-option value="redux-dark-color">redux-dark-color</sl-option>
             </sl-select>
           </div>
 

.esbuild/dev-explorer/public/styles.css

@@ -366,7 +366,9 @@ dev-explorer-app .diagram-inner > svg {
 }
 
 dev-explorer-app .diagram-inner[data-theme='dark'],
-dev-explorer-app .diagram-inner[data-theme='redux-dark'] {
+dev-explorer-app .diagram-inner[data-theme='neo-dark'],
+dev-explorer-app .diagram-inner[data-theme='redux-dark'],
+dev-explorer-app .diagram-inner[data-theme='redux-dark-color'] {
   background: #0b1020;
   color: #e8eefc;
 }

docs/config/setup/config/README.md

@@ -26,5 +26,6 @@
 - [sanitize](functions/sanitize.md)
 - [saveConfigFromInitialize](functions/saveConfigFromInitialize.md)
 - [~~setConfig~~](functions/setConfig.md)
+- [setDiagramConfigScope](functions/setDiagramConfigScope.md)
 - [setSiteConfig](functions/setSiteConfig.md)
 - [updateSiteConfig](functions/updateSiteConfig.md)

docs/config/setup/config/functions/addDirective.md

@@ -12,7 +12,7 @@
 
 > **addDirective**(`directive`): `void`
 
-Defined in: [packages/mermaid/src/config.ts:173](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L173)
+Defined in: [packages/mermaid/src/config.ts:277](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L277)
 
 Pushes in a directive to the configuration
 

docs/config/setup/config/functions/evaluate.md

@@ -12,7 +12,7 @@
 
 > **evaluate**(`val?`): `boolean`
 
-Defined in: [packages/mermaid/src/config.ts:16](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L16)
+Defined in: [packages/mermaid/src/config.ts:62](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L62)
 
 Converts a string/boolean into a boolean
 

docs/config/setup/config/functions/getConfig.md

@@ -12,7 +12,7 @@
 
 > **getConfig**(): [`MermaidConfig`](../../mermaid/interfaces/MermaidConfig.md)
 
-Defined in: [packages/mermaid/src/config.ts:120](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L120)
+Defined in: [packages/mermaid/src/config.ts:224](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L224)
 
 Returns a copy of the `currentConfig`.
 

docs/config/setup/config/functions/getEffectiveHtmlLabels.md

@@ -12,7 +12,7 @@
 
 > **getEffectiveHtmlLabels**(`config`): `boolean`
 
-Defined in: [packages/mermaid/src/config.ts:246](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L246)
+Defined in: [packages/mermaid/src/config.ts:352](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L352)
 
 Helper function to handle deprecated flowchart.htmlLabels
 

docs/config/setup/config/functions/getSiteConfig.md

@@ -12,7 +12,7 @@
 
 > **getSiteConfig**(): [`MermaidConfig`](../../mermaid/interfaces/MermaidConfig.md)
 
-Defined in: [packages/mermaid/src/config.ts:94](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L94)
+Defined in: [packages/mermaid/src/config.ts:198](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L198)
 
 Returns a copy of the current `siteConfig` base configuration.
 

docs/config/setup/config/functions/getUserDefinedConfig.md

@@ -12,7 +12,7 @@
 
 > **getUserDefinedConfig**(): [`MermaidConfig`](../../mermaid/interfaces/MermaidConfig.md)
 
-Defined in: [packages/mermaid/src/config.ts:227](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L227)
+Defined in: [packages/mermaid/src/config.ts:333](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L333)
 
 ## Returns
 

docs/config/setup/config/functions/reset.md

@@ -12,7 +12,7 @@
 
 > **reset**(`config`): `void`
 
-Defined in: [packages/mermaid/src/config.ts:194](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L194)
+Defined in: [packages/mermaid/src/config.ts:298](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L298)
 
 Resets the current config and applied directives to the provided config.
 

docs/config/setup/config/functions/sanitize.md

@@ -12,7 +12,7 @@
 
 > **sanitize**(`options`): `void`
 
-Defined in: [packages/mermaid/src/config.ts:131](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L131)
+Defined in: [packages/mermaid/src/config.ts:235](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L235)
 
 Ensures options parameter does not attempt to override `siteConfig` secure keys.
 

docs/config/setup/config/functions/saveConfigFromInitialize.md

@@ -12,7 +12,7 @@
 
 > **saveConfigFromInitialize**(`conf`): `void`
 
-Defined in: [packages/mermaid/src/config.ts:78](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L78)
+Defined in: [packages/mermaid/src/config.ts:181](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L181)
 
 ## Parameters
 

docs/config/setup/config/functions/setConfig.md

@@ -12,7 +12,7 @@
 
 > **setConfig**(`conf`): [`MermaidConfig`](../../mermaid/interfaces/MermaidConfig.md)
 
-Defined in: [packages/mermaid/src/config.ts:106](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L106)
+Defined in: [packages/mermaid/src/config.ts:210](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L210)
 
 Updates the `currentConfig` with the provided `conf` after sanitization.
 

docs/config/setup/config/functions/setDiagramConfigScope.md

@@ -0,0 +1,29 @@
+> **Warning**
+>
+> ## THIS IS AN AUTOGENERATED FILE. DO NOT EDIT.
+>
+> ## Please edit the corresponding file in [/packages/mermaid/src/docs/config/setup/config/functions/setDiagramConfigScope.md](../../../../../packages/mermaid/src/docs/config/setup/config/functions/setDiagramConfigScope.md).
+
+[**mermaid**](../../README.md)
+
+---
+
+# Function: setDiagramConfigScope()
+
+> **setDiagramConfigScope**(`diagramType?`): `void`
+
+Defined in: [packages/mermaid/src/config.ts:150](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L150)
+
+Names the diagram type being parsed or rendered, so its own appearance defaults apply.
+
+## Parameters
+
+### diagramType?
+
+`string`
+
+The type `detectType` returned, e.g. `flowchart-v2`; `undefined` to leave scope.
+
+## Returns
+
+`void`

docs/config/setup/config/functions/setSiteConfig.md

@@ -12,7 +12,7 @@
 
 > **setSiteConfig**(`conf`): [`MermaidConfig`](../../mermaid/interfaces/MermaidConfig.md)
 
-Defined in: [packages/mermaid/src/config.ts:64](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L64)
+Defined in: [packages/mermaid/src/config.ts:164](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L164)
 
 Sets the `siteConfig` to the desired values.
 

docs/config/setup/config/functions/updateSiteConfig.md

@@ -12,7 +12,7 @@
 
 > **updateSiteConfig**(`conf`): [`MermaidConfig`](../../mermaid/interfaces/MermaidConfig.md)
 
-Defined in: [packages/mermaid/src/config.ts:82](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L82)
+Defined in: [packages/mermaid/src/config.ts:185](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L185)
 
 ## Parameters
 

docs/config/setup/config/variables/defaultConfig.md

@@ -12,4 +12,4 @@
 
 > `const` **defaultConfig**: [`MermaidConfig`](../../mermaid/interfaces/MermaidConfig.md)
 
-Defined in: [packages/mermaid/src/config.ts:8](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L8)
+Defined in: [packages/mermaid/src/config.ts:9](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L9)

docs/config/setup/defaultConfig/variables/configKeys.md

@@ -12,4 +12,4 @@
 
 > `const` **configKeys**: `Set`<`string`>
 
-Defined in: [packages/mermaid/src/defaultConfig.ts:354](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/defaultConfig.ts#L354)
+Defined in: [packages/mermaid/src/defaultConfig.ts:358](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/defaultConfig.ts#L358)

docs/config/setup/mermaid/interfaces/Mermaid.md

@@ -344,6 +344,10 @@ Defined in: [packages/mermaid/src/mermaid.ts:466](https://github.com/mermaid-js/
 
 Defined in: [packages/mermaid/src/mermaid.ts:460](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/mermaid.ts#L460)
 
+Renders the diagram, holding the diagram config scope for exactly as long as the render.
+Leaving it set would make `getConfig()` report the last diagram's appearance as the
+global answer for every caller between renders.
+
 #### Parameters
 
 ##### id
@@ -362,12 +366,6 @@ Defined in: [packages/mermaid/src/mermaid.ts:460](https://github.com/mermaid-js/
 
 `Promise`<[`RenderResult`](RenderResult.md)>
 
-#### Deprecated
-
-- use the `mermaid.render` function instead of `mermaid.mermaidAPI.render`
-
-Deprecated for external use.
-
 ---
 
 ### run()