Merge branch 'main' into lramos15/pleased-woodpecker

Author: lramos15

chat-lib/test/getInlineCompletions.spec.ts

@@ -16,7 +16,7 @@ import { ResultType } from '../src/_internal/extension/completions-core/vscode-n
 import { createTextDocument } from '../src/_internal/extension/completions-core/vscode-node/lib/src/test/textDocument';
 import { TextDocumentIdentifier } from '../src/_internal/extension/completions-core/vscode-node/lib/src/textDocument';
 import { TextDocumentChangeEvent, TextDocumentCloseEvent, TextDocumentFocusedEvent, TextDocumentOpenEvent, WorkspaceFoldersChangeEvent } from '../src/_internal/extension/completions-core/vscode-node/lib/src/textDocumentManager';
-import { CopilotToken, TokenEnvelope } from '../src/_internal/platform/authentication/common/copilotToken';
+import { CopilotToken, createTestExtendedTokenInfo } from '../src/_internal/platform/authentication/common/copilotToken';
 import { ChatEndpointFamily, EmbeddingsEndpointFamily } from '../src/_internal/platform/endpoint/common/endpointProvider';
 import { MutableObservableWorkspace } from '../src/_internal/platform/inlineEdits/common/observableWorkspace';
 import { FetchOptions, IAbortController, IHeaders, PaginationOptions, Response } from '../src/_internal/platform/networking/common/fetcherService';
@@ -100,18 +100,10 @@ class TestFetcher implements IFetcher {
 	}
 }
 
