- Resolve merge markers across plugin loader, agents view, dashboard server tests, and engine pi session setup - Keep current cache-busting and hook-guard implementations while removing stale branch-side fragments - Preserve rate-limit test imports and useAgents-driven loading flow in dashboard agent UI - Ensure workspace passes required verification gates with pnpm test and pnpm build