mirror of
https://github.com/AstrBotDevs/AstrBot
synced 2026-07-15 17:30:13 +08:00
Resolved 76 file conflicts across backend, frontend, and tests: - Core backend: agent, platform, provider, star, tools, cron, KB, utils - Dashboard backend: auth, config, plugin routes, server, runtime bootstrap - Frontend components: shared, extension, provider components - Frontend views: console, trace, cron, extension, platform, provider, etc. - Frontend infrastructure: layouts, router, stores, main.ts - Assets: MDI font subset (css, woff, woff2) - Tests: fixtures, plugin manager, anthropic provider, dashboard tests Strategy per file: - Most backend: merged master improvements (metrics, http_client -> default_headers, download_url params, plugin i18n, runtime guards, auth middleware) - Frontend views: adopted master dashboard-shell layout (v-container, is-dark theme) - InstalledPluginsTab: kept dev pinned-plugins feature (drag-sort, pin/unpin) - Binary assets: resolved via git checkout - Tests: merged both branches' assertions and mock updates