diff --git a/src/renderer/src/lib/workspace/activation/initial-surface/worktree-initial-terminal-seeding.ts b/src/renderer/src/lib/workspace/activation/initial-surface/worktree-initial-terminal-seeding.ts index 180fbe7abb5..cf4b696ae69 100644 --- a/src/renderer/src/lib/workspace/activation/initial-surface/worktree-initial-terminal-seeding.ts +++ b/src/renderer/src/lib/workspace/activation/initial-surface/worktree-initial-terminal-seeding.ts @@ -226,21 +226,22 @@ export function ensureWorktreeHasInitialTerminal( const shouldCreateNewStartupTerminal = opts?.createNewTerminalForStartup === true && sequencedStartup !== undefined if (!shouldAutoCreate && !shouldCreateForExplicitWork && !shouldCreateNewStartupTerminal) { - const existingTerminalTabId = store.tabsByWorktree[worktreeId]?.[0]?.id - if (existingTerminalTabId && (setup || issueCommand)) { - // Main can adopt the startup tab yet fail setup spawn; renderer still runs returned fallback setup. + const existingTerminalTabId = store.tabsByWorktree[worktreeId]?.[0]?.id ?? null + const queuedOnExisting = existingTerminalTabId !== null && Boolean(setup || issueCommand) + // Main can adopt the startup tab yet fail setup spawn; renderer still runs returned fallback + // setup. Editor- or browser-only workspaces run it in its own tab. + if (queuedOnExisting || setup) { queueSetupAndIssueCommands( store, worktreeId, existingTerminalTabId, setup, - issueCommand, + existingTerminalTabId ? issueCommand : undefined, wrappedSetupCommandStr, opts ) - return existingTerminalTabId } - return null + return queuedOnExisting ? existingTerminalTabId : null } const templatedTabId = applyDefaultTerminalTabs( diff --git a/src/renderer/src/lib/workspace/creation/worktree-creation-initial-tabs.ts b/src/renderer/src/lib/workspace/creation/worktree-creation-initial-tabs.ts index 974fd1c2769..bedf41e524b 100644 --- a/src/renderer/src/lib/workspace/creation/worktree-creation-initial-tabs.ts +++ b/src/renderer/src/lib/workspace/creation/worktree-creation-initial-tabs.ts @@ -54,7 +54,7 @@ export function prepareCreatedWorktreeActivation({ ...(primaryTabId ? { worktreeCreationId: creationId, providesInitialSurface: true } : { - // Seeding above already queued setup on every path; passing it again opens a second Setup tab. + // Seeding above owns setup delivery; passing it again opens a second Setup tab. ...(result.setup && !instantFolder ? { setup: result.setup } : {}), ...(defaultTabs ? { defaultTabs } : {}), ...(windowStartup.startup ? { startup: windowStartup.startup } : {}),