Merge remote-tracking branch 'origin/main' into roblou/official-hare

roblourens · roblourens · commit 64d2660678e1 · 2025-10-25T10:25:30.000-07:00
diff --git a/package.json b/package.json
@@ -1702,6 +1702,10 @@
 				"when": "true",
 				"contents": "%github.copilot.viewsWelcome.codexPlaceholder%"
 			},
+			{
+				"view": "workbench.view.chat.sessions.openai-codex",
+				"contents": "%github.copilot.viewsWelcome.codexWelcomeView%"
+			},
 			{
 				"view": "copilot-agents-placeholder",
 				"when": "true",
@@ -3960,7 +3964,7 @@
 				{
 					"id": "codex-placeholder",
 					"name": "OpenAI Codex",
-					"when": "github.copilot.chat.codex.notInstalled && config.chat.experimental.codex.enabled",
+					"when": "github.copilot.chat.codex.showPlaceholder && config.chat.experimental.codex.enabled",
 					"icon": "$(file)"
 				},
 				{
diff --git a/package.nls.json b/package.nls.json
@@ -78,13 +78,20 @@
 		]
 	},
 	"github.copilot.viewsWelcome.codexPlaceholder": {
-		"message": "[Start a coding session](command:github.copilot.chat.installAgent?%7B%22agent%22%3A%22codex%22%7D)\n\nThis will install [the OpenAI Codex extension](command:workbench.extensions.action.showExtensionsWithIds?%5B%5B%22openai.chatgpt%22%5D%5D).",
+		"message": "[Start OpenAI Codex Session](command:github.copilot.chat.installAgent?%7B%22agent%22%3A%22codex%22%7D)\n\nThis will install [the OpenAI Codex extension](command:workbench.extensions.action.showExtensionsWithIds?%5B%5B%22openai.chatgpt%22%5D%5D).",
 		"comment": [
 			"{Locked='['}",
 			"{Locked='](command:github.copilot.chat.installAgent?%7B%22agent%22%3A%22codex%22%7D)'}",
 			"{Locked='](command:workbench.extensions.action.showExtensionsWithIds?%5B%5B%22openai.chatgpt%22%5D%5D)'}"
 		]
 	},
