[pull] main from microsoft:main

.github/workflows/screenshot-test.yml

@@ -138,17 +138,23 @@ jobs:
 
       - name: Diff screenshots against merge base
         id: diff
-        if: github.event_name == 'pull_request' && steps.oidc.outputs.token
+        if: steps.oidc.outputs.token
         run: |
-          # We diff screenshots(checked-out commit) vs screenshots(merge-base of
-          # that commit with the target branch). This isolates the visual effect
-          # of just this PR's divergence from target. Using pull_request.base.sha
-          # would be wrong: it's the target-branch tip at PR creation time and can
-          # be stale, causing unrelated target-branch commits to show up as diffs.
-          TARGET_REF="origin/${{ github.event.pull_request.base.ref }}"
-          git fetch --no-tags --depth=1 origin "${{ github.event.pull_request.base.ref }}"
-          BASE_SHA=$(git merge-base "${{ github.sha }}" "$TARGET_REF")
-          echo "Using base SHA: $BASE_SHA (merge-base of ${{ github.sha }} and $TARGET_REF)"
+          if [ "${{ github.event_name }}" = "pull_request" ]; then
+            # For PRs, diff against the merge-base with the target branch.
+            # This isolates the visual effect of just this PR's divergence
+            # from target. Using pull_request.base.sha would be wrong: it's
+            # the target-branch tip at PR creation time and can be stale,
+            # causing unrelated target-branch commits to show up as diffs.
+            TARGET_REF="origin/${{ github.event.pull_request.base.ref }}"
+            git fetch --no-tags --depth=1 origin "${{ github.event.pull_request.base.ref }}"
+            BASE_SHA=$(git merge-base "${{ github.sha }}" "$TARGET_REF")
+          else
+            # For push events, diff against the parent commit.
+            BASE_SHA=$(git rev-parse "${{ github.sha }}^")
+          fi
+          echo "base_sha=$BASE_SHA" >> "$GITHUB_OUTPUT"
+          echo "Using base SHA: $BASE_SHA (base for ${{ github.sha }})"
           BODY=$(node build/lib/screenshotDiffReport.ts \
             https://hediet-screenshots.azurewebsites.net \
             ${{ github.repository_owner }} \
@@ -172,8 +178,25 @@ jobs:
         env:
           SCREENSHOT_SERVICE_TOKEN: ${{ steps.oidc.outputs.token }}
 
+      - name: Write job summary
+        if: steps.diff.outputs.has_changes == 'true' || steps.blocks-ci.outputs.match == 'false'
+        run: |
+          BODY="${COMMENT_BODY}"
+          if [ -n "$BLOCKS_CI_CONTENT" ]; then
+            if [ -n "$BODY" ]; then BODY+=$'\n\n---\n\n'; fi
+            BODY+="### blocks-ci screenshots changed"$'\n\n'
+            BODY+="Replace the contents of \`test/componentFixtures/blocks-ci-screenshots.md\` with:"$'\n\n'
+            BODY+="<details>"$'\n'"<summary>Updated blocks-ci-screenshots.md</summary>"$'\n\n'
+            BODY+="\`\`\`md"$'\n'"${BLOCKS_CI_CONTENT}"$'\n'"\`\`\`"$'\n\n'
+            BODY+="</details>"
+          fi
+          echo "$BODY" >> "$GITHUB_STEP_SUMMARY"
+        env:
+          COMMENT_BODY: ${{ steps.diff.outputs.body }}
+          BLOCKS_CI_CONTENT: ${{ steps.blocks-ci.outputs.content }}
+
       - name: Post PR comment
-        if: github.event_name == 'pull_request' && (steps.diff.outputs.has_changes == 'true' || steps.blocks-ci.outputs.match == 'false')
+        if: github.event_name == 'pull_request'
         uses: actions/github-script@v9
         with:
           script: |
@@ -190,7 +213,7 @@ jobs:
               body += '</details>';
             }
 
-            body = marker + '\n' + body;
+            const hasContent = body || blocksCiContent;
 
             const { data: comments } = await github.rest.issues.listComments({
               owner: context.repo.owner,
@@ -200,6 +223,27 @@ jobs:
             });
             const existing = comments.find(c => c.body?.startsWith(marker));
 
