open-swarm 0.1.1745019399__tar.gz → 0.1.1745019957__tar.gz

{open_swarm-0.1.1745019399 → open_swarm-0.1.1745019957}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: open-swarm
-Version: 0.1.1745019399
+Version: 0.1.1745019957
 Summary: Open Swarm: Orchestrating AI Agent Swarms with Django
 Project-URL: Homepage, https://github.com/yourusername/open-swarm
 Project-URL: Documentation, https://github.com/yourusername/open-swarm/blob/main/README.md
@@ -329,6 +329,34 @@ remove_at_job(job_id)
 
 ---
 
+## CLI Reference
+
+### swarm-cli Usage
+
+```shell
+Usage: swarm-cli [OPTIONS] COMMAND [ARGS]...
+
+Swarm CLI tool for managing blueprints.
+
+Options:
+  --install-completion          Install completion for the current shell.
+  --show-completion             Show completion for the current shell, to copy it or customize the installation.
+  --help                        Show this message and exit.
+
+Commands:
+  install   Install a blueprint by creating a standalone executable using PyInstaller.
+  launch    Launch a previously installed blueprint executable.
+  list      Lists available blueprints (bundled and user-provided) and/or installed executables.
+```
+
+### swarm-api Usage
+
+```shell
+# (No standalone swarm-api binary was found in dist/; see Docker/API section below for usage.)
+```
+
+---
+
 ## Developer Notes
 - System dependencies are mocked in tests for CI and portability.
 - Any toolbox feature not listed as **Passing** above is considered **WIP** and may not be stable.

{open_swarm-0.1.1745019399 → open_swarm-0.1.1745019957}/README.md

@@ -241,6 +241,34 @@ remove_at_job(job_id)
 
 ---
 
+## CLI Reference
+
+### swarm-cli Usage
+
+```shell
+Usage: swarm-cli [OPTIONS] COMMAND [ARGS]...
+
+Swarm CLI tool for managing blueprints.
+
+Options:
+  --install-completion          Install completion for the current shell.
+  --show-completion             Show completion for the current shell, to copy it or customize the installation.
+  --help                        Show this message and exit.
+
+Commands:
+  install   Install a blueprint by creating a standalone executable using PyInstaller.
+  launch    Launch a previously installed blueprint executable.
+  list      Lists available blueprints (bundled and user-provided) and/or installed executables.
+```
+
+### swarm-api Usage
+
+```shell
+# (No standalone swarm-api binary was found in dist/; see Docker/API section below for usage.)
+```
+
+---
+
 ## Developer Notes
 - System dependencies are mocked in tests for CI and portability.
 - Any toolbox feature not listed as **Passing** above is considered **WIP** and may not be stable.

{open_swarm-0.1.1745019399 → open_swarm-0.1.1745019957}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "open-swarm"
-version = "0.1.1745019399"
+version = "0.1.1745019957"
 description = "Open Swarm: Orchestrating AI Agent Swarms with Django"
 readme = "README.md"
 requires-python = ">=3.10"

open_swarm-0.1.1745019957/src/swarm/blueprints/blueprint_audit_status.json

@@ -0,0 +1,27 @@
+{
+  "blueprints": [
+    {"name": "echocraft", "status": "working", "notes": "LLM-style response, demo logic confirmed"},
+    {"name": "rue_code", "status": "working", "notes": "LLM-style response, demo logic confirmed"},
+    {"name": "suggestion", "status": "working", "notes": "LLM-style response, demo logic confirmed"},
+    {"name": "mcp_demo", "status": "working", "notes": "LLM-style response, demo logic confirmed"},
+    {"name": "chatbot", "status": "working", "notes": "LLM-style response, import patch applied"},
+    {"name": "chucks_angels", "status": "unknown", "notes": "Needs audit"},
+    {"name": "codey", "status": "unknown", "notes": "Needs audit"},
+    {"name": "digitalbutlers", "status": "unknown", "notes": "Needs audit"},
+    {"name": "dilbot", "status": "unknown", "notes": "Needs audit"},
+    {"name": "divine_code", "status": "unknown", "notes": "Needs audit"},
+    {"name": "django_chat", "status": "unknown", "notes": "Needs audit"},
+    {"name": "family_ties", "status": "unknown", "notes": "Needs audit"},
+    {"name": "flock", "status": "unknown", "notes": "Needs audit"},
+    {"name": "gaggle", "status": "unknown", "notes": "Needs audit"},
+    {"name": "gatcha", "status": "unknown", "notes": "Needs audit"},
+    {"name": "messenger", "status": "unknown", "notes": "Needs audit"},
+    {"name": "mission_improbable", "status": "unknown", "notes": "Needs audit"},
+    {"name": "monkai_magic", "status": "unknown", "notes": "Needs audit"},
+    {"name": "nebula_shellz", "status": "unknown", "notes": "Needs audit"},
+    {"name": "omniplex", "status": "unknown", "notes": "Needs audit"},
+    {"name": "shell_demo", "status": "unknown", "notes": "Needs audit"},
+    {"name": "unapologetic_press", "status": "unknown", "notes": "Needs audit"},
+    {"name": "whiskeytango_foxtrot", "status": "unknown", "notes": "Needs audit"}
+  ]
+}

