chore: cleanup

Author: damassi

Makefile

@@ -1,4 +1,4 @@
-.PHONY: dev console install start
+.PHONY: dev console lint install start type-check
 
 install:
 	uv sync && uv run pre-commit install && cp .env.example .env && echo "Please edit the .env file with your API keys."
@@ -9,5 +9,11 @@ console:
 dev:
 	uv run textual run --dev -c chat
 
+lint:
+	uv run ruff check --fix src
+
 start:
 	uv run chat
+
+type-check:
+	uv run mypy src

README.md

@@ -41,9 +41,9 @@ Optionally, MCP servers can be lazy-loaded via chat inference, which is useful i
 - Install pre-commit hooks via [pre-commit](https://pre-commit.com/)
   - `uv run pre-commit install`
 - Type-checking is via [MyPy](https://github.com/python/mypy):
-  - `uv run mypy src`
+  - `make type-check`
 - Linting and formatting is via [Ruff](https://docs.astral.sh/ruff/)
-  - `uv run ruff check src`
+  - `make lint`
 
 Textual has an integrated logging console that one can boot separately from the app to receive logs.
 

agent-chat-cli.config.yaml

@@ -1,17 +1,23 @@
 # Agent Chat CLI Configuration
+# See: https://platform.claude.com/docs/en/agent-sdk/python#claude-agent-options
 
-# System prompt loaded from /prompts folder
 system_prompt: system.md
 
-# Model to use (e.g., sonnet, haiku)
 model: haiku
 
 # Enable streaming
 include_partial_messages: true
 
-# Enable dynamic/lazy MCP server inference
+# Enable dynamic/lazy MCP server inference. Useful if one has many MCP servers or
+# many tools, or is cost conscious about loading everything up front.
 mcp_server_inference: false
 
+# Global tool restrictions
+disallowed_tools: ["Bash"]
+
+# Eg, 'default', 'bypassPermissions'
+permission_mode: "default"
+
 # MCP server configurations
 mcp_servers:
   chrome:
@@ -42,16 +48,3 @@ mcp_servers:
       - "https://mcp.notion.com/mcp"
     disallowed_tools: []
     enabled: false
-
-# Global tool restrictions
-disallowed_tools: []
-
-# Permission mode for tool execution
-permission_mode: "default"
-# TODO: Need to implement
-
-# Named agents with custom configurations
-# agents:
-#   sample_agent:
-#     description: "Example agent for demonstration"
-#     prompt: "You are a helpful assistant named Foo."

src/agent_chat_cli/app.py

@@ -9,9 +9,9 @@
 from agent_chat_cli.components.thinking_indicator import ThinkingIndicator
 from agent_chat_cli.components.tool_permission_prompt import ToolPermissionPrompt
 from agent_chat_cli.components.user_input import UserInput
-from agent_chat_cli.system.agent_loop import AgentLoop
-from agent_chat_cli.system.message_bus import MessageBus
-from agent_chat_cli.system.actions import Actions
+from agent_chat_cli.core.agent_loop import AgentLoop
+from agent_chat_cli.core.message_bus import MessageBus
+from agent_chat_cli.core.actions import Actions
 from agent_chat_cli.utils.logger import setup_logging
 
 from dotenv import load_dotenv
@@ -21,7 +21,7 @@
 
 
 class AgentChatCLIApp(App):
-    CSS_PATH = "system/styles.tcss"
+    CSS_PATH = "core/styles.tcss"
 
     BINDINGS = [
         Binding("ctrl+c", "quit", "Quit", show=False, priority=True),

src/agent_chat_cli/components/tool_permission_prompt.py

@@ -12,7 +12,7 @@
 from agent_chat_cli.utils.logger import log_json
 
 if TYPE_CHECKING:
-    from agent_chat_cli.system.actions import Actions
+    from agent_chat_cli.core.actions import Actions
 
 
 class ToolPermissionPrompt(Widget):

src/agent_chat_cli/components/user_input.py

@@ -4,7 +4,7 @@
 
 from agent_chat_cli.components.caret import Caret
 from agent_chat_cli.components.flex import Flex
-from agent_chat_cli.system.actions import Actions
+from agent_chat_cli.core.actions import Actions
 from agent_chat_cli.utils.enums import ControlCommand
 
 

src/agent_chat_cli/system/actions.py src/agent_chat_cli/core/actions.pysrc/agent_chat_cli/system/actions.py renamed to src/agent_chat_cli/core/actions.py

@@ -23,7 +23,7 @@
     get_sdk_config,
 )
 from agent_chat_cli.utils.enums import AgentMessageType, ContentType, ControlCommand
-from agent_chat_cli.system.mcp_inference import infer_mcp_servers
+from agent_chat_cli.core.mcp_inference import infer_mcp_servers
 from agent_chat_cli.utils.logger import log_json
 
 if TYPE_CHECKING:
@@ -219,7 +219,7 @@ async def _can_use_tool(
     ) -> PermissionResult:
         """Agent SDK handler for tool use permissions"""
 
-        # Handle permission request queue
+        # Handle permission request queue sequentially
         async with self.permission_lock:
             await self.app.actions.handle_agent_message(
                 AgentMessage(
@@ -235,25 +235,25 @@ async def _can_use_tool(
             user_response = await self.permission_response_queue.get()
             response = user_response.lower().strip()
 
-            CONFIRM = response in ["y", "yes", "allow", ""]
-            DENY = response in ["n", "no", "deny"]
+            accepted_tool = response in ["y", "yes", "allow", ""]
+            rejected_tool = response in ["n", "no", "deny"]
 
             log_json(
                 {
                     "event": "tool_permission_decision",
                     "response": response,
-                    "CONFIRM": CONFIRM,
-                    "DENY": DENY,
+                    "accepted_tool": accepted_tool,
+                    "rejected_tool": rejected_tool,
                 }
             )
 
-            if CONFIRM:
+            if accepted_tool:
                 return PermissionResultAllow(
                     behavior="allow",
                     updated_input=tool_input,
                 )
 
-            if DENY:
+            if rejected_tool:
                 self.app.actions.post_system_message(
                     f"Permission denied for {tool_name}"
                 )

src/agent_chat_cli/system/agent_loop.py src/agent_chat_cli/core/agent_loop.pysrc/agent_chat_cli/system/agent_loop.py renamed to src/agent_chat_cli/core/agent_loop.py

@@ -13,7 +13,7 @@
     Message,
     ToolMessage,
 )
-from agent_chat_cli.system.agent_loop import AgentMessage
+from agent_chat_cli.core.agent_loop import AgentMessage
 from agent_chat_cli.utils.enums import AgentMessageType, ContentType
 from agent_chat_cli.utils.logger import log_json