+            if (!hasContent) {
+              // No changes to report — update existing comment if present, otherwise do nothing
+              if (existing) {
+                const baseSha = (process.env.BASE_SHA || '').slice(0, 8);
+                const currentSha = (process.env.CURRENT_SHA || '').slice(0, 8);
+                let noChangesBody = '~No screenshot changes.~';
+                if (baseSha && currentSha) {
+                  noChangesBody = `**Base:** \`${baseSha}\` **Current:** \`${currentSha}\`\n\n` + noChangesBody;
+                }
+                await github.rest.issues.updateComment({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  comment_id: existing.id,
+                  body: marker + '\n' + noChangesBody,
+                });
+              }
+              return;
+            }
+
+            body = marker + '\n' + body;
+
             if (existing) {
               await github.rest.issues.updateComment({
                 owner: context.repo.owner,
@@ -218,6 +262,8 @@ jobs:
         env:
           COMMENT_BODY: ${{ steps.diff.outputs.body }}
           BLOCKS_CI_CONTENT: ${{ steps.blocks-ci.outputs.content }}
+          BASE_SHA: ${{ steps.diff.outputs.base_sha }}
+          CURRENT_SHA: ${{ github.sha }}
 
       - name: Fail if blocks-ci hashes changed
         if: steps.blocks-ci.outputs.match == 'false'

extensions/copilot/package.json

@@ -4018,6 +4018,15 @@
 						"tags": [
 							"experimental"
 						]
+					},
+					"github.copilot.chat.localIndex.enabled": {
+						"type": "boolean",
+						"default": false,
+						"markdownDescription": "%github.copilot.config.localIndex.enabled%",
+						"tags": [
+							"experimental",
+							"onExp"
+						]
 					}
 				}
 			},

extensions/copilot/package.nls.json

@@ -169,10 +169,11 @@
 	"copilot.agent.description": "Edit files in your workspace in agent mode",
 	"copilot.agent.compact.description": "Free up context by compacting the conversation history. Optionally include extra instructions for compaction.",
 	"copilot.chronicle.description": "Session history tools and insights",
-	"copilot.chronicle.standup.description": "Generate a standup report from recent coding sessions",
-	"copilot.chronicle.tips.description": "Get personalized tips based on your Copilot usage patterns",
+	"copilot.chronicle.standup.description": "Generate a standup report from recent chat sessions",
+	"copilot.chronicle.tips.description": "Get personalized tips based on your chat session 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.localIndex.enabled": "Enable local session tracking. When enabled, session data is tracked 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.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",

extensions/copilot/src/extension/agents/vscode-node/planAgentProvider.ts

@@ -9,6 +9,7 @@ import { AGENT_FILE_EXTENSION } from '../../../platform/customInstructions/commo
 import { IVSCodeExtensionContext } from '../../../platform/extContext/common/extensionContext';
 import { IFileSystemService } from '../../../platform/filesystem/common/fileSystemService';
 import { ILogService } from '../../../platform/log/common/logService';
+import { IExperimentationService } from '../../../platform/telemetry/common/nullExperimentationService';
 import { Disposable } from '../../../util/vs/base/common/lifecycle';
 import { AgentConfig, AgentHandoff, buildAgentMarkdown, DEFAULT_READ_TOOLS } from './agentTypes';
 
@@ -22,10 +23,8 @@ const BASE_PLAN_AGENT_CONFIG: AgentConfig = {
 	argumentHint: 'Outline the goal or problem to research',
 	target: 'vscode',
 	disableModelInvocation: true,
-	agents: ['Explore'],
 	tools: [
 		...DEFAULT_READ_TOOLS,
-		'agent',
 	],
 	handoffs: [], // Handoffs are generated dynamically in buildCustomizedConfig
 	body: '' // Body is generated dynamically in buildCustomizedConfig
@@ -52,6 +51,7 @@ export class PlanAgentProvider extends Disposable implements vscode.ChatCustomAg
 		@IVSCodeExtensionContext private readonly extensionContext: IVSCodeExtensionContext,
 		@IFileSystemService private readonly fileSystemService: IFileSystemService,
 		@ILogService private readonly logService: ILogService,
+		@IExperimentationService private readonly experimentationService: IExperimentationService,
 	) {
 		super();
 
@@ -63,7 +63,9 @@ export class PlanAgentProvider extends Disposable implements vscode.ChatCustomAg
 			if (e.affectsConfiguration(ConfigKey.PlanAgentAdditionalTools.fullyQualifiedId) ||
 				e.affectsConfiguration(ConfigKey.Deprecated.PlanAgentModel.fullyQualifiedId) ||
 				e.affectsConfiguration('chat.planAgent.defaultModel') ||
-				e.affectsConfiguration(ConfigKey.ImplementAgentModel.fullyQualifiedId)) {
+				e.affectsConfiguration(ConfigKey.ImplementAgentModel.fullyQualifiedId) ||
+				e.affectsConfiguration(ConfigKey.ExploreAgentEnabled.fullyQualifiedId) ||
+				e.affectsConfiguration(ConfigKey.Advanced.SearchSubagentToolEnabled.fullyQualifiedId)) {
 				this._onDidChangeCustomAgents.fire();
 			}
 		}));
