imccyu
59a2fc408b
Merge remote-tracking branch 'origin/worktree-webslot2' into worktree/fix-collapsed-sidebar-rail
# Conflicts:
# apps/web/tests/smoke-fixture.e2e.ts
# packages/client/ui-layout/src/client/AppFrame.tsx
# packages/client/ui-layout/src/client/columns.ts
# packages/client/ui-layout/src/client/index.ts
# packages/client/ui-layout/tests/app-frame.spec.tsx
# packages/client/ui-layout/tests/columns.spec.ts
# packages/client/ui-sidebar/README.md
# packages/client/ui-sidebar/src/client/SidebarRoot.tsx
# packages/client/ui-sidebar/src/client/contract/slots.ts
# packages/client/ui-sidebar/src/client/index.ts
# packages/client/ui-sidebar/tests/apply.spec.tsx
# packages/client/ui-sidebar/tests/sidebar-root.spec.tsx