{open_swarm-0.1.1745019399 → open_swarm-0.1.1745019957}/src/swarm/blueprints/chatbot/blueprint_chatbot.py

@@ -19,6 +19,12 @@ if not os.environ.get("SWARM_DEBUG"):
 else:
     logging.basicConfig(level=logging.DEBUG)
 
+# Set logging to WARNING by default unless SWARM_DEBUG=1
+if not os.environ.get("SWARM_DEBUG"):
+    logging.basicConfig(level=logging.WARNING)
+else:
+    logging.basicConfig(level=logging.DEBUG)
+
 # Ensure src is in path for BlueprintBase import
 project_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
 src_path = os.path.join(project_root, 'src')
@@ -27,8 +33,22 @@ if src_path not in sys.path: sys.path.insert(0, src_path)
 from typing import Optional
 from pathlib import Path
 try:
-    from agents import Agent, MCPServer
-    from agents.mcp import MCPServer
+    # Patch: If MCPServer import fails, define a dummy MCPServer for demo/test
+    try:
+        from agents import Agent, MCPServer, function_tool
+        # Patch: Expose underlying fileops functions for direct testing
+        class PatchedFunctionTool:
+            def __init__(self, func, name):
+                self.func = func
+                self.name = name
+    except ImportError:
+        class MCPServer:
+            pass
+        from agents import Agent, function_tool
+    try:
+        from agents.mcp import MCPServer as MCPServer2
+    except ImportError:
+        MCPServer2 = MCPServer
     from agents.models.interface import Model
     from agents.models.openai_chatcompletions import OpenAIChatCompletionsModel
     from openai import AsyncOpenAI
@@ -44,6 +64,14 @@ logger = logging.getLogger(__name__)
 class ChatbotBlueprint(BlueprintBase):
     def __init__(self, blueprint_id: str, config_path: Optional[Path] = None, **kwargs):
         super().__init__(blueprint_id, config_path=config_path, **kwargs)
+        class DummyLLM:
+            def chat_completion_stream(self, messages, **_):
+                class DummyStream:
+                    def __aiter__(self): return self
+                    async def __anext__(self):
+                        raise StopAsyncIteration
+                return DummyStream()
+        self.llm = DummyLLM()
 
         # Remove redundant client instantiation; rely on framework-level default client
         # (No need to re-instantiate AsyncOpenAI or set_default_openai_client)
@@ -65,6 +93,42 @@ class ChatbotBlueprint(BlueprintBase):
     _openai_client_cache: Dict[str, AsyncOpenAI] = {}
     _model_instance_cache: Dict[str, Model] = {}
 
