polish

Author: joshspicer

package.json

@@ -616,6 +616,11 @@
 					],
 					"description": "%githubIssues.createIssueTriggers.description%"
 				},
+				"githubPullRequests.codingAgent.codeLens": {
+					"type": "boolean",
+					"default": true,
+					"description": "%githubPullRequests.codingAgent.codeLens.description%"
+				},
 				"githubIssues.createInsertFormat": {
 					"type": "string",
 					"enum": [

package.nls.json

@@ -105,6 +105,7 @@
 	"githubIssues.ignoreMilestones.description": "An array of milestones titles to never show issues from.",
 	"githubIssues.createIssueTriggers.description": "Strings that will cause the 'Create issue from comment' code action to show.",
 	"githubIssues.createIssueTriggers.items": "String that enables the 'Create issue from comment' code action. Should not contain whitespace.",
+	"githubPullRequests.codingAgent.codeLens.description": "Show CodeLens actions above TODO comments for delegating to coding agent.",
 	"githubIssues.createInsertFormat.description": "Controls whether an issue number (ex. #1234) or a full url (ex. https://github.com/owner/name/issues/1234) is inserted when the Create Issue code action is run.",
 	"githubIssues.issueCompletions.enabled.description": "Controls whether completion suggestions are shown for issues.",
 	"githubIssues.userCompletions.enabled.description": "Controls whether completion suggestions are shown for users.",

src/common/settingKeys.ts

@@ -97,4 +97,5 @@ export const COLOR_THEME = 'colorTheme';
 export const CODING_AGENT = `${PR_SETTINGS_NAMESPACE}.codingAgent`;
 export const CODING_AGENT_ENABLED = 'enabled';
 export const CODING_AGENT_AUTO_COMMIT_AND_PUSH = 'autoCommitAndPush';
-export const CODING_AGENT_PROMPT_FOR_CONFIRMATION = 'promptForConfirmation';
+export const CODING_AGENT_PROMPT_FOR_CONFIRMATION = 'promptForConfirmation';
+export const SHOW_CODE_LENS = 'codeLens';

src/common/utils.ts

@@ -1005,3 +1005,9 @@ export function escapeRegExp(string: string) {
 	return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
 
+export function truncate(value: string, maxLength: number, suffix = '...'): string {
+	if (value.length <= maxLength) {
+		return value;
+	}
+	return `${value.substr(0, maxLength)}${suffix}`;
+}

src/github/copilotRemoteAgent.ts

@@ -261,6 +261,8 @@ export class CopilotRemoteAgentManager extends Disposable {
 		status: CopilotPRStatus;
 	}[]> | undefined;
 
+	private _isAssignable: boolean | undefined;
+
 	constructor(
 		private credentialStore: CredentialStore,
 		public repositoriesManager: RepositoriesManager,
@@ -287,18 +289,22 @@ export class CopilotRemoteAgentManager extends Disposable {
 		this._register(this.repositoriesManager.onDidChangeFolderRepositories((event) => {
 			if (event.added) {
 				this._register(event.added.onDidChangeAssignableUsers(() => {
+					this._isAssignable = undefined; // Invalidate cache
 					this.updateAssignabilityContext();
 				}));
 			}
+			this._isAssignable = undefined; // Invalidate cache
 			this.updateAssignabilityContext();
 		}));
 		this.repositoriesManager.folderManagers.forEach(manager => {
 			this._register(manager.onDidChangeAssignableUsers(() => {
+				this._isAssignable = undefined; // Invalidate cache
 				this.updateAssignabilityContext();
 			}));
 		});
 		this._register(vscode.workspace.onDidChangeConfiguration((e) => {
 			if (e.affectsConfiguration(CODING_AGENT)) {
+				this._isAssignable = undefined; // Invalidate cache
 				this.updateAssignabilityContext();
 			}
 		}));
@@ -348,9 +354,18 @@ export class CopilotRemoteAgentManager extends Disposable {
 	}
 
 	async isAssignable(): Promise<boolean> {
+		const cacheAndReturn = (b: boolean) => {
+			this._isAssignable = b;
+			return b;
+		};
+
+		if (this._isAssignable !== undefined) {
+			return this._isAssignable;
+		}
+
 		const repoInfo = await this.repoInfo();
 		if (!repoInfo) {
-			return false;
+			return cacheAndReturn(false);
 		}
 
 		const { fm } = repoInfo;
@@ -361,14 +376,12 @@ export class CopilotRemoteAgentManager extends Disposable {
 			const allAssignableUsers = fm.getAllAssignableUsers();
 
 			if (!allAssignableUsers) {
-				return false;
+				return cacheAndReturn(false);
 			}
-
-			// Check if any of the copilot logins are in the assignable users
-			return allAssignableUsers.some(user => COPILOT_LOGINS.includes(user.login));
+			return cacheAndReturn(allAssignableUsers.some(user => COPILOT_LOGINS.includes(user.login)));
 		} catch (error) {
 			// If there's an error fetching assignable users, assume not assignable
-			return false;
+			return cacheAndReturn(false);
 		}
 	}
 

src/issues/issueFeatureRegistrar.ts

@@ -69,6 +69,7 @@ import { chatCommand } from '../lm/utils';
 import { ReviewManager } from '../view/reviewManager';
 import { ReviewsManager } from '../view/reviewsManager';
 import { PRNode } from '../view/treeNodes/pullRequestNode';
+import { truncate } from '../common/utils';
 
 const CREATING_ISSUE_FROM_FILE_CONTEXT = 'issues.creatingFromFile';
 
@@ -147,8 +148,8 @@ export class IssueFeatureRegistrar extends Disposable {
 				'issue.startCodingAgentFromTodo',
 				(todoInfo?: { document: vscode.TextDocument; lineNumber: number; line: string; insertIndex: number; range: vscode.Range }) => {
 					/* __GDPR__
-				"issue.startCodingAgentFromTodo" : {}
-			*/
+						"issue.startCodingAgentFromTodo" : {}
+					*/
 					this.telemetry.sendTelemetryEvent('issue.startCodingAgentFromTodo');
 					return this.startCodingAgentFromTodo(todoInfo);
 				},
@@ -1492,28 +1493,27 @@ ${options?.body ?? ''}\n
 		}
 
 		const { document, line, insertIndex } = todoInfo;
-
-		// Extract the TODO text after the trigger word
 		const todoText = line.substring(insertIndex).trim();
-
 		if (!todoText) {
 			vscode.window.showWarningMessage(vscode.l10n.t('No task description found in TODO comment'));
 			return;
 		}
 
-		// Create a prompt for the coding agent
 		const relativePath = vscode.workspace.asRelativePath(document.uri);
 		const prompt = vscode.l10n.t('Work on TODO: {0} (from {1})', todoText, relativePath);
-
-		// Start the coding agent session
-		try {
-			await this.copilotRemoteAgentManager.commandImpl({
-				userPrompt: prompt,
-				source: 'todo'
-			});
-		} catch (error) {
-			vscode.window.showErrorMessage(vscode.l10n.t('Failed to start coding agent session: {0}', error.message));
-		}
+		return vscode.window.withProgress({
+			location: vscode.ProgressLocation.Notification,
+			title: vscode.l10n.t('Delegating \'{0}\' to coding agent', truncate(todoText, 20))
+		}, async (_progress) => {
+			try {
+				await this.copilotRemoteAgentManager.commandImpl({
+					userPrompt: prompt,
+					source: 'todo'
+				});
+			} catch (error) {
+				vscode.window.showErrorMessage(vscode.l10n.t('Failed to start coding agent session: {0}', error.message));
+			}
+		});
 	}
 
 	async assignToCodingAgent(issueModel: any) {

src/issues/issueTodoProvider.ts

@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode';
 import { MAX_LINE_LENGTH } from './util';
-import { CREATE_ISSUE_TRIGGERS, ISSUES_SETTINGS_NAMESPACE } from '../common/settingKeys';
+import { CODING_AGENT, CREATE_ISSUE_TRIGGERS, ISSUES_SETTINGS_NAMESPACE, SHOW_CODE_LENS } from '../common/settingKeys';
 import { escapeRegExp } from '../common/utils';
 import { CopilotRemoteAgentManager } from '../github/copilotRemoteAgent';
 import { ISSUE_OR_URL_EXPRESSION } from '../github/utils';
@@ -98,32 +98,28 @@ export class IssueTodoProvider implements vscode.CodeActionProvider, vscode.Code
 		return codeActions;
 	}
 
-	provideCodeLenses(
+	async provideCodeLenses(
 		document: vscode.TextDocument,
 		_token: vscode.CancellationToken,
-	): vscode.CodeLens[] {
+	): Promise<vscode.CodeLens[]> {
 		if (this.expression === undefined) {
 			return [];
 		}
 
+		// Check if CodeLens is enabled
+		const isCodeLensEnabled = vscode.workspace.getConfiguration(CODING_AGENT).get(SHOW_CODE_LENS, true);
+		if (!isCodeLensEnabled) {
+			return [];
+		}
+
 		const codeLenses: vscode.CodeLens[] = [];
 		for (let lineNumber = 0; lineNumber < document.lineCount; lineNumber++) {
 			const line = document.lineAt(lineNumber).text;
 			const todoInfo = this.findTodoInLine(lineNumber, line);
 			if (todoInfo) {
 				const { match, search, insertIndex } = todoInfo;
 				const range = new vscode.Range(lineNumber, search, lineNumber, search + match[0].length);
-
-				// Create GitHub Issue CodeLens
-				const createIssueCodeLens = new vscode.CodeLens(range, {
-					title: vscode.l10n.t('Create GitHub Issue'),
-					command: 'issue.createIssueFromSelection',
-					arguments: [{ document, lineNumber, line, insertIndex, range }],
-				});
-				codeLenses.push(createIssueCodeLens);
-
-				// Delegate to coding agent CodeLens (if copilot manager is available)
-				if (this.copilotRemoteAgentManager) {
+				if (this.copilotRemoteAgentManager && (await this.copilotRemoteAgentManager.isAvailable())) {
 					const startAgentCodeLens = new vscode.CodeLens(range, {
 						title: vscode.l10n.t('Delegate to coding agent'),
 						command: 'issue.startCodingAgentFromTodo',

src/test/issues/issueTodoProvider.test.ts

@@ -60,7 +60,7 @@ describe('IssueTodoProvider', function () {
 			lineCount: 4
 		} as vscode.TextDocument;
 
-		const codeLenses = provider.provideCodeLenses(document, new vscode.CancellationTokenSource().token);
+		const codeLenses = await provider.provideCodeLenses(document, new vscode.CancellationTokenSource().token);
 
 		assert.strictEqual(codeLenses.length, 2);
 
@@ -78,4 +78,54 @@ describe('IssueTodoProvider', function () {
 		assert.strictEqual(createIssueLens?.range.start.line, 1);
 		assert.strictEqual(startAgentLens?.range.start.line, 1);
 	});
+
+	it('should respect the createIssueCodeLens setting', async function () {
+		const mockContext = {
+			subscriptions: []
+		} as any as vscode.ExtensionContext;
+
+		const mockCopilotManager = {} as any; // Mock CopilotRemoteAgentManager
+
+		const provider = new IssueTodoProvider(mockContext, mockCopilotManager);
+
+		// Create a mock document with TODO comment
+		const document = {
+			lineAt: (line: number) => ({
+				text: line === 1 ? '  // TODO: Fix this' : 'function test() {}'
+			}),
+			lineCount: 4
+		} as vscode.TextDocument;
+
+		// Mock the workspace configuration to return false for createIssueCodeLens
+		const originalGetConfiguration = vscode.workspace.getConfiguration;
+		vscode.workspace.getConfiguration = (section?: string) => {
+			if (section === 'githubIssues') {
+				return {
+					get: (key: string, defaultValue?: any) => {
+						if (key === 'createIssueCodeLens') {
+							return false;
+						}
+						if (key === 'createIssueTriggers') {
+							return ['TODO', 'todo', 'BUG', 'FIXME', 'ISSUE', 'HACK'];
+						}
+						return defaultValue;
+					}
+				} as any;
+			}
+			return originalGetConfiguration(section);
+		};
+
+		try {
+			// Update triggers to ensure the expression is set
+			(provider as any).updateTriggers();
+
+			const codeLenses = await provider.provideCodeLenses(document, new vscode.CancellationTokenSource().token);
+
+			// Should return empty array when CodeLens is disabled
+			assert.strictEqual(codeLenses.length, 0, 'Should not provide code lenses when setting is disabled');
+		} finally {
+			// Restore original configuration
+			vscode.workspace.getConfiguration = originalGetConfiguration;
+		}
+	});
 });