fix: block merging personal workspaces with company organizations#701
Merged
Conversation
Personal workspaces represent individual users and should never be merged with company organizations. This adds defense-in-depth: - Block the merge in mergeOrganizations() with a clear error message - Show prominent warnings in previewMerge() if personal workspaces are incorrectly included in merge candidates - Return 400 (not 500) for validation errors in the merge endpoint This prevents accidental merges even if upstream duplicate detection fails to filter personal workspaces. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Changes
server/src/db/org-merge-db.ts:mergeOrganizations(): Added blocking check that throws an error if either org is a personal workspacepreviewMerge(): Added prominent warning messages when personal workspaces are included in merge candidatesserver/src/routes/admin/cleanup.ts:Context
Personal workspaces represent individual users and should never be merged with company organizations. The upstream duplicate detection queries already filter
is_personal = false, but this adds defense-in-depth to prevent merges even if:is_personalincorrectly setTest plan
npm run typecheck)npm run test:unit)🤖 Generated with Claude Code