Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { disposableTimeout, raceTimeout } from '../../../../../base/common/async.js';
import { CancellationToken } from '../../../../../base/common/cancellation.js';
import { Codicon } from '../../../../../base/common/codicons.js';
import { structuralEquals } from '../../../../../base/common/equals.js';
import { arrayEquals, structuralEquals } from '../../../../../base/common/equals.js';
import { Emitter, Event } from '../../../../../base/common/event.js';
import { IMarkdownString, MarkdownString } from '../../../../../base/common/htmlContent.js';
import { Disposable, DisposableMap, DisposableStore, IDisposable, IReference, MutableDisposable } from '../../../../../base/common/lifecycle.js';
Expand Down Expand Up @@ -581,6 +581,26 @@ function modeEquals(
return a.id === b.id && a.kind === b.kind;
}

function customizationsChanged(previous: SessionState, state: SessionState): boolean {
if (previous.customizations !== state.customizations) {
return true;
}
const previousActiveCustomizations = previous.activeClient?.customizations;
const currentActiveCustomizations = state.activeClient?.customizations;
if (previousActiveCustomizations === currentActiveCustomizations) {
return false;
}
if (!previousActiveCustomizations || !currentActiveCustomizations) {
return true;
}
return arrayEquals(previousActiveCustomizations, currentActiveCustomizations, (a, b) => {
if (a.nonce !== undefined && a.nonce === b.nonce) {
return true;
}
return a === b;
});
Comment on lines +596 to +601
}

// ============================================================================
// NewSession — bundles the in-flight new-session state
// ============================================================================
Expand Down Expand Up @@ -2197,7 +2217,7 @@ export abstract class BaseAgentHostSessionsProvider extends Disposable implement
// `SessionState` updates fire for every turn-status / activity / meta
// change too — firing on all of them caused excessive picker
// recomputes (and a feedback loop with `setAgent`).
if (previous?.customizations !== state.customizations || previous?.activeClient?.customizations !== state.activeClient?.customizations) {
if (!previous || customizationsChanged(previous, state)) {
this._onDidChangeCustomAgents.fire();
this._onDidChangeCustomizations.fire();
}
Expand All @@ -2216,7 +2236,7 @@ export abstract class BaseAgentHostSessionsProvider extends Disposable implement
private _handleNewSessionStateUpdate(sessionId: string, state: SessionState): void {
const previous = this._lastSessionStates.get(sessionId);
this._lastSessionStates.set(sessionId, state);
if (previous?.customizations !== state.customizations || previous?.activeClient?.customizations !== state.activeClient?.customizations) {
if (!previous || customizationsChanged(previous, state)) {
this._onDidChangeCustomAgents.fire();
this._onDidChangeCustomizations.fire();
}
Expand Down
Loading