Commit 955ff57
fix: resolve merge conflicts and fix esbuild regex filters
- Resolve 6 merge conflicts from main (take new code with @trycompai scope)
- Fix esbuild onResolve regex filters in integrationPlatformExtension.ts
that still matched @comp/integration-platform instead of @trycompai/
- Fix remaining @comp/auth references in test files from main
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>File tree
88 files changed
+4162
-2601
lines changed- .claude
- commands
- skills/add-integration
- .github/workflows
- apps
- api
- src
- assistant-chat
- auth
- config
- device-agent
- dto
- email
- frameworks
- integration-platform
- controllers
- services
- people
- utils
- questionnaire
- training
- trigger/email
- app/src
- app
- (app)/[orgId]
- components
- frameworks/components
- people/[employeeId]/actions
- tasks/[taskId]
- automation/[automationId]
- actions
- components
- components
- api/auth/[...all]
- components/integrations
- test-utils/mocks
- utils
- portal/src
- app
- (app)/(home)/[orgId]/components
- tasks
- video
- (public)/auth/device-callback
- api
- auth/[...all]
- device-agent
- auth-code
- check-in
- exchange-code
- my-organizations
- register
- status
- updates/[filename]
- portal/mark-video-completed
- hooks
- docs/superpowers
- plans
- specs
- packages
- auth/src
- db/prisma
- migrations/20260313180824_add_member_external_user_id
- schema
- device-agent
- src
- main
- docs
- integration-platform/src
- manifests/ramp
- checks
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
88 files changed
+4162
-2601
lines changedThis file was deleted.
0 commit comments