* fix: lots of fixes and name refactoring * feat: Add workbench preferences * fix: MCP bridge status widget and just command fixes * fix(tests): Use the correct mesa-glx package * fix(ci): Add fontconfig to GUI test dependencies FreeCAD GUI was failing to start with: "Fontconfig error: Cannot load default config file: No such file" Added fontconfig and fonts-dejavu-core packages to the GUI test job dependencies to resolve the font configuration issue. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * refactor(addon): Extract path utilities into shared module Create path_utils.py module that consolidates duplicated path-finding logic from commands.py and InitGui.py: - get_addon_path(): Find addon directory with caching and fallbacks - get_icon_path(): Get full path to an icon file - get_icons_dir(): Get path to icons directory - get_workbench_icon(): Get path to workbench main icon This removes ~100 lines of duplicated code while preserving the same behavior including _addon_path_cache and all fallback methods. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix(addon): Prevent stale plugin state on startup failure The StartMCPBridgeCommand.Activated method could leave _mcp_plugin in a partially initialized state if FreecadMCPPlugin.start() failed after the plugin was instantiated. Changes: - Create plugin in a local variable first - Only assign to _mcp_plugin after start() succeeds - Explicitly clear _mcp_plugin and _running_config in exception handlers to ensure clean state for subsequent retry attempts Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: Lot of broad improvements * fix(ci): Use blocking headless_server.py for GUI tests The GUI test was using startup_bridge.py which is non-blocking (designed for interactive use). For CI, even in GUI mode, we need the blocking headless_server.py that calls run_forever() to keep FreeCAD running. GUI features are still available since we use the 'freecad' executable instead of 'freecadcmd'. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * refactor(addon): Rename headless_server.py to blocking_bridge.py The old name was misleading because: - It works with both GUI (freecad) and headless (freecadcmd) modes - The key characteristic is that it BLOCKS with run_forever() New naming convention clarifies the difference: - blocking_bridge.py: Starts bridge and blocks (for CI, servers) - startup_bridge.py: Starts bridge and returns (for interactive GUI) Updated all references across: - GitHub workflow (macro-test.yaml) - Just commands (freecad.just) - Unit tests (test_addon_structure.py) - Documentation (5 files) - CLAUDE.md Also improved the script to detect GUI mode dynamically using FreeCAD.GuiUp and display the appropriate status message. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix(just): Remove erroneous rm of startup_bridge.py on error The startup script is now a permanent source file in the repository, not a generated temporary file. The rm -f would have deleted source code if FreeCAD wasn't found. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: General improvements * fix: Lots of general fixes and only stable to PyPi * fix: small cleanup * fix: Small fixes and hopefully fixes the GUI tests * fix: Add proper library paths for FreeCAD GUI in CI - Create wrapper scripts instead of symlinks for AppImage binaries - Set LD_LIBRARY_PATH, QT_PLUGIN_PATH for GUI mode - Add diagnostic output to identify startup failures * fix: Use apprun for GUI tests in CI * fix: Improving Xvfb tests * fix: GUI tests worlk * chore: remove invalid --no-splash comments * fix: ARM64 architecture support and other fixes * fix: cleanup * test: just commands test suite * test: improve just command tests * fix: more general improvements * fix: more cleanup * fix: more updates * fix: small tweaks --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
120 lines
4.2 KiB
Python
120 lines
4.2 KiB
Python
"""Robust MCP Bridge Workbench - Initialization.
|
|
|
|
SPDX-License-Identifier: MIT
|
|
Copyright (c) 2025 Sean P. Kane (GitHub: spkane)
|
|
|
|
This module is executed when FreeCAD starts up. It handles initialization
|
|
tasks for the Robust MCP Bridge workbench, including auto-start of the
|
|
MCP bridge if configured. Works in both GUI and headless modes.
|
|
|
|
Note: Status bar updates are handled by InitGui.py since Qt operations
|
|
must run on the main thread.
|
|
"""
|
|
|
|
import FreeCAD
|
|
|
|
FreeCAD.Console.PrintMessage("Robust MCP Bridge: Init loaded\n")
|
|
|
|
# Global reference to timer to prevent garbage collection
|
|
_auto_start_timer = None
|
|
|
|
|
|
def _auto_start_bridge() -> None:
|
|
"""Auto-start the MCP bridge if configured in preferences.
|
|
|
|
This function is called via a deferred timer (GUI mode) or directly
|
|
(headless mode) after FreeCAD finishes loading. It starts the bridge
|
|
without requiring the workbench to be selected.
|
|
"""
|
|
try:
|
|
from preferences import get_auto_start
|
|
|
|
if not get_auto_start():
|
|
return
|
|
|
|
# Check if bridge is already running
|
|
from commands import _mcp_plugin
|
|
|
|
if _mcp_plugin is not None and _mcp_plugin.is_running:
|
|
return
|
|
|
|
FreeCAD.Console.PrintMessage(
|
|
"Auto-starting MCP Bridge (configured in preferences)...\n"
|
|
)
|
|
|
|
# Import and start the bridge directly
|
|
import commands
|
|
from freecad_mcp_bridge.server import FreecadMCPPlugin
|
|
from preferences import get_socket_port, get_xmlrpc_port
|
|
|
|
xmlrpc_port = get_xmlrpc_port()
|
|
socket_port = get_socket_port()
|
|
|
|
commands._mcp_plugin = FreecadMCPPlugin(
|
|
host="localhost",
|
|
port=socket_port,
|
|
xmlrpc_port=xmlrpc_port,
|
|
enable_xmlrpc=True,
|
|
)
|
|
commands._mcp_plugin.start()
|
|
|
|
# Track running configuration for restart detection
|
|
commands._running_config = {
|
|
"xmlrpc_port": xmlrpc_port,
|
|
"socket_port": socket_port,
|
|
}
|
|
|
|
FreeCAD.Console.PrintMessage("\n")
|
|
FreeCAD.Console.PrintMessage("=" * 50 + "\n")
|
|
FreeCAD.Console.PrintMessage("MCP Bridge started!\n")
|
|
FreeCAD.Console.PrintMessage(f" - XML-RPC: localhost:{xmlrpc_port}\n")
|
|
FreeCAD.Console.PrintMessage(f" - Socket: localhost:{socket_port}\n")
|
|
FreeCAD.Console.PrintMessage("=" * 50 + "\n")
|
|
FreeCAD.Console.PrintMessage(
|
|
"\nYou can now connect your MCP client (Claude Code, etc.) to FreeCAD.\n"
|
|
)
|
|
|
|
except Exception as e:
|
|
FreeCAD.Console.PrintError(f"Failed to auto-start MCP Bridge: {e}\n")
|
|
|
|
|
|
# Schedule auto-start after FreeCAD finishes loading
|
|
# Strategy:
|
|
# - If FreeCAD.GuiUp is True: Qt event loop is running, use timer for deferred start
|
|
# - If FreeCAD.GuiUp is False but Qt is available: Start bridge directly
|
|
# (GUI mode starting up - InitGui.py will handle status bar later)
|
|
# - If Qt is not available: Pure headless mode, start bridge directly
|
|
try:
|
|
from preferences import get_auto_start
|
|
|
|
if get_auto_start():
|
|
# Try to import Qt
|
|
import contextlib
|
|
|
|
QtCore = None
|
|
try:
|
|
from PySide2 import QtCore # type: ignore[assignment, no-redef]
|
|
except ImportError:
|
|
with contextlib.suppress(ImportError):
|
|
from PySide6 import QtCore # type: ignore[assignment, no-redef]
|
|
|
|
if FreeCAD.GuiUp:
|
|
# GUI is already up - use timer for deferred start
|
|
if QtCore is not None:
|
|
_auto_start_timer = QtCore.QTimer()
|
|
_auto_start_timer.setSingleShot(True)
|
|
_auto_start_timer.timeout.connect(_auto_start_bridge)
|
|
_auto_start_timer.start(1000)
|
|
else:
|
|
# GUI is up but Qt import failed - start directly
|
|
_auto_start_bridge()
|
|
elif QtCore is not None:
|
|
# GUI not ready yet, but Qt is available (FreeCAD starting in GUI mode)
|
|
# Start bridge directly - InitGui.py will handle status bar update
|
|
_auto_start_bridge()
|
|
else:
|
|
# True headless mode - no Qt, no GUI
|
|
_auto_start_bridge()
|
|
except Exception as e:
|
|
FreeCAD.Console.PrintWarning(f"Could not set up auto-start: {e}\n")
|