Fix typing & translations

Added back and forth chat
More layout tweaks
2026-09-23 11:03:39 +00:00 · 2025-05-23 16:54:28 +02:00 · 2025-05-21 18:08:02 +02:00 · 2025-05-21 15:13:22 +02:00 · 2025-05-21 14:02:48 +02:00 · 2025-05-21 14:02:48 +02:00
120 changed files with 3039 additions and 1760 deletions
@@ -1,5 +0,0 @@
---
-"gitbook": minor
---
-
-Fix images in reusable content across spaces.
@@ -1,5 +0,0 @@
---
-'gitbook': patch
---
-
-Fix openapi-select hover in responses
@@ -1,5 +0,0 @@
---
-"@gitbook/colors": patch
---
-
-Update chroma ratio per step
@@ -1,6 +0,0 @@
---
-'@gitbook/react-openapi': patch
-'gitbook': patch
---
-
-Fix openapi CR preview
@@ -1,6 +0,0 @@
---
-"@gitbook/react-openapi": minor
-"gitbook": minor
---
-
-Design tweaks to code blocks and OpenAPI pages
@@ -1,8 +0,0 @@
---
-"@gitbook/react-openapi": patch
-"gitbook-v2": patch
-"gitbook": patch
-"@gitbook/colors": patch
---
-
-Fix code highlighting for HTTP
@@ -1,5 +0,0 @@
---
-"gitbook": patch
---
-
-Fix resolution of links in reusable contents
@@ -0,0 +1,5 @@
+---
+"gitbook-v2": patch
+---
+
+fix ISR on preview env
@@ -1,6 +0,0 @@
---
-"gitbook-v2": minor
-"gitbook": minor
---
-
-Add support for reusable content across spaces.
@@ -1,5 +0,0 @@
---
-"gitbook": patch
---
-
-Fix invalid sitemap.xml generated with relative URLs instead of absolute ones
@@ -1,5 +0,0 @@
---
-"gitbook": patch
---
-
-Change OpenAPI schema-optional from `info` to `tint` color
@@ -1,5 +0,0 @@
---
-"@gitbook/colors": patch
---
-
-Change lightness check for color step 9 to allow input colors with a higher-than-needed contrast
@@ -1,6 +0,0 @@
---
-'@gitbook/react-openapi': patch
-'gitbook': patch
---
-
-Fix schemas disclosure label causing client error
@@ -1,5 +0,0 @@
---
-'@gitbook/react-openapi': patch
---
-
-Missing top-level required OpenAPI alternatives
@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Make TOC height dynamic based on visible header and footer elements
@@ -1,5 +0,0 @@
---
-"gitbook-v2": patch
---
-
-Improve error messages around undefined site sections.
@@ -1,6 +0,0 @@
---
-"gitbook-v2": patch
-"gitbook": patch
---
-
-Increase logging around caching behaviour causing page crashes.
@@ -0,0 +1,5 @@
+---
+"gitbook-v2": patch
+---
+
+Add `urlObject.hash` to `linker.toLinkForContent` to pass through URL fragment identifiers, used in search
@@ -1,5 +0,0 @@
---
-"gitbook": patch
---
-
-Change `Dropdown`s to use Radix's `DropdownMenu`
@@ -1,5 +0,0 @@
---
-"@gitbook/react-openapi": patch
---
-
-Fix Python code sample "null vs None"
@@ -1,5 +0,0 @@
---
-"gitbook": patch
---
-
-Add border to filled sidebar on gradient theme
@@ -1,6 +0,0 @@
---
-"gitbook": patch
-"gitbook-v2": patch
---
-
-Revert investigation work around URL caches.
@@ -1,5 +0,0 @@
---
-"gitbook": patch
---
-
-Fix OpenAPI disclosure label ("Show properties") misalignment on mobile
@@ -63,9 +63,9 @@ To start your local version of GitBook, run the command `bun dev`.

 When running the development server, published GitBook sites can be rendered through your local version at `http://localhost:3000/`.

-For example, our published docs can be viewed using the local version by visiting `http://localhost:3000/docs.gitbook.com` after running the development server.
+For example, our published docs can be viewed using the local version by visiting `http://localhost:3000/gitbook.com/docs` after running the development server.

