copy the bundled configs from _MEIPASS to the working directory

Author: ahmad-ajmal

agent_core/core/impl/mcp/client.py

@@ -7,15 +7,28 @@
 """
 
 import asyncio
+import sys
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
 from agent_core.utils.logger import logger
 from agent_core.core.impl.mcp.config import MCPConfig, MCPServerConfig
 from agent_core.core.impl.mcp.server import MCPServerConnection, MCPTool
 
-# Default config path
-DEFAULT_CONFIG_PATH = Path("app/config/mcp_config.json")
+
+def _default_config_path() -> Path:
+    """Resolve MCP config path relative to the correct base directory."""
+    rel = Path("app") / "config" / "mcp_config.json"
+    if getattr(sys, 'frozen', False):
+        # Prefer CWD (bootstrapped, user-editable) over _MEIPASS (bundled)
+        cwd_path = Path.cwd() / rel
+        if cwd_path.exists():
+            return cwd_path
+        return Path(sys._MEIPASS) / rel
+    return Path(__file__).resolve().parent.parent.parent.parent.parent / rel
+
+
+DEFAULT_CONFIG_PATH = _default_config_path()
 
 
 class MCPClient:

app/tui/mcp_settings.py

@@ -5,11 +5,12 @@
 from pathlib import Path
 from typing import Dict, List, Optional, Any
 
+from app.config import APP_CONFIG_PATH
 from app.logger import logger
 from app.mcp import MCPConfig, MCPServerConfig
 
 # Default MCP config path
-MCP_CONFIG_PATH = Path("app/config/mcp_config.json")
+MCP_CONFIG_PATH = APP_CONFIG_PATH / "mcp_config.json"
 
 
 def load_mcp_config() -> MCPConfig:

run.py

@@ -44,6 +44,53 @@
 else:
     BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 
+
+def _bootstrap_frozen():
+    """Copy bundled config/data from _MEIPASS to CWD on first run.
+
+    PyInstaller extracts bundled files into a temp directory (sys._MEIPASS)
+    which is read-only and deleted on exit. The app expects mutable config
+    and data directories under CWD so they persist between runs.
+    """
+    if not getattr(sys, 'frozen', False):
+        return
+
+    import shutil as _shutil
+
+    meipass = sys._MEIPASS
+    cwd = os.getcwd()
+
+    # Directories to bootstrap (source relative to _MEIPASS)
+    dirs_to_copy = [
+        "app/config",
+        "app/data",
+        "agents",
+        "assets",
+    ]
+    # Individual files to bootstrap
+    files_to_copy = [
+        "config.json",
+        ".env.example",
+    ]
+
+    for rel_dir in dirs_to_copy:
+        src = os.path.join(meipass, rel_dir)
+        dst = os.path.join(cwd, rel_dir)
+        if os.path.isdir(src) and not os.path.isdir(dst):
+            print(f"  Bootstrapping {rel_dir}/...")
+            os.makedirs(os.path.dirname(dst), exist_ok=True)
+            _shutil.copytree(src, dst)
+
+    for rel_file in files_to_copy:
+        src = os.path.join(meipass, rel_file)
+        dst = os.path.join(cwd, rel_file)
+        if os.path.isfile(src) and not os.path.isfile(dst):
+            print(f"  Bootstrapping {rel_file}...")
+            _shutil.copy2(src, dst)
+
+
+_bootstrap_frozen()
+
 # --- Configuration ---
 CONFIG_FILE = os.path.join(BASE_DIR, "config.json")
 MAIN_APP_SCRIPT = os.path.join(BASE_DIR, "main.py")