@jini-ai/platform 0.5.9 → 0.6.10

package/dist/secrets/keyring.env.js

@@ -24,15 +24,7 @@ export class EnvOrFileKeyring {
     hkdfSalt;
     cachedRootKey;
     constructor(required, optional = {}) {
-        requireHostOption(required?.envVarName, "envVarName");
-        requireHostOption(required?.keyFilePath, "keyFilePath");
-        requireHostOption(required?.hkdfSalt, "hkdfSalt");
-        if (typeof required.env?.read !== "function")
-            throw new TypeError("env.read is required");
-        if (typeof required.allowFileFallback !== "boolean")
-            throw new TypeError("allowFileFallback must be an explicit boolean");
-        if (typeof required.allowFileAutoGenerate !== "boolean")
-            throw new TypeError("allowFileAutoGenerate must be an explicit boolean");
+        assertEnvOrFileKeyringRequired({ required });
         this.messages = optional.messages ?? defaultPlatformMessages;
         this.env = required.env;
         this.hkdfSalt = required.hkdfSalt;
@@ -178,7 +170,7 @@ function unusableRootKeyMessage(input) {
     const refusal = `${input.subject} is not usable as a root key: ${input.detail}. The keyring refuses to derive any key material from it rather than sealing under a shortened or empty key.`;
     if (input.sealedWarningSubject === undefined)
         return refusal;
-    return (`${refusal} ${(input.messages ?? defaultPlatformMessages).rootKeySealedWarning({ subject: input.sealedWarningSubject })}` +
+    return (`${refusal} ${input.messages.rootKeySealedWarning({ subject: input.sealedWarningSubject })}` +
         `not from a real ${ROOT_KEY_LENGTH_BYTES}-byte key, so those stored credentials are not protected as intended — with empty or very short material the derived key is computable from published constants. ` +
         `Replacing or regenerating the key will NOT restore them; it will make them unreadable. ` +
         `Do not overwrite, delete or regenerate this key until you have decided what to do with the credentials already stored.`);
@@ -264,6 +256,18 @@ function isAlreadyExistsError(err) {
     const code = err.code;
     return code === "EEXIST" || code === "ELOOP";
 }
+/** Every source permission is explicit; checked in order so the first missing option is named. */
+function assertEnvOrFileKeyringRequired({ required }) {
+    requireHostOption(required?.envVarName, "envVarName");
+    requireHostOption(required?.keyFilePath, "keyFilePath");
+    requireHostOption(required?.hkdfSalt, "hkdfSalt");
+    if (typeof required.env?.read !== "function")
+        throw new TypeError("env.read is required");
+    if (typeof required.allowFileFallback !== "boolean")
+        throw new TypeError("allowFileFallback must be an explicit boolean");
+    if (typeof required.allowFileAutoGenerate !== "boolean")
+        throw new TypeError("allowFileAutoGenerate must be an explicit boolean");
+}
 function requireHostOption(value, name) {
     if (value === undefined || value === null)
         throw new TypeError(`${name} is required`);

package/dist/toolchain.js

@@ -25,6 +25,14 @@ function resolveUserScopedHome(raw, home) {
     }
     return isAbsolute(value) ? value : null;
 }
+/** @internal Trim an optional env value, treating a missing/non-string value as blank. */
+function trimmedEnv(value) {
+    return typeof value === "string" ? value.trim() : "";
+}
+/** @internal Whether the current process runs on Windows (read live so tests can swap `process.platform`). */
+function isWindows() {
+    return process.platform === "win32";
+}
 // Single source of truth for "user-level CLI install locations the daemon
 // must search even when launched with a minimal PATH". GUI launchers
 // (macOS .app bundles, Linux .desktop files) typically inherit a stripped
@@ -46,7 +54,7 @@ function resolveUserScopedHome(raw, home) {
  */
 export function wellKnownUserToolchainBins(options = {}) {
     const home = options.home ?? homedir();
-    const includeSystemBins = options.includeSystemBins ?? process.platform !== "win32";
+    const includeSystemBins = options.includeSystemBins ?? !isWindows();
     const env = options.env ?? process.env;
     const dirs = [];
     // Vite+ global installs expose CLI shims from VP_HOME/bin (default
@@ -57,6 +65,40 @@ export function wellKnownUserToolchainBins(options = {}) {
     if (vpHome) {
         dirs.push(join(vpHome, "bin"));
     }
+    dirs.push(...npmPrefixBins({ env, home }));
+    dirs.push(...conventionalUserBins({ home }));
+    dirs.push(...windowsUserBins({ env, home }));
+    // Mise shims: makes every tool installed with `mise install` visible to
+    // GUI-launched daemons even when the process inherits a stripped PATH.
+    // Respect MISE_DATA_DIR (the official way to relocate the whole mise tree).
+    // We only fall back to the legacy ~/.mise/shims path when no explicit
+    // MISE_DATA_DIR override is provided.
+    const miseDataOverride = resolveUserScopedHome(env.MISE_DATA_DIR, home);
+    const miseData = miseDataOverride ?? join(home, ".local", "share", "mise");
+    dirs.push(join(miseData, "shims"));
+    if (!miseDataOverride) {
+        dirs.push(join(home, ".mise", "shims"));
+    }
+    if (includeSystemBins) {
+        dirs.push("/opt/homebrew/bin", "/usr/local/bin");
+    }
+    // Per-version Node toolchains: scan the install root and surface every
+    // version directory's bin folder. Best-effort — missing roots simply
+    // contribute nothing.
+    // When MISE_DATA_DIR is set we use the same root for consistency with shims.
+    const miseInstalls = join(miseData, "installs");
+    // Surface bin dirs for npm-packaged toolchains installed under the mise
+    // installs root (e.g. `npm-openai-codex`).
+    dirs.push(...existingChildBinDirs(join(miseInstalls, "npm-openai-codex"), ["bin"]));
+    for (const installRoot of nodeInstallRoots({ env, home, miseInstalls })) {
+        dirs.push(...existingChildBinDirs(installRoot.root, installRoot.segments));
+    }
+    return dirs;
+}
+/** @internal The npm-prefix bins derived from the env plus the Windows `%APPDATA%\npm` default. */
+function npmPrefixBins(input) {
+    const { env, home } = input;
+    const dirs = [];
     // The user's *explicit* npm prefix outranks every conventional
     // location below — including `~/.local/bin`. The env var is the
     // user's current npm configuration, so a binary installed via
@@ -72,21 +114,18 @@ export function wellKnownUserToolchainBins(options = {}) {
     // Trim before length-checking so accidental whitespace-only values
     // (`NPM_CONFIG_PREFIX=" "`) do not produce a `/bin`-suffixed garbage
     // entry.
-    const npmPrefixRaw = env.NPM_CONFIG_PREFIX ?? env.npm_config_prefix;
-    if (typeof npmPrefixRaw === "string") {
-        const npmPrefix = npmPrefixRaw.trim();
-        if (npmPrefix.length > 0) {
-            // Unix: npm global binaries live in <prefix>/bin. Always add it as a
-            // search-path candidate — existence is irrelevant for a PATH directory,
-            // and this preserves the long-standing helper contract.
-            dirs.push(join(npmPrefix, "bin"));
-            // Windows: npm installs global binaries directly into the prefix root
-            // (there is no /bin subdirectory), so add the root as well. Additive —
-            // the <prefix>/bin entry above is left untouched for cross-platform
-            // parity.
-            if (process.platform === "win32") {
-                dirs.push(npmPrefix);
-            }
+    const npmPrefix = trimmedEnv(env.NPM_CONFIG_PREFIX ?? env.npm_config_prefix);
+    if (npmPrefix.length > 0) {
+        // Unix: npm global binaries live in <prefix>/bin. Always add it as a
+        // search-path candidate — existence is irrelevant for a PATH directory,
+        // and this preserves the long-standing helper contract.
+        dirs.push(join(npmPrefix, "bin"));
+        // Windows: npm installs global binaries directly into the prefix root
+        // (there is no /bin subdirectory), so add the root as well. Additive —
+        // the <prefix>/bin entry above is left untouched for cross-platform
+        // parity.
+        if (isWindows()) {
+            dirs.push(npmPrefix);
         }
     }
     // Windows: %APPDATA%\npm is npm's default global prefix. NPM_CONFIG_PREFIX /
@@ -94,53 +133,59 @@ export function wellKnownUserToolchainBins(options = {}) {
     // child-process environments, so the block above no-ops for most Windows
     // users. Add the default location unconditionally — consistent with the
     // conventional dirs below, which are also added without an existence check.
-    if (process.platform === "win32") {
+    if (isWindows()) {
         dirs.push(join(home, "AppData", "Roaming", "npm"));
     }
-    dirs.push(join(home, ".local", "bin"), join(home, ".vite-plus", "bin"), join(home, ".kimi-code", "bin"), join(home, ".opencode", "bin"), join(home, ".bun", "bin"), join(home, ".volta", "bin"), join(home, ".asdf", "shims"), join(home, "Library", "pnpm"), join(home, ".cargo", "bin"), 
-    // Common user-level npm prefixes for sudo-free global installs.
-    // ~/.npm-global is the dominant non-canonical convention shipped
-    // in most third-party "fix npm EACCES" tutorials, and
-    // ~/.npm-packages is the second-most common variant. Without
-    // these, GUI-launched daemons miss `npm i -g`'d CLIs even though
-    // they resolve cleanly from the user's shell.
-    join(home, ".npm-global", "bin"), join(home, ".npm-packages", "bin"), 
-    // Other common user-level toolchains that install CLI shims outside the
-    // Node ecosystem but still ship agent CLIs (or their dependencies):
-    // Deno's install root, Go's default GOBIN, and pyenv's shim dir. All are
-    // best-effort — a missing dir contributes nothing.
-    join(home, ".deno", "bin"), join(home, "go", "bin"), join(home, ".pyenv", "shims"));
+    return dirs;
+}
+/** @internal Conventional home-relative toolchain bin dirs, added without an existence check. */
+function conventionalUserBins(input) {
+    const { home } = input;
+    return [
+        join(home, ".local", "bin"),
+        join(home, ".vite-plus", "bin"),
+        join(home, ".kimi-code", "bin"),
+        join(home, ".opencode", "bin"),
+        join(home, ".bun", "bin"),
+        join(home, ".volta", "bin"),
+        join(home, ".asdf", "shims"),
+        join(home, "Library", "pnpm"),
+        join(home, ".cargo", "bin"),
+        // Common user-level npm prefixes for sudo-free global installs.
+        // ~/.npm-global is the dominant non-canonical convention shipped
+        // in most third-party "fix npm EACCES" tutorials, and
+        // ~/.npm-packages is the second-most common variant. Without
+        // these, GUI-launched daemons miss `npm i -g`'d CLIs even though
+        // they resolve cleanly from the user's shell.
+        join(home, ".npm-global", "bin"),
+        join(home, ".npm-packages", "bin"),
+        // Other common user-level toolchains that install CLI shims outside the
+        // Node ecosystem but still ship agent CLIs (or their dependencies):
+        // Deno's install root, Go's default GOBIN, and pyenv's shim dir. All are
+        // best-effort — a missing dir contributes nothing.
+        join(home, ".deno", "bin"),
+        join(home, "go", "bin"),
+        join(home, ".pyenv", "shims"),
+    ];
+}
+/** @internal Windows-only scoop shims and `%APPDATA%\npm`; empty on POSIX. */
+function windowsUserBins(input) {
     // Windows-only user install roots that GUI launches miss. Scoop drops
     // shims under ~/scoop/shims, and npm's global prefix on Windows defaults
     // to %APPDATA%\npm rather than a `bin` subdir.
-    if (process.platform === "win32") {
-        dirs.push(join(home, "scoop", "shims"));
-        const appData = typeof env.APPDATA === "string" ? env.APPDATA.trim() : "";
-        if (appData.length > 0) {
-            dirs.push(join(appData, "npm"));
-        }
+    if (!isWindows())
+        return [];
+    const dirs = [join(input.home, "scoop", "shims")];
+    const appData = trimmedEnv(input.env.APPDATA);
+    if (appData.length > 0) {
+        dirs.push(join(appData, "npm"));
     }
-    // Mise shims: makes every tool installed with `mise install` visible to
-    // GUI-launched daemons even when the process inherits a stripped PATH.
-    // Respect MISE_DATA_DIR (the official way to relocate the whole mise tree).
-    // We only fall back to the legacy ~/.mise/shims path when no explicit
-    // MISE_DATA_DIR override is provided.
-    const miseDataOverride = resolveUserScopedHome(env.MISE_DATA_DIR, home);
-    const miseData = miseDataOverride || join(home, ".local", "share", "mise");
-    dirs.push(join(miseData, "shims"));
-    if (!miseDataOverride) {
-        dirs.push(join(home, ".mise", "shims"));
-    }
-    if (includeSystemBins) {
-        dirs.push("/opt/homebrew/bin", "/usr/local/bin");
-    }
-    // Per-version Node toolchains: scan the install root and surface every
-    // version directory's bin folder. Best-effort — missing roots simply
-    // contribute nothing.
-    // When MISE_DATA_DIR is set we use the same root for consistency with shims.
-    const miseInstalls = join(miseData, "installs");
-    dirs.push(...existingMiseNpmPackageBinDirs(miseInstalls));
-    const nodeInstallRoots = [
+    return dirs;
+}
+/** @internal Per-version Node install roots to probe, in priority order (mise, nvm, fnm, then Windows fnm). */
+function nodeInstallRoots(input) {
+    const { env, home, miseInstalls } = input;
+    const roots = [
         {
             root: join(miseInstalls, "node"),
             segments: ["bin"],
@@ -166,38 +211,23 @@ export function wellKnownUserToolchainBins(options = {}) {
     // inherits a stripped PATH and reads no shell rc, so without an explicit
     // probe fnm-managed Node — and every agent CLI it runs — is silently
     // undetected on Windows. See issues #3517 and #3062.
-    if (process.platform === "win32") {
-        const fnmDirOverride = typeof env.FNM_DIR === "string" ? env.FNM_DIR.trim() : "";
-        const fnmRoots = [];
-        if (fnmDirOverride.length > 0) {
-            fnmRoots.push(fnmDirOverride);
-        }
-        else {
-            for (const base of [env.LOCALAPPDATA, env.APPDATA]) {
-                const trimmed = typeof base === "string" ? base.trim() : "";
-                if (trimmed.length > 0)
-                    fnmRoots.push(join(trimmed, "fnm"));
-            }
-        }
-        for (const fnmRoot of fnmRoots) {
-            nodeInstallRoots.push({ root: join(fnmRoot, "node-versions"), segments: ["installation"] });
+    if (isWindows()) {
+        for (const fnmRoot of windowsFnmRoots({ env })) {
+            roots.push({ root: join(fnmRoot, "node-versions"), segments: ["installation"] });
         }
     }
-    for (const installRoot of nodeInstallRoots) {
-        for (const dir of existingChildBinDirs(installRoot.root, installRoot.segments)) {
-            dirs.push(dir);
-        }
-    }
-    return dirs;
+    return roots;
 }
-/** @internal Surface bin dirs for npm-packaged toolchains installed under a mise installs root (e.g. `npm-openai-codex`). */
-function existingMiseNpmPackageBinDirs(root) {
-    const out = [];
-    for (const packageName of ["npm-openai-codex"]) {
-        const packageRoot = join(root, packageName);
-        out.push(...existingChildBinDirs(packageRoot, ["bin"]));
-    }
-    return out;
+/** @internal Windows fnm roots: `FNM_DIR` when set, else `%LOCALAPPDATA%\fnm` then `%APPDATA%\fnm`. */
+function windowsFnmRoots(input) {
+    const { env } = input;
+    const fnmDirOverride = trimmedEnv(env.FNM_DIR);
+    if (fnmDirOverride.length > 0)
+        return [fnmDirOverride];
+    return [env.LOCALAPPDATA, env.APPDATA]
+        .map(trimmedEnv)
+        .filter((base) => base.length > 0)
+        .map((base) => join(base, "fnm"));
 }
 /** @internal List existing `<root>/<versionDir>/<...segments>` directories, version-sorted, skipping non-directories. */
 function existingChildBinDirs(root, segments) {
@@ -209,7 +239,9 @@ function existingChildBinDirs(root, segments) {
     catch {
         return out;
     }
-    for (const entry of sortVersionedDirEntries(entries)) {
+    // Sort directory entries by semver-like name (newest first), falling back to locale order.
+    const sorted = [...entries].sort((left, right) => compareVersionLikeDirNames(left.name, right.name));
+    for (const entry of sorted) {
         if (!entry.isDirectory() && !entry.isSymbolicLink())
             continue;
         const candidate = join(root, entry.name, ...segments);
@@ -218,10 +250,6 @@ function existingChildBinDirs(root, segments) {
     }
     return out;
 }
-/** @internal Sort directory entries by semver-like name (newest first), falling back to locale order. */
-function sortVersionedDirEntries(entries) {
-    return [...entries].sort((left, right) => compareVersionLikeDirNames(left.name, right.name));
-}
 /** @internal Compare two version-like directory names descending; semver-parseable names precede non-parseable ones. */
 function compareVersionLikeDirNames(left, right) {
     const leftSemver = parseVersionLikeDirName(left);

package/dist/web/html-document.js

@@ -83,65 +83,63 @@ export function imageSource({ img }, _optional = {}) {
         return src;
     return attr({ element: img, name: "data-src" }) ?? attr({ element: img, name: "data-lazy-src" }) ?? attr({ element: img, name: "srcset" })?.trim().split(/\s+/)[0];
 }
+/** A Map, not an object literal, so tag names such as `constructor` never hit Object.prototype. */
+const COLLECTED = new Map([["a", "anchors"], ["img", "images"], ["link", "linkTags"], ["meta", "metas"]]);
 function collect(document) {
     const raw = { anchors: [], images: [], linkTags: [], metas: [] };
     for (const node of walk(document)) {
         if (!isElement(node))
             continue;
-        switch (node.tagName) {
-            case "a":
-                raw.anchors.push(node);
-                break;
-            case "img":
-                raw.images.push(node);
-                break;
-            case "link":
-                raw.linkTags.push(node);
-                break;
-            case "meta":
-                raw.metas.push(node);
-                break;
-            case "title":
-                raw.title ??= node;
-                break;
-            case "html":
-                raw.html ??= node;
-                break;
-            case "base":
-                raw.base ??= attr({ element: node, name: "href" });
-                break;
-        }
+        const list = COLLECTED.get(node.tagName);
+        if (list)
+            raw[list].push(node);
+        else if (node.tagName === "title" || node.tagName === "html")
+            raw[node.tagName] ??= node;
+        // The first base WITH an href wins, as in browsers.
+        else if (node.tagName === "base")
+            raw.base ??= attr({ element: node, name: "href" });
     }
     return raw;
 }
+/** Meta keys whose values are URLs and are returned absolute. */
+const URL_META = new Set(["og:image", "og:url", "twitter:image"]);
+/** `<link rel>` tokens copied into meta, in emission order, under their meta key. */
+const LINK_META = [["canonical", "canonical"], ["icon", "favicon"], ["apple-touch-icon", "apple-touch-icon"]];
 function readMeta(raw, base) {
     const meta = {};
-    const put = (key, value) => {
-        if (value === undefined || key in meta || Object.keys(meta).length >= MAX_META)
-            return;
-        meta[key] = collapse(value).slice(0, MAX_META_VALUE);
-    };
     for (const element of raw.metas) {
-        const property = attr({ element, name: "property" })?.toLowerCase();
-        const name = attr({ element, name: "name" })?.toLowerCase();
-        const content = attr({ element, name: "content" });
-        if (property?.startsWith("og:"))
-            put(property, property === "og:image" || property === "og:url" ? absolute({ raw: content, base, protocols: ASSET_PROTOCOLS }) : content);
-        else if (name && META_NAMES.has(name))
-            put(name, name === "twitter:image" ? absolute({ raw: content, base, protocols: ASSET_PROTOCOLS }) : content);
+        const entry = metaTagEntry({ element, base });
+        if (entry)
+            putMeta({ meta, key: entry[0], value: entry[1] });
     }
     for (const element of raw.linkTags) {
-        const rel = (attr({ element, name: "rel" }) ?? "").toLowerCase().split(/\s+/);
+        const rels = relTokens({ element });
         const href = absolute({ raw: attr({ element, name: "href" }), base, protocols: ASSET_PROTOCOLS });
-        if (rel.includes("canonical"))
-            put("canonical", href);
-        if (rel.includes("icon"))
-            put("favicon", href);
-        if (rel.includes("apple-touch-icon"))
-            put("apple-touch-icon", href);
+        for (const [rel, key] of LINK_META)
+            if (rels.includes(rel))
+                putMeta({ meta, key, value: href });
     }
     return meta;
 }
+/** First value per key wins; the entry count and each value are capped. */
+function putMeta({ meta, key, value }, _optional = {}) {
+    if (value === undefined || key in meta || Object.keys(meta).length >= MAX_META)
+        return;
+    meta[key] = collapse(value).slice(0, MAX_META_VALUE);
+}
+/** Every `og:*` property, or an allowlisted `name`; URL-valued keys are resolved. */
+function metaTagEntry({ element, base }, _optional = {}) {
+    const property = attr({ element, name: "property" })?.toLowerCase();
+    const name = attr({ element, name: "name" })?.toLowerCase();
+    const key = property?.startsWith("og:") ? property : name && META_NAMES.has(name) ? name : undefined;
+    if (key === undefined)
+        return undefined;
+    const content = attr({ element, name: "content" });
+    return [key, URL_META.has(key) ? absolute({ raw: content, base, protocols: ASSET_PROTOCOLS }) : content];
+}
+function relTokens({ element }, _optional = {}) {
+    return (attr({ element, name: "rel" }) ?? "").toLowerCase().split(/\s+/);
+}
 function readLinks(anchors, base, pageHost) {
     const seen = new Set();
     const links = [];
@@ -179,9 +177,8 @@ function readImages(images, base) {
 function readStylesheets(linkTags, base) {
     const out = new Set();
     for (const element of linkTags) {
-        const rel = (attr({ element, name: "rel" }) ?? "").toLowerCase().split(/\s+/);
         const href = absolute({ raw: attr({ element, name: "href" }), base, protocols: ASSET_PROTOCOLS });
-        if (rel.includes("stylesheet") && href && out.size < MAX_STYLESHEETS)
+        if (relTokens({ element }).includes("stylesheet") && href && out.size < MAX_STYLESHEETS)
             out.add(href);
     }
     return [...out];
@@ -202,20 +199,25 @@ export function readHtmlDocument({ html, pageUrl }, _optional = {}) {
     const pageHost = siteHost(new URL(pageUrl).hostname);
     const links = readLinks(raw.anchors, base, pageHost);
     const images = readImages(raw.images, base);
-    const description = raw.metas.find(m => attr({ element: m, name: "name" })?.toLowerCase() === "description");
-    const title = raw.title ? textOf(raw.title) : "";
-    const lang = raw.html ? attr({ element: raw.html, name: "lang" })?.trim() : undefined;
-    const descriptionText = description ? collapse(attr({ element: description, name: "content" }) ?? "") : "";
     return {
-        ...(title ? { title } : {}),
-        ...(descriptionText ? { description: descriptionText } : {}),
-        ...(lang ? { lang } : {}),
+        ...headFacts({ raw }),
         links: links.links, linksTruncated: links.truncated,
         images: images.images, imagesTruncated: images.truncated,
         stylesheets: readStylesheets(raw.linkTags, base),
         meta: readMeta(raw, base),
     };
 }
+/** Title, description and lang; empty ones are absent keys. */
+function headFacts({ raw }, _optional = {}) {
+    const description = raw.metas.find(m => attr({ element: m, name: "name" })?.toLowerCase() === "description");
+    const facts = {
+        title: raw.title ? textOf(raw.title) : "",
+        description: description ? collapse(attr({ element: description, name: "content" }) ?? "") : "",
+        // parse5 always synthesizes the <html> element, so collect() always finds one.
+        lang: attr({ element: raw.html, name: "lang" })?.trim(),
+    };
+    return Object.fromEntries(Object.entries(facts).filter(([, value]) => value));
+}
 /**
  * Visible text with one line per block element; scripts, styles, `<head>`, SVG and embeds omitted.
  * @complexity O(nodes).
@@ -225,28 +227,30 @@ export function htmlToText({ html }, _optional = {}) {
     const out = [];
     while (pending.length) {
         const node = pending.pop();
-        if (node === "\n") {
-            out.push("\n");
-            continue;
-        }
-        if (isElement(node) && INVISIBLE.has(node.tagName))
-            continue;
-        if (node.nodeName === "#text" && "value" in node) {
-            out.push(node.value);
-            continue;
-        }
-        if (!("childNodes" in node))
-            continue;
-        const block = isElement(node) && BLOCKS.has(node.tagName);
-        if (block) {
+        if (node === "\n")
             out.push("\n");
-            pending.push("\n");
-        }
-        for (let i = node.childNodes.length - 1; i >= 0; i--)
-            pending.push(node.childNodes[i]);
+        else
+            visitText({ node, pending, out });
     }
     return out.join("").split("\n").map(line => line.replace(/[^\S\n]+/g, " ").trim()).filter(Boolean).join("\n");
 }
+/** Emits a text node, or schedules a visible node's children, bracketed by newlines for blocks. */
+function visitText({ node, pending, out }, _optional = {}) {
+    if (isElement(node) && INVISIBLE.has(node.tagName))
+        return;
+    if (node.nodeName === "#text" && "value" in node) {
+        out.push(node.value);
+        return;
+    }
+    if (!("childNodes" in node))
+        return;
+    if (isElement(node) && BLOCKS.has(node.tagName)) {
+        out.push("\n");
+        pending.push("\n");
+    }
+    for (let i = node.childNodes.length - 1; i >= 0; i--)
+        pending.push(node.childNodes[i]);
+}
 /**
  * The page HTML with `<script>`, `<noscript>`, `<template>`, comments, `on*` handler attributes and
  * `javascript:` attribute values removed (styles and classes kept: theming needs them). Re-serialized by parse5, so it is well-formed rather than byte-identical.