-You can visit any published GitBook site behind your development server. Please make sure your site is [published publicly](https://docs.gitbook.com/published-documentation/publish-your-content-as-a-docs-site) to ensure you can view the site correctly in your development version.
+You can visit any published GitBook site behind your development server. Please make sure your site is [published publicly](https://gitbook.com/docs/published-documentation/publish-your-content-as-a-docs-site) to ensure you can view the site correctly in your development version.

 ### Commit your update

@@ -152,7 +152,7 @@ jobs:

                      | Site | `v1` | `2v` | `2c` |
                      | --- | --- | --- | --- |
-                      | GitBook | [${{ needs.deploy-v1-cloudflare.outputs.deployment-url }}/docs.gitbook.com](${{ needs.deploy-v1-cloudflare.outputs.deployment-url }}/docs.gitbook.com) | [${{ needs.deploy-v2-vercel.outputs.deployment-url }}/url/docs.gitbook.com](${{ needs.deploy-v2-vercel.outputs.deployment-url }}/url/docs.gitbook.com) | [${{ needs.deploy-v2-cloudflare.outputs.deployment-url }}/url/docs.gitbook.com](${{ needs.deploy-v2-cloudflare.outputs.deployment-url }}/url/docs.gitbook.com) |
+                      | GitBook | [${{ needs.deploy-v1-cloudflare.outputs.deployment-url }}/gitbook.com/docs](${{ needs.deploy-v1-cloudflare.outputs.deployment-url }}/gitbook.com/docs) | [${{ needs.deploy-v2-vercel.outputs.deployment-url }}/url/gitbook.com/docs](${{ needs.deploy-v2-vercel.outputs.deployment-url }}/url/gitbook.com/docs) | [${{ needs.deploy-v2-cloudflare.outputs.deployment-url }}/url/gitbook.com/docs](${{ needs.deploy-v2-cloudflare.outputs.deployment-url }}/url/gitbook.com/docs) |
                      | E2E | [${{ needs.deploy-v1-cloudflare.outputs.deployment-url }}/gitbook.gitbook.io/test-gitbook-open](${{ needs.deploy-v1-cloudflare.outputs.deployment-url }}/gitbook.gitbook.io/test-gitbook-open) | [${{ needs.deploy-v2-vercel.outputs.deployment-url }}/url/gitbook.gitbook.io/test-gitbook-open](${{ needs.deploy-v2-vercel.outputs.deployment-url }}/url/gitbook.gitbook.io/test-gitbook-open) | [${{ needs.deploy-v2-cloudflare.outputs.deployment-url }}/url/gitbook.gitbook.io/test-gitbook-open](${{ needs.deploy-v2-cloudflare.outputs.deployment-url }}/url/gitbook.gitbook.io/test-gitbook-open) |
                  edit-mode: replace
    visual-testing-v1:
@@ -200,7 +200,6 @@ jobs:
        name: Visual Testing v2 (Cloudflare)
        needs: deploy-v2-cloudflare
        timeout-minutes: 10
-        if: startsWith(github.head_ref || github.ref_name, 'cloudflare/') || github.ref == 'refs/heads/main'
        steps:
            - name: Checkout
              uses: actions/checkout@v4
@@ -263,7 +262,6 @@ jobs:
        name: Visual Testing Customers v2 (Cloudflare)
        needs: deploy-v2-cloudflare
        timeout-minutes: 8
-        if: startsWith(github.head_ref || github.ref_name, 'cloudflare/') || github.ref == 'refs/heads/main'
        steps:
            - name: Checkout
              uses: actions/checkout@v4
@@ -1,7 +1,7 @@
 <h1 align="center">GitBook</h1>

 <p align="center">
-  <a href="https://docs.gitbook.com/">Docs</a> - <a href="https://github.com/GitbookIO/community">Community</a> - <a href="https://developer.gitbook.com/">Developer Docs</a> - <a href="https://changelog.gitbook.com/">Changelog</a> - <a href="https://github.com/GitbookIO/gitbook/issues/new?assignees=&labels=bug&template=bug_report.md">Bug reports</a> 
+  <a href="https://gitbook.com/docs/">Docs</a> - <a href="https://github.com/GitbookIO/community">Community</a> - <a href="https://developer.gitbook.com/">Developer Docs</a> - <a href="https://changelog.gitbook.com/">Changelog</a> - <a href="https://github.com/GitbookIO/gitbook/issues/new?assignees=&labels=bug&template=bug_report.md">Bug reports</a> 
 </p>

 <p align="center">
@@ -66,7 +66,7 @@ bun dev:v2

 examples:

-   http://localhost:3000/url/docs.gitbook.com
+-   http://localhost:3000/url/gitbook.com/docs
 -   http://localhost:3000/url/open-source.gitbook.io/midjourney

 Any published GitBook site can be accessed through your local development instance, and any updates you make to the codebase will be reflected in your browser.
@@ -26,7 +26,7 @@
      "name": "@gitbook/cache-tags",
      "version": "0.3.1",
      "dependencies": {
-        "@gitbook/api": "^0.111.0",
+        "@gitbook/api": "^0.115.0",
        "assert-never": "^1.2.1",
      },
      "devDependencies": {
@@ -35,7 +35,7 @@
    },
    "packages/colors": {
      "name": "@gitbook/colors",
-      "version": "0.3.2",
+      "version": "0.3.3",
      "devDependencies": {
        "typescript": "^5.5.3",
      },
@@ -49,9 +49,9 @@
    },
    "packages/gitbook": {
      "name": "gitbook",
-      "version": "0.11.1",
+      "version": "0.12.0",
      "dependencies": {
-        "@gitbook/api": "*",
+        "@gitbook/api": "^0.115.0",
        "@gitbook/cache-do": "workspace:*",
        "@gitbook/cache-tags": "workspace:*",
        "@gitbook/colors": "workspace:*",
@@ -141,14 +141,15 @@
    },
    "packages/gitbook-v2": {
      "name": "gitbook-v2",
-      "version": "0.2.5",
+      "version": "0.3.0",
      "dependencies": {
-        "@gitbook/api": "*",
+        "@gitbook/api": "^0.115.0",
        "@gitbook/cache-tags": "workspace:*",
+        "@opennextjs/cloudflare": "1.0.4",
        "@sindresorhus/fnv1a": "^3.1.0",
        "assert-never": "^1.2.1",
        "jwt-decode": "^4.0.0",
-        "next": "canary",
+        "next": "^15.3.2",
        "react": "^19.0.0",
        "react-dom": "^19.0.0",
        "rison": "^0.1.1",
@@ -156,7 +157,6 @@
        "warn-once": "^0.1.1",
      },
      "devDependencies": {
-        "@opennextjs/cloudflare": "^1.0.0-beta.3",
        "@types/rison": "^0.0.9",
        "gitbook": "*",
        "postcss": "^8",
@@ -185,7 +185,7 @@
    },
    "packages/openapi-parser": {
      "name": "@gitbook/openapi-parser",
-      "version": "2.1.3",
+      "version": "2.1.4",
      "dependencies": {
        "@scalar/openapi-parser": "^0.10.10",
        "@scalar/openapi-types": "^0.1.9",
@@ -202,7 +202,7 @@
      "name": "@gitbook/react-contentkit",
      "version": "0.7.0",
      "dependencies": {
-        "@gitbook/api": "*",
+        "@gitbook/api": "^0.115.0",
        "@gitbook/icons": "workspace:*",
        "classnames": "^2.5.1",
      },
@@ -232,7 +232,7 @@
    },
    "packages/react-openapi": {
      "name": "@gitbook/react-openapi",
-      "version": "1.2.1",
+      "version": "1.3.0",
      "dependencies": {
        "@gitbook/openapi-parser": "workspace:*",
        "@scalar/api-client-react": "^1.2.19",
@@ -260,7 +260,7 @@
  },
  "overrides": {
    "@codemirror/state": "6.4.1",
-    "@gitbook/api": "0.113.0",
+    "@gitbook/api": "^0.115.0",
    "react": "^19.0.0",
    "react-dom": "^19.0.0",
  },
@@ -625,7 +625,7 @@

    "@fortawesome/fontawesome-svg-core": ["@fortawesome/fontawesome-svg-core@6.6.0", "", { "dependencies": { "@fortawesome/fontawesome-common-types": "6.6.0" } }, "sha512-KHwPkCk6oRT4HADE7smhfsKudt9N/9lm6EJ5BVg0tD1yPA5hht837fB87F8pn15D8JfTqQOjhKTktwmLMiD7Kg=="],

-    "@gitbook/api": ["@gitbook/api@0.113.0", "", { "dependencies": { "event-iterator": "^2.0.0", "eventsource-parser": "^3.0.0" } }, "sha512-PWMeAkdm4bHSl3b5OmtcmskZ6qRkkDhauCPybo8sGnjS03O14YAUtubAQiNCKX/uwbs+yiQ8KRPyeIwn+g42yw=="],
+    "@gitbook/api": ["@gitbook/api@0.115.0", "", { "dependencies": { "event-iterator": "^2.0.0", "eventsource-parser": "^3.0.0" } }, "sha512-Lyj+1WVNnE/Zuuqa/1ZdnUQfUiNE6es89RFK6CJ+Tb36TFwls6mbHKXCZsBwSYyoMYTVK39WQ3Nob6Nw6+TWCA=="],

    "@gitbook/cache-do": ["@gitbook/cache-do@workspace:packages/cache-do"],

@@ -791,9 +791,9 @@

    "@nodelib/fs.walk": ["@nodelib/fs.walk@1.2.8", "", { "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" } }, "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="],

-    "@opennextjs/aws": ["@opennextjs/aws@3.5.7", "", { "dependencies": { "@ast-grep/napi": "^0.35.0", "@aws-sdk/client-cloudfront": "3.398.0", "@aws-sdk/client-dynamodb": "^3.398.0", "@aws-sdk/client-lambda": "^3.398.0", "@aws-sdk/client-s3": "^3.398.0", "@aws-sdk/client-sqs": "^3.398.0", "@node-minify/core": "^8.0.6", "@node-minify/terser": "^8.0.6", "@tsconfig/node18": "^1.0.1", "aws4fetch": "^1.0.18", "chalk": "^5.3.0", "esbuild": "0.19.2", "express": "5.0.1", "path-to-regexp": "^6.3.0", "urlpattern-polyfill": "^10.0.0", "yaml": "^2.7.0" }, "bin": { "open-next": "dist/index.js" } }, "sha512-YjyHJrkIHI7YwQRCp8GjDOudu86oOc1RiwxvBBpPHrplsS18H4ZmkzGggAKhK6B4myGsJQ/q9kNP2TraoZiNzg=="],
+    "@opennextjs/aws": ["@opennextjs/aws@3.6.2", "", { "dependencies": { "@ast-grep/napi": "^0.35.0", "@aws-sdk/client-cloudfront": "3.398.0", "@aws-sdk/client-dynamodb": "^3.398.0", "@aws-sdk/client-lambda": "^3.398.0", "@aws-sdk/client-s3": "^3.398.0", "@aws-sdk/client-sqs": "^3.398.0", "@node-minify/core": "^8.0.6", "@node-minify/terser": "^8.0.6", "@tsconfig/node18": "^1.0.1", "aws4fetch": "^1.0.18", "chalk": "^5.3.0", "esbuild": "0.25.4", "express": "5.0.1", "path-to-regexp": "^6.3.0", "urlpattern-polyfill": "^10.0.0", "yaml": "^2.7.0" }, "bin": { "open-next": "dist/index.js" } }, "sha512-26/3GSoj7mKN7XpQFikYM2Lrwal5jlMc4fJO//QAdd5bCSnBaWBAkzr7+VvXAFVIC6eBeDLdtlWiQuUQVEAPZQ=="],

-    "@opennextjs/cloudflare": ["@opennextjs/cloudflare@1.0.0-beta.3", "", { "dependencies": { "@dotenvx/dotenvx": "1.31.0", "@opennextjs/aws": "3.5.7", "enquirer": "^2.4.1", "glob": "^11.0.0", "ts-tqdm": "^0.8.6" }, "peerDependencies": { "wrangler": "^3.114.3 || ^4.7.0" }, "bin": { "opennextjs-cloudflare": "dist/cli/index.js" } }, "sha512-qKBXQZhUeQ+iGvfJeF7PO30g59LHnPOlRVZd77zxwn6Uc9C+c0LSwo8N28XRIWyQPkY007rKk9pSIxOrP4MHtQ=="],
+    "@opennextjs/cloudflare": ["@opennextjs/cloudflare@1.0.4", "", { "dependencies": { "@dotenvx/dotenvx": "1.31.0", "@opennextjs/aws": "^3.6.2", "enquirer": "^2.4.1", "glob": "^11.0.0", "ts-tqdm": "^0.8.6" }, "peerDependencies": { "wrangler": "^4.14.0" }, "bin": { "opennextjs-cloudflare": "dist/cli/index.js" } }, "sha512-DVudGpOSJ91ruPiBJ0kuFmPhEQbXIXLTbvUjAx1OlbwFskG2gvdNIAmF3ZXV6z1VGDO7Q/u2W2ybMZLf7avlrA=="],

    "@opentelemetry/api": ["@opentelemetry/api@1.9.0", "", {}, "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="],

@@ -3649,7 +3649,7 @@

    "@node-minify/core/mkdirp": ["mkdirp@1.0.4", "", { "bin": { "mkdirp": "bin/cmd.js" } }, "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="],

-    "@opennextjs/aws/esbuild": ["esbuild@0.19.2", "", { "optionalDependencies": { "@esbuild/android-arm": "0.19.2", "@esbuild/android-arm64": "0.19.2", "@esbuild/android-x64": "0.19.2", "@esbuild/darwin-arm64": "0.19.2", "@esbuild/darwin-x64": "0.19.2", "@esbuild/freebsd-arm64": "0.19.2", "@esbuild/freebsd-x64": "0.19.2", "@esbuild/linux-arm": "0.19.2", "@esbuild/linux-arm64": "0.19.2", "@esbuild/linux-ia32": "0.19.2", "@esbuild/linux-loong64": "0.19.2", "@esbuild/linux-mips64el": "0.19.2", "@esbuild/linux-ppc64": "0.19.2", "@esbuild/linux-riscv64": "0.19.2", "@esbuild/linux-s390x": "0.19.2", "@esbuild/linux-x64": "0.19.2", "@esbuild/netbsd-x64": "0.19.2", "@esbuild/openbsd-x64": "0.19.2", "@esbuild/sunos-x64": "0.19.2", "@esbuild/win32-arm64": "0.19.2", "@esbuild/win32-ia32": "0.19.2", "@esbuild/win32-x64": "0.19.2" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-G6hPax8UbFakEj3hWO0Vs52LQ8k3lnBhxZWomUJDxfz3rZTLqF5k/FCzuNdLx2RbpBiQQF9H9onlDDH1lZsnjg=="],
+    "@opennextjs/aws/esbuild": ["esbuild@0.25.4", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.25.4", "@esbuild/android-arm": "0.25.4", "@esbuild/android-arm64": "0.25.4", "@esbuild/android-x64": "0.25.4", "@esbuild/darwin-arm64": "0.25.4", "@esbuild/darwin-x64": "0.25.4", "@esbuild/freebsd-arm64": "0.25.4", "@esbuild/freebsd-x64": "0.25.4", "@esbuild/linux-arm": "0.25.4", "@esbuild/linux-arm64": "0.25.4", "@esbuild/linux-ia32": "0.25.4", "@esbuild/linux-loong64": "0.25.4", "@esbuild/linux-mips64el": "0.25.4", "@esbuild/linux-ppc64": "0.25.4", "@esbuild/linux-riscv64": "0.25.4", "@esbuild/linux-s390x": "0.25.4", "@esbuild/linux-x64": "0.25.4", "@esbuild/netbsd-arm64": "0.25.4", "@esbuild/netbsd-x64": "0.25.4", "@esbuild/openbsd-arm64": "0.25.4", "@esbuild/openbsd-x64": "0.25.4", "@esbuild/sunos-x64": "0.25.4", "@esbuild/win32-arm64": "0.25.4", "@esbuild/win32-ia32": "0.25.4", "@esbuild/win32-x64": "0.25.4" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-8pgjLUcUjcgDg+2Q4NYXnPbo/vncAY4UmyaCm0jZevERqCHZIaWwdJHkf8XQtu4AxSKCdvrUbT0XUr1IdZzI8Q=="],

    "@radix-ui/react-collection/@radix-ui/react-compose-refs": ["@radix-ui/react-compose-refs@1.1.1", "", { "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw=="],

@@ -4077,7 +4077,7 @@

    "gaxios/node-fetch": ["node-fetch@2.7.0", "", { "dependencies": { "whatwg-url": "^5.0.0" }, "peerDependencies": { "encoding": "^0.1.0" }, "optionalPeers": ["encoding"] }, "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="],

-    "gitbook-v2/next": ["next@15.4.0-canary.7", "", { "dependencies": { "@next/env": "15.4.0-canary.7", "@swc/counter": "0.1.3", "@swc/helpers": "0.5.15", "busboy": "1.6.0", "caniuse-lite": "^1.0.30001579", "postcss": "8.4.31", "styled-jsx": "5.1.6" }, "optionalDependencies": { "@next/swc-darwin-arm64": "15.4.0-canary.7", "@next/swc-darwin-x64": "15.4.0-canary.7", "@next/swc-linux-arm64-gnu": "15.4.0-canary.7", "@next/swc-linux-arm64-musl": "15.4.0-canary.7", "@next/swc-linux-x64-gnu": "15.4.0-canary.7", "@next/swc-linux-x64-musl": "15.4.0-canary.7", "@next/swc-win32-arm64-msvc": "15.4.0-canary.7", "@next/swc-win32-x64-msvc": "15.4.0-canary.7", "sharp": "^0.34.1" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", "@playwright/test": "^1.41.2", "babel-plugin-react-compiler": "*", "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "sass": "^1.3.0" }, "optionalPeers": ["@opentelemetry/api", "@playwright/test", "babel-plugin-react-compiler", "sass"], "bin": { "next": "dist/bin/next" } }, "sha512-ZYjT0iu+4osz8XIlr31MuoXaNQKRU75UcwEgNBt93gftoh6tzV2Mebz6sOGeVReYuYUvYlLJJksMBTNcFcPbSA=="],
+    "gitbook-v2/next": ["next@15.3.2", "", { "dependencies": { "@next/env": "15.3.2", "@swc/counter": "0.1.3", "@swc/helpers": "0.5.15", "busboy": "1.6.0", "caniuse-lite": "^1.0.30001579", "postcss": "8.4.31", "styled-jsx": "5.1.6" }, "optionalDependencies": { "@next/swc-darwin-arm64": "15.3.2", "@next/swc-darwin-x64": "15.3.2", "@next/swc-linux-arm64-gnu": "15.3.2", "@next/swc-linux-arm64-musl": "15.3.2", "@next/swc-linux-x64-gnu": "15.3.2", "@next/swc-linux-x64-musl": "15.3.2", "@next/swc-win32-arm64-msvc": "15.3.2", "@next/swc-win32-x64-msvc": "15.3.2", "sharp": "^0.34.1" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", "@playwright/test": "^1.41.2", "babel-plugin-react-compiler": "*", "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "sass": "^1.3.0" }, "optionalPeers": ["@opentelemetry/api", "@playwright/test", "babel-plugin-react-compiler", "sass"], "bin": { "next": "dist/bin/next" } }, "sha512-CA3BatMyHkxZ48sgOCLdVHjFU36N7TF1HhqAHLFOkV6buwZnvMI84Cug8xD56B9mCuKrqXnLn94417GrZ/jjCQ=="],

    "global-dirs/ini": ["ini@1.3.7", "", {}, "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ=="],

@@ -4721,49 +4721,55 @@

    "@node-minify/core/glob/path-scurry": ["path-scurry@1.11.1", "", { "dependencies": { "lru-cache": "^10.2.0", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" } }, "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA=="],

-    "@opennextjs/aws/esbuild/@esbuild/android-arm": ["@esbuild/android-arm@0.19.2", "", { "os": "android", "cpu": "arm" }, "sha512-tM8yLeYVe7pRyAu9VMi/Q7aunpLwD139EY1S99xbQkT4/q2qa6eA4ige/WJQYdJ8GBL1K33pPFhPfPdJ/WzT8Q=="],
+    "@opennextjs/aws/esbuild/@esbuild/aix-ppc64": ["@esbuild/aix-ppc64@0.25.4", "", { "os": "aix", "cpu": "ppc64" }, "sha512-1VCICWypeQKhVbE9oW/sJaAmjLxhVqacdkvPLEjwlttjfwENRSClS8EjBz0KzRyFSCPDIkuXW34Je/vk7zdB7Q=="],

-    "@opennextjs/aws/esbuild/@esbuild/android-arm64": ["@esbuild/android-arm64@0.19.2", "", { "os": "android", "cpu": "arm64" }, "sha512-lsB65vAbe90I/Qe10OjkmrdxSX4UJDjosDgb8sZUKcg3oefEuW2OT2Vozz8ef7wrJbMcmhvCC+hciF8jY/uAkw=="],
+    "@opennextjs/aws/esbuild/@esbuild/android-arm": ["@esbuild/android-arm@0.25.4", "", { "os": "android", "cpu": "arm" }, "sha512-QNdQEps7DfFwE3hXiU4BZeOV68HHzYwGd0Nthhd3uCkkEKK7/R6MTgM0P7H7FAs5pU/DIWsviMmEGxEoxIZ+ZQ=="],

-    "@opennextjs/aws/esbuild/@esbuild/android-x64": ["@esbuild/android-x64@0.19.2", "", { "os": "android", "cpu": "x64" }, "sha512-qK/TpmHt2M/Hg82WXHRc/W/2SGo/l1thtDHZWqFq7oi24AjZ4O/CpPSu6ZuYKFkEgmZlFoa7CooAyYmuvnaG8w=="],
+    "@opennextjs/aws/esbuild/@esbuild/android-arm64": ["@esbuild/android-arm64@0.25.4", "", { "os": "android", "cpu": "arm64" }, "sha512-bBy69pgfhMGtCnwpC/x5QhfxAz/cBgQ9enbtwjf6V9lnPI/hMyT9iWpR1arm0l3kttTr4L0KSLpKmLp/ilKS9A=="],

-    "@opennextjs/aws/esbuild/@esbuild/darwin-arm64": ["@esbuild/darwin-arm64@0.19.2", "", { "os": "darwin", "cpu": "arm64" }, "sha512-Ora8JokrvrzEPEpZO18ZYXkH4asCdc1DLdcVy8TGf5eWtPO1Ie4WroEJzwI52ZGtpODy3+m0a2yEX9l+KUn0tA=="],
+    "@opennextjs/aws/esbuild/@esbuild/android-x64": ["@esbuild/android-x64@0.25.4", "", { "os": "android", "cpu": "x64" }, "sha512-TVhdVtQIFuVpIIR282btcGC2oGQoSfZfmBdTip2anCaVYcqWlZXGcdcKIUklfX2wj0JklNYgz39OBqh2cqXvcQ=="],

-    "@opennextjs/aws/esbuild/@esbuild/darwin-x64": ["@esbuild/darwin-x64@0.19.2", "", { "os": "darwin", "cpu": "x64" }, "sha512-tP+B5UuIbbFMj2hQaUr6EALlHOIOmlLM2FK7jeFBobPy2ERdohI4Ka6ZFjZ1ZYsrHE/hZimGuU90jusRE0pwDw=="],
+    "@opennextjs/aws/esbuild/@esbuild/darwin-arm64": ["@esbuild/darwin-arm64@0.25.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-Y1giCfM4nlHDWEfSckMzeWNdQS31BQGs9/rouw6Ub91tkK79aIMTH3q9xHvzH8d0wDru5Ci0kWB8b3up/nl16g=="],

-    "@opennextjs/aws/esbuild/@esbuild/freebsd-arm64": ["@esbuild/freebsd-arm64@0.19.2", "", { "os": "freebsd", "cpu": "arm64" }, "sha512-YbPY2kc0acfzL1VPVK6EnAlig4f+l8xmq36OZkU0jzBVHcOTyQDhnKQaLzZudNJQyymd9OqQezeaBgkTGdTGeQ=="],
+    "@opennextjs/aws/esbuild/@esbuild/darwin-x64": ["@esbuild/darwin-x64@0.25.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-CJsry8ZGM5VFVeyUYB3cdKpd/H69PYez4eJh1W/t38vzutdjEjtP7hB6eLKBoOdxcAlCtEYHzQ/PJ/oU9I4u0A=="],

-    "@opennextjs/aws/esbuild/@esbuild/freebsd-x64": ["@esbuild/freebsd-x64@0.19.2", "", { "os": "freebsd", "cpu": "x64" }, "sha512-nSO5uZT2clM6hosjWHAsS15hLrwCvIWx+b2e3lZ3MwbYSaXwvfO528OF+dLjas1g3bZonciivI8qKR/Hm7IWGw=="],
+    "@opennextjs/aws/esbuild/@esbuild/freebsd-arm64": ["@esbuild/freebsd-arm64@0.25.4", "", { "os": "freebsd", "cpu": "arm64" }, "sha512-yYq+39NlTRzU2XmoPW4l5Ifpl9fqSk0nAJYM/V/WUGPEFfek1epLHJIkTQM6bBs1swApjO5nWgvr843g6TjxuQ=="],

-    "@opennextjs/aws/esbuild/@esbuild/linux-arm": ["@esbuild/linux-arm@0.19.2", "", { "os": "linux", "cpu": "arm" }, "sha512-Odalh8hICg7SOD7XCj0YLpYCEc+6mkoq63UnExDCiRA2wXEmGlK5JVrW50vZR9Qz4qkvqnHcpH+OFEggO3PgTg=="],
+    "@opennextjs/aws/esbuild/@esbuild/freebsd-x64": ["@esbuild/freebsd-x64@0.25.4", "", { "os": "freebsd", "cpu": "x64" }, "sha512-0FgvOJ6UUMflsHSPLzdfDnnBBVoCDtBTVyn/MrWloUNvq/5SFmh13l3dvgRPkDihRxb77Y17MbqbCAa2strMQQ=="],

-    "@opennextjs/aws/esbuild/@esbuild/linux-arm64": ["@esbuild/linux-arm64@0.19.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-ig2P7GeG//zWlU0AggA3pV1h5gdix0MA3wgB+NsnBXViwiGgY77fuN9Wr5uoCrs2YzaYfogXgsWZbm+HGr09xg=="],
+    "@opennextjs/aws/esbuild/@esbuild/linux-arm": ["@esbuild/linux-arm@0.25.4", "", { "os": "linux", "cpu": "arm" }, "sha512-kro4c0P85GMfFYqW4TWOpvmF8rFShbWGnrLqlzp4X1TNWjRY3JMYUfDCtOxPKOIY8B0WC8HN51hGP4I4hz4AaQ=="],

-    "@opennextjs/aws/esbuild/@esbuild/linux-ia32": ["@esbuild/linux-ia32@0.19.2", "", { "os": "linux", "cpu": "ia32" }, "sha512-mLfp0ziRPOLSTek0Gd9T5B8AtzKAkoZE70fneiiyPlSnUKKI4lp+mGEnQXcQEHLJAcIYDPSyBvsUbKUG2ri/XQ=="],
+    "@opennextjs/aws/esbuild/@esbuild/linux-arm64": ["@esbuild/linux-arm64@0.25.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-+89UsQTfXdmjIvZS6nUnOOLoXnkUTB9hR5QAeLrQdzOSWZvNSAXAtcRDHWtqAUtAmv7ZM1WPOOeSxDzzzMogiQ=="],

-    "@opennextjs/aws/esbuild/@esbuild/linux-loong64": ["@esbuild/linux-loong64@0.19.2", "", { "os": "linux", "cpu": "none" }, "sha512-hn28+JNDTxxCpnYjdDYVMNTR3SKavyLlCHHkufHV91fkewpIyQchS1d8wSbmXhs1fiYDpNww8KTFlJ1dHsxeSw=="],
+    "@opennextjs/aws/esbuild/@esbuild/linux-ia32": ["@esbuild/linux-ia32@0.25.4", "", { "os": "linux", "cpu": "ia32" }, "sha512-yTEjoapy8UP3rv8dB0ip3AfMpRbyhSN3+hY8mo/i4QXFeDxmiYbEKp3ZRjBKcOP862Ua4b1PDfwlvbuwY7hIGQ=="],

-    "@opennextjs/aws/esbuild/@esbuild/linux-mips64el": ["@esbuild/linux-mips64el@0.19.2", "", { "os": "linux", "cpu": "none" }, "sha512-KbXaC0Sejt7vD2fEgPoIKb6nxkfYW9OmFUK9XQE4//PvGIxNIfPk1NmlHmMg6f25x57rpmEFrn1OotASYIAaTg=="],
+    "@opennextjs/aws/esbuild/@esbuild/linux-loong64": ["@esbuild/linux-loong64@0.25.4", "", { "os": "linux", "cpu": "none" }, "sha512-NeqqYkrcGzFwi6CGRGNMOjWGGSYOpqwCjS9fvaUlX5s3zwOtn1qwg1s2iE2svBe4Q/YOG1q6875lcAoQK/F4VA=="],

-    "@opennextjs/aws/esbuild/@esbuild/linux-ppc64": ["@esbuild/linux-ppc64@0.19.2", "", { "os": "linux", "cpu": "ppc64" }, "sha512-dJ0kE8KTqbiHtA3Fc/zn7lCd7pqVr4JcT0JqOnbj4LLzYnp+7h8Qi4yjfq42ZlHfhOCM42rBh0EwHYLL6LEzcw=="],
+    "@opennextjs/aws/esbuild/@esbuild/linux-mips64el": ["@esbuild/linux-mips64el@0.25.4", "", { "os": "linux", "cpu": "none" }, "sha512-IcvTlF9dtLrfL/M8WgNI/qJYBENP3ekgsHbYUIzEzq5XJzzVEV/fXY9WFPfEEXmu3ck2qJP8LG/p3Q8f7Zc2Xg=="],

-    "@opennextjs/aws/esbuild/@esbuild/linux-riscv64": ["@esbuild/linux-riscv64@0.19.2", "", { "os": "linux", "cpu": "none" }, "sha512-7Z/jKNFufZ/bbu4INqqCN6DDlrmOTmdw6D0gH+6Y7auok2r02Ur661qPuXidPOJ+FSgbEeQnnAGgsVynfLuOEw=="],
+    "@opennextjs/aws/esbuild/@esbuild/linux-ppc64": ["@esbuild/linux-ppc64@0.25.4", "", { "os": "linux", "cpu": "ppc64" }, "sha512-HOy0aLTJTVtoTeGZh4HSXaO6M95qu4k5lJcH4gxv56iaycfz1S8GO/5Jh6X4Y1YiI0h7cRyLi+HixMR+88swag=="],

-    "@opennextjs/aws/esbuild/@esbuild/linux-s390x": ["@esbuild/linux-s390x@0.19.2", "", { "os": "linux", "cpu": "s390x" }, "sha512-U+RinR6aXXABFCcAY4gSlv4CL1oOVvSSCdseQmGO66H+XyuQGZIUdhG56SZaDJQcLmrSfRmx5XZOWyCJPRqS7g=="],
+    "@opennextjs/aws/esbuild/@esbuild/linux-riscv64": ["@esbuild/linux-riscv64@0.25.4", "", { "os": "linux", "cpu": "none" }, "sha512-i8JUDAufpz9jOzo4yIShCTcXzS07vEgWzyX3NH2G7LEFVgrLEhjwL3ajFE4fZI3I4ZgiM7JH3GQ7ReObROvSUA=="],

-    "@opennextjs/aws/esbuild/@esbuild/linux-x64": ["@esbuild/linux-x64@0.19.2", "", { "os": "linux", "cpu": "x64" }, "sha512-oxzHTEv6VPm3XXNaHPyUTTte+3wGv7qVQtqaZCrgstI16gCuhNOtBXLEBkBREP57YTd68P0VgDgG73jSD8bwXQ=="],
+    "@opennextjs/aws/esbuild/@esbuild/linux-s390x": ["@esbuild/linux-s390x@0.25.4", "", { "os": "linux", "cpu": "s390x" }, "sha512-jFnu+6UbLlzIjPQpWCNh5QtrcNfMLjgIavnwPQAfoGx4q17ocOU9MsQ2QVvFxwQoWpZT8DvTLooTvmOQXkO51g=="],

-    "@opennextjs/aws/esbuild/@esbuild/netbsd-x64": ["@esbuild/netbsd-x64@0.19.2", "", { "os": "none", "cpu": "x64" }, "sha512-WNa5zZk1XpTTwMDompZmvQLHszDDDN7lYjEHCUmAGB83Bgs20EMs7ICD+oKeT6xt4phV4NDdSi/8OfjPbSbZfQ=="],
+    "@opennextjs/aws/esbuild/@esbuild/linux-x64": ["@esbuild/linux-x64@0.25.4", "", { "os": "linux", "cpu": "x64" }, "sha512-6e0cvXwzOnVWJHq+mskP8DNSrKBr1bULBvnFLpc1KY+d+irZSgZ02TGse5FsafKS5jg2e4pbvK6TPXaF/A6+CA=="],

-    "@opennextjs/aws/esbuild/@esbuild/openbsd-x64": ["@esbuild/openbsd-x64@0.19.2", "", { "os": "openbsd", "cpu": "x64" }, "sha512-S6kI1aT3S++Dedb7vxIuUOb3oAxqxk2Rh5rOXOTYnzN8JzW1VzBd+IqPiSpgitu45042SYD3HCoEyhLKQcDFDw=="],
+    "@opennextjs/aws/esbuild/@esbuild/netbsd-arm64": ["@esbuild/netbsd-arm64@0.25.4", "", { "os": "none", "cpu": "arm64" }, "sha512-vUnkBYxZW4hL/ie91hSqaSNjulOnYXE1VSLusnvHg2u3jewJBz3YzB9+oCw8DABeVqZGg94t9tyZFoHma8gWZQ=="],

-    "@opennextjs/aws/esbuild/@esbuild/sunos-x64": ["@esbuild/sunos-x64@0.19.2", "", { "os": "sunos", "cpu": "x64" }, "sha512-VXSSMsmb+Z8LbsQGcBMiM+fYObDNRm8p7tkUDMPG/g4fhFX5DEFmjxIEa3N8Zr96SjsJ1woAhF0DUnS3MF3ARw=="],
+    "@opennextjs/aws/esbuild/@esbuild/netbsd-x64": ["@esbuild/netbsd-x64@0.25.4", "", { "os": "none", "cpu": "x64" }, "sha512-XAg8pIQn5CzhOB8odIcAm42QsOfa98SBeKUdo4xa8OvX8LbMZqEtgeWE9P/Wxt7MlG2QqvjGths+nq48TrUiKw=="],

-    "@opennextjs/aws/esbuild/@esbuild/win32-arm64": ["@esbuild/win32-arm64@0.19.2", "", { "os": "win32", "cpu": "arm64" }, "sha512-5NayUlSAyb5PQYFAU9x3bHdsqB88RC3aM9lKDAz4X1mo/EchMIT1Q+pSeBXNgkfNmRecLXA0O8xP+x8V+g/LKg=="],
+    "@opennextjs/aws/esbuild/@esbuild/openbsd-arm64": ["@esbuild/openbsd-arm64@0.25.4", "", { "os": "openbsd", "cpu": "arm64" }, "sha512-Ct2WcFEANlFDtp1nVAXSNBPDxyU+j7+tId//iHXU2f/lN5AmO4zLyhDcpR5Cz1r08mVxzt3Jpyt4PmXQ1O6+7A=="],

-    "@opennextjs/aws/esbuild/@esbuild/win32-ia32": ["@esbuild/win32-ia32@0.19.2", "", { "os": "win32", "cpu": "ia32" }, "sha512-47gL/ek1v36iN0wL9L4Q2MFdujR0poLZMJwhO2/N3gA89jgHp4MR8DKCmwYtGNksbfJb9JoTtbkoe6sDhg2QTA=="],
+    "@opennextjs/aws/esbuild/@esbuild/openbsd-x64": ["@esbuild/openbsd-x64@0.25.4", "", { "os": "openbsd", "cpu": "x64" }, "sha512-xAGGhyOQ9Otm1Xu8NT1ifGLnA6M3sJxZ6ixylb+vIUVzvvd6GOALpwQrYrtlPouMqd/vSbgehz6HaVk4+7Afhw=="],

-    "@opennextjs/aws/esbuild/@esbuild/win32-x64": ["@esbuild/win32-x64@0.19.2", "", { "os": "win32", "cpu": "x64" }, "sha512-tcuhV7ncXBqbt/Ybf0IyrMcwVOAPDckMK9rXNHtF17UTK18OKLpg08glminN06pt2WCoALhXdLfSPbVvK/6fxw=="],
+    "@opennextjs/aws/esbuild/@esbuild/sunos-x64": ["@esbuild/sunos-x64@0.25.4", "", { "os": "sunos", "cpu": "x64" }, "sha512-Mw+tzy4pp6wZEK0+Lwr76pWLjrtjmJyUB23tHKqEDP74R3q95luY/bXqXZeYl4NYlvwOqoRKlInQialgCKy67Q=="],
+
+    "@opennextjs/aws/esbuild/@esbuild/win32-arm64": ["@esbuild/win32-arm64@0.25.4", "", { "os": "win32", "cpu": "arm64" }, "sha512-AVUP428VQTSddguz9dO9ngb+E5aScyg7nOeJDrF1HPYu555gmza3bDGMPhmVXL8svDSoqPCsCPjb265yG/kLKQ=="],
+
+    "@opennextjs/aws/esbuild/@esbuild/win32-ia32": ["@esbuild/win32-ia32@0.25.4", "", { "os": "win32", "cpu": "ia32" }, "sha512-i1sW+1i+oWvQzSgfRcxxG2k4I9n3O9NRqy8U+uugaT2Dy7kLO9Y7wI72haOahxceMX8hZAzgGou1FhndRldxRg=="],
+
+    "@opennextjs/aws/esbuild/@esbuild/win32-x64": ["@esbuild/win32-x64@0.25.4", "", { "os": "win32", "cpu": "x64" }, "sha512-nOT2vZNw6hJ+z43oP1SPea/G/6AbN6X+bGNhNuq8NtRHy4wsMhw765IKLNmnjek7GvjWBYQ8Q5VBoYTFg9y1UQ=="],

    "@radix-ui/react-dismissable-layer/@radix-ui/react-primitive/@radix-ui/react-slot": ["@radix-ui/react-slot@1.1.1", "", { "dependencies": { "@radix-ui/react-compose-refs": "1.1.1" }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-RApLLOcINYJA+dMVbOju7MYv1Mb2EBp2nH4HdDzXTSyaR5optlm6Otrz1euW3HbdOR8UmmFK06TD+A9frYWv+g=="],

@@ -4969,23 +4975,23 @@

    "gaxios/https-proxy-agent/debug": ["debug@4.3.7", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ=="],

-    "gitbook-v2/next/@next/env": ["@next/env@15.4.0-canary.7", "", {}, "sha512-q8S7f2lQti3Y3gcAPzE8Pj8y0EwiWHVyyilMzoLbDPXGVfxlQhXLRiFdy2cDkKN4DyjGZWDeehEtw4huvJAa3Q=="],
+    "gitbook-v2/next/@next/env": ["@next/env@15.3.2", "", {}, "sha512-xURk++7P7qR9JG1jJtLzPzf0qEvqCN0A/T3DXf8IPMKo9/6FfjxtEffRJIIew/bIL4T3C2jLLqBor8B/zVlx6g=="],

-    "gitbook-v2/next/@next/swc-darwin-arm64": ["@next/swc-darwin-arm64@15.4.0-canary.7", "", { "os": "darwin", "cpu": "arm64" }, "sha512-+TMxUu5CAWNe+UFRc47BZAXQxCRqZfVbGyCldddiog4MorvL7kBxSd1qlmrwI73fRRKtXkHIH1TaeItyxzC9rQ=="],
+    "gitbook-v2/next/@next/swc-darwin-arm64": ["@next/swc-darwin-arm64@15.3.2", "", { "os": "darwin", "cpu": "arm64" }, "sha512-2DR6kY/OGcokbnCsjHpNeQblqCZ85/1j6njYSkzRdpLn5At7OkSdmk7WyAmB9G0k25+VgqVZ/u356OSoQZ3z0g=="],

-    "gitbook-v2/next/@next/swc-darwin-x64": ["@next/swc-darwin-x64@15.4.0-canary.7", "", { "os": "darwin", "cpu": "x64" }, "sha512-veXp8lg/X/7O+pG9BDQ3OizFz3B40v29jsvEWj+ULY/W8Z6+dCSd5XPP2M8fG/gKKKA0D6L0CnnM2Mj0RRSUJw=="],
+    "gitbook-v2/next/@next/swc-darwin-x64": ["@next/swc-darwin-x64@15.3.2", "", { "os": "darwin", "cpu": "x64" }, "sha512-ro/fdqaZWL6k1S/5CLv1I0DaZfDVJkWNaUU3un8Lg6m0YENWlDulmIWzV96Iou2wEYyEsZq51mwV8+XQXqMp3w=="],

-    "gitbook-v2/next/@next/swc-linux-arm64-gnu": ["@next/swc-linux-arm64-gnu@15.4.0-canary.7", "", { "os": "linux", "cpu": "arm64" }, "sha512-KxNGfW7BO0Z5B9rJyl9p7YVjNrxAhu06mH6h1PSdouZG7YMYpdRCconVXeuBI0PEu6g3ywNrOVxZUk1V6G5u0Q=="],
+    "gitbook-v2/next/@next/swc-linux-arm64-gnu": ["@next/swc-linux-arm64-gnu@15.3.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-covwwtZYhlbRWK2HlYX9835qXum4xYZ3E2Mra1mdQ+0ICGoMiw1+nVAn4d9Bo7R3JqSmK1grMq/va+0cdh7bJA=="],

-    "gitbook-v2/next/@next/swc-linux-arm64-musl": ["@next/swc-linux-arm64-musl@15.4.0-canary.7", "", { "os": "linux", "cpu": "arm64" }, "sha512-THgXgmP/cC4DsNwvC6uqB90CebB7Ep1KyZajQL3fYKT5V4SWr46yngKLyoyJVeAYWJH908MrWddf7Ya/Zq7cyg=="],
+    "gitbook-v2/next/@next/swc-linux-arm64-musl": ["@next/swc-linux-arm64-musl@15.3.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-KQkMEillvlW5Qk5mtGA/3Yz0/tzpNlSw6/3/ttsV1lNtMuOHcGii3zVeXZyi4EJmmLDKYcTcByV2wVsOhDt/zg=="],

-    "gitbook-v2/next/@next/swc-linux-x64-gnu": ["@next/swc-linux-x64-gnu@15.4.0-canary.7", "", { "os": "linux", "cpu": "x64" }, "sha512-kpLB3Jj7fProynQYj2ahFyZlJs0xwm71VzCVrNRu6u7qJGXn6dK5h7+hro8y/y1iqjXWgCLSdxWSHahhWK8XdQ=="],
+    "gitbook-v2/next/@next/swc-linux-x64-gnu": ["@next/swc-linux-x64-gnu@15.3.2", "", { "os": "linux", "cpu": "x64" }, "sha512-uRBo6THWei0chz+Y5j37qzx+BtoDRFIkDzZjlpCItBRXyMPIg079eIkOCl3aqr2tkxL4HFyJ4GHDes7W8HuAUg=="],

-    "gitbook-v2/next/@next/swc-linux-x64-musl": ["@next/swc-linux-x64-musl@15.4.0-canary.7", "", { "os": "linux", "cpu": "x64" }, "sha512-rnGAKvl4cWPVV9D+SybWOGijm0VmKXyqQ+IN0A6WDgdlYZAZP0ZnJv/rq7DSvuOh19AXS8UpQc88SelXV/3j3Q=="],
+    "gitbook-v2/next/@next/swc-linux-x64-musl": ["@next/swc-linux-x64-musl@15.3.2", "", { "os": "linux", "cpu": "x64" }, "sha512-+uxFlPuCNx/T9PdMClOqeE8USKzj8tVz37KflT3Kdbx/LOlZBRI2yxuIcmx1mPNK8DwSOMNCr4ureSet7eyC0w=="],

-    "gitbook-v2/next/@next/swc-win32-arm64-msvc": ["@next/swc-win32-arm64-msvc@15.4.0-canary.7", "", { "os": "win32", "cpu": "arm64" }, "sha512-/PRbn//EuR3UGiquk050gqvjxLliEgGBy1Cx9KkpAT7szaHOBj1mDDQmxMTEhRex4i3YfKGJXWn5mLMCveya6Q=="],
+    "gitbook-v2/next/@next/swc-win32-arm64-msvc": ["@next/swc-win32-arm64-msvc@15.3.2", "", { "os": "win32", "cpu": "arm64" }, "sha512-LLTKmaI5cfD8dVzh5Vt7+OMo+AIOClEdIU/TSKbXXT2iScUTSxOGoBhfuv+FU8R9MLmrkIL1e2fBMkEEjYAtPQ=="],

-    "gitbook-v2/next/@next/swc-win32-x64-msvc": ["@next/swc-win32-x64-msvc@15.4.0-canary.7", "", { "os": "win32", "cpu": "x64" }, "sha512-7a92XL+DlrbWyycCpQjjQMHOrsA0p+VvS7iA2dyi89Xsq0qtOPzFH0Gb56fsjh6M6BQGFhboOSzjmpjlkMTilQ=="],
+    "gitbook-v2/next/@next/swc-win32-x64-msvc": ["@next/swc-win32-x64-msvc@15.3.2", "", { "os": "win32", "cpu": "x64" }, "sha512-aW5B8wOPioJ4mBdMDXkt5f3j8pUr9W8AnlX0Df35uRWNT1Y6RIybxjnSUe+PhM+M1bwgyY8PHLmXZC6zT1o5tA=="],

    "gitbook-v2/next/postcss": ["postcss@8.4.31", "", { "dependencies": { "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" } }, "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ=="],

@@ -7,10 +7,10 @@
        "turbo": "^2.5.0",
        "vercel": "^39.3.0"
    },
-    "packageManager": "bun@1.2.8",
+    "packageManager": "bun@1.2.11",
    "overrides": {
        "@codemirror/state": "6.4.1",
-        "@gitbook/api": "0.113.0",
+        "@gitbook/api": "^0.115.0",
        "react": "^19.0.0",
        "react-dom": "^19.0.0"
    },
@@ -10,7 +10,7 @@
    },
    "version": "0.3.1",
    "dependencies": {
-        "@gitbook/api": "^0.111.0",
+        "@gitbook/api": "^0.115.0",
        "assert-never": "^1.2.1"
    },
    "devDependencies": {
@@ -1,5 +1,13 @@
 # @gitbook/colors

+## 0.3.3
+
+### Patch Changes
+
+- c3f6b8c: Update chroma ratio per step
+- 5e975ab: Fix code highlighting for HTTP
+- f7a3470: Change lightness check for color step 9 to allow input colors with a higher-than-needed contrast
+
 ## 0.3.2

 ### Patch Changes
@@ -8,7 +8,7 @@
            "default": "./dist/index.js"
        }
    },
-    "version": "0.3.2",
+    "version": "0.3.3",
    "devDependencies": {
        "typescript": "^5.5.3"
    },
@@ -6,6 +6,7 @@

 # cloudflare
 .open-next
+.wrangler

 # Symbolic links
 public
@@ -1,5 +1,24 @@
 # gitbook-v2

+## 0.3.0
+
+### Minor Changes
+
+- 3119066: Add support for reusable content across spaces.
+- 7d7806d: Pass SVG images through image resizing without resizing them to serve them from optimal host.
+
+### Patch Changes
+
+- 1c8d9fe: keep data cache in OpenNext between deployment
+- 778624a: Only resize images with supported extensions.
+- e6ddc0f: Fix URL in sitemap
+- 5e975ab: Fix code highlighting for HTTP
+- e15757d: Fix crash on Cloudflare by using latest stable version of Next.js instead of canary
+- 634e0b4: Improve error messages around undefined site sections.
+- 97b7c79: Increase logging around caching behaviour causing page crashes.
+- 3f29206: Update the regex for validating site redirect
+- dd043df: Revert investigation work around URL caches.
+
 ## 0.2.5

 ### Patch Changes
@@ -1,18 +1,26 @@
 import { defineCloudflareConfig } from '@opennextjs/cloudflare';
-import r2IncrementalCache from '@opennextjs/cloudflare/overrides/incremental-cache/r2-incremental-cache';
-import { withRegionalCache } from '@opennextjs/cloudflare/overrides/incremental-cache/regional-cache';
-import doQueue from '@opennextjs/cloudflare/overrides/queue/do-queue';
 import doShardedTagCache from '@opennextjs/cloudflare/overrides/tag-cache/do-sharded-tag-cache';
+import {
+    softTagFilter,
+    withFilter,
+} from '@opennextjs/cloudflare/overrides/tag-cache/tag-cache-filter';

 export default defineCloudflareConfig({
-    incrementalCache: withRegionalCache(r2IncrementalCache, { mode: 'long-lived' }),
-    tagCache: doShardedTagCache({
-        baseShardSize: 12,
-        regionalCache: true,
-        shardReplication: {
-            numberOfSoftReplicas: 2,
-            numberOfHardReplicas: 1,
-        },
+    incrementalCache: () => import('./openNext/incrementalCache').then((m) => m.default),
+    tagCache: withFilter({
+        tagCache: doShardedTagCache({
+            baseShardSize: 12,
+            regionalCache: true,
+            shardReplication: {
+                numberOfSoftReplicas: 2,
+                numberOfHardReplicas: 1,
+            },
+        }),
+        // We don't use `revalidatePath`, so we filter out soft tags
+        filterFn: softTagFilter,
    }),
-    queue: doQueue,
+    queue: () => import('./openNext/queue').then((m) => m.default),
+
+    // Performance improvements as we don't use PPR
+    enableCacheInterception: true,
 });
@@ -0,0 +1,186 @@
+import { createHash } from 'node:crypto';
+
+import { trace } from '@/lib/tracing';
+import type {
+    CacheEntryType,
+    CacheValue,
+    IncrementalCache,
+    WithLastModified,
+} from '@opennextjs/aws/types/overrides.js';
+import { getCloudflareContext } from '@opennextjs/cloudflare';
+
+export const BINDING_NAME = 'NEXT_INC_CACHE_R2_BUCKET';
+export const DEFAULT_PREFIX = 'incremental-cache';
+
+export type KeyOptions = {
+    cacheType?: CacheEntryType;
+};
+
+/**
+ *
+ * It is very similar to the `R2IncrementalCache` in the `@opennextjs/cloudflare` package, but it allow us to trace
+ * the cache operations. It also integrates both R2 and Cache API in a single class.
+ * Having our own, will allow us to customize it in the future if needed.
+ */
+class GitbookIncrementalCache implements IncrementalCache {
+    name = 'GitbookIncrementalCache';
+
+    protected localCache: Cache | undefined;
+
+    async get<CacheType extends CacheEntryType = 'cache'>(
+        key: string,
+        cacheType?: CacheType
+    ): Promise<WithLastModified<CacheValue<CacheType>> | null> {
+        const cacheKey = this.getR2Key(key, cacheType);
+        return trace(
+            {
+                operation: 'openNextIncrementalCacheGet',
+                name: cacheKey,
+            },
+            async (span) => {
+                span.setAttribute('cacheType', cacheType ?? 'cache');
+                const r2 = getCloudflareContext().env[BINDING_NAME];
+                const localCache = await this.getCacheInstance();
+                if (!r2) throw new Error('No R2 bucket');
+                try {
+                    // Check local cache first if available
+                    const localCacheEntry = await localCache.match(this.getCacheUrlKey(cacheKey));
+                    if (localCacheEntry) {
+                        span.setAttribute('cacheHit', 'local');
+                        return localCacheEntry.json();
+                    }
+
+                    const r2Object = await r2.get(cacheKey);
+                    if (!r2Object) return null;
+
+                    span.setAttribute('cacheHit', 'r2');
+                    return {
+                        value: await r2Object.json(),
+                        lastModified: r2Object.uploaded.getTime(),
+                    };
+                } catch (e) {
+                    console.error('Failed to get from cache', e);
+                    return null;
+                }
+            }
+        );
+    }
+
+    async set<CacheType extends CacheEntryType = 'cache'>(
+        key: string,
+        value: CacheValue<CacheType>,
+        cacheType?: CacheType
+    ): Promise<void> {
+        const cacheKey = this.getR2Key(key, cacheType);
+        return trace(
+            {
+                operation: 'openNextIncrementalCacheSet',
+                name: cacheKey,
+            },
+            async (span) => {
+                span.setAttribute('cacheType', cacheType ?? 'cache');
+                const r2 = getCloudflareContext().env[BINDING_NAME];
+                const localCache = await this.getCacheInstance();
+                if (!r2) throw new Error('No R2 bucket');
+
+                try {
+                    await r2.put(cacheKey, JSON.stringify(value));
+
+                    //TODO: Check if there is any places where we don't have tags
+                    // Ideally we should always have tags, but in case we don't, we need to decide how to handle it
+                    // For now we default to a build ID tag, which allow us to invalidate the cache in case something is wrong in this deployment
+                    const tags = this.getTagsFromCacheEntry(value) ?? [
+                        `build_id/${process.env.NEXT_BUILD_ID}`,
+                    ];
+
+                    // We consider R2 as the source of truth, so we update the local cache
+                    // only after a successful R2 write
+                    await localCache.put(
+                        this.getCacheUrlKey(cacheKey),
+                        new Response(
+                            JSON.stringify({
+                                value,
+                                // Note: `Date.now()` returns the time of the last IO rather than the actual time.
+                                //       See https://developers.cloudflare.com/workers/reference/security-model/
+                                lastModified: Date.now(),
+                            }),
+                            {
+                                headers: {
+                                    // Cache-Control default to 30 minutes, will be overridden by `revalidate`
+                                    // In theory we should always get the `revalidate` value
+                                    'cache-control': `max-age=${value.revalidate ?? 60 * 30}`,
+                                    'cache-tag': tags.join(','),
+                                },
+                            }
+                        )
+                    );
+                } catch (e) {
+                    console.error('Failed to set to cache', e);
+                }
+            }
+        );
+    }
+
+    async delete(key: string): Promise<void> {
+        const cacheKey = this.getR2Key(key);
+        return trace(
+            {
+                operation: 'openNextIncrementalCacheDelete',
+                name: cacheKey,
+            },
+            async () => {
+                const r2 = getCloudflareContext().env[BINDING_NAME];
+                const localCache = await this.getCacheInstance();
+                if (!r2) throw new Error('No R2 bucket');
+
+                try {
+                    await r2.delete(cacheKey);
+
+                    // Here again R2 is the source of truth, so we delete from local cache first
+                    await localCache.delete(this.getCacheUrlKey(cacheKey));
+                } catch (e) {
+                    console.error('Failed to delete from cache', e);
+                }
+            }
+        );
+    }
+
+    async getCacheInstance(): Promise<Cache> {
+        if (this.localCache) return this.localCache;
+        this.localCache = await caches.open('incremental-cache');
+        return this.localCache;
+    }
+
+    // Utility function to generate keys for R2/Cache API
+    getR2Key(key: string, cacheType: CacheEntryType = 'cache'): string {
+        const hash = createHash('sha256').update(key).digest('hex');
+        return `${DEFAULT_PREFIX}/${cacheType === 'cache' ? process.env?.NEXT_BUILD_ID : 'dataCache'}/${hash}.${cacheType}`.replace(
+            /\/+/g,
+            '/'
+        );
+    }
+
+    getCacheUrlKey(cacheKey: string): string {
+        return `http://cache.local/${cacheKey}`;
+    }
+
+    getTagsFromCacheEntry<CacheType extends CacheEntryType>(
+        entry: CacheValue<CacheType>
+    ): string[] | undefined {
+        if ('tags' in entry && entry.tags) {
+            return entry.tags;
+        }
+
+        if ('meta' in entry && entry.meta && 'headers' in entry.meta && entry.meta.headers) {
+            const rawTags = entry.meta.headers['x-next-cache-tags'];
+            if (typeof rawTags === 'string') {
+                return rawTags.split(',');
+            }
+        }
+        if ('value' in entry) {
+            return entry.tags;
+        }
+    }
+}
+
+export default new GitbookIncrementalCache();
@@ -0,0 +1,17 @@
+import type { Queue } from '@opennextjs/aws/types/overrides.js';
+import { getCloudflareContext } from '@opennextjs/cloudflare';
+import doQueue from '@opennextjs/cloudflare/overrides/queue/do-queue';
+import memoryQueue from '@opennextjs/cloudflare/overrides/queue/memory-queue';
+
+interface Env {
+    IS_PREVIEW?: string;
+}
+
+export default {
+    name: 'GitbookISRQueue',
+    send: async (msg) => {
+        const { ctx, env } = getCloudflareContext();
+        const isPreview = (env as Env).IS_PREVIEW === 'true';
+        ctx.waitUntil(isPreview ? memoryQueue.send(msg) : doQueue.send(msg));
+    },
+} satisfies Queue;
@@ -1,23 +1,23 @@
 {
    "name": "gitbook-v2",
-    "version": "0.2.5",
+    "version": "0.3.0",
    "private": true,
    "dependencies": {
-        "next": "canary",
+        "@gitbook/api": "^0.115.0",
+        "@gitbook/cache-tags": "workspace:*",
+        "@opennextjs/cloudflare": "1.0.4",
+        "@sindresorhus/fnv1a": "^3.1.0",
+        "assert-never": "^1.2.1",
+        "jwt-decode": "^4.0.0",
+        "next": "^15.3.2",
        "react": "^19.0.0",
        "react-dom": "^19.0.0",
-        "@gitbook/api": "*",
-        "@gitbook/cache-tags": "workspace:*",
-        "@sindresorhus/fnv1a": "^3.1.0",
-        "server-only": "^0.0.1",
-        "warn-once": "^0.1.1",
        "rison": "^0.1.1",
-        "jwt-decode": "^4.0.0",
-        "assert-never": "^1.2.1"
+        "server-only": "^0.0.1",
+        "warn-once": "^0.1.1"
    },
    "devDependencies": {
        "gitbook": "*",
-        "@opennextjs/cloudflare": "^1.0.0-beta.3",
        "@types/rison": "^0.0.9",
        "tailwindcss": "^3.4.0",
        "postcss": "^8"
@@ -29,7 +29,7 @@
        "build:v2": "next build",
        "start": "next start",
        "build:v2:cloudflare": "opennextjs-cloudflare build",
-        "dev:v2:cloudflare": "wrangler dev --port 8771",
+        "dev:v2:cloudflare": "wrangler dev --port 8771 --env preview",
        "unit": "bun test",
        "typecheck": "tsc --noEmit"
    }
@@ -165,7 +165,7 @@ export function getBaseContext(input: {
        // Create link in the same format for links to other sites/sections.
        linker.toLinkForContent = (rawURL: string) => {
            const urlObject = new URL(rawURL);
-            return `/url/${urlObject.host}${urlObject.pathname}${urlObject.search}`;
+            return `/url/${urlObject.host}${urlObject.pathname}${urlObject.search}${urlObject.hash}`;
        };
    }

@@ -1,55 +1,102 @@
 import { race, tryCatch } from '@/lib/async';
 import { joinPath, joinPathWithBaseURL } from '@/lib/paths';
 import { trace } from '@/lib/tracing';
-import type { PublishedSiteContentLookup } from '@gitbook/api';
+import type { GitBookAPI, PublishedSiteContentLookup, SiteVisitorPayload } from '@gitbook/api';
 import { apiClient } from './api';
 import { getExposableError } from './errors';
 import type { DataFetcherResponse } from './types';
 import { getURLLookupAlternatives, stripURLSearch } from './urls';

-/**
- * Lookup a content by its URL using the GitBook API.
- * To optimize caching, we try multiple lookup alternatives and return the first one that matches.
- */
-export async function getPublishedContentByURL(input: {
+interface LookupPublishedContentByUrlInput {
    url: string;
-    visitorAuthToken: string | null;
    redirectOnError: boolean;
    apiToken: string | null;
+    visitorPayload: SiteVisitorPayload;
+}
+
+/**
+ * Lookup a content by its URL using the GitBook resolvePublishedContentByUrl API endpoint.
+ * To optimize caching, we try multiple lookup alternatives and return the first one that matches.
+ */
+export async function resolvePublishedContentByUrl(input: LookupPublishedContentByUrlInput) {
+    return lookupPublishedContentByUrl({
+        url: input.url,
+        fetchLookupAPIResult: ({ url, signal }) => {
+            const api = apiClient({ apiToken: input.apiToken });
+            return trace(
+                {
+                    operation: 'resolvePublishedContentByUrl',
+                    name: url,
+                },
+                () =>
+                    tryCatch(
+                        api.urls.resolvePublishedContentByUrl(
+                            {
+                                url,
+                                ...(input.visitorPayload ? { visitor: input.visitorPayload } : {}),
+                                redirectOnError: input.redirectOnError,
+                            },
+                            { signal }
+                        )
+                    )
+            );
+        },
+    });
+}
+
+/**
+ * Lookup a content by its URL using the GitBook getPublishedContentByUrl API endpoint.
+ * To optimize caching, we try multiple lookup alternatives and return the first one that matches.
+ *
+ * @deprecated use resolvePublishedContentByUrl.
+ *
+ */
+export async function getPublishedContentByURL(input: LookupPublishedContentByUrlInput) {
+    return lookupPublishedContentByUrl({
+        url: input.url,
+        fetchLookupAPIResult: ({ url, signal }) => {
+            const api = apiClient({ apiToken: input.apiToken });
+            return trace(
+                {
+                    operation: 'getPublishedContentByURL',
+                    name: url,
+                },
+                () =>
+                    tryCatch(
+                        api.urls.getPublishedContentByUrl(
+                            {
+                                url,
+                                visitorAuthToken: input.visitorPayload.jwtToken ?? undefined,
+                                redirectOnError: input.redirectOnError,
+                                // @ts-expect-error - cacheVersion is not a real query param
+                                cacheVersion: 'v2',
+                            },
+                            { signal }
+                        )
+                    )
+            );
+        },
+    });
+}
+
+type TryCatch<T> = ReturnType<typeof tryCatch<T>>;
+
+async function lookupPublishedContentByUrl(input: {
+    url: string;
+    fetchLookupAPIResult: (args: {
+        url: string;
+        signal: AbortSignal;
+    }) => TryCatch<Awaited<ReturnType<GitBookAPI['urls']['resolvePublishedContentByUrl']>>>;
 }): Promise<DataFetcherResponse<PublishedSiteContentLookup>> {
    const lookupURL = new URL(input.url);
    const url = stripURLSearch(lookupURL);
    const lookup = getURLLookupAlternatives(url);

    const result = await race(lookup.urls, async (alternative, { signal }) => {
-        const api = await apiClient({ apiToken: input.apiToken });
-
-        const callResult = await trace(
-            {
-                operation: 'getPublishedContentByURL',
-                name: alternative.url,
-            },
-            () =>
-                tryCatch(
-                    api.urls.getPublishedContentByUrl(
-                        {
-                            url: alternative.url,
-                            visitorAuthToken: input.visitorAuthToken ?? undefined,
-                            redirectOnError: input.redirectOnError,
-
-                            // As this endpoint is cached by our API, we version the request
-                            // to void getting stale data with missing properties.
-                            // this could be improved by ensuring our API cache layer is versioned
-                            // or invalidated when needed
-                            // @ts-expect-error - cacheVersion is not a real query param
-                            cacheVersion: 'v2',
-                        },
-                        {
-                            signal,
-                        }
-                    )
-                )
-        );
+        const callResult = await input.fetchLookupAPIResult({
+            url: alternative.url,
+            signal,
+        });

        if (callResult.error) {
            if (alternative.primary) {
@@ -189,5 +189,7 @@ export interface GitBookDataFetcher {
        input: api.AIMessageInput[];
        output: api.AIOutputFormat;
        model: api.AIModel;
+        tools?: api.AIToolCapabilities;
+        previousResponseId?: string;
    }): AsyncGenerator<api.AIStreamResponse, void, unknown>;
 }
@@ -0,0 +1,81 @@
+import { describe, expect, it } from 'bun:test';
+import { SizableImageAction, checkIsSizableImageURL } from './checkIsSizableImageURL';
+
+describe('checkIsSizableImageURL', () => {
+    it('should return Skip for non-parsable URLs', () => {
+        expect(checkIsSizableImageURL('not a url')).toBe(SizableImageAction.Skip);
+    });
+
+    it('should return Skip for non-http(s) URLs', () => {
+        expect(checkIsSizableImageURL('data:image/png;base64,abc')).toBe(SizableImageAction.Skip);
+        expect(checkIsSizableImageURL('file:///path/to/image.jpg')).toBe(SizableImageAction.Skip);
+    });
+
+    it('should return Skip for localhost URLs', () => {
+        expect(checkIsSizableImageURL('http://localhost:3000/image.jpg')).toBe(
+            SizableImageAction.Skip
+        );
+        expect(checkIsSizableImageURL('https://localhost/image.png')).toBe(SizableImageAction.Skip);
+    });
+
+    it('should return Skip for GitBook image URLs', () => {
+        expect(checkIsSizableImageURL('https://example.com/~gitbook/image/test.jpg')).toBe(
+            SizableImageAction.Skip
+        );
+    });
+
+    it('should return Resize for supported image extensions', () => {
+        expect(checkIsSizableImageURL('https://example.com/image.jpg')).toBe(
+            SizableImageAction.Resize
+        );
+        expect(checkIsSizableImageURL('https://example.com/image.jpeg')).toBe(
+            SizableImageAction.Resize
+        );
+        expect(checkIsSizableImageURL('https://example.com/image.png')).toBe(
+            SizableImageAction.Resize
+        );
+        expect(checkIsSizableImageURL('https://example.com/image.gif')).toBe(
+            SizableImageAction.Resize
+        );
+        expect(checkIsSizableImageURL('https://example.com/image.webp')).toBe(
+            SizableImageAction.Resize
+        );
+    });
+
+    it('should return Resize for URLs without extensions', () => {
+        expect(checkIsSizableImageURL('https://example.com/image')).toBe(SizableImageAction.Resize);
+    });
+
+    it('should return Passthrough for unsupported image extensions', () => {
+        expect(checkIsSizableImageURL('https://example.com/image.svg')).toBe(
+            SizableImageAction.Passthrough
+        );
+        expect(checkIsSizableImageURL('https://example.com/image.bmp')).toBe(
+            SizableImageAction.Passthrough
+        );
+        expect(checkIsSizableImageURL('https://example.com/image.tiff')).toBe(
+            SizableImageAction.Passthrough
+        );
+        expect(checkIsSizableImageURL('https://example.com/image.ico')).toBe(
+            SizableImageAction.Passthrough
+        );
+    });
+
+    it('should handle URLs with query parameters correctly', () => {
+        expect(checkIsSizableImageURL('https://example.com/image.jpg?width=100')).toBe(
+            SizableImageAction.Resize
+        );
+        expect(checkIsSizableImageURL('https://example.com/image.svg?height=200')).toBe(
+            SizableImageAction.Passthrough
+        );
+    });
+
+    it('should be case-insensitive for extensions', () => {
+        expect(checkIsSizableImageURL('https://example.com/image.JPG')).toBe(
+            SizableImageAction.Resize
+        );
+        expect(checkIsSizableImageURL('https://example.com/image.PNG')).toBe(
+            SizableImageAction.Resize
+        );
+    });
+});
@@ -1,4 +1,15 @@
-import { checkIsHttpURL } from '@/lib/urls';
+import { getExtension } from '@/lib/paths';
+
+export enum SizableImageAction {
+    Resize = 'resize',
+    Skip = 'skip',
+    Passthrough = 'passthrough',
+}
+
+/**
+ * https://developers.cloudflare.com/images/transform-images/#supported-input-formats
+ */
+const SUPPORTED_IMAGE_EXTENSIONS = ['.jpg', '.jpeg', '.png', '.gif', '.webp'];

 /**
 * Check if an image URL is resizable.
@@ -6,22 +17,27 @@ import { checkIsHttpURL } from '@/lib/urls';
 * Skip it for SVGs.
 * Skip it for GitBook images (to avoid recursion).
 */
-export function checkIsSizableImageURL(input: string): boolean {
+export function checkIsSizableImageURL(input: string): SizableImageAction {
    if (!URL.canParse(input)) {
-        return false;
-    }
-
-    if (input.includes('/~gitbook/image')) {
-        return false;
+        return SizableImageAction.Skip;
    }

    const parsed = new URL(input);
-    if (parsed.pathname.endsWith('.svg') || parsed.pathname.endsWith('.avif')) {
-        return false;
+    if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {
+        return SizableImageAction.Skip;
    }
-    if (!checkIsHttpURL(parsed)) {
-        return false;
+    if (parsed.hostname === 'localhost') {
+        return SizableImageAction.Skip;
+    }
+    if (parsed.pathname.includes('/~gitbook/image')) {
+        return SizableImageAction.Skip;
    }

-    return true;
+    const extension = getExtension(parsed.pathname).toLowerCase();
+    if (!extension || SUPPORTED_IMAGE_EXTENSIONS.includes(extension)) {
+        // If no extension, we consider it resizable.
+        return SizableImageAction.Resize;
+    }
+
+    return SizableImageAction.Passthrough;
 }
@@ -1,7 +1,7 @@
 import 'server-only';
 import { GITBOOK_IMAGE_RESIZE_SIGNING_KEY, GITBOOK_IMAGE_RESIZE_URL } from '../env';
 import type { GitBookLinker } from '../links';
-import { checkIsSizableImageURL } from './checkIsSizableImageURL';
+import { SizableImageAction, checkIsSizableImageURL } from './checkIsSizableImageURL';
 import { getImageSize } from './resizer';
 import { type SignatureVersion, generateImageSignature } from './signatures';
 import type { ImageResizer } from './types';
@@ -24,7 +24,7 @@ export function createImageResizer({

    return {
        getResizedImageURL: (urlInput) => {
-            if (!checkIsSizableImageURL(urlInput)) {
+            if (checkIsSizableImageURL(urlInput) === SizableImageAction.Skip) {
                return null;
            }

@@ -64,7 +64,7 @@ export function createImageResizer({
        },

        getImageSize: async (input, options) => {
-            if (!checkIsSizableImageURL(input)) {
+            if (checkIsSizableImageURL(input) !== SizableImageAction.Resize) {
                return null;
            }

@@ -1,7 +1,7 @@
 import 'server-only';
 import assertNever from 'assert-never';
 import { GITBOOK_IMAGE_RESIZE_MODE } from '../../env';
-import { checkIsSizableImageURL } from '../checkIsSizableImageURL';
+import { SizableImageAction, checkIsSizableImageURL } from '../checkIsSizableImageURL';
 import { resizeImageWithCDNCgi } from './cdn-cgi';
 import { resizeImageWithCFFetch } from './cf-fetch';
 import type { CloudflareImageJsonFormat, CloudflareImageOptions } from './types';
@@ -13,7 +13,7 @@ export async function getImageSize(
    input: string,
    defaultSize: Partial<CloudflareImageOptions> = {}
 ): Promise<{ width: number; height: number } | null> {
-    if (!checkIsSizableImageURL(input)) {
+    if (checkIsSizableImageURL(input) !== SizableImageAction.Resize) {
        return null;
    }

@@ -48,13 +48,17 @@ export async function resizeImage(
        signal?: AbortSignal;
    }
 ): Promise<Response> {
-    const parsed = new URL(input);
-    if (parsed.protocol === 'data:') {
-        throw new Error('Cannot resize data: URLs');
+    const action = checkIsSizableImageURL(input);
+    if (action === SizableImageAction.Skip) {
+        throw new Error(
+            'Cannot resize this image, this function should have never been called on this url'
+        );
    }

-    if (parsed.hostname === 'localhost') {
-        throw new Error('Cannot resize localhost URLs');
+    if (action === SizableImageAction.Passthrough) {
+        return fetch(input, {
+            signal: options.signal,
+        });
    }

    switch (GITBOOK_IMAGE_RESIZE_MODE) {
@@ -93,6 +93,11 @@ export function createLinker(
        },

        toAbsoluteURL(absolutePath: string): string {
+            // If the path is already a full URL, we return it as is.
+            if (URL.canParse(absolutePath)) {
+                return absolutePath;
+            }
+
            if (!servedOn.host) {
                return absolutePath;
            }
@@ -10,15 +10,16 @@ import {
    type ResponseCookies,
    getPathScopedCookieName,
    getResponseCookiesForVisitorAuth,
-    getVisitorToken,
+    getVisitorData,
    normalizeVisitorAuthURL,
-} from '@/lib/visitor-token';
+} from '@/lib/visitors';
 import { serveResizedImage } from '@/routes/image';
 import {
    DataFetcherError,
    getPublishedContentByURL,
    getVisitorAuthBasePath,
    normalizeURL,
+    resolvePublishedContentByUrl,
    throwIfDataError,
 } from '@v2/lib/data';
 import { isGitBookAssetsHostURL, isGitBookHostURL } from '@v2/lib/env';
@@ -33,6 +34,15 @@ export const config = {

 type URLWithMode = { url: URL; mode: 'url' | 'url-host' };

+/**
+ * Temporary list of hosts to test adaptive content using the new resolution API.
+ */
+const ADAPTIVE_CONTENT_HOSTS = [
+    'docs.gitbook.com',
+    'adaptive-docs.gitbook-staging.com',
+    'enriched-content-playground.gitbook-staging.io',
+];
+
 export async function middleware(request: NextRequest) {
    try {
        const requestURL = new URL(request.url);
@@ -85,17 +95,22 @@ async function serveSiteRoutes(requestURL: URL, request: NextRequest) {
    //
    // Detect and extract the visitor authentication token from the request
    //
-    // @ts-ignore - request typing
-    const visitorToken = getVisitorToken({
+    const { visitorToken, unsignedClaims, visitorParamsCookie } = getVisitorData({
        cookies: request.cookies.getAll(),
        url: siteRequestURL,
    });

    const withAPIToken = async (apiToken: string | null) => {
+        const resolve = ADAPTIVE_CONTENT_HOSTS.includes(siteRequestURL.hostname)
+            ? resolvePublishedContentByUrl
+            : getPublishedContentByURL;
        const siteURLData = await throwIfDataError(
-            getPublishedContentByURL({
+            resolve({
                url: siteRequestURL.toString(),
-                visitorAuthToken: visitorToken?.token ?? null,
+                visitorPayload: {
+                    jwtToken: visitorToken?.token ?? undefined,
+                    unsignedClaims,
+                },
                // When the visitor auth token is pulled from the cookie, set redirectOnError when calling getPublishedContentByUrl to allow
                // redirecting when the token is invalid as we could be dealing with stale token stored in the cookie.
                // For example when the VA backend signature has changed but the token stored in the cookie is not yet expired.
@@ -106,7 +121,13 @@ async function serveSiteRoutes(requestURL: URL, request: NextRequest) {
                apiToken,
            })
        );
-        const cookies: ResponseCookies = [];
+
+        const cookies: ResponseCookies = visitorParamsCookie
+            ? [
+                  // If visitor.* params were passed to the site URL, include a session cookie to persist these params across navigation.
+                  visitorParamsCookie,
+              ]
+            : [];

        //
        // Handle redirects
@@ -2,7 +2,11 @@
    "main": ".open-next/worker.js",
    "name": "gitbook-open-v2",
    "compatibility_date": "2025-04-14",
-    "compatibility_flags": ["nodejs_compat", "allow_importable_env"],
+    "compatibility_flags": [
+        "nodejs_compat",
+        "allow_importable_env",
+        "global_fetch_strictly_public"
+    ],
    "assets": {
        "directory": ".open-next/assets",
        "binding": "ASSETS"
@@ -10,8 +14,15 @@
    "observability": {
        "enabled": true
    },
+    "vars": {
+        "NEXT_CACHE_DO_QUEUE_DISABLE_SQLITE": "true",
+        "IS_PREVIEW": "false"
+    },
    "env": {
        "preview": {
+            "vars": {
+                "IS_PREVIEW": "true"
+            },
            "r2_buckets": [
                {
                    "binding": "NEXT_INC_CACHE_R2_BUCKET",
@@ -83,6 +94,14 @@
            ]
        },
        "production": {
+            "vars": {
+                // This is a bit misleading, but it means that we can have 500 concurrent revalidations
+                // This means that we'll have up to 100 durable objects instance running at the same time
+                "MAX_REVALIDATE_CONCURRENCY": "100",
+                // Temporary variable to find the issue once deployed
+                // TODO: remove this once the issue is fixed
+                "DEBUG_CLOUDFLARE": "true"
+            },
            "routes": [
                {
                    "pattern": "open-2c.gitbook.com/*",
@@ -1,5 +1,51 @@
 # gitbook

+## 0.12.0
+
+### Minor Changes
+
+- 8339e91: Fix images in reusable content across spaces.
+- 326e28e: Design tweaks to code blocks and OpenAPI pages
+- 3119066: Add support for reusable content across spaces.
+- 7d7806d: Pass SVG images through image resizing without resizing them to serve them from optimal host.
+
+### Patch Changes
+
+- c4ebb3f: Fix openapi-select hover in responses
+- aed79fd: Decrease rounding of header logo
+- 42ca7e1: Fix openapi CR preview
+- e6ddc0f: Fix URL in sitemap
+- 5e975ab: Fix code highlighting for HTTP
+- 5d504ff: Fix resolution of links in reusable contents
+- 95a1f65: Better print layouts: wrap code blocks & force table column auto-sizing
+- 0499966: Fix invalid sitemap.xml generated with relative URLs instead of absolute ones
+- 2a805cc: Change OpenAPI schema-optional from `info` to `tint` color
+- 580101d: Fix schemas disclosure label causing client error
+- 12a455d: Fix OpenAPI layout issues
+- 97b7c79: Increase logging around caching behaviour causing page crashes.
+- 373f18f: Prevent section group popovers from opening on click
+- 3f29206: Update the regex for validating site redirect
+- 0c973a3: Always link main logo to the root of the site
+- ae5f1ab: Change `Dropdown`s to use Radix's `DropdownMenu`
+- 0e201d5: Add border to filled sidebar on gradient theme
+- dd043df: Revert investigation work around URL caches.
+- 89a5816: Fix OpenAPI disclosure label ("Show properties") misalignment on mobile
+- Updated dependencies [c3f6b8c]
+- Updated dependencies [d00dc8c]
+- Updated dependencies [42ca7e1]
+- Updated dependencies [326e28e]
+- Updated dependencies [5e975ab]
+- Updated dependencies [f7a3470]
+- Updated dependencies [580101d]
+- Updated dependencies [20ebecb]
+- Updated dependencies [80cb52a]
+- Updated dependencies [cb5598d]
+- Updated dependencies [c6637b0]
+- Updated dependencies [a3ec264]
+  - @gitbook/colors@0.3.3
+  - @gitbook/openapi-parser@2.1.4
+  - @gitbook/react-openapi@1.3.0
+
 ## 0.11.1

 ### Patch Changes
@@ -564,7 +610,7 @@
 - 4cbcc5b: Rollback of scalar modal while fixing perf issue
 - 3996110: Optimize images rendered in community ads
 - 133c3e7: Update design of Checkbox to be more consistent and readable
- 5096f7f: Disable KV cache for docs.gitbook.com as a test, also disable it for change-request to improve consistency
+- 5096f7f: Disable KV cache for gitbook.com/docs as a test, also disable it for change-request to improve consistency
 - 0f1565c: Add optional env `GITBOOK_INTEGRATIONS_HOST` to configure the host serving the integrations
 - 2ff7ed1: Fix table of contents being visible on mobile when disabled at the page level
 - b075f0f: Fix accessibility of the table of contents by using `aria-current` instead of `aria-selected`
@@ -12,7 +12,7 @@ import {
    VISITOR_TOKEN_COOKIE,
    getVisitorAuthCookieName,
    getVisitorAuthCookieValue,
-} from '@/lib/visitor-token';
+} from '@/lib/visitors';

 import { getSiteAPIToken } from '../tests/utils';
 import {
@@ -269,7 +269,7 @@ const testCases: TestsCase[] = [
    },
    {
        name: 'GitBook',
-        contentBaseURL: 'https://docs.gitbook.com',
+        contentBaseURL: 'https://gitbook.com/docs/',
        tests: [
            {
                name: 'Home',
@@ -168,6 +168,7 @@ export function runTestCases(testCases: TestsCase[]) {
                              new URL(testEntryPathname, testCase.contentBaseURL).toString()
                          )
                        : getTestURL(testEntryPathname);
+
                    if (testEntry.cookies) {
                        await context.addCookies(
                            testEntry.cookies.map((cookie) => ({
@@ -345,19 +346,30 @@ export function getCustomizationURL(partial: DeepPartial<SiteCustomizationSettin
 */
 async function waitForIcons(page: Page) {
    await page.waitForFunction(() => {
-        const urlStates: Record<string, 'pending' | 'loaded'> =
-            (window as any).__ICONS_STATES__ || {};
+        const urlStates: Record<
+            string,
+            { state: 'pending'; uri: null } | { state: 'loaded'; uri: string }
+        > = (window as any).__ICONS_STATES__ || {};
        (window as any).__ICONS_STATES__ = urlStates;

+        const fetchSvgAsDataUri = async (url: string): Promise<string> => {
+            const response = await fetch(url);
+            if (!response.ok) {
+                throw new Error(`Failed to fetch SVG: ${response.status}`);
+            }
+
+            const svgText = await response.text();
+            const encoded = encodeURIComponent(svgText).replace(/'/g, '%27').replace(/"/g, '%22');
+
+            return `data:image/svg+xml;charset=utf-8,${encoded}`;
+        };
+
        const loadUrl = (url: string) => {
            // Mark the URL as pending.
-            urlStates[url] = 'pending';
-
-            const img = new Image();
-            img.onload = () => {
-                urlStates[url] = 'loaded';
-            };
-            img.src = url;
+            urlStates[url] = { state: 'pending', uri: null };
+            fetchSvgAsDataUri(url).then((uri) => {
+                urlStates[url] = { state: 'loaded', uri };
+            });
        };

        const icons = Array.from(document.querySelectorAll('svg.gb-icon'));
@@ -393,18 +405,11 @@ async function waitForIcons(page: Page) {

            // If the URL is already queued for loading, we return the state.
            if (urlStates[url]) {
-                if (urlStates[url] === 'loaded') {
+                if (urlStates[url].state === 'loaded') {
                    icon.setAttribute('data-argos-state', 'pending');
-                    const bckMaskImage = icon.style.maskImage;
-                    const bckDisplay = icon.style.display;
-                    icon.style.maskImage = '';
-                    icon.style.display = 'none';
+                    icon.style.maskImage = `url("${urlStates[url].uri}")`;
                    requestAnimationFrame(() => {
-                        icon.style.maskImage = bckMaskImage;
-                        icon.style.display = bckDisplay;
-                        requestAnimationFrame(() => {
-                            icon.setAttribute('data-argos-state', 'loaded');
-                        });
+                        icon.setAttribute('data-argos-state', 'loaded');
                    });
                    return false;
                }
@@ -1,6 +1,6 @@
 {
    "name": "gitbook",
-    "version": "0.11.1",
+    "version": "0.12.0",
    "private": true,
    "scripts": {
        "dev": "env-cmd --silent -f ../../.env.local next dev",
@@ -16,7 +16,7 @@
        "clean": "rm -rf ./.next && rm -rf ./public/~gitbook/static/icons && rm -rf ./public/~gitbook/static/math"
    },
    "dependencies": {
-        "@gitbook/api": "*",
+        "@gitbook/api": "^0.115.0",
        "@gitbook/cache-do": "workspace:*",
        "@gitbook/cache-tags": "workspace:*",
        "@gitbook/colors": "workspace:*",
@@ -1,5 +1,10 @@
 'use server';
-import { type AIMessageInput, AIModel, type AIStreamResponse } from '@gitbook/api';
+import {
+    type AIMessageInput,
+    AIModel,
+    type AIStreamResponse,
+    type AIToolCapabilities,
+} from '@gitbook/api';
 import type { GitBookBaseContext } from '@v2/lib/context';
 import { EventIterator } from 'event-iterator';
 import type { MaybePromise } from 'p-map';
@@ -51,6 +56,7 @@ export async function streamGenerateObject<T>(
        schema: z.ZodSchema<T>;
        messages: AIMessageInput[];
        model?: AIModel;
+        tools?: AIToolCapabilities;
        previousResponseId?: string;
    }
 ) {
@@ -0,0 +1,166 @@
+'use server';
+import { filterOutNullable } from '@/lib/typescript';
+import { getV1BaseContext } from '@/lib/v1';
+import { isV2 } from '@/lib/v2';
+import { AIMessageRole } from '@gitbook/api';
+import { getSiteURLDataFromMiddleware } from '@v2/lib/middleware';
+import { getServerActionBaseContext } from '@v2/lib/server-actions';
+import { z } from 'zod';
+import { streamGenerateObject } from './api';
+
+/**
+ * Get a summary of a page, in the context of another page
+ */
+export async function* streamLinkPageSummary({
+    currentSpaceId,
+    currentPageId,
+    targetSpaceId,
+    targetPageId,
+    linkPreview,
+    linkTitle,
+    visitedPages,
+}: {
+    currentSpaceId: string;
+    currentPageId: string;
+    currentPageTitle: string;
+    targetSpaceId: string;
+    targetPageId: string;
+    linkPreview?: string;
+    linkTitle?: string;
+    visitedPages?: Array<{ spaceId: string; pageId: string }>;
+}) {
+    const baseContext = isV2() ? await getServerActionBaseContext() : await getV1BaseContext();
+    const siteURLData = await getSiteURLDataFromMiddleware();
+
+    const { stream } = await streamGenerateObject(
+        baseContext,
+        {
+            organizationId: siteURLData.organization,
+            siteId: siteURLData.site,
+        },
+        {
+            schema: z.object({
+                highlight: z
+                    .string()
+                    .describe('The reason why the user should read the target page.'),
+                // questions: z.array(z.string().describe('The questions to sea')).max(3),
+            }),
+            messages: [
+                {
+                    role: AIMessageRole.Developer,
+                    content: `# 1. Role
+You are a contextual fact extractor. Your job is to find the exact fact from the linked page that directly answers the implied question in the current paragraph.
+
+# 2. Task
+Extract a contextually-relevant fact that:
+- Directly answers the specific need or question implied by the link's placement
+- States a capability, limitation, or specification from the target page
+- Connects precisely to the user's current paragraph or sentence 
+- Completes the user's understanding based on what they're currently reading
+
+# 3. Instructions
+1. First, identify the exact need, question, or gap in the current paragraph where the link appears
+2. Find the specific fact in the target page that addresses this exact contextual need
+3. Ensure the fact relates directly to the context of the paragraph containing the link
+4. Avoid ALL instructional language including words like "use", "click", "select", "create"
+5. Keep it under 30 words, factual and declarative about what EXISTS or IS TRUE`,
+                },
+                {
+                    role: AIMessageRole.Developer,
+                    content: `# 4. Current page
+The content of the current page is:`,
+                    attachments: [
+                        {
+                            type: 'page' as const,
+                            spaceId: currentSpaceId,
+                            pageId: currentPageId,
+                        },
+                    ],
+                },
+                ...(visitedPages
+                    ? [
+                          {
+                              role: AIMessageRole.Developer,
+                              content: '# 5. Previous pages',
+                          },
+                          ...visitedPages.map(({ spaceId, pageId }) => ({
+                              role: AIMessageRole.Developer,
+                              content: `## Page ${pageId}`,
+                              attachments: [
+                                  {
+                                      type: 'page' as const,
+                                      spaceId,
+                                      pageId,
+                                  },
+                              ],
+                          })),
+                      ]
+                    : []),
+                {
+                    role: AIMessageRole.Developer,
+                    content: `# 6. Target page
+The content of the target page is:`,
+                    attachments: [
+                        {
+                            type: 'page' as const,
+                            spaceId: targetSpaceId,
+                            pageId: targetPageId,
+                        },
+                    ],
+                },
+                {
+                    role: AIMessageRole.Developer,
+                    content: `# 7. Link preview
+The content of the link preview is:
+> ${linkPreview}
+> Page ID: ${targetPageId}`,
+                },
+                {
+                    role: AIMessageRole.Developer,
+                    content: `# 8. Guidelines & Examples
+ALWAYS:
+- ALWAYS choose facts that directly fulfill the contextual need where the link appears
+- ALWAYS connect target page information specifically to the current paragraph context
+- ALWAYS focus on the gap in knowledge that the link is meant to fill
+- ALWAYS consider user's navigation history to ensure contextual continuity
+- ALWAYS use action verbs like "click", "select", "use", "create", "enable"
+
+NEVER:
+- NEVER include ANY unspecifc language like "learn", "how to", "discover", etc. State the fact directly.
+- NEVER select general facts unrelated to the specific link context
+- NEVER ignore the specific context where the link appears
+- NEVER repeat the same fact in different words
+
+## Examples 
+Current paragraph: "When organizing content, headings are limited to 3 levels. For more advanced editing, you can use (multiple select)[/multiple-select] to move multiple blocks at once."
+Preview: "Multiple Select: Select multiple content blocks at once."
+✓ "Shift selects content between two points, useful for reorganizing your current heading structure."
+✗ "Shift and Ctrl/Cmd keys are the modifiers for selecting multiple blocks."
+
+Current paragraph: "Most changes can be published directly, but for major revisions, if you want others to review changes before publishing, create a (change request)[/change-requests]."
+Preview: "Change Requests: Collaborative content editing workflow."
+✓ "Each reviewer's approval is tracked separately, with specific change highlighting for your major revisions."
+✗ "Each reviewer receives an email notification and can approve or request changes."
+
+Current paragraph: "Your team mentioned issues with conflicting edits. Need to collaborate in real-time? You can use (live edit mode)[/live-edit]."
+Preview: "Live Edit: Real-time collaborative editing."
+✓ "Teams with GitHub repositories (like yours) cannot use this feature due to sync limitations."
+✗ "Incompatible with GitHub/GitLab sync and requires specific visibility settings."`,
+                },
+                {
+                    role: AIMessageRole.User,
+                    content: `I'm considering reading the link titled "${linkTitle}" pointing to page ${targetPageId}. Why should I read it? Relate it to the paragraph I'm currently reading.`,
+                },
+            ].filter(filterOutNullable),
+        }
+    );
+
+    for await (const value of stream) {
+        const highlight = value.highlight;
+        if (!highlight) {
+            continue;
+        }
+
+        yield highlight;
+    }
+}
@@ -25,7 +25,7 @@ export function AnnouncementBanner(props: {
    const style = BANNER_STYLES[announcement.style];

    return (
-        <div className="announcement-banner theme-bold:bg-header-background pt-4 pb-2">
+        <div id="announcement-banner" className="theme-bold:bg-header-background pt-4 pb-2">
            <div className="scroll-nojump">
                <div className={tcls('relative', CONTAINER_STYLE)}>
                    <Tag
@@ -58,7 +58,7 @@ export const CodeBlockRenderer = forwardRef(function CodeBlockRenderer(
                <code
                    id={id}
                    className={tcls(
-                        'inline-grid min-w-full grid-cols-[auto_1fr] p-2 [count-reset:line]',
+                        'inline-grid min-w-full grid-cols-[auto_1fr] p-2 [count-reset:line] print:whitespace-pre-wrap',
                        withWrap && 'whitespace-pre-wrap'
                    )}
                >
@@ -6,6 +6,7 @@ import { Card } from '@/components/primitives';
 import { tcls } from '@/lib/tailwind';

 import { getDataOrNull } from '@v2/lib/data';
+import { Image } from '../utils';
 import type { BlockProps } from './Block';
 import { Caption } from './Caption';
 import { IntegrationBlock } from './Integration';
@@ -52,7 +53,14 @@ export async function Embed(props: BlockProps<gitbookAPI.DocumentBlockEmbed>) {
                <Card
                    leadingIcon={
                        embed.icon ? (
-                            <img src={embed.icon} className={tcls('w-5', 'h-5')} alt="Logo" />
+                            <Image
+                                src={embed.icon}
+                                className={tcls('w-5', 'h-5')}
+                                alt="Logo"
+                                sources={{ light: { src: embed.icon } }}
+                                sizes={[{ width: 20 }]}
+                                resize={context.contentContext.imageResizer}
+                            />
                        ) : null
                    }
                    href={block.data.url}
@@ -0,0 +1,58 @@
+import { type ClassValue, tcls } from '@/lib/tailwind';
+import type { DocumentBlockHeading, DocumentBlockTabs } from '@gitbook/api';
+import { Icon } from '@gitbook/icons';
+import { getBlockTextStyle } from './spacing';
+
+/**
+ * A hash icon which adds the block or active block item's ID in the URL hash.
+ * The button needs to be wrapped in a container with `hashLinkButtonWrapperStyles`.
+ */
+export const hashLinkButtonWrapperStyles = tcls('relative', 'group/hash');
+
+export function HashLinkButton(props: {
+    id: string;
+    block: DocumentBlockTabs | DocumentBlockHeading;
+    label?: string;
+    className?: ClassValue;
+    iconClassName?: ClassValue;
+}) {
+    const { id, block, className, iconClassName, label = 'Direct link to block' } = props;
+    const textStyle = getBlockTextStyle(block);
+    return (
+        <div
+            className={tcls(
+                'relative',
+                'hash',
+                'grid',
+                'grid-area-1-1',
+                'h-[1em]',
+                'border-0',
+                'opacity-0',
+                'group-hover/hash:opacity-[0]',
+                'group-focus/hash:opacity-[0]',
+                'md:group-hover/hash:md:opacity-[1]',
+                'md:group-focus/hash:md:opacity-[1]',
+                className
+            )}
+        >
+            <a
+                href={`#${id}`}
+                aria-label={label}
+                className={tcls('inline-flex', 'h-full', 'items-start', textStyle.lineHeight)}
+            >
+                <Icon
+                    icon="hashtag"
+                    className={tcls(
+                        'size-3',
+                        'self-center',
+                        'transition-colors',
+                        'text-transparent',
+                        'group-hover/hash:text-tint-subtle',
+                        'contrast-more:group-hover/hash:text-tint-strong',
+                        iconClassName
+                    )}
+                />
+            </a>
+        </div>
+    );
+}
@@ -1,9 +1,9 @@
 import type { DocumentBlockHeading } from '@gitbook/api';
-import { Icon } from '@gitbook/icons';

 import { tcls } from '@/lib/tailwind';

 import type { BlockProps } from './Block';
+import { HashLinkButton, hashLinkButtonWrapperStyles } from './HashLinkButton';
 import { Inlines } from './Inlines';
 import { getBlockTextStyle } from './spacing';

@@ -23,50 +23,20 @@ export function Heading(props: BlockProps<DocumentBlockHeading>) {
            className={tcls(
                textStyle.textSize,
                'heading',
-                'group',
-                'relative',
                'grid',
                'scroll-m-12',
+                hashLinkButtonWrapperStyles,
                style
            )}
        >
-            <div
-                className={tcls(
-                    'hash',
-                    'grid',
-                    'grid-area-1-1',
-                    'relative',
-                    '-ml-6',
-                    'w-7',
-                    'border-0',
-                    'opacity-0',
-                    'group-hover:opacity-[0]',
-                    'group-focus:opacity-[0]',
-                    'md:group-hover:md:opacity-[1]',
-                    'md:group-focus:md:opacity-[1]',
-                    textStyle.marginTop
-                )}
-            >
-                <a
-                    href={`#${id}`}
-                    aria-label="Direct link to heading"
-                    className={tcls('inline-flex', 'h-full', 'items-start', textStyle.lineHeight)}
-                >
-                    <Icon
-                        icon="hashtag"
-                        className={tcls(
-                            'w-3.5',
-                            'h-[1em]',
-                            'mt-0.5',
-                            'transition-colors',
-                            'text-transparent',
-                            'group-hover:text-tint-subtle',
-                            'contrast-more:group-hover:text-tint-strong',
-                            'lg:w-4'
-                        )}
-                    />
-                </a>
-            </div>
+            <HashLinkButton
+                id={id}
+                block={block}
+                className={tcls('-ml-6', textStyle.anchorButtonMarginTop)}
+                iconClassName={tcls('size-4')}
+                label="Direct link to heading"
+            />
+
            <div
                className={tcls(
                    'grid-area-1-1',
@@ -145,7 +145,7 @@
 }

 .openapi-column-preview-body {
-    @apply flex flex-col gap-4 sticky top-4 site-header:top-20 site-header-sections:top-32 page-api-block:xl:max-2xl:top-32 print-mode:static;
+    @apply flex flex-col gap-4 sticky top-4 site-header:top-20 site-header:xl:max-2xl:top-32 site-header-sections:top-32 site-header-sections:xl:max-2xl:top-44 print-mode:static;
 }

 .openapi-column-preview pre {
@@ -770,7 +770,7 @@ body:has(.openapi-select-popover) {
 }

 .openapi-disclosure:has(> .openapi-disclosure-trigger:hover) {
-    @apply bg-tint-subtle;
+    @apply bg-tint-subtle overflow-hidden;
 }

 .openapi-disclosure:has(> .openapi-disclosure-trigger:hover),
@@ -778,10 +778,10 @@ body:has(.openapi-select-popover) {
    @apply ring-1 shadow-sm;
 }

-.openapi-disclosure[data-expanded="true"]:not(:first-child) {
+.openapi-disclosure[data-expanded="true"]:not(.openapi-schemas-disclosure):not(:first-child) {
    @apply mt-2;
 }
-.openapi-disclosure[data-expanded="true"]:not(:last-child) {
+.openapi-disclosure[data-expanded="true"]:not(.openapi-schemas-disclosure):not(:last-child) {
    @apply mb-2;
 }

@@ -15,14 +15,14 @@ export function RecordRow(
        fixedColumns: string[];
    }
 ) {
-    const { view, autoSizedColumns, fixedColumns, block } = props;
+    const { view, autoSizedColumns, fixedColumns, block, context } = props;

    return (
        <div className={styles.row} role="row">
            {view.columns.map((column) => {
                const columnWidth = getColumnWidth({
                    column,
-                    columnWidths: view.columnWidths,
+                    columnWidths: context.mode === 'print' ? undefined : view.columnWidths,
                    autoSizedColumns,
                    fixedColumns,
                });
@@ -13,10 +13,10 @@ import { getColumnAlignment } from './utils';
     3. Auto-size is turned off without setting a width, we then default to a fixed width of 100px
 */
 export function ViewGrid(props: TableViewProps<DocumentTableViewGrid>) {
-    const { block, view, records, style } = props;
+    const { block, view, records, style, context } = props;

    /* Calculate how many columns are auto-sized vs fixed width */
-    const columnWidths = view.columnWidths;
+    const columnWidths = context.mode === 'print' ? undefined : view.columnWidths;
    const autoSizedColumns = view.columns.filter((column) => !columnWidths?.[column]);
    const fixedColumns = view.columns.filter((column) => columnWidths?.[column]);

@@ -5,6 +5,8 @@ import React, { useCallback, useMemo } from 'react';
 import { useHash, useIsMounted } from '@/components/hooks';
 import * as storage from '@/lib/local-storage';
 import { type ClassValue, tcls } from '@/lib/tailwind';
+import type { DocumentBlockTabs } from '@gitbook/api';
+import { HashLinkButton, hashLinkButtonWrapperStyles } from '../HashLinkButton';

 interface TabsState {
    activeIds: {
@@ -68,9 +70,10 @@ export function DynamicTabs(
    props: TabsInput & {
        tabsBody: React.ReactNode[];
        style: ClassValue;
+        block: DocumentBlockTabs;
    }
 ) {
-    const { id, tabs, tabsBody, style } = props;
+    const { id, block, tabs, tabsBody, style } = props;

    const hash = useHash();
    const [tabsState, setTabsState] = useTabsState();
@@ -146,8 +149,8 @@ export function DynamicTabs(
                'ring-inset',
                'ring-tint-subtle',
                'flex',
-                'overflow-hidden',
                'flex-col',
+                'overflow-hidden',
                style
            )}
        >
@@ -165,16 +168,14 @@ export function DynamicTabs(
                )}
            >
                {tabs.map((tab) => (
-                    <button
+                    <div
                        key={tab.id}
-                        role="tab"
-                        aria-selected={active.id === tab.id}
-                        aria-controls={getTabPanelId(tab.id)}
-                        id={getTabButtonId(tab.id)}
-                        onClick={() => {
-                            onSelectTab(tab);
-                        }}
                        className={tcls(
+                            hashLinkButtonWrapperStyles,
+                            'flex',
+                            'items-center',
+                            'gap-3.5',
+
                            //prev from active-tab
                            '[&:has(+_.active-tab)]:rounded-br-md',

@@ -184,14 +185,6 @@ export function DynamicTabs(
                            //next from active-tab
                            '[.active-tab_+_:after]:rounded-br-md',

-                            'inline-block',
-                            'text-sm',
-                            'px-3.5',
-                            'py-2',
-                            'transition-[color]',
-                            'font-[500]',
-                            'relative',
-
                            'after:transition-colors',
                            'after:border-r',
                            'after:absolute',
@@ -202,14 +195,16 @@ export function DynamicTabs(
                            'after:h-[70%]',
                            'after:w-[1px]',

+                            'px-3.5',
+                            'py-2',
+
                            'last:after:border-transparent',

                            'text-tint',
                            'bg-tint-12/1',
                            'hover:text-tint-strong',
-
-                            'truncate',
                            'max-w-full',
+                            'truncate',

                            active.id === tab.id
                                ? [
@@ -224,8 +219,34 @@ export function DynamicTabs(
                                : null
                        )}
                    >
-                        {tab.title}
-                    </button>
+                        <button
+                            type="button"
+                            role="tab"
+                            aria-selected={active.id === tab.id}
+                            aria-controls={getTabPanelId(tab.id)}
+                            id={getTabButtonId(tab.id)}
+                            onClick={() => {
+                                onSelectTab(tab);
+                            }}
+                            className={tcls(
+                                'inline-block',
+                                'text-sm',
+                                'transition-[color]',
+                                'font-[500]',
+                                'relative',
+                                'max-w-full',
+                                'truncate'
+                            )}
+                        >
+                            {tab.title}
+                        </button>
+
+                        <HashLinkButton
+                            id={getTabButtonId(tab.id)}
+                            block={block}
+                            label="Direct link to tab"
+                        />
+                    </div>
                ))}
            </div>
            {tabs.map((tab, index) => (
@@ -39,6 +39,7 @@ export function Tabs(props: BlockProps<DocumentBlockTabs>) {
                    <DynamicTabs
                        key={tab.id}
                        id={block.key!}
+                        block={block}
                        tabs={[tab]}
                        tabsBody={[tabsBody[index]]}
                        style={style}
@@ -48,5 +49,7 @@ export function Tabs(props: BlockProps<DocumentBlockTabs>) {
        );
    }

-    return <DynamicTabs id={block.key!} tabs={tabs} tabsBody={tabsBody} style={style} />;
+    return (
+        <DynamicTabs id={block.key!} block={block} tabs={tabs} tabsBody={tabsBody} style={style} />
+    );
 }
@@ -10,6 +10,8 @@ export function getBlockTextStyle(block: DocumentBlock): {
    lineHeight: string;
    /** Tailwind class for the margin top (mt-*) */
    marginTop?: string;
+    /** Tailwind class for the margin top to apply on the anchor link button */
+    anchorButtonMarginTop?: string;
 } {
    switch (block.type) {
        case 'paragraph':
@@ -22,18 +24,21 @@ export function getBlockTextStyle(block: DocumentBlock): {
                textSize: 'text-3xl font-semibold',
                lineHeight: 'leading-tight',
                marginTop: 'mt-[1em]',
+                anchorButtonMarginTop: 'mt-[1.05em]',
            };
        case 'heading-2':
            return {
                textSize: 'text-2xl font-semibold',
                lineHeight: 'leading-snug',
                marginTop: 'mt-[0.75em]',
+                anchorButtonMarginTop: 'mt-[0.9em]',
            };
        case 'heading-3':
            return {
                textSize: 'text-xl font-semibold',
                lineHeight: 'leading-snug',
                marginTop: 'mt-[0.5em]',
+                anchorButtonMarginTop: 'mt-[0.65em]',
            };
        case 'divider':
            return {
@@ -25,6 +25,7 @@ export function Footer(props: { context: GitBookSiteContext }) {

    return (
        <footer
+            id="site-footer"
            className={tcls(
                'border-tint-subtle border-t',
                // If the footer only contains a mode toggle, we only show it on smaller screens
@@ -20,7 +20,7 @@ export async function HeaderLogo(props: HeaderLogoProps) {

    return (
        <Link
-            href={linker.toAbsoluteURL(linker.toPathInSpace(''))}
+            href={linker.toAbsoluteURL(linker.toPathInSite(''))}
            className={tcls('group/headerlogo', 'min-w-0', 'shrink', 'flex', 'items-center')}
        >
            {customization.header.logo ? (
@@ -48,8 +48,6 @@ export async function HeaderLogo(props: HeaderLogoProps) {
                    ]}
                    priority="high"
                    style={tcls(
-                        'rounded',
-                        'straight-corners:rounded-sm',
                        'overflow-hidden',
                        'shrink',
                        'min-w-0',
@@ -87,7 +87,7 @@ export function PageAside(props: {
                'page-api-block:xl:max-2xl:dark:hover:shadow-tint-1/1',
                'page-api-block:xl:max-2xl:rounded-md',
                'page-api-block:xl:max-2xl:h-auto',
-                'page-api-block:xl:max-2xl:my-8',
+                'page-api-block:xl:max-2xl:my-4',
                'page-api-block:p-2'
            )}
        >
@@ -75,7 +75,7 @@ export async function CustomizationRootLayout(props: {
            lang={customization.internationalization.locale}
            className={tcls(
                customization.header.preset === CustomizationHeaderPreset.None
-                    ? 'site-header-none'
+                    ? null
                    : 'scroll-pt-[76px]', // Take the sticky header in consideration for the scrolling
                customization.styling.corners === CustomizationCorners.Straight
                    ? ' straight-corners'
@@ -39,7 +39,7 @@

    /*  Light mode */
    ::-webkit-scrollbar {
-        @apply bg-tint-subtle;
+        @apply bg-tint-subtle z-50;
        width: 8px;
        height: 8px;
    }
@@ -161,6 +161,6 @@ html.dark {
    color-scheme: dark light;
 }

-html.announcement-hidden .announcement-banner {
+html.announcement-hidden #announcement-banner {
    @apply hidden;
 }
@@ -18,8 +18,7 @@ export function HighlightQuery(props: {
            'text-bold',
            'bg-primary',
            'text-contrast-primary',
-            'px-0.5',
-            '-mx-0.5',
+            'px-1',
            'py-0.5',
            'rounded',
            'straight-corners:rounded-sm',
@@ -1,21 +1,19 @@
 'use client';

-import { Icon } from '@gitbook/icons';
-import { readStreamableValue } from 'ai/rsc';
-import React from 'react';
-
-import { Loading } from '@/components/primitives';
 import { useLanguage } from '@/intl/client';
 import { t } from '@/intl/translate';
 import type { TranslationLanguage } from '@/intl/translations';
 import { tcls } from '@/lib/tailwind';
+import { Icon } from '@gitbook/icons';
+import { readStreamableValue } from 'ai/rsc';
+import React from 'react';

+import { motion } from 'framer-motion';
 import { useTrackEvent } from '../Insights';
 import { Link } from '../primitives';
 import { useSearchAskContext } from './SearchAskContext';
 import { type AskAnswerResult, type AskAnswerSource, streamAskQuestion } from './server-actions';
 import { useSearch, useSearchLink } from './useSearch';
-
 export type SearchAskState =
    | {
          type: 'answer';
@@ -88,13 +86,22 @@ export function SearchAskAnswer(props: { query: string }) {
    }, [setAskState]);

    const loading = (
-        <div className={tcls('w-full', 'flex', 'items-center', 'justify-center')}>
-            <Loading className={tcls('w-6', 'py-8', 'text-primary-subtle')} />
+        <div key="loading" className={tcls('flex', 'flex-wrap', 'gap-2')}>
+            {[...Array(9)].map((_, index) => (
+                <div
+                    key={index}
+                    className="h-4 animate-[fadeIn_0.5s_ease-in-out_both,pulse_2s_ease-in-out_infinite] rounded straight-corners:rounded-none bg-tint-active"
+                    style={{
+                        animationDelay: `${index * 0.1}s,${0.5 + index * 0.1}s`,
+                        width: `${((index % 5) + 1) * 15}%`,
+                    }}
+                />
+            ))}
        </div>
    );

    return (
-        <div className={tcls('max-h-[60vh]', 'overflow-y-auto')}>
+        <motion.div className={tcls('mx-auto w-full max-w-prose')} layout="position">
            {askState?.type === 'answer' ? (
                <React.Suspense fallback={loading}>
                    <TransitionAnswerBody answer={askState.answer} placeholder={loading} />
@@ -104,7 +111,7 @@ export function SearchAskAnswer(props: { query: string }) {
                <div className={tcls('p-4')}>{t(language, 'search_ask_error')}</div>
            ) : null}
            {askState?.type === 'loading' ? loading : null}
-        </div>
+        </motion.div>
    );
 }

@@ -138,10 +145,7 @@ function AnswerBody(props: { answer: AskAnswerResult }) {

    return (
        <>
-            <div
-                data-testid="search-ask-answer"
-                className={tcls('my-4', 'sm:mt-6', 'px-4', 'sm:px-12', 'text-tint-strong')}
-            >
+            <div data-testid="search-ask-answer" className={tcls('text-tint-strong')}>
                {answer.body ?? t(language, 'search_ask_no_answer')}
                {answer.followupQuestions.length > 0 ? (
                    <AnswerFollowupQuestions followupQuestions={answer.followupQuestions} />
@@ -182,7 +186,6 @@ function AnswerFollowupQuestions(props: { followupQuestions: string[] }) {
                    )}
                    {...getSearchLinkProps({
                        query: question,
-                        ask: true,
                    })}
                >
                    <Icon
@@ -21,7 +21,7 @@ export function SearchButton(props: { children?: React.ReactNode; style?: ClassV

    const onClick = () => {
        setSearchState({
-            ask: false,
+            mode: 'both',
            global: false,
            query: '',
        });
@@ -99,7 +99,7 @@ export function SearchButton(props: { children?: React.ReactNode; style?: ClassV
    );
 }

-function Shortcut() {
+export function Shortcut() {
    const [operatingSystem, setOperatingSystem] = useState<string | null>(null);

    useEffect(() => {
@@ -0,0 +1,502 @@
+'use client';
+import { useLanguage } from '@/intl/client';
+import { t } from '@/intl/translate';
+import { tcls } from '@/lib/tailwind';
+import { filterOutNullable } from '@/lib/typescript';
+import { Icon } from '@gitbook/icons';
+import { useEffect, useRef, useState } from 'react';
+import { useVisitedPages } from '../Insights/useVisitedPages';
+import { Button } from '../primitives';
+import { Shortcut } from './SearchButton';
+import { isQuestion } from './isQuestion';
+import { streamAISearchAnswer, streamAISearchSummary } from './server-actions';
+import { useSearch } from './useSearch';
+
+// Types
+type Message = {
+    role: 'assistant' | 'user';
+    content?: string;
+    context?: string;
+    fetching?: boolean;
+};
+
+// Loading animation component
+function LoadingAnimation() {
+    return (
+        <div className="mt-2 flex flex-wrap gap-2">
+            {[...Array(9)].map((_, index) => (
+                <div
+                    key={index}
+                    className="h-4 animate-[fadeIn_0.5s_ease-in-out_both,pulse_2s_ease-in-out_infinite] rounded straight-corners:rounded-none bg-tint-active"
+                    style={{
+                        animationDelay: `${index * 0.1}s,${0.5 + index * 0.1}s`,
+                        width: `${((index % 5) + 1) * 15}%`,
+                    }}
+                />
+            ))}
+        </div>
+    );
+}
+
+// Followup questions component
+function FollowupQuestions({
+    questions,
+    onQuestionClick,
+}: {
+    questions: string[];
+    onQuestionClick: (question: string) => void;
+}) {
+    if (!questions || questions.length === 0) return null;
+
+    return (
+        <div className="mx-auto flex w-full max-w-prose flex-col">
+            {questions.map((question) => (
+                <button
+                    type="button"
+                    key={question}
+                    className="-mx-4 flex items-center gap-4 rounded straight-corners:rounded-none px-4 py-2 text-tint hover:bg-tint-hover"
+                    onClick={() => onQuestionClick(question)}
+                >
+                    <Icon icon="search" className="size-4" /> {question}
+                </button>
+            ))}
+        </div>
+    );
+}
+
+// Individual chat message component
+function ChatMessage({
+    message,
+}: {
+    message: Message;
+}) {
+    const language = useLanguage();
+    const isUser = message.role === 'user';
+
+    return (
+        <div className={tcls('flex-col gap-1', isUser && 'items-end gap-1 self-end')}>
+            <h5 className="flex items-center gap-1 font-semibold text-tint-subtle text-xs">
+                {isUser ? (
+                    (message.context ??
+                    `You asked ${isQuestion(message.content ?? '') ? '' : 'about'}`)
+                ) : (
+                    <>
+                        <Icon icon="sparkle" className="mt-0.5 size-3" />
+                        {message.context ?? 'AI Answer'}
+                    </>
+                )}
+            </h5>
+
+            {message.fetching ? (
+                <LoadingAnimation />
+            ) : !message.content ? (
+                <div className="text-tint-subtle italic">{t(language, 'search_ask_no_answer')}</div>
+            ) : (
+                <div className={tcls(isUser && 'rounded-lg bg-tint-active px-4 py-2')}>
+                    {message.content}
+                </div>
+            )}
+        </div>
+    );
+}
+
+// Chat input component
+function ChatInput({
+    onSendMessage,
+    disabled,
+    inputRef,
+}: {
+    onSendMessage: (message: string) => void;
+    disabled: boolean;
+    inputRef?: React.RefObject<HTMLInputElement>;
+}) {
+    const [inputValue, setInputValue] = useState('');
+
+    const handleSend = () => {
+        if (!inputValue.trim()) return;
+        onSendMessage(inputValue);
+        setInputValue('');
+    };
+
+    return (
+        <div className="flex gap-2">
+            <div className="relative flex grow">
+                <input
+                    ref={inputRef}
+                    type="text"
+                    placeholder="Ask a follow-up question"
+                    className="grow rounded px-4 py-1 ring-1 ring-tint-subtle"
+                    value={inputValue}
+                    onChange={(e) => setInputValue(e.target.value)}
+                    disabled={disabled}
+                    onKeyDown={(e) => {
+                        if (e.key === 'Enter' && !e.shiftKey) {
+                            e.preventDefault();
+                            handleSend();
+                        }
+                    }}
+                />
+                {!disabled && (
+                    <div className="-translate-y-1/2 absolute top-1/2 right-2.5">
+                        <Shortcut />
+                    </div>
+                )}
+            </div>
+            <Button
+                label="Send"
+                iconOnly
+                icon="arrow-up"
+                size="medium"
+                className="shrink-0"
+                onClick={handleSend}
+            />
+        </div>
+    );
+}
+
+// Custom hook for AI streaming
+function useAIStream({
+    question,
+    previousResponseId,
+}: {
+    question?: string;
+    previousResponseId?: string;
+}) {
+    const [response, setResponse] = useState<{
+        content?: string;
+        responseId?: string;
+        followupQuestions?: string[];
+        fetching: boolean;
+    }>({
+        fetching: false,
+    });
+
+    useEffect(() => {
+        if (!question) return;
+
+        let cancelled = false;
+        setResponse({ fetching: true });
+
+        (async () => {
+            try {
+                const stream = await streamAISearchAnswer({
+                    question,
+                    previousResponseId,
+                });
+
+                for await (const rawData of stream) {
+                    if (cancelled) break;
+                    if (!rawData) continue;
+
+                    // Use type assertion to handle the data
+                    const data = rawData as any;
+
+                    setResponse((prev) => {
+                        const updated = { ...prev, fetching: false };
+
+                        if (data.responseId) {
+                            updated.responseId = String(data.responseId);
+                        }
+
+                        if (data.answer) {
+                            updated.content = String(data.answer);
+                        }
+
+                        if (data.followupQuestions) {
+                            updated.followupQuestions =
+                                data.followupQuestions.filter(filterOutNullable);
+                        }
+
+                        return updated;
+                    });
+                }
+            } catch (error) {
+                console.error('Error in AI stream:', error);
+                setResponse((prev) => ({ ...prev, fetching: false }));
+            }
+        })();
+
+        return () => {
+            cancelled = true;
+        };
+    }, [question, previousResponseId]);
+
+    return response;
+}
+
+// Summary hook
+function useSummary(visitedPages: any[]) {
+    const [summary, setSummary] = useState('');
+    const [summaryResponseId, setSummaryResponseId] = useState<string | undefined>(undefined);
+
+    useEffect(() => {
+        let cancelled = false;
+
+        (async () => {
+            try {
+                const stream = await streamAISearchSummary({ visitedPages });
+
+                for await (const rawData of stream) {
+                    if (cancelled) break;
+                    if (!rawData) continue;
+
+                    // Use type assertion
+                    const data = rawData as any;
+
+                    if (data.responseId) {
+                        setSummaryResponseId(String(data.responseId));
+                    }
+
+                    if (data.summary) {
+                        setSummary(String(data.summary));
+                    }
+                }
+            } catch (error) {
+                console.error('Error in summary stream:', error);
+            }
+        })();
+
+        return () => {
+            cancelled = true;
+        };
+    }, [visitedPages]);
+
+    return { summary, summaryResponseId };
+}
+
+// Main component
+export function SearchChat(props: {
+    query: string;
+    chatInputRef?: React.RefObject<HTMLInputElement>;
+}) {
+    const { query, chatInputRef } = props;
+    const visitedPages = useVisitedPages((state) => state.pages);
+    const [messages, setMessages] = useState<Message[]>([]);
+    const [followupQuestions, setFollowupQuestions] = useState<string[]>([]);
+    const [conversationResponseId, setConversationResponseId] = useState<string | undefined>();
+    const [searchState, setSearchState] = useSearch();
+    const latestMessageRef = useRef<HTMLDivElement>(null);
+
+    const isExpanded = searchState?.mode === 'chat';
+
+    // Get summary of visited pages
+    const { summary, summaryResponseId } = useSummary(visitedPages);
+
+    // Handle initial query
+    const initialResponse = useAIStream({
+        question: query,
+        previousResponseId: summaryResponseId,
+    });
+
+    // Set up initial query effect
+    useEffect(() => {
+        if (!query) return;
+
+        // Add initial assistant message
+        setMessages([
+            {
+                role: 'assistant',
+                context: `You asked ${isQuestion(query) ? '' : 'about'} "${query}"`,
+                fetching: true,
+            },
+        ]);
+
+        setFollowupQuestions([]);
+        setConversationResponseId(undefined);
+    }, [query]);
+
+    // Update message when initial response changes
+    useEffect(() => {
+        if (!query || !initialResponse) return;
+
+        if (initialResponse.content !== undefined) {
+            setMessages([
+                {
+                    role: 'assistant',
+                    context: `You asked ${isQuestion(query) ? '' : 'about'} "${query}"`,
+                    content: initialResponse.content,
+                    fetching: initialResponse.fetching,
+                },
+            ]);
+        }
+
+        if (initialResponse.followupQuestions) {
+            setFollowupQuestions(initialResponse.followupQuestions);
+        }
+
+        if (initialResponse.responseId) {
+            setConversationResponseId(initialResponse.responseId);
+        }
+    }, [initialResponse, query]);
+
+    // Handle follow-up messages
+    const handleSendMessage = (message: string) => {
+        // Add user message
+        const newMessages: Message[] = [
+            ...messages,
+            { role: 'user', content: message, fetching: false },
+            { role: 'assistant', fetching: true },
+        ];
+
+        setMessages(newMessages);
+        setFollowupQuestions([]);
+        if (!searchState?.manual) {
+            setSearchState((state) => (state ? { ...state, mode: 'chat' } : null));
+        }
+
+        // Get AI response
+        const cancelled = false;
+
+        (async () => {
+            try {
+                const stream = await streamAISearchAnswer({
+                    question: message,
+                    previousResponseId: conversationResponseId,
+                });
+
+                for await (const rawData of stream) {
+                    if (cancelled) break;
+                    if (!rawData) continue;
+
+                    // Use type assertion
+                    const data = rawData as any;
+
+                    if (data.responseId) {
+                        setConversationResponseId(String(data.responseId));
+                    }
+
+                    if (data.answer !== undefined) {
+                        setMessages((prev) => [
+                            ...prev.slice(0, -1),
+                            { role: 'assistant', content: data.answer, fetching: false },
+                        ]);
+                    }
+
+                    if (data.followupQuestions && Array.isArray(data.followupQuestions)) {
+                        setFollowupQuestions(data.followupQuestions.filter(filterOutNullable));
+                    }
+                }
+            } catch (error) {
+                console.error('Error in follow-up stream:', error);
+                // Update the message to show an error state
+                setMessages((prev) => [
+                    ...prev.slice(0, -1),
+                    { role: 'assistant', fetching: false },
+                ]);
+            }
+        })();
+    };
+
+    // Handle followup question click
+    const handleFollowupClick = (question: string) => {
+        handleSendMessage(question);
+    };
+
+    // Auto-scroll to latest message
+    useEffect(() => {
+        if (latestMessageRef.current) {
+            latestMessageRef.current.scrollIntoView({
+                behavior: 'smooth',
+                block: 'start',
+            });
+        }
+    }, [messages]);
+
+    return (
+        <div className="flex h-full flex-col overflow-hidden">
+            {/* Toggle button for showing search results */}
+            {searchState?.mode === 'chat' && (
+                <div
+                    className="absolute top-2 animate-fadeIn max-md:right-4 md:top-4 md:left-4"
+                    style={{ animationDelay: '500ms' }}
+                >
+                    <Button
+                        label="Show search results"
+                        variant="secondary"
+                        size="small"
+                        iconOnly
+                        icon="arrow-down-from-line"
+                        className="md:hidden"
+                        onClick={() => {
+                            setSearchState((state) =>
+                                state ? { ...state, mode: 'both', manual: true } : null
+                            );
+                        }}
+                    />
+                    <Button
+                        label="Show search results"
+                        iconOnly
+                        variant="blank"
+                        size="default"
+                        icon="sidebar"
+                        className="hidden px-2 md:block"
+                        onClick={() => {
+                            setSearchState((state) =>
+                                state ? { ...state, mode: 'both', manual: true } : null
+                            );
+                        }}
+                    />
+                </div>
+            )}
+
+            {/* Main chat area */}
+            <div
+                className={tcls(
+                    'mx-auto flex w-full grow scroll-pt-8 flex-col gap-4 overflow-y-auto p-8 transition-all delay-200 duration-500',
+                    isExpanded && 'md:px-16'
+                )}
+                ref={latestMessageRef}
+            >
+                {/* Summary section */}
+                <div className="mx-auto w-full max-w-prose">
+                    <h5 className="mb-1 flex items-center gap-1 font-semibold text-tint-subtle text-xs">
+                        <Icon icon="glasses-round" className="mt-0.5 size-3" /> Summary of what
+                        you've read
+                    </h5>
+                    {summary ? summary : <LoadingAnimation />}
+                </div>
+
+                {/* Messages */}
+                {messages.map((message, index) => {
+                    const isLast = index === messages.length - 1;
+                    return (
+                        <div
+                            key={index}
+                            ref={isLast ? latestMessageRef : undefined}
+                            className={tcls(
+                                'mx-auto flex flex w-full max-w-prose flex-col gap-4',
+                                isLast && 'min-h-[calc(100%-2rem)]'
+                            )}
+                        >
+                            <ChatMessage message={message} />
+                            {isLast && followupQuestions && followupQuestions.length > 0 && (
+                                <FollowupQuestions
+                                    questions={followupQuestions}
+                                    onQuestionClick={handleFollowupClick}
+                                />
+                            )}
+                        </div>
+                    );
+                })}
+            </div>
+
+            {/* Input area */}
+            {query && (
+                <div
+                    className={tcls(
+                        'border-tint-subtle border-t bg-tint-subtle px-8 py-4 transition-all delay-200 duration-500',
+                        isExpanded && 'md:px-16'
+                    )}
+                >
+                    <div className={tcls('mx-auto flex w-full max-w-prose flex-col gap-2')}>
+                        <ChatInput
+                            onSendMessage={handleSendMessage}
+                            disabled={!conversationResponseId}
+                            inputRef={chatInputRef}
+                        />
+                    </div>
+                </div>
+            )}
+        </div>
+    );
+}
@@ -1,6 +1,4 @@
 'use client';
-
-import { Icon } from '@gitbook/icons';
 import { AnimatePresence, motion } from 'framer-motion';
 import { useRouter } from 'next/navigation';
 import React from 'react';
@@ -8,10 +6,9 @@ import { useHotkeys } from 'react-hotkeys-hook';

 import { tString, useLanguage } from '@/intl/client';
 import { tcls } from '@/lib/tailwind';
-
 import { LoadingPane } from '../primitives/LoadingPane';
-import { SearchAskAnswer } from './SearchAskAnswer';
 import { SearchAskProvider, useSearchAskState } from './SearchAskContext';
+import { SearchChat } from './SearchChat';
 import { SearchResults, type SearchResultsRef } from './SearchResults';
 import { SearchScopeToggle } from './SearchScopeToggle';
 import { type SearchState, type UpdateSearchState, useSearch } from './useSearch';
@@ -30,14 +27,21 @@ export function SearchModal(props: SearchModalProps) {
    const searchAsk = useSearchAskState();
    const [askState] = searchAsk;
    const router = useRouter();
+    const chatInputRef = React.useRef<HTMLInputElement>(null);

    useHotkeys(
        'mod+k',
        (e) => {
            e.preventDefault();
-            setSearchState({ ask: false, query: '', global: false });
+            if (state !== null) {
+                // If search is already open, focus the chat input
+                chatInputRef.current?.focus();
+            } else {
+                // Otherwise open the search modal
+                setSearchState({ mode: 'both', query: '', global: false });
+            }
        },
-        []
+        [state]
    );

    // Add a global class on the body when the search modal is open
@@ -125,6 +129,7 @@ export function SearchModal(props: SearchModalProps) {
                                state={state}
                                setSearchState={setSearchState}
                                onClose={onClose}
+                                chatInputRef={chatInputRef}
                            />
                        </div>
                    </motion.div>
@@ -139,9 +144,11 @@ function SearchModalBody(
        state: SearchState;
        setSearchState: UpdateSearchState;
        onClose: (to?: string) => void;
+        chatInputRef: React.RefObject<HTMLInputElement>;
    }
 ) {
-    const { spaceTitle, withAsk, isMultiVariants, state, setSearchState, onClose } = props;
+    const { spaceTitle, withAsk, isMultiVariants, state, setSearchState, onClose, chatInputRef } =
+        props;

    const language = useLanguage();
    const resultsRef = React.useRef<SearchResultsRef>(null);
@@ -165,6 +172,12 @@ function SearchModalBody(
    }, [onClose]);

    const onKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
+        // Handle second Cmd+K
+        if ((event.metaKey || event.ctrlKey) && event.key === 'k') {
+            event.preventDefault();
+            chatInputRef.current?.focus();
+            return;
+        }
        if (event.key === 'ArrowUp') {
            event.preventDefault();
            resultsRef.current?.moveUp();
@@ -179,7 +192,7 @@ function SearchModalBody(

    const onChange = (event: React.ChangeEvent<HTMLInputElement>) => {
        setSearchState({
-            ask: false, // When typing, we go back to the default search mode
+            mode: 'both', // When typing, we go back to the default search mode
            query: event.target.value,
            global: state.global,
        });
@@ -219,9 +232,10 @@ function SearchModalBody(
                'flex',
                'flex-col',
                'bg-tint-base',
-                'max-w-prose',
+                'max-w-screen-lg',
                'mx-auto',
-                'max-h-[70dvh]',
+                // 'min-h-[50dvh]',
+                'h-[70dvh]',
                'w-full',
                'rounded-lg',
                'straight-corners:rounded-sm',
@@ -242,12 +256,10 @@ function SearchModalBody(
                    'flex-row',
                    'items-start',
                    state.query !== null ? 'border-b' : null,
-                    'border-tint-subtle'
+                    'border-tint-subtle',
+                    'col-span-full'
                )}
            >
-                <div className={tcls('p-2', 'pl-4', 'pt-4')}>
-                    <Icon icon="magnifying-glass" className={tcls('size-4', 'text-tint-subtle')} />
-                </div>
                <div
                    className={tcls(
                        'w-full',
@@ -270,8 +282,8 @@ function SearchModalBody(
                            'flex',
                            'resize-none',
                            'flex-1',
-                            'h-12',
-                            'p-2',
+                            'py-4',
+                            'px-8',
                            'focus:outline-none',
                            'bg-transparent',
                            'whitespace-pre-line'
@@ -287,18 +299,38 @@ function SearchModalBody(
                    {isMultiVariants ? <SearchScopeToggle spaceTitle={spaceTitle} /> : null}
                </div>
            </div>
-            {!state.ask || !withAsk ? (
-                <SearchResults
-                    ref={resultsRef}
-                    global={isMultiVariants && state.global}
-                    query={normalizedQuery}
-                    withAsk={withAsk}
-                    onSwitchToAsk={onSwitchToAsk}
-                />
-            ) : null}
-            {normalizedQuery && state.ask && withAsk ? (
-                <SearchAskAnswer query={normalizedQuery} />
-            ) : null}
+            <div className={tcls('flex grow flex-col overflow-hidden md:flex-row')}>
+                <div
+                    key="results"
+                    className={tcls(
+                        'h-full w-full flex-1 overflow-y-auto transition-all duration-500 ease-[cubic-bezier(0.85,0,0.15,1)] *:transition-opacity *:delay-200 *:duration-300',
+                        state.mode === 'chat' && 'flex-[0] delay-200 *:opacity-0 *:delay-0'
+                    )}
+                    aria-hidden={state.mode === 'chat' ? 'true' : undefined}
+                >
+                    <SearchResults
+                        ref={resultsRef}
+                        global={isMultiVariants && state.global}
+                        query={normalizedQuery}
+                        withAsk={withAsk}
+                        onSwitchToAsk={onSwitchToAsk}
+                    />
+                </div>
+
+                <div
+                    key="chat"
+                    className={tcls(
+                        'relative h-full w-full flex-1 overflow-y-auto overflow-x-hidden bg-tint-subtle transition-colors duration-500 *:transition-opacity *:delay-200 *:duration-300 max-md:border-t md:border-l',
+                        state.mode === 'results' && 'flex-[0] *:opacity-0 *:delay-0',
+                        state.mode === 'both'
+                            ? 'border-tint-subtle'
+                            : 'border-transparent delay-500'
+                    )}
+                    aria-hidden={state.mode === 'results' ? 'true' : undefined}
+                >
+                    <SearchChat query={normalizedQuery} chatInputRef={chatInputRef} />
+                </div>
+            </div>
        </motion.div>
    );
 }
@@ -2,7 +2,9 @@ import { tcls } from '@/lib/tailwind';
 import { Icon, type IconName } from '@gitbook/icons';
 import React from 'react';

-import { Link } from '../primitives';
+import { useLanguage } from '@/intl/client';
+import { tString } from '@/intl/translate';
+import { Button, Link } from '../primitives';
 import { HighlightQuery } from './HighlightQuery';
 import type { ComputedPageResult } from './server-actions';

@@ -14,6 +16,7 @@ export const SearchPageResultItem = React.forwardRef(function SearchPageResultIt
    },
    ref: React.Ref<HTMLAnchorElement>
 ) {
+    const language = useLanguage();
    const { query, item, active } = props;

    const breadcrumbs =
@@ -34,16 +37,19 @@ export const SearchPageResultItem = React.forwardRef(function SearchPageResultIt
                'flex-row',
                'items-center',
                'p-4',
-                'border-t',
-                'border-tint-subtle',
-                'first:border-none',
+                'rounded-lg',
+                'straight-corners:rounded-none',
                'text-base',
                'font-medium',
+                'text-tint-strong',
                'hover:bg-tint-hover',
                'group',
-                active
-                    ? ['is-active', 'bg-primary', 'text-contrast-primary', 'hover:bg-primary-hover']
-                    : null
+                active && [
+                    'is-active',
+                    'bg-primary',
+                    'text-primary-strong',
+                    'hover:bg-primary-hover',
+                ]
            )}
            insights={{
                type: 'search_open_result',
@@ -56,8 +62,8 @@ export const SearchPageResultItem = React.forwardRef(function SearchPageResultIt
        >
            <div className="size-4">
                <Icon
-                    icon="file-lines"
-                    className={tcls('size-4', active ? 'text-primary' : 'text-tint-subtle')}
+                    icon="file"
+                    className={tcls('size-4', active ? 'text-primary-subtle' : 'text-tint-subtle')}
                />
            </div>
            <div className={tcls('flex', 'flex-col', 'w-full')}>
@@ -65,7 +71,8 @@ export const SearchPageResultItem = React.forwardRef(function SearchPageResultIt
                    <div
                        className={tcls(
                            'text-xs',
-                            'opacity-6',
+                            active ? 'text-primary-subtle' : 'text-neutral-subtle',
+                            // 'opacity-6',
                            'contrast-more:opacity-11',
                            'font-normal',
                            'uppercase',
@@ -103,19 +110,15 @@ export const SearchPageResultItem = React.forwardRef(function SearchPageResultIt
                ) : null}
                <HighlightQuery query={query} text={item.title} />
            </div>
-            <div
-                className={tcls(
-                    'p-2',
-                    'rounded',
-                    'straight-corners:rounded-none',
-                    active ? ['bg-primary-solid', 'text-contrast-primary-solid'] : ['opacity-6']
-                )}
-            >
-                <Icon
-                    icon={active ? 'arrow-turn-down-left' : 'chevron-right'}
-                    className={tcls('size-4')}
+            {active ? (
+                <Button
+                    icon="arrow-turn-down-left"
+                    size="small"
+                    label={tString(language, 'view')}
                />
-            </div>
+            ) : (
+                <Icon icon="chevron-right" className="size-4 text-tint-subtle/6" />
+            )}
        </Link>
    );
 });
@@ -1,10 +1,10 @@
 import { Icon } from '@gitbook/icons';
 import React from 'react';

-import { t, useLanguage } from '@/intl/client';
+import { t, tString, useLanguage } from '@/intl/client';
 import { tcls } from '@/lib/tailwind';

-import { Link } from '../primitives';
+import { Button, Link } from '../primitives';
 import { useSearchLink } from './useSearch';

 export const SearchQuestionResultItem = React.forwardRef(function SearchQuestionResultItem(
@@ -28,19 +28,20 @@ export const SearchQuestionResultItem = React.forwardRef(function SearchQuestion
            className={tcls(
                'flex',
                'px-4',
-                recommended ? ['py-2', 'text-tint'] : 'py-4',
+                'py-2',
+                'text-tint',
+                'rounded-lg',
+                'straight-corners:rounded-none',
                'hover:bg-tint-hover',
-                'first:mt-0',
-                'last:pb-3',
+                'gap-4',
                active && [
                    'is-active',
                    'bg-primary',
-                    'text-contrast-primary',
+                    'text-primary-strong',
                    'hover:bg-primary-hover',
                ]
            )}
            {...getLinkProp({
-                ask: true,
                query: question,
            })}
        >
@@ -50,7 +51,6 @@ export const SearchQuestionResultItem = React.forwardRef(function SearchQuestion
                    'size-4',
                    'shrink-0',
                    'mt-1.5',
-                    'mr-4',
                    active ? ['text-primary'] : ['text-tint-subtle']
                )}
            />
@@ -66,19 +66,16 @@ export const SearchQuestionResultItem = React.forwardRef(function SearchQuestion
                    </>
                )}
            </div>
-            <div
-                className={tcls(
-                    'p-2',
-                    'rounded',
-                    'self-center',
-                    'straight-corners:rounded-none',
-                    active ? ['bg-primary-solid', 'text-contrast-primary-solid'] : ['opacity-6']
+            <div className="self-center">
+                {active ? (
+                    <Button
+                        icon="arrow-turn-down-left"
+                        size="small"
+                        label={tString(language, 'search')}
+                    />
+                ) : (
+                    <Icon icon="chevron-right" className="size-4 text-tint-subtle/6" />
                )}
-            >
-                <Icon
-                    icon={active ? 'arrow-turn-down-left' : 'chevron-right'}
-                    className={tcls('size-4')}
-                />
            </div>
        </Link>
    );
@@ -7,6 +7,7 @@ import React from 'react';
 import { t, useLanguage } from '@/intl/client';
 import { tcls } from '@/lib/tailwind';

+import { AnimatePresence, motion } from 'framer-motion';
 import { useTrackEvent } from '../Insights';
 import { Loading } from '../primitives';
 import { SearchPageResultItem } from './SearchPageResultItem';
@@ -18,6 +19,7 @@ import {
    searchSiteSpaceContent,
    streamRecommendedQuestions,
 } from './server-actions';
+import { type SearchState, useSearch } from './useSearch';

 export interface SearchResultsRef {
    moveUp(): void;
@@ -44,7 +46,6 @@ let cachedRecommendedQuestions: null | ResultType[] = null;
 */
 export const SearchResults = React.forwardRef(function SearchResults(
    props: {
-        children?: React.ReactNode;
        query: string;
        global: boolean;
        withAsk: boolean;
@@ -52,7 +53,7 @@ export const SearchResults = React.forwardRef(function SearchResults(
    },
    ref: React.Ref<SearchResultsRef>
 ) {
-    const { children, query, withAsk, global, onSwitchToAsk } = props;
+    const { query, withAsk, global, onSwitchToAsk } = props;

    const language = useLanguage();
    const trackEvent = useTrackEvent();
@@ -62,6 +63,39 @@ export const SearchResults = React.forwardRef(function SearchResults(
    }>({ results: [], fetching: true });
    const [cursor, setCursor] = React.useState<number | null>(null);
    const refs = React.useRef<(null | HTMLAnchorElement)[]>([]);
+    const [searchState, setSearchState] = useSearch();
+    const manualStateRef = React.useRef(false);
+
+    React.useEffect(() => {
+        if (searchState?.manual !== undefined) {
+            manualStateRef.current = searchState.manual;
+        }
+    }, [searchState?.manual]);
+
+    const results: ResultType[] = React.useMemo(() => resultsState.results, [resultsState.results]);
+
+    React.useEffect(() => {
+        if (!query) {
+            // Reset the cursor when there's no query
+            setCursor(null);
+        } else if (!searchState?.manual && !resultsState.fetching && results.length === 0) {
+            setSearchState((prev) => {
+                const newState: SearchState | null = prev
+                    ? { ...prev, mode: 'chat' as const }
+                    : null;
+                return newState;
+            });
+        } else if (results.length > 0) {
+            // Auto-focus the first result
+            setSearchState((prev) => {
+                const newState: SearchState | null = prev
+                    ? { ...prev, mode: 'both' as const }
+                    : null;
+                return newState;
+            });
+            setCursor(0);
+        }
+    }, [results, query, setSearchState, resultsState.fetching, searchState?.manual]);

    React.useEffect(() => {
        if (!query) {
@@ -78,7 +112,7 @@ export const SearchResults = React.forwardRef(function SearchResults(
            let cancelled = false;

            // Silently fetch the recommended questions, instead of showing a spinner
-            setResultsState({ results: [], fetching: false });
+            // setResultsState({ results: [], fetching: false });

            // We currently have a bug where the same question can be returned multiple times.
            // This is a workaround to avoid that.
@@ -150,23 +184,6 @@ export const SearchResults = React.forwardRef(function SearchResults(
        };
    }, [query, global, withAsk, trackEvent]);

-    const results: ResultType[] = React.useMemo(() => {
-        if (!withAsk) {
-            return resultsState.results;
-        }
-        return withQuestionResult(resultsState.results, query);
-    }, [resultsState.results, query, withAsk]);
-
-    React.useEffect(() => {
-        if (!query) {
-            // Reset the cursor when there's no query
-            setCursor(null);
-        } else if (results.length > 0) {
-            // Auto-focus the first result
-            setCursor(0);
-        }
-    }, [results, query]);
-
    // Scroll to the active result.
    React.useEffect(() => {
        if (cursor === null || !refs.current[cursor]) {
@@ -214,106 +231,93 @@ export const SearchResults = React.forwardRef(function SearchResults(
        [moveBy, select]
    );

-    if (resultsState.fetching) {
-        return (
-            <div className={tcls('flex', 'items-center', 'justify-center', 'py-8')}>
-                <Loading className={tcls('w-6', 'text-primary')} />
-            </div>
-        );
-    }
+    const loading = (
+        <div className={tcls('flex', 'items-center', 'justify-center', 'p-8')}>
+            <Loading className={tcls('w-6', 'text-primary-subtle')} />
+        </div>
+    );

    const noResults = (
-        <div className={tcls('text', 'text-tint', 'p-8', 'text-center')}>
-            {t(language, 'search_no_results', query)}
+        <div className={tcls('text', 'text-tint', 'text-center', 'p-8')}>
+            <div className="animate-fadeIn" style={{ animationDelay: '0.5s' }}>
+                {t(language, 'search_no_results', query)}
+            </div>
        </div>
    );

    return (
-        <div className={tcls('overflow-auto')}>
-            {children}
-            {results.length === 0 ? (
-                query ? (
-                    noResults
-                ) : null
+        <AnimatePresence initial={false} mode="wait">
+            {resultsState.fetching ? (
+                loading
+            ) : query && results.length === 0 ? (
+                noResults
            ) : (
-                <>
-                    <div data-testid="search-results">
-                        {results.map((item, index) => {
-                            switch (item.type) {
-                                case 'page': {
-                                    return (
-                                        <SearchPageResultItem
-                                            ref={(ref) => {
-                                                refs.current[index] = ref;
-                                            }}
-                                            key={item.id}
-                                            query={query}
-                                            item={item}
-                                            active={index === cursor}
-                                        />
-                                    );
-                                }
-                                case 'question': {
-                                    return (
-                                        <SearchQuestionResultItem
-                                            ref={(ref) => {
-                                                refs.current[index] = ref;
-                                            }}
-                                            key={item.id}
-                                            question={query}
-                                            active={index === cursor}
-                                            onClick={onSwitchToAsk}
-                                        />
-                                    );
-                                }
-                                case 'recommended-question': {
-                                    return (
-                                        <SearchQuestionResultItem
-                                            ref={(ref) => {
-                                                refs.current[index] = ref;
-                                            }}
-                                            key={item.id}
-                                            question={item.question}
-                                            active={index === cursor}
-                                            onClick={onSwitchToAsk}
-                                            recommended
-                                        />
-                                    );
-                                }
-                                case 'section': {
-                                    return (
-                                        <SearchSectionResultItem
-                                            ref={(ref) => {
-                                                refs.current[index] = ref;
-                                            }}
-                                            key={item.id}
-                                            query={query}
-                                            item={item}
-                                            active={index === cursor}
-                                        />
-                                    );
-                                }
-                                default:
-                                    assertNever(item);
+                <motion.div
+                    layout="position"
+                    className="flex flex-col gap-2 p-4"
+                    data-testid="search-results"
+                >
+                    {results.map((item, index) => {
+                        switch (item.type) {
+                            case 'page': {
+                                return (
+                                    <SearchPageResultItem
+                                        ref={(ref) => {
+                                            refs.current[index] = ref;
+                                        }}
+                                        key={item.id}
+                                        query={query}
+                                        item={item}
+                                        active={index === cursor}
+                                    />
+                                );
                            }
-                        })}
-                    </div>
-                    {!results.some((result) => result.type !== 'question') && noResults}
-                </>
+                            case 'question': {
+                                return (
+                                    <SearchQuestionResultItem
+                                        ref={(ref) => {
+                                            refs.current[index] = ref;
+                                        }}
+                                        key={item.id}
+                                        question={query}
+                                        active={index === cursor}
+                                        onClick={onSwitchToAsk}
+                                    />
+                                );
+                            }
+                            case 'recommended-question': {
+                                return (
+                                    <SearchQuestionResultItem
+                                        ref={(ref) => {
+                                            refs.current[index] = ref;
+                                        }}
+                                        key={item.id}
+                                        question={item.question}
+                                        active={index === cursor}
+                                        onClick={onSwitchToAsk}
+                                        recommended
+                                    />
+                                );
+                            }
+                            case 'section': {
+                                return (
+                                    <SearchSectionResultItem
+                                        ref={(ref) => {
+                                            refs.current[index] = ref;
+                                        }}
+                                        key={item.id}
+                                        query={query}
+                                        item={item}
+                                        active={index === cursor}
+                                    />
+                                );
+                            }
+                            default:
+                                assertNever(item);
+                        }
+                    })}
+                </motion.div>
            )}
-        </div>
+        </AnimatePresence>
    );
 });
-
-/**
- * Add a "Ask <question>" item at the top of the results list.
- */
-function withQuestionResult(results: ResultType[], query: string): ResultType[] {
-    const without = results.filter((result) => result.type !== 'question');
-
-    if (query.length === 0) {
-        return without;
-    }
-
-    return [{ type: 'question', id: 'question', query }, ...(without ?? [])];
-}
@@ -3,7 +3,8 @@ import React from 'react';

 import { tcls } from '@/lib/tailwind';

-import { Link } from '../primitives';
+import { tString, useLanguage } from '@/intl/client';
+import { Button, Link } from '../primitives';
 import { HighlightQuery } from './HighlightQuery';
 import type { ComputedSectionResult } from './server-actions';

@@ -16,13 +17,15 @@ export const SearchSectionResultItem = React.forwardRef(function SearchSectionRe
    ref: React.Ref<HTMLAnchorElement>
 ) {
    const { query, item, active } = props;
+    const language = useLanguage();

    return (
        <Link
            ref={ref}
            href={item.href}
            className={tcls(
-                '[&:has(+:not(&))]:mb-6',
+                // '[&:has(+:not(&))]:mb-6',
+                '-mt-2',
                'flex',
                'items-center',
                'pl-6',
@@ -33,6 +36,8 @@ export const SearchSectionResultItem = React.forwardRef(function SearchSectionRe
                'font-normal',
                'py-2',
                'group',
+                'rounded-lg',
+                'straight-corners:rounded-none',
                active && [
                    'is-active',
                    'bg-primary',
@@ -72,20 +77,15 @@ export const SearchSectionResultItem = React.forwardRef(function SearchSectionRe
                    </p>
                ) : null}
            </div>
-            <div
-                className={tcls(
-                    'p-2',
-                    'rounded',
-                    'straight-corners:rounded-none',
-                    'bg-primary-solid',
-                    'text-contrast-primary-solid',
-                    'hidden',
-                    'sm:block',
-                    active ? ['opacity-11', 'block'] : ['opacity-0']
-                )}
-            >
-                <Icon icon="arrow-turn-down-left" className={tcls('size-4')} />
-            </div>
+            {active ? (
+                <Button
+                    icon="arrow-turn-down-left"
+                    size="small"
+                    label={tString(language, 'view')}
+                />
+            ) : (
+                <Icon icon="chevron-right" className="size-4 text-tint-subtle/6" />
+            )}
        </Link>
    );
 });
@@ -28,7 +28,7 @@ const questionWords = new Set([
 * Return true if an input query looks like a question.
 */
 export function isQuestion(query: string): boolean {
-    if (query.length > 25 || query.includes('?') || query.includes(' ')) {
+    if ((query.length > 25 && query.includes(' ')) || query.includes('?')) {
        return true;
    }

@@ -4,15 +4,16 @@ import { resolvePageId } from '@/lib/pages';
 import { findSiteSpaceById, getSiteStructureSections } from '@/lib/sites';
 import { filterOutNullable } from '@/lib/typescript';
 import { getV1BaseContext } from '@/lib/v1';
-import type {
-    RevisionPage,
-    SearchAIAnswer,
-    SearchAIRecommendedQuestionStream,
-    SearchPageResult,
-    SearchSpaceResult,
-    SiteSection,
-    SiteSectionGroup,
-    Space,
+import {
+    AIMessageRole,
+    type RevisionPage,
+    type SearchAIAnswer,
+    type SearchAIRecommendedQuestionStream,
+    type SearchPageResult,
+    type SearchSpaceResult,
+    type SiteSection,
+    type SiteSectionGroup,
+    type Space,
 } from '@gitbook/api';
 import type { GitBookBaseContext, GitBookSiteContext } from '@v2/lib/context';
 import { fetchServerActionSiteContext, getServerActionBaseContext } from '@v2/lib/server-actions';
@@ -24,6 +25,8 @@ import { isV2 } from '@/lib/v2';
 import type { IconName } from '@gitbook/icons';
 import { throwIfDataError } from '@v2/lib/data';
 import { getSiteURLDataFromMiddleware } from '@v2/lib/middleware';
+import { z } from 'zod';
+import { streamGenerateObject } from '../Adaptive/server-actions/api';
 import { DocumentView } from '../DocumentView';

 export type OrderedComputedResult = ComputedPageResult | ComputedSectionResult;
@@ -410,3 +413,140 @@ async function transformSitePageResult(

    return [page, ...pageSections];
 }
+
+/**
+ * Get an AI-generated answer to a search query.
+ */
+export async function* streamAISearchSummary({
+    visitedPages,
+}: {
+    visitedPages: { spaceId: string; pageId: string }[];
+}) {
+    const baseContext = isV2() ? await getServerActionBaseContext() : await getV1BaseContext();
+    const siteURLData = await getSiteURLDataFromMiddleware();
+
+    const { stream, response } = await streamGenerateObject(
+        baseContext,
+        {
+            organizationId: siteURLData.organization,
+            siteId: siteURLData.site,
+        },
+        {
+            schema: z.object({
+                summary: z
+                    .string()
+                    .describe(
+                        'A summary of the most important information the user has learned from the provided context.'
+                    ),
+            }),
+            messages: [
+                {
+                    role: AIMessageRole.Developer,
+                    content:
+                        'Summarise the most important information the user has learned from the provided context. Be concise and focus on facts. Do not add commentary, adjectives or other empty descriptors.',
+                    attachments: visitedPages.map(({ spaceId, pageId }) => ({
+                        type: 'page' as const,
+                        spaceId,
+                        pageId,
+                    })),
+                },
+            ].filter(filterOutNullable),
+        }
+    );
+
+    // Get the responseId asynchronously in the background
+    let responseId: string | null = null;
+    const responseIdPromise = response
+        .then((r) => {
+            responseId = r.responseId;
+        })
+        .catch((error) => {
+            console.error('Error getting responseId:', error);
+        });
+
+    for await (const value of stream) {
+        const summary = value.summary;
+        if (!summary) {
+            continue;
+        }
+
+        yield { summary };
+    }
+
+    // Wait for the responseId to be available and yield one final time
+    await responseIdPromise;
+    yield { responseId };
+}
+
+/**
+ * Get an AI-generated answer to a search query.
+ */
+export async function* streamAISearchAnswer({
+    question,
+    previousResponseId,
+}: {
+    question: string;
+    previousResponseId?: string;
+}) {
+    const baseContext = isV2() ? await getServerActionBaseContext() : await getV1BaseContext();
+    const siteURLData = await getSiteURLDataFromMiddleware();
+
+    const { stream, response } = await streamGenerateObject(
+        baseContext,
+        {
+            organizationId: siteURLData.organization,
+            siteId: siteURLData.site,
+        },
+        {
+            schema: z.object({
+                answer: z.string().describe('The answer to the question.'),
+                followupQuestions: z
+                    .array(z.string())
+                    .describe(
+                        'Follow-up questions to the question, based on the provided content only. Keep questions very short and use pronouns to refer to known concepts.'
+                    )
+                    .max(3),
+            }),
+            tools: {
+                search: true,
+                getPageContent: true,
+            },
+            previousResponseId: previousResponseId,
+            messages: [
+                {
+                    role: AIMessageRole.Developer,
+                    content: `Answer the following question by using the provided documentation or by searching. Format the answer in Markdown. If you cannot answer the question using the context provided, provide an empty string. Always list related follow-up questions using the provided context. Check first that you can answer the question given the provided context before listing it as a follow-up question. If you can't answer a question, don't include it in the follow up questions. If there is no provided context, do not list follow-up questions. List the sources used to answer the question in the "sources" field. Only list the sources that were directly used for the content of the answer.`,
+                },
+                {
+                    role: AIMessageRole.User,
+                    content: question,
+                },
+            ].filter(filterOutNullable),
+        }
+    );
+
+    // Get the responseId asynchronously in the background
+    let responseId: string | null = null;
+    const responseIdPromise = response
+        .then((r) => {
+            responseId = r.responseId;
+        })
+        .catch((error) => {
+            console.error('Error getting responseId:', error);
+        });
+
+    for await (const value of stream) {
+        const answer = value.answer;
+        const followupQuestions = value.followupQuestions;
+
+        if (answer === undefined) {
+            continue;
+        }
+
+        yield { answer, followupQuestions };
+    }
+
+    // Wait for the responseId to be available and yield one final time
+    await responseIdPromise;
+    yield { responseId };
+}
@@ -1,19 +1,21 @@
-import { parseAsBoolean, parseAsString, useQueryStates } from 'nuqs';
+import { parseAsBoolean, parseAsString, parseAsStringEnum, useQueryStates } from 'nuqs';
 import React from 'react';

 import type { LinkProps } from '../primitives';

 export interface SearchState {
    query: string;
-    ask: boolean;
    global: boolean;
+    mode: 'results' | 'chat' | 'both';
+    manual?: boolean;
 }

 // KeyMap needs to be statically defined to avoid `setRawState` being redefined on every render.
 const keyMap = {
    q: parseAsString,
-    ask: parseAsBoolean,
+    mode: parseAsStringEnum(['both', 'results', 'chat']).withDefault('both'),
    global: parseAsBoolean,
+    manual: parseAsBoolean,
 };

 export type UpdateSearchState = (
@@ -33,7 +35,12 @@ export function useSearch(): [SearchState | null, UpdateSearchState] {
            return null;
        }

-        return { query: rawState.q, ask: !!rawState.ask, global: !!rawState.global };
+        return {
+            query: rawState.q,
+            mode: rawState.mode,
+            global: !!rawState.global,
+            manual: !!rawState.manual,
+        };
    }, [rawState]);

    const stateRef = React.useRef(state);
@@ -52,14 +59,16 @@ export function useSearch(): [SearchState | null, UpdateSearchState] {
            if (update === null) {
                return setRawState({
                    q: null,
-                    ask: null,
+                    mode: null,
                    global: null,
+                    manual: null,
                });
            }
            return setRawState({
                q: update.query,
-                ask: update.ask ? true : null,
+                mode: update.mode,
                global: update.global ? true : null,
+                manual: update.manual ? true : null,
            });
        },
        [setRawState]
@@ -78,8 +87,9 @@ export function useSearchLink(): (query: Partial<SearchState>) => LinkProps {
        (query) => {
            const searchParams = new URLSearchParams();
            searchParams.set('q', query.query ?? '');
-            query.ask ? searchParams.set('ask', 'on') : searchParams.delete('ask');
+            query.mode ? searchParams.set('mode', query.mode) : searchParams.delete('mode');
            query.global ? searchParams.set('global', 'on') : searchParams.delete('global');
+            searchParams.delete('manual');
            return {
                href: `?${searchParams.toString()}`,
                prefetch: false,
@@ -87,7 +97,7 @@ export function useSearchLink(): (query: Partial<SearchState>) => LinkProps {
                    event.preventDefault();
                    setSearch((prev) => ({
                        query: '',
-                        ask: false,
+                        mode: 'both',
                        global: false,
                        ...(prev ?? {}),
                        ...query,
@@ -18,7 +18,7 @@ export function RocketLoaderDetector(props: { nonce?: string }) {
            alert.className = 'p-4 mb-4 text-sm text-red-800 rounded-lg bg-red-50 mt-8 mx-8';
            alert.innerHTML = \`
              <strong>Error in site configuration:</strong>
-                It looks like \${window.location.hostname} has been incorrectly configured in Cloudflare. This may lead to unexpected behavior or issues with the page loading. If you are the owner of this site, please refer to <a href="https://docs.gitbook.com/published-documentation/custom-domain/configure-dns#are-you-using-cloudflare" class="underline">GitBook's documentation</a> for steps to fix the problem.
+                It looks like \${window.location.hostname} has been incorrectly configured in Cloudflare. This may lead to unexpected behavior or issues with the page loading. If you are the owner of this site, please refer to <a href="https://gitbook.com/docs/published-documentation/custom-domain/configure-dns#are-you-using-cloudflare" class="underline">GitBook's documentation</a> for steps to fix the problem.
              \`;

            document.body.prepend(alert);
@@ -69,7 +69,11 @@ async function resolvePage(context: GitBookSiteContext, params: PagePathParams |

        // If a page still can't be found, we try with the API, in case we have a redirect at site level.
        const redirectPathname = withLeadingSlash(rawPathname);
-        if (/^\/[a-zA-Z0-9-_.\/]+[a-zA-Z0-9-_.]$/.test(redirectPathname)) {
+        if (
+            /^\/(?:[A-Za-z0-9\-._~]|%[0-9A-Fa-f]{2})+(?:\/(?:[A-Za-z0-9\-._~]|%[0-9A-Fa-f]{2})+)*$/.test(
+                redirectPathname
+            )
+        ) {
            const redirectSources = new Set<string>([
                // Test the pathname relative to the root
                // For example hello/world -> section/variant/hello/world
@@ -83,6 +83,12 @@ export function SiteSectionTabs(props: { sections: ClientSiteSections }) {
                                                    )
                                                }
                                                asChild
+                                                onClick={(e) => {
+                                                    if (value) {
+                                                        e.preventDefault();
+                                                        e.stopPropagation();
+                                                    }
+                                                }}
                                            >
                                                <SectionGroupTab
                                                    isActive={isActive}
@@ -180,7 +186,7 @@ const SectionGroupTab = React.forwardRef(function SectionGroupTab(
            ref={ref}
            {...rest}
            className={tcls(
-                'group relative my-2 flex select-none items-center justify-between rounded straight-corners:rounded-none px-3 py-1 transition-colors',
+                'group relative my-2 flex select-none items-center justify-between rounded straight-corners:rounded-none px-3 py-1 transition-colors hover:cursor-default',
                isActive
                    ? 'text-primary-subtle'
                    : 'text-tint hover:bg-tint-hover hover:text-tint-strong'
@@ -6,6 +6,7 @@ import { tcls } from '@/lib/tailwind';

 import { PagesList } from './PagesList';
 import { TOCScrollContainer } from './TOCScroller';
+import { TableOfContentsScript } from './TableOfContentsScript';
 import { Trademark } from './Trademark';

 export function TableOfContents(props: {
@@ -17,97 +18,107 @@ export function TableOfContents(props: {
    const { space, customization, pages } = context;

    return (
-        <aside // Sidebar container, responsible for setting the right dimensions and position for the sidebar.
-            data-testid="table-of-contents"
-            className={tcls(
-                'group',
-                'text-sm',
-
-                'grow-0',
-                'shrink-0',
-                'basis-full',
-                'lg:basis-72',
-                'page-no-toc:lg:basis-56',
-
-                'relative',
-                'z-[1]',
-                'lg:sticky',
-                // Without header
-                'lg:top-0',
-                'lg:h-screen',
-
-                // With header
-                'site-header:lg:top-16',
-                'site-header:lg:h-[calc(100vh_-_4rem)]',
-
-                // With header and sections
-                'site-header-sections:lg:top-[6.75rem]',
-                'site-header-sections:lg:h-[calc(100vh_-_6.75rem)]',
-
-                'pt-6',
-                'pb-4',
-                'sidebar-filled:lg:pr-6',
-                'page-no-toc:lg:pr-0',
-
-                'hidden',
-                'navigation-open:!flex',
-                'lg:flex',
-                'page-no-toc:lg:hidden',
-                'page-no-toc:xl:flex',
-                'site-header-none:page-no-toc:lg:flex',
-                'flex-col',
-                'gap-4',
-
-                'navigation-open:border-b',
-                'border-tint-subtle'
-            )}
-        >
-            {header && header}
-            <div // The actual sidebar, either shown with a filled bg or transparent.
+        <>
+            <aside // Sidebar container, responsible for setting the right dimensions and position for the sidebar.
+                data-testid="table-of-contents"
+                id="table-of-contents"
                className={tcls(
-                    'lg:-ms-5',
-                    'relative flex flex-grow flex-col overflow-hidden border-tint-subtle',
+                    'group',
+                    'text-sm',

-                    'sidebar-filled:bg-tint-subtle',
-                    'theme-muted:bg-tint-subtle',
-                    '[html.sidebar-filled.theme-bold.tint_&]:bg-tint-subtle',
-                    '[html.sidebar-filled.theme-muted_&]:bg-tint-base',
-                    '[html.sidebar-filled.theme-bold.tint_&]:bg-tint-base',
-                    '[html.sidebar-filled.theme-gradient_&]:border',
-                    'page-no-toc:!bg-transparent',
+                    'grow-0',
+                    'shrink-0',
+                    'basis-full',
+                    'lg:basis-72',
+                    'page-no-toc:lg:basis-56',

-                    'sidebar-filled:rounded-xl',
-                    'straight-corners:rounded-none'
+                    'relative',
+                    'z-[1]',
+                    'lg:sticky',
+
+                    // Server-side static positioning
+                    'lg:top-0',
+                    'lg:h-screen',
+                    'announcement:lg:h-[calc(100vh-4.25rem)]',
+
+                    'site-header:lg:top-16',
+                    'site-header:lg:h-[calc(100vh-4rem)]',
+                    'announcement:site-header:lg:h-[calc(100vh-4rem-4.25rem)]',
+
+                    'site-header-sections:lg:top-[6.75rem]',
+                    'site-header-sections:lg:h-[calc(100vh-6.75rem)]',
+                    'announcement:site-header-sections:lg:h-[calc(100vh-6.75rem-4.25rem)]',
+
+                    // Client-side dynamic positioning (CSS vars applied by script)
+                    '[html[style*="--toc-top-offset"]_&]:lg:!top-[var(--toc-top-offset)]',
+                    '[html[style*="--toc-height"]_&]:lg:!h-[var(--toc-height)]',
+
+                    'pt-6',
+                    'pb-4',
+                    'sidebar-filled:lg:pr-6',
+                    'page-no-toc:lg:pr-0',
+
+                    'hidden',
+                    'navigation-open:!flex',
+                    'lg:flex',
+                    'page-no-toc:lg:hidden',
+                    'page-no-toc:xl:flex',
+                    'site-header-none:page-no-toc:lg:flex',
+                    'flex-col',
+                    'gap-4',
+
+                    'navigation-open:border-b',
+                    'border-tint-subtle'
                )}
            >
-                {innerHeader && <div className="px-5 *:my-4">{innerHeader}</div>}
-                <TOCScrollContainer // The scrollview inside the sidebar
+                {header && header}
+                <div // The actual sidebar, either shown with a filled bg or transparent.
                    className={tcls(
-                        'flex flex-grow flex-col p-2',
-                        customization.trademark.enabled && 'lg:pb-20',
-                        'lg:gutter-stable overflow-y-auto',
-                        '[&::-webkit-scrollbar]:bg-transparent',
-                        '[&::-webkit-scrollbar-thumb]:bg-transparent',
-                        'group-hover:[&::-webkit-scrollbar]:bg-tint-subtle',
-                        'group-hover:[&::-webkit-scrollbar-thumb]:bg-tint-7',
-                        'group-hover:[&::-webkit-scrollbar-thumb:hover]:bg-tint-8'
+                        'lg:-ms-5',
+                        'relative flex flex-grow flex-col overflow-hidden border-tint-subtle',
+
+                        'sidebar-filled:bg-tint-subtle',
+                        'theme-muted:bg-tint-subtle',
+                        '[html.sidebar-filled.theme-bold.tint_&]:bg-tint-subtle',
+                        '[html.sidebar-filled.theme-muted_&]:bg-tint-base',
+                        '[html.sidebar-filled.theme-bold.tint_&]:bg-tint-base',
+                        '[html.sidebar-filled.theme-gradient_&]:border',
+                        'page-no-toc:!bg-transparent',
+
+                        'sidebar-filled:rounded-xl',
+                        'straight-corners:rounded-none'
                    )}
                >
-                    <PagesList
-                        rootPages={pages}
-                        pages={pages}
-                        context={context}
-                        style="page-no-toc:hidden border-tint-subtle sidebar-list-line:border-l"
-                    />
-                    {customization.trademark.enabled ? (
-                        <Trademark
-                            space={space}
-                            customization={customization}
-                            placement={SiteInsightsTrademarkPlacement.Sidebar}
+                    {innerHeader && <div className="px-5 *:my-4">{innerHeader}</div>}
+                    <TOCScrollContainer // The scrollview inside the sidebar
+                        className={tcls(
+                            'flex flex-grow flex-col p-2',
+                            customization.trademark.enabled && 'lg:pb-20',
+                            'lg:gutter-stable overflow-y-auto',
+                            '[&::-webkit-scrollbar]:bg-transparent',
+                            '[&::-webkit-scrollbar-thumb]:bg-transparent',
+                            'group-hover:[&::-webkit-scrollbar]:bg-tint-subtle',
+                            'group-hover:[&::-webkit-scrollbar-thumb]:bg-tint-7',
+                            'group-hover:[&::-webkit-scrollbar-thumb:hover]:bg-tint-8'
+                        )}
+                    >
+                        <PagesList
+                            rootPages={pages}
+                            pages={pages}
+                            context={context}
+                            style="page-no-toc:hidden border-tint-subtle sidebar-list-line:border-l"
                        />
-                    ) : null}
-                </TOCScrollContainer>
-            </div>
-        </aside>
+                        {customization.trademark.enabled ? (
+                            <Trademark
+                                space={space}
+                                customization={customization}
+                                placement={SiteInsightsTrademarkPlacement.Sidebar}
+                            />
+                        ) : null}
+                    </TOCScrollContainer>
+                </div>
+            </aside>
+            <TableOfContentsScript />
+        </>
    );
 }
@@ -0,0 +1,73 @@
+'use client';
+
+import { useEffect } from 'react';
+
+/**
+ * Adjusts TableOfContents height based on visible elements
+ */
+export function TableOfContentsScript() {
+    useEffect(() => {
+        const root = document.documentElement;
+
+        // Calculate and set TOC dimensions
+        const updateTocLayout = () => {
+            // Get key elements
+            const header = document.getElementById('site-header');
+            const banner = document.getElementById('announcement-banner');
+            const footer = document.getElementById('site-footer');
+
+            // Set sticky top position based on header
+            const headerHeight = header?.offsetHeight ?? 0;
+            root.style.setProperty('--toc-top-offset', `${headerHeight}px`);
+
+            // Start with full viewport height minus header
+            let height = window.innerHeight - headerHeight;
+
+            // Subtract visible banner (if any)
+            if (banner && window.getComputedStyle(banner).display !== 'none') {
+                const bannerRect = banner.getBoundingClientRect();
+                if (bannerRect.height > 0 && bannerRect.bottom > 0) {
+                    height -= Math.min(bannerRect.height, bannerRect.bottom);
+                }
+            }
+
+            // Subtract visible footer (if any)
+            if (footer) {
+                const footerRect = footer.getBoundingClientRect();
+                if (footerRect.top < window.innerHeight) {
+                    height -= Math.min(footerRect.height, window.innerHeight - footerRect.top);
+                }
+            }
+
+            // Update height
+            root.style.setProperty('--toc-height', `${height}px`);
+        };
+
+        // Initial update
+        updateTocLayout();
+
+        // Let the browser handle scroll throttling naturally
+        window.addEventListener('scroll', updateTocLayout, { passive: true });
+        window.addEventListener('resize', updateTocLayout, { passive: true });
+
+        // Use MutationObserver for DOM changes
+        const observer = new MutationObserver(() => {
+            requestAnimationFrame(updateTocLayout);
+        });
+
+        // Only observe what matters
+        observer.observe(document.documentElement, {
+            subtree: true,
+            attributes: true,
+            attributeFilter: ['style', 'class'],
+        });
+
+        return () => {
+            observer.disconnect();
+            window.removeEventListener('scroll', updateTocLayout);
+            window.removeEventListener('resize', updateTocLayout);
+        };
+    }, []);
+
+    return null;
+}
@@ -1 +1,4 @@
-export * from './TableOfContents';
+export { TableOfContents } from './TableOfContents';
+export { PagesList } from './PagesList';
+export { TOCScrollContainer } from './TOCScroller';
+export { Trademark } from './Trademark';
@@ -6,6 +6,7 @@ export const de = {
    switch_to_light_theme: 'Zum hellen Modus wechseln',
    switch_to_system_theme: 'Zum Systemmodus wechseln',
    search: 'Suche',
+    view: 'Anzeigen',
    search_or_ask: 'Fragen oder Suchen',
    search_input_placeholder: 'Inhalt durchsuchen',
    search_ask_input_placeholder: 'Inhalt durchsuchen oder eine Frage stellen',
@@ -6,6 +6,7 @@ export const en = {
    switch_to_light_theme: 'Switch to light theme',
    switch_to_system_theme: 'Switch to system theme',
    search: 'Search',
+    view: 'View',
    search_or_ask: 'Ask or search',
    search_input_placeholder: 'Search content',
    search_ask_input_placeholder: 'Search content or ask a question',
@@ -8,6 +8,7 @@ export const es: TranslationLanguage = {
    switch_to_light_theme: 'Cambiar a tema claro',
    switch_to_system_theme: 'Cambiar a tema del sistema',
    search: 'Buscar',
+    view: 'Ver',
    search_or_ask: 'Preguntar o Buscar',
    search_input_placeholder: 'Buscar contenido',
    search_ask_input_placeholder: 'Buscar contenido o hacer una pregunta',
@@ -8,6 +8,7 @@ export const fr: TranslationLanguage = {
    switch_to_light_theme: 'Passer au thème clair',
    switch_to_system_theme: 'Passer au thème système',
    search: 'Rechercher',
+    view: 'Voir',
    search_or_ask: 'Demander ou rechercher',
    search_input_placeholder: 'Rechercher le contenu',
    search_ask_input_placeholder: 'Rechercher du contenu ou poser une question',
@@ -8,6 +8,7 @@ export const ja: TranslationLanguage = {
    switch_to_light_theme: 'ライトテーマに切り替え',
    switch_to_system_theme: 'システムのテーマに切り替え',
    search: '検索',
+    view: '表示',
    search_or_ask: '質問または検索',
    search_input_placeholder: 'コンテンツを検索',
    search_ask_input_placeholder: 'コンテンツを検索するか質問をする',
@@ -8,6 +8,7 @@ export const nl: TranslationLanguage = {
    switch_to_light_theme: 'Schakel over naar lichte modus',
    switch_to_system_theme: 'Schakel over naar systeemmodus',
    search: 'Zoeken',
+    view: 'Bekijken',
    search_or_ask: 'Zoek of vraag',
    search_input_placeholder: 'Zoek inhoud',
    search_ask_input_placeholder: 'Zoek inhoud of stel een vraag',
@@ -17,7 +18,7 @@ export const nl: TranslationLanguage = {
    search_ask: 'Vraag "${1}"',
    search_ask_description: 'Vind het antwoord met AI',
    search_ask_sources: 'Bronnen',
-    search_ask_sources_no_answer: 'Gerelateerde pagina’s',
+    search_ask_sources_no_answer: "Gerelateerde pagina's",
    search_ask_no_answer:
        'Er kon geen antwoord op je vraag worden gevonden. Probeer je vraag anders te formuleren of wees specifieker.',
    search_ask_error: 'Er is iets misgegaan. Probeer het later opnieuw.',
@@ -54,9 +55,9 @@ export const nl: TranslationLanguage = {
    pdf_print: 'Print of opslaan als PDF',
    pdf_page_of: '${1} van ${2}',
    pdf_mode_only_page: 'Alleen deze pagina',
-    pdf_mode_all: 'Alle pagina’s',
+    pdf_mode_all: "Alle pagina's",
    pdf_limit_reached: "Kon de PDF niet genereren voor ${1} pagina's, generatie gestopt bij ${2}.",
-    pdf_limit_reached_continue: 'Verleng met ${1} extra pagina’s.',
+    pdf_limit_reached_continue: "Verleng met ${1} extra pagina's.",
    more: 'Meer',
    link_tooltip_external_link: 'Externe link naar',
    link_tooltip_page_anchor: 'Spring naar sectie',
@@ -8,6 +8,7 @@ export const no: TranslationLanguage = {
    switch_to_light_theme: 'Bytt til lyst tema',
    switch_to_system_theme: 'Bytt til systemtema',
    search: 'Søk',
+    view: 'Vis',
    search_or_ask: 'Spør eller søk',
    search_input_placeholder: 'Søk i innhold',
    search_ask_input_placeholder: 'Søk i innhold eller still et spørsmål',
@@ -6,6 +6,7 @@ export const pt_br = {
    switch_to_light_theme: 'Mudar para modo claro',
    switch_to_system_theme: 'Mudar para configuração do sistema',
    search: 'Busca',
+    view: 'Ver',
    search_or_ask: 'Perguntar ou buscar',
    search_input_placeholder: 'Buscar conteúdo',
    search_ask_input_placeholder: 'Buscar conteúdo ou fazer uma pergunta',
@@ -8,6 +8,7 @@ export const zh: TranslationLanguage = {
    switch_to_light_theme: '切换到浅色主题',
    switch_to_system_theme: '切换到系统主题',
    search: '搜索',
+    view: '查看',
    search_or_ask: '询问或搜索',
    search_input_placeholder: '搜索内容',
    search_ask_input_placeholder: '搜索内容或提问',
@@ -765,7 +765,12 @@ export const getComputedDocument = cache({
 * Mimic the validation done on source server-side to reduce API usage.
 */
 function validateSiteRedirectSource(source: string) {
-    return source.length <= 512 && /^\/[a-zA-Z0-9-_.\\/]+[a-zA-Z0-9-_.]$/.test(source);
+    return (
+        source.length <= 512 &&
+        /^\/(?:[A-Za-z0-9\-._~]|%[0-9A-Fa-f]{2})+(?:\/(?:[A-Za-z0-9\-._~]|%[0-9A-Fa-f]{2})+)*$/.test(
+            source
+        )
+    );
 }

 /**
@@ -1,5 +1,4 @@
 import { parseOpenAPI } from '@gitbook/openapi-parser';
-import { unstable_cache } from 'next/cache';

 import { type CacheFunctionOptions, cache, noCacheFetchOptions } from '@/lib/cache';
 import type {
@@ -10,7 +9,6 @@ import type {
 } from '@/lib/openapi/types';
 import { getCloudflareRequestGlobal } from '@v2/lib/data/cloudflare';
 import { withCacheKey, withoutConcurrentExecution } from '@v2/lib/data/memoize';
-import { GITBOOK_RUNTIME } from '@v2/lib/env';
 import { assert } from 'ts-essentials';
 import { resolveContentRef } from '../references';
 import { isV2 } from '../v2';
@@ -71,18 +69,8 @@ const fetchFilesystemV1 = cache({
 });

 const fetchFilesystemV2 = withCacheKey(
-    withoutConcurrentExecution(getCloudflareRequestGlobal, async (cacheKey, url: string) => {
-        if (GITBOOK_RUNTIME !== 'cloudflare') {
-            return fetchFilesystemUseCache(url);
-        }
-
-        // FIXME: OpenNext doesn't support 'use cache' yet
-        const uncached = unstable_cache(async () => fetchFilesystemUncached(url), [cacheKey], {
-            revalidate: 60 * 60 * 24,
-        });
-
-        const response = await uncached();
-        return response;
+    withoutConcurrentExecution(getCloudflareRequestGlobal, async (_cacheKey, url: string) => {
+        return fetchFilesystemUseCache(url);
    })
 );

@@ -0,0 +1,16 @@
+import { describe, expect, it } from 'bun:test';
+import { getExtension } from './paths';
+
+describe('getExtension', () => {
+    it('should return the extension of a path', () => {
+        expect(getExtension('test.txt')).toBe('.txt');
+    });
+
+    it('should return an empty string if there is no extension', () => {
+        expect(getExtension('test/path/to/file')).toBe('');
+    });
+
+    it('should return the extension of a path with multiple dots', () => {
+        expect(getExtension('test.with.multiple.dots.txt')).toBe('.txt');
+    });
+});
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zeno Kapitein	d678a9162d	Fix typing & translations	2025-05-23 16:54:28 +02:00
Zeno Kapitein	af7cadc8e9	Added back and forth chat	2025-05-21 18:08:02 +02:00
Zeno Kapitein	e2b2468475	More layout tweaks	2025-05-21 15:13:22 +02:00
Zeno Kapitein	11f4241709	Update layout and transitions	2025-05-21 14:02:48 +02:00
Zeno Kapitein	5a410feda0	Add chat component (non-functional)	2025-05-21 14:02:48 +02:00
Zeno Kapitein	31bfe77f74	Create Chat component	2025-05-21 14:02:48 +02:00
Zeno Kapitein	34dceb2f97	Toggleable layout	2025-05-21 14:02:48 +02:00
Zeno Kapitein	cced4f0d78	Initial styling	2025-05-21 14:02:48 +02:00
conico974	ba0094a862	fix ISR in preview in cloudflare (#3250 ) Co-authored-by: Nicolas Dorseuil <nicolas@gitbook.io>	2025-05-21 09:52:05 +02:00
conico974	b259009c9c	Add temporary logging for Cloudflare debugging (#3249 ) Co-authored-by: Nicolas Dorseuil <nicolas@gitbook.io>	2025-05-20 19:33:33 +02:00
conico974	d88dd5ed8a	Update OpenNext (#3248 ) Co-authored-by: Nicolas Dorseuil <nicolas@gitbook.io>	2025-05-20 19:04:07 +02:00
Zeno Kapitein	57bb146075	Dynamic TOC height (#3233 )	2025-05-20 14:13:57 +02:00
Zeno Kapitein	4b67fe5317	V2: Add `urlObject.hash` to `linker.toLinkForContent` (#3246 )	2025-05-20 10:25:35 +02:00
Samy Pessé	938125e772	Version Packages (#3180 ) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2025-05-19 19:10:57 +02:00
conico974	1c8d9febb3	Custom Incremental Cache (#3239 ) Co-authored-by: Nicolas Dorseuil <nicolas@gitbook.io>	2025-05-19 17:00:09 +02:00
conico974	223edae17d	Add env variables for the DOQueue (#3243 ) Co-authored-by: Nicolas Dorseuil <nicolas@gitbook.io>	2025-05-19 13:47:33 +02:00
Nolann B.	12a455dab5	Fix OpenAPI layout issues (#3242 )	2025-05-18 14:50:05 +02:00
Nolann B.	d00dc8ca72	Pass spec validation errors through OpenAPIParseError (#3240 )	2025-05-18 13:20:17 +02:00
Samy Pessé	2c85a302fc	Update opennext and leverage "use cache" on CF (#3204 ) Co-authored-by: Nicolas Dorseuil <nicolas@gitbook.io>	2025-05-16 13:58:35 +01:00
Addison	3460b78b45	Update docs.gitbook.com to gitbook.com/docs (#3187 ) Co-authored-by: Tal Gluck <talagluck@gmail.com> Co-authored-by: Taran Vohra <taranvohra@outlook.com>	2025-05-16 17:59:53 +05:30
Zeno Kapitein	95a1f652f9	Better print layouts: wrap code blocks & force table column auto-sizing (#3236 )	2025-05-15 13:24:10 +02:00
spastorelli	cc37e2ae15	Persist visitor params values in public visitor session cookie (#3231 )	2025-05-14 14:16:13 +02:00
Claire Chabas	08382ce62f	Improve tabs link support (#3211 )	2025-05-14 11:10:09 +02:00
Nolann B.	80cb52a237	Handle OpenAPI alternatives from schema.items (#3235 )	2025-05-14 08:05:08 +02:00
Nolann B.	c6637b09e2	Use default value if string/number/boolean in generateSchemaExample (#3234 )	2025-05-13 22:07:41 +02:00
Samy Pessé	778624af00	Only resize images with supported extensions (#3229 )	2025-05-13 10:52:58 +02:00
Samy Pessé	e15757d01f	Use next@15.3.2 instead of canary (#3227 )	2025-05-09 15:17:49 +02:00
Zeno Kapitein	aed79fd6c3	Remove header logo rounding (#3225 )	2025-05-09 14:45:38 +02:00
Greg Bergé	0c973a3292	Always link main logo to the root of the site (#3226 )	2025-05-09 10:31:52 +00:00
spastorelli	56c923c0ed	Adapt site resolution/lookup to pass visitor unsigned claims in addition to token (#3202 ) Co-authored-by: taranvohra <taranvohra@outlook.com>	2025-05-09 15:34:20 +05:30
Samy Pessé	7d7806df30	Passthrough SVG images in image resizing (#3224 )	2025-05-08 18:57:50 +02:00
Nolann B.	cb5598dc19	Handle invalid OpenAPI Responses (#3223 )	2025-05-08 11:54:46 +02:00
Greg Bergé	47f01edcb8	Fix E2E icons (#3222 )	2025-05-08 13:04:04 +05:30
Greg Bergé	e6ddc0f07f	Fix sitemap URLs (#3220 )	2025-05-08 08:54:28 +02:00
Zeno Kapitein	373f18f451	Prevent section group popovers from opening on click (#3213 )	2025-05-07 13:57:58 +00:00
Taran Vohra	3f292065cd	Update site redirect regex for validation (#3216 )	2025-05-07 12:42:28 +05:30