synabun 2.0.9 → 2.1.0

package/mcp-server/dist/services/tool-runtime.js

@@ -0,0 +1,400 @@
+import { existsSync, mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from 'fs';
+import { basename, dirname, join } from 'path';
+import { config } from '../config.js';
+import { isHttpMode, sanitizeDesktopGrant, sanitizeRole } from './identity.js';
+import { ALWAYS_ON_TOOLS, SELECTABLE_GROUP_IDS, TOOL_LIST_LIMITS, TOOL_GROUPS, isGatedGroup, isSelectableGroup, sortGroups } from './tool-catalog.js';
+import { parseToolList, resolveToolList } from './tool-list.js';
+/** The list of this runtime (comma-joined group ids) and the file its tool_groups changes go to. */
+export const TOOLS_ENV = 'SYNABUN_TOOLS';
+export const TOOLS_PATH_ENV = 'SYNABUN_TOOLS_PATH';
+/** deferred / focus: a focus host; profiled / strict: a strict one. */
+export const TOOL_CATALOG_MODE_ENV = 'SYNABUN_TOOL_CATALOG_MODE';
+/** Read as aliases through the legacy conversion (an older Neural Interface, a user's own config.toml or Gemini settings); never written. */
+export const LEGACY_PROFILE_ENV = 'SYNABUN_PROFILE';
+export const LEGACY_RUNTIME_PROFILE_PATH_ENV = 'SYNABUN_RUNTIME_PROFILE_PATH';
+/** The owner's Default tools: Settings and `synabun tools set` write it; a runtime reads it when it starts, never later. */
+export const DEFAULT_TOOLS_PATH = join(config.dataHome, 'data', 'default-tools.json');
+const LEGACY_DEFAULT_PROFILE_PATHS = [join(config.dataDir, 'active-profile.json'), join(config.dataHome, 'data', 'active-profile.json')];
+const REGISTRY_PATH = join(config.dataHome, 'data', 'mcp-registry.json');
+/** Groups only a caller with this role sees: the role decides, so no list can reveal or hide them. */
+export const ROLE_GATED_GROUPS = Object.freeze(Object.fromEntries(TOOL_GROUPS.filter((group) => group.gate === 'role:assistant').map((group) => [group.id, 'assistant'])));
+/** Groups a capability the caller proves unlocks: `computer` needs a desktop grant (and macOS). */
+export const CAPABILITY_GATED_GROUPS = Object.freeze(Object.fromEntries(TOOL_GROUPS.filter((group) => group.gate === 'grant:computer').map((group) => [group.id, 'computer'])));
+export function isRoleGatedGroup(group) {
+    return Object.prototype.hasOwnProperty.call(ROLE_GATED_GROUPS, group);
+}
+export function isCapabilityGatedGroup(group) {
+    return Object.prototype.hasOwnProperty.call(CAPABILITY_GATED_GROUPS, group);
+}
+const SOURCE_NAMES = {
+    'tools-file': 'SYNABUN_TOOLS_PATH',
+    'tools-env': 'SYNABUN_TOOLS',
+    'legacy-runtime-file': 'SYNABUN_RUNTIME_PROFILE_PATH',
+    'legacy-profile-env': 'SYNABUN_PROFILE',
+    'default-tools': 'default-tools.json',
+    'legacy-default': 'active-profile.json',
+    header: 'X-Synabun-Tools',
+    channel: 'the worker channel',
+};
+/** The selection of a host's own list, with its host mode. */
+export function selectionOf(groups, mode, source, added = []) {
+    return { groups: sortGroups(groups).filter(isSelectableGroup), mode, listError: null, source, added };
+}
+/** What a list that could not be read leaves: memory tools only (and the gated ones), strict until tool_groups succeeds. */
+export function unreadableSelection(source, reason, hostMode) {
+    const name = SOURCE_NAMES[source];
+    return { groups: [], mode: 'strict', hostMode, listError: name ? `${name}: ${reason}` : reason, source, added: [] };
+}
+export function isClaudeCode(env = process.env) {
+    return env.CLAUDECODE === '1';
+}
+/** focus for Codex (SYNABUN_TOOL_CATALOG_MODE=deferred, or a managed Codex sidepanel), strict otherwise. */
+export function readHostMode(env = process.env) {
+    const configured = String(env[TOOL_CATALOG_MODE_ENV] || '').trim().toLowerCase();
+    if (configured === 'deferred' || configured === 'focus')
+        return 'focus';
+    if (configured === 'profiled' || configured === 'strict')
+        return 'strict';
+    // Managed Codex sidepanels have always used this runtime prefix: one spawned before its launch environment
+    // named the catalog mode is a focus host all the same.
+    if (/^codex-sp-/.test(String(env.SYNABUN_TERMINAL_SESSION || '')))
+        return 'focus';
+    return 'strict';
+}
+const loggedProblems = new Set();
+function logOnce(message) {
+    if (loggedProblems.has(message))
+        return;
+    loggedProblems.add(message);
+    console.error(`[SynaBun] ${message}`);
+}
+/** The registry's presets, read only to convert a stored profile name. */
+export function readCustomPresets() {
+    try {
+        if (!existsSync(REGISTRY_PATH))
+            return null;
+        const registry = JSON.parse(readFileSync(REGISTRY_PATH, 'utf-8'));
+        const profiles = registry?.profiles;
+        return profiles && typeof profiles === 'object' && !Array.isArray(profiles) ? profiles : null;
+    }
+    catch (err) {
+        logOnce(`Could not read the MCP registry for stored profile names: ${err instanceof Error ? err.message : String(err)}`);
+        return null;
+    }
+}
+function fromList(value, source, hostMode, legacy) {
+    const parsed = parseToolList(value, legacy ? { legacy: true, customPresets: readCustomPresets() } : {});
+    if (!parsed.ok)
+        return unreadableSelection(source, parsed.message, hostMode);
+    const resolved = resolveToolList(parsed.items, { source: 'runtime' });
+    if (!resolved.ok)
+        return unreadableSelection(source, resolved.message, hostMode);
+    return selectionOf(resolved.groups, hostMode, source, resolved.added);
+}
+/**
+ * The selection of a list given in code or by a request (a header, the worker channel), resolved like a runtime's
+ * own: `all` expanded, a browser group's `browser` added. One that cannot be read is memory tools only, strict.
+ */
+export function selectionFromList(value, mode, source, { legacy = false } = {}) {
+    return fromList(value, source, mode, legacy);
+}
+/** A runtime file holds `{ "tools": [...] }`; one an older Neural Interface wrote holds `{ "profile": "..." }`. */
+function fromFile(path, source, hostMode) {
+    const file = String(path || '').trim();
+    if (!file)
+        return null;
+    let text;
+    try {
+        if (!existsSync(file))
+            return null;
+        text = readFileSync(file, 'utf-8');
+    }
+    catch (err) {
+        return unreadableSelection(source, `${basename(file)} could not be read (${err instanceof Error ? err.message : String(err)})`, hostMode);
+    }
+    let data;
+    try {
+        data = JSON.parse(text);
+    }
+    catch {
+        return unreadableSelection(source, `${basename(file)} is not JSON`, hostMode);
+    }
+    const record = data && typeof data === 'object' && !Array.isArray(data) ? data : null;
+    if (record && Array.isArray(record.tools))
+        return fromList(record.tools, source, hostMode, false);
+    if (record && typeof record.profile === 'string')
+        return fromList(record.profile, source, hostMode, true);
+    return unreadableSelection(source, `${basename(file)} names no tools`, hostMode);
+}
+function fromEnv(value, source, hostMode, legacy) {
+    if (value === undefined || !value.trim())
+        return null;
+    return fromList(value, source, hostMode, legacy);
+}
+/**
+ * The selection a runtime starts with, the first of: its runtime file (SYNABUN_TOOLS_PATH), its list
+ * (SYNABUN_TOOLS), the runtime file of an older Neural Interface (SYNABUN_RUNTIME_PROFILE_PATH), Claude Code
+ * (CLAUDECODE=1: focus on every group), the old SYNABUN_PROFILE, the owner's Default tools, the old
+ * active-profile.json, every group. The runtime's own pins come before CLAUDECODE, so a strict runtime that
+ * inherited it from a parent shell keeps its list. A list that cannot be read is not skipped: the runtime starts
+ * with memory tools only and says why (fail closed, never every group).
+ */
+export function readInitialTools(env = process.env) {
+    const hostMode = readHostMode(env);
+    const steps = [
+        () => fromFile(env[TOOLS_PATH_ENV], 'tools-file', hostMode),
+        () => fromEnv(env[TOOLS_ENV], 'tools-env', hostMode, false),
+        () => fromFile(env[LEGACY_RUNTIME_PROFILE_PATH_ENV], 'legacy-runtime-file', hostMode),
+        () => (isClaudeCode(env) ? selectionOf(SELECTABLE_GROUP_IDS, 'focus', 'claude-code') : null),
+        () => fromEnv(env[LEGACY_PROFILE_ENV], 'legacy-profile-env', hostMode, true),
+        () => fromFile(DEFAULT_TOOLS_PATH, 'default-tools', hostMode),
+        () => {
+            for (const path of LEGACY_DEFAULT_PROFILE_PATHS) {
+                const selection = fromFile(path, 'legacy-default', hostMode);
+                if (selection)
+                    return selection;
+            }
+            return null;
+        },
+    ];
+    for (const step of steps) {
+        const selection = step();
+        if (!selection)
+            continue;
+        if (selection.listError)
+            logOnce(`Could not read this runtime's tool list (${selection.listError}); only memory tools are loaded.`);
+        return selection;
+    }
+    return selectionOf(SELECTABLE_GROUP_IDS, hostMode, 'all');
+}
+/**
+ * The value an older Neural Interface's /api/mcp/runtime-profile and runtime file understand for these groups: a
+ * comma list (every selectable id is one of its group names), or its always-on pseudo-group `memory` for none.
+ */
+export function legacyProfileValue(groups) {
+    const ids = sortGroups(groups).filter(isSelectableGroup);
+    return ids.length ? ids.join(',') : 'memory';
+}
+function writeJsonFile(path, value) {
+    const temp = `${path}.synabun-${process.pid}-${Date.now()}.tmp`;
+    try {
+        const dir = dirname(path);
+        if (!existsSync(dir))
+            mkdirSync(dir, { recursive: true });
+        writeFileSync(temp, JSON.stringify(value, null, 2) + '\n', 'utf-8');
+        renameSync(temp, path);
+        return true;
+    }
+    catch (err) {
+        try {
+            unlinkSync(temp);
+        }
+        catch { /* never written */ }
+        console.error(`[SynaBun] Failed to save this runtime's tools at ${path}:`, err);
+        return false;
+    }
+}
+/**
+ * Save this runtime's groups where a restarted child of the same runtime reads them, never the shared default.
+ * Over HTTP there is no such file: process.env is the Neural Interface's own, not a caller's.
+ */
+export function runtimeToolsWithExternalRefs(groups) {
+    const tools = sortGroups(groups).filter(isSelectableGroup);
+    if (isHttpMode())
+        return tools; // HTTP identity belongs to the request; NI preserves the outer run's refs.
+    const path = String(process.env[TOOLS_PATH_ENV] || process.env[LEGACY_RUNTIME_PROFILE_PATH_ENV] || '').trim();
+    let previous = process.env[TOOLS_ENV] || '';
+    try {
+        if (path && existsSync(path))
+            previous = JSON.parse(readFileSync(path, 'utf8')).tools ?? previous;
+    }
+    catch { /* launch env remains the fallback */ }
+    const parsed = parseToolList(previous);
+    const refs = parsed.ok ? parsed.items.filter(item => item.startsWith('mcp:')) : [];
+    const compact = tools.length + refs.length > TOOL_LIST_LIMITS.maxItems && SELECTABLE_GROUP_IDS.every(id => tools.includes(id));
+    return [...(compact ? ['all'] : tools), ...refs];
+}
+export function persistRuntimeTools(groups) {
+    if (isHttpMode())
+        return null;
+    const tools = runtimeToolsWithExternalRefs(groups);
+    const toolsPath = String(process.env[TOOLS_PATH_ENV] || '').trim();
+    if (toolsPath)
+        return writeJsonFile(toolsPath, { tools, updatedAt: new Date().toISOString() }) ? 'tools-file' : null;
+    const legacyPath = String(process.env[LEGACY_RUNTIME_PROFILE_PATH_ENV] || '').trim();
+    if (legacyPath)
+        return writeJsonFile(legacyPath, { profile: legacyProfileValue(groups), tools }) ? 'legacy-runtime-file' : null;
+    return null;
+}
+export function logCodexConfigNoticeOnce() {
+    logOnce('Changing this runtime\'s tools never rewrites ~/.codex/config.toml: the canonical Codex registration loads every '
+        + 'SynaBun tool (SYNABUN_TOOLS=all, deferred catalog) and a tool list only sets a Codex runtime\'s focus.');
+}
+function sameList(a, b) {
+    return a.length === b.length && a.every((item, index) => item === b[index]);
+}
+export class ToolRuntime {
+    groups;
+    mode;
+    hostMode;
+    listError;
+    source;
+    added;
+    role;
+    capabilities;
+    platform;
+    activeGroups;
+    toolGroups = new Map();
+    ungroupedTools = ALWAYS_ON_TOOLS.length;
+    onToolsChanged = null;
+    notificationTimer = null;
+    constructor(selection = readInitialTools(), options = {}) {
+        // stdio children of the Codex/OpenCode assistant brains receive the role through their launch env; HTTP
+        // sessions bind it later (setRole). The desktop grant the same way (setCapabilities).
+        this.role = options.role !== undefined ? options.role : sanitizeRole(process.env.SYNABUN_ROLE);
+        this.capabilities = new Set(options.capabilities ?? (sanitizeDesktopGrant(process.env.SYNABUN_DESKTOP_GRANT) ? ['computer'] : []));
+        this.platform = options.platform || process.platform;
+        this.groups = sortGroups(selection.groups).filter(isSelectableGroup);
+        this.mode = selection.mode;
+        this.hostMode = selection.hostMode ?? selection.mode;
+        this.listError = selection.listError ?? null;
+        this.source = selection.source;
+        this.added = [...(selection.added || [])];
+        this.activeGroups = this.resolveActive(this.groups);
+    }
+    getGroups() { return [...this.groups]; }
+    /** The groups the instructions name: the selection plus the gated groups the role and grant unlock. */
+    getActiveGroups() { return this.activeGroups; }
+    getMode() { return this.mode; }
+    /** The mode the host has once its list reads: focus for Codex and Claude Code, strict otherwise. */
+    getHostMode() { return this.hostMode; }
+    getListError() { return this.listError; }
+    getSource() { return this.source; }
+    getAdded() { return [...this.added]; }
+    getRole() { return this.role; }
+    getCapabilities() { return [...this.capabilities]; }
+    getSelection() {
+        return { groups: this.getGroups(), mode: this.mode, hostMode: this.hostMode, listError: this.listError, source: this.source, added: this.getAdded() };
+    }
+    /** Plain setter: callers apply() afterwards so the gated groups follow (index.ts setServerRole does both). */
+    setRole(role) { this.role = role; }
+    /** Plain setter, like setRole. */
+    setCapabilities(capabilities) { this.capabilities = new Set(capabilities); }
+    setToolGroup(name, tools) {
+        this.toolGroups.set(name, tools);
+    }
+    /** How many registered tools sit outside every group (the always-on tools, and any compatibility name). */
+    setUngroupedToolCount(count) {
+        this.ungroupedTools = count;
+    }
+    setOnToolsChanged(fn) {
+        this.onToolsChanged = fn;
+    }
+    // HTTP clients can refresh over their open notification stream without destroying an in-flight call.
+    inBandRefresh = null;
+    setInBandRefresh(fn) { this.inBandRefresh = fn; }
+    hasInBandRefresh() { return !!this.inBandRefresh; }
+    refreshBeforeReply() { return this.inBandRefresh?.() ?? Promise.resolve(false); }
+    dispose() {
+        if (this.notificationTimer)
+            clearTimeout(this.notificationTimer);
+        this.notificationTimer = null;
+        this.onToolsChanged = null;
+        this.inBandRefresh = null;
+    }
+    /**
+     * Coalesce one delayed tools/list_changed. The delay matters: OpenCode used to get the notification while the
+     * tool call that caused it was still in flight, and could abort or cache the old tool round trip.
+     */
+    scheduleToolsChangedNotification(delayMs = 10) {
+        if (!this.onToolsChanged)
+            return false;
+        if (this.notificationTimer)
+            clearTimeout(this.notificationTimer);
+        this.notificationTimer = setTimeout(() => {
+            this.notificationTimer = null;
+            try {
+                void Promise.resolve(this.onToolsChanged?.()).catch((err) => {
+                    console.error('[SynaBun] tools/list_changed notifier failed:', err);
+                });
+            }
+            catch (err) {
+                console.error('[SynaBun] tools/list_changed notifier failed:', err);
+            }
+        }, Math.max(0, delayMs));
+        this.notificationTimer.unref?.();
+        return true;
+    }
+    /** The selection with the gates applied: a gated group is active iff this runtime's role or grant unlocks it. */
+    resolveActive(groups) {
+        const active = new Set(groups.filter(isSelectableGroup));
+        for (const [group, role] of Object.entries(ROLE_GATED_GROUPS))
+            if (this.role === role)
+                active.add(group);
+        for (const [group, capability] of Object.entries(CAPABILITY_GATED_GROUPS)) {
+            if (this.capabilities.has(capability) && (capability !== 'computer' || this.platform === 'darwin'))
+                active.add(group);
+        }
+        return active;
+    }
+    /** Tools this server advertises: the ones outside every group and each group's enabled tools. */
+    getAdvertisedToolCount() {
+        let total = this.ungroupedTools;
+        for (const tools of this.toolGroups.values())
+            total += tools.filter((tool) => tool.enabled).length;
+        return total;
+    }
+    /**
+     * Apply a new selection (or re-apply the current one after a role or grant change). Tools are flipped directly:
+     * RegisteredTool.enable()/disable() would each send a notification, and the caller sends one after its answer.
+     */
+    apply(next = {}) {
+        const groups = next.groups ? sortGroups(next.groups).filter(isSelectableGroup) : this.groups;
+        const mode = next.mode ?? this.mode;
+        const listError = next.listError !== undefined ? next.listError : this.listError;
+        const previous = { groups: this.groups, mode: this.mode, listError: this.listError, active: this.activeGroups };
+        const active = this.resolveActive(groups);
+        let advertisedChanged = false;
+        for (const [group, tools] of this.toolGroups) {
+            // A gated group ignores the mode: a focus host gets every other group up front, never one its role or grant does not unlock.
+            const advertise = isGatedGroup(group) ? active.has(group) : mode === 'focus' || active.has(group);
+            for (const tool of tools) {
+                if (tool.enabled === advertise)
+                    continue;
+                tool.enabled = advertise;
+                advertisedChanged = true;
+            }
+        }
+        const enabled = sortGroups([...active].filter((group) => !previous.active.has(group)));
+        const disabled = sortGroups([...previous.active].filter((group) => !active.has(group)));
+        this.groups = groups;
+        this.mode = mode;
+        this.listError = listError;
+        this.activeGroups = active;
+        if (next.hostMode)
+            this.hostMode = next.hostMode;
+        if (next.source)
+            this.source = next.source;
+        if (next.added)
+            this.added = [...next.added];
+        const totalTools = this.getAdvertisedToolCount();
+        const changed = enabled.length > 0 || disabled.length > 0 || previous.mode !== mode
+            || previous.listError !== listError || !sameList(previous.groups, groups);
+        if (changed) {
+            console.error(`[SynaBun] Tools (${mode}): ${groups.join(',') || 'memory only'} (${totalTools} tools, +${enabled.join(',') || 'none'}, -${disabled.join(',') || 'none'})`);
+        }
+        return {
+            groups: [...groups],
+            activeGroups: sortGroups(active),
+            enabled,
+            disabled,
+            added: [...this.added],
+            totalTools,
+            changed,
+            advertisedChanged,
+            mode,
+            listError,
+        };
+    }
+}
+//# sourceMappingURL=tool-runtime.js.map

package/mcp-server/dist/services/tool-runtime.js.map

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

package/mcp-server/dist/services/whiteboard-geometry.d.ts

@@ -39,6 +39,7 @@ export interface WbElement {
     height?: number;
     content?: string;
     items?: string[];
+    levels?: number[];
     ordered?: boolean;
     fontSize?: number;
     color?: string;
@@ -148,6 +149,28 @@ export type WbSectionTypeName = typeof SECTION_TYPE_NAMES[number];
 export declare const ELEMENT_TYPES: readonly ["text", "list", "shape", "arrow", "pen", "image", "section"];
 /** Section defaults keyed by section type — same 12 entries and values as the client. */
 export declare const SECTION_DEFAULTS: Record<string, WbSectionDefault>;
+/** Deepest list level (the client's WB_LIST_MAX_LEVEL). */
+export declare const LIST_MAX_LEVEL = 4;
+/** One list item as a caller may send it: a plain string (level 0) or { text, level }. */
+export type WbListItemInput = string | {
+    text: string;
+    level?: number;
+};
+/**
+ * A list's items in either form -> `{ items, levels }` that keep the nesting rules (levels as long as items).
+ * A plain string takes `levels[i]` (0 without one); a { text, level } object's own level wins.
+ */
+export declare function normalizeListItems(items: unknown, levels?: unknown): {
+    items: string[];
+    levels: number[];
+};
+/** True when some item of the list is nested (only then is `levels` stored). */
+export declare function hasNestedLevels(levels: readonly number[] | undefined): boolean;
+/**
+ * The marker before each list item: a bullet per level (disc, circle, square, cycling) or the item's number in
+ * its level's style (1, a, i, cycling) with ".". Numbering restarts under every item above, as in the browser.
+ */
+export declare function listMarkers(levels: readonly number[], ordered: boolean): string[];
 /**
  * The drawable area as a rect: `{ x: xOffset||0, y: yOffset||0, width, height }`.
  * Missing/invalid dimensions fall back to `DEFAULT_VIEWPORT`.
@@ -165,9 +188,10 @@ export declare function estimateTextSize(content: string | undefined, fontSize?:
 };
 /**
  * Estimate the rendered size of a list element before the browser measures it.
- * Same font metrics as text, plus the 1.4em bullet indent; line-height 1.5.
+ * Same font metrics as text, plus the 1.4em bullet indent and 1.4em more per
+ * nesting level (`levels[i]`, 0 when missing); line-height 1.5.
  */
-export declare function estimateListSize(items: string[] | undefined, fontSize?: number): {
+export declare function estimateListSize(items: string[] | undefined, fontSize?: number, levels?: readonly number[]): {
     width: number;
     height: number;
 };

package/mcp-server/dist/services/whiteboard-geometry.d.ts.map

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

package/mcp-server/dist/services/whiteboard-geometry.js

@@ -77,8 +77,89 @@ function contentString(v) {
         return v;
     return v == null ? undefined : String(v);
 }
-function itemStrings(v) {
-    return Array.isArray(v) ? v.map(item => (typeof item === 'string' ? item : String(item ?? ''))) : undefined;
+// ── List nesting ──
+// A list stores `items: string[]` and, only while some item is nested, `levels: number[]` beside them (levels[i]
+// is the depth of items[i], 0 = top level; no `levels` = all 0, so older boards read unchanged). Callers may send
+// items as { text, level } objects. Rules: the first item is level 0, an item is at most one level deeper than
+// the item above it, no item is deeper than LIST_MAX_LEVEL. The browser and server.js read the same format
+// through neural-interface/public/shared/whiteboard-list.js; keep the two on the same rules.
+/** Deepest list level (the client's WB_LIST_MAX_LEVEL). */
+export const LIST_MAX_LEVEL = 4;
+function listItemText(item) {
+    if (typeof item === 'string')
+        return item;
+    if (item && typeof item === 'object') {
+        const t = item.text;
+        return t == null ? '' : String(t);
+    }
+    return item == null ? '' : String(item);
+}
+function listLevelOf(value) {
+    const n = Math.floor(Number(value));
+    return Number.isFinite(n) && n > 0 ? Math.min(n, LIST_MAX_LEVEL) : 0;
+}
+/**
+ * A list's items in either form -> `{ items, levels }` that keep the nesting rules (levels as long as items).
+ * A plain string takes `levels[i]` (0 without one); a { text, level } object's own level wins.
+ */
+export function normalizeListItems(items, levels) {
+    const list = Array.isArray(items) ? items : [];
+    const given = Array.isArray(levels) ? levels : [];
+    const out = [];
+    let above = -1;
+    list.forEach((item, i) => {
+        const own = item && typeof item === 'object' ? item.level : undefined;
+        const level = Math.min(listLevelOf(own !== undefined ? own : given[i]), above + 1);
+        out.push(level);
+        above = level;
+    });
+    return { items: list.map(listItemText), levels: out };
+}
+/** True when some item of the list is nested (only then is `levels` stored). */
+export function hasNestedLevels(levels) {
+    return Array.isArray(levels) && levels.some(level => level > 0);
+}
+/**
+ * The marker before each list item: a bullet per level (disc, circle, square, cycling) or the item's number in
+ * its level's style (1, a, i, cycling) with ".". Numbering restarts under every item above, as in the browser.
+ */
+export function listMarkers(levels, ordered) {
+    const bullets = ['•', '◦', '▪'];
+    const counters = [];
+    return levels.map((raw) => {
+        const level = listLevelOf(raw);
+        if (!ordered)
+            return bullets[level % 3];
+        counters.length = level + 1;
+        counters[level] = (counters[level] || 0) + 1;
+        const n = counters[level];
+        const style = level % 3;
+        return `${style === 1 ? alphaCounter(n) : style === 2 ? romanCounter(n) : String(n)}.`;
+    });
+}
+function alphaCounter(n) {
+    let out = '';
+    while (n > 0) {
+        n -= 1;
+        out = String.fromCharCode(97 + (n % 26)) + out;
+        n = Math.floor(n / 26);
+    }
+    return out;
+}
+function romanCounter(n) {
+    const table = [[1000, 'm'], [900, 'cm'], [500, 'd'], [400, 'cd'], [100, 'c'], [90, 'xc'], [50, 'l'], [40, 'xl'], [10, 'x'], [9, 'ix'], [5, 'v'], [4, 'iv'], [1, 'i']];
+    let out = '';
+    for (const [value, digits] of table)
+        while (n >= value) {
+            out += digits;
+            n -= value;
+        }
+    return out;
+}
+/** Size estimate of a list element from its stored items and levels. */
+function estimateListElement(el) {
+    const list = normalizeListItems(el.items, el.levels);
+    return estimateListSize(Array.isArray(el.items) ? list.items : undefined, positiveDim(el.fontSize) ?? 18, list.levels);
 }
 /** Stored size, or the type's fallback when a dimension is missing (see `elementBox`). */
 function storedOrDefaultSize(el) {
@@ -92,7 +173,7 @@ function storedOrDefaultSize(el) {
             return { width: w ?? est.width, height: h ?? est.height };
         }
         case 'list': {
-            const est = estimateListSize(itemStrings(el.items), positiveDim(el.fontSize) ?? 18);
+            const est = estimateListElement(el);
             return { width: w ?? est.width, height: h ?? est.height };
         }
         case 'shape':
@@ -168,14 +249,16 @@ export function estimateTextSize(content, fontSize = 22) {
 }
 /**
  * Estimate the rendered size of a list element before the browser measures it.
- * Same font metrics as text, plus the 1.4em bullet indent; line-height 1.5.
+ * Same font metrics as text, plus the 1.4em bullet indent and 1.4em more per
+ * nesting level (`levels[i]`, 0 when missing); line-height 1.5.
  */
-export function estimateListSize(items, fontSize = 18) {
+export function estimateListSize(items, fontSize = 18, levels) {
     const list = items ?? [];
     const rows = Math.max(1, list.length);
-    const maxChars = list.length ? Math.max(...list.map(codePointLength)) : 0;
+    const indents = list.map((item, i) => codePointLength(item) * 0.6 + (1 + listLevelOf(levels?.[i])) * 1.4);
+    const widest = list.length ? Math.max(...indents) : 1.4;
     return {
-        width: Math.max(120, Math.round(maxChars * fontSize * 0.6 + 1.4 * fontSize + 30)),
+        width: Math.max(120, Math.round(widest * fontSize + 30)),
         height: Math.max(30, Math.round(rows * fontSize * 1.5 + 22)),
     };
 }
@@ -204,7 +287,7 @@ export function ensureElementGeometry(el, opts = {}) {
             if (force || el.measured !== true || missing) {
                 const size = el.type === 'text'
                     ? estimateTextSize(contentString(el.content), positiveDim(el.fontSize) ?? 22)
-                    : estimateListSize(itemStrings(el.items), positiveDim(el.fontSize) ?? 18);
+                    : estimateListElement(el);
                 el.width = size.width;
                 el.height = size.height;
                 el.estimated = true;