feat(organizations): sweep a joiner's owned workspaces into the org on join, disclose it at accept, and add external workspace invites by icecrasher321 · Pull Request #5918 · simstudioai/sim

icecrasher321 · 2026-07-24T03:35:50Z

Summary

Accepting an org invite now moves every workspace the invitee owns (archived included) into the organization — disclosed on the accept screen — with collaborators kept as seat-free external members and stale pre-move invites downgraded instead of escalating.
Invites land directly in the granted workspace, member-role org invites must carry workspace access (enforced route + domain layer), and the invite modal gains an explicit Member vs External choice.
The remove-member dialog now lists which owner-bound credentials will stop working, workspace-less members get a proper in-product empty state, and the membership docs reflect the new model.

Type of Change

New feature

Testing

WiP

Checklist

Code follows project style guidelines
Self-reviewed my changes
Tests added/updated and passing
No new warnings introduced
I confirm that I have read and agree to the terms outlined in the Contributor License Agreement (CLA)

vercel · 2026-07-24T03:35:58Z

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Actions	Updated (UTC)
docs	Ready	Preview, Comment	Jul 24, 2026 6:22am

cursor · 2026-07-24T03:36:01Z

PR Summary

High Risk
Large changes to invitation acceptance, org membership, billing/workspace attachment, and concurrent locking—incorrect behavior could strand users, move workspaces without consent, or break credentials on removal.

Overview
Organization membership now sweeps the invitee's owned personal workspaces—including archived—into the org on internal join, with collaborators kept as external members via a new external-all attach policy and a shared ownedAttachableWorkspacesWhere helper so preview, locks, and attach stay aligned.

The accept flow adds a join preview on invitation GET, migration copy on the invite page, and disclosedWorkspaceIds on accept; mismatches return disclosure-outdated. Acceptance logic is expanded for stale org grants, safer workspace-invite escalation, concurrent owned-set changes, and redirects into the first granted workspace.

Inviting requires at least one workspace for member-role org invites (routes + createPendingInvitation), workspace batch invites accept membershipIntent, and the invite modal adds Member vs External (external skips seat checks).

Removal exposes GET .../removal-impact and surfaces breaking credentials in the remove-member dialog. Users with no workspace access see an in-app blocked state instead of being sent home; personal workspace creation races org join via billing-identity locks.

Admin member add and org recovery attach owned workspaces in transactions with the same sweep semantics. Docs and minor fixes (Ask AI jsonSchema tool input, formatQuotedNameList) ride along.

^{Reviewed by Cursor Bugbot for commit 94a7216. Configure here.}

greptile-apps · 2026-07-24T03:39:20Z

Greptile Summary

This PR expands organization membership and workspace invitation behavior.

Moves a new internal member’s owned workspaces into the organization during invitation acceptance or administrative addition.
Adds explicit internal-member versus external-collaborator workspace invitations and corresponding access handling.
Discloses workspace migration during acceptance and credential impact during member removal.
Updates workspace creation race handling, API contracts, tests, UI states, and membership documentation.

Confidence Score: 5/5

The PR appears safe to merge with no blocking failures remaining in the previously reviewed areas.

No blocking failure remains.

Important Files Changed

Filename	Overview
apps/sim/lib/invitations/core.ts	Adds transactional workspace sweeping, disclosure validation, external invitation handling, and stale-grant safeguards to invitation acceptance.
apps/sim/app/api/v1/admin/organizations/[id]/members/route.ts	Makes administrative membership creation and the owned-workspace sweep commit or roll back together.
apps/sim/app/api/workspaces/route.ts	Serializes personal workspace creation against organization joins and recovers the lazy default-workspace path after a join race.
apps/sim/app/workspace/[workspaceId]/settings/components/team-management/team-management.tsx	Fetches current credential-removal impact and gates confirmation while that disclosure is refreshing.
apps/sim/hooks/queries/organization.ts	Adds uncached removal-impact queries so each dialog opening requests a fresh disclosure.

_{Reviews (15): Last reviewed commit: "fix(invitations): guard the reverse disc..." | Re-trigger Greptile}

icecrasher321 · 2026-07-24T04:25:49Z

@greptile

icecrasher321 · 2026-07-24T04:25:50Z

@cursor review

cursor

✅ Bugbot reviewed your changes and found no new issues!

Comment @cursor review or bugbot run to trigger another review on this PR

^{Reviewed by Cursor Bugbot for commit 7509184. Configure here.}

icecrasher321 · 2026-07-24T04:37:16Z

@greptile

icecrasher321 · 2026-07-24T04:37:18Z

@cursor review

icecrasher321 · 2026-07-24T04:46:13Z

@greptile

icecrasher321 · 2026-07-24T04:46:14Z

@cursor review

icecrasher321 · 2026-07-24T04:53:38Z

@greptile

