@jini-ai/ui 0.5.5 → 0.6.10

package/dist/features/html-editor/css.js

@@ -27,109 +27,116 @@ export function prettifyCss(css) {
     let atDeclStart = false;
     let i = 0;
     const n = css.length;
-    const trimTrailingSpace = () => {
-        out = out.replace(/[ \t]+$/, '');
-    };
-    const peekNextNonSpace = (from) => {
-        let j = from;
-        while (j < n && /\s/.test(css[j]))
-            j++;
-        return css[j];
+    const skipWhitespace = (_input, _options = {}) => {
+        while (i < n && /\s/.test(css[i]))
+            i++;
     };
-    while (i < n) {
-        const ch = css[i];
+    const consumeValue = ({ ch }, _options = {}) => {
         if (quote) {
             out += ch;
             if (ch === '\\' && i + 1 < n) {
                 out += css[i + 1];
                 i += 2;
-                continue;
+                return true;
             }
             if (ch === quote)
                 quote = null;
             i++;
-            continue;
+            return true;
         }
         if (ch === '"' || ch === "'") {
             quote = ch;
             out += ch;
             i++;
-            continue;
+            return true;
         }
         if (ch === '(') {
             parenDepth++;
             out += ch;
             i++;
-            continue;
+            return true;
         }
         if (ch === ')') {
             parenDepth = Math.max(0, parenDepth - 1);
             out += ch;
             i++;
-            continue;
+            return true;
         }
-        if (parenDepth === 0 && ch === '{') {
-            trimTrailingSpace();
-            out += ' {';
-            depth++;
-            atDeclStart = true;
-            i++;
-            while (i < n && /\s/.test(css[i]))
-                i++;
-            if (peekNextNonSpace(i) !== '}')
-                out += '\n' + INDENT.repeat(depth);
-            continue;
+        return false;
+    };
+    const openRule = (_input, _options = {}) => {
+        out = out.replace(/[ \t]+$/, '');
+        out += ' {';
+        depth++;
+        atDeclStart = true;
+        i++;
+        skipWhitespace({}, {});
+        if (css[i] !== '}')
+            out += '\n' + INDENT.repeat(depth);
+        return true;
+    };
+    const closeRule = (_input, _options = {}) => {
+        depth = Math.max(0, depth - 1);
+        out = out.replace(/[ \t]+$/, '');
+        // A `}` immediately after `{` (an empty rule) needs no newline before it; otherwise close on
+        // its own indented line.
+        if (!out.endsWith('{'))
+            out += '\n' + INDENT.repeat(depth);
+        out += '}';
+        atDeclStart = false;
+        i++;
+        skipWhitespace({}, {});
+        const nextCh = css[i];
+        // A following `}` (closing a parent at-rule) manages its own leading newline via the same
+        // trailing-space trim above — adding one here too would double up into a stray blank line.
+        if (nextCh !== undefined && nextCh !== '}') {
+            out += depth === 0 ? '\n\n' : '\n' + INDENT.repeat(depth);
         }
-        if (parenDepth === 0 && ch === '}') {
-            depth = Math.max(0, depth - 1);
-            trimTrailingSpace();
-            // A `}` immediately after `{` (an empty rule) needs no newline before it; otherwise close on
-            // its own indented line.
-            if (!out.endsWith('{'))
-                out += '\n' + INDENT.repeat(depth);
-            out += '}';
-            atDeclStart = false;
-            i++;
-            while (i < n && /\s/.test(css[i]))
-                i++;
-            const nextCh = css[i];
-            // A following `}` (closing a parent at-rule) manages its own leading newline via the same
-            // trimTrailingSpace() above — adding one here too would double up into a stray blank line.
-            if (nextCh !== undefined && nextCh !== '}') {
-                out += depth === 0 ? '\n\n' : '\n' + INDENT.repeat(depth);
-            }
-            continue;
+        return true;
+    };
+    const endDeclaration = (_input, _options = {}) => {
+        out += ';';
+        i++;
+        skipWhitespace({}, {});
+        const nextCh = css[i];
+        if (nextCh !== '}' && nextCh !== undefined) {
+            out += '\n' + INDENT.repeat(depth);
+            atDeclStart = true;
         }
-        if (parenDepth === 0 && ch === ';') {
-            out += ';';
+        return true;
+    };
+    // Only the FIRST colon of a declaration (the property/value separator) gets a space after it —
+    // a selector's own colon (`.gm-btn:hover`, matched at `depth === 0`, before any `{`) is left
+    // untouched, and only `atDeclStart` (cleared the moment this fires) keeps a later colon inside
+    // the same value (there are none in practice here, but the guard costs nothing) from being
+    // treated as another property separator.
+    const separateValue = (_input, _options = {}) => {
+        out += ': ';
+        atDeclStart = false;
+        i++;
+        while (i < n && css[i] === ' ')
             i++;
-            const nextCh = peekNextNonSpace(i);
-            while (i < n && /\s/.test(css[i]))
-                i++;
-            if (nextCh !== '}' && nextCh !== undefined) {
-                out += '\n' + INDENT.repeat(depth);
-                atDeclStart = true;
-            }
-            continue;
+        return true;
+    };
+    const consumeStructure = ({ ch }, _options = {}) => {
+        if (parenDepth !== 0)
+            return false;
+        switch (ch) {
+            case '{': return openRule({}, {});
+            case '}': return closeRule({}, {});
+            case ';': return endDeclaration({}, {});
+            case ':': return depth > 0 && atDeclStart ? separateValue({}, {}) : false;
+            default: return false;
         }
-        // Only the FIRST colon of a declaration (the property/value separator) gets a space after it —
-        // a selector's own colon (`.gm-btn:hover`, matched at `depth === 0`, before any `{`) is left
-        // untouched, and only `atDeclStart` (cleared the moment this fires) keeps a later colon inside
-        // the same value (there are none in practice here, but the guard costs nothing) from being
-        // treated as another property separator.
-        if (parenDepth === 0 && ch === ':' && depth > 0 && atDeclStart) {
-            out += ': ';
-            atDeclStart = false;
-            i++;
-            while (i < n && css[i] === ' ')
-                i++;
+    };
+    while (i < n) {
+        const ch = css[i];
+        if (consumeValue({ ch }, {}) || consumeStructure({ ch }, {}))
             continue;
-        }
         if (/\s/.test(ch)) {
             out += ' ';
             i++;
-            while (i < n && /\s/.test(css[i]))
-                i++;
+            skipWhitespace({}, {});
             continue;
         }
         out += ch;

package/dist/features/html-editor/editor-blocks.js

@@ -48,6 +48,42 @@ const isEditableEffect = (el) => {
         return true;
     return (TEXT_EFFECT_TAGS.has(el.tagName) || PHRASING_TAGS.has(el.tagName)) && isPhrasingOnly(el);
 };
+function runtimeBlockReason({ el, isLive }, _options = {}) {
+    if (isLive)
+        return undefined;
+    if (Object.keys(el.attributes).some(name => name.startsWith('data-kui')) && !isEditableEffect(el))
+        return 'kuinetic';
+    if (el.tagName === 'canvas')
+        return 'canvas';
+    if (el.tagName === 'video' && 'autoplay' in el.attributes)
+        return 'autoplay-video';
+    if (el.attributes['data-editor'] === 'block')
+        return 'scripted';
+    return undefined;
+}
+function describeBlock({ el, isLive, hasLiveDescendants }, options = {}) {
+    const view = sourceElementAttributeView(el, {});
+    const host = options.describeHostElement?.(view);
+    const embed = !!host || !!options.isProtectedElement?.(view);
+    let reason = runtimeBlockReason({ el, isLive }, {});
+    if (reason && hasLiveDescendants)
+        reason = undefined;
+    if (!reason && embed)
+        reason = 'embed';
+    return { reason, host };
+}
+function createEditorBlock({ el, reason, host }, options = {}) {
+    const t = options.translate ?? ((key) => key);
+    const id = el.attributes.id;
+    const identity = id ? `#${id}` : el.attributes.class ? `.${el.attributes.class.trim().split(/\s+/).slice(0, 2).join('.')}` : el.tagName;
+    return {
+        ...el.outerRange, tagName: el.tagName, ...(id ? { id } : {}), reason, element: el,
+        descriptor: reason === 'embed' && host ? host : {
+            kindLabel: t(LABELS[reason]), identityLabel: identity.slice(0, 64), presentation: reason === 'embed' ? 'embed' : 'runtime',
+            guidanceLabel: t('Locked · Edit in HTML · Preview plays it'), inline: INLINE_TAGS.has(el.tagName),
+        },
+    };
+}
 /** Outermost disjoint roots; explicit live islands veto aggregation but never host embed safety. */
 export function detectEditorBlocks({ html }, options = {}) {
     const elements = indexSourceElements({ html }, {});
@@ -60,48 +96,22 @@ export function detectEditorBlocks({ html }, options = {}) {
     };
     elements.forEach(annotate);
     let unsupported = false;
-    const walk = (el, live, invalidAncestor) => {
+    const walk = ({ el, live, invalidAncestor }, _options = {}) => {
         const mode = el.attributes['data-editor'];
         const isLive = mode === 'live' || (mode !== 'block' && live);
-        const view = sourceElementAttributeView(el, {});
-        const host = options.describeHostElement?.(view);
-        const embed = !!host || !!options.isProtectedElement?.(view);
-        let reason;
-        if (!isLive) {
-            if (Object.keys(el.attributes).some(name => name.startsWith('data-kui')) && !isEditableEffect(el))
-                reason = 'kuinetic';
-            else if (el.tagName === 'canvas')
-                reason = 'canvas';
-            else if (el.tagName === 'video' && 'autoplay' in el.attributes)
-                reason = 'autoplay-video';
-            else if (mode === 'block')
-                reason = 'scripted';
-        }
-        if (reason && liveIslands.get(el))
-            reason = undefined;
-        if (!reason && embed)
-            reason = 'embed';
+        const { reason, host } = describeBlock({ el, isLive, hasLiveDescendants: !!liveIslands.get(el) }, options);
         const invalid = invalidAncestor || !el.outerRange || UNSUPPORTED_CONTEXTS.has(el.tagName);
         if (reason) {
             if (invalid || !el.sourceSupported) {
                 unsupported = true;
                 return;
             }
-            const t = options.translate ?? ((key) => key);
-            const id = el.attributes.id;
-            const identity = id ? `#${id}` : el.attributes.class ? `.${el.attributes.class.trim().split(/\s+/).slice(0, 2).join('.')}` : el.tagName;
-            blocks.push({
-                ...el.outerRange, tagName: el.tagName, ...(id ? { id } : {}), reason, element: el,
-                descriptor: reason === 'embed' && host ? host : {
-                    kindLabel: t(LABELS[reason]), identityLabel: identity.slice(0, 64), presentation: reason === 'embed' ? 'embed' : 'runtime',
-                    guidanceLabel: t('Locked · Edit in HTML · Preview plays it'), inline: INLINE_TAGS.has(el.tagName),
-                },
-            });
+            blocks.push(createEditorBlock({ el, reason, host }, options));
             return;
         }
-        el.children.forEach(child => walk(child, isLive, invalid));
+        el.children.forEach(child => walk({ el: child, live: isLive, invalidAncestor: invalid }, {}));
     };
-    elements.forEach(el => walk(el, false, false));
+    elements.forEach(el => walk({ el, live: false, invalidAncestor: false }, {}));
     return unsupported || (blocks.length > 0 && elements.some(el => !el.sourceSupported))
         ? { ok: false, problem: "Can't edit this source visually. Use HTML." } : { ok: true, blocks, elements };
 }
@@ -147,8 +157,12 @@ export function prepareEditorSource({ html }, options = {}) {
     let namespace = 0;
     while (html.toLowerCase().includes(markerAttribute))
         markerAttribute = `data-jini-raw-source-${++namespace}`;
+    const prepared = renderSourceShells({ html, instances, blocks: detected.blocks, markerAttribute }, {});
+    return { ok: true, html: prepared, markerAttribute, instances, canvasCss: css.join('\n') };
+}
+function renderSourceShells({ html, instances, blocks, markerAttribute }, _options = {}) {
     let prepared = html;
-    const roots = new Map(detected.blocks.map(block => [block.outerStart, block]));
+    const roots = new Map(blocks.map(block => [block.outerStart, block]));
     for (let i = instances.length - 1; i >= 0; i--) {
         const instance = instances[i];
         const block = roots.get(instance.outerStart);
@@ -164,7 +178,7 @@ export function prepareEditorSource({ html }, options = {}) {
         const shell = `<${tag} ${markerAttribute}="${i}"${layout}>${voidTag && !instance.nonvisual ? '' : `</${tag}>`}`;
         prepared = prepared.slice(0, instance.outerStart) + shell + prepared.slice(instance.outerEnd);
     }
-    return { ok: true, html: prepared, markerAttribute, instances, canvasCss: css.join('\n') };
+    return prepared;
 }
 /** Exact authored opening tag and its source offsets; no regex-based HTML parsing or id guessing. */
 export function findEditorBlockOpening({ html, target }, _options = {}) {

package/dist/features/html-editor/editor-serialization.js

@@ -32,10 +32,11 @@ function serializeCleaned(editor) {
     // GrapesJS's getCss typing omits its JSON return type; successful init supplies a wrapper.
     const rules = editor.getCss({ json: true, avoidProtected: true, keepUnusedStyles: true });
     const css = rules.map(rule => rule.toCSS()).join('');
-    const wrapper = editor.getWrapper();
-    // `wrapper` is undefined only before/without a successful init, which cannot be true once this
-    // hook's `editor` has fired `update` — defensive only, mirroring `serializeCleaned`'s own doc.
-    const html = wrapper ? wrapper.getInnerHTML() : editor.getHtml();
+    // `getWrapper()` is undefined only before/without a successful init, which cannot be true once this
+    // hook's `editor` has fired `update` — and `serializeEditorSource` has already walked the wrapper
+    // (`assertProtectedSourceMetadata`) before reaching here. The old `: editor.getHtml()` fallback for a
+    // missing wrapper was therefore unreachable and is gone.
+    const html = editor.getWrapper().getInnerHTML();
     return css ? `<style>${prettifyCss(css)}</style>${html}` : html;
 }
 /**
@@ -86,7 +87,7 @@ function serializeWithSplice(editor, original, dirty, structuralChange, sourcePl
     let result = original;
     for (const edit of ordered) {
         const range = originalIndex.get(pathKey(edit.path));
-        if (range && sourcePlan?.instances.some(raw => range.start < raw.outerEnd && range.end > raw.outerStart)) {
+        if (range && sourcePlan.instances.some(raw => range.start < raw.outerEnd && range.end > raw.outerStart)) {
             warnFallback('text edit overlaps a protected source region');
             return serializeCleaned(editor);
         }

package/dist/features/html-editor/protected-elements.js

@@ -71,6 +71,38 @@ export function protectedCanvasDescriber({ editor }, _options = {}) {
         });
     return el => descriptors.get(el);
 }
+function selectedSourceStart({ wrapper, selected, original, html }, _options = {}) {
+    // Search only exact authored slices. Copies share bytes, so count preceding equal instances
+    // in model order; no mapping export mode or persistent source tokens are needed.
+    let copiesBefore = 0;
+    let reached = false;
+    visit(wrapper, component => {
+        if (component === selected)
+            reached = true;
+        else if (!reached && component.is(PROTECTED_ELEMENT_TYPE) && protectedElementHtml({ component }, {}) === original)
+            copiesBefore++;
+    });
+    let start = -1;
+    for (let i = 0; i <= copiesBefore; i++)
+        start = html.indexOf(original, start + 1);
+    if (start < 0)
+        throw new EditorSourceError();
+    return start;
+}
+function selectedSourceTarget({ selected, html, start }, _options = {}) {
+    const tagName = selected.get('sourceTagName');
+    const id = selected.get('sourceId');
+    let occurrenceIndex = 0;
+    for (;;) {
+        const range = findEditorBlockOpening({ html, target: { occurrenceIndex, tagName, ...(id ? { id } : {}) } }, {});
+        if (!range || range.start > start)
+            throw new EditorSourceError();
+        if (range.start === start)
+            break;
+        occurrenceIndex++;
+    }
+    return { occurrenceIndex, tagName, ...(id ? { id } : {}) };
+}
 /**
  * Registers the `protected-element` component type so any parsed element `isProtectedElement`
  * recognizes becomes one atomic block: its content can never be edited (excluded from RTE
@@ -104,33 +136,9 @@ export function registerProtectedElementType({ editor, sourcePlan }, options = {
                         return;
                     const original = protectedElementHtml({ component: selected }, {});
                     const html = wrapper.getInnerHTML();
-                    // Search only exact authored slices. Copies share bytes, so count preceding equal instances
-                    // in model order; no mapping export mode or persistent source tokens are needed.
-                    let copiesBefore = 0;
-                    let reached = false;
-                    visit(wrapper, component => {
-                        if (component === selected)
-                            reached = true;
-                        else if (!reached && component.is(PROTECTED_ELEMENT_TYPE) && protectedElementHtml({ component }, {}) === original)
-                            copiesBefore++;
-                    });
-                    let start = -1;
-                    for (let i = 0; i <= copiesBefore; i++)
-                        start = html.indexOf(original, start + 1);
-                    if (start < 0)
-                        throw new EditorSourceError();
-                    const tagName = selected.get('sourceTagName');
-                    const id = selected.get('sourceId');
-                    let occurrenceIndex = 0;
-                    for (;;) {
-                        const range = findEditorBlockOpening({ html, target: { occurrenceIndex, tagName, ...(id ? { id } : {}) } }, {});
-                        if (!range || range.start > start)
-                            throw new EditorSourceError();
-                        if (range.start === start)
-                            break;
-                        occurrenceIndex++;
-                    }
-                    await requestEditHtml({ occurrenceIndex, tagName, ...(id ? { id } : {}) }, {});
+                    const start = selectedSourceStart({ wrapper, selected, original, html }, {});
+                    const target = selectedSourceTarget({ selected, html, start }, {});
+                    await requestEditHtml(target, {});
                 }
                 catch (error) {
                     options.onSerializationError?.(error instanceof EditorSourceError ? error : new EditorSourceError());
@@ -161,7 +169,10 @@ export function registerProtectedElementType({ editor, sourcePlan }, options = {
             init() {
                 // Keep default move/copy/delete toolbar commands, then append the host navigation action.
                 if (!this.get('sourceNonvisual') && options.onRequestEditHtml) {
-                    const toolbar = (this.get('toolbar') ?? []);
+                    // GrapesJS's `Component.initToolbar` fills `toolbar` (even over an explicit `null`) before a
+                    // type's `init` runs, and a component cannot be constructed without the editor model it
+                    // needs for that — so the old `?? []` fallback here could not run.
+                    const toolbar = this.get('toolbar');
                     this.set('toolbar', [...toolbar.filter(item => item.command !== command), {
                             label: options.editHtmlLabel ?? 'Edit HTML', command,
                             // GrapesJS sizes every toolbar item as a 26px icon square; a text label overflowed past the

package/dist/features/html-editor/react/hooks/useInteractiveHtmlEditor.js

@@ -259,10 +259,10 @@ export function useInteractiveHtmlEditor(html, onChange, isProtectedElement, can
         };
         const serialize = () => {
             try {
-                const next = serializeEditorSource({ editor, html, edits: dirty, sourcePlan }, { structuralChange });
-                if (next.includes(sourcePlan.markerAttribute))
-                    throw new EditorSourceError();
-                return next;
+                // No separate marker-leak check here: `serializeEditorSource` already throws an
+                // `EditorSourceError` when its result carries `sourcePlan.markerAttribute`, so a second
+                // identical check on the same result could never fire.
+                return serializeEditorSource({ editor, html, edits: dirty, sourcePlan }, { structuralChange });
             }
             catch (error) {
                 const failure = error instanceof EditorSourceError ? error : new EditorSourceError();

package/dist/features/html-editor/source-splice.js

@@ -11,6 +11,20 @@ function isElement(node) {
 function hasChildNodes(node) {
     return 'childNodes' in node;
 }
+function recordInnerRange({ node, currentPath, out }, _options = {}) {
+    const location = node.sourceCodeLocation;
+    // parse5 attaches a location only to elements created from a start-tag token, so a located
+    // element always has `startTag` (implied elements — a `tbody`, a `</p>`- or `</br>`-created
+    // element — carry no location at all and are skipped). Requiring `startTag` here replaces the old
+    // `: location.endOffset` fallback, which no parsed element could reach.
+    if (location?.startTag) {
+        // Void elements (`<br>`, `<img>`) have no `endTag` and no inner content: their range is
+        // empty (`start === end`), anchored at the end of the start tag.
+        const start = location.startTag.endOffset;
+        const end = location.endTag ? location.endTag.startOffset : start;
+        out.set(pathKey(currentPath), { start, end, tagName: node.tagName });
+    }
+}
 /**
  * Walks one level of element-only children (recursing into each), assigning each a path and
  * recording its source range. `style`/`script` children are skipped without consuming a path slot.
@@ -25,14 +39,7 @@ function indexChildren(children, parentPath, out) {
         if (UNINDEXED_TAGS.has(node.tagName))
             continue;
         const currentPath = [...parentPath, elementIndex];
-        const location = node.sourceCodeLocation;
-        if (location) {
-            // Void elements (`<br>`, `<img>`) have no `endTag` and no inner content: their range is
-            // empty (`start === end`), anchored at the end of the start tag.
-            const start = location.startTag ? location.startTag.endOffset : location.endOffset;
-            const end = location.endTag ? location.endTag.startOffset : start;
-            out.set(pathKey(currentPath), { start, end, tagName: node.tagName });
-        }
+        recordInnerRange({ node, currentPath, out }, {});
         if (hasChildNodes(node))
             indexChildren(node.childNodes, currentPath, out);
         elementIndex++;
@@ -87,6 +94,35 @@ export function spliceElementInner(html, path, expectedTagName, newInner) {
     return html.slice(0, range.start) + newInner + html.slice(range.end);
 }
 const VOID_TAGS = new Set(['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source', 'track', 'wbr']);
+function sourceOuterEnd({ node, html }, _options = {}) {
+    const loc = node.sourceCodeLocation;
+    const start = loc?.startTag;
+    const foreignSelfClosing = node.namespaceURI !== 'http://www.w3.org/1999/xhtml' && !!start
+        && html.slice(start.startOffset, start.endOffset).endsWith('/>');
+    if (VOID_TAGS.has(node.tagName) || foreignSelfClosing)
+        return start?.endOffset;
+    return loc?.endTag?.endOffset;
+}
+function sourceOuterRange({ node, html, parentStart, parentEnd }, _options = {}) {
+    const start = node.sourceCodeLocation?.startTag;
+    const outerEnd = sourceOuterEnd({ node, html }, {});
+    const boundsValid = !!start && outerEnd !== undefined && start.startOffset >= parentStart && outerEnd <= parentEnd;
+    // Template content is a separate fragment; it has no ordinary component path/shell here.
+    if (!boundsValid || node.tagName === 'template')
+        return null;
+    return { outerStart: start.startOffset, outerEnd: outerEnd, openingEnd: start.endOffset };
+}
+function invalidateOverlappingSiblings({ elements }, _options = {}) {
+    // Foster parenting can move a valid-looking node ahead of a source-earlier table. Neither
+    // sibling can be trusted as a model-addressable source owner in that recovered ordering.
+    for (let i = 1; i < elements.length; i++) {
+        const previous = elements[i - 1];
+        const current = elements[i];
+        if (previous.outerRange && current.outerRange && previous.outerRange.outerEnd > current.outerRange.outerStart) {
+            previous.sourceSupported = current.sourceSupported = false;
+        }
+    }
+}
 /**
  * Extends the inner-splice index without changing its published range shape. Missing end tags,
  * implicit nodes and reordered/foster-parented children cannot establish an opaque source owner.
@@ -94,41 +130,26 @@ const VOID_TAGS = new Set(['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'i
  */
 export function indexSourceElements({ html }, _options = {}) {
     const fragment = parseFragment(html, { sourceCodeLocationInfo: true });
-    const walk = (nodes, parentPath, parentStart, parentEnd) => {
+    const walk = ({ nodes, parentPath, parentStart, parentEnd }, _options = {}) => {
         let slot = 0;
         const elements = nodes.filter(isElement).map(node => {
             const atom = UNINDEXED_TAGS.has(node.tagName);
             const path = atom ? null : [...parentPath, slot++];
             const loc = node.sourceCodeLocation;
-            const start = loc?.startTag;
-            const end = loc?.endTag;
-            const voidTag = VOID_TAGS.has(node.tagName) || (node.namespaceURI !== 'http://www.w3.org/1999/xhtml'
-                && !!start && html.slice(start.startOffset, start.endOffset).endsWith('/>'));
-            const outerEnd = voidTag ? start?.endOffset : end?.endOffset;
-            const boundsValid = !!start && outerEnd !== undefined && start.startOffset >= parentStart && outerEnd <= parentEnd;
-            const children = walk(node.childNodes, path ?? parentPath, start?.endOffset ?? parentStart, end?.startOffset ?? parentEnd);
-            // Template content is a separate fragment; it has no ordinary component path/shell here.
-            const valid = boundsValid && node.tagName !== 'template';
+            const children = walk({ nodes: node.childNodes, parentPath: path ?? parentPath, parentStart: loc?.startTag?.endOffset ?? parentStart, parentEnd: loc?.endTag?.startOffset ?? parentEnd }, {});
+            const outerRange = sourceOuterRange({ node, html, parentStart, parentEnd }, {});
             return {
                 tagName: node.tagName,
                 attributes: Object.fromEntries(node.attrs.map(attr => [attr.name, attr.value])),
                 path,
-                outerRange: valid ? { outerStart: start.startOffset, outerEnd: outerEnd, openingEnd: start.endOffset } : null,
-                sourceSupported: valid && children.every(child => child.sourceSupported),
+                outerRange,
+                sourceSupported: !!outerRange && children.every(child => child.sourceSupported),
                 children,
             };
         });
-        // Foster parenting can move a valid-looking node ahead of a source-earlier table. Neither
-        // sibling can be trusted as a model-addressable source owner in that recovered ordering.
-        for (let i = 1; i < elements.length; i++) {
-            const previous = elements[i - 1];
-            const current = elements[i];
-            if (previous.outerRange && current.outerRange && previous.outerRange.outerEnd > current.outerRange.outerStart) {
-                previous.sourceSupported = current.sourceSupported = false;
-            }
-        }
+        invalidateOverlappingSiblings({ elements }, {});
         return elements;
     };
-    return walk(fragment.childNodes, [], 0, html.length);
+    return walk({ nodes: fragment.childNodes, parentPath: [], parentStart: 0, parentEnd: html.length }, {});
 }
 //# sourceMappingURL=source-splice.js.map

package/dist/features/i18n/dictionaries/settings-dialog.ja.js

@@ -1,5 +1,6 @@
 export const SETTINGS_DIALOG_JA = {
     "I removed what looked like a key from your message. If it was real, rotate it. Use the secure form to save it.": "メッセージからキーと思われる文字列を削除しました。本物のキーだった場合は再発行してください。保存には安全なフォームを使ってください。",
+    // eslint-disable-next-line sonarjs/no-hardcoded-passwords -- Translation of user-facing credential-safety guidance; the value is prose, not a password.
     "Use the secure form to save keys, tokens, passwords, and secrets. Chat answers are sent to the assistant.": "キー、トークン、パスワード、シークレットの保存には安全なフォームを使ってください。チャットの回答はアシスタントに送信されます。",
     '# My skill\n\n1. Explain the workflow.\n2. Describe the inputs and outputs.': '# マイスキル\n\n1. ワークフローを説明してください。\n2. 入力と出力を説明してください。',
     'A custom path override did not work, so this used the automatically detected binary instead.': 'カスタムパスの上書きが機能しなかったため、自動検出されたバイナリを代わりに使用しました。',

package/dist/features/i18n/dictionaries/settings-dialog.zh-CN.js

@@ -1,5 +1,6 @@
 export const SETTINGS_DIALOG_ZH_CN = {
     "I removed what looked like a key from your message. If it was real, rotate it. Use the secure form to save it.": "我已从你的消息中移除疑似密钥的内容。如果是真实密钥，请更换它。请使用安全表单保存。",
+    // eslint-disable-next-line sonarjs/no-hardcoded-passwords -- Translation of user-facing credential-safety guidance; the value is prose, not a password.
     "Use the secure form to save keys, tokens, passwords, and secrets. Chat answers are sent to the assistant.": "请使用安全表单保存密钥、令牌、密码和机密信息。聊天回答会发送给助手。",
     '# My skill\n\n1. Explain the workflow.\n2. Describe the inputs and outputs.': '# 我的技能\n\n1. 说明工作流程。\n2. 描述输入和输出。',
     'A custom path override did not work, so this used the automatically detected binary instead.': '自定义路径覆盖未生效，因此改用自动检测到的二进制文件。',

package/dist/features/i18n/dictionaries/settings-dialog.zh-TW.js

@@ -1,5 +1,6 @@
 export const SETTINGS_DIALOG_ZH_TW = {
     "I removed what looked like a key from your message. If it was real, rotate it. Use the secure form to save it.": "我已從你的訊息中移除疑似金鑰的內容。如果是真實金鑰，請更換它。請使用安全表單儲存。",
+    // eslint-disable-next-line sonarjs/no-hardcoded-passwords -- Translation of user-facing credential-safety guidance; the value is prose, not a password.
     "Use the secure form to save keys, tokens, passwords, and secrets. Chat answers are sent to the assistant.": "請使用安全表單儲存金鑰、權杖、密碼和機密資訊。聊天回答會傳送給助理。",
     '# My skill\n\n1. Explain the workflow.\n2. Describe the inputs and outputs.': '# 我的技能\n\n1. 說明工作流程。\n2. 描述輸入與輸出。',
     'A custom path override did not work, so this used the automatically detected binary instead.': '自訂路徑覆寫未生效，因此改用自動偵測到的二進位檔。',

package/dist/features/i18n/locale.js

@@ -21,25 +21,29 @@ export function resolveSystemLocale(languages, supportedLocales) {
         const normalized = raw.trim();
         if (!normalized)
             continue;
-        const exact = supportedLocales.find((locale) => locale.toLowerCase() === normalized.toLowerCase());
-        if (exact)
-            return exact;
-        const [language, regionOrScript] = normalized.toLowerCase().split('-');
-        if (language === 'zh') {
-            const isTraditionalScript = regionOrScript === 'hant' ||
-                regionOrScript === 'tw' ||
-                regionOrScript === 'hk' ||
-                regionOrScript === 'mo';
-            const candidate = isTraditionalScript ? 'zh-TW' : 'zh-CN';
-            if (supportedLocales.includes(candidate))
-                return candidate;
-        }
-        const baseMatch = supportedLocales.find((locale) => locale.toLowerCase().split('-')[0] === language);
-        if (baseMatch)
-            return baseMatch;
+        const match = matchPreferredLocale({ normalized, supportedLocales });
+        if (match)
+            return match;
     }
     return null;
 }
+function matchPreferredLocale({ normalized, supportedLocales }, _options = {}) {
+    const exact = supportedLocales.find((locale) => locale.toLowerCase() === normalized.toLowerCase());
+    if (exact)
+        return exact;
+    const [language, regionOrScript] = normalized.toLowerCase().split('-');
+    if (language === 'zh') {
+        const isTraditionalScript = regionOrScript === 'hant' ||
+            regionOrScript === 'tw' ||
+            regionOrScript === 'hk' ||
+            regionOrScript === 'mo';
+        const candidate = isTraditionalScript ? 'zh-TW' : 'zh-CN';
+        if (supportedLocales.includes(candidate))
+            return candidate;
+    }
+    const baseMatch = supportedLocales.find((locale) => locale.toLowerCase().split('-')[0] === language);
+    return baseMatch || null;
+}
 /** Reads `navigator.languages` (falling back to `navigator.language`). */
 function browserPreferredLanguages() {
     if (typeof navigator === 'undefined')