deepagents-code 0.1.70__tar.gz → 0.1.71__tar.gz

{deepagents_code-0.1.70 → deepagents_code-0.1.71}/AGENTS.md

@@ -76,7 +76,7 @@ Apply these rules to new UI; do not treat them as a mandate to refactor existing
 ### Testing Textual apps
 
 - Use `textual.pilot` for async UI testing - see [Testing guide](https://textual.textualize.io/guide/testing/)
-- Snapshot testing available for visual regression - see repo `notes/snapshot_testing.md`
+- Snapshot testing available for visual regression
 - For modal flows, test the real interaction path with keypresses when possible. Unit tests that call action methods or resume handlers directly can miss focus and modal-stack bugs.
 - A modal test that pushes the screen onto a bare `App` host cannot catch app-level key interception. The app owns a priority `shift+tab -> toggle_auto_approve` binding (`app.py`) that wins dispatch over any screen binding; `action_toggle_auto_approve` routes the key to the active screen. Cursor-style modals (highlighted rows, no focusable children) just implement `action_move_up` — the router's `_SupportsReverseNav` protocol branch picks them up automatically. The protocol matches on method *presence*, so enrollment is opt-out, not opt-in: a screen that defines `action_move_up` for its own arrow keys gets `shift+tab` reverse-nav whether or not it was written with that key in mind. Screens needing different behavior (`focus_previous`, tab bars) — or none — need an explicit branch *above* the protocol check in `action_toggle_auto_approve`. Add an app-level regression test in `test_app.py` when a screen needs behavior other than swallowing the key.
 - Do not open another modal or refocus the base chat input directly inside a modal dismiss callback. Preserve the non-blocking `push_screen(..., callback)` flow and schedule follow-up UI work with `call_after_refresh` so the dismissing modal fully unwinds first.

{deepagents_code-0.1.70 → deepagents_code-0.1.71}/ARCHITECTURE.md

@@ -85,6 +85,4 @@ The main cost is the client/server boundary. When debugging, first decide which
 - For cost estimates and local pricing overrides (`prices.json`), see
   [`PRICING.md`](./PRICING.md).
 - For security boundaries, see [`THREAT_MODEL.md`](./THREAT_MODEL.md).
-- For how a transient model failure is retried after output has already streamed,
-  see [`STREAMING_RETRY_DESIGN.md`](./STREAMING_RETRY_DESIGN.md).
 - For package-specific coding conventions, see [`AGENTS.md`](./AGENTS.md).

{deepagents_code-0.1.70 → deepagents_code-0.1.71}/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 # Deep Agents Code Changelog
 
+## [0.1.71](https://github.com/langchain-ai/deepagents/compare/deepagents-code==0.1.70...deepagents-code==0.1.71) (2026-09-18)
+
+### Features
+
+- Moved MCP support onto FastMCP and `langchain.mcp`. ([#5922](https://github.com/langchain-ai/deepagents/pull/5922))
+- Condensed the current working directory in the status bar from the middle, preserving the end of the path. ([#6252](https://github.com/langchain-ai/deepagents/pull/6252))
+
+### Bug Fixes
+
+- Replaced the composer with prompt search and prevented query feedback. ([#6346](https://github.com/langchain-ai/deepagents/pull/6346))
+- Kept absolute paths intact in normal input mode. ([#6379](https://github.com/langchain-ai/deepagents/pull/6379))
+- Pinned resumed history to the newest message. ([#6225](https://github.com/langchain-ai/deepagents/pull/6225))
+- Improved handling of overflowing pasted content in the chat input so it scrolls correctly. ([#6382](https://github.com/langchain-ai/deepagents/pull/6382))
+- Wrapped debug logs before the scrollbar. ([#6219](https://github.com/langchain-ai/deepagents/pull/6219))
+
 ## [0.1.70](https://github.com/langchain-ai/deepagents/compare/deepagents-code==0.1.69...deepagents-code==0.1.70) (2026-09-16)
 
 ### Bug Fixes

{deepagents_code-0.1.70 → deepagents_code-0.1.71}/DEVELOPMENT.md

@@ -143,7 +143,7 @@ To send logs elsewhere, also `export DEEPAGENTS_CODE_DEBUG_DIRECTORY=<path>`. Ea
 
 The directory is created or tightened to owner-only access, and each file is created or tightened to user-only access. Symlinks are refused. If either cannot be secured, no file handler is attached and a warning goes to stderr. Use the in-app Debug Console in that case.
 
-Stdio MCP server stderr is captured here at `DEBUG`. This keeps server-side failures visible when the TUI cannot show process stderr. Each record is one line, capped at 4096 characters. Characters in the Unicode `C` categories are removed, which includes control and format characters. The ESC byte of an ANSI sequence is removed but the rest stays as literal text, so the log is not free of escape-sequence residue. The text comes from the server. It can contain credentials or other sensitive values. Enable `DEBUG` logging only if you accept that risk, and do not share the log file.
+Raw stdio MCP server stderr is discarded to protect the TUI and prevent unbounded disk growth, including in debug mode. Structured MCP log notifications still reach the application logger with the server name and severity.
 
 ### In-app Debug Console (`Ctrl+\`)
 

{deepagents_code-0.1.70 → deepagents_code-0.1.71}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: deepagents-code
-Version: 0.1.70
+Version: 0.1.71
 Summary: Terminal coding agent built on the Deep Agents SDK - works with any model, with persistent memory, customizable skills, subagents, and approval controls.
 Project-URL: Homepage, https://www.langchain.com/dcode
 Project-URL: Documentation, https://docs.langchain.com/oss/deepagents/code/overview
@@ -31,12 +31,12 @@ Requires-Dist: aiosqlite<1.0.0,>=0.22.1
 Requires-Dist: anyio<5.0.0,>=4.14.2
 Requires-Dist: deepagents-acp<1.0.0,>=0.0.10
 Requires-Dist: deepagents==0.7.15
+Requires-Dist: fastmcp<5.0.0,>=4.0.0b4
 Requires-Dist: filelock<3.30,>=3.29.7
 Requires-Dist: genai-prices<0.2.0,>=0.1.7
 Requires-Dist: httpx<1.0.0,>=0.28.1
 Requires-Dist: langchain-anthropic<2.0.0,>=1.7.2
 Requires-Dist: langchain-google-genai<5.0.0,>=4.4.0
-Requires-Dist: langchain-mcp-adapters<1.0.0,>=0.3.2
 Requires-Dist: langchain-openai<2.0.0,>=1.6.2
 Requires-Dist: langchain-quickjs<0.4.0,>=0.3.4
 Requires-Dist: langchain<2.0.0,>=1.4.1
@@ -46,7 +46,7 @@ Requires-Dist: langgraph-runtime-inmem<1.0.0,>=0.34.1
 Requires-Dist: langgraph-sdk<1.0.0,>=0.4.4
 Requires-Dist: langsmith[sandbox]>=0.12.6
 Requires-Dist: markdownify<2.0.0,>=1.2.3
-Requires-Dist: mcp<2.0.0,>=1.28.1
+Requires-Dist: mcp<3.0.0,>=2.0.0
 Requires-Dist: packaging>=26.2
 Requires-Dist: pillow<13.0.0,>=12.3.0
 Requires-Dist: prompt-toolkit<4.0.0,>=3.0.53
@@ -77,7 +77,7 @@ Requires-Dist: langchain-google-vertexai<4.0.0,>=3.2.4; extra == 'all-providers'
 Requires-Dist: langchain-groq<2.0.0,>=1.1.3; extra == 'all-providers'
 Requires-Dist: langchain-huggingface<2.0.0,>=1.2.2; extra == 'all-providers'
 Requires-Dist: langchain-ibm<2.0.0,>=1.1.0; extra == 'all-providers'
-Requires-Dist: langchain-litellm<2.0.0,>=0.7.1; extra == 'all-providers'
+Requires-Dist: langchain-litellm<2.0.0,>=0.7.2; extra == 'all-providers'
 Requires-Dist: langchain-meta<2.0.0,>=0.5.0; extra == 'all-providers'
 Requires-Dist: langchain-mistralai<2.0.0,>=1.1.6; extra == 'all-providers'
 Requires-Dist: langchain-nvidia-ai-endpoints<2.0.0,>=1.4.3; extra == 'all-providers'
@@ -116,7 +116,7 @@ Requires-Dist: langchain-huggingface<2.0.0,>=1.2.2; extra == 'huggingface'
 Provides-Extra: ibm
 Requires-Dist: langchain-ibm<2.0.0,>=1.1.0; extra == 'ibm'
 Provides-Extra: litellm
-Requires-Dist: langchain-litellm<2.0.0,>=0.7.1; extra == 'litellm'
+Requires-Dist: langchain-litellm<2.0.0,>=0.7.2; extra == 'litellm'
 Provides-Extra: media
 Requires-Dist: av<19.0.0,>=18.0.0; extra == 'media'
 Requires-Dist: pillow<13.0.0,>=12.3.0; extra == 'media'

{deepagents_code-0.1.70 → deepagents_code-0.1.71}/deepagents_code/_build_info.py

@@ -1,3 +1,3 @@
 """Generated at build time. Do not edit or commit."""
 
-BUILD_COMMIT = "229ffef"
+BUILD_COMMIT = "d1674e6"

{deepagents_code-0.1.70 → deepagents_code-0.1.71}/deepagents_code/_version.py

@@ -2,7 +2,7 @@
 
 # Keep the `x-release-please-version` annotation — release-please uses it to
 # bump `__version__` in sync with `pyproject.toml` on every release PR.
-__version__ = "0.1.70"  # x-release-please-version
+__version__ = "0.1.71"  # x-release-please-version
 
 DOCS_URL = "https://docs.langchain.com/oss/python/deepagents/code"
 """URL for `deepagents-code` documentation."""

{deepagents_code-0.1.70 → deepagents_code-0.1.71}/deepagents_code/app.py

@@ -2963,6 +2963,7 @@ class _ChatScroll(VerticalScroll):
         """
         super().__init__(*args, **kwargs)
         self._follow_bottom_when_scrollable = False
+        self._bottom_follow_generation = 0
 
     def anchor(self, anchor: bool = True) -> None:
         """Anchor only once the transcript is tall enough to scroll.
@@ -2979,6 +2980,8 @@ class _ChatScroll(VerticalScroll):
                 delegate to the base class.
         """
         self._follow_bottom_when_scrollable = anchor
+        if anchor:
+            self._bottom_follow_generation += 1
         if not anchor:
             super().anchor(False)
             return
@@ -4343,6 +4346,9 @@ class DeepAgentsApp(App):
         self._history_prefetch_active = False
         """Whether resumed history is warming toward the soft window size."""
 
+        self._history_prefetch_anchor_generation: int | None = None
+        """Bottom-follow generation owned by resumed-history prefetch."""
+
         self._transcript_prune_timer: Timer | None = None
         """Idle timer that defers opposite-edge pruning while scrolling."""
 
@@ -9453,7 +9459,7 @@ class DeepAgentsApp(App):
             self._hydration_scheduled = False
 
         if hydrated_count == 0 and direction == "above":
-            self._history_prefetch_active = False
+            self._stop_history_prefetch()
         if hydrated_count or self._hydration_requests:
             self.call_after_refresh(lambda: self._continue_hydration(direction))
 
@@ -9473,7 +9479,7 @@ class DeepAgentsApp(App):
             ):
                 self._request_hydration("above")
                 return
-            self._history_prefetch_active = False
+            self._stop_history_prefetch()
             return
 
         if direction == "above":
@@ -9487,8 +9493,26 @@ class DeepAgentsApp(App):
             self._message_store.has_messages_above
             and self._message_store.visible_count < self._message_store.WINDOW_SIZE
         )
-        if self._history_prefetch_active:
-            self._request_hydration("above")
+        if not self._history_prefetch_active:
+            return
+        self._history_prefetch_anchor_generation = None
+        with suppress(NoMatches):
+            chat = self.query_one("#chat", _ChatScroll)
+            chat.anchor()
+            self._history_prefetch_anchor_generation = chat._bottom_follow_generation
+        self._request_hydration("above")
+
+    def _stop_history_prefetch(self) -> None:
+        """End resumed-history warming and its temporary bottom anchor."""
+        if not self._history_prefetch_active:
+            return
+        self._history_prefetch_active = False
+        generation = self._history_prefetch_anchor_generation
+        self._history_prefetch_anchor_generation = None
+        with suppress(NoMatches):
+            chat = self.query_one("#chat", _ChatScroll)
+            if generation == chat._bottom_follow_generation:
+                chat.anchor(False)
 
     def _check_hydration_needed(self) -> None:
         """Prefetch older messages near the mounted-window boundary."""
@@ -20859,6 +20883,9 @@ class DeepAgentsApp(App):
         self._pending_shell_messages.clear()
         self._hydration_requests.clear()
         self._history_prefetch_active = False
+        self._history_prefetch_anchor_generation = None
+        with suppress(NoMatches):
+            self.query_one("#chat", _ChatScroll).anchor(False)
         if self._transcript_prune_timer is not None:
             self._transcript_prune_timer.stop()
             self._transcript_prune_timer = None
@@ -25188,7 +25215,7 @@ class DeepAgentsApp(App):
             started_at = self._first_invocation_at
             if started_at is None:
                 return "not started"
-            return format_duration(max(0.0, time.monotonic() - started_at))
+            return format_duration(int(max(0.0, time.monotonic() - started_at)))
 
         def _model_field() -> SnapshotField:
             # Built directly (not via `_safe`) so the copyable metadata tracks

{deepagents_code-0.1.70 → deepagents_code-0.1.71}/deepagents_code/config.py

@@ -4817,7 +4817,7 @@ def configure_langsmith_secret_redaction() -> bool:
         _fail_closed_disable_tracing()
         return False
 
-    logger.info("LangSmith secret redaction enabled for agent traces.")
+    logger.debug("LangSmith secret redaction enabled for agent traces.")
     return True
 
 

{deepagents_code-0.1.70 → deepagents_code-0.1.71}/deepagents_code/mcp_auth.py

@@ -25,11 +25,12 @@ import secrets
 import stat
 import threading
 import time
-from collections.abc import AsyncGenerator, AsyncIterator, Awaitable, Callable
-from typing import TYPE_CHECKING, Any, Literal, TypedDict, override
+from collections.abc import AsyncGenerator, AsyncIterator, Awaitable, Callable, Mapping
+from typing import TYPE_CHECKING, Any, Literal, override
 from urllib.parse import parse_qs, urlparse
 
 import httpx
+import httpx2
 from anyio import CancelScope
 from filelock import FileLock, Timeout
 from mcp.client.auth import OAuthClientProvider, TokenStorage
@@ -40,8 +41,11 @@ from mcp.client.auth.utils import (
     handle_auth_metadata_response,
     handle_protected_resource_response,
 )
-from mcp.client.streamable_http import MCP_PROTOCOL_VERSION
+from mcp.client.streamable_http import (
+    MCP_PROTOCOL_VERSION_HEADER as MCP_PROTOCOL_VERSION,
+)
 from mcp.shared.auth import (
+    AuthorizationCodeResult,
     OAuthClientInformationFull,
     OAuthMetadata,
     OAuthToken,
@@ -56,6 +60,7 @@ if TYPE_CHECKING:
     from _thread import LockType
     from pathlib import Path
 
+    from fastmcp.client.transports import ClientTransport
     from mcp.client.auth.oauth2 import OAuthContext
 
     from deepagents_code.mcp_oauth_ui import OAuthInteraction
@@ -82,39 +87,19 @@ class _DeviceCodeResponse(BaseModel):
     """Recommended polling interval in seconds when the provider omits one."""
 
 
-class McpServerSpec(TypedDict, total=False):
-    """Parsed MCP server config entry.
-
-    All keys are optional at the type level because `mcpServers` entries
-    are validated shape-first by `_validate_server_config` rather than by
-    the type system. This TypedDict documents the accepted shape for
-    readers and static checkers — validate the fields at use sites before
-    relying on them.
-    """
-
-    auth: Literal["oauth"]
-    """Authentication mode for remote MCP servers that require OAuth login."""
-
-    type: Literal["stdio", "http", "sse"]
-    """Transport type when the config uses the `type` key."""
-
-    transport: Literal["stdio", "http", "sse"]
-    """Transport type when the config uses the `transport` key."""
-
-    url: str
-    """Remote endpoint URL for HTTP or SSE MCP servers."""
+type McpServerSpec = Mapping[str, Any]
+"""A raw `mcpServers` entry, as it appears in a config file.
 
-    headers: dict[str, str]
-    """Optional request headers sent when connecting to the remote server."""
+Deliberately a mapping rather than one of FastMCP's server models: entries
+reach here straight from JSON and may still carry unresolved `${VAR}`
+references, so they are not yet valid against those models.
 
-    command: str
-    """Executable for stdio MCP servers."""
-
-    args: list[str]
-    """Command-line arguments passed to the stdio server executable."""
-
-    env: dict[str, str]
-    """Environment overrides for launching a stdio MCP server."""
+The accepted fields are FastMCP's, not this app's — `fastmcp.mcp_config`'s
+`StdioMCPServer` and `RemoteMCPServer` define and validate them, and
+`mcp_tools._build_transport` is where an entry is finally checked against
+them. Anything this app adds on top (`allowedTools`, `disabledTools`, and the
+`auth: "oauth"` mode marker) is validated by `_validate_server_config`.
+"""
 
 
 logger = logging.getLogger(__name__)
@@ -824,7 +809,7 @@ class _FreshLoginTokenStorage(FileTokenStorage):
 
 
 RedirectHandler = Callable[[str], Awaitable[None]]
-CallbackHandler = Callable[[], Awaitable[tuple[str, str | None]]]
+CallbackHandler = Callable[[], Awaitable[AuthorizationCodeResult]]
 _LOOPBACK_BIND_HOST = "127.0.0.1"
 _LOOPBACK_URI_HOST = "localhost"
 _LOOPBACK_CALLBACK_PATH = "/callback"
@@ -871,7 +856,7 @@ class _LoopbackOAuthCallbackServer:
         self.redirect_uri = (
             f"http://{_LOOPBACK_URI_HOST}:{port}{_LOOPBACK_CALLBACK_PATH}"
         )
-        self._future: concurrent.futures.Future[tuple[str, str | None]] = (
+        self._future: concurrent.futures.Future[AuthorizationCodeResult] = (
             concurrent.futures.Future()
         )
         self._server: object | None = None
@@ -918,11 +903,11 @@ class _LoopbackOAuthCallbackServer:
         if isinstance(self._server, ThreadingHTTPServer):
             self._server.serve_forever()
 
-    async def wait(self) -> tuple[str, str | None]:
-        """Wait for the authorization callback and return `(code, state)`.
+    async def wait(self) -> AuthorizationCodeResult:
+        """Wait for the authorization callback and return its parsed result.
 
         Returns:
-            The OAuth authorization code and optional state.
+            The authorization code with its optional `state` and RFC 9207 `iss`.
 
         Raises:
             _LoopbackCallbackTimeoutError: If no callback arrives before the timeout.
@@ -1020,7 +1005,13 @@ class _LoopbackOAuthCallbackServer:
             self._send_html(handler, 400, _oauth_error_html(msg))
             return
 
-        self._future.set_result((params["code"][0], (params.get("state") or [None])[0]))
+        self._future.set_result(
+            AuthorizationCodeResult(
+                code=params["code"][0],
+                state=(params.get("state") or [None])[0],
+                iss=(params.get("iss") or [None])[0],
+            )
+        )
         self._send_html(
             handler,
             200,
@@ -1136,7 +1127,7 @@ def _make_reauth_required_handlers(
     async def redirect(_auth_url: str) -> None:  # noqa: RUF029
         raise MCPReauthRequiredError(server_name)
 
-    async def callback() -> tuple[str, str | None]:  # noqa: RUF029
+    async def callback() -> AuthorizationCodeResult:  # noqa: RUF029
         raise MCPReauthRequiredError(server_name)
 
     return redirect, callback
@@ -1164,21 +1155,21 @@ def _make_paste_back_handlers(
         final_url = _append_query_params(auth_url, extras) if extras else auth_url
         await interaction.show_authorize_url(final_url, opened_in_browser=False)
 
-    async def callback() -> tuple[str, str | None]:
+    async def callback() -> AuthorizationCodeResult:
         url = await interaction.request_callback_url()
         return _parse_callback_url(url)
 
     return redirect, callback
 
 
-def _parse_callback_url(url: str) -> tuple[str, str | None]:
-    """Parse a provider callback URL into `(code, state)`.
+def _parse_callback_url(url: str) -> AuthorizationCodeResult:
+    """Parse a provider callback URL into the SDK's authorization result.
 
     Args:
         url: Raw callback URL pasted by the user.
 
     Returns:
-        The `code` and optional `state` query parameters.
+        The `code` with its optional `state` and RFC 9207 `iss` parameters.
 
     Raises:
         RuntimeError: If the URL contains `error=` or lacks `code`.
@@ -1193,7 +1184,11 @@ def _parse_callback_url(url: str) -> tuple[str, str | None]:
     if "code" not in params or not params["code"]:
         msg = "Callback URL is missing the 'code' parameter."
         raise RuntimeError(msg)
-    return params["code"][0], (params.get("state") or [None])[0]
+    return AuthorizationCodeResult(
+        code=params["code"][0],
+        state=(params.get("state") or [None])[0],
+        iss=(params.get("iss") or [None])[0],
+    )
 
 
 def _default_ui() -> OAuthInteraction:
@@ -1275,7 +1270,7 @@ def _make_loopback_handlers(
             return
         await interaction.show_authorize_url(final_url, opened_in_browser=True)
 
-    async def callback() -> tuple[str, str | None]:
+    async def callback() -> AuthorizationCodeResult:
         try:
             return await callback_server.wait()
         except (
@@ -1597,12 +1592,12 @@ class _ExpiryAwareOAuthClientProvider(OAuthClientProvider):
         if set_oauth_metadata is not None:
             await set_oauth_metadata(self.context.oauth_metadata)
 
-    async def _handle_token_response(self, response: httpx.Response) -> None:
+    async def _handle_token_response(self, response: httpx2.Response) -> None:
         """Persist tokens and any metadata discovered during full OAuth login."""
         await super()._handle_token_response(response)
         await self._persist_oauth_metadata()
 
-    async def _handle_locked_refresh_response(self, response: httpx.Response) -> bool:
+    async def _handle_locked_refresh_response(self, response: httpx2.Response) -> bool:
         """Handle a serialized refresh without bypassing SDK re-auth fallback.
 
         Args:
@@ -1629,8 +1624,8 @@ class _ExpiryAwareOAuthClientProvider(OAuthClientProvider):
 
     async def async_auth_flow(
         self,
-        request: httpx.Request,
-    ) -> AsyncGenerator[httpx.Request, httpx.Response]:
+        request: httpx2.Request,
+    ) -> AsyncGenerator[httpx2.Request, httpx2.Response]:
         """Discover and cache OAuth metadata before the SDK refresh branch.
 
         Yields:
@@ -1688,7 +1683,7 @@ class _ExpiryAwareOAuthClientProvider(OAuthClientProvider):
                         self.context.oauth_metadata = metadata
                         await self._persist_oauth_metadata()
                         break
-                except httpx.HTTPError as exc:
+                except httpx2.HTTPError as exc:
                     # Log only the exception type, never its payload — discovery
                     # responses travel the same channel as bearer tokens.
                     logger.debug(
@@ -2076,7 +2071,7 @@ _RESOURCE_METADATA_RE = re.compile(
 """Capture the RFC 9728 `resource_metadata` URL from a Bearer challenge."""
 
 
-def _oauth_resource_challenge(headers: httpx.Headers) -> str | None:
+def _oauth_resource_challenge(headers: httpx.Headers | httpx2.Headers) -> str | None:
     """Return the RFC 9728 `resource_metadata` URL from a Bearer challenge.
 
     A single `WWW-Authenticate` header line may carry several comma-separated
@@ -2106,7 +2101,9 @@ def find_oauth_challenge(exc: BaseException) -> str | None:
     Per the MCP authorization spec (RFC 9728), a server requiring OAuth
     answers an unauthenticated request with HTTP 401 plus a Bearer
     `WWW-Authenticate` challenge pointing at its protected-resource metadata.
-    The MCP client surfaces that as an `httpx.HTTPStatusError`. Walks
+    The MCP client surfaces that as an `httpx2.HTTPStatusError` (the MCP
+    SDK's HTTP client); dcode's own `httpx` calls raise the `httpx` one, so
+    both are matched. Walks
     `exceptions` (for `ExceptionGroup`), then `__cause__`/`__context__`,
     tracking visited nodes to terminate on cyclic chains.
 
@@ -2124,7 +2121,7 @@ def find_oauth_challenge(exc: BaseException) -> str | None:
         if id(current) in visited:
             continue
         visited.add(id(current))
-        if isinstance(current, httpx.HTTPStatusError):
+        if isinstance(current, (httpx.HTTPStatusError, httpx2.HTTPStatusError)):
             response = current.response
             if (
                 response is not None and response.status_code == 401  # noqa: PLR2004  # HTTP Unauthorized
@@ -2140,13 +2137,19 @@ def find_oauth_challenge(exc: BaseException) -> str | None:
     return None
 
 
-async def _drive_handshake(connections: dict) -> None:
-    """Open a one-shot MCP session for `connections` to trigger OAuth handshake."""
-    from langchain_mcp_adapters.client import MultiServerMCPClient
+async def _drive_handshake(transport: ClientTransport) -> None:
+    """Open a one-shot MCP session to trigger the OAuth handshake.
 
-    client = MultiServerMCPClient(connections=connections)
-    server_name = next(iter(connections))
-    async with client.session(server_name):
+    Connecting is the whole point: the provider attached to `transport` runs
+    its authorization flow during the connect, and persists tokens on success.
+    Nothing is done with the session itself.
+
+    Args:
+        transport: A remote transport carrying the OAuth provider to drive.
+    """
+    from fastmcp.client import Client
+
+    async with Client(transport):
         pass
 
 
@@ -2172,11 +2175,6 @@ async def login(
         RuntimeError: If the device flow fails or times out, or the
             OAuth handshake aborts.
     """  # noqa: DOC502 - `RuntimeError` surfaces via the device flow / handshake
-    from langchain_mcp_adapters.sessions import (
-        SSEConnection,
-        StreamableHttpConnection,
-    )
-
     from deepagents_code.mcp_tools import MCPConfigError, _resolve_server_type
 
     # OAuth login is discovery-based (RFC 9728), so it works for any remote
@@ -2229,22 +2227,15 @@ async def login(
         extra_auth_params=result.extra_auth_params or None,
         ui=ui,
     )
-    conn: StreamableHttpConnection | SSEConnection
-    if transport == "http":
-        conn = StreamableHttpConnection(
-            transport="streamable_http",
-            url=resolved_config["url"],
-            auth=provider,
-        )
-    else:
-        conn = SSEConnection(
-            transport="sse",
-            url=resolved_config["url"],
+    from deepagents_code.mcp_tools import _build_transport
+
+    await _drive_handshake(
+        _build_transport(
+            server_name,
+            transport,
+            {**resolved_config, "headers": resolved_config.get("headers") or {}},
             auth=provider,
+            keep_alive=False,
         )
-
-    if "headers" in resolved_config:
-        conn["headers"] = resolved_config["headers"]
-
-    await _drive_handshake({server_name: conn})
+    )
     await ui.show_success(success_message)