fix(lifecycle): retain shared resources when creators leave by mzxchandra · Pull Request #8762 · simstudioai/sim

mzxchandra · 2026-10-07T20:55:23Z

Summary

Transfer shared workspace resources to the existing billed account before removing access, and transfer organization-only resources to an existing organization owner. Preserve archived roots, child rows/documents, and file history without changing non-null API contracts.
Preserve implicit upload attribution through handoff, including empty uploads, and keep legitimate first writes at version 1. Serialize content writes, archive rollback, and retention cleanup with member removal by locking the workspace before existing files.
Repair references from earlier departures before permanent account deletion, using transactional successor validation and a user-row barrier against late creator references. Both v1 admin removal routes use the common revocation path.
Retain public MCP execution identity and block creator deletion until an admin makes the server private or deletes it. Require live workspace API keys to be replaced/revoked instead of transferring credentials.

Type of Change

Bug fix

Testing

74 affected real PostgreSQL cases pass: file history, full member-removal races, lifecycle retention, and storage accounting. Eight contention cases verify both arrival orders for content writes, archive rollback, and retention cleanup.
The unchanged code reproduced four PostgreSQL deadlocks. Removing each early lock independently reproduced its failure; restored code passes. Earlier history controls verify uploader attribution, first-write numbering, restored versions, and retained storage references.
158 affected unit tests pass. Scoped Biome, API-validation and test-pattern audits, generated artifacts, and diff checks pass. Full repository tests, typecheck and build run in CI.
Earlier HTTP lifecycle acceptance verifies handoff, departed-user denial, account deletion, surviving-user access, file bytes, non-null contracts, and storage/history preservation; it was not rerun for the lock-order correction.

Checklist

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

Scope notes

Shared service-account and workspace-env credential lifecycle is intentionally deferred: their existing creator cascade remains, with no new transfer or deletion guard. Existing workflow owner-based execution/environment fallback is preserved. Public MCP execution-identity cleanup is a separate follow-up. Already-admitted requests may finish after departure; permanent deletion repairs their committed references or rejects late user references. HTTP document setup uses a provider-independent fixture, so these tests do not claim connector indexing or provider execution coverage.

vercel · 2026-10-07T20:55:29Z

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

1 Skipped Deployment

Project	Deployment	Actions	Updated
docs	Skipped		Oct 8, 2026 7:14am UTC

mzxchandra · 2026-10-07T20:57:57Z

@greptile

mzxchandra · 2026-10-07T20:57:58Z

@cubic-dev-ai review this PR

cubic-dev-ai · 2026-10-07T20:58:05Z

@cubic-dev-ai review this PR

@mzxchandra I have started the AI code review. It will take a few minutes to complete.

cubic-dev-ai

All reported issues were addressed across 10 files

_{Reply with feedback, questions, or to request a fix.

Turn on auto-fix | Re-trigger cubic}

greptile-apps · 2026-10-07T21:05:32Z

Confidence Score: 5/5

[High risk] Refactors member removal to centralize access revocation logic.

The reviewed changes appear safe to merge; no new blocking issue was found.

What we checked:

File operations wait safely: The changed operations and member removal take the workspace lock first. One waits before it can hold the file lock needed by the other.

Summary

This PR keeps shared resources when their creators leave and repairs older creator references before account deletion. The latest changes align file operations with member removal.

Content writes, archive rollback, and retention cleanup now lock the workspace before existing files.
PostgreSQL tests cover both arrival orders and check file history, access removal, and storage totals.
No new actionable issues were found in the changes since the previous review. Checks were based on code inspection; tests were not run.
mzxchandra explicitly deferred shared service-account and workspace-env credential retention, and public MCP execution-identity cleanup.

Diagram

%%{init: {'theme': 'neutral'}}%%
flowchart TD
  A[Content write] --> L[Lock workspace]
  B[Archive rollback] --> L
  C[Retention cleanup] --> L
  D[Member removal] --> L
  L --> F[Lock existing files]
  F --> M[Write content, purge files, or transfer creators]
  M --> T[Commit together]

_{Reviews (7) · Last reviewed commit: "fix(lifecycle): order workspace locks be..." · Reviewed by Greptile}

mzxchandra · 2026-10-07T22:07:45Z

@greptile

mzxchandra · 2026-10-07T22:07:47Z

@cubic-dev-ai review this PR

cubic-dev-ai · 2026-10-07T22:07:52Z

@cubic-dev-ai review this PR

@mzxchandra I have started the AI code review. It will take a few minutes to complete.

cubic-dev-ai

No issues found across 10 files

Confidence score: 5/5

Automated review surfaced no issues in the provided summaries.
No files require special attention.

_{Turn on auto-fix | Re-trigger cubic}

cubic-dev-ai

No issues found across 10 files

Confidence score: 5/5

Automated review surfaced no issues in the provided summaries.
No files require special attention.

_{Turn on auto-fix | Re-trigger cubic}

mzxchandra · 2026-10-08T05:11:35Z

@greptile

mzxchandra · 2026-10-08T05:11:36Z

@cubic-dev-ai review this PR

cubic-dev-ai · 2026-10-08T05:11:40Z

@cubic-dev-ai review this PR

@mzxchandra I have started the AI code review. It will take a few minutes to complete.

cubic-dev-ai

All reported issues were addressed across 13 files

_{Reply with feedback, questions, or to request a fix.

Turn on auto-fix | Re-trigger cubic}

mzxchandra · 2026-10-08T06:54:29Z

@greptile

mzxchandra · 2026-10-08T06:54:30Z

@cubic-dev-ai review this PR

