make sure only single command starts with "ros2".

Signed-off-by: Tomoya Fujita <[email protected]>

Author: fujitatomoya

ros2ai/api/constants.py

@@ -15,7 +15,7 @@
 # This is only required when actually accessing api.openai.com
 ROS_OPENAI_API_KEY_ENV_VAR = 'OPENAI_API_KEY'
 
-ROS_OPENAI_DEFAULT_MODEL = 'gpt-4o'
+ROS_OPENAI_DEFAULT_MODEL = 'gpt-5'
 ROS_OLLAMA_DEFAULT_MODEL = 'llama3.1'
 
 ROS_OPENAI_MODEL_NAME_ENV_VAR = 'OPENAI_MODEL_NAME'
@@ -35,8 +35,8 @@
     'You are a Robot Operating System version 2 (as known as ROS2) {} distribution ' \
     'professional assistant who can provide helpful answers against any questions.'
 ROLE_SYSTEM_EXEC_DEFAULT = \
-    'You are a Robot Operating System 2 (as known as ROS2) {} distribution command line executor, ' \
-    'provides executable command string only without any comments or code blocks or backticks.'
+    'You are a Robot Operating System 2 (as known as ROS 2) {} distribution command line executor, ' \
+    'provides single executable command string only without any comments or code blocks or backticks.'
 ROLE_SYSTEM_ENV_VAR = 'OPENAI_ROLE_SYSTEM'
 
 # Temperature controls the consistency for behavior. (range 0.0 - 2.0)

ros2ai/api/utils.py

@@ -15,6 +15,7 @@
 import signal
 import subprocess
 import os
+import re
 
 def run_command(*, command, argv = None, prefix = None):
     """
@@ -118,3 +119,37 @@ def remove_backticks(string) -> str:
     :return: The string without backticks.
     """
     return string.replace('`', '')
+
+def ros2_single_command(command_string) -> str:
+    """
+    Check if the command string contains only a single command (no command separators).
+    If multiple commands are found, extract the first 'ros2' command and warn the user.
+
+    :command_string: The command string to validate.
+    :return: The validated single command string, or the first 'ros2' command if multiple found.
+    """
+    # Common command separators in shell
+    separators = [';', '&&', '||', '&', '|']
+
+    # Strip whitespace and check for separators
+    cleaned_command = command_string.strip()
+
+    # Check if command contains separators
+    has_separators = any(separator in cleaned_command for separator in separators)
+
+    if has_separators:
+        print(f"Warning: Multiple commands detected in \"{command_string}\". Only the first 'ros2' command will be executed.")
+
+        # Split by all separators and find first ros2 command
+        pattern = '|'.join(re.escape(sep) for sep in separators)
+        commands = re.split(pattern, cleaned_command)
+
+        for cmd in commands:
+            cmd = cmd.strip()
+            if cmd.startswith('ros2'):
+                return cmd
+
+        # If no ros2 command found, return the first command
+        return commands[0].strip() if commands else ""
+
+    return cleaned_command

ros2ai/verb/exec.py

@@ -16,7 +16,7 @@
 from ros2ai.api.config import get_role_system
 from ros2ai.api.constants import ROLE_SYSTEM_EXEC_DEFAULT
 from ros2ai.api.openai import ChatCompletionClient, ChatCompletionParameters
-from ros2ai.api.utils import get_ros_distro, run_executable, truncate_before_substring, remove_backticks
+from ros2ai.api.utils import get_ros_distro, run_executable, truncate_before_substring, remove_backticks, ros2_single_command
 from ros2ai.verb import VerbExtension
 
 
@@ -71,9 +71,11 @@ def main(self, *, args):
         if (args.debug is True):
             client.print_all()
             print(f"System role:\n{system_role}")
+        # Extract command from the response
         command_str = truncate_before_substring(
             original = client.get_result(), substring = 'ros2')
         command_str = remove_backticks(command_str)
+        command_str = ros2_single_command(command_str)
         if not args.dry_run:
             return_code = run_executable(command = command_str)
             return return_code

scripts/verification.sh

@@ -29,8 +29,11 @@ command_list=(
     "ros2 ai query -h"
     "ros2 ai query \"say hello\""
     "ros2 ai query \"say hello\" -nv"
-    "ros2 ai query \"say hello\" -m gpt-5 -t 100"
-    "ros2 ai exec \"give me all topics\""
+    "ros2 ai query \"say hello\" -m gpt-5 -t 1000"
+    "ros2 ai exec -m o3 \"give me all topics\""
+    "ros2 ai exec -m o4-mini \"give me all topics\""
+    "ros2 ai exec -m gpt-5 \"give me all topics\""
+    "ros2 ai exec -m gemini-2.5-pro \"give me all topics\""
     "ros2 ai exec \"give me all topics\" --dry-run"
     "ros2 ai exec \"give me all topics\" -d"
 )