-function createTestCopilotToken(envelope?: Partial<Omit<TokenEnvelope, 'expires_at'>>): CopilotToken {
-	const REFRESH_BUFFER_SECONDS = 60;
-	const expires_at = Date.now() + ((envelope?.refresh_in ?? 0) + REFRESH_BUFFER_SECONDS) * 1000;
-	return new CopilotToken({
+function createTestCopilotToken(): CopilotToken {
+	return new CopilotToken(createTestExtendedTokenInfo({
 		token: `test token ${Math.ceil(Math.random() * 100)}`,
-		refresh_in: 0,
-		expires_at,
-		username: 'testuser',
-		isVscodeTeamMember: false,
-		copilot_plan: 'testsku',
-		...envelope
-	});
+	}));
 }
 
 class TestAuthService extends Disposable implements IAuthenticationService {

chat-lib/test/nesProvider.spec.ts

@@ -12,7 +12,7 @@ import { outdent } from 'outdent';
 import * as path from 'path';
 import * as stream from 'stream';
 import { assert, describe, expect, it } from 'vitest';
-import { CopilotToken } from '../src/_internal/platform/authentication/common/copilotToken';
+import { CopilotToken, createTestExtendedTokenInfo } from '../src/_internal/platform/authentication/common/copilotToken';
 import { ICopilotTokenManager } from '../src/_internal/platform/authentication/common/copilotTokenManager';
 import { DocumentId } from '../src/_internal/platform/inlineEdits/common/dataTypes/documentId';
 import { MutableObservableWorkspace } from '../src/_internal/platform/inlineEdits/common/observableWorkspace';
@@ -97,7 +97,7 @@ class TestCopilotTokenManager implements ICopilotTokenManager {
 	onDidCopilotTokenRefresh = new Emitter<void>().event;
 
 	async getCopilotToken(force?: boolean): Promise<CopilotToken> {
-		return new CopilotToken({ token: 'fixedToken', expires_at: 0, refresh_in: 0, username: 'fixedTokenManager', isVscodeTeamMember: false, copilot_plan: 'unknown' });
+		return new CopilotToken(createTestExtendedTokenInfo({ token: 'fixedToken' }));
 	}
 
 	resetCopilotToken(httpError?: number): void {

package.json

@@ -2114,6 +2114,12 @@
 				"category": "Chat",
 				"enablement": "github.copilot-chat.activated"
 			},
+			{
+				"command": "github.copilot.deleteExternalIngestWorkspaceIndex",
+				"title": "%github.copilot.command.deleteExternalIngestWorkspaceIndex%",
+				"category": "Developer",
+				"enablement": "github.copilot-chat.activated"
+			},
 			{
 				"command": "github.copilot.report",
 				"title": "Report Issue",
@@ -3910,7 +3916,7 @@
 					"github.copilot.chat.CCAPartnerAgents.enabled": {
 						"type": "boolean",
 						"default": false,
-						"markdownDescription": "Enable partner agents for Copilot Coding Agent (CCA) sessions.",
+						"markdownDescription": "Enable partner agents for Copilot Coding Agent (CCA) sessions. Reload VS Code to apply.",
 						"tags": [
 							"advanced",
 							"experimental"

package.nls.json

@@ -32,6 +32,7 @@
 	"github.copilot.command.sendChatFeedback": "Send Chat Feedback",
 	"github.copilot.command.buildLocalWorkspaceIndex": "Build Local Workspace Index",
 	"github.copilot.command.buildRemoteWorkspaceIndex": "Build Remote Workspace Index",
+	"github.copilot.command.deleteExternalIngestWorkspaceIndex": "Delete External Ingest Workspace Index",
 	"github.copilot.viewsWelcome.individual.expired": "Your Copilot subscription has expired.\n\n[Review Copilot Settings](https://github.com/settings/copilot?editor=vscode)",
 	"github.copilot.viewsWelcome.enterprise": "Contact your GitHub organization administrator to enable Copilot.",
 	"github.copilot.viewsWelcome.offline": {

src/extension/agents/vscode-node/test/organizationAndEnterpriseAgentProvider.spec.ts

@@ -44,6 +44,7 @@ class MockOctoKitService implements IOctoKitService {
 	getUserOrganizations = async () => this.userOrganizations;
 	getOrganizationRepositories = async (org: string) => [org === 'testorg' ? 'testrepo' : 'repo'];
 	getCopilotAgentModels = async () => [];
+	getAssignableActors = async () => [];
 
 	async getCustomAgents(owner: string, repo: string, options: CustomAgentListOptions, authOptions: { createIfNone?: boolean }): Promise<CustomAgentListItem[]> {
 		if (!(await this.getCurrentAuthedUser())) {

src/extension/byok/common/geminiMessageConverter.ts

@@ -77,7 +77,7 @@ function apiContentToGeminiContent(content: (LanguageModelTextPart | LanguageMod
 				// Handle case with text content (may also have images)
 				try {
 					responsePayload = JSON.parse(textContent);
-					if (typeof responsePayload !== 'object' || responsePayload === null) {
+					if (typeof responsePayload !== 'object' || responsePayload === null || Array.isArray(responsePayload)) {
 						responsePayload = { result: responsePayload };
 					}
 				} catch {

src/extension/byok/common/test/geminiMessageConverter.spec.ts

@@ -102,6 +102,24 @@ describe('GeminiMessageConverter', () => {
 		expect(fr.functionResponse.response).toEqual({ foo: 'bar' });
 	});
 
+	it('should wrap array responses in an object', () => {
+		const toolResult = new LanguageModelToolResultPart('listRepos_12345', [new LanguageModelTextPart('["repo1", "repo2"]')]);
+		const messages: LanguageModelChatMessage[] = [
+			{
+				role: LanguageModelChatMessageRole.Assistant,
+				content: [toolResult],
+				name: undefined
+			}
+		];
+
+		const result = apiMessageToGeminiMessage(messages);
+
+		expect(result.contents).toHaveLength(1);
+		expect(result.contents[0].role).toBe('user');
+		const fr: any = result.contents[0].parts![0];
+		expect(fr.functionResponse.response).toEqual({ result: ['repo1', 'repo2'] });
+	});
+
 	it('should be idempotent when called multiple times (no duplication)', () => {
 		const toolResult = new LanguageModelToolResultPart('doThing_12345', [new LMText('{"value":42}')]);
 		const messages: LanguageModelChatMessage[] = [

src/extension/byok/vscode-node/anthropicProvider.ts

@@ -299,7 +299,7 @@ export class AnthropicLMProvider implements BYOKModelProvider<LanguageModelChatI
 				type: 'enabled',
 				budget_tokens: thinkingBudget
 			} : undefined,
-			context_management: contextManagement as any,
+			context_management: contextManagement as Anthropic.Beta.Messages.BetaContextManagementConfig | undefined,
 		};
 
 		const wrappedProgress = new RecordedProgress(progress);
@@ -592,6 +592,7 @@ export class AnthropicLMProvider implements BYOKModelProvider<LanguageModelChatI
 					completion_tokens: -1,
 					prompt_tokens: chunk.message.usage.input_tokens + (chunk.message.usage.cache_creation_input_tokens ?? 0) + (chunk.message.usage.cache_read_input_tokens ?? 0),
 					total_tokens: -1,
+					// Cast needed: Anthropic returns cache_creation_input_tokens which APIUsage.prompt_tokens_details doesn't define
 					prompt_tokens_details: {
 						cached_tokens: chunk.message.usage.cache_read_input_tokens ?? 0,
 						cache_creation_input_tokens: chunk.message.usage.cache_creation_input_tokens

src/extension/chatSessions/common/chatSessionWorktreeService.ts

@@ -34,7 +34,6 @@ export interface IChatSessionWorktreeService {
 	setWorktreeProperties(sessionId: string, properties: string | ChatSessionWorktreeProperties): Promise<void>;
 
 	getWorktreePath(sessionId: string): vscode.Uri | undefined;
-	getWorktreeRelativePath(sessionId: string): string | undefined;
 
 	applyWorktreeChanges(sessionId: string): Promise<void>;
 	getWorktreeChanges(sessionId: string): Promise<vscode.ChatSessionChangedFile[] | undefined>;

src/extension/chatSessions/vscode-node/chatSessionWorktreeServiceImpl.ts

@@ -84,6 +84,7 @@ export class ChatSessionWorktreeService extends Disposable implements IChatSessi
 			const repository = this.gitService.activeRepository.get();
 			if (!repository) {
 				progress?.report(new vscode.ChatResponseWarningPart(vscode.l10n.t('Failed to create worktree for isolation, using default workspace directory')));
+				this.logService.error('[ChatSessionWorktreeService][_createWorktree] No active repository found to create worktree for isolation.');
 				return undefined;
 			}
 
@@ -103,6 +104,7 @@ export class ChatSessionWorktreeService extends Disposable implements IChatSessi
 				} satisfies ChatSessionWorktreeProperties;
 			}
 			progress?.report(new vscode.ChatResponseWarningPart(vscode.l10n.t('Failed to create worktree for isolation, using default workspace directory')));
+			this.logService.error('[ChatSessionWorktreeService][_createWorktree] Failed to create worktree for isolation.');
 			return undefined;
 		} catch (error) {
 			progress?.report(new vscode.ChatResponseWarningPart(vscode.l10n.t('Error creating worktree for isolation: {0}', error instanceof Error ? error.message : String(error))));
@@ -137,17 +139,6 @@ export class ChatSessionWorktreeService extends Disposable implements IChatSessi
 		}
 	}
 
-	getWorktreeRelativePath(sessionId: string): string | undefined {
-		const worktreePath = this.getWorktreePath(sessionId);
-		if (!worktreePath) {
-			return undefined;
-		}
-
-		// TODO@rebornix, @osortega: read the workingtree name from git extension
-		const lastIndex = worktreePath.fsPath.lastIndexOf('/');
-		return worktreePath.fsPath.substring(lastIndex + 1);
-	}
-
 	async applyWorktreeChanges(sessionId: string): Promise<void> {
 		const worktreeProperties = this.getWorktreeProperties(sessionId);