makefile-agent 0.4.0__tar.gz → 0.4.2__tar.gz

{makefile_agent-0.4.0 → makefile_agent-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: makefile-agent
-Version: 0.4.0
+Version: 0.4.2
 Summary: An AI agent powered by Makefile skills.
 Author: Dmitriy Sorochenkov
 License-Expression: MIT
@@ -91,8 +91,7 @@ Priority order (first match wins):
 
 1. `--system PROMPT` flag
 2. `--system-file FILE` flag
-3. `SYSTEM.md` in the current working directory
-4. `~/.make-agent/<project>/makefile/SYSTEM.md` (created from a bundled template on first run)
+3. `~/.make-agent/<project>/makefile/SYSTEM.md` (created from a bundled template on first run)
 
 ## Skills
 

{makefile_agent-0.4.0 → makefile_agent-0.4.2}/README.md

@@ -65,8 +65,7 @@ Priority order (first match wins):
 
 1. `--system PROMPT` flag
 2. `--system-file FILE` flag
-3. `SYSTEM.md` in the current working directory
-4. `~/.make-agent/<project>/makefile/SYSTEM.md` (created from a bundled template on first run)
+3. `~/.make-agent/<project>/makefile/SYSTEM.md` (created from a bundled template on first run)
 
 ## Skills
 

{makefile_agent-0.4.0 → makefile_agent-0.4.2}/make_agent/agent_core/__init__.py

@@ -1,4 +1,4 @@
-from .agent import Agent, AgentManager, SessionNotFoundError
+from .agent import AgentManager, SessionNotFoundError
 from .bridge import (
     ApprovalRequested,
     ApproveSkill,
@@ -11,9 +11,9 @@ from .bridge import (
     Shutdown,
     StartTurn,
     StatusChanged,
+    TokenEmitted,
     ToolFinished,
     ToolStarted,
-    TokenEmitted,
     TurnCancelled,
     TurnFinished,
     TurnStarted,
@@ -58,7 +58,6 @@ __all__ = [
     "DEFAULT_REASONING_EFFORT",
     "DEFAULT_TOOL_TIMEOUT",
     "DEFAULT_USE_PROMPT_CACHE",
-    "Agent",
     "AgentConfig",
     "AgentEvent",
     "AgenticLoop",

{makefile_agent-0.4.0 → makefile_agent-0.4.2}/make_agent/agent_core/agent.py

@@ -14,9 +14,9 @@ from make_agent.protocols import ToolHandlerProtocol
 
 from .bridge import (
     ApprovalRequested,
+    ApproveSkill,
     CancelTurn,
     DenySkill,
-    ApproveSkill,
     HistoryCompacted,
     ManagerError,
     ShellCommand,
@@ -24,9 +24,9 @@ from .bridge import (
     Shutdown,
     StartTurn,
     StatusChanged,
+    TokenEmitted,
     ToolFinished,
     ToolStarted,
-    TokenEmitted,
     TurnCancelled,
     TurnFinished,
     TurnStarted,
@@ -56,10 +56,6 @@ from .middleware import MiddlewareBase, Request, Response, SessionMiddleware
 logger = logging.getLogger(__name__)
 
 
-# Backward-compatible alias.
-Agent = AgenticLoop
-
-
 class SessionNotFoundError(Exception):
     pass
 

{makefile_agent-0.4.0 → makefile_agent-0.4.2}/make_agent/agent_shell/run.py

@@ -41,7 +41,6 @@ async def run(
     compact_mode: str = DEFAULT_COMPACT_MODE,
 ) -> None:
     """Start the interactive shell (or send a single prompt and return)."""
-    await tool_handler.setup(model)
     agent_config = AgentConfig(
         system_prompt=system_prompt,
         model=model,
@@ -74,6 +73,7 @@ async def run(
         session_id,
         model=model,
         history_path=project_dir() / "history",
+        memory=memory,
     )
     try:
         await shell.run()

{makefile_agent-0.4.0 → makefile_agent-0.4.2}/make_agent/agent_shell/shell.py

@@ -19,16 +19,6 @@ from pathlib import Path
 from typing import Any, Optional
 from uuid import uuid4
 
-from prompt_toolkit.application import Application
-from prompt_toolkit.completion import WordCompleter
-from prompt_toolkit.filters import Condition
-from prompt_toolkit.history import FileHistory
-from prompt_toolkit.key_binding import KeyBindings
-from prompt_toolkit.layout import HSplit, Layout, VSplit, Window
-from prompt_toolkit.layout.controls import FormattedTextControl
-from prompt_toolkit.styles import Style
-from prompt_toolkit.widgets import Frame, TextArea
-
 from make_agent.agent_core import (
     AgentManager,
     ApprovalRequested,
@@ -42,14 +32,24 @@ from make_agent.agent_core import (
     Shutdown,
     StartTurn,
     StatusChanged,
+    TokenEmitted,
     ToolFinished,
     ToolStarted,
-    TokenEmitted,
     TurnCancelled,
     TurnFinished,
     TurnStarted,
 )
+from make_agent.memory import Memory
+from prompt_toolkit.application import Application
+from prompt_toolkit.completion import WordCompleter
+from prompt_toolkit.filters import Condition
+from prompt_toolkit.key_binding import KeyBindings
+from prompt_toolkit.layout import HSplit, Layout, VSplit, Window
+from prompt_toolkit.layout.controls import FormattedTextControl
+from prompt_toolkit.styles import Style
+from prompt_toolkit.widgets import Frame, TextArea
 
+from .user_messages import UserMessagesManager
 
 # ── status / enums ──────────────────────────────────────────────────────────────
 
@@ -299,6 +299,7 @@ class MakeAgentShell:
         session_id: str,
         model: str,
         history_path: Path,
+        memory: Optional[Memory] = None,
     ) -> None:
         self._agent_manager = agent_manager
         self._session_id = session_id
@@ -310,6 +311,7 @@ class MakeAgentShell:
         self._app: Optional[Application] = None
         self._response_area: Optional[TextArea] = None
         self._tools_area: Optional[TextArea] = None
+        self._history_manager = UserMessagesManager(memory) if memory else None
         self._commands: dict[str, Any] = {
             "exit": self._cmd_exit,
             "quit": self._cmd_exit,
@@ -418,7 +420,6 @@ class MakeAgentShell:
             prompt="> ",
             multiline=True,
             completer=completer,
-            history=FileHistory(str(self._history_path)),
             wrap_lines=False,
         )
         self._composer_input = composer_input
@@ -474,7 +475,7 @@ class MakeAgentShell:
                         else [
                             (
                                 "class:hint",
-                                "  /help /stats /export /exit   Alt+Enter newline   Ctrl+T transcript",
+                                "  /help /stats /export /exit   ↑↓ history   Alt+Enter newline   Ctrl+T transcript",
                             )
                         ]
                     )
@@ -557,10 +558,15 @@ class MakeAgentShell:
         def _on_enter(event) -> None:
             if state.status != AgentStatus.IDLE or state.transcript_focused:
                 return
+
             text = composer_input.text.strip()
             if not text:
                 return
+
             composer_input.text = ""
+            if self._history_manager is not None:
+                self._history_manager.submit()  # Reset nav state after sending
+
             if text.startswith("/"):
                 should_exit = self._dispatch_command(text[1:])
                 if should_exit:
@@ -570,6 +576,31 @@ class MakeAgentShell:
             else:
                 asyncio.ensure_future(self._run_turn(text))
 
+        # Only bind up/down for history navigation when composer is focused,
+        # idle, and memory is available — so arrow keys still scroll the
+        # transcript area when it's focused.
+        composer_history_filter = Condition(
+            lambda: (
+                not state.transcript_focused
+                and state.status == AgentStatus.IDLE
+                and self._history_manager is not None
+            )
+        )
+
+        @kb.add("up", filter=composer_history_filter)
+        def _on_up(event) -> None:
+            msg = self._history_manager.previous(composer_input.text)
+            if msg is not None:
+                composer_input.text = msg
+                self._refresh()
+
+        @kb.add("down", filter=composer_history_filter)
+        def _on_down(event) -> None:
+            msg = self._history_manager.next()
+            if msg is not None:
+                composer_input.text = msg
+                self._refresh()
+
         @kb.add("escape", "enter")
         def _on_alt_enter(event) -> None:
             if state.status == AgentStatus.IDLE and not state.transcript_focused:

makefile_agent-0.4.2/make_agent/agent_shell/user_messages.py

@@ -0,0 +1,110 @@
+"""User message history manager for the agent shell.
+
+Provides navigation through past user messages backed by persistent Memory.
+The shell interacts with this manager, not Memory directly.
+"""
+
+from __future__ import annotations
+
+from typing import Optional
+
+from make_agent.memory import Memory
+
+
+class UserMessagesManager:
+    """Manages user message history for shell navigation.
+
+    Refreshes messages from Memory on each navigation start so that
+    messages from the current session are always included.  Supports
+    forward/backward navigation with index tracking.
+    """
+
+    def __init__(self, memory: Memory, limit: int = 200) -> None:
+        """Initialize with a Memory instance.
+
+        Args:
+            memory: The Memory backend to fetch messages from.
+            limit: Maximum number of historical messages to load (default: 200).
+        """
+        self._memory = memory
+        self._limit = limit
+        self._messages: list[str] = []  # Refreshed on each nav start, newest first
+        self._index: int = -1  # -1 = not navigating; 0 = most recent
+        self._original_text: str = ""  # Text user had typed before pressing UP
+
+    def _refresh(self) -> None:
+        """Reload user messages from Memory so current-session messages
+        are always visible."""
+        self._messages = self._memory.recent_user(self._limit)
+
+    def start_navigating(self, current_text: str) -> Optional[str]:
+        """Begin navigation from the current composer text.
+
+        Called when user first presses UP.  Reloads messages from Memory
+        so current-session messages are included.  Saves the current text
+        as the restoration point (returned when DOWN exits navigation).
+
+        Args:
+            current_text: What the user has typed so far.
+
+        Returns:
+            The most recent past user message, or None if history is empty.
+        """
+        self._refresh()
+        if not self._messages:
+            return None
+        self._original_text = current_text
+        self._index = 0
+        return self._messages[0]
+
+    def previous(self, current_text: str = "") -> Optional[str]:
+        """Navigate to the next older message.
+
+        Args:
+            current_text: What the user has typed so far (saved as restoration point
+                          on first UP press).
+
+        Returns:
+            The previous message, or None if already at the oldest.
+        """
+        if self._index < 0:
+            # First press — start navigating, save current text as restoration point
+            return self.start_navigating(current_text)
+        if self._index < len(self._messages) - 1:
+            self._index += 1
+            return self._messages[self._index]
+        return None
+
+    def next(self) -> Optional[str]:
+        """Navigate to the next newer message or restore original text.
+
+        Returns:
+            The next newer message, or the original typed text when
+            navigation returns to the start, or None if not navigating.
+        """
+        if self._index < 0:
+            return None
+        if self._index > 0:
+            self._index -= 1
+            return self._messages[self._index]
+        # Back at start — restore original text
+        text = self._original_text
+        self._index = -1
+        self._original_text = ""
+        return text
+
+    def cancel(self) -> None:
+        """Cancel navigation and restore the original typed text."""
+        self._index = -1
+
+    def submit(self) -> None:
+        """Called when the user sends a message (presses Enter).
+
+        Resets navigation state so the next UP press starts fresh.
+        """
+        self._index = -1
+        self._original_text = ""
+
+    def is_navigating(self) -> bool:
+        """Check if the user is currently in navigation mode."""
+        return self._index >= 0

{makefile_agent-0.4.0 → makefile_agent-0.4.2}/make_agent/main.py

@@ -29,7 +29,7 @@ logger = logging.getLogger(__name__)
 
 _DEFAULT_SYSTEM_PROMPT_FILE = "SYSTEM.md"
 _REASONING_EFFORT_VALUES = ("none", "minimal", "low", "medium", "high", "xhigh")
-_SKILL_MODES = ("makefile",)
+_SKILL_MODE = "makefile"
 
 
 def _init_logging(loglevel: str) -> None:
@@ -61,9 +61,7 @@ def _resolve_system_prompt(args: argparse.Namespace) -> str:
     if cwd_system.exists():
         return cwd_system.read_text(encoding="utf-8")
 
-    project_system = (
-        mode_dir(getattr(args, "skill_mode", "python")) / _DEFAULT_SYSTEM_PROMPT_FILE
-    )
+    project_system = mode_dir(_SKILL_MODE) / _DEFAULT_SYSTEM_PROMPT_FILE
     if project_system.exists():
         return project_system.read_text(encoding="utf-8")
 
@@ -111,16 +109,16 @@ def _cmd_run(args: argparse.Namespace) -> None:
         except OSError as e:
             sys.exit(f"make-agent run: {e}")
 
-    ensure_mode_system_prompt(args.skill_mode)
+    ensure_mode_system_prompt(_SKILL_MODE)
     system_prompt = _resolve_system_prompt(args)
-    disabled = _parse_disabled_tools(args.disable_builtin_tools, args.skill_mode)
+    disabled = _parse_disabled_tools(args.disable_builtin_tools, _SKILL_MODE)
     if args.skills_dir:
-        skills_dir = str(Path(args.skills_dir) / args.skill_mode)
+        skills_dir = str(Path(args.skills_dir) / _SKILL_MODE)
     else:
-        skills_dir = str(default_skills_dir(args.skill_mode))
+        skills_dir = str(default_skills_dir(_SKILL_MODE))
 
-    memory = Memory(mode_memory_path(args.skill_mode))
-    backend = _build_backend(args.skill_mode, skills_dir, args.tool_timeout)
+    memory = Memory(mode_memory_path(_SKILL_MODE))
+    backend = _build_backend(_SKILL_MODE, skills_dir, args.tool_timeout)
     trusted_skills = _parse_trusted_skills(getattr(args, "trusted_skills", None))
     tool_handler = ToolHandler(backend, memory, disabled, trusted_skills)
 
@@ -200,13 +198,6 @@ def main() -> None:
         metavar="SECONDS",
         help="Timeout in seconds for each tool call (default: 600)",
     )
-    run_p.add_argument(
-        "--skill-mode",
-        choices=_SKILL_MODES,
-        default="makefile",
-        metavar="MODE",
-        help="Skill backend mode to use (default: makefile)",
-    )
     run_p.add_argument(
         "--skills-dir",
         default=None,

{makefile_agent-0.4.0 → makefile_agent-0.4.2}/make_agent/memory/memory.py

@@ -216,6 +216,21 @@ class Memory:
         """Search past agent replies using FTS5 via the ``agent_memory`` view."""
         return self._search("agent_memory", query, limit, from_date, to_date)
 
+    def recent_user(
+        self,
+        limit: int = 10,
+    ) -> list[str]:
+        """Return the *limit* most recent user messages as plain strings, newest first.
+
+        Used by the shell for UP/DOWN arrow navigation through past user messages.
+        """
+        conn = self._get_conn()
+        rows = conn.execute(
+            "SELECT message FROM messages WHERE sender = 'user' ORDER BY id DESC LIMIT ?",
+            (limit,),
+        ).fetchall()
+        return [row["message"] for row in rows]
+
     def recent(
         self,
         limit: int = 10,

{makefile_agent-0.4.0 → makefile_agent-0.4.2}/make_agent/skill_backend.py

@@ -23,8 +23,6 @@ class SkillBackend(Protocol):
     @property
     def executors(self) -> dict[str, Any]: ...
 
-    async def setup(self, model: str) -> None: ...
-
     def get_skill_trusted(self, name: str) -> bool | None: ...
 
 
@@ -81,9 +79,6 @@ class MakefileSkillBackend:
     def executors(self) -> dict[str, Any]:
         return self._executors
 
-    async def setup(self, model: str) -> None:
-        del model
-
     def get_skill_trusted(self, name: str) -> bool | None:
         return None
 

{makefile_agent-0.4.0 → makefile_agent-0.4.2}/make_agent/templates/makefile/SYSTEM.md

@@ -37,7 +37,7 @@ A skill is a directory containing a single file: **skill.mk**.
 
 ```makefile
 define DESCRIPTION
-One-line description shown in list_skills.
+Description shown in list_skills.
 endef
 
 .PHONY: target-name
@@ -49,3 +49,16 @@ target-name:
 Rules for skill.mk:
 - Must contain a `define DESCRIPTION … endef` block with a short description.
 - Call `validate_skill` after creating a skill to confirm it is valid.
+
+### Overwriting a skilll
+
+To overwrite an existing skill, simply call `create_skill` with the same name. This will replace the existing `skill.mk` file with the new content you provide.
+
+
+## Your workflow
+1. Clarify the user's request
+2. Create a plan to fulfill the request, which may include using skills
+3. Identify which skills to use and in what order
+4. If there are no existing skills that can fulfill the request, create a new skill
+5. Implement the plan by executing the necessary skills
+6. Observe the results and iterate as needed until the user's request is fulfilled

{makefile_agent-0.4.0 → makefile_agent-0.4.2}/make_agent/tool_handler/handler.py

@@ -82,9 +82,6 @@ class ToolHandler:
             return {"tools": self._schemas, "tool_choice": "auto"}
         return {}
 
-    async def setup(self, model: str) -> None:
-        await self._backend.setup(model)
-
     async def execute(
         self,
         name: str,

{makefile_agent-0.4.0 → makefile_agent-0.4.2}/makefile_agent.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: makefile-agent
-Version: 0.4.0
+Version: 0.4.2
 Summary: An AI agent powered by Makefile skills.
 Author: Dmitriy Sorochenkov
 License-Expression: MIT
@@ -91,8 +91,7 @@ Priority order (first match wins):
 
 1. `--system PROMPT` flag
 2. `--system-file FILE` flag
-3. `SYSTEM.md` in the current working directory
-4. `~/.make-agent/<project>/makefile/SYSTEM.md` (created from a bundled template on first run)
+3. `~/.make-agent/<project>/makefile/SYSTEM.md` (created from a bundled template on first run)
 
 ## Skills
 

{makefile_agent-0.4.0 → makefile_agent-0.4.2}/makefile_agent.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ make_agent/agent_core/provider.py
 make_agent/agent_shell/__init__.py
 make_agent/agent_shell/run.py
 make_agent/agent_shell/shell.py
+make_agent/agent_shell/user_messages.py
 make_agent/builtin_tools/__init__.py
 make_agent/builtin_tools/file_tools.py
 make_agent/builtin_tools/skill_tools.py
@@ -52,4 +53,5 @@ tests/test_memory.py
 tests/test_middleware.py
 tests/test_parser.py
 tests/test_tools.py
-tests/test_trusted_skill.py
+tests/test_trusted_skill.py
+tests/test_user_messages.py

{makefile_agent-0.4.0 → makefile_agent-0.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "makefile-agent"
-version = "0.4.0"
+version = "0.4.2"
 description = "An AI agent powered by Makefile skills."
 readme = "README.md"
 license = "MIT"