Fix conflicts

katmayb · katmayb · commit 15b2d56915de · 2025-11-05T09:54:44.000-05:00
diff --git a/src/docs.json b/src/docs.json
@@ -869,7 +869,7 @@
                       {
                         "group": "Releases & changelogs",
                         "pages": [
-                          "langsmith/langgraph-server-changelog",
+                          "langsmith/agent-server-changelog",
                           "langsmith/release-versions"
                         ]
                       },
@@ -1191,7 +1191,7 @@
                           "group": "Deployment components",
                           "pages": [
                             "langsmith/components",
-                            "langsmith/langgraph-server",
+                            "langsmith/agent-server",
                             "langsmith/data-plane",
                             "langsmith/control-plane"
                           ]
diff --git a/src/langsmith/cli.mdx b/src/langsmith/cli.mdx
@@ -71,7 +71,7 @@ To build and run a valid application, the LangGraph CLI requires a JSON configur
         | <span style={{ whiteSpace: "nowrap" }}>`dockerfile_lines`</span> | Array of additional lines to add to Dockerfile following the import from parent image.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
         | <span style={{ whiteSpace: "nowrap" }}>`checkpointer`</span>   | Configuration for the checkpointer. Supports: <ul><li>`ttl` (optional): Object with `strategy`, `sweep_interval_minutes`, `default_ttl` controlling checkpoint expiry.</li><li>`serde` (optional, 0.5+): Object with `allowed_json_modules` and `pickle_fallback` to tune deserialization behavior.</li></ul> |
         | <span style={{ whiteSpace: "nowrap" }}>`http`</span>            | HTTP server configuration with the following fields: <ul><li>`app`: Path to custom Starlette/FastAPI app (e.g., `"./src/agent/webapp.py:app"`). See [custom routes guide](/langsmith/custom-routes).</li><li>`cors`: CORS configuration with fields such as `allow_origins`, `allow_methods`, `allow_headers`, `allow_credentials`, `allow_origin_regex`, `expose_headers`, and `max_age`.</li><li>`configurable_headers`: Define which request headers to expose as configurable values via `includes` / `excludes` patterns.</li><li>`logging_headers`: Mirror of `configurable_headers` for excluding sensitive headers from logs.</li><li>`middleware_order`: Choose how custom middleware and auth interact. `auth_first` runs authentication hooks before custom middleware, while `middleware_first` (default) runs your middleware first.</li><li>`enable_custom_route_auth`: Apply auth checks to routes added through `app`.</li><li>`disable_assistants`, `disable_mcp`, `disable_meta`, `disable_runs`, `disable_store`, `disable_threads`, `disable_ui`, `disable_webhooks`: Disable built-in routes or hooks.</li><li>`mount_prefix`: Prefix for mounted routes (e.g., "/my-deployment/api").</li></ul> |
-        | <span style={{ whiteSpace: "nowrap" }}>`api_version`</span>     | _(Added in v0.3.7)_ Which semantic version of the LangGraph API server to use (e.g., `"0.3"`). Defaults to latest. Check the server [changelog](/langsmith/langgraph-server-changelog) for details on each release. |
+        | <span style={{ whiteSpace: "nowrap" }}>`api_version`</span>     | _(Added in v0.3.7)_ Which semantic version of the LangGraph API server to use (e.g., `"0.3"`). Defaults to latest. Check the server [changelog](/langsmith/agent-server-changelog) for details on each release. |
     </Tab>
     <Tab title="JS">
     | Key                                                          | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
@@ -83,7 +83,7 @@ To build and run a valid application, the LangGraph CLI requires a JSON configur
         | <span style={{ whiteSpace: "nowrap" }}>`dockerfile_lines`</span> | Array of additional lines to add to Dockerfile following the import from parent image.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
         | <span style={{ whiteSpace: "nowrap" }}>`checkpointer`</span>   | Configuration for the checkpointer. Supports: <ul><li>`ttl` (optional): Object with `strategy`, `sweep_interval_minutes`, `default_ttl` controlling checkpoint expiry.</li><li>`serde` (optional, 0.5+): Object with `allowed_json_modules` and `pickle_fallback` to tune deserialization behavior.</li></ul> |
         | <span style={{ whiteSpace: "nowrap" }}>`http`</span>            | HTTP server configuration mirroring the Python options: <ul><li>`cors` with `allow_origins`, `allow_methods`, `allow_headers`, `allow_credentials`, `allow_origin_regex`, `expose_headers`, `max_age`.</li><li>`configurable_headers` and `logging_headers` pattern lists.</li><li>`middleware_order` (`auth_first` or `middleware_first`).</li><li>`enable_custom_route_auth` plus the same boolean route toggles as above.</li></ul> |
-        | <span style={{ whiteSpace: "nowrap" }}>`api_version`</span>     | _(Added in v0.3.7)_ Which semantic version of the LangGraph API server to use (e.g., `"0.3"`). Defaults to latest. Check the server [changelog](/langsmith/langgraph-server-changelog) for details on each release. |
+        | <span style={{ whiteSpace: "nowrap" }}>`api_version`</span>     | _(Added in v0.3.7)_ Which semantic version of the LangGraph API server to use (e.g., `"0.3"`). Defaults to latest. Check the server [changelog](/langsmith/agent-server-changelog) for details on each release. |
     </Tab>
 </Tabs>
 
