Merge upstream/master (53 commits) into local
Build: Production / build (push) Failing after 13m4s

Resolved conflicts:
- ui CompanySettingsSidebar.tsx: keep both Secrets (local) and Cloud upstream (master) nav items
- ui CompanySettingsNav.tsx + test: take master's cloud-upstream/members (drops deprecated `access` tab now consolidated into `members`)
- server plugin-worker-manager.ts: take master's 15min RPC timeout cap
- pnpm-lock.yaml: regenerated via `pnpm install` against merged package.json files

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-05-28 08:01:31 -04:00
536 changed files with 60296 additions and 2542 deletions
+15
View File
@@ -34,6 +34,11 @@
"name": "@paperclipai/adapter-gemini-local",
"publishFromCi": true
},
{
"dir": "packages/adapters/grok-local",
"name": "@paperclipai/adapter-grok-local",
"publishFromCi": true
},
{
"dir": "packages/adapters/opencode-local",
"name": "@paperclipai/adapter-opencode-local",
@@ -64,6 +69,11 @@
"name": "@paperclipai/plugin-sdk",
"publishFromCi": true
},
{
"dir": "packages/plugins/plugin-workspace-diff",
"name": "@paperclipai/plugin-workspace-diff",
"publishFromCi": false
},
{
"dir": "server",
"name": "@paperclipai/server",
@@ -109,6 +119,11 @@
"name": "@paperclipai/plugin-e2b",
"publishFromCi": true
},
{
"dir": "packages/plugins/sandbox-providers/modal",
"name": "@paperclipai/plugin-modal",
"publishFromCi": true
},
{
"dir": "ui",
"name": "@paperclipai/ui",