Merge remote-tracking branch 'origin/main' into connor4312/eager-activeclient

Author: connor4312

.github/workflows/no-engineering-system-changes.yml

@@ -30,13 +30,19 @@ jobs:
           #    touches the "distro" or "version" field, OR
           # 2. package.json + package-lock.json are the only changed files and
           #    the package.json diff exclusively touches the "version" field
-          #    (lock file updates are expected from npm install after version bump).
+          #    (lock file updates are expected from npm install after version bump), OR
+          # 3. Same as (2) but also including extensions/copilot/package.json
+          #    and extensions/copilot/package-lock.json, where the copilot
+          #    package.json diff only touches "version" and "vscode" fields.
 
-          ONLY_PKG=$(jq -e '. == ["package.json"]' "$HOME/files.json" > /dev/null 2>&1 && echo true || echo false)
-          PKG_AND_LOCK=$(jq -e '. | sort == ["package-lock.json", "package.json"]' "$HOME/files.json" > /dev/null 2>&1 && echo true || echo false)
+          SORTED_FILES=$(jq -e '. | sort' "$HOME/files.json")
 
-          if [[ "$ONLY_PKG" != "true" && "$PKG_AND_LOCK" != "true" ]]; then
-            echo "Bot modified files beyond package.json (+ package-lock.json) — not allowed"
+          ONLY_PKG=$(echo "$SORTED_FILES" | jq -e '. == ["package.json"]' > /dev/null 2>&1 && echo true || echo false)
+          PKG_AND_LOCK=$(echo "$SORTED_FILES" | jq -e '. == ["package-lock.json", "package.json"]' > /dev/null 2>&1 && echo true || echo false)
+          PKG_LOCK_AND_COPILOT=$(echo "$SORTED_FILES" | jq -e '. == ["extensions/copilot/package-lock.json", "extensions/copilot/package.json", "package-lock.json", "package.json"]' > /dev/null 2>&1 && echo true || echo false)
+
+          if [[ "$ONLY_PKG" != "true" && "$PKG_AND_LOCK" != "true" && "$PKG_LOCK_AND_COPILOT" != "true" ]]; then
+            echo "Bot modified files beyond package.json (+ package-lock.json + extensions/copilot) — not allowed"
             echo "allowed=false" >> $GITHUB_OUTPUT
             exit 0
           fi
@@ -47,7 +53,7 @@ jobs:
             exit 0
           }
 
-          # Extract only the package.json diff section (ignore package-lock.json changes)
+          # Extract only the root package.json diff section (ignore lock file changes)
           PKG_DIFF=$(echo "$DIFF" | awk '/^diff --git a\/package\.json b\/package\.json/{p=1} p && /^diff --git / && !/^diff --git a\/package\.json/{exit} p{print}')
 
           CHANGED_LINES=$(echo "$PKG_DIFF" | grep -E '^[+-]' | grep -vE '^(\+\+\+|---)' | wc -l)
@@ -57,9 +63,25 @@ jobs:
           if [[ "$ONLY_PKG" == "true" && "$CHANGED_LINES" -eq 2 && ("$DISTRO_LINES" -eq 2 || "$VERSION_LINES" -eq 2) ]]; then
             echo "Distro-only or version-only update by bot — allowing"
             echo "allowed=true" >> $GITHUB_OUTPUT
