Skip to content

Commit fcfb0fa

Browse files
chore: Address review feedback - minor improvements
- Fix empty string check in get_all_secrets() to use 'is not None' instead of truthy check (allows empty string secrets) - Add explicit expand_defaults=True in loader.py for clarity - Improve logging to indicate when defaults are applied without secrets Co-authored-by: openhands <openhands@all-hands.dev>
1 parent 055e09f commit fcfb0fa

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

openhands-sdk/openhands/sdk/conversation/impl/local_conversation.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,8 @@ def _ensure_plugins_loaded(self) -> None:
388388
agent_update_needed = True
389389
if secrets:
390390
logger.debug(f"Expanded MCP config with {len(secrets)} secret(s)")
391+
else:
392+
logger.debug("Applied MCP config defaults (no secrets provided)")
391393

392394
# Update agent with merged content if needed
393395
if agent_update_needed:

openhands-sdk/openhands/sdk/conversation/secret_registry.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def get_all_secrets(self) -> dict[str, str]:
147147
for name, source in self.secret_sources.items():
148148
try:
149149
value = source.get_value()
150-
if value:
150+
if value is not None:
151151
secrets[name] = value
152152
except Exception as e:
153153
logger.warning(f"Failed to retrieve secret '{name}': {e}")

openhands-sdk/openhands/sdk/plugin/loader.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@ def load_plugins(
105105
# Expand MCP config variables with per-conversation secrets
106106
# This handles ${VAR} placeholders that reference secrets injected via API
107107
if merged_mcp and secrets:
108-
merged_mcp = expand_mcp_variables(merged_mcp, {}, secrets=secrets)
108+
merged_mcp = expand_mcp_variables(
109+
merged_mcp, {}, secrets=secrets, expand_defaults=True
110+
)
109111
logger.debug(f"Expanded MCP config with {len(secrets)} secret(s)")
110112

111113
# Combine all hook configs (concatenation semantics)

0 commit comments

Comments
 (0)