mirror of
https://github.com/openswarm-ai/openswarm.git
synced 2026-09-27 03:54:49 +02:00
TheAchiever6823
fe0c3af0f2
Brings the branch current with dev (was 18 behind) so the PR squash-merges into dev with zero conflicts. Resolved 6 conflicts: - backend/main.py: keep both workflows and telegram_bot SubApps - backend/auth.py: keep the Spotify OAuth callback path exemptions - backend/apps/agents/agent_manager.py: take the deletions of _build_connected_tools_context, _approx_tokens, and _summarize_message_block (confirmed dead, zero callers on dev) - backend/apps/tools_lib/tools_lib.py: keep both dev's google_oauth_token_proxy and the MCP credential endpoints - electron/main.js: keep both the Instagram MCP CLI helpers and dev's one-line waitForBackend comment - frontend/src/app/pages/Tools/Tools.tsx: keep the credential dialogs Also widens the Tools.tsx snackbar severity union to include 'warning', a value its own code already passes (a pre-existing type error surfaced once dev was merged and tsc was run). Verified: 832 backend tests pass, webpack build succeeds, tsc clean except one pre-existing allowpopups error in dev's BrowserCard.tsx.