+	"github.copilot.viewsWelcome.codexWelcomeView": {
+		"message": "[Start OpenAI Codex Session](command:chatgpt.newCodexPanel)",
+		"comment": [
+			"{Locked='['}",
+			"{Locked='](command:chatgpt.newCodexPanel)'}"
+		]
+	},
 	"github.copilot.viewsWelcome.agentsPlaceholder": {
 		"message": "Sign in to access GitHub Copilot CLI and Cloud Agents.\n\n[Sign in](command:workbench.action.chat.triggerSetupForceSignIn)",
 		"comment": [
diff --git a/src/extension/chatSessions/vscode-node/copilotCloudSessionContentBuilder.ts b/src/extension/chatSessions/vscode-node/copilotCloudSessionContentBuilder.ts
@@ -159,7 +159,7 @@ export class ChatSessionContentBuilder {
 	private async createResponseTurn(pullRequest: PullRequestSearchItem, logs: string, session: SessionInfo): Promise<ChatResponseTurn2 | undefined> {
 		if (logs.trim().length > 0) {
 			return await this.parseSessionLogsIntoResponseTurn(pullRequest, logs, session);
-		} else if (session.state === 'in_progress') {
+		} else if (session.state === 'in_progress' || session.state === 'queued') {
 			// For in-progress sessions without logs, create a placeholder response
 			const placeholderParts = [new ChatResponseProgressPart('Session is initializing...')];
 			const responseResult: ChatResult = {};
diff --git a/src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts b/src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts
@@ -330,19 +330,20 @@ export class CopilotChatSessionsProvider extends Disposable implements vscode.Ch
 		pr: PullRequestSearchItem
 	): ((stream: vscode.ChatResponseStream, token: vscode.CancellationToken) => Thenable<void>) | undefined {
 		// Only the latest in-progress session gets activeResponseCallback
-		const inProgressSession = sessions
+		const pendingSession = sessions
 			.slice()
 			.sort((a, b) => new Date(b.created_at).getTime() - new Date(a.created_at).getTime())
-			.find(session => session.state === 'in_progress');
+			.find(session => session.state === 'in_progress' || session.state === 'queued');
 
-		if (inProgressSession) {
-			return this.createActiveResponseCallback(pr, inProgressSession.id);
+		if (pendingSession) {
+			return this.createActiveResponseCallback(pr, pendingSession.id);
 		}
 		return undefined;
 	}
 
 	private createActiveResponseCallback(pr: PullRequestSearchItem, sessionId: string): (stream: vscode.ChatResponseStream, token: vscode.CancellationToken) => Thenable<void> {
 		return async (stream: vscode.ChatResponseStream, token: vscode.CancellationToken) => {
+			await this.waitForQueuedToInProgress(sessionId, token);
 			return this.streamSessionLogs(stream, pr, sessionId, token);
 		};
 	}
@@ -841,6 +842,10 @@ export class CopilotChatSessionsProvider extends Disposable implements vscode.Ch
 		} while (waitForQueuedCount <= waitForQueuedMaxRetries && (!token || !token.isCancellationRequested));
 
 		if (!sessionInfo || sessionInfo.state !== 'queued') {
+			if (sessionInfo?.state === 'in_progress') {
+				this.logService.trace('Session already in progress');
+				return sessionInfo;
+			}
 			// Failure
 			this.logService.trace('Failed to find queued session');
 			return;
@@ -859,6 +864,7 @@ export class CopilotChatSessionsProvider extends Disposable implements vscode.Ch
 			}
 			await new Promise(resolve => setTimeout(resolve, pollInterval));
 		}
+		this.logService.error(`Timed out waiting for session ${sessionId} to transition from queued to in_progress.`);
 	}
 
 	private async waitForNewSession(
@@ -1117,9 +1123,6 @@ export class CopilotChatSessionsProvider extends Disposable implements vscode.Ch
 
 			const webviewUri = await toOpenPullRequestWebviewUri({ owner: pullRequest.repository.owner.login, repo: pullRequest.repository.name, pullRequestNumber: number });
 			const prLlmString = `The remote agent has begun work and has created a pull request. Details about the pull request are being shown to the user. If the user wants to track progress or iterate on the agent's work, they should use the pull request.`;
-
-			chatStream?.progress(vscode.l10n.t('Attaching to session'));
-			await this.waitForQueuedToInProgress(response.session_id, token);
 			return {
 				state: 'success',
 				number,
diff --git a/src/extension/contextKeys/vscode-node/placeholderView.contribution.ts b/src/extension/contextKeys/vscode-node/placeholderView.contribution.ts
@@ -4,26 +4,38 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
+import { IAuthenticationService } from '../../../platform/authentication/common/authentication';
 import { IRunCommandExecutionService } from '../../../platform/commands/common/runCommandExecutionService';
+import { IConfigurationService } from '../../../platform/configuration/common/configurationService';
 import { IEnvService } from '../../../platform/env/common/envService';
+import { Event } from '../../../util/vs/base/common/event';
 import { Disposable } from '../../../util/vs/base/common/lifecycle';
 
-const CodexPlaceholderKey = 'github.copilot.chat.codex.notInstalled';
+const ShowCodexPlaceholderKey = 'github.copilot.chat.codex.showPlaceholder';
 
 export class PlaceholderViewContribution extends Disposable {
 	constructor(
 		@IRunCommandExecutionService private readonly _commandService: IRunCommandExecutionService,
 		@IEnvService private readonly envService: IEnvService,
+		@IAuthenticationService authenticationService: IAuthenticationService,
+		@IConfigurationService configurationService: IConfigurationService
 	) {
 		super();
 
+		let curShouldShowPlaceholder: boolean | undefined = undefined;
 		const updateContextKey = () => {
+			const token = authenticationService.copilotToken;
+			const enabledForUser = token && (token.codexAgentEnabled || configurationService.getNonExtensionConfig('chat.experimental.codex.enabled'));
 			const codexExtension = vscode.extensions.getExtension('openai.chatgpt');
-			void vscode.commands.executeCommand('setContext', CodexPlaceholderKey, !codexExtension);
+			const shouldShowPlaceholder = enabledForUser && !codexExtension;
+			if (curShouldShowPlaceholder !== shouldShowPlaceholder) {
+				curShouldShowPlaceholder = shouldShowPlaceholder;
+				void vscode.commands.executeCommand('setContext', ShowCodexPlaceholderKey, shouldShowPlaceholder);
+			}
 		};
 
-		updateContextKey();
 		this._register(vscode.extensions.onDidChange(updateContextKey));
+		this._register(Event.runAndSubscribe(authenticationService.onDidAuthenticationChange, updateContextKey));
 
 		this._register(vscode.commands.registerCommand('github.copilot.chat.installAgent', this.installAgentCommand, this));
 	}
diff --git a/src/extension/externalAgents/node/oaiLanguageModelServer.ts b/src/extension/externalAgents/node/oaiLanguageModelServer.ts
@@ -167,7 +167,7 @@ export class OpenAILanguageModelServer extends Disposable {
 				res,
 				endpointRequestBody,
 				headers,
-				'vscode_codex'
+				'codex_vscode'
 			);
 
 			await streamingEndpoint.makeChatRequest2({
diff --git a/src/extension/tools/node/findFilesTool.tsx b/src/extension/tools/node/findFilesTool.tsx
@@ -9,6 +9,7 @@ import { IPromptPathRepresentationService } from '../../../platform/prompts/comm
 import { URI } from '../../../util/vs/base/common/uri';
 
 import * as l10n from '@vscode/l10n';
+import { IEndpointProvider } from '../../../platform/endpoint/common/endpointProvider';
 import { ISearchService } from '../../../platform/search/common/searchService';
 import { IWorkspaceService } from '../../../platform/workspace/common/workspaceService';
 import { raceTimeoutAndCancellationError } from '../../../util/common/racePromise';
@@ -33,13 +34,16 @@ export class FindFilesTool implements ICopilotTool<IFindFilesToolParams> {
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@ISearchService private readonly searchService: ISearchService,
 		@IWorkspaceService private readonly workspaceService: IWorkspaceService,
+		@IEndpointProvider private readonly endpointProvider: IEndpointProvider,
 	) { }
 
 	async invoke(options: vscode.LanguageModelToolInvocationOptions<IFindFilesToolParams>, token: CancellationToken) {
 		checkCancellation(token);
+		const endpoint = options.model && (await this.endpointProvider.getChatEndpoint(options.model));
+		const modelFamily = endpoint?.family;
 
 		// The input _should_ be a pattern matching inside a workspace, folder, but sometimes we get absolute paths, so try to resolve them
-		const pattern = inputGlobToPattern(options.input.query, this.workspaceService);
+		const pattern = inputGlobToPattern(options.input.query, this.workspaceService, modelFamily);
 
 		// try find text with a timeout of 20s
 		const timeoutInMs = 20_000;
diff --git a/src/extension/tools/node/findTextInFilesTool.tsx b/src/extension/tools/node/findTextInFilesTool.tsx
@@ -7,6 +7,7 @@ import * as l10n from '@vscode/l10n';
 import { BasePromptElementProps, PromptElement, PromptElementProps, PromptPiece, PromptReference, PromptSizing, TextChunk } from '@vscode/prompt-tsx';
 import type * as vscode from 'vscode';
 import { OffsetLineColumnConverter } from '../../../platform/editing/common/offsetLineColumnConverter';
+import { IEndpointProvider } from '../../../platform/endpoint/common/endpointProvider';
 import { IPromptPathRepresentationService } from '../../../platform/prompts/common/promptPathRepresentationService';
 import { ISearchService } from '../../../platform/search/common/searchService';
 import { IWorkspaceService } from '../../../platform/workspace/common/workspaceService';
@@ -41,11 +42,15 @@ export class FindTextInFilesTool implements ICopilotTool<IFindTextInFilesToolPar
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@ISearchService private readonly searchService: ISearchService,
 		@IWorkspaceService private readonly workspaceService: IWorkspaceService,
+		@IEndpointProvider private readonly endpointProvider: IEndpointProvider,
 	) { }
 
 	async invoke(options: vscode.LanguageModelToolInvocationOptions<IFindTextInFilesToolParams>, token: CancellationToken) {
+		const endpoint = options.model && (await this.endpointProvider.getChatEndpoint(options.model));
+		const modelFamily = endpoint?.family;
+
 		// The input _should_ be a pattern matching inside a workspace, folder, but sometimes we get absolute paths, so try to resolve them
-		const patterns = options.input.includePattern ? inputGlobToPattern(options.input.includePattern, this.workspaceService) : undefined;
+		const patterns = options.input.includePattern ? inputGlobToPattern(options.input.includePattern, this.workspaceService, modelFamily) : undefined;
 
 		checkCancellation(token);
 		const askedForTooManyResults = options.input.maxResults && options.input.maxResults > MaxResultsCap;
diff --git a/src/extension/tools/node/test/findFiles.spec.tsx b/src/extension/tools/node/test/findFiles.spec.tsx
@@ -5,6 +5,7 @@
 
 import { afterEach, beforeEach, expect, suite, test } from 'vitest';
 import type * as vscode from 'vscode';
+import { IEndpointProvider } from '../../../../platform/endpoint/common/endpointProvider';
 import { RelativePattern } from '../../../../platform/filesystem/common/fileTypes';
 import { AbstractSearchService, ISearchService } from '../../../../platform/search/common/searchService';
 import { ITestingServicesAccessor, TestingServiceCollection } from '../../../../platform/test/node/services';
@@ -18,6 +19,7 @@ import { IInstantiationService } from '../../../../util/vs/platform/instantiatio
 import { createExtensionUnitTestingServices } from '../../../test/node/services';
 import { CopilotToolMode } from '../../common/toolsRegistry';
 import { FindFilesTool, IFindFilesToolParams } from '../findFilesTool';
+import { createMockEndpointProvider, mockLanguageModelChat } from './searchToolTestUtils';
 
 suite('FindFiles', () => {
 	let accessor: ITestingServicesAccessor;
@@ -34,38 +36,78 @@ suite('FindFiles', () => {
 		accessor.dispose();
 	});
 
-	function setup(expected: vscode.GlobPattern) {
+	function setup(expected: vscode.GlobPattern, includeExtraPattern = true, modelFamily?: string) {
+		if (modelFamily) {
+			collection.define(IEndpointProvider, createMockEndpointProvider(modelFamily));
+		}
+
 		const patterns: vscode.GlobPattern[] = [expected];
-		if (typeof expected === 'string' && !expected.endsWith('/**')) {
-			patterns.push(expected + '/**');
-		} else if (typeof expected !== 'string' && !expected.pattern.endsWith('/**')) {
-			patterns.push(new RelativePattern(expected.baseUri, expected.pattern + '/**'));
+		if (includeExtraPattern) {
+			if (typeof expected === 'string' && !expected.endsWith('/**')) {
+				patterns.push(expected + '/**');
+			} else if (typeof expected !== 'string' && !expected.pattern.endsWith('/**')) {
+				patterns.push(new RelativePattern(expected.baseUri, expected.pattern + '/**'));
+			}
 		}
 		collection.define(ISearchService, new TestSearchService(patterns));
 		accessor = collection.createTestingAccessor();
 	}
 
 	test('passes through simple query', async () => {
-		setup('test/**/*.ts');
+		setup('test/**/*.ts', false);
 
 		const tool = accessor.get(IInstantiationService).createInstance(FindFilesTool);
 		await tool.invoke({ input: { query: 'test/**/*.ts' }, toolInvocationToken: null!, }, CancellationToken.None);
 	});
 
 	test('handles absolute path with glob', async () => {
-		setup(new RelativePattern(URI.file(workspaceFolder), 'test/**/*.ts'));
+		setup(new RelativePattern(URI.file(workspaceFolder), 'test/**/*.ts'), false);
 
 		const tool = accessor.get(IInstantiationService).createInstance(FindFilesTool);
 		await tool.invoke({ input: { query: `${workspaceFolder}/test/**/*.ts` }, toolInvocationToken: null!, }, CancellationToken.None);
 	});
 
 	test('handles absolute path to folder', async () => {
-		setup(new RelativePattern(URI.file(workspaceFolder), ''));
+		setup(new RelativePattern(URI.file(workspaceFolder), ''), false);
 
 		const tool = accessor.get(IInstantiationService).createInstance(FindFilesTool);
 		await tool.invoke({ input: { query: workspaceFolder }, toolInvocationToken: null!, }, CancellationToken.None);
 	});
 
+	suite('gpt-4.1 model glob pattern', () => {
+		test('adds extra pattern for gpt-4.1 model with simple query', async () => {
+			setup('src', true, 'gpt-4.1');
+
+			const tool = accessor.get(IInstantiationService).createInstance(FindFilesTool);
+			const result = await tool.invoke({ input: { query: 'src' }, toolInvocationToken: null!, model: mockLanguageModelChat }, CancellationToken.None);
+			expect(result).toBeDefined();
+		});
+
+		test('adds extra pattern for gpt-4.1 with string query ending in /**', async () => {
+			setup('src/**', true, 'gpt-4.1');
+
+			const tool = accessor.get(IInstantiationService).createInstance(FindFilesTool);
+			const result = await tool.invoke({ input: { query: 'src/**' }, toolInvocationToken: null!, model: mockLanguageModelChat }, CancellationToken.None);
+			expect(result).toBeDefined();
+		});
+
+		test('adds extra pattern for gpt-4.1 with RelativePattern', async () => {
+			setup(new RelativePattern(URI.file(workspaceFolder), 'src'), true, 'gpt-4.1');
+
+			const tool = accessor.get(IInstantiationService).createInstance(FindFilesTool);
+			const result = await tool.invoke({ input: { query: `${workspaceFolder}/src` }, toolInvocationToken: null!, model: mockLanguageModelChat }, CancellationToken.None);
+			expect(result).toBeDefined();
+		});
+
+		test('does not duplicate extra pattern when RelativePattern already ends with /**', async () => {
+			setup(new RelativePattern(URI.file(workspaceFolder), 'src/**'), true, 'gpt-4.1');
+
+			const tool = accessor.get(IInstantiationService).createInstance(FindFilesTool);
+			const result = await tool.invoke({ input: { query: `${workspaceFolder}/src/**` }, toolInvocationToken: null!, model: mockLanguageModelChat }, CancellationToken.None);
+			expect(result).toBeDefined();
+		});
+	});
+
 	suite('resolveInput', () => {
 		beforeEach(() => {
 			setup('hello');
diff --git a/src/extension/tools/node/test/findTextInFilesTool.spec.tsx b/src/extension/tools/node/test/findTextInFilesTool.spec.tsx
diff --git a/src/extension/tools/node/test/searchToolTestUtils.ts b/src/extension/tools/node/test/searchToolTestUtils.ts
diff --git a/src/extension/tools/node/toolUtils.ts b/src/extension/tools/node/toolUtils.ts

Original file line number	Diff line number	Diff line change
`@@ -1702,6 +1702,10 @@`
`1702`	`1702`	`"when": "true",`
`1703`	`1703`	`"contents": "%github.copilot.viewsWelcome.codexPlaceholder%"`
`1704`	`1704`	`},`
	`1705`	`+ {`
	`1706`	`+ "view": "workbench.view.chat.sessions.openai-codex",`
	`1707`	`+ "contents": "%github.copilot.viewsWelcome.codexWelcomeView%"`
	`1708`	`+ },`
`1705`	`1709`	`{`
`1706`	`1710`	`"view": "copilot-agents-placeholder",`
`1707`	`1711`	`"when": "true",`
`@@ -3960,7 +3964,7 @@`
`3960`	`3964`	`{`
`3961`	`3965`	`"id": "codex-placeholder",`
`3962`	`3966`	`"name": "OpenAI Codex",`
`3963`		`- "when": "github.copilot.chat.codex.notInstalled && config.chat.experimental.codex.enabled",`
	`3967`	`+ "when": "github.copilot.chat.codex.showPlaceholder && config.chat.experimental.codex.enabled",`
`3964`	`3968`	`"icon": "$(file)"`
`3965`	`3969`	`},`
`3966`	`3970`	`{`