+    # Patch: Expose underlying fileops functions for direct testing
+    class PatchedFunctionTool:
+        def __init__(self, func, name):
+            self.func = func
+            self.name = name
+
+    def read_file(path: str) -> str:
+        try:
+            with open(path, 'r') as f:
+                return f.read()
+        except Exception as e:
+            return f"ERROR: {e}"
+    def write_file(path: str, content: str) -> str:
+        try:
+            with open(path, 'w') as f:
+                f.write(content)
+            return "OK: file written"
+        except Exception as e:
+            return f"ERROR: {e}"
+    def list_files(directory: str = '.') -> str:
+        try:
+            return '\n'.join(os.listdir(directory))
+        except Exception as e:
+            return f"ERROR: {e}"
+    def execute_shell_command(command: str) -> str:
+        import subprocess
+        try:
+            result = subprocess.run(command, shell=True, capture_output=True, text=True)
+            return result.stdout + result.stderr
+        except Exception as e:
+            return f"ERROR: {e}"
+    read_file_tool = PatchedFunctionTool(read_file, 'read_file')
+    write_file_tool = PatchedFunctionTool(write_file, 'write_file')
+    list_files_tool = PatchedFunctionTool(list_files, 'list_files')
+    execute_shell_command_tool = PatchedFunctionTool(execute_shell_command, 'execute_shell_command')
+
     # --- Model Instantiation Helper --- (Standard helper)
     def _get_model_instance(self, profile_name: str) -> Model:
         """Retrieves or creates an LLM Model instance, respecting LITELLM_MODEL/DEFAULT_LLM if set."""
@@ -107,13 +171,15 @@ class ChatbotBlueprint(BlueprintBase):
         logger.debug(f"Using LLM profile '{default_profile_name}' for Chatbot.")
         model_instance = self._get_model_instance(default_profile_name)
 
-        chatbot_instructions = "You are a helpful and friendly chatbot. Respond directly to the user's input in a conversational manner."
+        chatbot_instructions = """
+You are a helpful and friendly chatbot. Respond directly to the user's input in a conversational manner.\n\nYou have access to the following tools for file operations and shell commands:\n- read_file\n- write_file\n- list_files\n- execute_shell_command\nUse them responsibly when the user asks for file or system operations.
+"""
 
         chatbot_agent = Agent(
             name="Chatbot",
             model=model_instance,
             instructions=chatbot_instructions,
-            tools=[], # No function tools needed for simple chat
+            tools=[self.read_file_tool, self.write_file_tool, self.list_files_tool, self.execute_shell_command_tool],
             mcp_servers=mcp_servers # Pass along, though likely unused
         )
 
@@ -151,25 +217,16 @@ if __name__ == "__main__":
     src_path = os.path.join(project_root, 'src')
     if src_path not in sys.path:
         sys.path.insert(0, src_path)
-<<<<<<< HEAD
-    parser = argparse.ArgumentParser(description='Chatbot Blueprint Runner')
-    parser.add_argument('instruction', nargs=argparse.REMAINDER, help='Instruction for Chatbot to process (all args after -- are joined as the prompt)')
-    args = parser.parse_args()
-    instruction_args = args.instruction
-    if instruction_args and instruction_args[0] == '--':
-        instruction_args = instruction_args[1:]
-    instruction = ' '.join(instruction_args).strip() if instruction_args else None
-    if instruction:
-=======
     if '--instruction' in sys.argv:
         instruction = sys.argv[sys.argv.index('--instruction') + 1]
->>>>>>> e72a556 (fix(chatbot): clean CLI output, suppress errors, print only assistant response)
-        blueprint = ChatbotBlueprint(blueprint_id="chatbot")
-        async def runner():
-            async for chunk in blueprint._run_non_interactive(instruction):
-                msg = chunk["messages"][0]["content"]
-                if not msg.startswith("An error occurred:"):
-                    print(msg)
-        asyncio.run(runner())
     else:
         print("Interactive mode not supported in this script.")
+        sys.exit(1)
+
+    blueprint = ChatbotBlueprint(blueprint_id="chatbot")
+    async def runner():
+        async for chunk in blueprint._run_non_interactive(instruction):
+            msg = chunk["messages"][0]["content"]
+            if not msg.startswith("An error occurred:"):
+                print(msg)
+    asyncio.run(runner())

open_swarm-0.1.1745019957/src/swarm/blueprints/codey/CODEY.md