icecrasher321 · 2026-07-24T04:53:39Z

@cursor review

cursor

✅ Bugbot reviewed your changes and found no new issues!

Comment @cursor review or bugbot run to trigger another review on this PR

^{Reviewed by Cursor Bugbot for commit 5010800. Configure here.}

icecrasher321 · 2026-07-24T05:00:29Z

@greptile

icecrasher321 · 2026-07-24T05:00:31Z

@cursor review

icecrasher321 · 2026-07-24T05:52:31Z

@greptile

icecrasher321 · 2026-07-24T05:52:32Z

@cursor review

icecrasher321 · 2026-07-24T06:02:07Z

@greptile

icecrasher321 · 2026-07-24T06:02:08Z

@cursor review

icecrasher321 · 2026-07-24T06:08:18Z

@greptile

…us in dialog, and preview-unavailable disclosure Review round 1: the v1 admin add-member now commits membership and the workspace sweep in one transaction; the remove-member dialog holds confirm while the credential-impact check loads and shows a caution when it fails; a failed join preview flags joinPreviewUnavailable so the accept screen falls back to a generic migration notice. Also aligns the invite test's react-query mock and repairs two pre-existing docs type errors. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

… sweep Personal workspace creation now serializes with organization joins on the user's billing-identity lock and re-verifies membership inside its transaction; both join paths (invite acceptance and the v1 admin add) re-read the owned-workspace set under that lock after the member insert and roll the whole join back when it diverged from the advisory-lock plan, so a workspace created mid-join can never land outside the organization. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

…creation race client-side A member-role org acceptance whose grants all turned stale now rolls back with workspace-not-found instead of stranding a workspace-less member, and the workspace resolver treats the creation-vs-join 409 as a signal to re-resolve (the user is authenticated with org workspaces) rather than falling into the login path. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

The accept-screen preview now returns no-join for a member-role org invite whose grants all left the stamped organization, matching the acceptance-side rollback so the disclosure never promises a migration that acceptance would refuse. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

