Skip to content

Rift workspaces: a copy-on-write environment provider #3229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ymichael wants to merge 13 commits into from
Closed

Rift workspaces: a copy-on-write environment provider #3229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d4c089d
Rift workspaces: add copy-on-write environment provider
ymichael Sep 8, 2026
9658ea0
Fix Rift completion recovery and postcreate branch selection
ymichael Sep 8, 2026
424a623
Claim canonical Rift paths after creation and completion recovery
ymichael Sep 8, 2026
99a84ab
fix(rift): admit attempt paths before creation and recovery
ymichael Sep 8, 2026
c3aab35
Align Rift test hosts with machine provider lifecycle
ymichael Sep 8, 2026
d9ad8d8
Delegate Rift environment lifecycle hooks to core
ymichael Sep 8, 2026
8329cb8
Bump plugin SDK for Rift presentation declarations
ymichael Sep 8, 2026
8f45cef
Bump Rift presentation SDK to 0.4.62 after final machine rebase
ymichael Sep 8, 2026
d89789c
Adapt Rift test fixtures to merged environment provider contracts
ymichael Sep 8, 2026
f4f74ff
Simplify Rift replay, initialization and cleanup
ymichael Sep 9, 2026
173c349
Remove redundant environment provider kind label
ymichael Sep 9, 2026
00df281
Align Rift integration assertions with main environment schema
ymichael Sep 9, 2026
6ea1930
Share Rift test fixtures and teardown
ymichael Sep 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions apps/app/.ladle/story-fixtures.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@ export const STORY_ENVIRONMENT_PROVIDERS: readonly SystemEnvironmentProvider[] =
icon: "Laptop",
logoUrl: null,
pluginId: "environment-project-checkout",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand All @@ -311,6 +312,7 @@ export const STORY_ENVIRONMENT_PROVIDERS: readonly SystemEnvironmentProvider[] =
icon: "GitBranch",
logoUrl: null,
pluginId: "environment-git-worktree",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand All @@ -327,6 +329,7 @@ export const STORY_ENVIRONMENT_PROVIDERS: readonly SystemEnvironmentProvider[] =
icon: "Folder",
logoUrl: null,
pluginId: "environment-personal-workspace",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand Down
5 changes: 5 additions & 0 deletions apps/app/src/components/pickers/EnvironmentPicker.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const checkoutProvider: SystemEnvironmentProvider = {
icon: "Laptop",
logoUrl: null,
pluginId: "environment-project-checkout",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand All @@ -34,6 +35,7 @@ const branchProvider: SystemEnvironmentProvider = {
icon: "GitBranch",
logoUrl: null,
pluginId: "branchy",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand All @@ -51,6 +53,7 @@ const sandboxProvider: SystemEnvironmentProvider = {
icon: "Container",
logoUrl: null,
pluginId: "docker-sandbox",
presentation: null,
acceptsEmptyInputs: false,
availability: null,
requires: {
Expand All @@ -72,6 +75,7 @@ const optionalInputsProvider: SystemEnvironmentProvider = {
icon: "Container",
logoUrl: null,
pluginId: "optional-sandbox",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand Down Expand Up @@ -251,6 +255,7 @@ describe("EnvironmentPickerUI", () => {
const onSelectProvider = vi.fn();
const setupRequiredProvider: SystemEnvironmentProvider = {
...sandboxProvider,
presentation: null,
acceptsEmptyInputs: true,
inputs: null,
availability: {
Expand Down
1 change: 1 addition & 0 deletions apps/app/src/components/pickers/ReuseEnvironmentPicker.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const provider: SystemEnvironmentProvider = {
icon: "Laptop",
logoUrl: null,
pluginId: "environment-project-checkout",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand Down
1 change: 1 addition & 0 deletions apps/app/src/components/plugin/EnvironmentProviderIcon.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { EnvironmentProviderIcon } from "./EnvironmentProviderIcon";
const provider: SystemEnvironmentProvider = {
id: "git-worktree",
pluginId: "environment-git-worktree",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
displayName: "Worktree",
Expand Down
7 changes: 7 additions & 0 deletions apps/app/src/components/plugin/PluginNewThreadComposer.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,7 @@ const CHECKOUT_PROVIDER: SystemEnvironmentProvider = {
icon: "Laptop",
logoUrl: null,
pluginId: "environment-project-checkout",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand All @@ -421,6 +422,7 @@ const PERSONAL_WORKSPACE_PROVIDER: SystemEnvironmentProvider = {
icon: "Folder",
logoUrl: null,
pluginId: "environment-personal-workspace",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand All @@ -438,6 +440,7 @@ const MANAGED_WORKTREE_SUGAR_PROVIDER: SystemEnvironmentProvider = {
icon: "GitBranch",
logoUrl: null,
pluginId: "environment-git-worktree",
presentation: null,
acceptsEmptyInputs: false,
availability: null,
requires: {
Expand Down Expand Up @@ -1338,6 +1341,7 @@ const SANDBOX_PROVIDER: SystemEnvironmentProvider = {
icon: "Container",
logoUrl: null,
pluginId: "docker-sandbox",
presentation: null,
acceptsEmptyInputs: false,
availability: null,
requires: {
Expand All @@ -1359,6 +1363,7 @@ const OPTIONAL_INPUTS_PROVIDER: SystemEnvironmentProvider = {
icon: "Container",
logoUrl: null,
pluginId: "optional-sandbox",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand All @@ -1379,6 +1384,7 @@ const BRANCH_PROVIDER: SystemEnvironmentProvider = {
icon: "GitBranch",
logoUrl: null,
pluginId: "branchy",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand All @@ -1396,6 +1402,7 @@ const HOST_PROVIDER: SystemEnvironmentProvider = {
icon: "Server",
logoUrl: null,
pluginId: "hosted",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand Down
5 changes: 5 additions & 0 deletions apps/app/src/components/plugin/new-thread-environment-seed.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const ENVIRONMENT_PROVIDERS: SystemEnvironmentProvider[] = [
icon: "GitBranch",
logoUrl: null,
pluginId: "branchy",
presentation: null,
acceptsEmptyInputs: false,
availability: null,
requires: {
Expand All @@ -37,6 +38,7 @@ const ENVIRONMENT_PROVIDERS: SystemEnvironmentProvider[] = [
icon: "Laptop",
logoUrl: null,
pluginId: "environment-project-checkout",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand All @@ -56,6 +58,7 @@ const ENVIRONMENT_PROVIDERS: SystemEnvironmentProvider[] = [
icon: "GitBranch",
logoUrl: null,
pluginId: "environment-git-worktree",
presentation: null,
acceptsEmptyInputs: false,
availability: null,
requires: {
Expand All @@ -72,6 +75,7 @@ const ENVIRONMENT_PROVIDERS: SystemEnvironmentProvider[] = [
icon: "Folder",
logoUrl: null,
pluginId: "environment-personal-workspace",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand All @@ -88,6 +92,7 @@ const ENVIRONMENT_PROVIDERS: SystemEnvironmentProvider[] = [
icon: "Container",
logoUrl: null,
pluginId: "docker-sandbox",
presentation: null,
acceptsEmptyInputs: false,
availability: null,
requires: {
Expand Down
3 changes: 3 additions & 0 deletions apps/app/src/components/promptbox/NewThreadPromptBox.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ describe("ProjectlessMachineSlot", () => {
icon: "Folder",
logoUrl: null,
pluginId: "environment-personal-workspace",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand Down Expand Up @@ -175,6 +176,7 @@ describe("ProjectlessEnvSlot", () => {
icon: "Folder",
logoUrl: null,
pluginId: "environment-personal-workspace",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand All @@ -192,6 +194,7 @@ describe("ProjectlessEnvSlot", () => {
icon: "Cloud",
logoUrl: null,
pluginId: "environment-modal-sandbox",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand Down
3 changes: 3 additions & 0 deletions apps/app/src/components/secondary-panel/ThreadMetadataContent.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ const worktreeProvider: SystemEnvironmentProvider = {
icon: "GitBranch",
logoUrl: null,
pluginId: "environment-git-worktree",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand All @@ -73,6 +74,7 @@ const modalProvider: SystemEnvironmentProvider = {
icon: "Cloud",
logoUrl: null,
pluginId: "environment-modal-sandbox",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand All @@ -90,6 +92,7 @@ const personalProvider: SystemEnvironmentProvider = {
icon: "Folder",
logoUrl: null,
pluginId: "environment-personal-workspace",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand Down
8 changes: 8 additions & 0 deletions apps/app/src/components/sidebar/ProjectRow.interactions.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ describe("ProjectRow interactions", () => {
environmentBranchName: "feat/menu-close",
environmentProviderId: "git-worktree",
environmentIsWorktree: true,
environmentGroupsThreads: true,
queuedWork: "none",
activity: {
activeWorkflowCount: 1,
Expand All @@ -205,6 +206,7 @@ describe("ProjectRow interactions", () => {
environmentBranchName: "feat/menu-close",
environmentProviderId: "git-worktree",
environmentIsWorktree: true,
environmentGroupsThreads: true,
queuedWork: "none",
}),
],
Expand Down Expand Up @@ -236,6 +238,7 @@ describe("ProjectRow interactions", () => {
queuedWork: "none",
environmentProviderId: "git-worktree",
environmentIsWorktree: true,
environmentGroupsThreads: true,
activity: {
activeWorkflowCount: 0,
activeBackgroundAgentCount: 0,
Expand All @@ -251,6 +254,7 @@ describe("ProjectRow interactions", () => {
queuedWork: "none",
environmentProviderId: "git-worktree",
environmentIsWorktree: true,
environmentGroupsThreads: true,
}),
],
},
Expand Down Expand Up @@ -476,6 +480,7 @@ describe("ProjectRow interactions", () => {
environmentBranchName: "feat/menu-close",
environmentProviderId: "git-worktree",
environmentIsWorktree: true,
environmentGroupsThreads: true,
queuedWork: "none",
}),
makeThread({
Expand All @@ -485,6 +490,7 @@ describe("ProjectRow interactions", () => {
environmentBranchName: "feat/menu-close",
environmentProviderId: "git-worktree",
environmentIsWorktree: true,
environmentGroupsThreads: true,
queuedWork: "none",
}),
],
Expand Down Expand Up @@ -546,6 +552,7 @@ describe("ProjectRow interactions", () => {
environmentBranchName: "main",
environmentProviderId: "personal-workspace",
environmentIsWorktree: true,
environmentGroupsThreads: true,
queuedWork: "none",
}),
makeThread({
Expand All @@ -554,6 +561,7 @@ describe("ProjectRow interactions", () => {
environmentBranchName: "main",
environmentProviderId: "personal-workspace",
environmentIsWorktree: true,
environmentGroupsThreads: true,
queuedWork: "none",
}),
],
Expand Down
1 change: 1 addition & 0 deletions apps/app/src/hooks/cache-owners/query-cache.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,7 @@ export function optimisticallyInsertThread(
environmentPath: null,
environmentProviderId: null,
environmentIsWorktree: null,
environmentGroupsThreads: false,
environmentWorkspaceDisplayKind: "other",
runtime: thread.runtime,
hasPendingInteraction: false,
Expand Down
1 change: 1 addition & 0 deletions apps/app/src/hooks/queries/environment-provider-queries.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const WORKTREE_PROVIDER: SystemEnvironmentProvider = {
icon: "GitBranch",
logoUrl: null,
pluginId: "environment-git-worktree",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand Down
3 changes: 3 additions & 0 deletions apps/app/src/lib/environment-workspace-display.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const worktreeProvider: SystemEnvironmentProvider = {
icon: "FolderGit",
logoUrl: null,
pluginId: "environment-git-worktree",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand All @@ -39,6 +40,7 @@ const personalProvider: SystemEnvironmentProvider = {
icon: "Folder",
logoUrl: null,
pluginId: "environment-personal-workspace",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand All @@ -56,6 +58,7 @@ const machineContainerProvider: SystemEnvironmentProvider = {
icon: "Box",
logoUrl: null,
pluginId: "containers",
presentation: null,
acceptsEmptyInputs: false,
availability: null,
requires: {
Expand Down
1 change: 1 addition & 0 deletions apps/app/src/views/RootComposeMobileRecents.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const personalProvider: SystemEnvironmentProvider = {
icon: "Folder",
logoUrl: null,
pluginId: "environment-personal-workspace",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand Down
2 changes: 2 additions & 0 deletions apps/app/src/views/RootComposeView.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ function makeProjectProvider(id: string): SystemEnvironmentProvider {
icon: null,
logoUrl: null,
pluginId: id,
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand All @@ -311,6 +312,7 @@ function makeProjectlessProvider(
icon: null,
logoUrl: null,
pluginId: id,
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand Down
2 changes: 2 additions & 0 deletions apps/app/src/views/root-compose-thread-environment.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const environmentProviders: SystemEnvironmentProvider[] = [
icon: "GitBranch",
logoUrl: null,
pluginId: "branchy",
presentation: null,
acceptsEmptyInputs: false,
availability: null,
requires: {
Expand All @@ -31,6 +32,7 @@ const environmentProviders: SystemEnvironmentProvider[] = [
icon: "Server",
logoUrl: null,
pluginId: "hosted",
presentation: null,
acceptsEmptyInputs: true,
availability: null,
requires: {
Expand Down
2 changes: 2 additions & 0 deletions apps/cli/src/__tests__/command-output/environment.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ describe("bb environment command output", () => {
displayName: "Worktree",
icon: null,
pluginId: "environment-git-worktree",
presentation: null,
acceptsEmptyInputs: false,
availability: { status: "available" },
requires: {
Expand All @@ -129,6 +130,7 @@ describe("bb environment command output", () => {
displayName: "Modal sandbox",
icon: null,
pluginId: "environment-modal-sandbox",
presentation: null,
acceptsEmptyInputs: true,
availability: {
status: "setup-required",
Expand Down
Loading
Loading