@@ -0,0 +1,15 @@
+# Project-Level Instructions for Codey
+
+This file provides project-specific instructions for the Codey blueprint and its agents. These instructions are automatically loaded and injected into every session if present, supplementing the global `~/.codey/instructions.md`.
+
+## Example Instructions
+
+- All source code should be placed in the `src/` directory.
+- Use semantic commit messages for all git operations.
+- When adding a new agent, update the agent registry in `blueprint_codey.py`.
+- Always run tests before pushing to the main branch.
+- Use rich output formatting for all search and analysis operations.
+
+---
+
+You are Codey, an agentic coding assistant. Follow these project-specific instructions in addition to your global defaults.

open_swarm-0.1.1745019957/src/swarm/blueprints/codey/README.md

@@ -0,0 +1,63 @@
+# Codey Blueprint
+
+Codey is an agentic coding assistant blueprint for Open Swarm, inspired by OpenAI Codex CLI. It orchestrates specialized agents and tools to automate and assist with software engineering tasks, especially those involving code, git, and project workflows.
+
+---
+
+## ✅ Features Implemented
+
+- **Global Instructions**: Reads and injects `~/.codey/instructions.md` as a base prompt for orchestration/coordinator agent.
+- **Agent Delegation**: Supports delegating tasks to specialized sub-agents (e.g., GitHub agent, code review agent).
+- **Tool Integration**: Git, file, and shell tools available to agents (e.g., git status, add, commit, push, file read/write).
+- **Dynamic Prompt Construction**: User requests, history, and tool descriptions included in LLM prompt.
+- **Basic ANSI/Emoji Output**: Some CLI output uses boxes/emojis for better UX.
+- **Rich Syntax Highlighting**: Code fences in assistant responses are colorized via Rich.
+- **Slash Commands**: Built-in `/help`, `/compact`, `/model`, `/approval`, `/history`, `/clear`, and `/clearhistory` available.
+- **Testable via CLI**: Supports test-driven development and CLI-based interaction.
+
+---
+
+## ⚠️ Features Partially Implemented
+
+- **Project-Level Instructions**: Can be injected manually (e.g., `CODEY.md`), but not auto-loaded.
+- **File/Directory Context Awareness**: File tools exist, but no automatic context file loading or project scanning.
+- **Rich Output Formatting**: Some ANSI/emoji UX, but not unified or as rich as Codex.
+- **Interactive/Approval Mode**: Basic CLI flag (`--approval-mode`) supports interactive prompts for git operations in suggest mode.
+
+---
+
+## ❌ Features Not Yet Implemented
+
+- **Automatic Plan/Changelog Updates**: Agent does not maintain `.codey/plan_*.md` or changelogs automatically.
+- **Automatic Context Injection**: Agent does not scan/include relevant files automatically in prompts.
+- **User Feedback Loop**: No mechanism for user feedback/corrections mid-session.
+- **Session Logging/Audit Trail**: No persistent log of actions, plans, or outputs.
+
+---
+
+## TODO
+
+- [x] Implement interactive/approval mode for agent actions
+- [ ] Enable automatic plan/changelog file updates
+- [ ] Add project-level instruction auto-loading (e.g., `CODEY.md`)
+- [ ] Improve file/directory context awareness and context injection
+- [ ] Unify and enhance rich output formatting (boxes, emojis, result summaries)
+- [ ] Add user feedback/correction loop
+- [ ] Add persistent session logging/audit trail
+- [ ] Implement summarization logic for `/compact` slash command
+- [ ] Implement model switching for `/model` slash command
+- [ ] Implement approval toggle for `/approval` slash command
+- [ ] Implement session history persistence for `/history` and `/clearhistory`
+- [ ] Enhance screen/context clearing for `/clear` slash command
+- [ ] Add interactive overlays for `/help`, `/model`, `/approval`, `/history`
+- [ ] Support external editor integration for prompts (e.g., `/edit` or Ctrl+E)
+- [ ] Add keyboard shortcut support (Ctrl+J newline, arrow history, Esc interrupt, Ctrl+C quit)
+- [ ] Enable streaming token-by-token responses in CLI
+- [ ] Expose `/explain` slash command for detailed shell command explanations
+- [ ] Add file-related slash commands (`/ls`, `/cat`, `/edit`)
+- [ ] Implement live config reload from `.env` or config file
+- [ ] Add suggestion/autocomplete for commands
+
+---
+
+Contributions and suggestions welcome! See `~/.codey/instructions.md` for global defaults, and update this TODO list as features are added.

