Skip to content

Don't apply the worktree default when resuming a session #62

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

Open
ymajoros wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Don't apply the worktree default when resuming a session #62

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions public/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,6 +793,11 @@ async function openSession(session, customOptions) {

// Open terminal in main process
const resumeOptions = customOptions || await resolveDefaultSessionOptions({ projectPath });
// The `worktree` default applies to NEW sessions only. Resuming must reuse the
// session's existing directory, so never pass --worktree on resume — otherwise
// a plain-click resume tries to spin up a fresh git worktree and fails to attach
// (the Resume-with-config dialog already omits worktree, which is why it works).
if (resumeOptions) { delete resumeOptions.worktree; delete resumeOptions.worktreeName; }
const result = await window.api.openTerminal(sessionId, projectPath, false, resumeOptions);
if (!result.ok) {
entry.terminal.write(`\r\nError: ${result.error}\r\n`);
Expand Down