nighthawk-python 0.7.0__py3-none-any.whl → 0.9.0__py3-none-any.whl

nighthawk/__init__.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 from .configuration import (
     StepContextLimits,
     StepExecutorConfiguration,
-    StepExecutorConfigurationPatch,
     StepPromptTemplates,
 )
 from .errors import (
@@ -32,7 +31,6 @@ __all__ = [
     "StepContextLimits",
     "StepExecutor",
     "StepExecutorConfiguration",
-    "StepExecutorConfigurationPatch",
     "StepPromptTemplates",
     "ToolEvaluationError",
     "ToolRegistrationError",

nighthawk/configuration.py

@@ -32,7 +32,7 @@ Trust boundaries:
 
 Notes:
 - In async Natural functions, expressions may use `await`.
-- Tool calls return {"value": ..., "error": ...}. Values may contain \u2026 where content was omitted. Check "error" for failures.
+- Tool calls return {"value": ..., "error": ...}; "value" is a preview (max $tool_result_max_tokens tokens), so persist large/intermediate data via nh_assign and inspect with focused nh_eval reads.
 """
 
 
@@ -81,8 +81,11 @@ class StepContextLimits(BaseModel):
         locals_max_items: Maximum items rendered in the locals section.
         globals_max_tokens: Maximum tokens for the globals section.
         globals_max_items: Maximum items rendered in the globals section.
-        value_max_tokens: Maximum tokens for a single value rendering.
-        tool_result_max_tokens: Maximum tokens for a tool result rendering.
+        value_max_tokens: Maximum tokens for a single value preview.
+        object_max_methods: Maximum public methods rendered for one object capability view.
+        object_max_fields: Maximum public fields rendered for one object capability view.
+        object_field_value_max_tokens: Maximum tokens for one object field value preview.
+        tool_result_max_tokens: Maximum tokens for a tool result preview.
     """
 
     model_config = ConfigDict(extra="forbid", frozen=True)
@@ -94,6 +97,9 @@ class StepContextLimits(BaseModel):
     globals_max_items: int = Field(default=40, ge=1)
 
     value_max_tokens: int = Field(default=200, ge=1)
+    object_max_methods: int = Field(default=16, ge=0)
+    object_max_fields: int = Field(default=16, ge=0)
+    object_field_value_max_tokens: int = Field(default=120, ge=1)
     tool_result_max_tokens: int = Field(default=1_200, ge=1)
 
 
@@ -154,44 +160,3 @@ class StepExecutorConfiguration(BaseModel):
             return tiktoken.encoding_for_model(model_name)
         except Exception:
             return tiktoken.get_encoding("o200k_base")
-
-
-class StepExecutorConfigurationPatch(BaseModel):
-    """Partial override for StepExecutorConfiguration.
-
-    Non-None fields replace the corresponding fields in the target configuration.
-
-    Attributes:
-        model: Model identifier override.
-        model_settings: Model settings override. Accepts a dict or a
-            backend-specific BaseModel instance (auto-converted to dict).
-        prompts: Prompt templates override.
-        context_limits: Context limits override.
-        json_renderer_style: JSON renderer style override.
-        tokenizer_encoding: Tokenizer encoding override.
-        system_prompt_suffix_fragments: System prompt suffix fragments override.
-        user_prompt_suffix_fragments: User prompt suffix fragments override.
-    """
-
-    model_config = ConfigDict(extra="forbid", frozen=True)
-
-    model: str | None = None
-    model_settings: dict[str, Any] | BaseModel | None = None
-
-    @field_validator("model_settings", mode="before")
-    @classmethod
-    def _normalize_model_settings(cls, value: Any) -> dict[str, Any] | None:
-        if isinstance(value, BaseModel):
-            return value.model_dump()
-        return value
-
-    prompts: StepPromptTemplates | None = None
-    context_limits: StepContextLimits | None = None
-    json_renderer_style: JsonRendererStyle | None = None
-    tokenizer_encoding: str | None = None
-    system_prompt_suffix_fragments: tuple[str, ...] | None = None
-    user_prompt_suffix_fragments: tuple[str, ...] | None = None
-
-    def apply_to(self, configuration: StepExecutorConfiguration) -> StepExecutorConfiguration:
-        """Apply non-None fields to the given configuration and return a new copy."""
-        return configuration.model_copy(update=self.model_dump(exclude_none=True))

nighthawk/runtime/prompt.py

@@ -1,14 +1,16 @@
 from __future__ import annotations
 
+import dataclasses
 import functools
 import inspect
 import logging
 import re
-from collections.abc import Iterable
+from collections.abc import Iterable, Mapping, Sequence
 from string import Template
 from typing import Any, TypeAliasType
 
 import tiktoken
+from pydantic import BaseModel
 
 from ..configuration import StepContextLimits, StepExecutorConfiguration
 from ..json_renderer import JsonRendererStyle, count_tokens, render_json_text
@@ -21,6 +23,8 @@ from .scoping import (
 )
 from .step_context import _MISSING, StepContext, resolve_name_in_step_context
 
+type ReferenceAndValue = tuple[str, object]
+
 
 def _resolve_partial_effective_signature(partial_callable: functools.partial[Any]) -> str | None:
     try:
@@ -98,7 +102,7 @@ def _is_async_callable_value(value: object) -> bool:
 
 def _find_ambiguous_callable_signatures(
     *,
-    reference_and_value_list: list[tuple[str, object]],
+    reference_and_value_list: list[ReferenceAndValue],
 ) -> dict[str, list[str]]:
     callable_signature_text_to_reference_list: dict[str, list[str]] = {}
     for reference, value in reference_and_value_list:
@@ -146,14 +150,275 @@ def _render_callable_line(
     return rendered_text
 
 
+def _is_object_capability_candidate(value: object) -> bool:
+    if callable(value):
+        return False
+    if isinstance(value, TypeAliasType):
+        return False
+    if value is None:
+        return False
+    if isinstance(value, (bool, int, float, str, bytes, bytearray)):
+        return False
+    return not isinstance(value, (Mapping, Sequence, set, frozenset))
+
+
+def _resolve_public_method_name_to_value(*, value: object) -> dict[str, object]:
+    method_name_to_value: dict[str, object] = {}
+    for value_type in type(value).__mro__:
+        for method_name, class_attribute in value_type.__dict__.items():
+            if method_name.startswith("_"):
+                continue
+            if method_name in method_name_to_value:
+                continue
+            if isinstance(class_attribute, property):
+                continue
+
+            method_value: object | None = None
+            if isinstance(class_attribute, staticmethod):
+                method_value = class_attribute.__func__
+            elif isinstance(class_attribute, classmethod) or inspect.isfunction(class_attribute):
+                method_value = class_attribute.__get__(value, type(value))
+            elif callable(class_attribute):
+                method_value = class_attribute
+
+            if method_value is None:
+                continue
+
+            method_name_to_value[method_name] = method_value
+
+    return {method_name: method_name_to_value[method_name] for method_name in sorted(method_name_to_value)}
+
+
+def _resolve_public_slot_name_set(*, value: object) -> set[str]:
+    public_slot_name_set: set[str] = set()
+    for value_type in type(value).__mro__:
+        slot_definition = value_type.__dict__.get("__slots__")
+        if slot_definition is None:
+            continue
+
+        if isinstance(slot_definition, str):
+            slot_name_list = [slot_definition]
+        else:
+            slot_name_list = [slot_name for slot_name in slot_definition if isinstance(slot_name, str)]
+
+        for slot_name in slot_name_list:
+            if slot_name.startswith("_"):
+                continue
+            if slot_name in {"__dict__", "__weakref__"}:
+                continue
+            public_slot_name_set.add(slot_name)
+
+    return public_slot_name_set
+
+
+def _resolve_public_field_name_to_value(*, value: object) -> dict[str, object]:
+    field_name_to_value: dict[str, object] = {}
+
+    def add_field(field_name: str, field_value: object) -> None:
+        if field_name.startswith("_"):
+            return
+        if field_name in field_name_to_value:
+            return
+        field_name_to_value[field_name] = field_value
+
+    try:
+        instance_dict = object.__getattribute__(value, "__dict__")
+    except Exception:
+        instance_dict = None
+
+    if isinstance(instance_dict, dict):
+        for field_name, field_value in instance_dict.items():
+            add_field(field_name, field_value)
+
+    if dataclasses.is_dataclass(value) and not isinstance(value, type):
+        for data_field in dataclasses.fields(value):
+            field_name = data_field.name
+            if field_name in field_name_to_value:
+                continue
+            try:
+                field_value = object.__getattribute__(value, field_name)
+            except Exception:
+                continue
+            add_field(field_name, field_value)
+
+    if isinstance(value, BaseModel):
+        for field_name, field_value in value.model_dump(mode="python").items():
+            add_field(field_name, field_value)
+
+    for slot_name in sorted(_resolve_public_slot_name_set(value=value)):
+        if slot_name in field_name_to_value:
+            continue
+        try:
+            slot_value = object.__getattribute__(value, slot_name)
+        except Exception:
+            continue
+        add_field(slot_name, slot_value)
+
+    for value_type in type(value).__mro__:
+        for field_name, class_attribute in value_type.__dict__.items():
+            if field_name in field_name_to_value:
+                continue
+            if field_name.startswith("_"):
+                continue
+            if isinstance(class_attribute, (property, staticmethod, classmethod)):
+                continue
+            if callable(class_attribute):
+                continue
+            add_field(field_name, class_attribute)
+
+    return {field_name: field_name_to_value[field_name] for field_name in sorted(field_name_to_value)}
+
+
+def _render_value_preview_line(
+    *,
+    reference: str,
+    value: object,
+    value_max_tokens: int,
+    token_encoding: tiktoken.Encoding,
+    json_renderer_style: JsonRendererStyle,
+) -> str:
+    reference_type_name = type(value).__name__
+    rendered_name_and_type = f"{reference}: {reference_type_name} = "
+
+    rendered_value, _ = render_json_text(
+        value,
+        max_tokens=value_max_tokens,
+        encoding=token_encoding,
+        style=json_renderer_style,
+    )
+
+    return rendered_name_and_type + rendered_value
+
+
+def _collect_callable_reference_and_value_list(*, reference_and_value_list: list[ReferenceAndValue]) -> list[ReferenceAndValue]:
+    callable_reference_and_value_list: list[ReferenceAndValue] = []
+    for reference, value in reference_and_value_list:
+        if callable(value):
+            callable_reference_and_value_list.append((reference, value))
+            continue
+
+        if not _is_object_capability_candidate(value):
+            continue
+
+        method_name_to_value = _resolve_public_method_name_to_value(value=value)
+        for method_name, method_value in method_name_to_value.items():
+            callable_reference_and_value_list.append((f"{reference}.{method_name}", method_value))
+
+    return callable_reference_and_value_list
+
+
+def _render_object_capability_lines(
+    *,
+    reference: str,
+    value: object,
+    context_limits: StepContextLimits,
+    token_encoding: tiktoken.Encoding,
+    json_renderer_style: JsonRendererStyle,
+    callable_signature_text_to_reference_list: dict[str, list[str]],
+) -> list[str]:
+    lines = [f"{reference}: object = {type(value).__name__}"]
+
+    method_name_to_value = _resolve_public_method_name_to_value(value=value)
+    field_name_to_value = _resolve_public_field_name_to_value(value=value)
+
+    shown_method_count = 0
+    for method_name, method_value in method_name_to_value.items():
+        if shown_method_count >= context_limits.object_max_methods:
+            break
+        method_reference = f"{reference}.{method_name}"
+        lines.append(
+            _render_callable_line(
+                reference=method_reference,
+                value=method_value,
+                callable_signature_text_to_reference_list=callable_signature_text_to_reference_list,
+            )
+        )
+        shown_method_count += 1
+
+    omitted_method_count = len(method_name_to_value) - shown_method_count
+    if omitted_method_count > 0:
+        lines.append(f"{reference}.<methods>: <snipped {omitted_method_count} public methods>")
+
+    shown_field_count = 0
+    for field_name, field_value in field_name_to_value.items():
+        if shown_field_count >= context_limits.object_max_fields:
+            break
+        field_reference = f"{reference}.{field_name}"
+        lines.append(
+            _render_value_preview_line(
+                reference=field_reference,
+                value=field_value,
+                value_max_tokens=context_limits.object_field_value_max_tokens,
+                token_encoding=token_encoding,
+                json_renderer_style=json_renderer_style,
+            )
+        )
+        shown_field_count += 1
+
+    omitted_field_count = len(field_name_to_value) - shown_field_count
+    if omitted_field_count > 0:
+        lines.append(f"{reference}.<fields>: <snipped {omitted_field_count} public fields>")
+
+    return lines
+
+
+def _render_reference_and_value_lines(
+    *,
+    reference: str,
+    value: object,
+    context_limits: StepContextLimits,
+    token_encoding: tiktoken.Encoding,
+    json_renderer_style: JsonRendererStyle,
+    callable_signature_text_to_reference_list: dict[str, list[str]],
+) -> list[str]:
+    if isinstance(value, TypeAliasType):
+        return [f"{reference}: type = {value.__value__}"]
+
+    if callable(value):
+        return [
+            _render_callable_line(
+                reference=reference,
+                value=value,
+                callable_signature_text_to_reference_list=callable_signature_text_to_reference_list,
+            )
+        ]
+
+    if _is_object_capability_candidate(value):
+        return _render_object_capability_lines(
+            reference=reference,
+            value=value,
+            context_limits=context_limits,
+            token_encoding=token_encoding,
+            json_renderer_style=json_renderer_style,
+            callable_signature_text_to_reference_list=callable_signature_text_to_reference_list,
+        )
+
+    return [
+        _render_value_preview_line(
+            reference=reference,
+            value=value,
+            value_max_tokens=context_limits.value_max_tokens,
+            token_encoding=token_encoding,
+            json_renderer_style=json_renderer_style,
+        )
+    ]
+
+
+def _count_rendered_line_list_tokens(*, lines: list[str], token_encoding: tiktoken.Encoding) -> int:
+    total_tokens = 0
+    for line in lines:
+        total_tokens += count_tokens(line, token_encoding) + 1
+    return total_tokens
+
+
 def _render_reference_and_value_list_section(
     *,
     section_name: str,
     step_context: StepContext,
-    reference_and_value_list: list[tuple[str, object]],
+    reference_and_value_list: list[ReferenceAndValue],
     max_items: int,
     section_max_tokens: int,
-    value_max_tokens: int,
+    context_limits: StepContextLimits,
     token_encoding: tiktoken.Encoding,
     json_renderer_style: JsonRendererStyle,
 ) -> str:
@@ -161,42 +426,34 @@ def _render_reference_and_value_list_section(
     total_tokens = 0
     shown_items = 0
     token_limit_reached = False
-    callable_signature_text_to_reference_list = _find_ambiguous_callable_signatures(reference_and_value_list=reference_and_value_list)
+
+    callable_reference_and_value_list = _collect_callable_reference_and_value_list(reference_and_value_list=reference_and_value_list)
+    callable_signature_text_to_reference_list = _find_ambiguous_callable_signatures(reference_and_value_list=callable_reference_and_value_list)
 
     for reference, value in reference_and_value_list:
         if shown_items >= max_items:
             break
 
-        if isinstance(value, TypeAliasType):
-            rendered = f"{reference}: type = {value.__value__}"
-            rendered_tokens = count_tokens(rendered, token_encoding)
-        elif callable(value):
-            rendered = _render_callable_line(
-                reference=reference,
-                value=value,
-                callable_signature_text_to_reference_list=callable_signature_text_to_reference_list,
-            )
-            rendered_tokens = count_tokens(rendered, token_encoding)
-        else:
-            reference_type_name = type(value).__name__
-            rendered_name_and_type = f"{reference}: {reference_type_name} = "
-
-            rendered_value, rendered_value_tokens = render_json_text(
-                value,
-                max_tokens=value_max_tokens,
-                encoding=token_encoding,
-                style=json_renderer_style,
-            )
-
-            rendered = rendered_name_and_type + rendered_value
-            rendered_tokens = count_tokens(rendered_name_and_type, token_encoding) + rendered_value_tokens
-
-        if total_tokens + rendered_tokens + 1 > section_max_tokens:
+        rendered_line_list = _render_reference_and_value_lines(
+            reference=reference,
+            value=value,
+            context_limits=context_limits,
+            token_encoding=token_encoding,
+            json_renderer_style=json_renderer_style,
+            callable_signature_text_to_reference_list=callable_signature_text_to_reference_list,
+        )
+
+        rendered_tokens = _count_rendered_line_list_tokens(
+            lines=rendered_line_list,
+            token_encoding=token_encoding,
+        )
+
+        if total_tokens + rendered_tokens > section_max_tokens:
             token_limit_reached = True
             break
 
-        lines.append(rendered)
-        total_tokens += rendered_tokens + 1
+        lines.extend(rendered_line_list)
+        total_tokens += rendered_tokens
         shown_items += 1
 
     truncated = shown_items < len(reference_and_value_list)
@@ -230,8 +487,7 @@ def _render_locals_section(
     context_limits: StepContextLimits,
     json_renderer_style: JsonRendererStyle,
 ) -> str:
-
-    eligible_reference_and_value_list: list[tuple[str, object]] = []
+    eligible_reference_and_value_list: list[ReferenceAndValue] = []
     for reference in sorted(references):
         if reference.startswith("__"):
             continue
@@ -243,7 +499,7 @@ def _render_locals_section(
         reference_and_value_list=eligible_reference_and_value_list,
         max_items=context_limits.locals_max_items,
         section_max_tokens=context_limits.locals_max_tokens,
-        value_max_tokens=context_limits.value_max_tokens,
+        context_limits=context_limits,
         token_encoding=token_encoding,
         json_renderer_style=json_renderer_style,
     )
@@ -275,8 +531,7 @@ def _render_globals_section(
     context_limits: StepContextLimits,
     json_renderer_style: JsonRendererStyle,
 ) -> str:
-
-    eligible_reference_and_value_list: list[tuple[str, object]] = []
+    eligible_reference_and_value_list: list[ReferenceAndValue] = []
     for reference in sorted(references):
         if reference.startswith("__"):
             continue
@@ -293,12 +548,53 @@ def _render_globals_section(
         reference_and_value_list=eligible_reference_and_value_list,
         max_items=context_limits.globals_max_items,
         section_max_tokens=context_limits.globals_max_tokens,
-        value_max_tokens=context_limits.value_max_tokens,
+        context_limits=context_limits,
         token_encoding=token_encoding,
         json_renderer_style=json_renderer_style,
     )
 
 
+def _resolve_step_prompt_template_text(
+    *,
+    template_text: str,
+    name_to_value: dict[str, str],
+) -> str:
+    template = Template(template_text)
+    return template.safe_substitute(name_to_value)
+
+
+def _resolve_step_system_prompt_text(*, configuration: StepExecutorConfiguration) -> str:
+    return _resolve_step_prompt_template_text(
+        template_text=configuration.prompts.step_system_prompt_template,
+        name_to_value={
+            "tool_result_max_tokens": str(configuration.context_limits.tool_result_max_tokens),
+        },
+    )
+
+
+def _resolve_step_user_prompt_text(
+    *,
+    template_text: str,
+    program_text: str,
+    locals_text: str,
+    globals_text: str,
+    tool_result_max_tokens: int,
+) -> str:
+    return _resolve_step_prompt_template_text(
+        template_text=template_text,
+        name_to_value={
+            "program": program_text,
+            "locals": locals_text,
+            "globals": globals_text,
+            "tool_result_max_tokens": str(tool_result_max_tokens),
+        },
+    )
+
+
+def build_system_prompt(*, configuration: StepExecutorConfiguration) -> str:
+    return _resolve_step_system_prompt_text(configuration=configuration)
+
+
 def build_user_prompt(
     *,
     processed_natural_program: str,
@@ -327,12 +623,12 @@ def build_user_prompt(
         json_renderer_style=configuration.json_renderer_style,
     )
 
-    template = Template(template_text)
-
-    prompt_text = template.substitute(
-        program=program_text,
-        locals=locals_text,
-        globals=globals_text,
+    prompt_text = _resolve_step_user_prompt_text(
+        template_text=template_text,
+        program_text=program_text,
+        locals_text=locals_text,
+        globals_text=globals_text,
+        tool_result_max_tokens=context_limits.tool_result_max_tokens,
     )
 
     suffix_fragments = (

nighthawk/runtime/scoping.py

@@ -2,17 +2,17 @@ from __future__ import annotations
 
 import importlib.metadata
 import threading
-from collections.abc import Iterator, Mapping
+from collections.abc import Iterator, Mapping, Sequence
 from contextlib import contextmanager
 from contextvars import ContextVar
 from copy import copy
 from dataclasses import dataclass, replace
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, Literal
 
 from opentelemetry.trace import Span, get_tracer_provider
 from pydantic_ai.usage import RunUsage
 
-from ..configuration import StepExecutorConfiguration, StepExecutorConfigurationPatch
+from ..configuration import StepExecutorConfiguration
 from ..errors import NighthawkError
 from ..tools.registry import tool_scope
 from ..ulid import generate_ulid
@@ -295,24 +295,28 @@ def run(
 @contextmanager
 def scope(
     *,
+    mode: Literal["inherit", "replace"] = "inherit",
     step_executor_configuration: StepExecutorConfiguration | None = None,
-    step_executor_configuration_patch: StepExecutorConfigurationPatch | None = None,
     step_executor: StepExecutor | None = None,
-    system_prompt_suffix_fragment: str | None = None,
-    user_prompt_suffix_fragment: str | None = None,
+    system_prompt_suffix_fragments: Sequence[str] | None = None,
+    user_prompt_suffix_fragments: Sequence[str] | None = None,
     implicit_references: ImplicitReferenceNameToValue | None = None,
 ) -> Iterator[StepExecutor]:
-    """Open a nested scope that can override the step executor or its configuration.
+    """Open a nested scope that can override the active execution context.
 
-    Must be called inside an active run context. Creates a new scope_id while inheriting the run_id from the parent context.
+    Must be called inside an active run context. Creates a new ``scope_id`` while inheriting the ``run_id`` from the parent context.
 
     Args:
+        mode: Scope composition mode. ``"inherit"`` appends/merges values into the current scope. ``"replace"`` fully replaces provided list/dict values.
+            In both modes, ``None`` means no change.
         step_executor_configuration: Full replacement configuration for the step executor.
-        step_executor_configuration_patch: Partial override applied on top of the current configuration.
         step_executor: Replacement step executor for this scope.
-        system_prompt_suffix_fragment: Additional text appended to the system prompt.
-        user_prompt_suffix_fragment: Additional text appended to the user prompt.
-        implicit_references: Additional implicit global references merged into this scope and inherited by nested scopes.
+        system_prompt_suffix_fragments: Additional system prompt suffix fragments.
+            In ``mode="inherit"``, fragments are appended. In ``mode="replace"``, provided fragments fully replace the current fragments.
+        user_prompt_suffix_fragments: Additional user prompt suffix fragments.
+            In ``mode="inherit"``, fragments are appended. In ``mode="replace"``, provided fragments fully replace the current fragments.
+        implicit_references: Implicit global references for this scope.
+            In ``mode="inherit"``, values are merged with conflict checks. In ``mode="replace"``, provided mappings fully replace the current mapping.
 
     Yields:
         The step executor active within this scope.
@@ -321,9 +325,9 @@ def scope(
         ```python
         with nighthawk.run(executor):
             with nighthawk.scope(
-                step_executor_configuration_patch=StepExecutorConfigurationPatch(
-                    model="openai:gpt-5.4-mini",
-                ),
+                mode="replace",
+                implicit_references={},
+                system_prompt_suffix_fragments=["Use concise answers."],
             ) as scoped_executor:
                 result = my_natural_function()
         ```
@@ -332,31 +336,13 @@ def scope(
     current_execution_context = get_execution_context()
 
     next_step_executor = current_step_executor
-
     if step_executor is not None:
         next_step_executor = step_executor
 
-    has_configuration_update = any(
-        value is not None
-        for value in (
-            step_executor_configuration,
-            step_executor_configuration_patch,
-        )
-    )
-
-    if has_configuration_update:
-        current_agent_step_executor = _resolve_agent_step_executor(next_step_executor)
-        next_configuration = current_agent_step_executor.configuration
-
-        if step_executor_configuration is not None:
-            next_configuration = step_executor_configuration
-
-        if step_executor_configuration_patch is not None:
-            next_configuration = step_executor_configuration_patch.apply_to(next_configuration)
-
+    if step_executor_configuration is not None:
         next_step_executor = _replace_step_executor_with_configuration(
             next_step_executor,
-            configuration=next_configuration,
+            configuration=step_executor_configuration,
         )
 
     next_execution_context = replace(
@@ -364,27 +350,36 @@ def scope(
         scope_id=generate_ulid(),
     )
 
-    next_system_fragments = _system_prompt_suffix_fragments_var.get()
-    next_user_fragments = _user_prompt_suffix_fragments_var.get()
+    next_system_prompt_suffix_fragments = _system_prompt_suffix_fragments_var.get()
+    next_user_prompt_suffix_fragments = _user_prompt_suffix_fragments_var.get()
     next_implicit_reference_name_to_value = _implicit_reference_name_to_value_var.get()
 
-    if system_prompt_suffix_fragment is not None:
-        next_system_fragments = (*next_system_fragments, system_prompt_suffix_fragment)
+    if system_prompt_suffix_fragments is not None:
+        if mode == "inherit":
+            next_system_prompt_suffix_fragments = (*next_system_prompt_suffix_fragments, *system_prompt_suffix_fragments)
+        else:
+            next_system_prompt_suffix_fragments = tuple(system_prompt_suffix_fragments)
 
-    if user_prompt_suffix_fragment is not None:
-        next_user_fragments = (*next_user_fragments, user_prompt_suffix_fragment)
+    if user_prompt_suffix_fragments is not None:
+        if mode == "inherit":
+            next_user_prompt_suffix_fragments = (*next_user_prompt_suffix_fragments, *user_prompt_suffix_fragments)
+        else:
+            next_user_prompt_suffix_fragments = tuple(user_prompt_suffix_fragments)
 
     if implicit_references is not None:
-        next_implicit_reference_name_to_value = _merge_implicit_reference_name_to_value_with_conflict_check(
-            next_implicit_reference_name_to_value,
-            implicit_references,
-        )
+        if mode == "inherit":
+            next_implicit_reference_name_to_value = _merge_implicit_reference_name_to_value_with_conflict_check(
+                next_implicit_reference_name_to_value,
+                implicit_references,
+            )
+        else:
+            next_implicit_reference_name_to_value = dict(implicit_references)
 
     with tool_scope():
         step_executor_token = _step_executor_var.set(next_step_executor)
         execution_context_token = _execution_context_var.set(next_execution_context)
-        system_fragments_token = _system_prompt_suffix_fragments_var.set(next_system_fragments)
-        user_fragments_token = _user_prompt_suffix_fragments_var.set(next_user_fragments)
+        system_fragments_token = _system_prompt_suffix_fragments_var.set(next_system_prompt_suffix_fragments)
+        user_fragments_token = _user_prompt_suffix_fragments_var.set(next_user_prompt_suffix_fragments)
         implicit_reference_name_to_value_token = _implicit_reference_name_to_value_var.set(next_implicit_reference_name_to_value)
         try:
             with span(

nighthawk/runtime/step_executor.py

@@ -11,7 +11,7 @@ from ..errors import ExecutionError
 from ..tools.execution import ToolResultWrapperToolset
 from ..tools.registry import get_visible_tools
 from .async_bridge import run_coroutine_synchronously
-from .prompt import build_user_prompt, extract_references_and_program
+from .prompt import build_system_prompt, build_user_prompt, extract_references_and_program
 from .scoping import (
     get_current_usage_meter,
     get_system_prompt_suffix_fragments,
@@ -108,11 +108,13 @@ def _new_agent_step_executor(
     if configuration.model_settings is not None:
         constructor_arguments["model_settings"] = configuration.model_settings
 
+    system_prompt_text = build_system_prompt(configuration=configuration)
+
     agent = Agent(
         model=model,
         output_type=StepFinalResult,
         deps_type=StepContext,
-        system_prompt=configuration.prompts.step_system_prompt_template,
+        system_prompt=system_prompt_text,
         **constructor_arguments,
     )
 

nighthawk/tools/contracts.py

@@ -38,7 +38,7 @@ def render_tool_result_json_text(
 ) -> str:
     """Render a tool result envelope as compact JSON text.
 
-    Both ``value`` and ``error`` are individually rendered under their own
+    Both ``value`` and ``error`` are individually previewed under their own
     token budgets via ``render_json_text``, then assembled into a
     ``{"value": ..., "error": ...}`` envelope using f-string interpolation.
     The sub-values are already valid JSON fragments produced by

{nighthawk_python-0.7.0.dist-info → nighthawk_python-0.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nighthawk-python
-Version: 0.7.0
+Version: 0.9.0
 Summary: A Python library where Python controls flow and LLMs or coding agents reason within constrained Natural blocks.
 Project-URL: Repository, https://github.com/kurusugawa-computer/nighthawk-python
 Project-URL: Documentation, https://kurusugawa-computer.github.io/nighthawk-python/

{nighthawk_python-0.7.0.dist-info → nighthawk_python-0.9.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
-nighthawk/__init__.py,sha256=AYep0vIYT0t5p6Qb-GyhEY5u0Kmp9nP6-jRZhkgWDn4,1382
-nighthawk/configuration.py,sha256=M8y8fcH7m6Clhw50ya5LCF-Vu5Xv0Wx_VH-LHdmCa34,7538
+nighthawk/__init__.py,sha256=YqE9InkNzbW12v9Bh3qF4INLUHfJfmNT_hPqmE_kNb8,1308
+nighthawk/configuration.py,sha256=1gtdLxcDMMnvz9t2fBZP-U-MHW54IHWmInSPiByTaGo,6286
 nighthawk/errors.py,sha256=CSw_VfIoppCE2SdN2zMtVbMGu_wFwD628v8ZAVxeHIY,602
 nighthawk/identifier_path.py,sha256=Io3VcT8BlxAASHQUSUclrRcCwnRKTtMDPSR1bpaDN6s,984
 nighthawk/json_renderer.py,sha256=ixpUYTsVVKOp-iMdHldw7-6I3JxelXOQD8vK2KVXwbw,7640
@@ -27,20 +27,20 @@ nighthawk/resilience/_timeout.py,sha256=L5zWSXmhEYIyWlEjut0nA7ur3oRDOn_2JrhpBw_v
 nighthawk/resilience/_vote.py,sha256=YV0MTYWwFsHBEbGJhfDByCYaFSuuE6rZYB2VnILx0Es,4616
 nighthawk/runtime/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nighthawk/runtime/async_bridge.py,sha256=k1s7e5dJEMNZJd0xHqkqAY7VkE7tOBzJf6nAEJH_Xh0,1478
-nighthawk/runtime/prompt.py,sha256=cd9lu9UJU9_Fvjl4oxm3NqnPJZkpZV3v6RQ4eMSa-sM,12360
+nighthawk/runtime/prompt.py,sha256=fod1f8wS2xKoc3RM44eB8wrKwPmap9K1gwLw4EzUSP4,22669
 nighthawk/runtime/runner.py,sha256=saVkEeMkVfz1cm_AVaz8I23Y5OiWuWthqwv-z_4kwwY,23121
-nighthawk/runtime/scoping.py,sha256=jWvlNYMJ25cv3n0uA60vDkR9O-BBjREw1JVx6I9ChvY,14614
+nighthawk/runtime/scoping.py,sha256=oa3SqjxctFQtTTZNYFj-scvf5Q0_zaVtluh8V1h8pqE,14986
 nighthawk/runtime/step_context.py,sha256=-MafRMUV9fo0IBTGnQfAF72IyQy90ZoUS9SK77OVgPc,5529
 nighthawk/runtime/step_contract.py,sha256=2rbZpUBbmWGTogAksYerIAZfv2xgBgaNmidWxjJtfmY,6391
-nighthawk/runtime/step_executor.py,sha256=xicyn5tuiaOqaCsl33rGqrZBEgeMCyQAfn3YA_k6CtI,12782
+nighthawk/runtime/step_executor.py,sha256=Y4P7PuGzJT64FIwjhU2gABxoqHf6wPTXMiSFTSfkK6U,12847
 nighthawk/runtime/tool_calls.py,sha256=rPLzp2iLdOIWDYvJFw7nMcbo2i786YHHE-gm2_clfB4,3076
 nighthawk/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nighthawk/tools/assignment.py,sha256=5_VrhuM2KUBz6RHE5kNOnVC-NZUO0x2N3QvNE17z0GY,9462
-nighthawk/tools/contracts.py,sha256=lLfBue1VF8NMd76GMIp6y71cCx1p4MlVQyNhd4Ju2qk,2096
+nighthawk/tools/contracts.py,sha256=9bFj88GiRqwyUSfjhZxY3jhtQafdBP3RvDSz6-QCYPs,2097
 nighthawk/tools/execution.py,sha256=e1uv09MWOkCoZ5uQu9myUXyhQzM_UziR9yE0raFYtQI,2740
 nighthawk/tools/provided.py,sha256=gsZ7xcrNmEmwcvdkQi4YndTAIcfpwY1jTxpKJsYU4QQ,2079
 nighthawk/tools/registry.py,sha256=wsZznwI2xPTflN6tfVE8je5keNVqBHHtTPd9bq0Cu7g,6425
-nighthawk_python-0.7.0.dist-info/METADATA,sha256=d2B15wRPtQT5RYhPLJqCHRFf3Q09Or4vaDgjPTPEbdo,6192
-nighthawk_python-0.7.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-nighthawk_python-0.7.0.dist-info/licenses/LICENSE,sha256=R8tjrX79o5Pbi_l_aFPPWDbTZkmz4is0CxmzMMs3f0A,1076
-nighthawk_python-0.7.0.dist-info/RECORD,,
+nighthawk_python-0.9.0.dist-info/METADATA,sha256=DIyU5rb7e0BvfBfC7hbiw8vc8SIeDQRapJ1XTM0gDg0,6192
+nighthawk_python-0.9.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+nighthawk_python-0.9.0.dist-info/licenses/LICENSE,sha256=R8tjrX79o5Pbi_l_aFPPWDbTZkmz4is0CxmzMMs3f0A,1076
+nighthawk_python-0.9.0.dist-info/RECORD,,