Merge remote-tracking branch 'origin/main' into factory/onboarding-app-shell

# Conflicts:
#	factory/CLAUDE.md
#	factory/packages/backend/package.json
#	factory/packages/client/package.json
#	pnpm-lock.yaml
#	research/acp/friction.md
This commit is contained in:
Nathan Flurry 2026-03-10 21:59:12 -07:00
commit 0a8fda040b
57 changed files with 1465 additions and 503 deletions

View file

@ -46,7 +46,7 @@
},
"dependencies": {
"@sandbox-agent/factory-shared": "workspace:*",
"rivetkit": "^2.1.6"
"rivetkit": "2.1.6"
},
"devDependencies": {
"tsup": "^8.5.0"