aicippy 2.2.2__tar.gz → 2.2.4__tar.gz

{aicippy-2.2.2/src/aicippy.egg-info → aicippy-2.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aicippy
-Version: 2.2.2
+Version: 2.2.4
 Summary: Enterprise-grade multi-agent CLI for Vibe Coding
 Author-email: Aravind Jayamohan <aravind@aivibe.in>
 Maintainer-email: AiVibe Software Services Pvt Ltd <support@aivibe.in>

{aicippy-2.2.2 → aicippy-2.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aicippy"
-version = "2.2.2"
+version = "2.2.4"
 description = "Enterprise-grade multi-agent CLI for Vibe Coding"
 readme = "README.md"
 license = "LicenseRef-Proprietary"

{aicippy-2.2.2 → aicippy-2.2.4}/src/aicippy/__init__.py

@@ -29,7 +29,7 @@ from __future__ import annotations
 from typing import Final
 
 # Package metadata
-__version__: Final[str] = "2.2.2"
+__version__: Final[str] = "2.2.4"
 __author__: Final[str] = "Aravind Jayamohan"
 __email__: Final[str] = "support@aicippy.com"
 __license__: Final[str] = "Proprietary"

{aicippy-2.2.2 → aicippy-2.2.4}/src/aicippy/agents/bedrock_agent.py

@@ -31,6 +31,46 @@ AGENT_READ_TIMEOUT: Final[int] = 900
 AGENT_CONNECT_TIMEOUT: Final[int] = 30
 
 
+def _clean_agent_response(text: str) -> str:
+    """Strip tool call artifacts leaked by the Bedrock agent orchestration.
+
+    Removes patterns like:
+    - AgentCommunication__sendMessage(recipient="User", content="...")
+    - get__codeinterpreteraction__execute(...)
+    - ", "recipient": "User"}}
+    - </sources> tags
+    - Trailing ") or "}) artifacts
+    """
+    import re
+
+    # Remove AgentCommunication__sendMessage wrapper
+    text = re.sub(
+        r'AgentCommunication__sendMessage\s*\(\s*recipient\s*=\s*"User"\s*,\s*content\s*=\s*"',
+        "",
+        text,
+    )
+
+    # Remove tool call references like get__codeinterpreteraction__execute
+    text = re.sub(r'get__\w+__\w+\s*\([^)]*\)', "", text)
+    text = re.sub(
+        r'(I will call the|To get the final answer, I will call the)\s+`?\w+__\w+`?\s+(function|tool)[^.]*\.',
+        "",
+        text,
+    )
+
+    # Remove trailing JSON artifacts from tool calls
+    text = re.sub(r',\s*"recipient"\s*:\s*"User"\s*\}\s*\}?\s*$', "", text)
+
+    # Remove </sources> tags
+    text = re.sub(r'</sources>\s*', "", text)
+
+    # Remove trailing ") or "}) from tool call closures
+    text = re.sub(r'"\s*\)\s*$', "", text)
+    text = re.sub(r'"\s*\}\s*\)\s*$', "", text)
+
+    return text.strip()
+
+
 class BedrockAgentClient:
     """Client for invoking odin Bedrock Agent with streaming."""
 
@@ -101,31 +141,53 @@ class BedrockAgentClient:
                 },
             )
 
+            # Buffer chunks and clean tool call artifacts before emitting
             full_response = ""
-            _skip_tool_prefix = True
+            _buffer = ""
+            _tool_prefix_seen = False
+
             for event in response.get("completion", []):
                 if "chunk" in event:
                     chunk_bytes = event["chunk"].get("bytes", b"")
                     if chunk_bytes:
                         text = chunk_bytes.decode("utf-8")
-                        # Strip leaked tool call syntax from agent response
-                        if _skip_tool_prefix and "AgentCommunication__sendMessage" in text:
-                            # Remove the tool call wrapper
-                            import re
-                            text = re.sub(
-                                r'AgentCommunication__sendMessage\(recipient="User",\s*content="',
-                                "",
-                                text,
-                            )
-                            _skip_tool_prefix = False
-                        full_response += text
-                        if on_token:
-                            on_token(text)
-
-            # Clean trailing tool call artifacts
-            if full_response.endswith('")'):
-                full_response = full_response[:-2]
-
+                        _buffer += text
+
+                        # Detect and strip tool call prefix at start of response
+                        if not _tool_prefix_seen:
+                            import re as _re
+                            # Check if buffer contains the full tool call prefix
+                            if 'content="' in _buffer:
+                                _buffer = _re.sub(
+                                    r'^.*?AgentCommunication__sendMessage\s*\(\s*recipient\s*=\s*"User"\s*,\s*content\s*=\s*"',
+                                    "",
+                                    _buffer,
+                                    count=1,
+                                )
+                                _tool_prefix_seen = True
+                            elif len(_buffer) > 200:
+                                # No tool prefix found — emit as-is
+                                _tool_prefix_seen = True
+
+                            # Don't emit yet if we haven't resolved the prefix
+                            if not _tool_prefix_seen:
+                                continue
+
+                        # Emit the buffered/cleaned text
+                        to_emit = _buffer
+                        _buffer = ""
+                        full_response += to_emit
+                        if on_token and to_emit:
+                            on_token(to_emit)
+
+            # Flush remaining buffer
+            if _buffer:
+                full_response += _buffer
+                if on_token and _buffer:
+                    on_token(_buffer)
+
+            # Final cleanup of the complete response
+            full_response = _clean_agent_response(full_response)
             return full_response
 
         # Run blocking boto3 call in thread pool

{aicippy-2.2.2 → aicippy-2.2.4}/src/aicippy/cli/main.py

@@ -2169,8 +2169,7 @@ def chat(
                     )
                     raise typer.Exit(1)
 
-            # Silently proceed — no noisy plan warnings for CLI usage
-            console.print(f"[dim]OdIn agent | Llama 4 Maverick[/dim]")
+            # Silent proceed — no header noise
 
             # Build TenantContext for tenant-scoped orchestration
             tenant_ctx = None

{aicippy-2.2.2 → aicippy-2.2.4/src/aicippy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aicippy
-Version: 2.2.2
+Version: 2.2.4
 Summary: Enterprise-grade multi-agent CLI for Vibe Coding
 Author-email: Aravind Jayamohan <aravind@aivibe.in>
 Maintainer-email: AiVibe Software Services Pvt Ltd <support@aivibe.in>