@j0hanz/fetch-url-mcp 1.10.22 → 1.10.24

package/dist/http/native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"native.d.ts","sourceRoot":"","sources":["../../src/http/native.ts"],"names":[],"mappings":"AAokCA,wBAAsB,eAAe,IAAI,OAAO,CAAC;IAC/C,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC,CA0DD"}
+{"version":3,"file":"native.d.ts","sourceRoot":"","sources":["../../src/http/native.ts"],"names":[],"mappings":"AAgoCA,wBAAsB,eAAe,IAAI,OAAO,CAAC;IAC/C,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC,CA0DD"}

package/dist/http/native.js

@@ -157,15 +157,14 @@ class McpSessionGateway {
         const method = typeof body.method === 'string' ? body.method : null;
         const isInitializedMethod = method !== null && isInitializedNotification(method);
         const isInitNotification = isInitializedMethod && body.id === undefined;
-        const sessionId = getMcpSessionId(ctx.req);
         if (isInitializedMethod && !isInitNotification) {
             sendError(ctx.res, -32600, 'notifications/initialized must be sent as a notification', 400, requestId);
             return null;
         }
-        const authFingerprint = buildAuthFingerprint(ctx.auth);
-        const session = sessionId
-            ? (this.getAuthenticatedSessionById(sessionId, authFingerprint, ctx.res, requestId) ?? undefined)
-            : undefined;
+        const sessionState = this.getOptionalAuthenticatedSession(ctx, requestId);
+        if (!sessionState)
+            return null;
+        const { sessionId, session } = sessionState;
         if (!this.ensurePostSessionAccess({
             ctx,
             sessionId,
@@ -248,14 +247,25 @@ class McpSessionGateway {
         this.store.touch(sessionId);
         return session.transport;
     }
-    getRequiredAuthenticatedSession(ctx, requestId = null, options) {
-        const sessionId = this.getRequiredSessionId(ctx.req, ctx.res, requestId);
+    getOptionalAuthenticatedSession(ctx, requestId = null) {
+        const sessionId = getMcpSessionId(ctx.req);
         if (!sessionId)
-            return null;
+            return { sessionId: null, session: undefined };
         const authFingerprint = buildAuthFingerprint(ctx.auth);
         const session = this.getAuthenticatedSessionById(sessionId, authFingerprint, ctx.res, requestId);
         if (!session)
             return null;
+        return { sessionId, session };
+    }
+    getRequiredAuthenticatedSession(ctx, requestId = null, options) {
+        const state = this.getOptionalAuthenticatedSession(ctx, requestId);
+        if (!state)
+            return null;
+        const { sessionId, session } = state;
+        if (!sessionId || !session) {
+            sendError(ctx.res, -32600, 'Missing session ID', 400, requestId);
+            return null;
+        }
         if (!this.ensureSessionProtocolVersion(ctx, session))
             return null;
         if (options?.requireInitialized && !session.protocolInitialized) {
@@ -264,13 +274,6 @@ class McpSessionGateway {
         }
         return { sessionId, session };
     }
-    getRequiredSessionId(req, res, requestId = null) {
-        const sessionId = getMcpSessionId(req);
-        if (sessionId)
-            return sessionId;
-        sendError(res, -32600, 'Missing session ID', 400, requestId);
-        return null;
-    }
     getAuthenticatedSessionById(sessionId, authFingerprint, res, requestId = null) {
         const session = this.store.get(sessionId);
         if (!session) {
@@ -296,50 +299,29 @@ class McpSessionGateway {
         if (sessionId)
             this.store.touch(sessionId);
     }
-    async createNewSession(ctx, requestId, negotiatedProtocolVersion) {
-        const authFingerprint = buildAuthFingerprint(ctx.auth);
-        if (!authFingerprint) {
-            sendError(ctx.res, -32603, 'Missing auth context', 500, requestId);
-            return null;
-        }
-        if (!this.reserveCapacity(ctx.res, requestId))
-            return null;
-        const tracker = createSlotTracker(this.store);
-        const newSessionId = randomUUID();
-        let sessionServer;
-        try {
-            sessionServer = await this.createSessionServer();
-        }
-        catch (error) {
-            tracker.releaseSlot();
-            throw error;
-        }
-        const transportImpl = new StreamableHTTPServerTransport({
-            sessionIdGenerator: () => newSessionId,
-        });
-        const unpublishedSession = {
-            server: sessionServer,
-            transport: transportImpl,
-        };
+    createSessionInitTimeout(sessionId, tracker, unpublishedSession) {
         const initTimeout = setTimeout(() => {
-            const session = this.store.get(newSessionId);
+            const session = this.store.get(sessionId);
             if (session) {
                 if (session.protocolInitialized) {
-                    this.clearSessionInitTimeout(newSessionId);
+                    this.clearSessionInitTimeout(sessionId);
                     return;
                 }
-                this.cleanupSessionRecord(newSessionId, 'session-init-timeout');
+                this.cleanupSessionRecord(sessionId, 'session-init-timeout');
                 return;
             }
             tracker.releaseSlot();
             void teardownUnregisteredSessionResources(unpublishedSession, 'session-init-timeout');
         }, config.server.sessionInitTimeoutMs);
         initTimeout.unref();
+        return initTimeout;
+    }
+    async connectTransport(sessionServer, transportImpl, initTimeout, tracker, unpublishedSession, sessionId) {
         const connectState = { transportClosed: false };
         transportImpl.onclose = () => {
             connectState.transportClosed = true;
             clearTimeout(initTimeout);
-            this.sessionInitTimeouts.delete(newSessionId);
+            this.sessionInitTimeouts.delete(sessionId);
             tracker.releaseSlot();
         };
         try {
@@ -352,8 +334,37 @@ class McpSessionGateway {
             void teardownUnregisteredSessionResources(unpublishedSession, 'session-connect-failed');
             throw err;
         }
+        return !connectState.transportClosed;
+    }
+    async createNewSession(ctx, requestId, negotiatedProtocolVersion) {
+        const authFingerprint = buildAuthFingerprint(ctx.auth);
+        if (!authFingerprint) {
+            sendError(ctx.res, -32603, 'Missing auth context', 500, requestId);
+            return null;
+        }
+        if (!this.reserveCapacity(ctx.res, requestId))
+            return null;
+        const tracker = createSlotTracker(this.store);
+        const newSessionId = randomUUID();
+        let sessionServer;
+        try {
+            sessionServer = await this.createSessionServer();
+        }
+        catch (error) {
+            tracker.releaseSlot();
+            throw error;
+        }
+        const transportImpl = new StreamableHTTPServerTransport({
+            sessionIdGenerator: () => newSessionId,
+        });
+        const unpublishedSession = {
+            server: sessionServer,
+            transport: transportImpl,
+        };
+        const initTimeout = this.createSessionInitTimeout(newSessionId, tracker, unpublishedSession);
+        const isConnected = await this.connectTransport(sessionServer, transportImpl, initTimeout, tracker, unpublishedSession, newSessionId);
         tracker.releaseSlot();
-        if (connectState.transportClosed) {
+        if (!isConnected) {
             void teardownUnregisteredSessionResources(unpublishedSession, 'session-closed-during-connect');
             return null;
         }
@@ -533,29 +544,36 @@ class HttpDispatcher {
 // ---------------------------------------------------------------------------
 // Body parse error responses
 // ---------------------------------------------------------------------------
+const DEFAULT_BODY_ERROR = {
+    statusCode: 400,
+    mcpCode: -32700,
+    mcpMsg: 'Parse error',
+    restMsg: 'Invalid JSON',
+};
+const BODY_PARSE_ERRORS = {
+    'payload-too-large': {
+        statusCode: 413,
+        mcpCode: -32600,
+        mcpMsg: 'Request body too large',
+        restMsg: 'Payload too large',
+    },
+    'read-failed': {
+        statusCode: 400,
+        mcpCode: -32600,
+        mcpMsg: 'Request body read failed',
+        restMsg: 'Invalid JSON',
+    },
+    default: DEFAULT_BODY_ERROR,
+};
 function sendBodyParseError(ctx, bodyErrorKind, rawReq) {
-    if (ctx.url.pathname === '/mcp') {
-        switch (bodyErrorKind) {
-            case 'payload-too-large':
-                sendError(ctx.res, -32600, 'Request body too large', 413, null);
-                break;
-            case 'read-failed':
-                if (!rawReq.destroyed) {
-                    sendError(ctx.res, -32600, 'Request body read failed', 400, null);
-                }
-                break;
-            case 'invalid-json':
-            default:
-                sendError(ctx.res, -32700, 'Parse error', 400, null);
-                break;
+    const errorDef = BODY_PARSE_ERRORS[bodyErrorKind ?? 'default'] ?? DEFAULT_BODY_ERROR;
+    if (bodyErrorKind !== 'read-failed' || !rawReq.destroyed) {
+        if (ctx.url.pathname === '/mcp') {
+            sendError(ctx.res, errorDef.mcpCode, errorDef.mcpMsg, errorDef.statusCode, null);
+        }
+        else {
+            sendJson(ctx.res, errorDef.statusCode, { error: errorDef.restMsg });
         }
-    }
-    else {
-        sendJson(ctx.res, bodyErrorKind === 'payload-too-large' ? 413 : 400, {
-            error: bodyErrorKind === 'payload-too-large'
-                ? 'Payload too large'
-                : 'Invalid JSON',
-        });
     }
     drainRequest(rawReq);
 }
@@ -619,6 +637,7 @@ class HttpRequestPipeline {
             return false;
         }
         if (!this.rateLimiter.check(ctx)) {
+            sendJson(ctx.res, 429, { error: 'Too Many Requests' });
             drainRequest(rawReq);
             return false;
         }

package/dist/lib/core.d.ts.map

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

package/dist/lib/core.js

@@ -584,10 +584,14 @@ class InMemoryCacheStore {
         const now = Date.now();
         const expiresAtMs = now + this.ttlMs;
         const entrySize = content.length;
+        const isUpdate = this.entries.has(cacheKey);
+        if (isUpdate) {
+            this.delete(cacheKey);
+        }
         const capacity = this.ensureCapacity(cacheKey, entrySize);
         if (!capacity.ok)
             return;
-        let listChanged = !this.entries.has(cacheKey) || capacity.listChanged;
+        let listChanged = !isUpdate || capacity.listChanged;
         const entry = {
             url: metadata.url,
             content,
@@ -596,9 +600,6 @@ class InMemoryCacheStore {
             expiresAtMs,
             ...(metadata.title ? { title: metadata.title } : {}),
         };
-        if (this.entries.has(cacheKey)) {
-            this.delete(cacheKey);
-        }
         this.entries.set(cacheKey, entry);
         this.currentBytes += entrySize;
         // Eviction (LRU: first insertion-order key) - Count based
@@ -1080,23 +1081,46 @@ class SessionCleanupLoop {
                 });
             }
         }
+        const closePromise = Promise.allSettled([
+            session.transport.close(),
+            session.server.close(),
+        ]);
+        let timeoutId;
+        const timeoutPromise = new Promise((_, reject) => {
+            timeoutId = setTimeout(() => {
+                reject(new Error('Session close timed out'));
+            }, 5000);
+            timeoutId.unref();
+        });
         try {
-            unregisterMcpSessionServer(sessionId);
+            const [transportResult, serverResult] = await Promise.race([
+                closePromise,
+                timeoutPromise,
+            ]);
+            if (transportResult.status === 'rejected') {
+                this.logCloseFailure('transport', transportResult.reason);
+            }
+            if (serverResult.status === 'rejected') {
+                this.logCloseFailure('server', serverResult.reason);
+            }
         }
         catch (error) {
-            logWarn('Failed to unregister session server', {
+            logWarn('Session close operation failed or timed out', {
                 error: getErrorMessage(error),
             });
         }
-        const [transportResult, serverResult] = await Promise.allSettled([
-            session.transport.close(),
-            session.server.close(),
-        ]);
-        if (transportResult.status === 'rejected') {
-            this.logCloseFailure('transport', transportResult.reason);
+        finally {
+            if (timeoutId) {
+                clearTimeout(timeoutId);
+            }
         }
-        if (serverResult.status === 'rejected') {
-            this.logCloseFailure('server', serverResult.reason);
+        try {
+            unregisterMcpSessionServer(sessionId);
+        }
+        catch (error) {
+            logWarn('Failed to unregister session server', {
+                error: getErrorMessage(error),
+            });
         }
     }
     logCloseFailure(target, error) {

package/dist/lib/dom-prep.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dom-prep.d.ts","sourceRoot":"","sources":["../../src/lib/dom-prep.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AA6oB9D,eAAO,MAAM,sBAAsB,QAAmB,CAAC;AAyCvD,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CA6B9D;AAuBD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAY/D;AAED,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,MAAM,GACf,MAAM,CASR;AA0CD,qEAAqE;AACrE,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAG5D;AA0RD,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CA2BjE;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAE1D;AAWD,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAQ3D;AAkCD,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,WAAW,GACnB,IAAI,CAON;AA4BD,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,QAAQ,EACnB,OAAO,CAAC,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,WAAW,GACnB,MAAM,CAcR;AA0ED,wBAAgB,oBAAoB,CAClC,cAAc,EAAE,MAAM,GAAG,QAAQ,GAChC,MAAM,CAaR;AA+KD,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,QAAQ,GACjB,QAAQ,GAAG,IAAI,CAsBjB"}
+{"version":3,"file":"dom-prep.d.ts","sourceRoot":"","sources":["../../src/lib/dom-prep.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAilB9D,eAAO,MAAM,sBAAsB,QAAmB,CAAC;AAyCvD,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CA6B9D;AAuBD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAY/D;AAED,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,MAAM,GACf,MAAM,CASR;AA0CD,qEAAqE;AACrE,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAG5D;AA0RD,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CA2BjE;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAE1D;AAWD,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAQ3D;AAuDD,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,WAAW,GACnB,IAAI,CAON;AA4BD,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,QAAQ,EACnB,OAAO,CAAC,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,WAAW,GACnB,MAAM,CAcR;AA0ED,wBAAgB,oBAAoB,CAClC,cAAc,EAAE,MAAM,GAAG,QAAQ,GAChC,MAAM,CAaR;AA8KD,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,QAAQ,GACjB,QAAQ,GAAG,IAAI,CAsBjB"}

package/dist/lib/dom-prep.js

@@ -257,16 +257,11 @@ function isInteractive(element, role) {
     return (element.hasAttribute('data-accordion-item') ||
         element.hasAttribute('data-radix-collection-item'));
 }
-function isWithinPrimaryContent(element) {
-    let current = element;
-    while (current) {
-        const tagName = current.tagName.toLowerCase();
-        if (tagName === 'article' || tagName === 'main')
-            return true;
-        if (current.getAttribute('role') === 'main')
-            return true;
-        current = current.parentElement;
-    }
+function isPrimaryContent(element, checkDescendants = false) {
+    if (element.closest('article,main,[role="main"]'))
+        return true;
+    if (checkDescendants && element.querySelector('article,main,[role="main"]'))
+        return true;
     return false;
 }
 function isLinkDenseNavigation(element, checkContainedNav = false) {
@@ -285,7 +280,7 @@ function shouldPreserve(element, tagName) {
     // Check Dialog
     const role = element.getAttribute('role');
     if (role === 'dialog' || role === 'alertdialog') {
-        if (isWithinPrimaryContent(element))
+        if (isPrimaryContent(element))
             return true;
         const textLen = (element.textContent || '').length;
         if (textLen > DIALOG_MIN_CHARS_FOR_PRESERVATION)
@@ -304,7 +299,7 @@ function shouldPreserve(element, tagName) {
     }
     // Check Aside — preserve only if it looks like article content, not navigation
     if (tagName === 'aside') {
-        if (!isWithinPrimaryContent(element))
+        if (!isPrimaryContent(element))
             return false;
         return !isLinkDenseNavigation(element, true);
     }
@@ -318,60 +313,6 @@ function removeNodes(nodes) {
         }
     }
 }
-// Checks if the element itself or any of its ancestors contain primary content indicators (article, main, role=main).
-function containsPrimaryContent(element) {
-    const tag = element.tagName.toLowerCase();
-    if (tag === 'article' || tag === 'main')
-        return true;
-    if (element.getAttribute('role') === 'main')
-        return true;
-    return element.querySelector('article,main,[role="main"]') !== null;
-}
-function isPromoMatch(className, id, element, context) {
-    if (!context.promoEnabled)
-        return false;
-    const aggTest = context.promoMatchers.aggressive.test(className) ||
-        context.promoMatchers.aggressive.test(id);
-    if (aggTest)
-        return !isWithinPrimaryContent(element);
-    // Base test must match and be outside primary content to be considered noise
-    if (!context.promoMatchers.base.test(className) &&
-        !context.promoMatchers.base.test(id))
-        return false;
-    return !containsPrimaryContent(element);
-}
-function isStructuralNoise(tagName, interactive, context) {
-    return context.structuralTags.has(tagName) && !interactive;
-}
-function isNavigationNoise(tagName, role, className, id, context) {
-    if (!context.flags.navFooter)
-        return false;
-    // Always-noise tags (nav, footer)
-    if (ALWAYS_NOISE_TAGS.has(tagName))
-        return true;
-    // Header with navigation role or noise class/id
-    if (tagName === 'header' &&
-        ((role !== null && NAVIGATION_ROLES.has(role)) ||
-            HEADER_NOISE_PATTERN.test(`${className} ${id}`)))
-        return true;
-    // Aside elements
-    if (tagName === 'aside')
-        return true;
-    // Navigation roles (except aside+complementary)
-    if (role !== null &&
-        NAVIGATION_ROLES.has(role) &&
-        (tagName !== 'aside' || role !== 'complementary'))
-        return true;
-    return false;
-}
-function isHiddenNoise(hidden, interactive) {
-    return hidden && !interactive;
-}
-function isPositionalNoise(className, element) {
-    return (FIXED_OR_HIGH_Z_PATTERN.test(className) &&
-        (element.textContent || '').trim().length <
-            NAV_FOOTER_MIN_CHARS_FOR_PRESERVATION);
-}
 function isNoiseElement(element, context) {
     const tagName = element.tagName.toLowerCase();
     const role = element.getAttribute('role');
@@ -382,16 +323,45 @@ function isNoiseElement(element, context) {
     const hidden = element.hasAttribute('hidden') ||
         element.getAttribute('aria-hidden') === 'true' ||
         (style !== null && HIDDEN_STYLE_REGEX.test(style));
-    if (isStructuralNoise(tagName, interactive, context))
-        return true;
-    if (isNavigationNoise(tagName, role, className, id, context))
+    // 1. Structural Noise
+    if (context.structuralTags.has(tagName) && !interactive)
         return true;
-    if (isHiddenNoise(hidden, interactive))
-        return true;
-    if (isPositionalNoise(className, element))
+    // 2. Navigation / Layout Noise
+    if (context.flags.navFooter) {
+        if (ALWAYS_NOISE_TAGS.has(tagName))
+            return true;
+        if (tagName === 'header' &&
+            ((role !== null && NAVIGATION_ROLES.has(role)) ||
+                HEADER_NOISE_PATTERN.test(`${className} ${id}`)))
+            return true;
+        if (tagName === 'aside')
+            return true;
+        if (role !== null &&
+            NAVIGATION_ROLES.has(role) &&
+            (tagName !== 'aside' || role !== 'complementary'))
+            return true;
+    }
+    // 3. Hidden Noise
+    if (hidden && !interactive)
         return true;
-    if (isPromoMatch(className, id, element, context))
+    // 4. Positional Noise
+    if (FIXED_OR_HIGH_Z_PATTERN.test(className) &&
+        (element.textContent || '').trim().length <
+            NAV_FOOTER_MIN_CHARS_FOR_PRESERVATION) {
         return true;
+    }
+    // 5. Promo/Advert Noise
+    if (context.promoEnabled) {
+        const aggTest = context.promoMatchers.aggressive.test(className) ||
+            context.promoMatchers.aggressive.test(id);
+        if (aggTest && !isPrimaryContent(element))
+            return true;
+        if (context.promoMatchers.base.test(className) ||
+            context.promoMatchers.base.test(id)) {
+            if (!isPrimaryContent(element, true))
+                return true;
+        }
+    }
     return false;
 }
 function stripHeadingWrapperDivs(h) {
@@ -459,25 +429,16 @@ function isHeadingPermalinkAnchor(anchor) {
     return ((ariaHidden === 'true' || tabindex === '-1') &&
         text.length <= MAX_PERMALINK_TEXT_LENGTH);
 }
-function getDirectRows(section) {
-    return Array.from(section.children).filter((child) => child.tagName === 'TR');
-}
-function getDirectCells(row) {
-    return Array.from(row.children).filter((child) => child.tagName === 'TH' || child.tagName === 'TD');
-}
 function hoistNestedRows(table) {
-    const sections = Array.from(table.querySelectorAll('thead,tbody,tfoot'));
-    for (const section of sections) {
-        const rows = getDirectRows(section);
-        for (const row of rows) {
-            let insertAfter = row;
-            for (const cell of getDirectCells(row)) {
-                const nestedRows = Array.from(cell.querySelectorAll('tr')).filter((nested) => nested.closest('table') === table);
-                for (const nestedRow of nestedRows) {
-                    insertAfter.after(nestedRow);
-                    insertAfter = nestedRow;
-                }
-            }
+    const nestedRows = table.querySelectorAll('td tr, th tr');
+    // Iterate backwards to preserve the original document order when inserting after the parent row
+    for (let i = nestedRows.length - 1; i >= 0; i--) {
+        const nestedRow = nestedRows[i];
+        if (nestedRow?.closest('table') !== table)
+            continue;
+        const parentRow = nestedRow.parentElement?.closest('tr');
+        if (parentRow && parentRow !== nestedRow) {
+            parentRow.after(nestedRow);
         }
     }
 }
@@ -961,7 +922,27 @@ export function runDocsControlPass(document) {
     stripPromoLinks(document);
     separateAdjacentInlineElements(document);
 }
+const PHRASING_PARENTS = new Set([
+    'P',
+    'LI',
+    'TD',
+    'TH',
+    'DD',
+    'SPAN',
+    'LABEL',
+    'FIGCAPTION',
+    'BLOCKQUOTE',
+]);
+function unwrapInlineButtons(document) {
+    for (const btn of document.querySelectorAll('button')) {
+        const parent = btn.parentElement;
+        if (!parent || !PHRASING_PARENTS.has(parent.tagName))
+            continue;
+        btn.replaceWith(...Array.from(btn.childNodes));
+    }
+}
 function runStructuralNoisePass(document, signal) {
+    unwrapInlineButtons(document);
     stripNoise(document, signal);
 }
 function runCodeExamplePass(document) {
@@ -1203,21 +1184,21 @@ function passesContentRatioGate(articleTextLength, document) {
     return (originalLength < MIN_HTML_LENGTH_FOR_GATE ||
         articleTextLength / originalLength >= MIN_CONTENT_RATIO);
 }
-function countRealImages(doc) {
+const DATA_IMG_PATTERN = /<img\b[^>]*\bsrc\s*=\s*["']?data:/gi;
+function countRealImages(htmlOrDoc) {
+    if (typeof htmlOrDoc === 'string') {
+        const total = htmlOrDoc.match(/<img\b/gi)?.length ?? 0;
+        const dataImages = htmlOrDoc.match(DATA_IMG_PATTERN)?.length ?? 0;
+        return total - dataImages;
+    }
     let count = 0;
-    for (const img of doc.querySelectorAll('img')) {
+    for (const img of htmlOrDoc.querySelectorAll('img')) {
         const src = img.getAttribute('src') ?? '';
         if (!src.startsWith('data:'))
             count++;
     }
     return count;
 }
-const DATA_IMG_PATTERN = /<img\b[^>]*\bsrc\s*=\s*["']?data:/gi;
-function countRealImagesFromHtml(html) {
-    const total = html.match(/<img\b/gi)?.length ?? 0;
-    const dataImages = html.match(DATA_IMG_PATTERN)?.length ?? 0;
-    return total - dataImages;
-}
 function passesRetentionRulesFromHtml(originalDoc, articleHtml) {
     return RETENTION_RULES.every(({ selector, pattern, minThreshold, ratio }) => {
         // Exclude lazy-loaded placeholder images (data: URI src) from the
@@ -1231,7 +1212,7 @@ function passesRetentionRulesFromHtml(originalDoc, articleHtml) {
         // For images, also exclude data: URIs from the article count to
         // align with the denominator's real-image filtering.
         const articleCount = selector === 'img'
-            ? countRealImagesFromHtml(articleHtml)
+            ? countRealImages(articleHtml)
             : (articleHtml.match(pattern)?.length ?? 0);
         return articleCount / original >= ratio;
     });

package/dist/lib/fetch-pipeline.d.ts

@@ -42,7 +42,7 @@ export type MarkdownPipelineResult = MarkdownTransformResult & {
 export declare function parseCachedMarkdownResult(cached: string): MarkdownPipelineResult | undefined;
 export declare const markdownTransform: (input: FetchTransformInput, url: string, signal?: AbortSignal) => Promise<MarkdownPipelineResult>;
 export declare function serializeMarkdownResult(result: MarkdownPipelineResult): string;
-interface SharedFetchOptions {
+interface MarkdownFetchOptions {
     readonly url: string;
     readonly signal?: AbortSignal;
     readonly cacheVary?: Record<string, unknown> | string;
@@ -55,7 +55,7 @@ interface SharedFetchOptions {
 interface SharedFetchDeps {
     readonly executeFetchPipeline?: typeof executeFetchPipeline;
 }
-export declare function performSharedFetch(options: SharedFetchOptions, deps?: SharedFetchDeps): Promise<{
+export declare function performSharedFetch(options: MarkdownFetchOptions, deps?: SharedFetchDeps): Promise<{
     pipeline: PipelineResult<MarkdownPipelineResult>;
     inlineResult: InlineContentResult;
 }>;

package/dist/lib/fetch-pipeline.d.ts.map

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