merge: resolve conflicts with develop (telemetry + lockfile)

Keep both Mosaic Telemetry section (from develop) and Matrix Dev Environment section (from feature branch) in .env.example. Regenerate pnpm-lock.yaml with both dependency trees merged. Co-Authored-By: Claude Opus 4.6 <[email protected]>
2026-02-15 12:12:43 -06:00
parent 03d0c032e4 c5a87df6e1
commit eca2c46e9d
42 changed files with 6276 additions and 15 deletions
@@ -27,6 +27,7 @@
  "dependencies": {
    "@anthropic-ai/sdk": "^0.72.1",
    "@mosaic/shared": "workspace:*",
+    "@mosaicstack/telemetry-client": "^0.1.0",
    "@nestjs/axios": "^4.0.1",
    "@nestjs/bullmq": "^11.0.4",
    "@nestjs/common": "^11.1.12",