openhands-agent-server 1.49.2__tar.gz → 1.49.4__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (95) hide show
  1. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/PKG-INFO +1 -1
  2. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/agent_profiles_router.py +23 -3
  3. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/api.py +9 -0
  4. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/docker_runtime/registry.py +2 -0
  5. openhands_agent_server-1.49.4/openhands/agent_server/local_secret_resolver.py +87 -0
  6. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/mcp_oauth_store.py +59 -9
  7. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands_agent_server.egg-info/PKG-INFO +1 -1
  8. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands_agent_server.egg-info/SOURCES.txt +2 -0
  9. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/pyproject.toml +1 -1
  10. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/__init__.py +0 -0
  11. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/__main__.py +0 -0
  12. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/_secret_redaction.py +0 -0
  13. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/_secrets_exposure.py +0 -0
  14. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/auth_router.py +0 -0
  15. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/bash_router.py +0 -0
  16. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/bash_service.py +0 -0
  17. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/canvas_extensions/__init__.py +0 -0
  18. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/canvas_extensions/installed.py +0 -0
  19. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/canvas_extensions/manifest.py +0 -0
  20. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/canvas_extensions_router.py +0 -0
  21. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/config.py +0 -0
  22. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/conversation_lease.py +0 -0
  23. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/conversation_registry.py +0 -0
  24. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/conversation_router.py +0 -0
  25. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/conversation_service.py +0 -0
  26. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/credential_binding.py +0 -0
  27. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/dependencies.py +0 -0
  28. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/docker/Dockerfile +0 -0
  29. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/docker/build.py +0 -0
  30. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/docker_runtime/__init__.py +0 -0
  31. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/docker_runtime/mediation.py +0 -0
  32. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/docker_runtime/provisioning.py +0 -0
  33. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/docker_runtime/proxy.py +0 -0
  34. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/docker_runtime/routers.py +0 -0
  35. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/env_parser.py +0 -0
  36. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/event_router.py +0 -0
  37. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/event_service.py +0 -0
  38. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/file_router.py +0 -0
  39. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/git_router.py +0 -0
  40. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/hooks_router.py +0 -0
  41. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/hooks_service.py +0 -0
  42. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/init_router.py +0 -0
  43. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/llm_router.py +0 -0
  44. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/logging_config.py +0 -0
  45. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/mcp_router.py +0 -0
  46. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/middleware.py +0 -0
  47. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/models.py +0 -0
  48. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/openai/__init__.py +0 -0
  49. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/openai/models.py +0 -0
  50. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/openai/router.py +0 -0
  51. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/openai/service.py +0 -0
  52. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/openapi.py +0 -0
  53. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/persistence/__init__.py +0 -0
  54. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/persistence/models.py +0 -0
  55. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/persistence/store.py +0 -0
  56. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/plugins_router.py +0 -0
  57. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/plugins_service.py +0 -0
  58. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/profiles_router.py +0 -0
  59. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/provider_connections_router.py +0 -0
  60. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/pub_sub.py +0 -0
  61. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/py.typed +0 -0
  62. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/runtime_router.py +0 -0
  63. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/server_details_router.py +0 -0
  64. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/session_protocol.py +0 -0
  65. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/session_socket.py +0 -0
  66. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/settings_router.py +0 -0
  67. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/skills_router.py +0 -0
  68. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/skills_service.py +0 -0
  69. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/sockets.py +0 -0
  70. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/sub_agents_router.py +0 -0
  71. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/telemetry/__init__.py +0 -0
  72. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/telemetry/factory.py +0 -0
  73. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/telemetry/http_exporter.py +0 -0
  74. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/telemetry/models.py +0 -0
  75. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/telemetry/policy.py +0 -0
  76. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/telemetry/posthog_exporter.py +0 -0
  77. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/telemetry/sanitizer.py +0 -0
  78. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/telemetry/service.py +0 -0
  79. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/telemetry/sink.py +0 -0
  80. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/telemetry/subscriber.py +0 -0
  81. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/telemetry_types.py +0 -0
  82. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/tool_preload_service.py +0 -0
  83. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/tool_router.py +0 -0
  84. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/utils.py +0 -0
  85. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/vscode_extensions/openhands-settings/extension.js +0 -0
  86. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/vscode_extensions/openhands-settings/package.json +0 -0
  87. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/vscode_router.py +0 -0
  88. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/vscode_service.py +0 -0
  89. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/workspace_router.py +0 -0
  90. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands/agent_server/workspaces_router.py +0 -0
  91. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands_agent_server.egg-info/dependency_links.txt +0 -0
  92. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands_agent_server.egg-info/entry_points.txt +0 -0
  93. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands_agent_server.egg-info/requires.txt +0 -0
  94. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/openhands_agent_server.egg-info/top_level.txt +0 -0
  95. {openhands_agent_server-1.49.2 → openhands_agent_server-1.49.4}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: openhands-agent-server