cubic-dev-ai · 2026-10-08T06:54:37Z

@cubic-dev-ai review this PR

@mzxchandra I have started the AI code review. It will take a few minutes to complete.

cubic-dev-ai

All reported issues were addressed across 13 files

_{You've manually re-run cubic several times on this PR. Each manual re-review checks the full PR again and counts toward your usage quota. To preserve your usage limits, we recommend letting cubic automatically review new commits.

Turn on auto-fix | Re-trigger cubic}

mzxchandra · 2026-10-08T07:14:39Z

@greptile

mzxchandra · 2026-10-08T07:14:40Z

@cubic-dev-ai review this PR

cubic-dev-ai · 2026-10-08T07:14:45Z

@cubic-dev-ai review this PR

@mzxchandra I have started the AI code review. It will take a few minutes to complete.

cubic-dev-ai

No issues found across 18 files

Confidence score: 5/5

Automated review surfaced no issues in the provided summaries.
No files require special attention.

_{You've manually re-run cubic several times on this PR. Each manual re-review checks the full PR again and counts toward your usage quota. To preserve your usage limits, we recommend letting cubic automatically review new commits.

Turn on auto-fix | Re-trigger cubic}

cubic-dev-ai

No issues found across 18 files

Confidence score: 5/5

Automated review surfaced no issues in the provided summaries.
No files require special attention.

_{Turn on auto-fix | Re-trigger cubic}

fix(lifecycle): retain shared resources when creators leave

817191c

cubic-dev-ai Bot reviewed Oct 7, 2026

View reviewed changes

Comment thread apps/sim/lib/workspaces/access/shared-resource-handoff.integration.ts

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

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

fix(lifecycle): preserve replacement workspace grants

be01225

vercel Bot temporarily deployed to Preview October 7, 2026 22:07 Inactive

cubic-dev-ai Bot reviewed Oct 7, 2026

View reviewed changes

mzxchandra marked this pull request as ready for review October 7, 2026 22:43

cubic-dev-ai Bot reviewed Oct 7, 2026

View reviewed changes

This was referenced Oct 8, 2026

feat(files): integrate Project files with the browser and Mothership #8781

Draft

feat: establish shared file ownership foundation #8609

Draft

feat(files): add the Project file backend and APIs #8610

Draft

mzxchandra marked this pull request as draft October 8, 2026 04:09

fix(lifecycle): preserve upload history during creator handoff

34a82c3

vercel Bot temporarily deployed to Preview October 8, 2026 05:11 Inactive

cubic-dev-ai Bot reviewed Oct 8, 2026

View reviewed changes

Comment thread apps/sim/lib/uploads/contexts/workspace/creator-handoff.ts Outdated

fix(lifecycle): preserve empty upload attribution through handoff

08398e7

vercel Bot temporarily deployed to Preview October 8, 2026 06:54 Inactive

cubic-dev-ai Bot reviewed Oct 8, 2026

View reviewed changes

Comment thread apps/sim/lib/uploads/contexts/workspace/creator-handoff.ts

fix(lifecycle): order workspace locks before file mutations

ef198ef

vercel Bot temporarily deployed to Preview October 8, 2026 07:14 Inactive

cubic-dev-ai Bot reviewed Oct 8, 2026

View reviewed changes

mzxchandra marked this pull request as ready for review October 8, 2026 07:47

cubic-dev-ai Bot reviewed Oct 8, 2026

View reviewed changes

Conversation

mzxchandra commented Oct 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Type of Change

Testing

Checklist

Scope notes

Uh oh!

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

Uh oh!

Uh oh!

mzxchandra commented Oct 7, 2026

Uh oh!

mzxchandra commented Oct 7, 2026

Uh oh!

cubic-dev-ai Bot commented Oct 7, 2026

Uh oh!

cubic-dev-ai Bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

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

Uh oh!

Confidence Score: 5/5

Summary

Uh oh!

mzxchandra commented Oct 7, 2026

Uh oh!

mzxchandra commented Oct 7, 2026

Uh oh!

cubic-dev-ai Bot commented Oct 7, 2026

Uh oh!

cubic-dev-ai Bot left a comment

Choose a reason for hiding this comment

Uh oh!

cubic-dev-ai Bot left a comment

Choose a reason for hiding this comment

Uh oh!

mzxchandra commented Oct 8, 2026

Uh oh!

mzxchandra commented Oct 8, 2026

Uh oh!

cubic-dev-ai Bot commented Oct 8, 2026

Uh oh!

cubic-dev-ai Bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mzxchandra commented Oct 8, 2026

Uh oh!

mzxchandra commented Oct 8, 2026

Uh oh!

cubic-dev-ai Bot commented Oct 8, 2026

Uh oh!

cubic-dev-ai Bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mzxchandra commented Oct 8, 2026

Uh oh!

mzxchandra commented Oct 8, 2026

Uh oh!

cubic-dev-ai Bot commented Oct 8, 2026

Uh oh!

cubic-dev-ai Bot left a comment

Choose a reason for hiding this comment

Uh oh!

cubic-dev-ai Bot left a comment

Choose a reason for hiding this comment

Uh oh!

This branch was previously deployed

Reviewers

Assignees

Labels

mzxchandra commented Oct 7, 2026 •

edited

Loading

vercel Bot commented Oct 7, 2026 •

edited

Loading

cubic-dev-ai Bot left a comment •

edited

Loading

greptile-apps Bot commented Oct 7, 2026 •

edited

Loading

cubic-dev-ai Bot left a comment •

edited

Loading

cubic-dev-ai Bot left a comment •

edited

Loading