Skip to content

agentHost: pass telemetry flag to runtime #341661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Vijay Upadya (vijayupadya) merged 7 commits into from
Oct 15, 2026
Merged

agentHost: pass telemetry flag to runtime #341661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d4d6ecf
agentHost: pass enableSessionTelemetry: false to Copilot runtime when…
vijayupadya Oct 15, 2026
d551c38
feedback updates
vijayupadya Oct 15, 2026
c769c51
test updates
vijayupadya Oct 15, 2026
1b495f3
few updates
vijayupadya Oct 15, 2026
8d7e3a8
Merge main and fix policy-session telemetry tests (#341661)
vijayupadya Oct 15, 2026
7bbf5f5
Fix MCP Start after telemetry session teardown (#341661)
vijayupadya Oct 15, 2026
ca0f6fa
Merge main into telemetry settings fix (#341661)
vijayupadya Oct 15, 2026
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
9 changes: 9 additions & 0 deletions src/vs/platform/agentHost/node/agentHostTelemetryService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import { hostname, release } from 'os';
import { Disposable, isDisposable, toDisposable, type DisposableStore, type IDisposable } from '../../../base/common/lifecycle.js';
import { Emitter, type Event } from '../../../base/common/event.js';
import { joinPath } from '../../../base/common/resources.js';
import { URI } from '../../../base/common/uri.js';
import { getDevDeviceId, getMachineId, getSqmMachineId } from '../../../base/node/id.js';
Expand Down Expand Up @@ -40,6 +41,7 @@ export interface IAgentHostTelemetryServiceOptions {
}

export interface IAgentHostTelemetryService extends ITelemetryService, IAgentHostRestrictedTelemetry {
readonly onDidChangeTelemetryLevel: Event<TelemetryLevel>;
updateTelemetryLevel(telemetryLevel: TelemetryLevel): void;
/** Register an account reader with provider-owned lifetime, never process-wide account properties. */
registerCopilotTelemetryProvider(provider: string, getContext: () => IAgentTelemetryContext): IDisposable;
Expand All @@ -51,6 +53,8 @@ export class AgentHostTelemetryService extends Disposable implements IAgentHostT
declare readonly _serviceBrand: undefined;

private _telemetryLevel: TelemetryLevel;
private readonly _onDidChangeTelemetryLevel = this._register(new Emitter<TelemetryLevel>());
readonly onDidChangeTelemetryLevel: Event<TelemetryLevel> = this._onDidChangeTelemetryLevel.event;

/**
* Whether `/copilot_internal/user` enables enhanced/restricted telemetry. Defaults to `false`
Expand Down Expand Up @@ -229,7 +233,12 @@ export class AgentHostTelemetryService extends Disposable implements IAgentHostT
}

updateTelemetryLevel(telemetryLevel: TelemetryLevel): void {
const previous = this.telemetryLevel;
this._telemetryLevel = Math.min(this._telemetryLevel, telemetryLevel);
const next = this.telemetryLevel;
if (next !== previous) {
this._onDidChangeTelemetryLevel.fire(next);
}
}
}

Expand Down
122 changes: 112 additions & 10 deletions src/vs/platform/agentHost/node/copilot/copilotAgent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ import { parsedPluginsEqual, toChildCustomizations } from './copilotPluginConver
import { CopilotGitHubTelemetryForwarder, type ICopilotModelCallCorrelationTelemetry } from './copilotGitHubTelemetryForwarder.js';
import { CopilotGitHubCredentials, CopilotGitHubSessionCredentials } from './copilotGitHubCredentials.js';
import { CopilotSecondaryAssignmentContext } from './copilotSecondaryAssignmentContext.js';
import { AGENT_HOST_COPILOT_CLIENT_NAME, CopilotSessionLauncher, AutoTierConfigKey, ContextSizeConfigKey, ThinkingLevelConfigKey, getCopilotContextTier, getLocalModelSelectionId, isCopilotReasoningEffort, resolveCopilotAutoTier, resolveCopilotReasoningEffort, type CopilotSessionLaunchPlan, type IActiveClientSnapshot } from './copilotSessionLauncher.js';
import { AGENT_HOST_COPILOT_CLIENT_NAME, CopilotSessionLauncher, AutoTierConfigKey, ContextSizeConfigKey, ThinkingLevelConfigKey, getCopilotContextTier, getLocalModelSelectionId, isCopilotReasoningEffort, isCopilotSessionTelemetryEnabled, resolveCopilotAutoTier, resolveCopilotReasoningEffort, type CopilotSessionLaunchPlan, type IActiveClientSnapshot } from './copilotSessionLauncher.js';
import { createLocalModelRowMeta } from '../../common/meta/localModelStatus.js';
import { errorCodeForLog } from '../../common/logRedaction.js';
import { withSessionInitiator } from '../../common/meta/agentSessionInitiatorMeta.js';
Expand Down Expand Up @@ -1086,26 +1086,42 @@ export class CopilotAgent extends Disposable implements IAgent {
this._register(this._githubCredentials.onDidRequestRefresh(() => this._handleCopilotSessionAuthRequired(false)));
if (isAgentHostTelemetryService(this._telemetryService)) {
this._register(this._telemetryService.registerCopilotTelemetryProvider(this.id, () => this.getTelemetryContext()));
this._register(this._telemetryService.onDidChangeTelemetryLevel(() => {
this._revokeSessionTelemetryIfDisabled().catch(err =>
this._logService.error('[Copilot] Failed to revoke session telemetry', err)
);
}));
}
this._worktree = worktree;
this._configurationService.publishRootTransientValues?.({
[CopilotCliVSCodeAssignmentContextKey]: undefined,
});
this._lastStartupConfig = this._readClientStartupConfig();
this._sessionTelemetryRevoked = !isCopilotSessionTelemetryEnabled(this._configurationService, this._telemetryService);
this._plugins = this._register(this._instantiationService.createInstance(PluginController, () => this._ensureClient()));
this._sessionLauncher = this._instantiationService.createInstance(CopilotSessionLauncher);
this._customizationInstallations = this._register(new CopilotCustomizationInstallations(
() => this._ensureClient(),
session => this._findSessionChat(session)?.sessionId,
async (client, sessionId) => {
const copilotClient = client as CopilotClient;
const session = await this._sessionLauncher.createCustomizationPolicySession(
const createSession = () => this._sessionLauncher.createCustomizationPolicySession(
copilotClient,
sessionId,
getCopilotHomePath(this._environmentService.userHome.fsPath, process.env),
this._getGitHubSessionCredentials(),
this._getGitHubHostUri(),
);
const telemetryEnabledAtStart = isCopilotSessionTelemetryEnabled(this._configurationService, this._telemetryService);
let session = await createSession();
if (telemetryEnabledAtStart && !isCopilotSessionTelemetryEnabled(this._configurationService, this._telemetryService)) {
try {
await session.disconnect();
} catch {
// best-effort teardown before re-creating with telemetry disabled
}
session = await createSession();
}
return {
client,
sessionId: session.sessionId,
Expand Down Expand Up @@ -1180,6 +1196,9 @@ export class CopilotAgent extends Disposable implements IAgent {
this._restartClientIfStartupConfigChanged().catch(err =>
this._logService.error('[Copilot] Failed to apply root config change', err)
);
this._revokeSessionTelemetryIfDisabled().catch(err =>
this._logService.error('[Copilot] Failed to revoke session telemetry', err)
);
Comment thread
vijayupadya marked this conversation as resolved.
Resolved
}));
this._register(this._managedSettingsService.onDidChange(() => {
this._restartClientIfStartupConfigChanged().catch(err =>
Expand Down Expand Up @@ -1248,6 +1267,7 @@ export class CopilotAgent extends Disposable implements IAgent {
}

private _lastStartupConfig: CopilotAgentStartupConfig;
private _sessionTelemetryRevoked: boolean;
private _migrateLegacyEnabledSnapshot: boolean | undefined;

private _isSessionSyncEnabled(): boolean {
Expand Down Expand Up @@ -1650,6 +1670,13 @@ export class CopilotAgent extends Disposable implements IAgent {
for (const session of this._allLiveSessions()) {
void this._scheduleConnectorRefresh(session);
}
if (this._sessionTelemetryRevoked) {
queueMicrotask(() => {
this._disposeIdleTelemetryRevokedSessions().catch(err =>
this._logService.error('[Copilot] Failed to dispose telemetry-revoked session', err)
);
});
}
if (this._pendingClientRestartReasons.size === 0) {
return;
}
Expand All @@ -1660,6 +1687,58 @@ export class CopilotAgent extends Disposable implements IAgent {
});
}

/**
* Revokes session telemetry on existing runtime sessions when the effective
* telemetry level drops below `USAGE`, without waiting for every chat across
* the host to become idle. Idle sessions and the hidden customization policy
* session are torn down immediately so they cannot be reused with telemetry
* enabled; sessions with in-flight work are marked so they tear down as soon
* as their own turn/subagents finish (or before their next turn in
* {@link _refreshSessionConfiguration}).
*/
private async _revokeSessionTelemetryIfDisabled(): Promise<void> {
if (this._sessionTelemetryRevoked || isCopilotSessionTelemetryEnabled(this._configurationService, this._telemetryService)) {
return;
}
this._sessionTelemetryRevoked = true;
for (const session of [...this._allLiveSessions(), ...this._sessionsPendingRegistration]) {
session.markTelemetryRevocationRequiresRestart?.();
}
Comment thread
vijayupadya marked this conversation as resolved.
Resolved
const policyRelease = this._customizationInstallations.releasePolicySession();
await Promise.all([
policyRelease,
this._disposeIdleTelemetryRevokedSessions(),
]);
}

/**
* Tears down a telemetry-revoked session through its chat sequencer once it
* has no active turn or subagent, so disposal never races a concurrently
* queued operation on that chat.
*/
private _scheduleTelemetryRevokedSessionDisposal(session: CopilotAgentSession): Promise<void> {
if (this._shutdownPromise || !session.requiresRestartAfterTelemetryRevocation || session.isDisposed || session.hasActiveTurn || session.hasActiveSubagents) {
return Promise.resolve();
}
return this._queueChat(session.sessionId, session.sessionId, 'disposeTelemetryRevokedSession', async () => {
if (this._shutdownPromise || session.isDisposed || session.hasActiveTurn || session.hasActiveSubagents || this._findSessionBySdkId(session.sessionId) !== session) {
return;
}
const canvasHandoff = session.takeCanvasProjection();
if (canvasHandoff) {
this._canvasHandoffs.set(session.chatChannelUri, canvasHandoff);
}
await this._destroyLiveSession(session, true);
Comment thread
vijayupadya marked this conversation as resolved.
Resolved
}).catch(error => this._logService.warn(`[Copilot:${session.sessionId}] Failed to dispose telemetry-revoked session`, error));
}

private async _disposeIdleTelemetryRevokedSessions(): Promise<void> {
if (this._shutdownPromise) {
return;
}
await Promise.all(this._allLiveSessions().map(session => this._scheduleTelemetryRevokedSessionDisposal(session)));
}

private async _handleClientOperationFailure(error: unknown, operation: CopilotClientOperation, correlation?: ICopilotFailureCorrelation): Promise<ICopilotClosedConnectionRecoveryResult | undefined> {
const failureKind = classifyCopilotClientOperationFailure(error);
if (!failureKind) {
Expand Down Expand Up @@ -2489,12 +2568,16 @@ export class CopilotAgent extends Disposable implements IAgent {
if (token.isCancellationRequested) {
throw new CancellationError();
}
const current = this._findSessionChat(session);
const context = this._resolveMcpRequestChatContext(controlChat.chat);
if (!context) {
throw new Error('Cannot start an MCP server because the session runtime is no longer available.');
}
const current = context.target ?? await this._ensureResolvedChatSession(context);
if (!current) {
throw new Error('Cannot start an MCP server because the session runtime is no longer available.');
}
return this._refreshSessionConfiguration(
this._resolveSendChatContext(controlChat.chat),
context,
current,
undefined,
{ operation: 'startMcpServer', allowRestart: 'whenIdle', token },
Expand Down Expand Up @@ -5775,7 +5858,7 @@ export class CopilotAgent extends Disposable implements IAgent {
: raceCancellationError(activeClient.snapshot(context.chatKey, anchor, selectedAgentUri), waitToken),
]);
const primaryDirectoryChanged = !!storedWorkingDirectory && !isEqual(entry.workingDirectory, storedWorkingDirectory);
const structuralRestartReason = !entry.requiresRestartAfterWorkingDirectoryChange && !entry.requiresRestartAfterModelChange && activeClient && currentSnapshot
const structuralRestartReason = !entry.requiresRestartAfterWorkingDirectoryChange && !entry.requiresRestartAfterModelChange && !entry.requiresRestartAfterTelemetryRevocation && activeClient && currentSnapshot
? await raceCancellationError(activeClient.getRestartReason(entry.appliedSnapshot, context.chatKey, currentSnapshot, anchor), waitToken)
: undefined;
const currentDisabledRootMcpServers = currentSnapshot
Expand All @@ -5788,6 +5871,7 @@ export class CopilotAgent extends Disposable implements IAgent {
const refreshReason = (entry.requiresRestartAfterWorkingDirectoryChange ? 'workingDirectoryChanged' : undefined)
?? (primaryDirectoryChanged ? 'primaryDirectoryChanged' : undefined)
?? (entry.requiresRestartAfterModelChange ? 'hydraFusionModelChanged' : undefined)
?? (entry.requiresRestartAfterTelemetryRevocation ? 'telemetryRevoked' : undefined)
?? (rootsChanged ? 'additionalDirectoriesChanged' : undefined)
?? structuralRestartReason
?? (disabledRootMcpServersChanged ? 'disabledRootMcpServersChanged' : undefined)
Expand All @@ -5808,7 +5892,7 @@ export class CopilotAgent extends Disposable implements IAgent {
throw new CopilotSessionConfigurationBusyError(entry);
}
this._logService.info(`[Copilot:${context.ownerSessionId}] Session configuration changed, refreshing session: operation=${operation}, sdkSessionId=${entry.sessionId}, chat=${context.chatKey}, turnId=${turnId ?? '(none)'}, reason=${refreshReason}, clients=[${activeClient ? [...activeClient.toolSet.clientIds()].join(', ') || '(none)' : '(none)'}]`);
const canvasHandoff = entry.takeCanvasProjection();
const canvasHandoff = entry.takeCanvasProjection() ?? this._canvasHandoffs.get(entry.chatChannelUri);
if (canvasHandoff) {
this._canvasHandoffs.set(entry.chatChannelUri, canvasHandoff);
}
Expand All @@ -5834,9 +5918,10 @@ export class CopilotAgent extends Disposable implements IAgent {

/** Commits handed-over canvases to the replacement the refresh kept, or closes them when there is none. */
private _settleCanvasHandoff(chat: URI, handoff: ICopilotCanvasHandoff, replacement: CopilotAgentSession | undefined): void {
if (this._canvasHandoffs.get(chat) === handoff) {
this._canvasHandoffs.delete(chat);
if (this._canvasHandoffs.get(chat) !== handoff) {
return;
}
this._canvasHandoffs.delete(chat);
if (!replacement?.adoptCanvasHandoff(handoff)) {
this._onDidChatProgress.fire({ kind: 'action', resource: chat, action: { type: ActionType.ChatCanvasesChanged, canvases: undefined } });
}
Expand Down Expand Up @@ -6425,6 +6510,7 @@ export class CopilotAgent extends Disposable implements IAgent {
if (isProvisional) {
this._provisionalSessions.delete(provisionalKey);
}
this._canvasHandoffs.delete(chat);
this._chatBackings.delete(chatKey);
this._chatOwners.delete(chatKey);
this._chatSubagentFormats.delete(chatKey);
Expand Down Expand Up @@ -6715,9 +6801,15 @@ export class CopilotAgent extends Disposable implements IAgent {
if (!lease) {
return undefined;
}
const canvasHandoff = this._canvasHandoffs.get(chat);
let replacement: CopilotAgentSession | undefined;
try {
return await this._retryRestoreAfterClientReplacement(acquireClient => this._resumeChatSessionOnce(context, acquireClient, workingDirectories, stageRecorder));
replacement = await this._retryRestoreAfterClientReplacement(acquireClient => this._resumeChatSessionOnce(context, acquireClient, workingDirectories, stageRecorder));
return replacement;
} finally {
if (canvasHandoff) {
this._settleCanvasHandoff(chat, canvasHandoff, replacement);
}
lease.dispose();
}
});
Expand Down Expand Up @@ -7439,6 +7531,7 @@ export class CopilotAgent extends Disposable implements IAgent {
if (session.hasPendingConnectorRefresh) {
await session.refreshConnectors();
}
await session.revalidateTelemetryBeforeRegistration?.();
if (!this._sessionsPendingRegistration.deleteAndLeak(session)) {
throw new CancellationError();
}
Expand Down Expand Up @@ -7469,7 +7562,16 @@ export class CopilotAgent extends Disposable implements IAgent {
}

private _doResumeSession(sessionId: string, chatChannelUri: URI, workingDirectories?: readonly URI[], stageRecorder?: IAgentProviderSendStageRecorder): Promise<CopilotAgentSession> {
return this._retryRestoreAfterClientReplacement(acquireClient => this._resumeSessionOnce(sessionId, chatChannelUri, acquireClient, workingDirectories, stageRecorder));
const canvasHandoff = this._canvasHandoffs.get(chatChannelUri);
let replacement: CopilotAgentSession | undefined;
return this._retryRestoreAfterClientReplacement(acquireClient => this._resumeSessionOnce(sessionId, chatChannelUri, acquireClient, workingDirectories, stageRecorder)).then(session => {
replacement = session;
return session;
}).finally(() => {
if (canvasHandoff) {
this._settleCanvasHandoff(chatChannelUri, canvasHandoff, replacement);
}
});
}

private async _resumeSessionOnce(sessionId: string, chatChannelUri: URI, acquireClient: () => Promise<CopilotClient>, workingDirectories?: readonly URI[], stageRecorder?: IAgentProviderSendStageRecorder): Promise<CopilotAgentSession> {
Expand Down
Loading
Loading