3
- Version: 1.49.2
3
+ Version: 1.49.4
4
4
  Summary: OpenHands Agent Server - REST/WebSocket interface for OpenHands AI Agent
5
5
  Project-URL: Source, https://github.com/OpenHands/software-agent-sdk
6
6
  Project-URL: Homepage, https://github.com/OpenHands/software-agent-sdk
@@ -47,6 +47,7 @@ from openhands.sdk.profiles import (
47
47
  validate_agent_profile,
48
48
  )
49
49
  from openhands.sdk.profiles.agent_profile_store import PROFILE_NAME_PATTERN
50
+ from openhands.sdk.settings.model import OpenHandsAgentSettings
50
51
  from openhands.sdk.utils.cipher import Cipher
51
52
 
52
53
 
@@ -370,7 +371,10 @@ async def delete_agent_profile(
370
371
  """Delete a stored profile (idempotent).
371
372
 
372
373
  If the deleted profile was the active one, ``active_agent_profile_id`` is
373
- cleared.
374
+ cleared. If ``agent_settings`` is itself left on a non-OpenHands variant,
375
+ it is reset to default OpenHands agent settings so stale ACP configuration
376
+ does not outlive the profile it came from; the server-wide ``mcp_config``
377
+ is carried over.
374
378
  """
375
379
  store = get_agent_profile_store()
376
380
  deleted_id = _summary_id_for_name(store, name)
@@ -384,11 +388,27 @@ async def delete_agent_profile(
384
388
  settings = settings_store.load() or PersistedSettings()
385
389
  if settings.active_agent_profile_id == deleted_id:
386
390
 
387
- def clear_pointer(s: PersistedSettings) -> PersistedSettings:
391
+ def clear_pointer_and_reset_settings(
392
+ s: PersistedSettings,
393
+ ) -> PersistedSettings:
388
394
  s.active_agent_profile_id = None
395
+ # Stale non-OpenHands settings outlive their profile. Reset to
396
+ # a fresh OpenHands base rather than merging across the variant
397
+ # boundary (see _apply_agent_settings_diff), except for
398
+ # ``mcp_config``: it is the server-wide MCP registry every other
399
+ # profile resolves ``mcp_server_refs`` against, not ACP state.
400
+ prior_kind = s.agent_settings.agent_kind
401
+ if prior_kind != "openhands":
402
+ s.agent_settings = OpenHandsAgentSettings(
403
+ mcp_config=s.agent_settings.mcp_config
404
+ )
405
+ logger.info(
406
+ f"Reset agent_settings to default "
407
+ f"(agent_settings was agent_kind='{prior_kind}')"
408
+ )
389
409
  return s
390
410
 
391
- settings_store.update(clear_pointer)
411
+ settings_store.update(clear_pointer_and_reset_settings)
392
412
  logger.info(f"Cleared active pointer for deleted profile '{name}'")
393
413
 
394
414
  logger.info(f"Deleted agent profile '{name}'")
@@ -53,6 +53,7 @@ from openhands.agent_server.init_router import (
53
53
  require_initialized,
54
54
  )
55
55
  from openhands.agent_server.llm_router import llm_router
56
+ from openhands.agent_server.local_secret_resolver import local_secret_resolution
56
57
  from openhands.agent_server.mcp_router import mcp_router
57
58
  from openhands.agent_server.middleware import CORSDispatcher
58
59
  from openhands.agent_server.openai.router import (
@@ -154,6 +155,7 @@ def _cleanup_stale_tmux_sessions() -> None:
154
155
  @asynccontextmanager
155
156
  async def api_lifespan(api: FastAPI) -> AsyncIterator[None]:
156
157
  tmux_tmpdir, tmux_tmpdir_was_defaulted = _ensure_server_tmux_tmpdir()
158
+ secret_resolution: local_secret_resolution | None = None
157
159
  try:
158
160
  # Clean up stale tmux sessions from previous server runs
159
161
  _cleanup_stale_tmux_sessions()
@@ -165,6 +167,11 @@ async def api_lifespan(api: FastAPI) -> AsyncIterator[None]:
165
167
  ) or create_conversation_registry(config)
166
168
  api.state.conversation_registry = conversation_registry
167
169
 
170
+ # Answer our own LookupSecret URLs in-process; a loopback fetch made
171
+ # from the event loop cannot be served by the loop blocked on it.
172
+ secret_resolution = local_secret_resolution(config)
173
+ secret_resolution.__enter__()
174
+
168
175
  # Deferred pods boot with telemetry disabled and are rebuilt by
169
176
  # InitService, so they emit `server_started` there instead.
170
177
  api.state.telemetry_sink = await build_telemetry_sink(config)
@@ -292,6 +299,8 @@ async def api_lifespan(api: FastAPI) -> AsyncIterator[None]:
292
299
  finally:
293
300
  # Outer finally so a startup failure cannot leak the drain task, and
294
301
  # after `async with service` so terminal events are still accepted.
302
+ if secret_resolution is not None:
303
+ secret_resolution.__exit__(None, None, None)
295
304
  emit_server_stopped()
296
305
  await shutdown_telemetry_sink()
297
306
 
@@ -314,6 +314,8 @@ class DockerConversationRegistry(ConversationRegistry):
314
314
  "ALL",
315
315
  "--security-opt",
316
316
  "no-new-privileges",
317
+ "--add-host",
318
+ "host.docker.internal:host-gateway",
317
319
  "--label",
318
320
  f"{_OWNER_LABEL}={self.owner}",
319
321
  "--name",
@@ -0,0 +1,87 @@
1
+ """Serve this server's own ``LookupSecret`` URLs without a loopback request.
2
+
3
+ ``LookupSecret`` resolves lazily over HTTP so raw values never transit an SDK
4
+ client. When the client and the server are the same process, that round trip
5
+ buys nothing and costs correctness: a resolution on the event loop blocks the
6
+ very loop that would answer it, so it stalls until the client times out.
7
+ Resolving those URLs against the local store keeps the laziness and drops the
8
+ round trip.
9
+ """
10
+
11
+ import os
12
+ from urllib.parse import urlsplit
13
+
14
+ from openhands.agent_server.config import Config
15
+ from openhands.agent_server.persistence import get_secrets_store
16
+ from openhands.sdk.logger import get_logger
17
+ from openhands.sdk.secret import (
18
+ register_local_secret_resolver,
19
+ unregister_local_secret_resolver,
20
+ )
21
+
22
+
23
+ logger = get_logger(__name__)
24
+
25
+ _INTERNAL_SERVER_URL_ENV = "OH_INTERNAL_SERVER_URL"
26
+ _DEFAULT_INTERNAL_SERVER_URL = "http://127.0.0.1:8000"
27
+ _SECRET_PATH_PREFIX = "/api/settings/secrets/"
28
+ _LOOPBACK_HOSTS = frozenset({"127.0.0.1", "localhost", "::1"})
29
+ _DEFAULT_PORTS = {"http": 80, "https": 443}
30
+
31
+
32
+ def _effective_port(scheme: str, port: int | None) -> int | None:
33
+ return port if port is not None else _DEFAULT_PORTS.get(scheme)
34
+
35
+
36
+ def _secret_name_if_local(url: str) -> str | None:
37
+ """Return the secret name when ``url`` is one this process serves itself."""
38
+ parsed = urlsplit(url)
39
+ server = urlsplit(os.getenv(_INTERNAL_SERVER_URL_ENV, _DEFAULT_INTERNAL_SERVER_URL))
40
+ if parsed.scheme != server.scheme:
41
+ return None
42
+ if _effective_port(parsed.scheme, parsed.port) != _effective_port(
43
+ server.scheme, server.port
44
+ ):
45
+ return None
46
+ if parsed.hostname != server.hostname and not {
47
+ parsed.hostname,
48
+ server.hostname,
49
+ }.issubset(_LOOPBACK_HOSTS):
50
+ return None
51
+ if not parsed.path.startswith(_SECRET_PATH_PREFIX):
52
+ return None
53
+ name = parsed.path[len(_SECRET_PATH_PREFIX) :]
54
+ # Only a bare name; anything deeper is a different route.
55
+ if not name or "/" in name:
56
+ return None
57
+ return name
58
+
59
+
60
+ def build_local_secret_resolver(config: Config):
61
+ """Build a resolver that answers this server's own secret URLs."""
62
+
63
+ def resolve(url: str) -> str | None:
64
+ name = _secret_name_if_local(url)
65
+ if name is None:
66
+ return None
67
+ value = get_secrets_store(config).get_secret(name)
68
+ if value is None:
69
+ # Fall through to HTTP so the caller still sees the server's 404.
70
+ return None
71
+ logger.debug("Resolved secret '%s' in-process", name)
72
+ return value
73
+
74
+ return resolve
75
+
76
+
77
+ class local_secret_resolution:
78
+ """Context manager registering the in-process resolver for a server."""
79
+
80
+ def __init__(self, config: Config) -> None:
81
+ self._resolver = build_local_secret_resolver(config)
82
+
83
+ def __enter__(self) -> None:
84
+ register_local_secret_resolver(self._resolver)
85
+
86
+ def __exit__(self, *exc_info) -> None:
87
+ unregister_local_secret_resolver(self._resolver)
@@ -10,6 +10,7 @@ from __future__ import annotations
10
10
 
11
11
  import asyncio
12
12
  import copy
13
+ import threading
13
14
  from collections.abc import Mapping, Sequence
14
15
  from dataclasses import dataclass
15
16
  from typing import Any, NamedTuple, SupportsFloat
@@ -29,6 +30,7 @@ from openhands.sdk.mcp.utils import (
29
30
  ToolsReconciledCallback,
30
31
  create_mcp_tools,
31
32
  )
33
+ from openhands.sdk.utils.cipher import Cipher
32
34
 
33
35
 
34
36
  logger = get_logger(__name__)
@@ -83,7 +85,33 @@ def _state_field_for_fastmcp_key(
83
85
 
84
86
 
85
87
  class MCPSettingsOAuthTokenStore:
86
- """FastMCP OAuth token storage persisted inside settings MCP servers."""
88
+ """FastMCP OAuth token storage persisted inside settings MCP servers.
89
+
90
+ ``seed_mcp_config`` covers OAuth servers that are not in this server's
91
+ settings store, such as the ones a hosted deployment passes inline on the
92
+ agent (their settings live on the remote app server): the ``auth.state``
93
+ they carry is served to FastMCP, and tokens refreshed during the
94
+ conversation are kept in memory for the lifetime of the store instead of
95
+ being dropped. Servers found in settings always take precedence.
96
+ """
97
+
98
+ def __init__(
99
+ self,
100
+ *,
101
+ seed_mcp_config: Mapping[str, MCPServer] | None = None,
102
+ cipher: Cipher | None = None,
103
+ ):
104
+ self._seeded: dict[str, MCPOAuthState] = {}
105
+ self._seeded_lock = threading.Lock()
106
+ for server in (seed_mcp_config or {}).values():
107
+ if server.url is None or server.oauth_auth is None:
108
+ continue
109
+ state = server.initial_oauth_state(cipher=cipher) or MCPOAuthState()
110
+ self._seeded[server.url.rstrip("/")] = state
111
+
112
+ def _seeded_state(self, key: str) -> MCPOAuthState | None:
113
+ with self._seeded_lock:
114
+ return self._seeded.get(_server_url_from_fastmcp_key(key))
87
115
 
88
116
  def _get_entry_sync(
89
117
  self, key: str, collection: str | None
@@ -94,13 +122,13 @@ class MCPSettingsOAuthTokenStore:
94
122
 
95
123
  store = get_settings_store()
96
124
  settings = store.load()
97
- if settings is None:
98
- return None, None
99
-
100
- mcp_config = settings.agent_settings.mcp_config
125
+ mcp_config = settings.agent_settings.mcp_config if settings else {}
101
126
  match = _find_matching_oauth_server(mcp_config, key)
102
127
  if match is None:
103
- return None, None
128
+ seeded = self._seeded_state(key)
129
+ if seeded is None:
130
+ return None, None
131
+ return seeded.get_token_storage_value(field), None
104
132
  _, _, auth = match
105
133
  return (auth.state or MCPOAuthState()).get_token_storage_value(field), None
106
134
 
@@ -133,6 +161,14 @@ class MCPSettingsOAuthTokenStore:
133
161
  mcp_config = settings.agent_settings.mcp_config
134
162
  match = _find_matching_oauth_server(mcp_config, key)
135
163
  if match is None:
164
+ server_url = _server_url_from_fastmcp_key(key)
165
+ with self._seeded_lock:
166
+ seeded = self._seeded.get(server_url)
167
+ if seeded is not None:
168
+ self._seeded[server_url] = seeded.with_token_storage_value(
169
+ field, stored_value
170
+ )
171
+ return settings
136
172
  logger.warning(
137
173
  "Could not persist MCP OAuth state: no configured MCP "
138
174
  "server matches FastMCP key %r",
@@ -188,6 +224,12 @@ class MCPSettingsOAuthTokenStore:
188
224
  mcp_config = settings.agent_settings.mcp_config
189
225
  match = _find_matching_oauth_server(mcp_config, key)
190
226
  if match is None:
227
+ server_url = _server_url_from_fastmcp_key(key)
228
+ with self._seeded_lock:
229
+ seeded = self._seeded.get(server_url)
230
+ if seeded is not None:
231
+ seeded, deleted = seeded.without_token_storage_value(field)
232
+ self._seeded[server_url] = seeded
191
233
  return settings
192
234
  server_name, server, auth = match
193
235
  state, deleted = (
@@ -330,7 +372,13 @@ class InMemoryMCPOAuthTokenStore:
330
372
 
331
373
  @dataclass(frozen=True, slots=True)
332
374
  class SettingsBackedMCPToolProvider:
333
- """Create MCP tools with FastMCP OAuth state persisted in settings."""
375
+ """Create MCP tools with FastMCP OAuth state persisted in settings.
376
+
377
+ OAuth servers absent from settings (passed inline on the agent) fall back
378
+ to the OAuth state they carry; see ``MCPSettingsOAuthTokenStore``.
379
+ """
380
+
381
+ cipher: Cipher | None = None
334
382
 
335
383
  def create_tools(
336
384
  self,
@@ -343,7 +391,9 @@ class SettingsBackedMCPToolProvider:
343
391
  return create_mcp_tools(
344
392
  mcp_config,
345
393
  timeout,
346
- mcp_oauth_token_storage=MCPSettingsOAuthTokenStore(),
394
+ mcp_oauth_token_storage=MCPSettingsOAuthTokenStore(
395
+ seed_mcp_config=mcp_config, cipher=self.cipher
396
+ ),
347
397
  on_tools_changed=on_tools_changed,
348
398
  on_tools_reconciled=on_tools_reconciled,
349
399
  )
@@ -360,4 +410,4 @@ def create_settings_backed_mcp_tool_provider(
360
410
  "(no OH_SECRET_KEY configured). Configure OH_SECRET_KEY for "
361
411
  "production deployments."
362
412
  )
363
- return SettingsBackedMCPToolProvider()
413
+ return SettingsBackedMCPToolProvider(cipher=config.cipher)
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: openhands-agent-server
3
- Version: 1.49.2
3
+ Version: 1.49.4
4
4
  Summary: OpenHands Agent Server - REST/WebSocket interface for OpenHands AI Agent
5
5
  Project-URL: Source, https://github.com/OpenHands/software-agent-sdk
6
6
  Project-URL: Homepage, https://github.com/OpenHands/software-agent-sdk
@@ -25,6 +25,7 @@ pyproject.toml
25
25
  ./openhands/agent_server/hooks_service.py
26
26
  ./openhands/agent_server/init_router.py
27
27
  ./openhands/agent_server/llm_router.py
28
+ ./openhands/agent_server/local_secret_resolver.py
28
29
  ./openhands/agent_server/logging_config.py
29
30
  ./openhands/agent_server/mcp_oauth_store.py
30
31
  ./openhands/agent_server/mcp_router.py
@@ -110,6 +111,7 @@ openhands/agent_server/hooks_router.py
110
111
  openhands/agent_server/hooks_service.py
111
112
  openhands/agent_server/init_router.py
112
113
  openhands/agent_server/llm_router.py
114
+ openhands/agent_server/local_secret_resolver.py
113
115
  openhands/agent_server/logging_config.py
114
116
  openhands/agent_server/mcp_oauth_store.py
115
117
  openhands/agent_server/mcp_router.py
@@ -1,6 +1,6 @@
1
1
  [project]
2
2
  name = "openhands-agent-server"
3
- version = "1.49.2"
3
+ version = "1.49.4"
4
4
  description = "OpenHands Agent Server - REST/WebSocket interface for OpenHands AI Agent"
5
5
 
6
6
  requires-python = ">=3.12"