Merge branch 'main' into vasco/fix-list-str-coercion

Author: VascoSch92

openhands-sdk/openhands/sdk/agent/base.py

@@ -502,26 +502,58 @@ def _resolved_template_kwargs(self) -> dict[str, object]:
                 template_kwargs["model_variant"] = spec.variant
         return template_kwargs
 
-    def _build_prompt_context(self) -> PromptContext:
+    def _build_prompt_context(
+        self,
+        additional_secret_infos: list[dict[str, str | None]] | None = None,
+    ) -> PromptContext:
         """Frozen :class:`PromptContext` snapshot for this agent.
 
         ``template_kwargs`` is resolved by the shared
         :meth:`_resolved_template_kwargs`; the other fields snapshot
-        per-conversation signals.
+        per-conversation signals. The dynamic-tier fields reuse
+        ``AgentContext._resolve_dynamic_data`` so skills are model-gated and
+        secrets merged exactly as ``get_system_message_suffix`` does;
+        ``additional_secret_infos`` mirrors ``get_dynamic_context(state)``.
         """
         agent_context = self.agent_context
+        # Mirror get_dynamic_context's temp-context path: with no agent_context but
+        # conversation secrets present, the legacy renderer resolves a default
+        # AgentContext() (which carries a default current_datetime), so its dynamic
+        # block advertises the secrets *and* a <CURRENT_DATETIME>. Resolve the same
+        # default here so the registry reproduces both blocks, not just secrets.
+        if agent_context is None and additional_secret_infos:
+            agent_context = AgentContext()
+
+        now: str | None = None
+        skill_names: tuple[str, ...] = ()
+        secret_names: tuple[str, ...] = ()
+        repo_skills: tuple[tuple[str, str], ...] = ()
+        available_skills_prompt: str | None = None
+        custom_suffix: str | None = None
+        secret_infos: tuple[tuple[str, str | None], ...] = ()
+
         if agent_context is not None:
-            now = agent_context.get_formatted_datetime()
+            data = agent_context._resolve_dynamic_data(
+                self.llm.model,
+                self.llm.model_canonical_name,
+                additional_secret_infos,
+            )
+            # Reuse the shared resolver's formatted datetime rather than re-deriving
+            # it: get_system_message_suffix renders this exact string, so the registry
+            # must too (a rounded copy would break byte-for-byte parity for callers
+            # that pass a datetime object instead of a pre-formatted string).
+            now = data.formatted_datetime
             skill_names = tuple(skill.name for skill in agent_context.skills)
