Inverts flow of Start Work

- Removes 'worktree' options from first prompt
- Adds confirmation back to the end of the 'create branch' command flow which gives option to create a worktree
- Removes option to create branch without switching when command is invoked from Start Work

Author: axosoft-ramint

docs/telemetry-events.md

@@ -1379,7 +1379,7 @@ void
 ```typescript
 {
   'instance': number,
-  'type': 'branch' | 'branch-worktree' | 'issue' | 'issue-worktree'
+  'type': 'branch' | 'issue'
 }
 ```
 
@@ -1390,7 +1390,7 @@ void
 ```typescript
 {
   'instance': number,
-  'type': 'branch' | 'branch-worktree' | 'issue' | 'issue-worktree',
+  'type': 'branch' | 'issue',
   'items.count': number,
   'connected': false | true
 }
@@ -1403,7 +1403,7 @@ void
 ```typescript
 {
   'instance': number,
-  'type': 'branch' | 'branch-worktree' | 'issue' | 'issue-worktree',
+  'type': 'branch' | 'issue',
   'items.count': number,
   'connected': false | true
 }
@@ -1416,7 +1416,7 @@ void
 ```typescript
 {
   'instance': number,
-  'type': 'branch' | 'branch-worktree' | 'issue' | 'issue-worktree',
+  'type': 'branch' | 'issue',
   'items.count': number,
   'action': 'soft-open',
   'connected': false | true,
@@ -1431,7 +1431,7 @@ void
 ```typescript
 {
   'instance': number,
-  'type': 'branch' | 'branch-worktree' | 'issue' | 'issue-worktree',
+  'type': 'branch' | 'issue',
   'items.count': number,
   'connected': false | true,
   [`item.${string}`]: string | number | false | true
@@ -1445,7 +1445,7 @@ void
 ```typescript
 {
   'instance': number,
-  'type': 'branch' | 'branch-worktree' | 'issue' | 'issue-worktree',
+  'type': 'branch' | 'issue',
   'items.count': number,
   'connected': false | true
 }
@@ -1456,7 +1456,7 @@ void
 ```typescript
 {
   'instance': number,
-  'type': 'branch' | 'branch-worktree' | 'issue' | 'issue-worktree',
+  'type': 'branch' | 'issue',
   'items.count': number,
   'connected': false | true
 }
@@ -1467,7 +1467,7 @@ void
 ```typescript
 {
   'instance': number,
-  'type': 'branch' | 'branch-worktree' | 'issue' | 'issue-worktree',
+  'type': 'branch' | 'issue',
   'items.count': number,
   'connected': false | true
 }
@@ -1513,7 +1513,7 @@ void
 {
   'hostingProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'jira' | 'trello' | 'github-enterprise' | 'gitlab-self-hosted',
   'hostingProvider.key': string,
-  // @deprecated: 
+  // @deprecated:
   'remoteProviders.key': string
 }
 ```
@@ -1526,7 +1526,7 @@ void
 {
   'hostingProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'jira' | 'trello' | 'github-enterprise' | 'gitlab-self-hosted',
   'hostingProvider.key': string,
-  // @deprecated: 
+  // @deprecated:
   'remoteProviders.key': string
 }
 ```

src/commands/git/branch.ts

@@ -64,6 +64,7 @@ interface CreateState {
 
 	suggestNameOnly?: boolean;
 	suggestRepoOnly?: boolean;
+	confirmOptions?: CreateFlags[];
 }
 
 function isCreateState(state: Partial<State> | undefined): state is Partial<CreateState> {
@@ -434,27 +435,42 @@ export class BranchGitCommand extends QuickCommand {
 	}
 
 	private *createCommandConfirmStep(state: CreateStepState, context: Context): StepResultGenerator<CreateFlags[]> {
-		const step: QuickPickStep<FlagsQuickPickItem<CreateFlags>> = createConfirmStep(
-			appendReposToTitle(`Confirm ${context.title}`, state, context),
-			[
+		const confirmItems = [];
+		if (!state.confirmOptions) {
+			confirmItems.push(
 				createFlagsQuickPickItem<CreateFlags>(state.flags, [], {
 					label: context.title,
 					detail: `Will create a new branch named ${state.name} from ${getReferenceLabel(state.reference)}`,
 				}),
+			);
+		}
+
+		if (!state.confirmOptions || state.confirmOptions.includes('--switch')) {
+			confirmItems.push(
 				createFlagsQuickPickItem<CreateFlags>(state.flags, ['--switch'], {
 					label: `Create & Switch to Branch`,
 					detail: `Will create and switch to a new branch named ${state.name} from ${getReferenceLabel(
 						state.reference,
 					)}`,
 				}),
+			);
+		}
+
+		if (!state.confirmOptions || state.confirmOptions.includes('--worktree')) {
+			confirmItems.push(
 				createFlagsQuickPickItem<CreateFlags>(state.flags, ['--worktree'], {
 					label: `${context.title} in New Worktree`,
 					description: 'avoids modifying your working tree',
 					detail: `Will create a new worktree for a new branch named ${state.name} from ${getReferenceLabel(
 						state.reference,
 					)}`,
 				}),
-			],
+			);
+		}
+
+		const step: QuickPickStep<FlagsQuickPickItem<CreateFlags>> = createConfirmStep(
+			appendReposToTitle(`Confirm ${context.title}`, state, context),
+			confirmItems,
 			context,
 		);
 		const selection: StepSelection<typeof step> = yield step;

src/plus/startWork/startWork.ts

@@ -29,7 +29,7 @@ import type { Issue, IssueShape, SearchedIssue } from '../../git/models/issue';
 import { getOrOpenIssueRepository } from '../../git/models/issue';
 import type { Repository } from '../../git/models/repository';
 import type { QuickPickItemOfT } from '../../quickpicks/items/common';
-import { createQuickPickItemOfT, createQuickPickSeparator } from '../../quickpicks/items/common';
+import { createQuickPickItemOfT } from '../../quickpicks/items/common';
 import type { DirectiveQuickPickItem } from '../../quickpicks/items/directive';
 import { createDirectiveQuickPickItem, Directive } from '../../quickpicks/items/directive';
 import { getScopedCounter } from '../../system/counter';
@@ -54,14 +54,13 @@ interface Context {
 interface State {
 	item?: StartWorkItem;
 	type?: StartWorkType;
-	inWorktree?: boolean;
 }
 interface StateWithType extends State {
 	type: StartWorkType;
 }
 
-export type StartWorkType = 'branch' | 'branch-worktree' | 'issue' | 'issue-worktree';
-type StartWorkTypeItem = { type: StartWorkType; inWorktree?: boolean };
+export type StartWorkType = 'branch' | 'issue';
+type StartWorkTypeItem = { type: StartWorkType };
 
 export interface StartWorkCommandArgs {
 	readonly command: 'startWork';
@@ -125,7 +124,6 @@ export class StartWorkCommand extends QuickCommand<State> {
 				const result = yield* this.selectTypeStep(state);
 				if (result === StepResultBreak) continue;
 				state.type = result.type;
-				state.inWorktree = result.inWorktree;
 				if (this.container.telemetry.enabled) {
 					this.container.telemetry.sendEvent(
 						'startWork/type/chosen',
@@ -139,7 +137,7 @@ export class StartWorkCommand extends QuickCommand<State> {
 				}
 			}
 
-			if ((state.counter < 2 && state.type === 'issue') || state.type === 'issue-worktree') {
+			if (state.counter < 2 && state.type === 'issue') {
 				if (!hasConnectedIntegrations) {
 					if (this.container.telemetry.enabled) {
 						this.container.telemetry.sendEvent(
@@ -189,7 +187,6 @@ export class StartWorkCommand extends QuickCommand<State> {
 					}
 				} else {
 					state.type = result.type;
-					state.inWorktree = result.inWorktree;
 				}
 			}
 
@@ -206,9 +203,8 @@ export class StartWorkCommand extends QuickCommand<State> {
 						name: issue ? `${slug(issue.id, { lower: false })}-${slug(issue.title)}` : undefined,
 						suggestNameOnly: true,
 						suggestRepoOnly: true,
-						flags: state.inWorktree ? ['--worktree'] : ['--switch'],
+						confirmOptions: ['--switch', '--worktree'],
 					},
-					confirm: false,
 				},
 				this.pickedVia,
 			);
@@ -222,47 +218,23 @@ export class StartWorkCommand extends QuickCommand<State> {
 		return state.counter < 0 ? StepResultBreak : undefined;
 	}
 
-	private *selectTypeStep(
-		state: StepState<State>,
-	): StepResultGenerator<{ type: StartWorkType; inWorktree?: boolean }> {
+	private *selectTypeStep(state: StepState<State>): StepResultGenerator<{ type: StartWorkType }> {
 		const step = createPickStep({
 			placeholder: 'Choose how to start work',
 			items: [
-				createQuickPickSeparator('Issues'),
 				createQuickPickItemOfT<StartWorkTypeItem>(
 					{
 						label: 'Create Branch from Issue...',
 						detail: 'Will create a new branch after selecting an issue',
 					},
 					{ type: 'issue' },
 				),
-				createQuickPickItemOfT<StartWorkTypeItem>(
-					{
-						label: 'Create Branch & Worktree from Issue...',
-						detail: 'Will create a new branch & worktree after selecting an issue',
-					},
-					{
-						type: 'issue-worktree',
-						inWorktree: true,
-					},
-				),
-				createQuickPickSeparator('References'),
 				createQuickPickItemOfT<StartWorkTypeItem>(
 					{ label: 'Create Branch...', detail: 'Will create a new branch after selecting a reference' },
 					{
 						type: 'branch',
 					},
 				),
-				createQuickPickItemOfT<StartWorkTypeItem>(
-					{
-						label: 'Create Branch & Worktree...',
-						detail: 'Will create a new branch & worktree after selecting a reference',
-					},
-					{
-						type: 'branch-worktree',
-						inWorktree: true,
-					},
-				),
 			],
 		});
 		const selection: StepSelection<typeof step> = yield step;
@@ -444,12 +416,7 @@ export class StartWorkCommand extends QuickCommand<State> {
 			if (!context.result.items.length) {
 				return {
 					placeholder: 'No issues found. Start work anyway.',
-					items: [
-						createQuickPickItemOfT<StartWorkTypeItem>(
-							state.inWorktree ? 'Create a branch on a worktree' : 'Create a branch',
-							{ type: state.inWorktree ? 'branch-worktree' : 'branch', inWorktree: state.inWorktree },
-						),
-					],
+					items: [createQuickPickItemOfT<StartWorkTypeItem>('Create a branch', { type: 'branch' })],
 				};
 			}