Improve Agent Merge status presentation #333839
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| /*--------------------------------------------------------------------------------------------- | ||
| * Copyright (c) Microsoft Corporation. All rights reserved. | ||
| * Licensed under the MIT License. See License.txt in the project root for license information. | ||
| *--------------------------------------------------------------------------------------------*/ | ||
|
|
||
| import { Codicon } from '../../base/common/codicons.js'; | ||
| import { structuralEquals } from '../../base/common/equals.js'; | ||
| import { Event } from '../../base/common/event.js'; | ||
| import { constObservable, derivedOpts, IObservable, observableFromEvent } from '../../base/common/observable.js'; | ||
| import { themeColorFromId, ThemeIcon } from '../../base/common/themables.js'; | ||
| import { AgentMergeConfiguration, AgentMergeSettingId, defaultAgentMergeConfiguration, isAgentMergeMergePullRequest, resolveAgentMergeConfiguration } from '../../platform/agentHost/common/agentMerge.js'; | ||
| import { IConfigurationService } from '../../platform/configuration/common/configuration.js'; | ||
| import { IAgentMergeClientState, isAgentHostProvider } from '../common/agentHostSessionsProvider.js'; | ||
| import { ISessionsProvidersService } from '../services/sessions/browser/sessionsProvidersService.js'; | ||
| import { ISession } from '../services/sessions/common/session.js'; | ||
|
|
||
| const noAgentMergeConfiguration = constObservable<ISessionAgentMergeConfiguration | undefined>(undefined); | ||
| const agentMergeSessionStateBySession = new WeakMap<ISession, IObservable<IAgentMergeClientState | undefined>>(); | ||
| const agentMergeConfigurationBySession = new WeakMap<ISession, IObservable<ISessionAgentMergeConfiguration | undefined>>(); | ||
| const openPullRequestIcon = { ...Codicon.gitPullRequest, color: themeColorFromId('charts.green') }; | ||
|
|
||
| /** Effective Agent Merge state used by client presentation. */ | ||
| export interface ISessionAgentMergeConfiguration { | ||
| readonly enabled: boolean; | ||
| readonly actions: AgentMergeConfiguration; | ||
| } | ||
|
|
||
| /** Returns the Agent Merge state observable for a session. */ | ||
| export function getSessionAgentMergeStateObservable(session: ISession, sessionsProvidersService: ISessionsProvidersService): IObservable<IAgentMergeClientState | undefined> { | ||
| const cached = agentMergeSessionStateBySession.get(session); | ||
| if (cached) { | ||
| return cached; | ||
| } | ||
| const provider = sessionsProvidersService.getProvider(session.providerId); | ||
| if (!provider || !isAgentHostProvider(provider)) { | ||
| return constObservable(undefined); | ||
| } | ||
| const observable = provider.getAgentMergeClientStateObservable(session.sessionId); | ||
| agentMergeSessionStateBySession.set(session, observable); | ||
| return observable; | ||
| } | ||
|
|
||
| /** Returns effective Agent Merge actions for a session. */ | ||
| export function getSessionAgentMergeConfigurationObservable(session: ISession, sessionsProvidersService: ISessionsProvidersService, configurationService: IConfigurationService): IObservable<ISessionAgentMergeConfiguration | undefined> { | ||
| const cached = agentMergeConfigurationBySession.get(session); | ||
| if (cached) { | ||
| return cached; | ||
| } | ||
| const provider = sessionsProvidersService.getProvider(session.providerId); | ||
| if (!provider || !isAgentHostProvider(provider)) { | ||
| return noAgentMergeConfiguration; | ||
| } | ||
| const state = getSessionAgentMergeStateObservable(session, sessionsProvidersService); | ||
| const globalConfiguration = observableFromEvent( | ||
| Event.filter(configurationService.onDidChangeConfiguration, event => Object.values(AgentMergeSettingId).some(settingId => event.affectsConfiguration(settingId))), | ||
| () => getGlobalAgentMergeConfiguration(configurationService)); | ||
| const observable = derivedOpts<ISessionAgentMergeConfiguration>({ | ||
| owner: session, | ||
| equalsFn: structuralEquals, | ||
| }, reader => { | ||
| const sessionState = state.read(reader); | ||
| return { | ||
| enabled: sessionState?.enabled === true, | ||
| actions: resolveAgentMergeConfiguration(globalConfiguration.read(reader), sessionState?.overrides), | ||
| }; | ||
| }); | ||
| agentMergeConfigurationBySession.set(session, observable); | ||
| return observable; | ||
| } | ||
|
|
||
| /** Hides pull-request blockers that an enabled Agent Merge session owns. */ | ||
| export function getAgentMergeAwarePullRequestIcon(icon: ThemeIcon, agentMerge: ISessionAgentMergeConfiguration | undefined, blockers?: { readonly hasFailingChecks?: boolean; readonly hasMergeConflicts?: boolean; readonly hasUnresolvedComments?: boolean }): ThemeIcon { | ||
| if (!agentMerge?.enabled) { | ||
| return icon; | ||
| } | ||
| if (icon.id === Codicon.gitPullRequestComment.id) { | ||
| return agentMerge.actions.addressReviews ? openPullRequestIcon : icon; | ||
|
Collaborator
There was a problem hiding this comment. AI Review: |
||
| } | ||
| if (icon.id === Codicon.gitPullRequestError.id) { | ||
| const hasKnownBlocker = blockers?.hasFailingChecks === true || blockers?.hasMergeConflicts === true || blockers?.hasUnresolvedComments === true; | ||
| if (blockers && !hasKnownBlocker) { | ||
| return icon; | ||
| } | ||
| const handlesBlockers = blockers | ||
| ? (!blockers.hasFailingChecks || agentMerge.actions.fixCI) | ||
|
Collaborator
There was a problem hiding this comment. AI Review: |
||
| && (!blockers.hasMergeConflicts || agentMerge.actions.resolveConflicts) | ||
| && (!blockers.hasUnresolvedComments || agentMerge.actions.addressReviews) | ||
| : agentMerge.actions.fixCI && agentMerge.actions.resolveConflicts && agentMerge.actions.addressReviews; | ||
| return handlesBlockers ? openPullRequestIcon : icon; | ||
| } | ||
| return icon; | ||
| } | ||
|
|
||
| /** Whether the pull-request icon represents blockers Agent Merge can own. */ | ||
| export function isAgentMergePullRequestIcon(icon: ThemeIcon): boolean { | ||
| return icon.id === Codicon.gitPullRequestError.id || icon.id === Codicon.gitPullRequestComment.id; | ||
| } | ||
|
|
||
| /** Reads the effective global Agent Merge configuration. */ | ||
| export function getGlobalAgentMergeConfiguration(configurationService: IConfigurationService): AgentMergeConfiguration { | ||
| const mergePullRequest = configurationService.getValue<unknown>(AgentMergeSettingId.MergePullRequest); | ||
| return { | ||
| addressReviews: configurationService.getValue<boolean>(AgentMergeSettingId.AddressReviews) ?? defaultAgentMergeConfiguration.addressReviews, | ||
| fixCI: configurationService.getValue<boolean>(AgentMergeSettingId.FixCI) ?? defaultAgentMergeConfiguration.fixCI, | ||
| resolveConflicts: configurationService.getValue<boolean>(AgentMergeSettingId.ResolveConflicts) ?? defaultAgentMergeConfiguration.resolveConflicts, | ||
| // Tolerate the retired boolean form until every profile has run its migration. | ||
| mergePullRequest: isAgentMergeMergePullRequest(mergePullRequest) | ||
| ? mergePullRequest | ||
| : typeof mergePullRequest === 'boolean' | ||
| ? (mergePullRequest ? 'always' : 'never') | ||
| : defaultAgentMergeConfiguration.mergePullRequest, | ||
| mergeMethod: configurationService.getValue<AgentMergeConfiguration['mergeMethod']>(AgentMergeSettingId.MergeMethod) ?? defaultAgentMergeConfiguration.mergeMethod, | ||
| replyAttribution: configurationService.getValue<boolean>(AgentMergeSettingId.ReplyAttribution) ?? defaultAgentMergeConfiguration.replyAttribution, | ||
| }; | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
AI Review: Effective enablement should include the global
chat.agentMerge.enabledgate. The controller stops this session's runtime when that gate is false but deliberately preserves the per-session bit, so this remains true and the icon/banner consumers hide blockers while nothing is monitoring them. Please combine the session bit with the global or host operational state and cover global disable/re-enable.