Merge branch 'main' into sg-next-feb-2025

Author: MaedahBatool

contentlayer.config.ts

@@ -1,5 +1,3 @@
-/* eslint-disable */
-
 import { defineDocumentType, makeSource } from 'contentlayer/source-files';
 import fs from 'fs';
 import rehypeAutolinkHeadings from 'rehype-autolink-headings';

docs/cody/capabilities/supported-models.mdx

@@ -43,4 +43,6 @@ Cody uses a set of models for autocomplete which are suited for the low latency
 
 <Callout type="note">The default autocomplete model for Cody Free, Pro and Enterprise users is DeepSeek-Coder-V2.</Callout>
 
+<Callout type="note">The DeepSeek model used by Sourcegraph is hosted by Fireworks.ai, and is hosted as a single-tenant service in a US-based data center. For more information see our [Cody FAQ](https://sourcegraph.com/docs/cody/faq#is-any-of-my-data-sent-to-deepseek).</Callout>
+
 Read here for [Ollama setup instructions](https://sourcegraph.com/docs/cody/clients/install-vscode#supported-local-ollama-models-with-cody). For information on context token limits, see our [documentation here](/cody/core-concepts/token-limits).

docs/cody/faq.mdx

@@ -100,6 +100,14 @@ Cody does not support embeddings on Cody PLG and Cody Enterprise because we have
 
 Leveraging Sourcegraph Search allowed us to deliver these enhancements.
 
+## LLM Data Sharing and Retention
+
+### Is any of my data sent to DeepSeek?
+
+Our autocomplete features uses the open source DeepSeek-Coder-V2 model, which is hosted by Fireworks.ai in a secure single-tenant environment located in the USA. No customer chat or autocomplete data - such as chat messages, or context such as code snippets or configuration - is stored by Fireworks.ai.
+
+Sourcegraph does not use models hosted by DeepSeek (the company), and does not send any data to the same.
+
 ## Third party dependencies
 
 ### What is the default `sourcegraph` provider for completions?

docs/technical-changelog.mdx

@@ -2242,6 +2242,25 @@ The following PRs were merged onto the previous release branch but could not be
 {/* RSS={"version":"v5.10.0", "releasedAt": "2024-11-27"} */}
 
 
+# 5.9 Patch 4
+
+## v5.9.17785
+
+- [sourcegraph](https://github.com/sourcegraph/sourcegraph/releases/tag/v5.9.17785)
+
+- [docker-compose](https://github.com/sourcegraph/deploy-sourcegraph-docker/releases/tag/v5.9.17785)
+
+- [helm](https://github.com/sourcegraph/deploy-sourcegraph-helm/releases/tag/v5.9.17785)
+
+- [kustomize](https://github.com/sourcegraph/deploy-sourcegraph-k8s/releases/tag/v5.9.17785)
+
+### Fix
+
+#### Cody
+
+- Allow specification of additional chat GPT models for Cody `(PR #3434)`
+Backport 5190f43a4d09810e69400c5d0e6d9176b3c4b815 from #3380
+
 # 5.9 Patch 3
 
 ## v5.9.1590

package.json

@@ -21,7 +21,7 @@
     "@heroicons/react": "^2.0.18",
     "@langbase/components": "^0.1.5",
     "@mdx-js/mdx": "^3.0.1",
-    "@next/third-parties": "^15.1.3",
+    "@next/third-parties": "^14.1.4",
     "@radix-ui/react-hover-card": "^1.1.1",
     "@radix-ui/react-select": "^2.0.0",
     "@radix-ui/react-slot": "^1.0.2",
@@ -45,12 +45,12 @@
     "langbase": "^1.1.26",
     "lucide-react": "^0.372.0",
     "mdx": "^0.3.1",
-    "next": "^15.1.6",
+    "next": "^14.2.3",
     "next-contentlayer": "^0.3.4",
     "next-themes": "^0.2.1",
     "prism-react-renderer": "^2.0.6",
-    "react": "19.0.0",
-    "react-dom": "19.0.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "react-highlight-words": "^0.20.0",
     "react-syntax-highlighter": "^15.5.0",
     "rehype-autolink-headings": "^7.1.0",
@@ -63,7 +63,7 @@
     "tailwind-merge": "^2.3.0",
     "tailwindcss": "^3.3.3",
     "tailwindcss-animate": "^1.0.7",
-    "typescript": "5.7.2",
+    "typescript": "5.1.6",
     "unist-util-visit": "^5.0.0"
   },
   "devDependencies": {