Merge remote-tracking branch 'origin/main' into merge/main-into-dev

# Conflicts:
#	nix/package.nix
#	packages/app/src/screens/settings-screen.tsx
#	packages/server/src/server/session.workspace-git-watch.test.ts
#	packages/server/src/server/session.workspaces.test.ts

packages/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/server",
-  "version": "0.1.49",
+  "version": "0.1.50",
   "description": "Paseo backend server",
   "type": "module",
   "publishConfig": {
@@ -61,8 +61,8 @@
     "@ai-sdk/openai": "2.0.52",
     "@anthropic-ai/claude-agent-sdk": "^0.2.11",
     "@deepgram/sdk": "^3.4.0",
-    "@getpaseo/highlight": "0.1.49",
-    "@getpaseo/relay": "0.1.49",
+    "@getpaseo/highlight": "0.1.50",
+    "@getpaseo/relay": "0.1.50",
     "@isaacs/ttlcache": "^2.1.4",
     "@modelcontextprotocol/sdk": "^1.20.1",
     "@opencode-ai/sdk": "1.2.6",