…ate removal on live impact data The workspace list GET now re-lists (returning the join sweep's workspaces) when lazy default creation loses the race to an organization join instead of failing with a 500, and the remove-member dialog gates its confirm on isFetching so a background refetch can never let an admin confirm against a stale credential-impact list. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

…kspace caches post-accept The accept route now carries the human-readable message alongside the machine-readable error kind (the client prefers it for server-error), and a successful accept invalidates workspace queries so the swept workspaces appear immediately instead of after the stale window. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

… org creation Every attach call site now passes includeArchived so the archived escape hatch is closed uniformly — join-attach, admin move, subscription-driven org provisioning, and manual org creation all sweep archived personal workspaces into the organization. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

…he disclosed set The join preview now carries the workspace ids it disclosed, the accept screen echoes them back as a disclosure token, and acceptance rolls back with disclosure-outdated (409) whenever the set it would sweep no longer matches — a workspace created after the preview rendered can never move without the user seeing the refreshed notice first. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

A preview that predicted no join still tells the user nothing moves — the empty disclosed set is now echoed on accept, so a join that becomes possible between preview and accept (left another org, billing turned usable, grants un-staled) conflicts with disclosure-outdated instead of sweeping workspaces without a rendered notice. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

…lways refetch removal impact The all-stale check for member-role org invites now runs before any mutation and before the disclosure comparison, so an invite whose grants all left the org fails with workspace-not-found instead of trapping owners of personal workspaces in a disclosure-outdated retry loop. The removal-impact query drops its stale window (staleTime 0): every dialog open refetches while the confirm is held on isFetching. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

…move candidates Org creation/recovery now uses the keep-external collaborator policy (matching Pro-to-Team conversion) so different-org collaborators on archived workspaces cannot abort it with a conflict, and the admin workspace-move search and preflight expose an archived flag so internal tooling can label archived targets. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

A will-join notice whose acceptance downgrades to no-join (stale escalation denial, concurrent other-org membership) now fails with disclosure-outdated instead of silently succeeding as an external grant — the disclosure token binds the outcome in both directions. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

icecrasher321 · 2026-07-24T06:17:11Z

@greptile

icecrasher321 · 2026-07-24T06:17:12Z

@cursor review

cursor

✅ Bugbot reviewed your changes and found no new issues!

Comment @cursor review or bugbot run to trigger another review on this PR

^{Reviewed by Cursor Bugbot for commit 94a7216. Configure here.}

vercel Bot deployed to Preview July 24, 2026 03:38 View deployment

greptile-apps Bot reviewed Jul 24, 2026

View reviewed changes

Comment thread apps/sim/app/api/v1/admin/organizations/[id]/members/route.ts

Comment thread apps/sim/app/workspace/[workspaceId]/settings/components/team-management/team-management.tsx Outdated

cursor Bot reviewed Jul 24, 2026

View reviewed changes

Comment thread apps/sim/app/api/invitations/[id]/route.ts

icecrasher321 force-pushed the staging-v8 branch from e915b65 to 7509184 Compare July 24, 2026 04:25

greptile-apps Bot reviewed Jul 24, 2026

View reviewed changes

Comment thread apps/sim/app/api/v1/admin/organizations/[id]/members/route.ts

vercel Bot deployed to Preview July 24, 2026 04:30 View deployment

cursor Bot reviewed Jul 24, 2026

View reviewed changes

vercel Bot temporarily deployed to Preview July 24, 2026 04:37 Inactive

cursor Bot reviewed Jul 24, 2026

View reviewed changes

Comment thread apps/sim/lib/invitations/core.ts

Comment thread apps/sim/app/workspace/page.tsx

vercel Bot temporarily deployed to Preview July 24, 2026 04:46 Inactive

cursor Bot reviewed Jul 24, 2026

View reviewed changes

Comment thread apps/sim/lib/invitations/core.ts

vercel Bot temporarily deployed to Preview July 24, 2026 04:53 Inactive

greptile-apps Bot reviewed Jul 24, 2026

View reviewed changes

Comment thread apps/sim/app/api/workspaces/route.ts

Comment thread apps/sim/app/workspace/[workspaceId]/settings/components/team-management/team-management.tsx

cursor Bot reviewed Jul 24, 2026

View reviewed changes

vercel Bot temporarily deployed to Preview July 24, 2026 05:00 Inactive

cursor Bot reviewed Jul 24, 2026

View reviewed changes

Comment thread apps/sim/app/api/invitations/[id]/accept/route.ts

Comment thread apps/sim/app/invite/[id]/invite.tsx

vercel Bot temporarily deployed to Preview July 24, 2026 05:12 Inactive

vercel Bot temporarily deployed to Preview July 24, 2026 05:52 Inactive

cursor Bot reviewed Jul 24, 2026

View reviewed changes

Comment thread apps/sim/app/api/organizations/route.ts

Comment thread apps/sim/lib/workspaces/admin-move.ts

vercel Bot temporarily deployed to Preview July 24, 2026 06:01 Inactive

greptile-apps Bot reviewed Jul 24, 2026

View reviewed changes

Comment thread apps/sim/app/api/v1/admin/organizations/[id]/members/route.ts

cursor Bot reviewed Jul 24, 2026

View reviewed changes

Comment thread apps/sim/lib/invitations/core.ts

vercel Bot temporarily deployed to Preview July 24, 2026 06:15 Inactive

icecrasher321 and others added 14 commits July 23, 2026 23:15

feat(invites): explicit external members

991f71e

update docs

fea3fda

icecrasher321 force-pushed the staging-v8 branch from e85ac38 to 94a7216 Compare July 24, 2026 06:16

cursor Bot reviewed Jul 24, 2026

View reviewed changes

vercel Bot deployed to Preview July 24, 2026 06:22 View deployment

Uh oh!

Conversation

icecrasher321 commented Jul 24, 2026

Summary

Type of Change

Testing

Checklist

Uh oh!

vercel Bot commented Jul 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cursor Bot commented Jul 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Summary

Uh oh!

greptile-apps Bot commented Jul 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Greptile Summary

Confidence Score: 5/5

Important Files Changed

Uh oh!

Uh oh!

Uh oh!

Uh oh!

icecrasher321 commented Jul 24, 2026

Uh oh!

icecrasher321 commented Jul 24, 2026

Uh oh!

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

icecrasher321 commented Jul 24, 2026

Uh oh!

icecrasher321 commented Jul 24, 2026

Uh oh!

Uh oh!

Uh oh!

icecrasher321 commented Jul 24, 2026

Uh oh!

icecrasher321 commented Jul 24, 2026

Uh oh!

Uh oh!

icecrasher321 commented Jul 24, 2026

Uh oh!

icecrasher321 commented Jul 24, 2026

Uh oh!

Uh oh!

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

icecrasher321 commented Jul 24, 2026

Uh oh!

icecrasher321 commented Jul 24, 2026

Uh oh!

Uh oh!

Uh oh!

icecrasher321 commented Jul 24, 2026

Uh oh!

icecrasher321 commented Jul 24, 2026

Uh oh!

Uh oh!

Uh oh!

icecrasher321 commented Jul 24, 2026

Uh oh!

icecrasher321 commented Jul 24, 2026

Uh oh!

Uh oh!

Uh oh!

icecrasher321 commented Jul 24, 2026

Uh oh!

icecrasher321 commented Jul 24, 2026

Uh oh!

icecrasher321 commented Jul 24, 2026

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

vercel Bot commented Jul 24, 2026 •

edited

Loading

cursor Bot commented Jul 24, 2026 •

edited

Loading

greptile-apps Bot commented Jul 24, 2026 •

edited

Loading