@@ -250,7 +250,7 @@ To build and run a valid application, the LangGraph CLI requires a JSON configur
     You can configure the time-to-live (TTL) for checkpoints using the `checkpointer` key. This determines how long checkpoint data is retained before being automatically handled according to the specified strategy (e.g., deletion). Two optional sub-objects are supported:
 
     * `ttl`: Includes `strategy`, `sweep_interval_minutes`, and `default_ttl`, which collectively set how checkpoints expire.
-    * `serde` _(LangGraph server 0.5+)_ : Lets you control deserialization behavior for checkpoint payloads.
+    * `serde` _(Agent server 0.5+)_ : Lets you control deserialization behavior for checkpoint payloads.
 
     Here's an example setting a default TTL of 30 days (43200 minutes):
 
diff --git a/src/oss/langchain/deploy.mdx b/src/oss/langchain/deploy.mdx
@@ -15,6 +15,6 @@ Before you begin, ensure you have the following:
 
 ### 1. Create a repository on GitHub
 
-Your application's code must reside in a GitHub repository to be deployed on LangSmith. Both public and private repositories are supported. For this quickstart, first make sure your app is LangGraph-compatible by following the [local server setup guide](/oss/langchain/studio#setup-local-langgraph-server). Then, push your code to the repository.
+Your application's code must reside in a GitHub repository to be deployed on LangSmith. Both public and private repositories are supported. For this quickstart, first make sure your app is LangGraph-compatible by following the [local server setup guide](/oss/langchain/studio#setup-local-agent-server). Then, push your code to the repository.
 
 <deploy />
diff --git a/src/oss/langchain/studio.mdx b/src/oss/langchain/studio.mdx
@@ -7,5 +7,5 @@ import Studio from '/snippets/oss/studio.mdx';
 <Studio/>
 
 <Tip>
-For more information about local and deployed agents, see [Set up local Agent Server](/oss/langchain/studio#setup-local-langgraph-server) and [Deploy](/oss/langchain/deploy).
+For more information about local and deployed agents, see [Set up local Agent Server](/oss/langchain/studio#setup-local-agent-server) and [Deploy](/oss/langchain/deploy).
 </Tip>
diff --git a/src/oss/langchain/ui.mdx b/src/oss/langchain/ui.mdx
@@ -15,7 +15,7 @@ import chat_uiJS from '/snippets/oss/ui-js.mdx';
 
 ### Connect to your agent
 
-Agent Chat UI can connect to both [local](/oss/langchain/studio#setup-local-langgraph-server) and [deployed agents](/oss/langchain/deploy).
+Agent Chat UI can connect to both [local](/oss/langchain/studio#setup-local-agent-server) and [deployed agents](/oss/langchain/deploy).
 
 After starting Agent Chat UI, you'll need to configure it to connect to your agent:
 
diff --git a/src/oss/langgraph/deploy.mdx b/src/oss/langgraph/deploy.mdx
@@ -17,6 +17,6 @@ Before you begin, ensure you have the following:
 
 ### 1. Create a repository on GitHub
 
-Your application's code must reside in a GitHub repository to be deployed on LangSmith. Both public and private repositories are supported. For this quickstart, first make sure your app is LangGraph-compatible by following the [local server setup guide](/oss/langgraph/studio#setup-local-langgraph-server). Then, push your code to the repository.
+Your application's code must reside in a GitHub repository to be deployed on LangSmith. Both public and private repositories are supported. For this quickstart, first make sure your app is LangGraph-compatible by following the [local server setup guide](/oss/langgraph/studio#setup-local-agent-server). Then, push your code to the repository.
 
 <deploy />
diff --git a/src/oss/langgraph/ui.mdx b/src/oss/langgraph/ui.mdx
@@ -14,7 +14,7 @@ import chat_uiJS from '/snippets/oss/ui-js.mdx';
 
 ### Connect to your agent
 
-Agent Chat UI can connect to both [local](/oss/langgraph/studio#setup-local-langgraph-server) and [deployed agents](/oss/langgraph/deploy).
+Agent Chat UI can connect to both [local](/oss/langgraph/studio#setup-local-agent-server) and [deployed agents](/oss/langgraph/deploy).
 
 After starting Agent Chat UI, you'll need to configure it to connect to your agent:
 

Original file line number	Diff line number	Diff line change
`@@ -869,7 +869,7 @@`
`869`	`869`	`{`
`870`	`870`	`"group": "Releases & changelogs",`
`871`	`871`	`"pages": [`
`872`		`- "langsmith/langgraph-server-changelog",`
	`872`	`+ "langsmith/agent-server-changelog",`
`873`	`873`	`"langsmith/release-versions"`
`874`	`874`	`]`
`875`	`875`	`},`
`@@ -1191,7 +1191,7 @@`
`1191`	`1191`	`"group": "Deployment components",`
`1192`	`1192`	`"pages": [`
`1193`	`1193`	`"langsmith/components",`
`1194`		`- "langsmith/langgraph-server",`
	`1194`	`+ "langsmith/agent-server",`
`1195`	`1195`	`"langsmith/data-plane",`
`1196`	`1196`	`"langsmith/control-plane"`
`1197`	`1197`	`]`