[pull] main from microsoft:main

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

@@ -43,6 +43,10 @@ export interface CopilotCLIModelInfo {
 	readonly id: string;
 	readonly name: string;
 	readonly multiplier?: number;
+	readonly priceCategory?: string;
+	readonly inputCost?: number;
+	readonly outputCost?: number;
+	readonly cacheCost?: number;
 	readonly maxInputTokens?: number;
 	readonly maxOutputTokens?: number;
 	readonly maxContextWindowTokens: number;
@@ -152,18 +156,26 @@ export class CopilotCLIModels extends Disposable implements ICopilotCLIModels {
 		const [{ getAvailableModels }, authInfo] = await Promise.all([this.copilotCLISDK.getPackage(), this.copilotCLISDK.getAuthInfo()]);
 		try {
 			const models = await getAvailableModels(authInfo);
-			return models.map(model => ({
-				id: model.id,
-				name: model.name,
-				multiplier: model.billing?.multiplier,
-				maxInputTokens: model.capabilities.limits.max_prompt_tokens,
-				maxOutputTokens: model.capabilities.limits.max_output_tokens,
-				maxContextWindowTokens: model.capabilities.limits.max_context_window_tokens,
-				supportsVision: model.capabilities.supports.vision,
-				supportsReasoningEffort: model.capabilities.supports.reasoningEffort,
-				defaultReasoningEffort: model.defaultReasoningEffort,
-				supportedReasoningEfforts: model.supportedReasoningEfforts,
-			} satisfies CopilotCLIModelInfo));
+			return models.map(model => {
+				const tokenPrices = model.billing?.token_prices;
+				const normalizedPricing = normalizeTokenPricing(tokenPrices);
+				return {
+					id: model.id,
+					name: model.name,
+					multiplier: model.billing?.multiplier,
+					priceCategory: model.model_picker_price_category,
+					inputCost: normalizedPricing?.inputPrice,
+					outputCost: normalizedPricing?.outputPrice,
+					cacheCost: normalizedPricing?.cachePrice,
+					maxInputTokens: model.capabilities.limits.max_prompt_tokens,
+					maxOutputTokens: model.capabilities.limits.max_output_tokens,
+					maxContextWindowTokens: model.capabilities.limits.max_context_window_tokens,
+					supportsVision: model.capabilities.supports.vision,
+					supportsReasoningEffort: model.capabilities.supports.reasoningEffort,
+					defaultReasoningEffort: model.defaultReasoningEffort,
+					supportedReasoningEfforts: model.supportedReasoningEfforts,
+				} satisfies CopilotCLIModelInfo;
+			});
 		} catch (ex) {
 			this.logService.error(`[CopilotCLISession] Failed to fetch models`, ex);
 			// Clear cached promise so subsequent calls retry instead of
@@ -208,6 +220,10 @@ export class CopilotCLIModels extends Disposable implements ICopilotCLIModels {
 				maxInputTokens: model.maxInputTokens ?? model.maxContextWindowTokens,
 				maxOutputTokens: model.maxOutputTokens ?? 0,
 				pricing: multiplier,
+				priceCategory: model.priceCategory,
+				inputCost: model.inputCost,
+				outputCost: model.outputCost,
+				cacheCost: model.cacheCost,
 				multiplierNumeric: model.multiplier,
 				isUserSelectable: true,
 				configurationSchema: isReasoningEffortEnabled ? buildConfigurationSchema(model) : undefined,
@@ -613,3 +629,24 @@ export function isEnabledForCopilotCLI(customization: { sessionTypes?: readonly
 	return sessionTypes === undefined || sessionTypes.includes('copilotcli') || false;
 }
 
+const AIC_DIVISOR = 1_000_000_000;
+const TOKENS_PER_MILLION = 1_000_000;
+
+/**
+ * Converts raw billing token prices (nano-AICs with a batch_size) into
+ * normalized AICs per million tokens, matching the normalization in
+ * chatEndpoint.ts for non-CLI models.
+ */
+function normalizeTokenPricing(tokenPrices: { input_price?: number; output_price?: number; cache_price?: number; batch_size?: number } | undefined): { inputPrice: number; outputPrice: number; cachePrice: number | undefined } | undefined {
+	if (!tokenPrices || tokenPrices.input_price === undefined || tokenPrices.output_price === undefined) {
+		return undefined;
+	}
+	const batchSize = tokenPrices.batch_size ?? TOKENS_PER_MILLION;
+	const scale = TOKENS_PER_MILLION / batchSize;
+	return {
+		inputPrice: (tokenPrices.input_price / AIC_DIVISOR) * scale,
+		outputPrice: (tokenPrices.output_price / AIC_DIVISOR) * scale,
+		cachePrice: tokenPrices.cache_price !== undefined ? (tokenPrices.cache_price / AIC_DIVISOR) * scale : undefined,
+	};
+}
+

extensions/copilot/src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts

@@ -995,10 +995,11 @@ export class CopilotCloudSessionsProvider extends Disposable implements vscode.C
 			}
 
 			if (models.status === 'fulfilled' && models.value.length > 0) {
+				const isUBB = !!this._authenticationService.copilotToken?.isUsageBasedBilling;
 				const modelItems: vscode.ChatSessionProviderOptionItem[] = models.value.map(model => ({
 					id: model.id,
 					name: model.name,
-					...(model.billing?.multiplier !== undefined ? { description: `${model.billing.multiplier}x` } : {}),
+					...(!isUBB && model.billing?.multiplier !== undefined ? { description: `${model.billing.multiplier}x` } : {}),
 				}));
 				if (!models.value.find(m => m.id === DEFAULT_MODEL_ID)) {
 					modelItems.unshift({ id: DEFAULT_MODEL_ID, name: vscode.l10n.t('Auto'), description: vscode.l10n.t('Automatically select the best model') });

src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts

@@ -1203,7 +1203,8 @@ export class InlineCompletionsModel extends Disposable {
 	 * Used for cross-file inline edits.
 	 */
 	public transplantCompletion(item: InlineSuggestionItem): void {
-		item.addRef();
+		// No explicit addRef needed: `seedWithCompletion` creates a new `InlineCompletionsState`
+		// which calls `addRef` on every item it holds and pairs it with `removeRef` in dispose.
 		transaction(tx => {
 			this._source.seedWithCompletion(item, tx);
 			this._isActive.set(true, tx);

src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts

@@ -5,32 +5,32 @@
 
 import { assertNever } from '../../../../../base/common/assert.js';
 import { AsyncIterableProducer } from '../../../../../base/common/async.js';
+import { CachedFunction } from '../../../../../base/common/cache.js';
 import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
-import { BugIndicatingError, onUnexpectedExternalError } from '../../../../../base/common/errors.js';
+import { groupByMap } from '../../../../../base/common/collections.js';
+import { BugIndicatingError, onUnexpectedError, onUnexpectedExternalError } from '../../../../../base/common/errors.js';
 import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { isDefined } from '../../../../../base/common/types.js';
+import { URI } from '../../../../../base/common/uri.js';
 import { prefixedUuid } from '../../../../../base/common/uuid.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
 import { ISingleEditOperation } from '../../../../common/core/editOperation.js';
 import { StringReplacement } from '../../../../common/core/edits/stringEdit.js';
-import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
+import { TextReplacement } from '../../../../common/core/edits/textEdit.js';
 import { Position } from '../../../../common/core/position.js';
 import { Range } from '../../../../common/core/range.js';
-import { TextReplacement } from '../../../../common/core/edits/textEdit.js';
-import { InlineCompletionEndOfLifeReason, InlineCompletionEndOfLifeReasonKind, InlineCompletion, InlineCompletionContext, InlineCompletions, InlineCompletionsProvider, PartialAcceptInfo, InlineCompletionsDisposeReason, LifetimeSummary, ProviderId, IInlineCompletionHint, InlineCompletionTriggerKind } from '../../../../common/languages.js';
+import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
+import { IInlineCompletionHint, InlineCompletion, InlineCompletionContext, InlineCompletionEndOfLifeReason, InlineCompletionEndOfLifeReasonKind, InlineCompletions, InlineCompletionsDisposeReason, InlineCompletionsProvider, InlineCompletionTriggerKind, LifetimeSummary, PartialAcceptInfo, ProviderId } from '../../../../common/languages.js';
 import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';
 import { ITextModel } from '../../../../common/model.js';
 import { fixBracketsInLine } from '../../../../common/model/bracketPairsTextModelPart/fixBrackets.js';
+import { EditDeltaInfo } from '../../../../common/textModelEditSource.js';
 import { SnippetParser, Text } from '../../../snippet/browser/snippetParser.js';
 import { ErrorResult, getReadonlyEmptyArray } from '../utils.js';
-import { groupByMap } from '../../../../../base/common/collections.js';
-import { DirectedGraph } from './graph.js';
-import { CachedFunction } from '../../../../../base/common/cache.js';
 import { InlineCompletionViewData, InlineCompletionViewKind } from '../view/inlineEdits/inlineEditsViewInterface.js';
-import { isDefined } from '../../../../../base/common/types.js';
-import { inlineCompletionIsVisible } from './inlineCompletionIsVisible.js';
-import { EditDeltaInfo } from '../../../../common/textModelEditSource.js';
-import { URI } from '../../../../../base/common/uri.js';
 import { InlineSuggestionEditKind } from './editKind.js';
+import { DirectedGraph } from './graph.js';
+import { inlineCompletionIsVisible } from './inlineCompletionIsVisible.js';
 import { InlineSuggestAlternativeAction } from './InlineSuggestAlternativeAction.js';
 
 export type InlineCompletionContextWithoutUuid = Omit<InlineCompletionContext, 'requestUuid'>;
@@ -659,6 +659,12 @@ export class InlineSuggestionList {
 				item.reportEndOfLife();
 			}
 			this.provider.disposeInlineCompletions(this.inlineSuggestions, reason);
+		} else if (this.refCount < 0) {
+			// Invariant: every addRef must be paired with exactly one removeRef.
+			// Going negative means a removeRef without a matching addRef somewhere.
+			onUnexpectedError(new BugIndicatingError(
+				`InlineSuggestionList (provider=${this.provider.providerId?.toString()}) refCount went negative (${this.refCount}) — more removeRef than addRef calls.`
+			));
 		}
 	}
 }

src/vs/platform/agentHost/browser/remoteAgentHostProtocolClient.ts

@@ -39,6 +39,7 @@ import { AgentHostTelemetryLevelConfigKey, AgentHostSessionSyncEnabledConfigKey,
 import type { OtlpExportLogsParams } from '../common/state/protocol/channels-otlp/notifications.js';
 import type { TelemetryCapabilities } from '../common/state/protocol/channels-otlp/state.js';
 import type { InitializeResult } from '../common/state/protocol/common/commands.js';
+import { dirname } from '../../../base/common/resources.js';
 
 const AHP_CLIENT_CONNECTION_CLOSED = -32000;
 
@@ -880,14 +881,15 @@ export class RemoteAgentHostProtocolClient extends Disposable implements IAgentC
 			} catch {
 				continue;
 			}
-			const key = uri.toString();
+			const grantUri = dirname(uri);
+			const key = grantUri.toString();
 			if (this._grantedCustomizationUris.has(key)) {
 				continue;
 			}
 			this._grantedCustomizationUris.add(key);
 			// Disposable is owned by the permission service; cleared on
 			// connectionClosed.
-			this._permissionService.grantImplicitRead(this._address, uri);
+			this._permissionService.grantImplicitRead(this._address, grantUri);
 		}
 	}
 

src/vs/platform/agentHost/node/copilot/copilotAgent.ts

@@ -41,7 +41,7 @@ import { IAgentHostCheckpointService } from '../../common/agentHostCheckpointSer
 import { IAgentHostTerminalManager } from '../agentHostTerminalManager.js';
 import { CopilotAgentSession, SessionWrapperFactory, type CopilotSdkMode, type IActiveClientSnapshot } from './copilotAgentSession.js';
 import { ICopilotSessionContext, projectFromCopilotContext } from './copilotGitProject.js';
-import { parsedPluginsEqual, toCustomizationAgentRefs, toSdkCustomAgents, toSdkHooks, toSdkMcpServers, toSdkSkillDirectories } from './copilotPluginConverters.js';
+import { parsedPluginsEqual, toCustomizationAgentRefs, toSdkCustomAgents, toSdkHooks, toSdkInstructionDirectories, toSdkMcpServers, toSdkSkillDirectories } from './copilotPluginConverters.js';
 import { CopilotSessionWrapper } from './copilotSessionWrapper.js';
 import { ShellManager, createShellTools } from './copilotShellTools.js';
 import { SessionCustomizationDiscovery } from './sessionCustomizationDiscovery.js';
@@ -1504,6 +1504,7 @@ export class CopilotAgent extends Disposable implements IAgent {
 				mcpServers: toSdkMcpServers(plugins.flatMap(p => p.mcpServers)),
 				customAgents,
 				skillDirectories: toSdkSkillDirectories(plugins.flatMap(p => p.skills)),
+				instructionDirectories: toSdkInstructionDirectories(plugins.flatMap(p => p.instructions)),
 				systemMessage: COPILOT_AGENT_HOST_SYSTEM_MESSAGE,
 				tools: [...shellTools, ...callbacks.clientTools],
 				// Enable infinite sessions so the SDK provisions a workspace

src/vs/platform/agentHost/node/copilot/copilotPluginConverters.ts

@@ -126,11 +126,22 @@ export function toCustomizationAgentRefs(agents: readonly INamedPluginResource[]
  * The SDK expects directory paths; we extract the parent directory of each SKILL.md.
  */
 export function toSdkSkillDirectories(skills: readonly INamedPluginResource[]): string[] {
+	return toSdkResourceDirectories(skills);
+}
+
+/**
+ * Converts parsed plugin instructions into the SDK's
+ * `instructionDirectories` config.
+ */
+export function toSdkInstructionDirectories(instructions: readonly INamedPluginResource[]): string[] {
+	return toSdkResourceDirectories(instructions);
+}
+
+function toSdkResourceDirectories(resources: readonly INamedPluginResource[]): string[] {
 	const seen = new Set<string>();
 	const result: string[] = [];
-	for (const skill of skills) {
-		// SKILL.md parent directory is the skill directory
-		const dir = dirname(skill.uri.fsPath);
+	for (const resource of resources) {
+		const dir = dirname(resource.uri.fsPath);
 		if (!seen.has(dir)) {
 			seen.add(dir);
 			result.push(dir);
@@ -373,6 +384,7 @@ export function parsedPluginsEqual(a: readonly IParsedPlugin[], b: readonly IPar
 			mcpServers: p.mcpServers.map(m => ({ name: m.name, configuration: m.configuration })),
 			skills: p.skills.map(s => ({ uri: s.uri.toString(), name: s.name })),
 			agents: p.agents.map(a => ({ uri: a.uri.toString(), name: a.name })),
+			instructions: p.instructions.map(i => ({ uri: i.uri.toString(), name: i.name })),
 		})));
 	};
 	return serialize(a) === serialize(b);