Associates branch with issue when created from Start Work

Author: axosoft-ramint

src/commands/git/branch.ts

@@ -1,6 +1,11 @@
 import { QuickInputButtons } from 'vscode';
 import type { Container } from '../../container';
-import { getNameWithoutRemote } from '../../git/models/branch.utils';
+import {
+	addAssociatedIssueToBranch,
+	clearAssociatedIssuesForBranch,
+	getNameWithoutRemote,
+} from '../../git/models/branch.utils';
+import type { IssueShape } from '../../git/models/issue';
 import type { GitBranchReference, GitReference } from '../../git/models/reference';
 import { getReferenceLabel, isBranchReference, isRevisionReference } from '../../git/models/reference.utils';
 import { Repository } from '../../git/models/repository';
@@ -61,6 +66,7 @@ interface CreateState {
 	suggestNameOnly?: boolean;
 	suggestRepoOnly?: boolean;
 	confirmOptions?: CreateFlags[];
+	withIssue?: IssueShape;
 }
 
 function isCreateState(state: Partial<State> | undefined): state is Partial<CreateState> {
@@ -415,6 +421,25 @@ export class BranchGitCommand extends QuickCommand {
 			}
 
 			endSteps(state);
+
+			if (state.withIssue != null) {
+				const issue = state.withIssue;
+				const branch = await state.repo.git.getBranch(state.name);
+				// TODO: These descriptors are hacked in. Use an integration function to get the right resource for the issue.
+				const resource = issue.repository
+					? {
+							key: `${issue.repository.owner}/${issue.repository.repo}`,
+							owner: issue.repository.owner,
+							name: issue.repository.repo,
+					  }
+					: issue.project
+					  ? { key: issue.project.resourceId, id: issue.project.resourceId, name: issue.project.resourceId }
+					  : undefined;
+				if (branch != null && resource != null) {
+					await addAssociatedIssueToBranch(this.container, branch, { ...issue, type: 'issue' }, resource);
+				}
+			}
+
 			if (state.flags.includes('--switch')) {
 				await state.repo.switch(state.reference.ref, { createBranch: state.name });
 			} else {
@@ -558,6 +583,11 @@ export class BranchGitCommand extends QuickCommand {
 				force: state.flags.includes('--force'),
 				remote: state.flags.includes('--remotes'),
 			});
+
+			// Clean up any associated issue entries for the branches stored in the git config
+			for (const ref of state.references) {
+				await clearAssociatedIssuesForBranch(this.container, ref);
+			}
 		}
 	}
 

src/plus/startWork/startWork.ts

@@ -225,6 +225,7 @@ export class StartWorkCommand extends QuickCommand<State> {
 						suggestNameOnly: true,
 						suggestRepoOnly: true,
 						confirmOptions: ['--switch', '--worktree'],
+						withIssue: issue,
 					},
 				},
 				this.pickedVia,
@@ -386,7 +387,6 @@ export class StartWorkCommand extends QuickCommand<State> {
 			return {
 				label:
 					i.item.issue.title.length > 60 ? `${i.item.issue.title.substring(0, 60)}...` : i.item.issue.title,
-				// description: `${i.repoAndOwner}#${i.id}, by @${i.author}`,
 				description: `\u00a0 ${
 					i.item.issue.repository ? `${i.item.issue.repository.owner}/${i.item.issue.repository.repo}#` : ''
 				}${i.item.issue.id} \u00a0`,