feat(workspaces): fork + push/pull#5210
Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub. |
PR SummaryHigh Risk Overview New Sync (push/pull) along the direct parent edge remaps credentials, env vars, and other resources via The sidebar gains Fork / Sync / Manage forks modals, fork lineage indicators in the workspace list, and Reviewed by Cursor Bugbot for commit 055cb47. Configure here. |
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
Greptile SummaryThis PR introduces workspace forking (clone a workspace's deployed workflows + selected resources), push/pull promotion between fork edges, rollback support, and a mapping editor for remapping credentials/secrets/resources across workspaces.
Confidence Score: 5/5Safe to merge; all three auth layers (forking gate, source-read, target-admin) are correctly enforced on every route, the advisory-lock serialization prevents concurrent promote races, and the rollback undo-point design is durable. The large new surface area is well-guarded: authorization checks are layered correctly across all six routes, the advisory lock prevents concurrent promote/rollback on the same edge, and the rollback undo-point uses a run-id comparison to detect superseded promotes before doing any destructive cleanup. The only issues found are a folder-key collision when sibling folders share a name, a cycle-unsafe topological sort, and allowPersonalApiKeys not being inherited from the parent — all self-contained edge cases that do not affect correctness for the common path. apps/sim/lib/workspaces/fork/copy/copy-workflows.ts (folder mapping logic) and apps/sim/lib/workspaces/fork/create-fork.ts (allowPersonalApiKeys inheritance) Important Files Changed
Sequence Diagram%%{init: {'theme': 'neutral'}}%%
sequenceDiagram
participant UI
participant ForkRoute as POST /fork
participant PromoteRoute as POST /fork/promote
participant RollbackRoute as POST /fork/rollback
participant Authz
participant DB
participant BG as Background (Trigger.dev)
UI->>ForkRoute: fork workspace (source id, name, selection)
ForkRoute->>Authz: assertCanFork(sourceId, userId)
Authz->>DB: checkWorkspaceAccess + assertForkingEnabled
ForkRoute->>DB: tx: insert workspace, copy permissions, copy workflow states, copy resources, seed identity mappings
ForkRoute->>BG: runForkContentCopy (table rows, KB docs, blobs)
ForkRoute-->>UI: "{ workspace, workflowsCopied }"
UI->>PromoteRoute: promote (id, otherWorkspaceId, direction, force)
PromoteRoute->>Authz: assertCanPromote (read source, admin target)
PromoteRoute->>DB: tx: acquireEdgeLock → computePlan → drift/unmapped check → copyWorkflows → captureSnapshot → upsertPromoteRun
PromoteRoute->>DB: performFullDeploy (per promoted workflow, outside tx)
PromoteRoute-->>UI: "{ promoteRunId, updated, created, archived, drift, blocked }"
UI->>RollbackRoute: rollback (id, otherWorkspaceId)
RollbackRoute->>Authz: assertCanRollback (admin target)
RollbackRoute->>DB: tx1: acquireEdgeLock → un-archive orphans
RollbackRoute->>DB: reactivate prior versions (outside tx, serial)
RollbackRoute->>DB: tx2: acquireEdgeLock → confirm run id → undeploy/archive created → deleteIdentityRows → deletePromoteRun
RollbackRoute-->>UI: "{ restored, archived, unarchived, skipped }"
%%{init: {'theme': 'base', 'themeVariables': {"darkMode": true, "background": "#0d1117", "primaryColor": "#21262d", "primaryTextColor": "#e6edf3", "primaryBorderColor": "#8b949e", "lineColor": "#8b949e", "textColor": "#e6edf3", "edgeLabelBackground": "#161b22", "actorBkg": "#21262d", "actorBorder": "#8b949e", "actorTextColor": "#e6edf3", "actorLineColor": "#8b949e", "signalColor": "#8b949e", "signalTextColor": "#e6edf3", "noteBkgColor": "#373320", "noteBorderColor": "#d4a72c", "noteTextColor": "#f0e6c0", "labelBoxBkgColor": "#21262d", "labelBoxBorderColor": "#8b949e", "labelTextColor": "#e6edf3", "loopTextColor": "#e6edf3", "activationBkgColor": "#30363d", "activationBorderColor": "#8b949e"}}}%%
sequenceDiagram
participant UI
participant ForkRoute as POST /fork
participant PromoteRoute as POST /fork/promote
participant RollbackRoute as POST /fork/rollback
participant Authz
participant DB
participant BG as Background (Trigger.dev)
UI->>ForkRoute: fork workspace (source id, name, selection)
ForkRoute->>Authz: assertCanFork(sourceId, userId)
Authz->>DB: checkWorkspaceAccess + assertForkingEnabled
ForkRoute->>DB: tx: insert workspace, copy permissions, copy workflow states, copy resources, seed identity mappings
ForkRoute->>BG: runForkContentCopy (table rows, KB docs, blobs)
ForkRoute-->>UI: "{ workspace, workflowsCopied }"
UI->>PromoteRoute: promote (id, otherWorkspaceId, direction, force)
PromoteRoute->>Authz: assertCanPromote (read source, admin target)
PromoteRoute->>DB: tx: acquireEdgeLock → computePlan → drift/unmapped check → copyWorkflows → captureSnapshot → upsertPromoteRun
PromoteRoute->>DB: performFullDeploy (per promoted workflow, outside tx)
PromoteRoute-->>UI: "{ promoteRunId, updated, created, archived, drift, blocked }"
UI->>RollbackRoute: rollback (id, otherWorkspaceId)
RollbackRoute->>Authz: assertCanRollback (admin target)
RollbackRoute->>DB: tx1: acquireEdgeLock → un-archive orphans
RollbackRoute->>DB: reactivate prior versions (outside tx, serial)
RollbackRoute->>DB: tx2: acquireEdgeLock → confirm run id → undeploy/archive created → deleteIdentityRows → deletePromoteRun
RollbackRoute-->>UI: "{ restored, archived, unarchived, skipped }"
Reviews (2): Last reviewed commit: "address comments" | Re-trigger Greptile |
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
|
@greptile |
|
bugbot run |
|
bugbot run |
|
bugbot run |
|
bugbot run |
|
bugbot run |
There was a problem hiding this comment.
✅ 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 055cb47. Configure here.
1 participant
Summary
Be able to Fork Workspaces. And push/pull changes into or from parent workspaces. Allows one click promotion between environments and supports mapping credentials, secrets, and resources.
Type of Change
Testing
Tested manually
Checklist