Chris Farhood dcdc1d2353 Merge upstream/master (53 commits) into local ...

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>

2026-05-28 08:01:31 -04:00

..

scripts

fix(server): use stable tsx/cli entry point in dev-watch

2026-03-28 06:42:03 +07:00

src

Merge upstream/master (53 commits) into local

2026-05-28 08:01:31 -04:00

CHANGELOG.md

chore: release v0.3.1

2026-03-12 13:09:22 -05:00

package.json

Merge upstream/master (53 commits) into local

2026-05-28 08:01:31 -04:00

tsconfig.json

Fix root TypeScript solution config

2026-03-09 14:09:30 -05:00

vitest.config.ts

Stabilize serialized server route tests (#4448)

2026-04-24 19:27:00 -05:00