@@ -103,12 +105,27 @@ export class PlanAgentProvider extends Disposable implements vscode.ChatCustomAg
 		return fileUri;
 	}
 
-	static buildAgentBody(): string {
-		const discoverySection = `## 1. Discovery
+	static buildAgentBody(exploreEnabled: boolean, searchSubagentEnabled: boolean): string {
+		let discoverySection: string;
+		if (exploreEnabled) {
+			discoverySection = `## 1. Discovery
 
 Run the *Explore* subagent to gather context, analogous existing features to use as implementation templates, and potential blockers or ambiguities. When the task spans multiple independent areas (e.g., frontend + backend, different features, separate repos), launch **2-3 *Explore* subagents in parallel** — one per area — to speed up discovery.
 
 Update the plan with your findings.`;
+		} else if (searchSubagentEnabled) {
+			discoverySection = `## 1. Discovery
+
+Use #tool:searchSubagent to gather context, analogous existing features to use as implementation templates, and potential blockers or ambiguities. When the task spans multiple independent areas (e.g., frontend + backend, different features, separate repos), launch **2-3 search subagents in parallel** — one per area — to speed up discovery.
+
+Update the plan with your findings.`;
+		} else {
+			discoverySection = `## 1. Discovery
+
+Search the codebase to gather context, analogous existing features to use as implementation templates, and potential blockers or ambiguities.
+
+Update the plan with your findings.`;
+		}
 
 		return `You are a PLANNING AGENT, pairing with the user to create a detailed, actionable plan.
 
@@ -197,6 +214,8 @@ Rules:
 
 	private buildCustomizedConfig(): AgentConfig {
 		const additionalTools = this.configurationService.getConfig(ConfigKey.PlanAgentAdditionalTools);
+		const isExploreEnabled = this.configurationService.getExperimentBasedConfig(ConfigKey.ExploreAgentEnabled, this.experimentationService);
+		const isSearchSubagentEnabled = this.configurationService.getExperimentBasedConfig(ConfigKey.Advanced.SearchSubagentToolEnabled, this.experimentationService);
 		const coreDefaultModel = this.configurationService.getNonExtensionConfig<string>('chat.planAgent.defaultModel');
 		const modelOverride = coreDefaultModel || this.configurationService.getConfig(ConfigKey.Deprecated.PlanAgentModel);
 
@@ -225,6 +244,11 @@ Rules:
 		// Always include askQuestions tool (now provided by core)
 		toolsToAdd.push('vscode/askQuestions');
 
+		// When explore agent is enabled, include the 'agent' tool to allow sub-agent calls
+		if (isExploreEnabled) {
+			toolsToAdd.push('agent');
+		}
+
 		// Merge additional tools (deduplicated)
 		const tools = toolsToAdd.length > 0
 			? [...new Set([...BASE_PLAN_AGENT_CONFIG.tools, ...toolsToAdd])]
@@ -233,9 +257,11 @@ Rules:
 		// Start with base config
 		return {
 			...BASE_PLAN_AGENT_CONFIG,
+			// When explore agent is enabled, allow the Explore subagent
+			...(isExploreEnabled ? { agents: ['Explore'] } : {}),
 			tools,
 			handoffs: [startImplementationHandoff, openInEditorHandoff, ...(BASE_PLAN_AGENT_CONFIG.handoffs ?? [])],
-			body: PlanAgentProvider.buildAgentBody(),
+			body: PlanAgentProvider.buildAgentBody(isExploreEnabled, isSearchSubagentEnabled),
 			...(modelOverride ? { model: modelOverride } : {}),
 		};
 	}

extensions/copilot/src/extension/agents/vscode-node/test/planAgentProvider.spec.ts

@@ -362,6 +362,70 @@ suite('PlanAgentProvider', () => {
 
 		assert.equal(eventFired, true);
 	});
+
+	test('fires onDidChangeCustomAgents when SearchSubagentToolEnabled setting changes', async () => {
+		const provider = createProvider();
+
+		let eventFired = false;
+		provider.onDidChangeCustomAgents(() => {
+			eventFired = true;
+		});
+
+		await mockConfigurationService.setConfig(ConfigKey.Advanced.SearchSubagentToolEnabled, true);
+
+		assert.equal(eventFired, true);
+	});
+
+	test('buildAgentBody uses Explore discovery when explore is enabled', () => {
+		const body = PlanAgentProvider.buildAgentBody(true, true);
+		assert.ok(body.includes('Run the *Explore* subagent'));
+		assert.ok(!body.includes('#tool:searchSubagent'));
+	});
+
+	test('buildAgentBody uses search subagent discovery when explore is disabled but search is enabled', () => {
+		const body = PlanAgentProvider.buildAgentBody(false, true);
+		assert.ok(body.includes('#tool:searchSubagent'));
+		assert.ok(!body.includes('Run the *Explore* subagent'));
+	});
+
+	test('buildAgentBody uses generic discovery when both explore and search are disabled', () => {
+		const body = PlanAgentProvider.buildAgentBody(false, false);
+		assert.ok(body.includes('Search the codebase to gather context'));
+		assert.ok(!body.includes('Run the *Explore* subagent'));
+		assert.ok(!body.includes('#tool:searchSubagent'));
+	});
+
+	test('excludes agent tool and Explore subagent when explore is disabled', async () => {
+		await mockConfigurationService.setConfig(ConfigKey.ExploreAgentEnabled, false);
+
+		const provider = createProvider();
+		const agents = await provider.provideCustomAgents({}, {} as any);
+		const content = await getAgentContent(agents[0]);
+
+		// Should not have the 'agent' tool
+		const toolsMatch = content.match(/tools: \[([^\]]+)\]/);
+		assert.ok(toolsMatch);
+		assert.ok(!toolsMatch[1].includes('\'agent\''), 'Should not include agent tool when explore is disabled');
+
+		// Should not have agents field
+		assert.ok(!content.includes('agents:'), 'Should not include agents field when explore is disabled');
+	});
+
+	test('includes agent tool and Explore subagent when explore is enabled', async () => {
+		await mockConfigurationService.setConfig(ConfigKey.ExploreAgentEnabled, true);
+
+		const provider = createProvider();
+		const agents = await provider.provideCustomAgents({}, {} as any);
+		const content = await getAgentContent(agents[0]);
+
+		// Should have the 'agent' tool
+		const toolsMatch = content.match(/tools: \[([^\]]+)\]/);
+		assert.ok(toolsMatch);
+		assert.ok(toolsMatch[1].includes('\'agent\''), 'Should include agent tool when explore is enabled');
+
+		// Should have agents field with Explore
+		assert.ok(content.includes('agents:'), 'Should include agents field when explore is enabled');
+	});
 });
 
 suite('buildAgentMarkdown', () => {

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

@@ -143,7 +143,11 @@ export function byokKnownModelToAPIInfo(providerName: string, id: string, capabi
 		version: '1.0.0',
 		maxOutputTokens: capabilities.maxOutputTokens,
 		maxInputTokens: capabilities.maxInputTokens,
-		detail: providerName,
+		// `detail` is intentionally omitted: when this model is resolved
+		// via a configured provider group, `LanguageModelsService` will
+		// fall back to the group name so multiple instances of the same
+		// vendor (e.g. multiple Ollama servers) are distinguishable in
+		// the model picker.
 		family: id,
 		tooltip: `${capabilities.name} is contributed via the ${providerName} provider.`,
 		multiplierNumeric: 0,

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

@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { Attachment, SendOptions } from '@github/copilot/sdk';
+
+export interface ICopilotCLIPendingRequestContext {
+	readonly prompt: string;
+	readonly attachments: Attachment[];
+	readonly source?: SendOptions['source'];
+}
+
+const pendingRequestContextBySessionId = new Map<string, ICopilotCLIPendingRequestContext>();
+
+export function setPendingCopilotCLIRequestContext(sessionId: string, context: ICopilotCLIPendingRequestContext): void {
+	pendingRequestContextBySessionId.set(sessionId, context);
+}
+
+export function takePendingCopilotCLIRequestContext(sessionId: string): ICopilotCLIPendingRequestContext | undefined {
+	const context = pendingRequestContextBySessionId.get(sessionId);
+	if (context) {
+		pendingRequestContextBySessionId.delete(sessionId);
+	}
+	return context;
+}
+
+export function clearPendingCopilotCLIRequestContext(sessionId: string): void {
+	pendingRequestContextBySessionId.delete(sessionId);
+}