fix(converters): replace "Continue" and "(empty)" with "(empty placeholder)" (#171)

Author: jwadow

kiro/config.py

@@ -555,7 +555,7 @@ def _warn_timeout_configuration():
 # Application Version
 # ==================================================================================================
 
-APP_VERSION: str = "2.4"
+APP_VERSION: str = "2.4.dev.13"
 APP_TITLE: str = "Kiro Gateway"
 APP_DESCRIPTION: str = "Proxy gateway for Kiro API (Amazon Q Developer / AWS CodeWhisperer). OpenAI and Anthropic compatible. Made by @jwadow"
 

kiro/converters_core.py

@@ -965,7 +965,7 @@ def strip_all_tool_content(messages: List[UnifiedMessage]) -> Tuple[List[Unified
                     content_parts.append(result_text)
 
             # Join all parts with double newline
-            content = "\n\n".join(content_parts) if content_parts else "(empty)"
+            content = "\n\n".join(content_parts) if content_parts else "(empty placeholder)"
 
             # Create a copy of the message without tool content but with text representation
             # IMPORTANT: Preserve images from the original message (e.g., screenshots from MCP tools)
@@ -1179,7 +1179,7 @@ def ensure_first_message_is_user(messages: List[UnifiedMessage]) -> List[Unified
         >>> result[0].role
         'user'
         >>> result[0].content
-        '(empty)'
+        '(empty placeholder)'
     """
     if not messages:
         return messages
@@ -1189,12 +1189,11 @@ def ensure_first_message_is_user(messages: List[UnifiedMessage]) -> List[Unified
             f"First message is '{messages[0].role}', prepending synthetic user message "
             f"(Kiro API requires conversations to start with user)"
         )
-        
         # Create minimal synthetic user message (matches LiteLLM behavior)
-        # Using "(empty)" as minimal valid content to avoid disrupting conversation context
+        # Using "(empty placeholder)" as minimal valid content to avoid disrupting conversation context
         synthetic_user = UnifiedMessage(
             role="user",
-            content="(empty)"
+            content="(empty placeholder)"
         )
 
         return [synthetic_user] + messages
@@ -1263,7 +1262,7 @@ def ensure_alternating_roles(messages: List[UnifiedMessage]) -> List[UnifiedMess
     
     Kiro API requires alternating userInputMessage and assistantResponseMessage.
     When consecutive user messages are detected, synthetic assistant messages
-    with "(empty)" placeholder are inserted between them to maintain alternation.
+    with "(empty placeholder)" placeholder are inserted between them to maintain alternation.
     
     This fixes multiple unknown roles (converted to user)
     create consecutive userInputMessage entries that violate Kiro API requirements.
@@ -1286,7 +1285,7 @@ def ensure_alternating_roles(messages: List[UnifiedMessage]) -> List[UnifiedMess
         >>> result[1].role
         'assistant'
         >>> result[1].content
-        '(empty)'
+        '(empty placeholder)'
     """
     if not messages or len(messages) < 2:
         return messages
@@ -1301,7 +1300,7 @@ def ensure_alternating_roles(messages: List[UnifiedMessage]) -> List[UnifiedMess
         if msg.role == "user" and prev_role == "user":
             synthetic_assistant = UnifiedMessage(
                 role="assistant",
-                content="(empty)"  # Consistent with build_kiro_history() placeholder
+                content="(empty placeholder)"  # Consistent with build_kiro_history() placeholder
             )
             result.append(synthetic_assistant)
             synthetic_count += 1
@@ -1343,7 +1342,7 @@ def build_kiro_history(messages: List[UnifiedMessage], model_id: str) -> List[Di
 
             # Fallback for empty content - Kiro API requires non-empty content
             if not content:
-                content = "(empty)"
+                content = "(empty placeholder)"
 
             user_input = {
                 "content": content,
@@ -1385,7 +1384,7 @@ def build_kiro_history(messages: List[UnifiedMessage], model_id: str) -> List[Di
 
             # Fallback for empty content - Kiro API requires non-empty content
             if not content:
-                content = "(empty)"
+                content = "(empty placeholder)"
 
             assistant_response = {"content": content}
 
@@ -1504,18 +1503,18 @@ def build_kiro_payload(
         current_content = f"{full_system_prompt}\n\n{current_content}"
 
     # If current message is assistant, need to add it to history
-    # and create user message "Continue"
+    # and create user message placeholder
     if current_message.role == "assistant":
         history.append({
             "assistantResponseMessage": {
                 "content": current_content
             }
         })
-        current_content = "Continue"
+        current_content = "(empty placeholder)"
 
-    # If content is empty - use "Continue"
+    # If content is empty - use placeholder
     if not current_content:
-        current_content = "Continue"
+        current_content = "(empty placeholder)"
 
     # Process images in current message - extract from message or content
     # IMPORTANT: images go directly into userInputMessage, NOT into userInputMessageContext

tests/unit/test_converters_core.py

@@ -1342,7 +1342,7 @@ def test_prepends_synthetic_user_when_first_is_assistant(self):
 
         print("Checking first message is synthetic user...")
         assert result[0].role == "user"
-        assert result[0].content == "(empty)"
+        assert result[0].content == "(empty placeholder)"
 
         print("Checking original messages are preserved...")
         assert result[1].role == "assistant"
@@ -1379,7 +1379,7 @@ def test_handles_single_assistant_message(self):
         print(f"Comparing length: Expected 2 (synthetic + original), Got {len(result)}")
         assert len(result) == 2
         assert result[0].role == "user"
-        assert result[0].content == "(empty)"
+        assert result[0].content == "(empty placeholder)"
         assert result[1].role == "assistant"
 
     def test_handles_assistant_user_assistant_sequence(self):
@@ -1400,7 +1400,7 @@ def test_handles_assistant_user_assistant_sequence(self):
         print(f"Comparing length: Expected 4 (synthetic + 3 original), Got {len(result)}")
         assert len(result) == 4
         assert result[0].role == "user"
-        assert result[0].content == "(empty)"
+        assert result[0].content == "(empty placeholder)"
         assert result[1].role == "assistant"
         assert result[2].role == "user"
         assert result[3].role == "assistant"
@@ -1429,7 +1429,7 @@ def test_preserves_tool_calls_in_assistant_message(self):
         print("Checking synthetic user was prepended...")
         assert len(result) == 2
         assert result[0].role == "user"
-        assert result[0].content == "(empty)"
+        assert result[0].content == "(empty placeholder)"
 
         print("Checking tool_calls are preserved...")
         assert result[1].role == "assistant"
@@ -1463,7 +1463,7 @@ def test_preserves_images_in_messages(self):
 
     def test_uses_minimal_content_for_synthetic_message(self):
         """
-        What it does: Verifies synthetic message uses minimal content ("(empty)").
+        What it does: Verifies synthetic message uses minimal content ("(empty placeholder)").
         Purpose: Ensure minimal token usage and avoid disrupting conversation context.
         """
         print("Setup: Assistant-first conversation...")
@@ -1475,7 +1475,7 @@ def test_uses_minimal_content_for_synthetic_message(self):
         result = ensure_first_message_is_user(messages)
 
         print("Checking synthetic message content...")
-        assert result[0].content == "(empty)"
+        assert result[0].content == "(empty placeholder)"
         print("✓ Synthetic message uses minimal content (matches LiteLLM behavior)")
 
 
@@ -1685,7 +1685,7 @@ class TestEnsureAlternatingRoles:
     Tests for ensure_alternating_roles function.
     
     This function ensures alternating user/assistant roles by inserting synthetic
-    assistant messages with "(empty)" content between consecutive user messages.
+    assistant messages with "(empty placeholder)" content between consecutive user messages.
     This is part of the fix for Issue #64 where multiple 'developer' roles
     (converted to 'user') create consecutive userInputMessage entries.
     """
@@ -1710,7 +1710,7 @@ def test_inserts_synthetic_assistant_between_two_consecutive_users(self):
         assert result[0].role == "user"
         assert result[0].content == "First"
         assert result[1].role == "assistant"
-        assert result[1].content == "(empty)"
+        assert result[1].content == "(empty placeholder)"
         assert result[2].role == "user"
         assert result[2].content == "Second"
 
@@ -1734,11 +1734,11 @@ def test_inserts_multiple_synthetic_assistants_for_four_consecutive_users(self):
         assert len(result) == 7
         print("Checking alternation pattern...")
         assert result[0].role == "user" and result[0].content == "First"
-        assert result[1].role == "assistant" and result[1].content == "(empty)"
+        assert result[1].role == "assistant" and result[1].content == "(empty placeholder)"
         assert result[2].role == "user" and result[2].content == "Second"
-        assert result[3].role == "assistant" and result[3].content == "(empty)"
+        assert result[3].role == "assistant" and result[3].content == "(empty placeholder)"
         assert result[4].role == "user" and result[4].content == "Third"
-        assert result[5].role == "assistant" and result[5].content == "(empty)"
+        assert result[5].role == "assistant" and result[5].content == "(empty placeholder)"
         assert result[6].role == "user" and result[6].content == "Fourth"
 
     def test_preserves_already_alternating_messages(self):
@@ -1787,15 +1787,15 @@ def test_handles_multiple_groups_of_consecutive_users(self):
         assert len(result) == 9
         print("Checking first group (A, synthetic, B)...")
         assert result[0].role == "user" and result[0].content == "A"
-        assert result[1].role == "assistant" and result[1].content == "(empty)"
+        assert result[1].role == "assistant" and result[1].content == "(empty placeholder)"
         assert result[2].role == "user" and result[2].content == "B"
         print("Checking real assistant...")
         assert result[3].role == "assistant" and result[3].content == "C"
         print("Checking second group (D, synthetic, E, synthetic, F)...")
         assert result[4].role == "user" and result[4].content == "D"
-        assert result[5].role == "assistant" and result[5].content == "(empty)"
+        assert result[5].role == "assistant" and result[5].content == "(empty placeholder)"
         assert result[6].role == "user" and result[6].content == "E"
-        assert result[7].role == "assistant" and result[7].content == "(empty)"
+        assert result[7].role == "assistant" and result[7].content == "(empty placeholder)"
         assert result[8].role == "user" and result[8].content == "F"
 
     def test_handles_empty_list(self):
@@ -1931,11 +1931,11 @@ def test_developer_messages_are_normalized_and_alternated(self):
         assert len(result) == 7
         print("Checking alternation pattern...")
         assert result[0].role == "user" and result[0].content == "Context 1"
-        assert result[1].role == "assistant" and result[1].content == "(empty)"
+        assert result[1].role == "assistant" and result[1].content == "(empty placeholder)"
         assert result[2].role == "user" and result[2].content == "Context 2"
-        assert result[3].role == "assistant" and result[3].content == "(empty)"
+        assert result[3].role == "assistant" and result[3].content == "(empty placeholder)"
         assert result[4].role == "user" and result[4].content == "Context 3"
-        assert result[5].role == "assistant" and result[5].content == "(empty)"
+        assert result[5].role == "assistant" and result[5].content == "(empty placeholder)"
         assert result[6].role == "user" and result[6].content == "Question"
 
     def test_mixed_roles_are_normalized_and_alternated(self):
@@ -1970,13 +1970,13 @@ def test_mixed_roles_are_normalized_and_alternated(self):
         assert len(result) == 9
         print("Checking that all system/developer were converted to user...")
         assert result[0].role == "user" and result[0].content == "System"
-        assert result[1].role == "assistant" and result[1].content == "(empty)"
+        assert result[1].role == "assistant" and result[1].content == "(empty placeholder)"
         assert result[2].role == "user" and result[2].content == "Dev"
-        assert result[3].role == "assistant" and result[3].content == "(empty)"
+        assert result[3].role == "assistant" and result[3].content == "(empty placeholder)"
         assert result[4].role == "user" and result[4].content == "User1"
         assert result[5].role == "assistant" and result[5].content == "Assistant1"
         assert result[6].role == "user" and result[6].content == "Dev2"
-        assert result[7].role == "assistant" and result[7].content == "(empty)"
+        assert result[7].role == "assistant" and result[7].content == "(empty placeholder)"
         assert result[8].role == "user" and result[8].content == "User2"
 
 
@@ -3899,7 +3899,7 @@ def test_builds_assistant_message_with_tool_calls(self):
 
     def test_adds_empty_placeholder_for_empty_user_content(self):
         """
-        What it does: Verifies that "(empty)" placeholder is added for user messages with empty content.
+        What it does: Verifies that "(empty placeholder)" placeholder is added for user messages with empty content.
         Purpose: Ensure Kiro API receives non-empty content in history.
         
         This is a fallback test for issue #20 - ensures any edge case with empty content
@@ -3913,12 +3913,12 @@ def test_adds_empty_placeholder_for_empty_user_content(self):
 
         print(f"Result: {result}")
         print(f"Content: '{result[0]['userInputMessage']['content']}'")
-        print("Checking that '(empty)' placeholder is added...")
-        assert result[0]["userInputMessage"]["content"] == "(empty)"
+        print("Checking that '(empty placeholder)' placeholder is added...")
+        assert result[0]["userInputMessage"]["content"] == "(empty placeholder)"
 
     def test_adds_empty_placeholder_for_empty_assistant_content(self):
         """
-        What it does: Verifies that "(empty)" placeholder is added for assistant messages with empty content.
+        What it does: Verifies that "(empty placeholder)" placeholder is added for assistant messages with empty content.
         Purpose: Ensure Kiro API receives non-empty content in history.
         
         This is a fallback test for issue #20 - ensures any edge case with empty content
@@ -3932,12 +3932,12 @@ def test_adds_empty_placeholder_for_empty_assistant_content(self):
 
         print(f"Result: {result}")
         print(f"Content: '{result[0]['assistantResponseMessage']['content']}'")
-        print("Checking that '(empty)' placeholder is added...")
-        assert result[0]["assistantResponseMessage"]["content"] == "(empty)"
+        print("Checking that '(empty placeholder)' placeholder is added...")
+        assert result[0]["assistantResponseMessage"]["content"] == "(empty placeholder)"
 
     def test_adds_empty_placeholder_for_none_user_content(self):
         """
-        What it does: Verifies that "(empty)" placeholder is added for user messages with None content.
+        What it does: Verifies that "(empty placeholder)" placeholder is added for user messages with None content.
         Purpose: Ensure Kiro API receives non-empty content when content is None.
         """
         print("Setup: User message with None content...")
@@ -3948,12 +3948,12 @@ def test_adds_empty_placeholder_for_none_user_content(self):
 
         print(f"Result: {result}")
         print(f"Content: '{result[0]['userInputMessage']['content']}'")
-        print("Checking that '(empty)' placeholder is added...")
-        assert result[0]["userInputMessage"]["content"] == "(empty)"
+        print("Checking that '(empty placeholder)' placeholder is added...")
+        assert result[0]["userInputMessage"]["content"] == "(empty placeholder)"
 
     def test_adds_empty_placeholder_for_none_assistant_content(self):
         """
-        What it does: Verifies that "(empty)" placeholder is added for assistant messages with None content.
+        What it does: Verifies that "(empty placeholder)" placeholder is added for assistant messages with None content.
         Purpose: Ensure Kiro API receives non-empty content when content is None.
         """
         print("Setup: Assistant message with None content...")
@@ -3964,8 +3964,8 @@ def test_adds_empty_placeholder_for_none_assistant_content(self):
 
         print(f"Result: {result}")
         print(f"Content: '{result[0]['assistantResponseMessage']['content']}'")
-        print("Checking that '(empty)' placeholder is added...")
-        assert result[0]["assistantResponseMessage"]["content"] == "(empty)"
+        print("Checking that '(empty placeholder)' placeholder is added...")
+        assert result[0]["assistantResponseMessage"]["content"] == "(empty placeholder)"
 
     def test_preserves_non_empty_content_in_history(self):
         """
@@ -4011,10 +4011,10 @@ def test_mixed_empty_and_non_empty_content_in_history(self):
         assert result[0]["userInputMessage"]["content"] == "Start"
 
         print(f"Message 1 content: '{result[1]['assistantResponseMessage']['content']}'")
-        assert result[1]["assistantResponseMessage"]["content"] == "(empty)"
+        assert result[1]["assistantResponseMessage"]["content"] == "(empty placeholder)"
 
         print(f"Message 2 content: '{result[2]['userInputMessage']['content']}'")
-        assert result[2]["userInputMessage"]["content"] == "(empty)"
+        assert result[2]["userInputMessage"]["content"] == "(empty placeholder)"
 
         print(f"Message 3 content: '{result[3]['assistantResponseMessage']['content']}'")
         assert result[3]["assistantResponseMessage"]["content"] == "Response"
@@ -4488,7 +4488,7 @@ def test_mixed_messages_with_and_without_tool_content(self):
                 content="",
                 tool_calls=[{"id": "call_1", "type": "function", "function": {"name": "tool", "arguments": "{}"}}]
             ),  # Has tool content
-            UnifiedMessage(role="user", content="Continue"),  # No tool content
+            UnifiedMessage(role="user", content="(empty placeholder)"),  # No tool content
         ]
 
         print("Action: Stripping tool content...")
@@ -4499,7 +4499,7 @@ def test_mixed_messages_with_and_without_tool_content(self):
         assert result[0].content == "Hello"
         assert result[0].tool_calls is None
         assert result[1].tool_calls is None  # Stripped
-        assert result[2].content == "Continue"
+        assert result[2].content == "(empty placeholder)"
         assert result[2].tool_calls is None
         assert had_content is True
 
@@ -5507,7 +5507,7 @@ def test_with_tools_defined_keeps_tool_structure(self):
                     "content": "Tool executed"
                 }]
             ),
-            UnifiedMessage(role="user", content="Continue")
+            UnifiedMessage(role="user", content="(empty placeholder)")
         ]
 
         tools = [UnifiedTool(
@@ -5558,7 +5558,7 @@ def test_empty_tools_list_triggers_stripping(self):
                     "function": {"name": "some_tool", "arguments": "{}"}
                 }]
             ),
-            UnifiedMessage(role="user", content="Continue")
+            UnifiedMessage(role="user", content="(empty placeholder)")
         ]
 
         print("Action: Building Kiro payload with empty tools list...")