cecli-dev 0.99.3__tar.gz → 0.99.5__tar.gz

{cecli_dev-0.99.3 → cecli_dev-0.99.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cecli-dev
-Version: 0.99.3
+Version: 0.99.5
 Summary: we also can't pronounce cecli
 Project-URL: Homepage, https://github.com/dwash96/cecli
 Project-URL: Documentation, https://github.com/dwash96/cecli
@@ -52,7 +52,7 @@ Requires-Dist: textual>=6.0.0
 Requires-Dist: tomlkit>=0.14.0
 Requires-Dist: truststore
 Requires-Dist: xxhash>=3.6.0
-Requires-Dist: py-cymbal>=0.1.5
+Requires-Dist: py-cymbal>=0.1.24
 Requires-Dist: rustworkx>=0.15.0
 Requires-Dist: scipy>=1.15.3
 Requires-Dist: importlib-metadata>=7.2.1

{cecli_dev-0.99.3 → cecli_dev-0.99.5}/cecli/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.99.3'
-__version_tuple__ = version_tuple = (0, 99, 3)
+__version__ = version = '0.99.5'
+__version_tuple__ = version_tuple = (0, 99, 5)
 
-__commit_id__ = commit_id = 'g2909d229a'
+__commit_id__ = commit_id = 'g4a4e977c3'

{cecli_dev-0.99.3 → cecli_dev-0.99.5}/cecli/coders/agent_coder.py

@@ -1016,25 +1016,25 @@ I will proceed based on the tool results and updated context.""")
 
             if not self.model_kwargs:
                 self.model_kwargs = {
-                    "temperature": default_temp + 0.1,
-                    "frequency_penalty": default_fp + 0.2,
+                    "temperature": default_temp + 2**-5,
+                    "frequency_penalty": default_fp + 2**-5,
                     # "presence_penalty": 0.1,
                 }
             else:
                 temperature = nested.getter(self.model_kwargs, "temperature", default_temp)
                 freq_penalty = nested.getter(self.model_kwargs, "frequency_penalty", default_fp)
 
-                self.model_kwargs["temperature"] = temperature + 0.1
-                self.model_kwargs["frequency_penalty"] = freq_penalty + 0.1
+                self.model_kwargs["temperature"] = temperature + 2**-5
+                self.model_kwargs["frequency_penalty"] = freq_penalty + 2**-5
 
                 if random.random() < 0.2:
                     self.model_kwargs["temperature"] = max(
                         default_temp,
-                        temperature - 0.15,
+                        temperature - 2**-4,
                     )
                     self.model_kwargs["frequency_penalty"] = max(
                         default_fp,
-                        freq_penalty - 0.15,
+                        freq_penalty - 2**-4,
                     )
 
             self.model_kwargs["temperature"] = max(

{cecli_dev-0.99.3 → cecli_dev-0.99.5}/cecli/coders/base_coder.py

@@ -2737,8 +2737,8 @@ class Coder:
                     message_dict=tool_response,
                     tag=MessageTag.CUR,
                     hash_key=(tool_response["tool_call_id"], str(time.monotonic_ns())),
-                    promotion=ConversationService.get_manager(self).DEFAULT_TAG_PROMOTION_VALUE,
-                    mark_for_demotion=1,
+                    # promotion=ConversationService.get_manager(self).DEFAULT_TAG_PROMOTION_VALUE,
+                    # mark_for_demotion=1,
                 )
 
         return bool(tool_responses)
@@ -2925,8 +2925,8 @@ class Coder:
                 message_dict=msg,
                 tag=MessageTag.CUR,
                 hash_key=("assistant_message", str(msg), str(time.monotonic_ns())),
-                promotion=ConversationService.get_manager(self).DEFAULT_TAG_PROMOTION_VALUE,
-                mark_for_demotion=1,
+                # promotion=ConversationService.get_manager(self).DEFAULT_TAG_PROMOTION_VALUE,
+                # mark_for_demotion=1,
             )
 
     def get_file_mentions(self, content, ignore_current=False):

{cecli_dev-0.99.3 → cecli_dev-0.99.5}/cecli/commands/load_hook.py

@@ -15,24 +15,28 @@ class LoadHookCommand(BaseCommand):
         if not args.strip():
             io.tool_error("Usage: /load-hook <hook-name>")
             return 1
-
-        hook_name = args.strip()
-
-        # Check if hook exists
+        hook_names = args.strip().split()
         hook_manager = HookManager()
-        if not hook_manager.hook_exists(hook_name):
-            io.tool_error(f"Error: Hook '{hook_name}' not found")
-            return 1
+        results = []
+        errors = 0
 
-        # Enable the hook
-        success = hook_manager.enable_hook(hook_name)
+        for hook_name in hook_names:
+            if not hook_manager.hook_exists(hook_name):
+                io.tool_error(f"Error: Hook '{hook_name}' not found")
+                results.append(f"Hook '{hook_name}' not found")
+                errors += 1
+                continue
 
-        if success:
-            io.tool_output(f"Hook '{hook_name}' enabled successfully")
-            return 0
-        else:
-            io.tool_error(f"Error: Failed to enable hook '{hook_name}'")
-            return 1
+            success = hook_manager.enable_hook(hook_name)
+            if success:
+                io.tool_output(f"Hook '{hook_name}' enabled successfully")
+                results.append(f"Hook '{hook_name}' enabled")
+            else:
+                io.tool_error(f"Error: Failed to enable hook '{hook_name}'")
+                results.append(f"Failed to enable hook '{hook_name}'")
+                errors += 1
+
+        return 0 if errors == 0 else 1
 
     @classmethod
     def get_completions(cls, io, coder, args) -> List[str]:
@@ -58,10 +62,10 @@ class LoadHookCommand(BaseCommand):
         """Get help text for the load-hook command."""
         help_text = super().get_help()
         help_text += "\nUsage:\n"
-        help_text += "  /load-hook <hook-name>  # Enable a specific hook\n"
+        help_text += "  /load-hook <hook-name>...  # Enable one or more hooks\n"
         help_text += "\nExamples:\n"
         help_text += "  /load-hook my_start_hook\n"
-        help_text += "  /load-hook check_commands\n"
-        help_text += "\nThis command enables a hook that was previously disabled.\n"
+        help_text += "  /load-hook check_commands my_start_hook\n"
+        help_text += "\nThis command enables one or more hooks that were previously disabled.\n"
         help_text += "Use /hooks to see all available hooks and their current state.\n"
         return help_text

{cecli_dev-0.99.3 → cecli_dev-0.99.5}/cecli/commands/load_mcp.py

@@ -19,25 +19,22 @@ class LoadMcpCommand(BaseCommand):
                 io, cls.NORM_NAME, "No MCP servers found, nothing to load."
             )
 
-        server_name = args.strip()
-        server = coder.mcp_manager.get_server(server_name)
-        if server is None:
-            return format_command_result(
-                io, cls.NORM_NAME, "", f"MCP server {server_name} does not exist."
-            )
-
-        did_connect = await coder.mcp_manager.connect_server(server.name)
-
-        if not did_connect:
-            return format_command_result(io, cls.NORM_NAME, f"Unable to load server: {server_name}")
+        server_names = args.strip().split()
+        results = []
+        for server_name in server_names:
+            server = coder.mcp_manager.get_server(server_name)
+            if server is None:
+                results.append(f"MCP server {server_name} does not exist.")
+                continue
 
-        try:
+            did_connect = await coder.mcp_manager.connect_server(server.name)
             if did_connect:
-                return format_command_result(io, cls.NORM_NAME, f"Loaded server: {server_name}")
+                results.append(f"Loaded server: {server_name}")
             else:
-                return format_command_result(
-                    io, cls.NORM_NAME, "", f"Unable to Load server: {server_name}"
-                )
+                results.append(f"Unable to load server: {server_name}")
+
+        try:
+            return format_command_result(io, cls.NORM_NAME, "\n".join(results))
         finally:
             from . import SwitchCoderSignal
 
@@ -69,9 +66,9 @@ class LoadMcpCommand(BaseCommand):
         """Get help text for the load-mcp command."""
         help_text = super().get_help()
         help_text += "\nUsage:\n"
-        help_text += "  /load-mcp <mcp-name>  # Load a mcp by name\n"
+        help_text += "  /load-mcp <mcp-name>...  # Load one or more mcps by name\n"
         help_text += "\nExamples:\n"
         help_text += "  /load-mcp context7  # Load the context7 mcp\n"
-        help_text += "  /load-mcp github  # Load the github mcp\n"
-        help_text += "\nThis command loads a MCP server by name.\n"
+        help_text += "  /load-mcp github context7  # Load both github and context7 mcps\n"
+        help_text += "\nThis command loads one or more MCP servers by name.\n"
         return help_text

{cecli_dev-0.99.3 → cecli_dev-0.99.5}/cecli/commands/load_skill.py

@@ -15,7 +15,7 @@ class LoadSkillCommand(BaseCommand):
             io.tool_output("Usage: /load-skill <skill-name>")
             return format_command_result(io, "load-skill", "Usage: /load-skill <skill-name>")
 
-        skill_name = args.strip()
+        skill_names = args.strip().split()
 
         # Check if we're in agent mode
         if not hasattr(coder, "edit_format") or coder.edit_format != "agent":
@@ -35,10 +35,14 @@ class LoadSkillCommand(BaseCommand):
                 )
             return format_command_result(io, "load-skill", "Skills manager is not initialized")
 
-        # Use the instance method on skills_manager
-        result = coder.skills_manager.load_skill(skill_name)
-        io.tool_output(result)
-        return format_command_result(io, "load-skill", f"Loaded skill: {skill_name}")
+        results = []
+        for skill_name in skill_names:
+            # Use the instance method on skills_manager
+            result = coder.skills_manager.load_skill(skill_name)
+            io.tool_output(result)
+            results.append(result)
+
+        return format_command_result(io, "load-skill", "\n".join(results))
 
     @classmethod
     def get_completions(cls, io, coder, args) -> List[str]:
@@ -57,12 +61,13 @@ class LoadSkillCommand(BaseCommand):
         """Get help text for the load-skill command."""
         help_text = super().get_help()
         help_text += "\nUsage:\n"
-        help_text += "  /load-skill <skill-name>  # Load a skill by name\n"
+        help_text += "  /load-skill <skill-name>...  # Load one or more skills by name\n"
         help_text += "\nExamples:\n"
         help_text += "  /load-skill pdf  # Load the PDF skill\n"
-        help_text += "  /load-skill web  # Load the web skill\n"
+        help_text += "  /load-skill web pdf  # Load both web and PDF skills\n"
         help_text += (
-            "\nThis command loads a skill by name. Skills are only available in agent mode.\n"
+            "\nThis command loads one or more skills by name. Skills are only available in agent"
+            " mode.\n"
         )
         help_text += "Skills provide additional functionality and tools to the agent.\n"
         return help_text

{cecli_dev-0.99.3 → cecli_dev-0.99.5}/cecli/commands/remove_hook.py

@@ -15,24 +15,28 @@ class RemoveHookCommand(BaseCommand):
         if not args.strip():
             io.tool_error("Usage: /remove-hook <hook-name>")
             return 1
-
-        hook_name = args.strip()
-
-        # Check if hook exists
+        hook_names = args.strip().split()
         hook_manager = HookManager()
-        if not hook_manager.hook_exists(hook_name):
-            io.tool_error(f"Error: Hook '{hook_name}' not found")
-            return 1
+        results = []
+        errors = 0
 
-        # Disable the hook
-        success = hook_manager.disable_hook(hook_name)
+        for hook_name in hook_names:
+            if not hook_manager.hook_exists(hook_name):
+                io.tool_error(f"Error: Hook '{hook_name}' not found")
+                results.append(f"Hook '{hook_name}' not found")
+                errors += 1
+                continue
 
-        if success:
-            io.tool_output(f"Hook '{hook_name}' disabled successfully")
-            return 0
-        else:
-            io.tool_error(f"Error: Failed to disable hook '{hook_name}'")
-            return 1
+            success = hook_manager.disable_hook(hook_name)
+            if success:
+                io.tool_output(f"Hook '{hook_name}' disabled successfully")
+                results.append(f"Hook '{hook_name}' disabled")
+            else:
+                io.tool_error(f"Error: Failed to disable hook '{hook_name}'")
+                results.append(f"Failed to disable hook '{hook_name}'")
+                errors += 1
+
+        return 0 if errors == 0 else 1
 
     @classmethod
     def get_completions(cls, io, coder, args) -> List[str]:
@@ -58,10 +62,10 @@ class RemoveHookCommand(BaseCommand):
         """Get help text for the remove-hook command."""
         help_text = super().get_help()
         help_text += "\nUsage:\n"
-        help_text += "  /remove-hook <hook-name>  # Disable a specific hook\n"
+        help_text += "  /remove-hook <hook-name>...  # Disable one or more hooks\n"
         help_text += "\nExamples:\n"
         help_text += "  /remove-hook my_start_hook\n"
-        help_text += "  /remove-hook check_commands\n"
+        help_text += "  /remove-hook check_commands my_start_hook\n"
         help_text += "\nThis command disables a hook without removing it from the registry.\n"
         help_text += "Use /load-hook to re-enable it later.\n"
         help_text += "Use /hooks to see all available hooks and their current state.\n"

{cecli_dev-0.99.3 → cecli_dev-0.99.5}/cecli/commands/remove_mcp.py

@@ -19,16 +19,17 @@ class RemoveMcpCommand(BaseCommand):
                 io, cls.NORM_NAME, "No MCP servers connected, nothing to remove."
             )
 
-        server_name = args.strip()
-        was_disconnected = await coder.mcp_manager.disconnect_server(server_name)
-
-        try:
+        server_names = args.strip().split()
+        results = []
+        for server_name in server_names:
+            was_disconnected = await coder.mcp_manager.disconnect_server(server_name)
             if was_disconnected:
-                return format_command_result(io, cls.NORM_NAME, f"Removed server: {server_name}")
+                results.append(f"Removed server: {server_name}")
             else:
-                return format_command_result(
-                    io, cls.NORM_NAME, "", f"Unable to remove server: {server_name}"
-                )
+                results.append(f"Unable to remove server: {server_name}")
+
+        try:
+            return format_command_result(io, cls.NORM_NAME, "\n".join(results))
         finally:
             from . import SwitchCoderSignal
 
@@ -57,9 +58,8 @@ class RemoveMcpCommand(BaseCommand):
         """Get help text for the remove-mcp command."""
         help_text = super().get_help()
         help_text += "\nUsage:\n"
-        help_text += "  /remove-mcp <mcp-name>  # Remove a mcp by name\n"
+        help_text += "  /remove-mcp <mcp-name>...  # Remove one or more mcps by name\n"
         help_text += "\nExamples:\n"
         help_text += "  /remove-mcp context7  # Remove the context7 mcp\n"
-        help_text += "  /remove-mcp github  # Remove the github mcp\n"
-        help_text += "\nThis command removes a MCP server by name.\n"
-        return help_text
+        help_text += "  /remove-mcp github context7  # Remove both github and context7 mcps\n"
+        help_text += "\nThis command removes one or more MCP servers by name.\n"

{cecli_dev-0.99.3 → cecli_dev-0.99.5}/cecli/commands/remove_skill.py

@@ -15,7 +15,7 @@ class RemoveSkillCommand(BaseCommand):
             io.tool_output("Usage: /remove-skill <skill-name>")
             return format_command_result(io, "remove-skill", "Usage: /remove-skill <skill-name>")
 
-        skill_name = args.strip()
+        skill_names = args.strip().split()
 
         # Check if we're in agent mode
         if not hasattr(coder, "edit_format") or coder.edit_format != "agent":
@@ -35,10 +35,14 @@ class RemoveSkillCommand(BaseCommand):
                 )
             return format_command_result(io, "remove-skill", "Skills manager is not initialized")
 
-        # Use the instance method on skills_manager
-        result = coder.skills_manager.remove_skill(skill_name)
-        io.tool_output(result)
-        return format_command_result(io, "remove-skill", f"Removed skill: {skill_name}")
+        results = []
+        for skill_name in skill_names:
+            # Use the instance method on skills_manager
+            result = coder.skills_manager.remove_skill(skill_name)
+            io.tool_output(result)
+            results.append(result)
+
+        return format_command_result(io, "remove-skill", "\n".join(results))
 
     @classmethod
     def get_completions(cls, io, coder, args) -> List[str]:
@@ -57,12 +61,13 @@ class RemoveSkillCommand(BaseCommand):
         """Get help text for the remove-skill command."""
         help_text = super().get_help()
         help_text += "\nUsage:\n"
-        help_text += "  /remove-skill <skill-name>  # Remove a skill by name\n"
+        help_text += "  /remove-skill <skill-name>...  # Remove one or more skills by name\n"
         help_text += "\nExamples:\n"
         help_text += "  /remove-skill pdf  # Remove the PDF skill\n"
-        help_text += "  /remove-skill web  # Remove the web skill\n"
+        help_text += "  /remove-skill web pdf  # Remove both web and PDF skills\n"
         help_text += (
-            "\nThis command removes a skill by name. Skills are only available in agent mode.\n"
+            "\nThis command removes one or more skills by name. Skills are only available in agent"
+            " mode.\n"
         )
         help_text += "Skills provide additional functionality and tools to the agent.\n"
         return help_text

{cecli_dev-0.99.3 → cecli_dev-0.99.5}/cecli/helpers/conversation/files.py

@@ -261,8 +261,8 @@ class ConversationFiles:
             ConversationService.get_manager(coder).add_message(
                 message_dict=diff_message,
                 tag=MessageTag.DIFFS,
-                promotion=ConversationService.get_manager(coder).DEFAULT_TAG_PROMOTION_VALUE,
-                mark_for_demotion=1,
+                # promotion=ConversationService.get_manager(coder).DEFAULT_TAG_PROMOTION_VALUE,
+                # mark_for_demotion=1,
             )
 
         return diff

{cecli_dev-0.99.3 → cecli_dev-0.99.5}/cecli/helpers/conversation/integration.py

@@ -8,7 +8,7 @@ import xxhash
 from cecli.utils import is_image_file
 
 from .service import ConversationService
-from .tags import MessageTag
+from .tags import DEFAULT_TAG_PRIORITY, MessageTag
 
 
 class ConversationChunks:
@@ -897,7 +897,7 @@ class ConversationChunks:
             ConversationService.get_manager(coder).add_message(
                 message_dict={"role": "user", "content": block_content},
                 tag=MessageTag.STATIC,  # Use STATIC tag but with different priority
-                priority=250,  # Between CUR (200) and REMINDER (300)
+                priority=DEFAULT_TAG_PRIORITY[MessageTag.REMINDER] + 25,  # After REMINDER (300)
                 mark_for_delete=0,
                 hash_key=("post_message", block_type),
                 force=True,

{cecli_dev-0.99.3 → cecli_dev-0.99.5}/cecli/prompts/agent.yml

@@ -63,12 +63,13 @@ main_system: |
 
 system_reminder: |
   <context name="critical_reminders">
-  ## Reminders
-  **Strict Scope**: Stay on task. Do not alter functionality and syntax that is out of scope or pursue unrequested refactors. Do not attempt to modify large files in one shot. Work step by step.
-  **Context Hygiene**: Remove files and loaded skills from context using `ContextManager` and/or `RemoveSkill` once they are no longer needed to save tokens and prevent confusion.
-  **Turn Management**: Tool calls trigger the next turn. Do not include tool calls in your final summary to the user. You must use `ShowContext` to view the relevant hashline range before each edit.
-  **Sandbox**: Use `.cecli/temp` for all verification and temporary logic.
-  **Novelty**: Do not repeat phrases in your responses to the user. You do not need to declare you understand the task. Simply proceed. Only give status updates when you have new information. 
+  ## Operational Rules
+  - **Scope**: No unrequested refactors. Edit files incrementally; avoid full-file rewrites.
+  - **Hygiene**: Use `ContextManager`/`RemoveSkill` to evict unneeded files/skills immediately after use.
+  - **Verification**: You MUST use `ShowContext` to verify hashline ranges before every edit.
+  - **Outputs**: Tool calls trigger turns. Never include tool syntax in final user summaries.
+  - **Sandbox**: Perform all verification and temp logic in `.cecli/temp`.
+  - **Vibe**: Zero conversational filler. Do not confirm instructions or state "I understand." Provide status updates only when you have new information.
 
   {lazy_prompt}
   {shell_cmd_reminder}

{cecli_dev-0.99.3 → cecli_dev-0.99.5}/cecli/tools/explore_symbols.py

@@ -5,12 +5,16 @@ from cecli.tools.utils.base_tool import BaseTool
 from cecli.tools.utils.helpers import ToolError
 from cecli.tools.utils.output import color_markers, tool_footer, tool_header
 
+cwd = os.getcwd()
+
 try:
     import cymbal
 
     CYMBAL_AVAILABLE = True
 except ImportError:
     CYMBAL_AVAILABLE = False
+finally:
+    os.chdir(cwd)
 
 
 class Tool(BaseTool):
@@ -95,14 +99,12 @@ class Tool(BaseTool):
             repo_path = getattr(coder, "root", ".")
 
             try:
-                # If we can't get a db_path or it doesn't exist, index it.
-                if not os.path.exists(c.db_path):
-                    c.index(repo_path)
+                # Always index to ensure we have the latest data
+                c.index(repo_path)
             except Exception as e:
                 error_msg = f"Failed to index repository: {str(e)}"
                 coder.io.tool_error(error_msg)
                 return f"Error: {error_msg}"
-
             all_results = []
             all_failed_queries = []
             total_successful_queries = 0
@@ -117,11 +119,8 @@ class Tool(BaseTool):
                         results = c.search(symbol, limit=limit)
                         all_results.append(cls._format_search_results(results, symbol))
                     elif action == "investigate":
-                        # Parse symbol for file hint format: {file}:{symbol} or {package}.{symbol}
                         symbol_name = symbol
                         file_hint = ""
-
-                        # Check for file:symbol format (e.g., "config.go:Config")
                         if ":" in symbol:
                             parts = symbol.split(":", 1)
                             if len(parts) == 2:
@@ -135,7 +134,6 @@ class Tool(BaseTool):
                             )
                         except Exception as e:
                             if "multiple matches" in str(e).lower():
-                                # Fallback to search to show locations
                                 results = c.search(symbol_name, limit=10)
                                 locations = "\n".join(
                                     [f"- {r['file']}:{r['start_line']}" for r in results]
@@ -178,6 +176,9 @@ class Tool(BaseTool):
         except Exception as e:
             coder.io.tool_error(f"Error in ExploreSymbols: {str(e)}")
             return f"Error: {str(e)}"
+        finally:
+            if "c" in locals():
+                c.close()
 
     @classmethod
     def _format_search_results(cls, results, symbol):
@@ -187,14 +188,18 @@ class Tool(BaseTool):
 
         formatted = [f"Found {len(results)} symbols matching '{symbol}':"]
         for i, result in enumerate(results[:15], 1):
-            # Extract symbol attributes (adjust based on actual cymbal result structure)
-            # Extract symbol attributes from dictionary
             name = result.get("name", "Unknown")
             kind = result.get("kind", "unknown")
-            file = result.get("file", "Unknown")
+            file = result.get("rel_path") or result.get("file", "Unknown")
             start_line = result.get("start_line", 0)
+            signature = result.get("signature", "")
+            parent = result.get("parent")
 
-            formatted.append(f"{i}. {name} ({kind}) at {file}:{start_line}")
+            location = f"{file}:{start_line}"
+            if parent:
+                location = f"{location} (in {parent})"
+
+            formatted.append(f"{i}. {name}{signature} ({kind}) at {location}")
 
         if len(results) > 15:
             formatted.append(f"... and {len(results) - 15} more results")
@@ -207,17 +212,33 @@ class Tool(BaseTool):
         if not investigation:
             return f"No information found for symbol '{symbol}'"
 
+        # Handle nested structure if present
+        if "results" in investigation and "result" in investigation["results"]:
+            investigation = investigation["results"]["result"]
+
         formatted = [f"Investigation of symbol '{symbol}':"]
 
         # Extract definition information
         definition = investigation.get("symbol")
         if definition:
             def_name = definition.get("name", symbol)
-            def_file = definition.get("file", "Unknown")
+            def_file = definition.get("rel_path") or definition.get("file", "Unknown")
             def_line = definition.get("start_line", 0)
             def_kind = definition.get("kind", "unknown")
-            formatted.append(f"Definition: {def_name} ({def_kind}) at {def_file}:{def_line}")
-
+            def_sig = definition.get("signature", "")
+            formatted.append(
+                f"Definition: {def_name}{def_sig} ({def_kind}) at {def_file}:{def_line}"
+            )
+
+        # Source code snippet
+        source = investigation.get("source")
+        if source:
+            formatted.append("\nSource Code:")
+            formatted.append("```python")
+            formatted.append(source.strip())
+            formatted.append("```")
+
+        # References
         references = investigation.get("refs", [])
         ref_count = len(references) if references else 0
         formatted.append(f"\nReferences found: {ref_count}")
@@ -225,13 +246,26 @@ class Tool(BaseTool):
         if references and ref_count > 0:
             formatted.append("Top references:")
             for i, ref in enumerate(references[:10], 1):
-                ref_file = ref.get("file", "Unknown")
+                ref_file = ref.get("rel_path") or ref.get("file", "Unknown")
                 ref_line = ref.get("line", 0)
                 formatted.append(f"{i}. {ref_file}:{ref_line}")
 
             if ref_count > 10:
                 formatted.append(f"... and {ref_count - 10} more references")
 
+        # Impact / Callers
+        impact = investigation.get("impact", [])
+        if impact:
+            formatted.append("\nImpact (Callers):")
+            for i, imp in enumerate(impact[:10], 1):
+                imp_file = imp.get("rel_path") or imp.get("file", "Unknown")
+                imp_line = imp.get("line", 0)
+                imp_caller = imp.get("caller", "unknown")
+                formatted.append(f"{i}. {imp_caller} at {imp_file}:{imp_line}")
+
+            if len(impact) > 10:
+                formatted.append(f"... and {len(impact) - 10} more callers")
+
         return "\n".join(formatted)
 
     @classmethod
@@ -242,11 +276,15 @@ class Tool(BaseTool):
 
         formatted = [f"Found {len(references)} references to '{symbol}':"]
         for i, ref in enumerate(references[:15], 1):
-            # Extract reference attributes from dictionary
-            file = ref.get("file", "Unknown")
+            file = ref.get("rel_path") or ref.get("file", "Unknown")
             line = ref.get("line", 0)
+            context = ref.get("context", [])
 
             formatted.append(f"{i}. {file}:{line}")
+            if context:
+                formatted.append("   Context:")
+                for line_text in context:
+                    formatted.append(f"     {line_text.strip()}")
 
         if len(references) > 15:
             formatted.append(f"... and {len(references) - 15} more references")
@@ -266,8 +304,6 @@ class Tool(BaseTool):
 
         # Output header
         tool_header(coder=coder, mcp_server=mcp_server, tool_response=tool_response)
-
-        # Output each query with the requested format
         queries = params.get("queries", [])
         if queries:
             coder.io.tool_output("")