Fixes further use of recompose on limited commits and adds count to button

Author: axosoft-ramint

src/webviews/apps/plus/composer/components/app.ts

@@ -1381,14 +1381,26 @@ export class ComposerApp extends LitElement {
 		// Reset feedback state and create new session ID for new composition
 		this.compositionFeedback = null;
 		this.compositionSessionId = `composer-${Date.now()}-${Math.random().toString(36).substring(2, 11)}`;
-		let selectedCommitIdsForGenerate = !this.state.hasUsedAutoCompose ? [...this.selectedCommitIds] : [];
+		const hasLockedCommits = this.state.commits.some(c => c.locked);
+		let selectedCommitIdsForGenerate: string[] = [];
+		if (hasLockedCommits) {
+			selectedCommitIdsForGenerate = this.state.commits.filter(c => !c.locked).map(c => c.id);
+		}
+
+		if (!selectedCommitIdsForGenerate.length) {
+			selectedCommitIdsForGenerate =
+				this.state.recompose?.enabled && !this.state.hasUsedAutoCompose && !hasLockedCommits
+					? [...this.selectedCommitIds]
+					: [];
+		}
+
 		if (selectedCommitIdsForGenerate.length === 1) {
 			selectedCommitIdsForGenerate = [];
 		}
 
 		if (!selectedCommitIdsForGenerate.length && this.state.recompose?.commitShas?.length) {
 			const recomposeCommits = this.state.commits.filter(
-				c => c.sha && this.state.recompose!.commitShas!.includes(c.sha),
+				c => c.sha && !c.locked && this.state.recompose!.commitShas!.includes(c.sha),
 			);
 			selectedCommitIdsForGenerate = recomposeCommits.map(c => c.id);
 		}
@@ -1627,6 +1639,8 @@ export class ComposerApp extends LitElement {
 		// Get hunks with updated assignments
 		const hunks = this.hunksWithAssignments;
 
+		const hasLockedCommits = this.state.commits.some(c => c.locked);
+
 		return html`
 			<header class="header">
 				<div class="header__group">
@@ -1671,6 +1685,7 @@ export class ComposerApp extends LitElement {
 					.canMoveHunks=${this.canMoveHunks}
 					.canGenerateCommitsWithAI=${this.canGenerateCommitsWithAI}
 					.canReorderCommits=${this.canReorderCommits}
+					.hasLockedCommits=${hasLockedCommits}
 					.isPreviewMode=${this.isPreviewMode}
 					.baseCommit=${this.state.baseCommit}
 					.repoName=${this.state.baseCommit?.repoName ?? this.state.repositoryState?.current.name ?? null}

src/webviews/apps/plus/composer/components/commits-panel.ts

@@ -389,6 +389,9 @@ export class CommitsPanel extends LitElement {
 	@property({ type: Boolean })
 	hasChanges: boolean = true;
 
+	@property({ type: Boolean })
+	hasLockedCommits: boolean = false;
+
 	@property({ type: Object })
 	aiModel?: AIModel = undefined;
 
@@ -1094,6 +1097,11 @@ export class CommitsPanel extends LitElement {
 	}
 
 	private renderAutoComposeContainer(disabled = false) {
+		const recomposeCount = this.hasLockedCommits
+			? this.commits.filter(c => !c.locked).length
+			: this.recompose?.enabled && this.selectedCommitIds.size > 1
+				? this.selectedCommitIds.size
+				: null;
 		return html`
 			<div class="auto-compose${this.hasUsedAutoCompose ? ' is-used' : ''}">
 				${when(
@@ -1184,9 +1192,10 @@ export class CommitsPanel extends LitElement {
 								></code-icon>
 								${this.generating
 									? 'Generating Commits...'
-									: this.hasUsedAutoCompose || this.isRecomposeLocked
-										? this.selectedCommitIds.size > 1
-											? 'Recompose Selected Commits'
+									: this.hasUsedAutoCompose || this.recompose?.enabled
+										? recomposeCount
+											? html`Recompose ${recomposeCount}
+												${recomposeCount === 1 ? 'Commit' : 'Commits'}`
 											: 'Recompose Commits'
 										: 'Auto-Compose Commits'}
 							</gl-button>

src/webviews/plus/composer/composerWebview.ts

@@ -1023,36 +1023,49 @@ export class ComposerWebviewProvider implements WebviewProvider<State, State, Co
 						params.commitsToReplace.commits[params.commitsToReplace.commits.length - 1].sha ??
 						this._safetyState.headSha!;
 				}
-				const combinedDiff = await calculateCombinedDiffBetweenCommits(
-					this._currentRepository!,
-					baseSha,
-					headSha,
-				);
-
-				const combinedHunks = createHunksFromDiffs(combinedDiff!.contents);
-				for (const hunk of combinedHunks) {
-					const { author, coAuthors } = getAuthorAndCoAuthorsForCombinedDiffHunk(this._hunks, hunk);
-					hunk.author = author;
-					hunk.coAuthors = coAuthors.length ? coAuthors : undefined;
-					hunks.push({ ...hunk, assigned: true });
-				}
 
-				// Update the hunks. Note that if params.commitsToReplace is defined, then we need to remove all the hunks with indices that match the hunkIndices of the commits to replace, then add in the new hunks and
-				// reinder all of the hunks. Otherwise, we just replace the existing hunks with the new ones
-				if (params.commitsToReplace) {
-					const hunkIndicesToRemove = new Set(params.commitsToReplace.commits.flatMap(c => c.hunkIndices));
-					this._hunks = this._hunks.filter(h => !hunkIndicesToRemove.has(h.index));
-					// Reindex the hunks
-					let newIndexCounter = 1;
-					this._hunks.forEach(hunk => {
-						hunk.index = newIndexCounter++;
-					});
-					hunks.forEach(hunk => {
-						hunk.index = newIndexCounter++;
-					});
-					this._hunks.push(...hunks);
+				const shouldSkipDiffCalculation =
+					params.commitsToReplace?.commits?.length && params.commitsToReplace.commits.every(c => !c.sha);
+				if (shouldSkipDiffCalculation) {
+					// just set hunks to the existing hunks and move on
+					const hunkIndices = new Set(params.commitsToReplace!.commits.flatMap(c => c.hunkIndices));
+					for (const index of hunkIndices) {
+						hunks.push({ ...this._hunks.find(m => m.index === index)!, assigned: true });
+					}
 				} else {
-					this._hunks = hunks;
+					const combinedDiff = await calculateCombinedDiffBetweenCommits(
+						this._currentRepository!,
+						baseSha,
+						headSha,
+					);
+
+					const combinedHunks = createHunksFromDiffs(combinedDiff!.contents);
+					for (const hunk of combinedHunks) {
+						const { author, coAuthors } = getAuthorAndCoAuthorsForCombinedDiffHunk(this._hunks, hunk);
+						hunk.author = author;
+						hunk.coAuthors = coAuthors.length ? coAuthors : undefined;
+						hunks.push({ ...hunk, assigned: true });
+					}
+
+					// Update the hunks. Note that if params.commitsToReplace is defined, then we need to remove all the hunks with indices that match the hunkIndices of the commits to replace, then add in the new hunks and
+					// reinder all of the hunks. Otherwise, we just replace the existing hunks with the new ones
+					if (params.commitsToReplace) {
+						const hunkIndicesToRemove = new Set(
+							params.commitsToReplace.commits.flatMap(c => c.hunkIndices),
+						);
+						this._hunks = this._hunks.filter(h => !hunkIndicesToRemove.has(h.index));
+						// Reindex the hunks
+						let newIndexCounter = 1;
+						this._hunks.forEach(hunk => {
+							hunk.index = newIndexCounter++;
+						});
+						hunks.forEach(hunk => {
+							hunk.index = newIndexCounter++;
+						});
+						this._hunks.push(...hunks);
+					} else {
+						this._hunks = hunks;
+					}
 				}
 			} else {
 				// Working directory mode: use existing hunks