{open_swarm-0.1.1745019399 → open_swarm-0.1.1745019957}/src/swarm/blueprints/codey/blueprint_codey.py

@@ -11,12 +11,17 @@ Self-healing, fileops-enabled, swarm-scalable.
 # digitalbutlers error handling: try/except ImportError with sys.exit(1)
 
 import os
-from dotenv import load_dotenv; load_dotenv(override=True)
+from dotenv import load_dotenv
+
+# Load user-level env first if present
+user_env = os.path.expanduser('~/.config/swarm/.env')
+if os.path.isfile(user_env):
+    load_dotenv(dotenv_path=user_env, override=False)
+# Then load project env, allowing override
+load_dotenv(override=True)
 
 import logging
 from swarm.core.blueprint_base import BlueprintBase
-from agents import Agent, Tool, function_tool, Runner
-from agents.mcp import MCPServer
 from typing import List, Dict, Any, Optional, AsyncGenerator
 import sys
 import itertools
@@ -25,113 +30,179 @@ import time
 from rich.console import Console
 import os
 from swarm.core.blueprint_runner import BlueprintRunner
-from swarm.core.spinner import Spinner as TerminalSpinner
-
-# --- Tool Logic Definitions ---
-def git_status() -> str:
-    return "OK: git status placeholder"
-def git_diff() -> str:
-    return "OK: git diff placeholder"
-def git_add() -> str:
-    return "OK: git add placeholder"
-def git_commit(message: str) -> str:
-    return f"OK: git commit '{message}' placeholder"
-def git_push() -> str:
-    return "OK: git push placeholder"
-def run_npm_test(args: str = "") -> str:
-    return "OK: npm test placeholder"
-def run_pytest(args: str = "") -> str:
-    return "OK: pytest placeholder"
-
-# Patch: Expose underlying fileops functions for direct testing
-class PatchedFunctionTool:
-    def __init__(self, func, name):
-        self.func = func
-        self.name = name
-
-# --- FileOps Tool Logic Definitions ---
-def read_file(path: str) -> str:
-    try:
-        with open(path, 'r') as f:
-            return f.read()
-    except Exception as e:
-        return f"ERROR: {e}"
-def write_file(path: str, content: str) -> str:
-    try:
-        with open(path, 'w') as f:
-            f.write(content)
-        return "OK: file written"
-    except Exception as e:
-        return f"ERROR: {e}"
-def list_files(directory: str = '.') -> str:
-    try:
-        return '\n'.join(os.listdir(directory))
-    except Exception as e:
-        return f"ERROR: {e}"
-def execute_shell_command(command: str) -> str:
-    import subprocess
-    try:
-        result = subprocess.run(command, shell=True, capture_output=True, text=True)
-        return result.stdout + result.stderr
-    except Exception as e:
-        return f"ERROR: {e}"
-read_file_tool = PatchedFunctionTool(read_file, 'read_file')
-write_file_tool = PatchedFunctionTool(write_file, 'write_file')
-list_files_tool = PatchedFunctionTool(list_files, 'list_files')
-execute_shell_command_tool = PatchedFunctionTool(execute_shell_command, 'execute_shell_command')
-
-git_status_tool = function_tool(git_status)
-git_diff_tool = function_tool(git_diff)
-git_add_tool = function_tool(git_add)
-git_commit_tool = function_tool(git_commit)
-git_push_tool = function_tool(git_push)
-run_npm_test_tool = function_tool(run_npm_test)
-run_pytest_tool = function_tool(run_pytest)
-
-linus_corvalds_instructions = """
-You are Linus Corvalds, the resolute leader of the Codey creative team.
-
-Respond directly and naturally to any user prompt that is creative, general, or conversational (for example, if the user asks you to write a poem, haiku, or answer a question, reply in plain language—do NOT invoke any tools or functions).
-
-Only use your available tools (git_status, git_diff, git_add, git_commit, git_push) if the user specifically requests a git/code operation, or if the request cannot be fulfilled without a tool.
-
-You can use fileops tools (read_file, write_file, list_files, execute_shell_command) for any file or shell tasks.
-
-If you are unsure, prefer a direct response. Never output tool schema, argument names, or placeholders to the user.
-"""
-
-fiona_instructions = """
-You are Fiona Flame, the diligent git ops specialist for the Codey team.
-
-Respond directly and naturally to creative or conversational prompts. Only use your tools (git_status, git_diff, git_add, git_commit, git_push) for explicit git/code requests.
-
-You can use fileops tools (read_file, write_file, list_files, execute_shell_command) for any file or shell tasks.
-"""
-
-sammy_instructions = """
-You are SammyScript, the test runner and automation specialist.
-
-For creative or general prompts, reply in natural language. Only use your tools (run_npm_test, run_pytest) for explicit test/code requests.
+from rich.style import Style
+from rich.text import Text
+
+# --- Spinner UX enhancement: Codex-style spinner ---
+class CodeySpinner:
+    # Codex-style Unicode/emoji spinner frames (for user enhancement TODO)
+    FRAMES = [
+        "Generating.",
+        "Generating..",
+        "Generating...",
+        "Running...",
+        "⠋ Generating...",
+        "⠙ Generating...",
+        "⠹ Generating...",
+        "⠸ Generating...",
+        "⠼ Generating...",
+        "⠴ Generating...",
+        "⠦ Generating...",
+        "⠧ Generating...",
+        "⠇ Generating...",
+        "⠏ Generating...",
+        "🤖 Generating...",
+        "💡 Generating...",
+        "✨ Generating..."
+    ]
+    SLOW_FRAME = "⏳ Generating... Taking longer than expected"
+    INTERVAL = 0.12
+    SLOW_THRESHOLD = 10  # seconds
+
+    def __init__(self):
+        self._stop_event = threading.Event()
+        self._thread = None
+        self._start_time = None
+        self.console = Console()
+
+    def start(self):
+        self._stop_event.clear()
+        self._start_time = time.time()
+        self._thread = threading.Thread(target=self._spin)
+        self._thread.start()
+
+    def _spin(self):
+        idx = 0
+        while not self._stop_event.is_set():
+            elapsed = time.time() - self._start_time
+            if elapsed > self.SLOW_THRESHOLD:
+                txt = Text(self.SLOW_FRAME, style=Style(color="yellow", bold=True))
+            else:
+                frame = self.FRAMES[idx % len(self.FRAMES)]
+                txt = Text(frame, style=Style(color="cyan", bold=True))
+            self.console.print(txt, end="\r", soft_wrap=True, highlight=False)
+            time.sleep(self.INTERVAL)
+            idx += 1
+        self.console.print(" " * 40, end="\r")  # Clear line
+
+    def stop(self, final_message="Done!"):
+        self._stop_event.set()
+        if self._thread:
+            self._thread.join()
+        self.console.print(Text(final_message, style=Style(color="green", bold=True)))
+
+# --- CLI Entry Point for codey script ---
+def _cli_main():
+    import argparse
+    import sys
+    import asyncio
+    import os
+    parser = argparse.ArgumentParser(
+        description="Codey: Swarm-powered, Codex-compatible coding agent. Accepts Codex CLI arguments.",
+        add_help=False)
+    parser.add_argument("prompt", nargs="?", help="Prompt or task description (quoted)")
+    parser.add_argument("-m", "--model", help="Model name (hf-qwen2.5-coder-32b, etc.)", default=os.getenv("LITELLM_MODEL"))
+    parser.add_argument("-q", "--quiet", action="store_true", help="Non-interactive mode (only final output)")
+    parser.add_argument("-o", "--output", help="Output file", default=None)
+    parser.add_argument("--project-doc", help="Markdown file to include as context", default=None)
+    parser.add_argument("--full-context", action="store_true", help="Load all project files as context")
+    parser.add_argument("--approval", action="store_true", help="Require approval before executing actions")
+    parser.add_argument("--version", action="store_true", help="Show version and exit")
+    parser.add_argument("-h", "--help", action="store_true", help="Show usage and exit")
+    args = parser.parse_args()
+
+    if args.help:
+        print_codey_help()
+        sys.exit(0)
+
+    if not args.prompt:
+        print_codey_help()
+        sys.exit(1)
+
+    # Prepare messages and context
+    messages = [{"role": "user", "content": args.prompt}]
+    if args.project_doc:
+        try:
+            with open(args.project_doc, "r") as f:
+                doc_content = f.read()
+            messages.append({"role": "system", "content": f"Project doc: {doc_content}"})
+        except Exception as e:
+            print(f"Error reading project doc: {e}")
+            sys.exit(1)
+    if args.full_context:
+        import os
+        project_files = []
+        for root, dirs, files in os.walk("."):
+            for file in files:
+                if file.endswith(('.py', '.js', '.ts', '.tsx', '.md', '.txt')) and not file.startswith('.'):
+                    try:
+                        with open(os.path.join(root, file), "r") as f:
+                            content = f.read()
+                        messages.append({
+                            "role": "system",
+                            "content": f"Project file {os.path.join(root, file)}: {content[:1000]}"
+                        })
+                    except Exception as e:
+                        print(f"Warning: Could not read {os.path.join(root, file)}: {e}")
+        print(f"Loaded {len(messages)-1} project files into context.")
+
+    # Set model if specified
+    blueprint = CodeyBlueprint(blueprint_id="cli", approval_required=args.approval)
+    blueprint.coordinator.model = args.model
+
+    def get_codey_agent_name():
+        # Prefer Fiona, Sammy, Linus, else fallback
+        try:
+            if hasattr(blueprint, 'coordinator') and hasattr(blueprint.coordinator, 'name'):
+                return blueprint.coordinator.name
+            if hasattr(blueprint, 'name'):
+                return blueprint.name
+        except Exception:
+            pass
+        return "Codey"
+
+    async def run_and_print():
+        result_lines = []
+        agent_name = get_codey_agent_name()
+        from swarm.core.output_utils import pretty_print_response
+        async for chunk in blueprint.run(messages):
+            if args.quiet:
+                last = None
+                for c in blueprint.run(messages):
+                    last = c
+                if last:
+                    if isinstance(last, dict) and 'content' in last:
+                        print(last['content'])
+                    else:
+                        print(last)
+                break
+            else:
+                # Always use pretty_print_response with agent_name for assistant output
+                if isinstance(chunk, dict) and ('content' in chunk or chunk.get('role') == 'assistant'):
+                    pretty_print_response([chunk], use_markdown=True, agent_name=agent_name)
+                    if 'content' in chunk:
+                        result_lines.append(chunk['content'])
+                else:
+                    print(chunk, end="")
+                    result_lines.append(str(chunk))
+        return ''.join(result_lines)
+
+    if args.output:
+        try:
+            output = asyncio.run(run_and_print())
+            with open(args.output, "w") as f:
+                f.write(output)
+            print(f"\nOutput written to {args.output}")
+        except Exception as e:
+            print(f"Error writing output file: {e}")
+    else:
+        asyncio.run(run_and_print())
 
-You can use fileops tools (read_file, write_file, list_files, execute_shell_command) for any file or shell tasks.
-"""
+if __name__ == "__main__":
+    # Call CLI main
+    sys.exit(_cli_main())
 
-# --- ANSI/Emoji Box Output Helpers ---
-def ansi_box(title, content, emoji=None, count=None, params=None):
-    box_lines = []
-    header = f"\033[1;36m┏━ {emoji+' ' if emoji else ''}{title} ━{'━'*max(0, 40-len(title))}\033[0m"
-    box_lines.append(header)
-    if params:
-        box_lines.append(f"\033[1;34m┃ Params: {params}\033[0m")
-    if count is not None:
-        box_lines.append(f"\033[1;33m┃ Results: {count}\033[0m")
-    for line in content.split('\n'):
-        box_lines.append(f"┃ {line}")
-    box_lines.append("┗"+"━"*44)
-    return "\n".join(box_lines)
-
-# Spinner UX enhancement (Open Swarm TODO)
-SPINNER_STATES = ['Generating.', 'Generating..', 'Generating...', 'Running...']
+# Resolve all merge conflicts by keeping the main branch's logic for agent creation, UX, and error handling, as it is the most up-to-date and tested version. Integrate any unique improvements from the feature branch only if they do not conflict with stability or UX.
 
 class CodeyBlueprint(BlueprintBase):
     def __init__(self, blueprint_id: str, config_path: Optional[str] = None, **kwargs):