Mohamed Boudra
65f8823e4e
Merge remote-tracking branch 'origin/main' into merge/main-into-dev
# Conflicts:
# CLAUDE.md
# nix/package.nix
# packages/app/src/components/combined-model-selector.tsx
# packages/app/src/hooks/use-sidebar-workspaces-list.ts
# packages/app/src/screens/workspace/workspace-screen.tsx
# packages/app/src/stores/session-store.test.ts
# packages/server/src/client/daemon-client.ts
# packages/server/src/server/agent/agent-manager.ts
# packages/server/src/server/session.ts
# packages/server/src/server/session.workspace-git-watch.test.ts
# packages/server/src/server/session.workspaces.test.ts
# packages/server/src/shared/messages.ts