Merge branch 'main' into agents/configure-remote-agent-plugins

Author: joshspicer

.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/chronicle/common/sessionIndexingPreference.ts

@@ -16,14 +16,6 @@ export type SessionIndexingLevel = 'local' | 'user' | 'repo_and_user';
 
 /**
  * Manages user preferences for session indexing via VS Code settings.
- *
- * Two settings control behavior:
- * - `chat.sessionSearch.localIndex.enabled` (team-internal, ExP) — enables local
- *   SQLite tracking and /chronicle commands
- * - `chat.sessionSearch.cloudSync.enabled` — enables
- *   cloud upload to cloud
- * - `chat.sessionSearch.cloudSync.excludeRepositories` — repo patterns
- *   to exclude from cloud sync
  */
 export class SessionIndexingPreference {
 

extensions/copilot/src/extension/chronicle/common/test/sessionIndexingPreference.spec.ts

@@ -13,7 +13,7 @@ function createMockConfigService(opts: {
 } = {}) {
 	const configs: Record<string, unknown> = {};
 	// Map by fullyQualifiedId
-	configs['github.copilot.chat.advanced.sessionSearch.localIndex.enabled'] = opts.localIndexEnabled ?? false;
+	configs['github.copilot.chat.localIndex.enabled'] = opts.localIndexEnabled ?? false;
 	configs['github.copilot.chat.advanced.sessionSearch.cloudSync.enabled'] = opts.cloudSyncEnabled ?? false;
 	configs['github.copilot.chat.advanced.sessionSearch.cloudSync.excludeRepositories'] = opts.excludeRepositories ?? [];
 

extensions/copilot/src/extension/chronicle/vscode-node/remoteSessionExporter.ts

@@ -120,7 +120,7 @@ export class RemoteSessionExporter extends Disposable implements IExtensionContr
 
 		// Only set up span listener when both local index and cloud sync are enabled.
 		// Uses autorun to react if settings change at runtime.
-		const localEnabled = this._configService.getExperimentBasedConfigObservable(ConfigKey.TeamInternal.SessionSearchLocalIndexEnabled, this._expService);
+		const localEnabled = this._configService.getExperimentBasedConfigObservable(ConfigKey.LocalIndexEnabled, this._expService);
 		const cloudEnabled = this._configService.getConfigObservable(ConfigKey.TeamInternal.SessionSearchCloudSyncEnabled);
 		const spanListenerStore = this._register(new DisposableStore());
 		this._register(autorun(reader => {

extensions/copilot/src/extension/chronicle/vscode-node/sessionStoreTracker.ts

@@ -80,7 +80,7 @@ export class SessionStoreTracker extends Disposable implements IExtensionContrib
 
 		// Only set up span listener and flush timer when the feature is enabled.
 		// Uses autorun to react if the setting changes at runtime.
-		const featureEnabled = this._configService.getExperimentBasedConfigObservable(ConfigKey.TeamInternal.SessionSearchLocalIndexEnabled, this._expService);
+		const featureEnabled = this._configService.getExperimentBasedConfigObservable(ConfigKey.LocalIndexEnabled, this._expService);
 		const spanListenerStore = this._register(new DisposableStore());
 		this._register(autorun(reader => {
 			spanListenerStore.clear();

extensions/copilot/src/extension/contextKeys/vscode-node/contextKeys.contribution.ts

@@ -85,7 +85,7 @@ export class ContextKeysContribution extends Disposable {
 			commands.executeCommand('setContext', debugReportFeedbackContextKey, debugReportFeedback.read(reader));
 		}));
 
-		const sessionSearchEnabled = this._configService.getExperimentBasedConfigObservable(ConfigKey.TeamInternal.SessionSearchLocalIndexEnabled, this._expService);
+		const sessionSearchEnabled = this._configService.getExperimentBasedConfigObservable(ConfigKey.LocalIndexEnabled, this._expService);
 		this._register(autorun(reader => {
 			commands.executeCommand('setContext', sessionSearchEnabledContextKey, sessionSearchEnabled.read(reader));
 		}));

extensions/copilot/src/extension/intents/node/chronicleIntent.ts

@@ -49,7 +49,7 @@ export class ChronicleIntent implements IIntent {
 	readonly id = ChronicleIntent.ID;
 	readonly description = l10n.t('Session history tools and insights (standup, tips, improve)');
 	get locations(): ChatLocation[] {
-		return this._configService.getExperimentBasedConfig(ConfigKey.TeamInternal.SessionSearchLocalIndexEnabled, this._expService) ? [ChatLocation.Panel] : [];
+		return this._configService.getExperimentBasedConfig(ConfigKey.LocalIndexEnabled, this._expService) ? [ChatLocation.Panel] : [];
 	}
 
 	readonly commandInfo: IIntentSlashCommandInfo = {
@@ -86,7 +86,7 @@ export class ChronicleIntent implements IIntent {
 		location: ChatLocation,
 		chatTelemetry: ChatTelemetryBuilder,
 	): Promise<vscode.ChatResult> {
-		if (!this._configService.getExperimentBasedConfig(ConfigKey.TeamInternal.SessionSearchLocalIndexEnabled, this._expService)) {
+		if (!this._configService.getExperimentBasedConfig(ConfigKey.LocalIndexEnabled, this._expService)) {
 			stream.markdown(l10n.t('Session search is not available yet.'));
 			return {};
 		}

extensions/copilot/src/platform/configuration/common/configurationService.ts

@@ -875,8 +875,6 @@ export namespace ConfigKey {
 		export const ResponsesApiWebSocketEnabled = defineTeamInternalSetting<boolean>('chat.advanced.responsesApi.webSocket.enabled', ConfigType.ExperimentBased, false);
 		export const DebugSimulateWebSocketResponse = defineTeamInternalSetting<string>('chat.advanced.debug.simulateWebSocketResponse', ConfigType.Simple, '');
 
-		/** Enable local session search index — tracks sessions locally and enables chronicle commands.*/
-		export const SessionSearchLocalIndexEnabled = defineTeamInternalSetting<boolean>('chat.advanced.sessionSearch.localIndex.enabled', ConfigType.ExperimentBased, false, vBoolean());
 		/** Enable cloud sync of session data to cloud. */
 		export const SessionSearchCloudSyncEnabled = defineTeamInternalSetting<boolean>('chat.advanced.sessionSearch.cloudSync.enabled', ConfigType.Simple, false, vBoolean());
 		/** Repository patterns to exclude from cloud sync (exact owner/repo or glob patterns like my-org/*). */
@@ -1030,6 +1028,9 @@ export namespace ConfigKey {
 	export const CopilotMemoryEnabled = defineSetting<boolean>('chat.copilotMemory.enabled', ConfigType.ExperimentBased, false);
 	export const MemoryToolEnabled = defineSetting<boolean>('chat.tools.memory.enabled', ConfigType.ExperimentBased, true);
 	export const ViewImageToolEnabled = defineSetting<boolean>('chat.tools.viewImage.enabled', ConfigType.ExperimentBased, true);
+
+	/** Enable local session search index — tracks sessions locally and enables chronicle commands.*/
+	export const LocalIndexEnabled = defineSetting<boolean>('chat.localIndex.enabled', ConfigType.ExperimentBased, false);
 }
 
 export function getAllConfigKeys(): string[] {