raggiecode 0.2.1__tar.gz → 0.2.2__tar.gz

{raggiecode-0.2.1 → raggiecode-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: raggiecode
-Version: 0.2.1
+Version: 0.2.2
 Summary: AI Coding Agent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -28,7 +28,7 @@ Requires-Dist: ripgrep_rs
 
 # Raggie Code 
 
-> *Raggie Code v0.2.1 (beta)*
+> *Raggie Code v0.2.2*
 
 <p style="padding:30px 50px;">
   <img src="Raggie.png" alt="Raggie" width="312">
@@ -134,7 +134,7 @@ Every tool call is displayed in real time with its arguments. Debug mode (`--deb
 ### From pip (GitHub)
 
 ```bash
-pip install git+https://github.com/Hussein-L-AlMadhachi/RaggieCode.git
+pip install raggiecode
 ```
 
 ### From source
@@ -208,12 +208,13 @@ After the agent makes changes, type `/undo` as your next prompt to undo the last
 $ raggie code .
 
 Raggie Agent (code) v1.0.0 - Interactive Mode
-Press Esc followed by Enter to send message, or type 'exit' to quit
 --------------------------------------------------
 Indexing codebase...
 
 Effort: Zen - to change it use /effort
 
+Press Esc followed by Enter to send message, or type 'exit' to quit
+
 You:
 > Add input validation to the login endpoint and update all callers
 
@@ -448,7 +449,7 @@ raggie/
 
 ### How the Agent Works
 
-1. **Startup**: The agent loads its role config, connects to the LLM API, checks for project markers in the working directory, indexes your codebase (tree-sitter, multiprocessing) if it looks like a project, and initialises its local git repo.
+1. **Startup**: The agent loads its role config, connects to the LLM API, indexes your codebase (tree-sitter, multiprocessing), and initialises its local git repo. Before the agent is created, the CLI entry point checks for a `.raggie` folder in the working directory and prompts the user if none is found.
 2. **Prompt loop**: User sends a message → agent calls the LLM with full chat history + tool definitions → LLM responds with text and/or tool calls.
 3. **Tool execution**: Each tool call is dispatched to a registered handler. Results are fed back to the LLM as tool responses.
 4. **Re-indexing**: After each tool call, the code index is updated so the agent always has fresh context.
@@ -806,11 +807,12 @@ Languages are gracefully skipped if their tree-sitter grammar is not installed.
 
 ### Project directory detection
 
-Before indexing, Raggie checks whether the current directory looks like a code project by looking for project marker files (`.git`, `pyproject.toml`, `package.json`, `go.mod`, `Cargo.toml`, `Makefile`, `pom.xml`, `build.gradle`, `composer.json`, `Gemfile`, `mix.exs`, `build.zig`, `pubspec.yaml`, `.raggie`, `.vscode`, `.idea`, `.editorconfig`, and many more).
+Before indexing, Raggie checks whether a `.raggie` folder exists in the current directory. This folder is created by Raggie on first run, so its presence means the user has already confirmed this is a project directory.
 
-- **If project markers are found**: indexing proceeds automatically as normal.
-- **If no project markers are found**: Raggie warns that the directory doesn't look like a project and asks whether to index anyway. This prevents accidentally scanning unrelated files (e.g. if you run `raggie code .` in your home directory). If you decline, Raggie exits and suggests you `cd` into your project directory or start a new one with `raggie code <project-name>`.
-- **Subagent sessions**: indexing is skipped silently (subagents can't prompt interactively).
+- **`.raggie` exists**: indexing proceeds automatically as normal.
+- **No `.raggie` folder, but directory has no subdirectories**: indexing proceeds without prompting — a flat directory is small enough to be safe.
+- **No `.raggie` folder, directory has subdirectories**: Raggie warns that the directory doesn't look like a project and asks whether to index anyway. This prevents accidentally scanning unrelated files (e.g. if you run `raggie code .` in your home directory). If you decline, Raggie exits and suggests you `cd` into your project directory or start a new one with `raggie code <project-name>`.
+- **Subagent sessions**: subagents inherit the parent's `.raggie` folder (same working directory), so they always index normally.
 
 You can manually trigger re-indexing at any time with the `/reindex` command.
 

{raggiecode-0.2.1 → raggiecode-0.2.2}/README.md

@@ -1,6 +1,6 @@
 # Raggie Code 
 
-> *Raggie Code v0.2.1 (beta)*
+> *Raggie Code v0.2.2*
 
 <p style="padding:30px 50px;">
   <img src="Raggie.png" alt="Raggie" width="312">
@@ -106,7 +106,7 @@ Every tool call is displayed in real time with its arguments. Debug mode (`--deb
 ### From pip (GitHub)
 
 ```bash
-pip install git+https://github.com/Hussein-L-AlMadhachi/RaggieCode.git
+pip install raggiecode
 ```
 
 ### From source
@@ -180,12 +180,13 @@ After the agent makes changes, type `/undo` as your next prompt to undo the last
 $ raggie code .
 
 Raggie Agent (code) v1.0.0 - Interactive Mode
-Press Esc followed by Enter to send message, or type 'exit' to quit
 --------------------------------------------------
 Indexing codebase...
 
 Effort: Zen - to change it use /effort
 
+Press Esc followed by Enter to send message, or type 'exit' to quit
+
 You:
 > Add input validation to the login endpoint and update all callers
 
@@ -420,7 +421,7 @@ raggie/
 
 ### How the Agent Works
 
-1. **Startup**: The agent loads its role config, connects to the LLM API, checks for project markers in the working directory, indexes your codebase (tree-sitter, multiprocessing) if it looks like a project, and initialises its local git repo.
+1. **Startup**: The agent loads its role config, connects to the LLM API, indexes your codebase (tree-sitter, multiprocessing), and initialises its local git repo. Before the agent is created, the CLI entry point checks for a `.raggie` folder in the working directory and prompts the user if none is found.
 2. **Prompt loop**: User sends a message → agent calls the LLM with full chat history + tool definitions → LLM responds with text and/or tool calls.
 3. **Tool execution**: Each tool call is dispatched to a registered handler. Results are fed back to the LLM as tool responses.
 4. **Re-indexing**: After each tool call, the code index is updated so the agent always has fresh context.
@@ -778,11 +779,12 @@ Languages are gracefully skipped if their tree-sitter grammar is not installed.
 
 ### Project directory detection
 
-Before indexing, Raggie checks whether the current directory looks like a code project by looking for project marker files (`.git`, `pyproject.toml`, `package.json`, `go.mod`, `Cargo.toml`, `Makefile`, `pom.xml`, `build.gradle`, `composer.json`, `Gemfile`, `mix.exs`, `build.zig`, `pubspec.yaml`, `.raggie`, `.vscode`, `.idea`, `.editorconfig`, and many more).
+Before indexing, Raggie checks whether a `.raggie` folder exists in the current directory. This folder is created by Raggie on first run, so its presence means the user has already confirmed this is a project directory.
 
-- **If project markers are found**: indexing proceeds automatically as normal.
-- **If no project markers are found**: Raggie warns that the directory doesn't look like a project and asks whether to index anyway. This prevents accidentally scanning unrelated files (e.g. if you run `raggie code .` in your home directory). If you decline, Raggie exits and suggests you `cd` into your project directory or start a new one with `raggie code <project-name>`.
-- **Subagent sessions**: indexing is skipped silently (subagents can't prompt interactively).
+- **`.raggie` exists**: indexing proceeds automatically as normal.
+- **No `.raggie` folder, but directory has no subdirectories**: indexing proceeds without prompting — a flat directory is small enough to be safe.
+- **No `.raggie` folder, directory has subdirectories**: Raggie warns that the directory doesn't look like a project and asks whether to index anyway. This prevents accidentally scanning unrelated files (e.g. if you run `raggie code .` in your home directory). If you decline, Raggie exits and suggests you `cd` into your project directory or start a new one with `raggie code <project-name>`.
+- **Subagent sessions**: subagents inherit the parent's `.raggie` folder (same working directory), so they always index normally.
 
 You can manually trigger re-indexing at any time with the `/reindex` command.
 

{raggiecode-0.2.1 → raggiecode-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "raggiecode"
-version = "0.2.1"
+version = "0.2.2"
 description = "AI Coding Agent"
 readme = "README.md"
 requires-python = ">=3.10"

{raggiecode-0.2.1 → raggiecode-0.2.2}/src/Agent/agent.py

@@ -1,6 +1,4 @@
 import os
-import glob
-import sys
 import json
 import shutil
 import platform
@@ -13,7 +11,7 @@ from rich.markdown import Markdown
 from .config import load_roles, load_tools, load_keys
 from .tools import ToolRegistry
 from .command import CommandRegistry
-from .chat_history_db import init_db, get_or_create_session, load_messages, save_message, update_chat_title, generate_title, get_active_todo_list, get_todo_tasks, create_session, set_redirect_session_id, save_handover, get_old_session_ids, is_subagent_session, get_session_effort, get_session_info, resolve_session_id, migrate_todo_lists
+from .chat_history_db import init_db, get_or_create_session, load_messages, save_message, update_chat_title, generate_title, get_active_todo_list, get_todo_tasks, create_session, set_redirect_session_id, save_handover, get_old_session_ids, is_subagent_session, get_session_effort, get_session_info, resolve_session_id, migrate_todo_lists, repair_message_sequence
 from .git_manager import GitManager
 from skills import SkillManager
 from indexing.code_index_sdk import CodeIndexSDK
@@ -99,84 +97,13 @@ class Agent:
         # Initialize git manager for commit/undo/redo operations
         self.git_manager = GitManager(root_dir=os.getcwd())
 
-        # Check if this looks like a project directory before indexing
-        cwd = os.getcwd()
-        project_markers = [
-            # VCS
-            ".git", ".hg", ".svn",
-            # Python
-            "pyproject.toml", "setup.py", "setup.cfg", "requirements.txt",
-            "Pipfile", "poetry.lock", "uv.lock", "tox.ini", "MANIFEST.in",
-            # JavaScript / TypeScript
-            "package.json", "tsconfig.json", "yarn.lock", "pnpm-lock.yaml",
-            "package-lock.json", "bower.json", ".npmrc", "deno.json",
-            # Go
-            "go.mod", "go.sum", "go.work",
-            # Rust
-            "Cargo.toml",
-            # C / C++
-            "CMakeLists.txt", "Makefile", "Makefile.am", "configure.ac",
-            "meson.build", "BUCK", "BUILD", "BUILD.bazel", "WORKSPACE",
-            # C# / .NET
-            "Directory.Build.props", "global.json",
-            # Java / Kotlin
-            "pom.xml", "build.gradle", "build.gradle.kts",
-            "settings.gradle", "settings.gradle.kts", "gradle.properties",
-            # PHP
-            "composer.json", "artisan",
-            # Ruby
-            "Gemfile", "Rakefile", ".rspec",
-            # Elixir
-            "mix.exs",
-            # Zig
-            "build.zig",
-            # Dart / Flutter
-            "pubspec.yaml",
-            # Lua
-            "rockspec",
-            # Generic / editor
-            ".raggie", ".vscode", ".idea", ".editorconfig",
-        ]
-        is_project = any(os.path.exists(os.path.join(cwd, m)) for m in project_markers)
-        if not is_project:
-            is_project = bool(glob.glob(os.path.join(cwd, "*.csproj")) or glob.glob(os.path.join(cwd, "*.sln")))
-
-        if is_project:
-            try:
-                with self.console.status("[bold green]Indexing codebase...", spinner="dots"):
-                    self.code_indexer.index_directory()
-            except (KeyboardInterrupt, EOFError):
-                self.console.print("\n[yellow]Indexing interrupted. Using existing index.[/yellow]")
-                self.code_indexer._connect()
-        elif self.is_subagent:
-            self.console.print(
-                f"[yellow]Warning:[/yellow] '{cwd}' doesn't look like a project directory. "
-                f"Skipping indexing."
-            )
-        else:
-            self.console.print(
-                f"[yellow]Warning:[/yellow] '{cwd}' doesn't look like a project directory "
-                f"(no .git, pyproject.toml, package.json, go.mod, Cargo.toml, etc. found).\n"
-                f"Indexing here may scan unrelated files and take a long time."
-            )
-            try:
-                response = input("\nIndex anyway? (y/N): ").strip().lower()
-            except (EOFError, KeyboardInterrupt):
-                response = "n"
-
-            if response in ("y", "yes"):
-                try:
-                    with self.console.status("[bold green]Indexing codebase...", spinner="dots"):
-                        self.code_indexer.index_directory()
-                except (KeyboardInterrupt, EOFError):
-                    self.console.print("\n[yellow]Indexing interrupted. Using existing index.[/yellow]")
-                    self.code_indexer._connect()
-            else:
-                self.console.print(
-                    "Please cd into your project directory and try again.\n"
-                    "To start a new project: raggie code <project-name>"
-                )
-                sys.exit(0)
+        # Index the codebase at the start of each conversation
+        try:
+            with self.console.status("[bold green]Indexing codebase...", spinner="dots"):
+                self.code_indexer.index_directory()
+        except (KeyboardInterrupt, EOFError):
+            self.console.print("\n[yellow]Indexing interrupted. Using existing index.[/yellow]")
+            self.code_indexer._connect()
 
         # Display previous chat history if it exists (skip for subagents — they
         # share the chat_id but don't need the parent's conversation printed)
@@ -378,12 +305,38 @@ class Agent:
             "content": message,
         }
 
+    @staticmethod
+    def _normalize_message_content(msg):
+        """Ensure message content is a string or content-block list, as the API requires."""
+        content = msg.get("content")
+        if content is not None and not isinstance(content, (str, list)):
+            msg["content"] = json.dumps(content)
+
+    def _create_completion(self, **kwargs):
+        """Single choke point for chat.completions.create.
+
+        Repairs the tool_call/tool-response sequence and normalizes content on
+        the in-memory history right before sending, so the API never receives
+        an invalid conversation regardless of how the history was produced.
+        """
+        self.chat_history = repair_message_sequence(self.chat_history)
+        for msg in self.chat_history:
+            self._normalize_message_content(msg)
+        kwargs["messages"] = self.chat_history
+        return self.client.chat.completions.create(**kwargs)
+
 
 
     def _has_dangling_tool_work(self):
         if not self.chat_history:
             return False
 
+        # An assistant tool_calls message with missing responses anywhere in the
+        # history (not just at the tail — a crash can be followed by stored user
+        # messages) makes the sequence invalid for the API.
+        if self._get_pending_toolcalls():
+            return True
+
         last_msg = self.chat_history[-1]
         if last_msg.get("role") == "tool":
             return True
@@ -392,7 +345,7 @@ class Agent:
         if last_msg.get("role") == "user" and last_msg.get("tool_call_id"):
             return True
 
-        return last_msg.get("role") == "assistant" and bool(last_msg.get("tool_calls"))
+        return False
 
     def _get_pending_toolcalls(self):
         """Find tool calls from the last assistant message that don't have tool responses yet.
@@ -438,6 +391,9 @@ class Agent:
             tool_output = self.tool_registry.call(
                 tool_name, args_dict, toolcall_id, self.session_id
             )
+            # A tool returning non-string content (e.g. a dict) would make the
+            # next API call fail; normalize before it enters the history.
+            self._normalize_message_content(tool_output)
 
             if self.debug:
                 print(f"\n[DEBUG] Tool output for {tool_name}:")
@@ -479,24 +435,20 @@ class Agent:
         if not self._has_dangling_tool_work():
             return
 
-        last_msg = self.chat_history[-1]
-        if last_msg.get("role") == "assistant" and last_msg.get("tool_calls"):
-            for toolcall in last_msg["tool_calls"]:
-                function = toolcall.get("function", {})
-                yield from self._execute_tool_call(
-                    toolcall.get("id"),
-                    function.get("name"),
-                    function.get("arguments", "{}"),
-                )
-        elif last_msg.get("tool_call_id"):
-            pending = self._get_pending_toolcalls()
-            for toolcall in pending:
-                function = toolcall.get("function", {})
-                yield from self._execute_tool_call(
-                    toolcall.get("id"),
-                    function.get("name"),
-                    function.get("arguments", "{}"),
-                )
+        # Re-execute every tool call that never got a response, wherever the
+        # dangling assistant message sits in the history.
+        for toolcall in self._get_pending_toolcalls():
+            function = toolcall.get("function", {})
+            yield from self._execute_tool_call(
+                toolcall.get("id"),
+                function.get("name"),
+                function.get("arguments", "{}"),
+            )
+
+        # Executed tool responses are appended to the end of the history; pull
+        # them up next to their assistant message so the sequence sent to the
+        # API stays valid.
+        self.chat_history = repair_message_sequence(self.chat_history)
 
         yield from self.start()
 
@@ -530,9 +482,8 @@ class Agent:
         tool_calls_accum = []
 
         try:
-            stream = self.client.chat.completions.create(
+            stream = self._create_completion(
                 model=model,
-                messages=self.chat_history,
                 tools=self._get_tools(self.agent_role),
                 stream=True,
                 stream_options={"include_usage": True},
@@ -595,9 +546,8 @@ class Agent:
 
         try:
             with self.console.status("[bold green]Thinking...", spinner="dots"):
-                chat = self.client.chat.completions.create(
+                chat = self._create_completion(
                     model=model,
-                    messages=self.chat_history,
                     tools=self._get_tools(self.agent_role),
                 )
         except Exception as err:
@@ -652,9 +602,8 @@ class Agent:
         self._handover_text = None
         handover_text = ""
         try:
-            stream = self.client.chat.completions.create(
+            stream = self._create_completion(
                 model=model,
-                messages=self.chat_history,
                 stream=True,
             )
             for chunk in stream:
@@ -687,9 +636,8 @@ class Agent:
         self._handover_text = None
         try:
             with self.console.status("[bold green]Generating handover instructions...", spinner="dots"):
-                chat = self.client.chat.completions.create(
+                chat = self._create_completion(
                     model=model,
-                    messages=self.chat_history,
                 )
         except Exception as err:
             self.chat_history.pop()

{raggiecode-0.2.1 → raggiecode-0.2.2}/src/Agent/chat_history_db.py

@@ -493,29 +493,104 @@ def save_message(session_id: int, message: Dict):
     conn.close()
 
 
+def repair_message_sequence(messages: List[Dict]) -> List[Dict]:
+    """Move each tool response to directly follow the assistant message that requested it.
+
+    A crash or interrupt can leave a session where an assistant message with
+    tool_calls is followed by user/other messages, with the tool responses
+    appended later. The chat API requires every tool response to directly
+    follow its assistant tool_calls message, so pull each one forward.
+    """
+    result = []
+    owner = {}   # tool_call_id -> position of owning assistant message in result
+    placed = {}  # assistant position -> number of its tool responses already placed
+    for msg in messages:
+        tool_call_id = msg.get("tool_call_id")
+        if tool_call_id is not None and tool_call_id in owner:
+            asst_pos = owner.pop(tool_call_id)
+            insert_at = asst_pos + 1 + placed.get(asst_pos, 0)
+            result.insert(insert_at, msg)
+            placed = {k + 1 if k >= insert_at else k: v for k, v in placed.items()}
+            placed[asst_pos] = placed.get(asst_pos, 0) + 1
+            owner = {k: v + 1 if v >= insert_at else v for k, v in owner.items()}
+        else:
+            if msg.get("role") == "assistant" and msg.get("tool_calls"):
+                asst_pos = len(result)
+                for tc in msg["tool_calls"]:
+                    tcid = tc.get("id")
+                    if tcid:
+                        owner[tcid] = asst_pos
+                placed[asst_pos] = 0
+            result.append(msg)
+    return result
+
+
+def validate_message_sequence(messages: List[Dict]) -> List[str]:
+    """Return a list of API-contract violations in the message sequence (empty if valid).
+
+    Checks the two invariants the chat API enforces:
+    - content must be a string or a content-block list
+    - every assistant tool_calls entry must be answered by a tool response
+      (role "tool", or role "user" with tool_call_id for vision outputs) before
+      any other message follows
+    """
+    errors = []
+    pending: List[str] = []
+    for i, msg in enumerate(messages):
+        content = msg.get("content")
+        if content is not None and not isinstance(content, (str, list)):
+            errors.append(f"messages[{i}]: content is {type(content).__name__}, expected str or list")
+
+        tool_call_id = msg.get("tool_call_id")
+        if tool_call_id and msg.get("role") in ("tool", "user"):
+            if tool_call_id in pending:
+                pending.remove(tool_call_id)
+            else:
+                errors.append(f"messages[{i}]: tool response without matching tool_call")
+            continue
+
+        if pending:
+            errors.append(f"messages[{i}]: {msg.get('role')} message arrived before tool responses to {pending}")
+            pending = []
+
+        if msg.get("role") == "assistant" and msg.get("tool_calls"):
+            pending = [tc.get("id") for tc in msg["tool_calls"]]
+
+    if pending:
+        errors.append(f"unanswered tool_calls at end of history: {pending}")
+    return errors
+
+
 def load_messages(session_id: int) -> List[Dict]:
-    """Load all messages for a given session, ordered by timestamp."""
+    """Load all messages for a given session in insertion order."""
     conn = _get_conn()
     cursor = conn.cursor()
-    
+
+    # Order by id, not timestamp: timestamps can tie (same-second inserts),
+    # which makes the ordering of tool_calls vs tool responses nondeterministic.
     cursor.execute("""
         SELECT role, content, tool_calls, tool_call_id
         FROM messages
         WHERE session_id = ?
-        ORDER BY timestamp ASC
+        ORDER BY id ASC
     """, (session_id,))
     
     messages = []
     for row in cursor.fetchall():
         content_str = str(row[1]) if row[1] is not None else ""
+        content = content_str
         try:
             parsed = json.loads(content_str)
-            if isinstance(parsed, (list, dict)):
+            # Only restore structured content for vision-style content-block
+            # lists (e.g. [{"type": "text", ...}, {"type": "image_url", ...}]).
+            # Any other JSON value (a tool result that happens to be valid JSON,
+            # like a package.json dump) must stay a plain string, or the API
+            # rejects it with "content should be a string or a list".
+            if (isinstance(parsed, list) and parsed
+                    and all(isinstance(item, dict) and "type" in item for item in parsed)):
                 content = parsed
-            else:
-                content = content_str
         except (json.JSONDecodeError, TypeError):
-            content = content_str
+            pass
 
         message = {
             "role": str(row[0]) if row[0] is not None else "user",
@@ -538,9 +613,9 @@ def load_messages(session_id: int) -> List[Dict]:
             continue
         
         messages.append(message)
-    
+
     conn.close()
-    return messages
+    return repair_message_sequence(messages)
 
 
 def delete_chat(chat_id: int):

{raggiecode-0.2.1 → raggiecode-0.2.2}/src/RAG/find.py

@@ -392,7 +392,12 @@ def find_symbol_implementation(symbol_name: str, file_path: str = None) -> str:
             class_body = sdk.get_class_body(symbol_name, file_path)
             if class_body:
                 return class_body
-            
+
+            # Try to find as variable
+            variable_body = sdk.get_variable_body(symbol_name, file_path)
+            if variable_body:
+                return variable_body
+
             # Search for similar symbols by name and description
             matches = sdk.search_symbols(symbol_name, limit=10)
             

{raggiecode-0.2.1 → raggiecode-0.2.2}/src/Tools/todo_list.py

@@ -116,9 +116,7 @@ def handle_get_todo_list(arguments, toolcall_id, parent_session_id=None):
             if task.get('cancel_reason'):
                 output += f"{YELLOW}   Cancel reason: {task['cancel_reason']}{RESET}\n"
             output += "\n"
-        
-        print(output)
-        
+
         return {
             "role": "tool",
             "tool_call_id": toolcall_id,

{raggiecode-0.2.1 → raggiecode-0.2.2}/src/indexing/code_index_sdk.py

@@ -804,6 +804,29 @@ class CodeIndexSDK(QueryMixin, DescriptionMixin):
         
         return ""
 
+    def get_variable_body(self, variable_name: str, file_path: Optional[str] = None) -> Optional[str]:
+        """Get the declaration source lines of a variable by name.
+
+        Args:
+            variable_name: Name of the variable.
+            file_path: Optional relative file path to disambiguate same-name variables.
+
+        Returns:
+            Source code string of the declaration, or None if not found / file unresolvable.
+        """
+        file_id = None
+        if file_path:
+            f = self.get_file_by_path(file_path)
+            if f:
+                file_id = f.id
+
+        matches = self.get_variable_by_name(variable_name, file_id)
+        if not matches:
+            return None
+
+        var = matches[0]
+        return self._read_source_lines(var.file_id, var.location.start_line, var.location.end_line)
+
     def get_class_body(self, class_name: str, file_path: Optional[str] = None) -> Optional[str]:
         """Get the source body of a class by name.
         

{raggiecode-0.2.1 → raggiecode-0.2.2}/src/interactive.py

@@ -3,8 +3,10 @@ Agent run loops for Raggie (interactive and non-interactive modes).
 """
 
 import json
+import re
 import sys
 from importlib.metadata import version
+from pathlib import Path
 from prompt_toolkit import prompt
 from rich.console import Console
 from rich.markdown import Markdown
@@ -18,6 +20,50 @@ GREEN = "\033[32m"
 DIM = "\033[2m"
 RESET = "\033[0m"
 
+# Matches @path/to/file.x:23 and @path/to/file.x:23-43. The lookbehind rejects
+# @-mentions embedded in emails/handles, and the mandatory :N suffix ensures
+# only explicit line references are expanded.
+_FILE_REF_RE = re.compile(r'(?<![\w.@-])@([\w./\\-]+\.[A-Za-z0-9]+):(\d+)(?:-(\d+))?')
+
+
+def expand_file_references(text):
+    """Append referenced code snippets for @path/file.x:N[-M] mentions in user input.
+
+    References pointing to non-existent files are left untouched so emails,
+    handles, and plain text pass through unchanged.
+    """
+    snippets = []
+    seen = set()
+    for m in _FILE_REF_RE.finditer(text):
+        ref = m.group(0)
+        if ref in seen:
+            continue
+        seen.add(ref)
+
+        path_str, start, end = m.group(1), int(m.group(2)), m.group(3)
+        end = int(end) if end else start
+        if end < start:
+            start, end = end, start
+
+        path = Path(path_str)
+        if not path.is_file():
+            continue
+
+        try:
+            lines = path.read_text(errors="replace").splitlines()
+        except OSError:
+            continue
+        if start > len(lines):
+            continue
+
+        end = min(end, len(lines))
+        chunk = "\n".join(f"{i}: {lines[i - 1]}" for i in range(start, end + 1))
+        snippets.append(f"--- {path_str}:{start}-{end} ---\n{chunk}")
+
+    if not snippets:
+        return text
+    return text + "\n\n<referenced_code>\n" + "\n\n".join(snippets) + "\n</referenced_code>"
+
 
 def _prompt_effort(session_id, value=None):
     """Ask the user to pick an effort level and store it on the session."""
@@ -167,7 +213,6 @@ def run_interactive(agent, role):
     """
     model_name = agent.roles[role].get("model", "unknown")
     print(f"{GREEN}Raggie Agent ({role}) v{version('raggiecode')} - Interactive Mode{RESET}")
-    print(f"{GREEN}Press Esc followed by Enter to send message, or type 'exit' to quit{RESET}")
     print("-" * 50)
     print("\nuse /help to see all available commands")
 
@@ -190,6 +235,7 @@ def run_interactive(agent, role):
                 set_session_effort(agent.session_id, DEFAULT_EFFORT)
                 current = DEFAULT_EFFORT
             print(f"\n{DIM}Effort: {effort_name(current)} - to change it use /effort{RESET}")
+            print(f"{DIM}Press Esc followed by Enter to send message, or type 'exit' to quit{RESET}")
             print(f"{GREEN}\n\nYou:{RESET}")
             user_input = prompt("> ", multiline=True)
         except (EOFError, KeyboardInterrupt):
@@ -206,7 +252,7 @@ def run_interactive(agent, role):
             state = StreamState()
             depth = get_session_depth(agent.session_id)
             model_name = agent.roles[role].get("model", "unknown")
-            for event in agent.start(user_input):
+            for event in agent.start(expand_file_references(user_input)):
                 state = _print_event(event, state, depth, model_name)
         except KeyboardInterrupt:
             print("\n[interrupted]")
@@ -233,7 +279,7 @@ def run_non_interactive(agent, prompt_text, effort=None):
 
     try:
         state = StreamState()
-        for event in agent.start(prompt_text):
+        for event in agent.start(expand_file_references(prompt_text)):
             if event[0] == "error":
                 state._stop_live()
                 if state.reasoning_started: