diff --git a/packages/app/e2e/regression/new-session-workspace-branch.spec.ts b/packages/app/e2e/regression/new-session-workspace-branch.spec.ts index e815f10c68a..4ccbc1609f0 100644 --- a/packages/app/e2e/regression/new-session-workspace-branch.spec.ts +++ b/packages/app/e2e/regression/new-session-workspace-branch.spec.ts @@ -42,7 +42,7 @@ test("selects a base branch for a new workspace", async ({ page }) => { await page.goto(`/new-session?draftId=${draftID}`) await expectAppVisible(page.locator('[data-component="composer-editor"]')) await page.getByRole("button", { name: "Local", exact: true }).click() - await page.getByRole("menuitem", { name: "New workspace", exact: true }).click() + await page.getByRole("menuitem", { name: "New worktree", exact: true }).click() await page.getByRole("button", { name: "from main", exact: true }).click() await page.getByRole("menuitemradio", { name: "feature/api", exact: true }).click() diff --git a/packages/app/e2e/regression/new-session-workspace-pending.spec.ts b/packages/app/e2e/regression/new-session-workspace-pending.spec.ts index 70e20c41ec1..98c9be0517f 100644 --- a/packages/app/e2e/regression/new-session-workspace-pending.spec.ts +++ b/packages/app/e2e/regression/new-session-workspace-pending.spec.ts @@ -255,7 +255,7 @@ test("restores the original draft when worktree creation fails", async ({ page } await expect(page.getByText("Failed to create worktree", { exact: true })).toBeVisible() await expect(page.locator('[data-component="composer-editor"]')).toHaveText(text) await expect(page.locator('[data-action="composer-submit"]')).toBeEnabled() - await expect(page.getByRole("button", { name: "New workspace", exact: true })).toBeVisible() + await expect(page.getByRole("button", { name: "New worktree", exact: true })).toBeVisible() await expect(pending.shimmer).toHaveCount(0) await expect(pending.message).toHaveCount(0) await expect(page.locator(`[data-titlebar-tab-link][href="${sessionPath}${pending.sessionID}"]`)).toHaveCount(0) @@ -325,7 +325,7 @@ test("restores the draft after closing and revisiting a pending session that fai await expect(page.getByText("Failed to create worktree", { exact: true })).toBeVisible() await expect(page.locator('[data-component="composer-editor"]')).toHaveText(`${text}\n\n${followUp}`) await expect(page.locator('[data-action="composer-submit"]')).toBeEnabled() - await expect(page.getByRole("button", { name: "New workspace", exact: true })).toBeVisible() + await expect(page.getByRole("button", { name: "New worktree", exact: true })).toBeVisible() await expect(page.locator(`[data-titlebar-tab-link][href="${draftPath}"]`)).toHaveCount(1) await expect(tab).toHaveCount(0) await expect(pending.shimmer).toHaveCount(0) @@ -458,8 +458,8 @@ async function openDraft(page: Page, options?: { failSessionCreate?: boolean }) await page.goto(draftPath) await expectAppVisible(page.locator('[data-component="composer-editor"]')) await page.getByRole("button", { name: "Local", exact: true }).click() - await page.getByRole("menuitem", { name: "New workspace", exact: true }).click() - await expect(page.getByRole("button", { name: "New workspace", exact: true })).toBeVisible() + await page.getByRole("menuitem", { name: "New worktree", exact: true }).click() + await expect(page.getByRole("button", { name: "New worktree", exact: true })).toBeVisible() await expect(page.locator('[data-component="composer-editor"]')).toBeEditable() return { worktree, worktreeRequests, calls, creates, prompts } } diff --git a/packages/app/e2e/regression/settings-loading.spec.ts b/packages/app/e2e/regression/settings-loading.spec.ts index 2c539ac2a89..2d06a944e33 100644 --- a/packages/app/e2e/regression/settings-loading.spec.ts +++ b/packages/app/e2e/regression/settings-loading.spec.ts @@ -45,15 +45,15 @@ test("workspaces opens without waiting for inventory or sessions", async ({ page }) const settings = page.getByTestId("settings-screen") const requested = page.waitForRequest((request) => new URL(request.url()).pathname.startsWith("/api/worktree/")) - await settings.getByRole("tab", { name: "Workspaces", exact: true }).click() + await settings.getByRole("tab", { name: "Worktrees", exact: true }).click() await requested - await expect(settings.getByRole("heading", { name: "Workspaces", exact: true })).toBeVisible() + await expect(settings.getByRole("heading", { name: "Worktrees", exact: true })).toBeVisible() await expect(settings.getByRole("button", { name: "Back to app" })).toBeVisible() - await expect(settings.getByText("No workspaces", { exact: true })).toHaveCount(0) + await expect(settings.getByText("No worktrees", { exact: true })).toHaveCount(0) inventory.resolve() await expect(settings.getByText(sandboxes[0], { exact: true })).toBeVisible() - await expect(settings.getByText("12 workspaces", { exact: true })).toBeVisible() + await expect(settings.getByText("12 worktrees", { exact: true })).toBeVisible() sessions.resolve() await expect(settings.getByText("Workspace 1 session", { exact: true })).toBeVisible() @@ -63,7 +63,7 @@ test("workspaces opens without waiting for inventory or sessions", async ({ page await route.fallback() }) await settings.getByRole("tab", { name: "Preferences", exact: true }).click() - await settings.getByRole("tab", { name: "Workspaces", exact: true }).click() + await settings.getByRole("tab", { name: "Worktrees", exact: true }).click() await expect(settings.getByText("Workspace 1 session", { exact: true })).toBeVisible() refresh.resolve() }) @@ -89,7 +89,7 @@ test("extensions opens without waiting for MCPs", async ({ page }) => { test("workspace inventory uses the settings panel scroll area", async ({ page }) => { const settings = page.getByTestId("settings-screen") - await settings.getByRole("tab", { name: "Workspaces", exact: true }).click() + await settings.getByRole("tab", { name: "Worktrees", exact: true }).click() await expect(settings.getByText("Workspace 1 session", { exact: true })).toBeVisible() const list = settings.locator('[data-component="settings-list"]') await expect(list).toHaveCSS("max-height", "none") diff --git a/packages/app/e2e/regression/workspace-accent.spec.ts b/packages/app/e2e/regression/workspace-accent.spec.ts index cfe6f1542c4..2b085d033bb 100644 --- a/packages/app/e2e/regression/workspace-accent.spec.ts +++ b/packages/app/e2e/regression/workspace-accent.spec.ts @@ -134,8 +134,8 @@ for (const theme of ["light", "dark"] as const) { await expect(view.send).toBeDisabled() await expectBackground(view.send, "contrast") await page.getByRole("button", { name: "Local", exact: true }).click() - await page.getByRole("menuitem", { name: "New workspace", exact: true }).click() - await expect(page.getByRole("button", { name: "New workspace", exact: true })).toBeVisible() + await page.getByRole("menuitem", { name: "New worktree", exact: true }).click() + await expect(page.getByRole("button", { name: "New worktree", exact: true })).toBeVisible() await view.input.fill("Inspect this fixture workspace.") await expect(view.send).toBeEnabled() await expectBackground(view.send, "contrast") diff --git a/packages/app/src/runtime/i18n/en.ts b/packages/app/src/runtime/i18n/en.ts index 545feb61b49..e4b3e9d15ba 100644 --- a/packages/app/src/runtime/i18n/en.ts +++ b/packages/app/src/runtime/i18n/en.ts @@ -23,7 +23,7 @@ export const dict = { "command.category.mcp": "MCP", "command.category.agent": "Agent", "command.category.permissions": "Permissions", - "command.category.workspace": "Workspace", + "command.category.workspace": "Worktree", "command.category.settings": "Settings", "command.logs.export": "Export logs", @@ -88,8 +88,8 @@ export const dict = { "command.prompt.mode.normal": "Prompt", "command.permissions.autoaccept.enable": "Auto-accept permissions", "command.permissions.autoaccept.disable": "Stop auto-accepting permissions", - "command.workspace.toggle": "Toggle workspaces", - "command.workspace.toggle.description": "Enable or disable multiple workspaces in the sidebar", + "command.workspace.toggle": "Toggle worktrees", + "command.workspace.toggle.description": "Enable or disable multiple worktrees in the sidebar", "command.session.undo": "Undo", "command.session.undo.description": "Undo the last message", "command.session.redo": "Redo", @@ -462,9 +462,9 @@ export const dict = { "dialog.project.edit.icon.recommended": "Recommended: 128x128px", "dialog.project.edit.color": "Color", "dialog.project.edit.color.select": "Select {{color}} color", - "dialog.project.edit.worktree.startup": "Workspace startup script", + "dialog.project.edit.worktree.startup": "Worktree startup script", "dialog.project.edit.worktree.startup.description": - "Runs after creating a new workspace (worktree). Use $OPENCODE_WORKTREE_BASE for the base worktree and $OPENCODE_WORKTREE_PATH for the new worktree.", + "Runs after creating a new worktree. Use $OPENCODE_WORKTREE_BASE for the base worktree and $OPENCODE_WORKTREE_PATH for the new worktree.", "dialog.project.edit.worktree.startup.placeholder": "e.g. bun install", "dialog.releaseNotes.action.getStarted": "Get started", @@ -533,9 +533,9 @@ export const dict = { "toast.theme.title": "Theme switched", "toast.scheme.title": "Color scheme", - "toast.workspace.enabled.title": "Workspaces enabled", + "toast.workspace.enabled.title": "Worktrees enabled", "toast.workspace.enabled.description": "Multiple worktrees are now shown in the sidebar", - "toast.workspace.disabled.title": "Workspaces disabled", + "toast.workspace.disabled.title": "Worktrees disabled", "toast.workspace.disabled.description": "Only the main worktree is shown in the sidebar", "toast.permissions.autoaccept.on.title": "Auto-accepting permissions", @@ -749,7 +749,7 @@ export const dict = { "session.new.workspace.runIn": "Run session in", "session.new.workspace.triggerLocal": "Local", "session.new.workspace.local": "Local repository", - "session.new.workspace.existing": "Workspace…", + "session.new.workspace.existing": "Worktree…", "session.new.git.none": "No Git", "session.new.lastModified": "Last modified", @@ -850,8 +850,8 @@ export const dict = { "sidebar.nav.projectsAndSessions": "Projects and sessions", "sidebar.settings": "Settings", "sidebar.help": "Help", - "sidebar.workspaces.enable": "Enable workspaces", - "sidebar.workspaces.disable": "Disable workspaces", + "sidebar.workspaces.enable": "Enable worktrees", + "sidebar.workspaces.disable": "Disable worktrees", "sidebar.gettingStarted.title": "Getting started", "sidebar.gettingStarted.line1": "OpenCode includes free models so you can start immediately.", "sidebar.gettingStarted.line2": "Connect any provider to use models, inc. Claude, GPT, Gemini etc.", @@ -984,8 +984,7 @@ export const dict = { "settings.general.row.showProjectIcon.title": "Project icon", "settings.general.row.showProjectIcon.description": "Show the project icon in the session header", "settings.general.row.mobileTitlebarBottom.title": "Bottom navigation", - "settings.general.row.mobileTitlebarBottom.description": - "Place the title bar at the bottom of the screen on mobile", + "settings.general.row.mobileTitlebarBottom.description": "Place the title bar at the bottom of the screen on mobile", "settings.general.row.mobileDiffWrap.description": "Wrap long lines in mobile diffs instead of scrolling horizontally", "settings.general.row.showCustomAgents.title": "Show agent", @@ -1173,7 +1172,7 @@ export const dict = { "session.delete.confirm": 'Delete session "{{name}}"?', "session.delete.button": "Delete session", - "workspace.new": "New workspace", + "workspace.new": "New worktree", "common.viewAll": "View all", "session.new.workspace.local.tooltip": "Use current checkout", "session.new.workspace.new.tooltip": "Create isolated checkout", @@ -1181,66 +1180,66 @@ export const dict = { "session.new.workspace.createFrom": "Create from branch", "session.new.workspace.branch.search.placeholder": "Search branches", "session.new.workspace.trigger.tooltip": "Select where to run session", - "session.new.workspace.search.placeholder": "Search workspaces", - "settings.tab.workspaces": "Workspaces", + "session.new.workspace.search.placeholder": "Search worktrees", + "settings.tab.workspaces": "Worktrees", "settings.workspaces.filter.all": "All projects", - "settings.workspaces.empty": "No workspaces", - "settings.workspaces.count.one": "{{count}} workspace", - "settings.workspaces.count.other": "{{count}} workspaces", + "settings.workspaces.empty": "No worktrees", + "settings.workspaces.count.one": "{{count}} worktree", + "settings.workspaces.count.other": "{{count}} worktrees", "settings.workspaces.sessions.one": "{{count}} session in {{project}}", "settings.workspaces.sessions.other": "{{count}} sessions in {{project}}", "settings.workspaces.lastActiveSession": "Last active session", - "settings.workspaces.deleteAll": "Delete all workspaces", - "settings.workspaces.deleteAll.confirm": "Delete all {{count}} workspaces?", + "settings.workspaces.deleteAll": "Delete all worktrees", + "settings.workspaces.deleteAll.confirm": "Delete all {{count}} worktrees?", "settings.workspaces.delete.warning": - "The workspace directory and branch will be permanently removed, including any unmerged changes shown below.", + "The worktree directory and branch will be permanently removed, including any unmerged changes shown below.", "settings.workspaces.deleteAll.warning": - "The {{count}} selected workspaces in {{project}} will be permanently removed only if each is clean, inactive, and has no linked sessions.", - "settings.workspaces.delete.blocked.active": "The active workspace cannot be deleted.", + "The {{count}} selected worktrees in {{project}} will be permanently removed only if each is clean, inactive, and has no linked sessions.", + "settings.workspaces.delete.blocked.active": "The active worktree cannot be deleted.", "settings.workspaces.delete.blocked.linked": "Linked sessions will remain, but their working directory will be permanently removed.", "settings.workspaces.default.title": "Default environment", "settings.workspaces.default.description": "Choose where new sessions start", "settings.workspaces.default.lastUsed": "Last used per project", "settings.workspaces.default.local": "Local directory", - "settings.workspaces.default.new": "New workspace", - "workspace.move.title": "Move to workspace", + "settings.workspaces.default.new": "New worktree", + "workspace.move.title": "Move to worktree", "workspace.move.menu.title": "Move session to", "workspace.move.failed": "Failed to move session", - "workspace.lifecycle.creating": "Creating workspace", - "workspace.lifecycle.created": "Workspace created", + "workspace.lifecycle.creating": "Creating worktree", + "workspace.lifecycle.created": "Worktree created", "workspace.lifecycle.starting": "Starting session", - "workspace.onboarding.title": "Isolate sessions with workspaces", + "workspace.onboarding.title": "Isolate sessions with worktrees", "workspace.onboarding.description": "Each gets its own checkout, so nothing interferes with your local repository", - "workspace.lifecycle.moving": "Moving to workspace", - "workspace.lifecycle.set": "Workspace set", + "workspace.lifecycle.moving": "Moving to worktree", + "workspace.lifecycle.set": "Worktree set", "session.summary.title": "Session details", "session.summary.noBranch": "No branch", "session.summary.basedOn": "Based on {{branch}}", "workspace.type.local": "local", "workspace.type.sandbox": "sandbox", - "workspace.create.failed.title": "Failed to create workspace", - "workspace.delete.failed.title": "Failed to delete workspace", - "workspace.resetting.title": "Resetting workspace", + "workspace.create.failed.title": "Failed to create worktree", + "workspace.delete.failed.title": "Failed to delete worktree", + "workspace.resetting.title": "Resetting worktree", "workspace.resetting.description": "This may take a minute.", - "workspace.reset.failed.title": "Failed to reset workspace", - "workspace.reset.success.title": "Workspace reset", - "workspace.reset.success.description": "Workspace now matches the default branch.", - "workspace.error.stillPreparing": "Workspace is still preparing", + "workspace.reset.failed.title": "Failed to reset worktree", + "workspace.reset.success.title": "Worktree reset", + "workspace.reset.success.description": "Worktree now matches the default branch.", + "workspace.error.stillPreparing": "Worktree is still preparing", "workspace.status.checking": "Checking for unmerged changes...", "workspace.status.error": "Unable to verify git status.", "workspace.status.clean": "No unmerged changes detected.", - "workspace.status.dirty": "Unmerged changes detected in this workspace.", - "workspace.delete.title": "Delete workspace", - "workspace.delete.confirm": 'Delete workspace "{{name}}"?', - "workspace.delete.button": "Delete workspace", - "workspace.reset.title": "Reset workspace", - "workspace.reset.confirm": 'Reset workspace "{{name}}"?', - "workspace.reset.button": "Reset workspace", + "workspace.status.dirty": "Unmerged changes detected in this worktree.", + "workspace.delete.title": "Delete worktree", + "workspace.delete.confirm": 'Delete worktree "{{name}}"?', + "workspace.delete.button": "Delete worktree", + "workspace.reset.title": "Reset worktree", + "workspace.reset.confirm": 'Reset worktree "{{name}}"?', + "workspace.reset.button": "Reset worktree", "workspace.reset.archived.none": "No active sessions will be archived.", "workspace.reset.archived.one": "1 session will be archived.", "workspace.reset.archived.many": "{{count}} sessions will be archived.", - "workspace.reset.note": "This will reset the workspace to match the default branch.", + "workspace.reset.note": "This will reset the worktree to match the default branch.", } export default dict