From 29c8af2327b5b31e24386709e8083ad98df6f8e5 Mon Sep 17 00:00:00 2001
From: Xiao Cui <constantine124@gmail.com>
Date: Sun, 4 Jan 2026 18:32:40 -0500
Subject: [PATCH] fix: resolve FINAL_VAR to actual variable value instead of
 returning tuple

The find_final_answer() function returns a tuple ("FINAL_VAR", "var_name"),
but the caller was passing this tuple directly as the final answer instead
of resolving the variable from environment.locals.

- Refactor check_for_final_answer() to take env_locals dict directly
- Remove broken logger.log_tool_execution() dependency (method didn't exist)
- Use check_for_final_answer() in rlm.py to properly resolve FINAL_VAR
---
 rlm/core/rlm.py      |  4 ++--
 rlm/utils/parsing.py | 37 +++++++++++++++++--------------------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/rlm/core/rlm.py b/rlm/core/rlm.py
index 80a3792ad..267017cf2 100644
--- a/rlm/core/rlm.py
+++ b/rlm/core/rlm.py
@@ -16,8 +16,8 @@
 from rlm.environments import BaseEnv, get_environment
 from rlm.logger import RLMLogger, VerbosePrinter
 from rlm.utils.parsing import (
+    check_for_final_answer,
     find_code_blocks,
-    find_final_answer,
     format_iteration,
 )
 from rlm.utils.prompts import (
@@ -186,7 +186,7 @@ def completion(
                 )
 
                 # Check if RLM is done and has a final answer.
-                final_answer = find_final_answer(iteration.response)
+                final_answer = check_for_final_answer(iteration.response, environment.locals)
                 iteration.final_answer = final_answer
 
                 # If logger is used, log the iteration.
diff --git a/rlm/utils/parsing.py b/rlm/utils/parsing.py
index 0f871cf7a..b13b37169 100644
--- a/rlm/utils/parsing.py
+++ b/rlm/utils/parsing.py
@@ -115,8 +115,16 @@ def format_execution_result(result: REPLResult) -> str:
     return "\n\n".join(result_parts) if result_parts else "No output"
 
 
-def check_for_final_answer(response: str, repl_env, logger) -> str | None:
-    """Check if response contains a final answer."""
+def check_for_final_answer(response: str, env_locals: dict) -> str | None:
+    """Check if response contains a final answer and resolve it.
+
+    Args:
+        response: The LLM response text to check for FINAL/FINAL_VAR patterns.
+        env_locals: Dictionary of local variables from the REPL environment.
+
+    Returns:
+        The resolved final answer string, or None if not found.
+    """
     result = find_final_answer(response)
     if result is None:
         return None
@@ -126,24 +134,13 @@ def check_for_final_answer(response: str, repl_env, logger) -> str | None:
     if answer_type == "FINAL":
         return content
     elif answer_type == "FINAL_VAR":
-        # Get the variable directly from the REPL environment
-        try:
-            # Strip spaces, quotes, and newlines from variable name
-            variable_name = content.strip().strip('"').strip("'").strip("\n").strip("\r")
-
-            # Check if variable exists in the REPL environment's locals
-            if variable_name in repl_env.locals:
-                variable_value = repl_env.locals[variable_name]
-                return str(variable_value)
-            else:
-                error_msg = f"Variable '{variable_name}' not found in REPL environment"
-                logger.log_tool_execution("FINAL_VAR", error_msg)
-                return None
-        except Exception as e:
-            error_msg = f"Error retrieving variable '{variable_name}': {str(e)}"
-            print("ERROR MESSAGE", error_msg)
-            logger.log_tool_execution("FINAL_VAR", error_msg)
-            return None
+        # Strip spaces, quotes, and newlines from variable name
+        variable_name = content.strip().strip('"').strip("'").strip("\n").strip("\r")
+
+        # Check if variable exists in the environment's locals
+        if variable_name in env_locals:
+            return str(env_locals[variable_name])
+        return None
 
     return None