-            secret_names = tuple(
-                info["name"]
-                for info in agent_context.get_secret_infos()
-                if info["name"] is not None
+            repo_skills = tuple((s.name, s.content) for s in data.repo_skills)
+            available_skills_prompt = data.available_skills_prompt or None
+            custom_suffix = agent_context.system_message_suffix or None
+            secret_infos = tuple(
+                (info["name"] or "", info["description"]) for info in data.secret_infos
             )
-        else:
-            now = None
-            skill_names = ()
-            secret_names = ()
+            # Derive names from the resolver's merged secret_infos instead of a
+            # second get_secret_infos() walk; this now includes registry-provided
+            # secrets (additional_secret_infos), matching what <CUSTOM_SECRETS> shows.
+            secret_names = tuple(name for name, _ in secret_infos if name)
 
         return PromptContext(
             template_kwargs=self._resolved_template_kwargs(),
@@ -531,6 +563,10 @@ def _build_prompt_context(self) -> PromptContext:
             now=now,
             skill_names=skill_names,
             secret_names=secret_names,
+            repo_skills=repo_skills,
+            available_skills_prompt=available_skills_prompt,
+            custom_suffix=custom_suffix,
+            secret_infos=secret_infos,
         )
 
     @property

openhands-sdk/openhands/sdk/context/agent_context.py

@@ -3,7 +3,7 @@
 import pathlib
 from collections.abc import Mapping
 from datetime import datetime
-from typing import Any
+from typing import Any, NamedTuple
 
 from pydantic import (
     BaseModel,
@@ -39,6 +39,16 @@
 PROMPT_DIR = pathlib.Path(__file__).parent / "prompts" / "templates"
 
 
+class ResolvedDynamicData(NamedTuple):
+    """Dynamic-tier inputs resolved once, shared by the legacy ``.j2`` renderer and
+    the section registry (skills gated by model family, secrets merged)."""
+
+    repo_skills: list[Skill]
+    available_skills_prompt: str
+    secret_infos: list[dict[str, str | None]]
+    formatted_datetime: str | None
+
+
 class AgentContext(BaseModel):
     """Central structure for managing prompt extension.
 
@@ -300,6 +310,40 @@ def get_system_message_suffix(
         - Legacy with trigger=None: Full content in <REPO_CONTEXT> (always active)
         - Legacy with triggers: Listed in <available_skills>, injected on trigger
         """
+        data = self._resolve_dynamic_data(
+            llm_model, llm_model_canonical, additional_secret_infos
+        )
+        has_content = (
+            data.repo_skills
+            or self.system_message_suffix
+            or data.secret_infos
+            or data.available_skills_prompt
+            or data.formatted_datetime
+        )
+        if has_content:
+            formatted_text = render_template(
+                prompt_dir=str(PROMPT_DIR),
+                template_name="system_message_suffix.j2",
+                repo_skills=data.repo_skills,
+                system_message_suffix=self.system_message_suffix or "",
+                secret_infos=data.secret_infos,
+                available_skills_prompt=data.available_skills_prompt,
+                current_datetime=data.formatted_datetime,
+            ).strip()
+            return formatted_text
+        elif self.system_message_suffix and self.system_message_suffix.strip():
+            return self.system_message_suffix.strip()
+        return None
+
+    def _resolve_dynamic_data(
+        self,
+        llm_model: str | None = None,
+        llm_model_canonical: str | None = None,
+        additional_secret_infos: list[dict[str, str | None]] | None = None,
+    ) -> ResolvedDynamicData:
+        """Resolve the dynamic-tier inputs shared by :meth:`get_system_message_suffix`
+        and the section registry: model-gated repo skills, the available-skills
+        prompt, merged secret infos, and the formatted datetime. Pure (no render)."""
         repo_skills, available_skills = self._partition_skills()
 
         # Gate vendor-specific repo skills based on model family.
@@ -323,45 +367,28 @@ def get_system_message_suffix(
 
         logger.debug(f"Loaded {len(repo_skills)} repository skills: {repo_skills}")
 
-        # Generate available skills prompt
         available_skills_prompt = ""
         if available_skills:
             available_skills_prompt = to_prompt(available_skills)
             logger.debug(
                 f"Generated available skills prompt for {len(available_skills)} skills"
             )
 
-        # Build the workspace context information
-        # Merge agent_context secrets with additional secrets from registry
+        # Merge agent_context secrets with additional secrets from the registry
+        # (additional override by name).
         secret_infos = self.get_secret_infos()
         if additional_secret_infos:
-            # Merge: additional secrets override agent_context secrets by name
             secret_dict = {s["name"]: s for s in secret_infos}
             for additional in additional_secret_infos:
                 secret_dict[additional["name"]] = additional
             secret_infos = list(secret_dict.values())
-        formatted_datetime = self.get_formatted_datetime()
-        has_content = (
-            repo_skills
-            or self.system_message_suffix
-            or secret_infos
-            or available_skills_prompt
-            or formatted_datetime
+
+        return ResolvedDynamicData(
+            repo_skills=repo_skills,
+            available_skills_prompt=available_skills_prompt,
+            secret_infos=secret_infos,
+            formatted_datetime=self.get_formatted_datetime(),
         )
-        if has_content:
-            formatted_text = render_template(
-                prompt_dir=str(PROMPT_DIR),
-                template_name="system_message_suffix.j2",
-                repo_skills=repo_skills,
-                system_message_suffix=self.system_message_suffix or "",
-                secret_infos=secret_infos,
-                available_skills_prompt=available_skills_prompt,
-                current_datetime=formatted_datetime,
-            ).strip()
-            return formatted_text
-        elif self.system_message_suffix and self.system_message_suffix.strip():
-            return self.system_message_suffix.strip()
-        return None
 
     def validate_acp_compatibility(self) -> None:
         """Raise if this context uses fields unsupported by ACP prompt mode.

openhands-sdk/openhands/sdk/context/prompts/default_registry.py

@@ -7,6 +7,13 @@
 """
 
 from openhands.sdk.context.prompts.registry import PromptRegistry
+from openhands.sdk.context.prompts.sections.dynamic import (
+    AvailableSkillsSection,
+    CustomSecretsSection,
+    CustomSuffixSection,
+    DateTimeSection,
+    RepoContextSection,
+)
 from openhands.sdk.context.prompts.sections.static import (
     BrowserSection,
     CodeQualitySection,
@@ -53,4 +60,10 @@ def build_default_registry() -> PromptRegistry:
     r.register(TroubleshootingSection())
     r.register(ProcessManagementSection())
     r.register(ModelSpecificSection())  # guard: model_family resolved
+    # dynamic tier -- ported verbatim from system_message_suffix.j2 (#3610)
+    r.register(DateTimeSection())
+    r.register(RepoContextSection())  # guard: gated repo skills present
+    r.register(AvailableSkillsSection())  # guard: available_skills_prompt
+    r.register(CustomSuffixSection())  # guard: system_message_suffix
+    r.register(CustomSecretsSection())  # guard: secret_infos present
     return r

openhands-sdk/openhands/sdk/context/prompts/section.py

@@ -68,6 +68,13 @@ class PromptContext(BaseModel):
     now: str | None = None
     skill_names: tuple[str, ...] = Field(default_factory=tuple)
     secret_names: tuple[str, ...] = Field(default_factory=tuple)
+    # Resolved dynamic-tier data (skills gated + secrets merged before assembly),
+    # consumed by the dynamic sections. ``repo_skills`` is (name, content) pairs;
+    # ``secret_infos`` is (name, description) pairs.
+    repo_skills: tuple[tuple[str, str], ...] = Field(default_factory=tuple)
+    available_skills_prompt: str | None = None
+    custom_suffix: str | None = None
+    secret_infos: tuple[tuple[str, str | None], ...] = Field(default_factory=tuple)
 
     @field_validator("template_kwargs", mode="after")
     @classmethod

openhands-sdk/openhands/sdk/context/prompts/sections/__init__.py

@@ -6,6 +6,13 @@
 in :mod:`.static`.
 """
 
+from openhands.sdk.context.prompts.sections.dynamic import (
+    AvailableSkillsSection,
+    CustomSecretsSection,
+    CustomSuffixSection,
+    DateTimeSection,
+    RepoContextSection,
+)
 from openhands.sdk.context.prompts.sections.static import (
     BrowserSection,
     CodeQualitySection,
@@ -29,8 +36,12 @@
 
 
 __all__ = [
+    "AvailableSkillsSection",
     "BrowserSection",
     "CodeQualitySection",
+    "CustomSecretsSection",
+    "CustomSuffixSection",
+    "DateTimeSection",
     "EfficiencySection",
     "EnvironmentSetupSection",
     "ExternalServicesSection",
@@ -40,6 +51,7 @@
     "ProblemSolvingSection",
     "ProcessManagementSection",
     "PullRequestsSection",
+    "RepoContextSection",
     "RoleSection",
     "SecurityRiskAssessmentSection",
     "SecuritySection",