Merge branch 'main' into fix/builder-assistant-special-app-name

Author: rohityan

.agents/skills/adk-pr-triage/SKILL.md

@@ -141,6 +141,10 @@ If the user selects **Local Review**, run the following structured sequence:
    * *What it does*: This script automatically checks the Google CLA signature status again, attempts to update the PR branch on GitHub by rebasing onto `main`, and if rebase-update is blocked, falls back to updating via a merge commit. It handles all outputs and fallbacks gracefully.
 2. **Step 1: Checkout the PR to a Local Branch**:
    * Branch naming convention: `pr-triage-<pr_number>-[short_desc]` (e.g. `pr-triage-5875-parallelize-tool-union`).
+   * Fetch the latest main branch from origin before checking out the PR:
+     ```bash
+     git fetch origin main
+     ```
    * Fetch the pull request ref directly from the remote GitHub endpoint:
      ```bash
      git fetch https://github.com/google/adk-python.git pull/<pr_number>/head:pr-triage-<pr_number>-[short_desc]
@@ -156,9 +160,14 @@ If the user selects **Local Review**, run the following structured sequence:
        ```bash
        git log -1 --pretty=%B
        ```
-     * **Multiple Commits**: Squash them into a single local commit first, keeping the overall PR Title and PR Body as the exact commit message. An elegant way to squash is:
+     * **Multiple Commits**: Squash them into a single local commit first, keeping the overall PR Title and PR Body as the exact commit message, AND preserving the original author. An elegant way to squash is:
        ```bash
-       git reset --soft $(git merge-base HEAD origin/main) && git commit -m "<PR message>"
+       # 1. Capture the original author
+       ORIG_AUTHOR=$(git log -1 --format='%an <%ae>')
+
+       # 2. Reset to base and commit with the original author
+       git reset --soft $(git merge-base HEAD origin/main)
+       git commit --author="$ORIG_AUTHOR" -m "<PR message>"
        ```
    * Append `"Merge <PR link>"` to the very end of the commit message (separated by a blank line). Use this elegant shell command to do it in one-shot:
      ```bash

src/google/adk/cli/api_server.py

@@ -817,6 +817,7 @@ def _setup_runtime_config(self, web_assets_dir: str):
       os.makedirs(os.path.dirname(runtime_config_path), exist_ok=True)
       with open(runtime_config_path, "w") as f:
         json.dump(runtime_config, f, indent=2)
+        f.write("\n")
     except IOError as e:
       logger.error(
           "Failed to write runtime config file %s: %s", runtime_config_path, e

src/google/adk/evaluation/eval_metrics.py

@@ -67,6 +67,10 @@ class PrebuiltMetrics(Enum):
 
   MULTI_TURN_TOOL_USE_QUALITY_V1 = "multi_turn_tool_use_quality_v1"
 
+  RUBRIC_BASED_MULTI_TURN_TRAJECTORY_QUALITY_V1 = (
+      "rubric_based_multi_turn_trajectory_quality_v1"
+  )
+
 
 MetricName: TypeAlias = Union[str, PrebuiltMetrics]
 Threshold: TypeAlias = float

src/google/adk/evaluation/metric_evaluator_registry.py

@@ -33,6 +33,7 @@
 from .metric_info_providers import PerTurnUserSimulatorQualityV1MetricInfoProvider
 from .metric_info_providers import ResponseEvaluatorMetricInfoProvider
 from .metric_info_providers import RubricBasedFinalResponseQualityV1EvaluatorMetricInfoProvider
+from .metric_info_providers import RubricBasedMultiTurnTrajectoryMetricInfoProvider
 from .metric_info_providers import RubricBasedToolUseV1EvaluatorMetricInfoProvider
 from .metric_info_providers import SafetyEvaluatorV1MetricInfoProvider
 from .metric_info_providers import TrajectoryEvaluatorMetricInfoProvider
@@ -41,6 +42,7 @@
 from .multi_turn_trajectory_quality_evaluator import MultiTurnTrajectoryQualityV1Evaluator
 from .response_evaluator import ResponseEvaluator
 from .rubric_based_final_response_quality_v1 import RubricBasedFinalResponseQualityV1Evaluator
+from .rubric_based_multi_turn_trajectory_evaluator import RubricBasedMultiTurnTrajectoryEvaluator
 from .rubric_based_tool_use_quality_v1 import RubricBasedToolUseV1Evaluator
 from .safety_evaluator import SafetyEvaluatorV1
 from .simulation.per_turn_user_simulator_quality_v1 import PerTurnUserSimulatorQualityV1
@@ -164,6 +166,10 @@ def _get_default_metric_evaluator_registry() -> MetricEvaluatorRegistry:
       metric_info=PerTurnUserSimulatorQualityV1MetricInfoProvider().get_metric_info(),
       evaluator=PerTurnUserSimulatorQualityV1,
   )
+  metric_evaluator_registry.register_evaluator(
+      metric_info=RubricBasedMultiTurnTrajectoryMetricInfoProvider().get_metric_info(),
+      evaluator=RubricBasedMultiTurnTrajectoryEvaluator,
+  )
 
   return metric_evaluator_registry
 

src/google/adk/evaluation/metric_info_providers.py

@@ -242,3 +242,21 @@ def get_metric_info(self) -> MetricInfo:
             interval=Interval(min_value=0.0, max_value=1.0)
         ),
     )
+
+
+class RubricBasedMultiTurnTrajectoryMetricInfoProvider(MetricInfoProvider):
+  """Metric info provider for RubricBasedMultiTurnTrajectory."""
+
+  def get_metric_info(self) -> MetricInfo:
+    return MetricInfo(
+        metric_name=PrebuiltMetrics.RUBRIC_BASED_MULTI_TURN_TRAJECTORY_QUALITY_V1,
+        description=(
+            "This metric evaluates the agent's multi-turn trajectory against"
+            " a set of user-provided rubrics using an LLM as a judge. Value"
+            " range for this metric is [0,1], with values closer to 1 more"
+            " desirable."
+        ),
+        metric_value_info=MetricValueInfo(
+            interval=Interval(min_value=0.0, max_value=1.0)
+        ),
+    )