-          elif [[ "$PKG_AND_LOCK" == "true" && "$CHANGED_LINES" -eq 2 && "$VERSION_LINES" -eq 2 ]]; then
-            echo "Version bump with lock file update by bot — allowing"
-            echo "allowed=true" >> $GITHUB_OUTPUT
+          elif [[ ("$PKG_AND_LOCK" == "true" || "$PKG_LOCK_AND_COPILOT" == "true") && "$CHANGED_LINES" -eq 2 && "$VERSION_LINES" -eq 2 ]]; then
+            # Validate extensions/copilot/package.json when present
+            if [[ "$PKG_LOCK_AND_COPILOT" == "true" ]]; then
+              COPILOT_PKG_DIFF=$(echo "$DIFF" | awk '/^diff --git a\/extensions\/copilot\/package\.json b\/extensions\/copilot\/package\.json/{p=1} p && /^diff --git / && !/^diff --git a\/extensions\/copilot\/package\.json/{exit} p{print}')
+              COPILOT_CHANGED=$(echo "$COPILOT_PKG_DIFF" | grep -E '^[+-]' | grep -vE '^(\+\+\+|---)' | wc -l)
+              COPILOT_VERSION=$(echo "$COPILOT_PKG_DIFF" | grep -cE '^[+-][[:space:]]*"version"[[:space:]]*:' || true)
+              COPILOT_VSCODE=$(echo "$COPILOT_PKG_DIFF" | grep -cE '^[+-][[:space:]]*"vscode"[[:space:]]*:' || true)
+
+              if [[ "$COPILOT_CHANGED" -eq 4 && "$COPILOT_VERSION" -eq 2 && "$COPILOT_VSCODE" -eq 2 ]]; then
+                echo "Version bump with lock file and copilot extension update by bot — allowing"
+                echo "allowed=true" >> $GITHUB_OUTPUT
+              else
+                echo "Copilot package.json changed more than version + vscode fields — not allowed"
+                echo "allowed=false" >> $GITHUB_OUTPUT
+              fi
+            else
+              echo "Version bump with lock file update by bot — allowing"
+              echo "allowed=true" >> $GITHUB_OUTPUT
+            fi
           else
             echo "Bot changed more than a single allowed field (distro or version) — not allowed"
             echo "allowed=false" >> $GITHUB_OUTPUT

.vscode/notebooks/endgame.github-issues

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$MILESTONE=milestone:\"1.114.0\"\n\n$TPI_CREATION=2026-03-23 // Used to find fixes that need to be verified"
+    "value": "$MILESTONE=milestone:\"1.117.0\"\n\n$TPI_CREATION=2026-03-23 // Used to find fixes that need to be verified"
   },
   {
     "kind": 1,

.vscode/notebooks/my-endgame.github-issues

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$MILESTONE=milestone:\"1.115.0\"\n\n$MINE=assignee:@me"
+    "value": "$MILESTONE=milestone:\"1.117.0\"\n\n$MINE=assignee:@me"
   },
   {
     "kind": 2,

extensions/copilot/package.json

@@ -3968,6 +3968,15 @@
 			{
 				"id": "advanced",
 				"properties": {
+					"github.copilot.chat.sessionSearch.cloudSync.enabled": {
+						"type": "boolean",
+						"default": false,
+						"markdownDescription": "%github.copilot.config.sessionSearch.cloudSync.enabled%",
+						"tags": [
+							"advanced",
+							"onExp"
+						]
+					},
 					"github.copilot.chat.reasoningEffortOverride": {
 						"type": [
 							"string",

extensions/copilot/package.nls.json

@@ -173,7 +173,7 @@
 	"copilot.chronicle.tips.description": "Get personalized tips based on your Copilot usage patterns",
 	"github.copilot.config.sessionSearch.enabled": "Enable session search and /chronicle commands. This is a team-internal setting.",
 	"github.copilot.config.sessionSearch.localIndex.enabled": "Enable local session tracking. When enabled, Copilot tracks session data locally for /chronicle commands.",
-	"github.copilot.config.sessionSearch.cloudSync.enabled": "Enable cloud sync for session data. When enabled, session data is synced to your Copilot account for cross-device access.",
+	"github.copilot.config.sessionSearch.cloudSync.enabled": "Enable cloud sync for session data. When enabled, chat session data is synced to the cloud for cross-device querying.",
 	"github.copilot.config.sessionSearch.cloudSync.excludeRepositories": "Repository patterns to exclude from cloud sync. Use exact `owner/repo` names or glob patterns like `my-org/*`. Sessions from matching repos will only be stored locally.",
 	"copilot.workspace.explain.description": "Explain how the code in your active editor works",
 	"copilot.workspace.edit.description": "Edit files in your workspace",

extensions/copilot/src/extension/byok/common/byokProvider.ts

@@ -147,6 +147,7 @@ export function byokKnownModelToAPIInfo(providerName: string, id: string, capabi
 		family: id,
 		tooltip: `${capabilities.name} is contributed via the ${providerName} provider.`,
 		multiplierNumeric: 0,
+		isUserSelectable: true,
 		capabilities: {
 			toolCalling: capabilities.toolCalling,
 			imageInput: capabilities.vision

extensions/copilot/src/extension/byok/vscode-node/byokContribution.ts

@@ -8,7 +8,7 @@ import { ICAPIClientService } from '../../../platform/endpoint/common/capiClient
 import { IVSCodeExtensionContext } from '../../../platform/extContext/common/extensionContext';
 import { ILogService } from '../../../platform/log/common/logService';
 import { IFetcherService } from '../../../platform/networking/common/fetcherService';
-import { Disposable } from '../../../util/vs/base/common/lifecycle';
+import { Disposable, DisposableStore } from '../../../util/vs/base/common/lifecycle';
 import { IInstantiationService } from '../../../util/vs/platform/instantiation/common/instantiation';
 import { BYOKKnownModels, isBYOKEnabled } from '../../byok/common/byokProvider';
 import { IExtensionContribution } from '../../common/contributions';
@@ -26,6 +26,7 @@ export class BYOKContrib extends Disposable implements IExtensionContribution {
 	public readonly id: string = 'byok-contribution';
 	private readonly _byokStorageService: IBYOKStorageService;
 	private readonly _providers: Map<string, LanguageModelChatProvider<LanguageModelChatInformation>> = new Map();
+	private readonly _byokRegistrations = this._register(new DisposableStore());
 	private _byokProvidersRegistered = false;
 
 	constructor(
@@ -46,7 +47,17 @@ export class BYOKContrib extends Disposable implements IExtensionContribution {
 	}
 
 	private async _authChange(authService: IAuthenticationService, instantiationService: IInstantiationService) {
-		if (authService.copilotToken && isBYOKEnabled(authService.copilotToken, this._capiClientService) && !this._byokProvidersRegistered) {
+		const byokEnabled = authService.copilotToken && isBYOKEnabled(authService.copilotToken, this._capiClientService);
+
+		if (!byokEnabled && this._byokProvidersRegistered) {
+			this._logService.info('BYOK: Disabling BYOK providers due to account change.');
+			this._byokRegistrations.clear();
+			this._providers.clear();
+			this._byokProvidersRegistered = false;
+			return;
+		}
+
+		if (byokEnabled && !this._byokProvidersRegistered) {
 			this._byokProvidersRegistered = true;
 			// Update known models list from CDN so all providers have the same list
 			const knownModels = await this.fetchKnownModelList(this._fetcherService);
@@ -63,7 +74,7 @@ export class BYOKContrib extends Disposable implements IExtensionContribution {
 			this._providers.set(CustomOAIBYOKModelProvider.providerName.toLowerCase(), instantiationService.createInstance(CustomOAIBYOKModelProvider, this._byokStorageService));
 
 			for (const [providerName, provider] of this._providers) {
-				this._store.add(lm.registerLanguageModelChatProvider(providerName, provider));
+				this._byokRegistrations.add(lm.registerLanguageModelChatProvider(providerName, provider));
 			}
 		}
 	}

extensions/copilot/src/extension/chatSessions/copilotcli/common/copilotCLITools.ts

@@ -1684,6 +1684,15 @@ export class FakeToolsService implements IToolsService {
 			};
 		}
 
+		if (name === 'vscode_reviewPlan') {
+			if (this._confirmationResult === 'no') {
+				return { content: [new LanguageModelTextPart(JSON.stringify({ rejected: true }))] };
+			}
+			const input = options.input as { actions?: Array<{ label: string }> } | undefined;
+			const firstAction = input?.actions?.[0]?.label;
+			return { content: [new LanguageModelTextPart(JSON.stringify({ action: firstAction, rejected: false }))] };
+		}
+
 		return { content: [] };
 	}
 

extensions/copilot/src/extension/chatSessions/copilotcli/node/copilotcliSession.ts

@@ -7,7 +7,6 @@ import type { Attachment, SendOptions, Session, SessionOptions } from '@github/c
 import * as l10n from '@vscode/l10n';
 import type * as vscode from 'vscode';
 import type { ChatParticipantToolToken } from 'vscode';
-import { IRunCommandExecutionService } from '../../../../platform/commands/common/runCommandExecutionService';
 import { ConfigKey, IConfigurationService } from '../../../../platform/configuration/common/configurationService';
 import { ILogService } from '../../../../platform/log/common/logService';
 import { GenAiMetrics } from '../../../../platform/otel/common/genAiMetrics';
@@ -31,7 +30,6 @@ import { IChatSessionMetadataStore } from '../../common/chatSessionMetadataStore
 import { ExternalEditTracker } from '../../common/externalEditTracker';
 import { getWorkingDirectory, isIsolationEnabled, IWorkspaceInfo } from '../../common/workspaceInfo';
 import { enrichToolInvocationWithSubagentMetadata, isCopilotCliEditToolCall, isCopilotCLIToolThatCouldRequirePermissions, isTodoRelatedSqlQuery, processToolExecutionComplete, processToolExecutionStart, ToolCall, updateTodoListFromSqlItems } from '../common/copilotCLITools';
-import { SessionIdForCLI } from '../common/utils';
 import { getCopilotCLISessionDir } from './cliHelpers';
 import type { CopilotCliBridgeSpanProcessor } from './copilotCliBridgeSpanProcessor';
 import { ICopilotCLIImageSupport } from './copilotCLIImageSupport';
@@ -98,12 +96,6 @@ export interface ICopilotCLISession extends IDisposable {
 	addUserMessage(content: string): void;
 	addUserAssistantMessage(content: string): void;
 	getSelectedModelId(): Promise<string | undefined>;
-	/**
-	 * Temporarily sets the session resource.
-	 * Only for non-controller code paths.
-	 * @deprecated
-	 */
-	setSessionResource(resource: vscode.Uri): IDisposable;
 }
 
 export class CopilotCLISession extends DisposableStore implements ICopilotCLISession {
@@ -160,8 +152,6 @@ export class CopilotCLISession extends DisposableStore implements ICopilotCLISes
 	setSdkTraceContextUpdater(updater: ((traceparent?: string, tracestate?: string) => void) | undefined): void {
 		this._updateSdkTraceContext = updater;
 	}
-	private _sessionResource: Uri;
-
 	constructor(
 		private readonly _workspaceInfo: IWorkspaceInfo,
 		private readonly _agentName: string | undefined,
@@ -177,21 +167,13 @@ export class CopilotCLISession extends DisposableStore implements ICopilotCLISes
 		@IUserQuestionHandler private readonly _userQuestionHandler: IUserQuestionHandler,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IOTelService private readonly _otelService: IOTelService,
-		@IRunCommandExecutionService private readonly _commandExecutionService: IRunCommandExecutionService,
 		@IGitService private readonly _gitService: IGitService,
 	) {
 		super();
 		this.sessionId = _sdkSession.sessionId;
 		this.add(toDisposable(() => this._todoSqlQuery.dispose()));
-		this._sessionResource = SessionIdForCLI.getResource(this.sessionId);
 	}
 
-	setSessionResource(resource: vscode.Uri): IDisposable {
-		this._sessionResource = resource;
-		return this.add(toDisposable(() => {
-			this._sessionResource = SessionIdForCLI.getResource(this.sessionId);
-		}));
-	}
 	attachStream(stream: vscode.ChatResponseStream): IDisposable {
 		this._stream = stream;
 		return toDisposable(() => {
@@ -544,20 +526,11 @@ export class CopilotCLISession extends DisposableStore implements ICopilotCLISes
 							this._toolInvocationToken,
 							this.workspaceService,
 							this.logService,
-							this._userQuestionHandler,
+							this._toolsService,
 							token,
 						);
 						flushPendingInvocationMessages();
 
-						// Update the permission picker dropdown based on the selected action
-						if (response.approved && response.selectedAction !== 'exit_only') {
-							const autopilotSelected = response.selectedAction === 'autopilot' || response.selectedAction === 'autopilot_fleet';
-							const commandId = 'workbench.action.chat.copilotcli.approval';
-							this._commandExecutionService.executeCommand(commandId, this._sessionResource, autopilotSelected).catch(error => {
-								this.logService.error(error, '[CopilotCLISession] Failed to update permission picker');
-							});
-						}
-
 						this._sdkSession.respondToExitPlanMode(event.data.requestId, response);
 					} catch (error) {
 						this.logService.error(error, '[CopilotCLISession] Error handling exit plan mode');