@vscode/chat-lib 0.0.3 → 0.0.5-0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/_internal/extension/byok/node/openAIEndpoint.d.ts +10 -2
- package/dist/src/_internal/extension/byok/node/openAIEndpoint.d.ts.map +1 -1
- package/dist/src/_internal/extension/byok/node/openAIEndpoint.js +151 -13
- package/dist/src/_internal/extension/byok/node/openAIEndpoint.js.map +1 -1
- package/dist/src/_internal/extension/common/constants.d.ts +0 -1
- package/dist/src/_internal/extension/common/constants.d.ts.map +1 -1
- package/dist/src/_internal/extension/common/constants.js +0 -1
- package/dist/src/_internal/extension/common/constants.js.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nesConfigs.d.ts +0 -4
- package/dist/src/_internal/extension/inlineEdits/node/nesConfigs.d.ts.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditCache.d.ts +4 -2
- package/dist/src/_internal/extension/inlineEdits/node/nextEditCache.d.ts.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditCache.js +15 -8
- package/dist/src/_internal/extension/inlineEdits/node/nextEditCache.js.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProvider.d.ts +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProvider.d.ts.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProvider.js +60 -94
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProvider.js.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProviderTelemetry.d.ts +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProviderTelemetry.d.ts.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProviderTelemetry.js +7 -3
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProviderTelemetry.js.map +1 -1
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.d.ts +3 -13
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.d.ts.map +1 -1
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.js +64 -30
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.js.map +1 -1
- package/dist/src/_internal/extension/xtab/common/promptCrafting.d.ts +36 -21
- package/dist/src/_internal/extension/xtab/common/promptCrafting.d.ts.map +1 -1
- package/dist/src/_internal/extension/xtab/common/promptCrafting.js +81 -53
- package/dist/src/_internal/extension/xtab/common/promptCrafting.js.map +1 -1
- package/dist/src/_internal/extension/xtab/common/xtabCurrentDocument.d.ts +16 -0
- package/dist/src/_internal/extension/xtab/common/xtabCurrentDocument.d.ts.map +1 -0
- package/dist/src/_internal/extension/xtab/common/xtabCurrentDocument.js +19 -0
- package/dist/src/_internal/extension/xtab/common/xtabCurrentDocument.js.map +1 -0
- package/dist/src/_internal/extension/xtab/node/xtabEndpoint.d.ts +1 -2
- package/dist/src/_internal/extension/xtab/node/xtabEndpoint.d.ts.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabEndpoint.js +9 -11
- package/dist/src/_internal/extension/xtab/node/xtabEndpoint.js.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabProvider.d.ts +23 -6
- package/dist/src/_internal/extension/xtab/node/xtabProvider.d.ts.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabProvider.js +412 -153
- package/dist/src/_internal/extension/xtab/node/xtabProvider.js.map +1 -1
- package/dist/src/_internal/platform/authentication/common/authentication.d.ts.map +1 -1
- package/dist/src/_internal/platform/authentication/common/authentication.js +0 -2
- package/dist/src/_internal/platform/authentication/common/authentication.js.map +1 -1
- package/dist/src/_internal/platform/authentication/common/copilotToken.d.ts +2 -0
- package/dist/src/_internal/platform/authentication/common/copilotToken.d.ts.map +1 -1
- package/dist/src/_internal/platform/authentication/common/copilotToken.js +6 -0
- package/dist/src/_internal/platform/authentication/common/copilotToken.js.map +1 -1
- package/dist/src/_internal/platform/authentication/node/copilotTokenManager.d.ts +23 -2
- package/dist/src/_internal/platform/authentication/node/copilotTokenManager.d.ts.map +1 -1
- package/dist/src/_internal/platform/authentication/node/copilotTokenManager.js +79 -19
- package/dist/src/_internal/platform/authentication/node/copilotTokenManager.js.map +1 -1
- package/dist/src/_internal/platform/chat/common/chatMLFetcher.d.ts +2 -1
- package/dist/src/_internal/platform/chat/common/chatMLFetcher.d.ts.map +1 -1
- package/dist/src/_internal/platform/chat/common/chatMLFetcher.js +7 -1
- package/dist/src/_internal/platform/chat/common/chatMLFetcher.js.map +1 -1
- package/dist/src/_internal/platform/chat/common/commonTypes.d.ts.map +1 -1
- package/dist/src/_internal/platform/chat/common/commonTypes.js +5 -2
- package/dist/src/_internal/platform/chat/common/commonTypes.js.map +1 -1
- package/dist/src/_internal/platform/configuration/common/configurationService.d.ts +31 -18
- package/dist/src/_internal/platform/configuration/common/configurationService.d.ts.map +1 -1
- package/dist/src/_internal/platform/configuration/common/configurationService.js +48 -31
- package/dist/src/_internal/platform/configuration/common/configurationService.js.map +1 -1
- package/dist/src/_internal/platform/configuration/common/validator.d.ts +6 -0
- package/dist/src/_internal/platform/configuration/common/validator.d.ts.map +1 -1
- package/dist/src/_internal/platform/configuration/common/validator.js +41 -4
- package/dist/src/_internal/platform/configuration/common/validator.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/common/chatModelCapabilities.d.ts +4 -4
- package/dist/src/_internal/platform/endpoint/common/chatModelCapabilities.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/common/chatModelCapabilities.js +15 -10
- package/dist/src/_internal/platform/endpoint/common/chatModelCapabilities.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/common/endpointProvider.d.ts +31 -3
- package/dist/src/_internal/platform/endpoint/common/endpointProvider.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/common/endpointProvider.js +14 -0
- package/dist/src/_internal/platform/endpoint/common/endpointProvider.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/chatEndpoint.d.ts +6 -6
- package/dist/src/_internal/platform/endpoint/node/chatEndpoint.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/chatEndpoint.js +39 -28
- package/dist/src/_internal/platform/endpoint/node/chatEndpoint.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/domainServiceImpl.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/domainServiceImpl.js +2 -1
- package/dist/src/_internal/platform/endpoint/node/domainServiceImpl.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/responsesApi.d.ts +6 -0
- package/dist/src/_internal/platform/endpoint/node/responsesApi.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/responsesApi.js +184 -26
- package/dist/src/_internal/platform/endpoint/node/responsesApi.js.map +1 -1
- package/dist/src/_internal/platform/env/common/envService.d.ts +2 -0
- package/dist/src/_internal/platform/env/common/envService.d.ts.map +1 -1
- package/dist/src/_internal/platform/env/common/envService.js.map +1 -1
- package/dist/src/_internal/platform/env/common/nullEnvService.d.ts +1 -0
- package/dist/src/_internal/platform/env/common/nullEnvService.d.ts.map +1 -1
- package/dist/src/_internal/platform/env/common/nullEnvService.js +3 -0
- package/dist/src/_internal/platform/env/common/nullEnvService.js.map +1 -1
- package/dist/src/_internal/platform/github/common/githubAPI.d.ts +67 -0
- package/dist/src/_internal/platform/github/common/githubAPI.d.ts.map +1 -1
- package/dist/src/_internal/platform/github/common/githubAPI.js +120 -3
- package/dist/src/_internal/platform/github/common/githubAPI.js.map +1 -1
- package/dist/src/_internal/platform/github/common/githubService.d.ts +171 -1
- package/dist/src/_internal/platform/github/common/githubService.d.ts.map +1 -1
- package/dist/src/_internal/platform/github/common/githubService.js +34 -1
- package/dist/src/_internal/platform/github/common/githubService.js.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/xtabPromptOptions.d.ts +11 -0
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/xtabPromptOptions.d.ts.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/xtabPromptOptions.js +8 -1
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/xtabPromptOptions.js.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/inlineEditLogContext.js +2 -2
- package/dist/src/_internal/platform/inlineEdits/common/inlineEditLogContext.js.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/statelessNextEditProvider.d.ts +20 -5
- package/dist/src/_internal/platform/inlineEdits/common/statelessNextEditProvider.d.ts.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/statelessNextEditProvider.js +21 -1
- package/dist/src/_internal/platform/inlineEdits/common/statelessNextEditProvider.js.map +1 -1
- package/dist/src/_internal/platform/networking/common/fetch.d.ts +2 -1
- package/dist/src/_internal/platform/networking/common/fetch.d.ts.map +1 -1
- package/dist/src/_internal/platform/networking/common/fetch.js +1 -0
- package/dist/src/_internal/platform/networking/common/fetch.js.map +1 -1
- package/dist/src/_internal/platform/networking/common/fetcherService.d.ts +2 -0
- package/dist/src/_internal/platform/networking/common/fetcherService.d.ts.map +1 -1
- package/dist/src/_internal/platform/networking/common/fetcherService.js.map +1 -1
- package/dist/src/_internal/platform/networking/common/networking.d.ts +18 -7
- package/dist/src/_internal/platform/networking/common/networking.d.ts.map +1 -1
- package/dist/src/_internal/platform/networking/common/networking.js +6 -5
- package/dist/src/_internal/platform/networking/common/networking.js.map +1 -1
- package/dist/src/_internal/platform/networking/node/chatStream.d.ts.map +1 -1
- package/dist/src/_internal/platform/networking/node/chatStream.js +333 -3
- package/dist/src/_internal/platform/networking/node/chatStream.js.map +1 -1
- package/dist/src/_internal/platform/networking/node/stream.d.ts.map +1 -1
- package/dist/src/_internal/platform/networking/node/stream.js +6 -5
- package/dist/src/_internal/platform/networking/node/stream.js.map +1 -1
- package/dist/src/_internal/platform/openai/node/fetch.d.ts +4 -10
- package/dist/src/_internal/platform/openai/node/fetch.d.ts.map +1 -1
- package/dist/src/_internal/platform/openai/node/fetch.js +38 -15
- package/dist/src/_internal/platform/openai/node/fetch.js.map +1 -1
- package/dist/src/_internal/platform/requestLogger/node/requestLogger.d.ts +2 -2
- package/dist/src/_internal/platform/requestLogger/node/requestLogger.d.ts.map +1 -1
- package/dist/src/_internal/platform/requestLogger/node/requestLogger.js +20 -2
- package/dist/src/_internal/platform/requestLogger/node/requestLogger.js.map +1 -1
- package/dist/src/_internal/platform/telemetry/common/telemetryData.d.ts.map +1 -1
- package/dist/src/_internal/platform/telemetry/common/telemetryData.js +4 -2
- package/dist/src/_internal/platform/telemetry/common/telemetryData.js.map +1 -1
- package/dist/src/_internal/platform/tokenizer/node/tokenizer.d.ts.map +1 -1
- package/dist/src/_internal/platform/tokenizer/node/tokenizer.js +7 -6
- package/dist/src/_internal/platform/tokenizer/node/tokenizer.js.map +1 -1
- package/dist/src/_internal/util/common/cache.d.ts +1 -0
- package/dist/src/_internal/util/common/cache.d.ts.map +1 -1
- package/dist/src/_internal/util/common/cache.js +9 -0
- package/dist/src/_internal/util/common/cache.js.map +1 -1
- package/dist/src/_internal/util/common/notebooks.d.ts +1 -0
- package/dist/src/_internal/util/common/notebooks.d.ts.map +1 -1
- package/dist/src/_internal/util/common/notebooks.js +4 -0
- package/dist/src/_internal/util/common/notebooks.js.map +1 -1
- package/dist/src/_internal/util/common/tracing.d.ts +11 -0
- package/dist/src/_internal/util/common/tracing.d.ts.map +1 -1
- package/dist/src/_internal/util/common/tracing.js +5 -0
- package/dist/src/_internal/util/common/tracing.js.map +1 -1
- package/dist/src/main.d.ts +50 -9
- package/dist/src/main.d.ts.map +1 -1
- package/dist/src/main.js +87 -19
- package/dist/src/main.js.map +1 -1
- package/dist/src/package.json +434 -167
- package/package.json +3 -3
|
@@ -7,7 +7,6 @@ import { ICAPIClientService } from '../../../platform/endpoint/common/capiClient
|
|
|
7
7
|
import { IDomainService } from '../../../platform/endpoint/common/domainService';
|
|
8
8
|
import { IChatModelInformation } from '../../../platform/endpoint/common/endpointProvider';
|
|
9
9
|
import { ChatEndpoint } from '../../../platform/endpoint/node/chatEndpoint';
|
|
10
|
-
import { IEnvService } from '../../../platform/env/common/envService';
|
|
11
10
|
import { ILogService } from '../../../platform/log/common/logService';
|
|
12
11
|
import { IFetcherService } from '../../../platform/networking/common/fetcherService';
|
|
13
12
|
import { IChatEndpoint, ICreateEndpointBodyOptions, IEndpointBody, IMakeChatRequestOptions } from '../../../platform/networking/common/networking';
|
|
@@ -20,7 +19,16 @@ export declare class OpenAIEndpoint extends ChatEndpoint {
|
|
|
20
19
|
protected readonly _apiKey: string;
|
|
21
20
|
protected readonly _modelUrl: string;
|
|
22
21
|
protected instantiationService: IInstantiationService;
|
|
23
|
-
|
|
22
|
+
protected logService: ILogService;
|
|
23
|
+
private static readonly _reservedHeaders;
|
|
24
|
+
private static readonly _validHeaderNamePattern;
|
|
25
|
+
private static readonly _maxHeaderNameLength;
|
|
26
|
+
private static readonly _maxHeaderValueLength;
|
|
27
|
+
private static readonly _maxCustomHeaderCount;
|
|
28
|
+
private readonly _customHeaders;
|
|
29
|
+
constructor(modelMetadata: IChatModelInformation, _apiKey: string, _modelUrl: string, fetcherService: IFetcherService, domainService: IDomainService, capiClientService: ICAPIClientService, telemetryService: ITelemetryService, authService: IAuthenticationService, chatMLFetcher: IChatMLFetcher, tokenizerProvider: ITokenizerProvider, instantiationService: IInstantiationService, configurationService: IConfigurationService, expService: IExperimentationService, logService: ILogService);
|
|
30
|
+
private _sanitizeCustomHeaders;
|
|
31
|
+
private _sanitizeHeaderValue;
|
|
24
32
|
createRequestBody(options: ICreateEndpointBodyOptions): IEndpointBody;
|
|
25
33
|
interceptBody(body: IEndpointBody | undefined): void;
|
|
26
34
|
get urlOrRequestMetadata(): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openAIEndpoint.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/byok/node/openAIEndpoint.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,sBAAsB,EAAE,MAAM,wDAAwD,CAAC;AAChG,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC7E,OAAO,EAAyB,YAAY,EAAE,MAAM,2CAA2C,CAAC;AAChG,OAAO,EAAE,qBAAqB,EAAE,MAAM,6DAA6D,CAAC;AACpG,OAAO,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,iDAAiD,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,8CAA8C,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"openAIEndpoint.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/byok/node/openAIEndpoint.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,sBAAsB,EAAE,MAAM,wDAAwD,CAAC;AAChG,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC7E,OAAO,EAAyB,YAAY,EAAE,MAAM,2CAA2C,CAAC;AAChG,OAAO,EAAE,qBAAqB,EAAE,MAAM,6DAA6D,CAAC;AACpG,OAAO,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,iDAAiD,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,8CAA8C,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,oDAAoD,CAAC;AACrF,OAAO,EAAyB,aAAa,EAAE,0BAA0B,EAAE,aAAa,EAAE,uBAAuB,EAAE,MAAM,gDAAgD,CAAC;AAE1K,OAAO,EAAE,uBAAuB,EAAE,MAAM,+DAA+D,CAAC;AACxG,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,qBAAqB,EAAE,MAAM,8DAA8D,CAAC;AAwBrG,qBAAa,cAAe,SAAQ,YAAY;IA2D9C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,qBAAqB;IACvD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM;IAClC,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM;IAQb,SAAS,CAAC,oBAAoB,EAAE,qBAAqB;IAG/D,SAAS,CAAC,UAAU,EAAE,WAAW;IArE/C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CA4CrC;IAGH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,uBAAuB,CAAoC;IAGnF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAO;IACnD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,qBAAqB,CAAQ;IACrD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,qBAAqB,CAAM;IAEnD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAyB;gBAEpC,aAAa,EAAE,qBAAqB,EACpC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACnB,cAAc,EAAE,eAAe,EAChC,aAAa,EAAE,cAAc,EACzB,iBAAiB,EAAE,kBAAkB,EACtC,gBAAgB,EAAE,iBAAiB,EAC9B,WAAW,EAAE,sBAAsB,EAC3C,aAAa,EAAE,cAAc,EACzB,iBAAiB,EAAE,kBAAkB,EACxB,oBAAoB,EAAE,qBAAqB,EACrD,oBAAoB,EAAE,qBAAqB,EACzC,UAAU,EAAE,uBAAuB,EACrC,UAAU,EAAE,WAAW;IAmB/C,OAAO,CAAC,sBAAsB;IAsE9B,OAAO,CAAC,oBAAoB;IA0BnB,iBAAiB,CAAC,OAAO,EAAE,0BAA0B,GAAG,aAAa;IA8BrE,aAAa,CAAC,IAAI,EAAE,aAAa,GAAG,SAAS,GAAG,IAAI;IA8B7D,IAAa,oBAAoB,IAAI,MAAM,CAE1C;IAEM,eAAe,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAejC,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC;IAI1C,sBAAsB,CAAC,oBAAoB,EAAE,MAAM,GAAG,aAAa;IAKtD,gBAAgB,CAAC,OAAO,EAAE,uBAAuB,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,YAAY,CAAC;CASzH"}
|
|
@@ -18,7 +18,6 @@ const configurationService_1 = require("../../../platform/configuration/common/c
|
|
|
18
18
|
const capiClient_1 = require("../../../platform/endpoint/common/capiClient");
|
|
19
19
|
const domainService_1 = require("../../../platform/endpoint/common/domainService");
|
|
20
20
|
const chatEndpoint_1 = require("../../../platform/endpoint/node/chatEndpoint");
|
|
21
|
-
const envService_1 = require("../../../platform/env/common/envService");
|
|
22
21
|
const logService_1 = require("../../../platform/log/common/logService");
|
|
23
22
|
const fetch_1 = require("../../../platform/networking/common/fetch");
|
|
24
23
|
const fetcherService_1 = require("../../../platform/networking/common/fetcherService");
|
|
@@ -49,13 +48,145 @@ function hydrateBYOKErrorMessages(response) {
|
|
|
49
48
|
}
|
|
50
49
|
return response;
|
|
51
50
|
}
|
|
52
|
-
let OpenAIEndpoint =
|
|
53
|
-
|
|
54
|
-
|
|
51
|
+
let OpenAIEndpoint = class OpenAIEndpoint extends chatEndpoint_1.ChatEndpoint {
|
|
52
|
+
static { OpenAIEndpoint_1 = this; }
|
|
53
|
+
// Reserved headers that cannot be overridden for security and functionality reasons
|
|
54
|
+
// Including forbidden request headers: https://developer.mozilla.org/en-US/docs/Glossary/Forbidden_request_header
|
|
55
|
+
static { this._reservedHeaders = new Set([
|
|
56
|
+
// Forbidden Request Headers
|
|
57
|
+
'accept-charset',
|
|
58
|
+
'accept-encoding',
|
|
59
|
+
'access-control-request-headers',
|
|
60
|
+
'access-control-request-method',
|
|
61
|
+
'connection',
|
|
62
|
+
'content-length',
|
|
63
|
+
'cookie',
|
|
64
|
+
'date',
|
|
65
|
+
'dnt',
|
|
66
|
+
'expect',
|
|
67
|
+
'host',
|
|
68
|
+
'keep-alive',
|
|
69
|
+
'origin',
|
|
70
|
+
'permissions-policy',
|
|
71
|
+
'referer',
|
|
72
|
+
'te',
|
|
73
|
+
'trailer',
|
|
74
|
+
'transfer-encoding',
|
|
75
|
+
'upgrade',
|
|
76
|
+
'user-agent',
|
|
77
|
+
'via',
|
|
78
|
+
// Forwarding & Routing
|
|
79
|
+
'forwarded',
|
|
80
|
+
'x-forwarded-for',
|
|
81
|
+
'x-forwarded-host',
|
|
82
|
+
'x-forwarded-proto',
|
|
83
|
+
// Others
|
|
84
|
+
'api-key',
|
|
85
|
+
'authorization',
|
|
86
|
+
'content-type',
|
|
87
|
+
'openai-intent',
|
|
88
|
+
'x-github-api-version',
|
|
89
|
+
'x-initiator',
|
|
90
|
+
'x-interaction-id',
|
|
91
|
+
'x-interaction-type',
|
|
92
|
+
'x-onbehalf-extension-id',
|
|
93
|
+
'x-request-id',
|
|
94
|
+
'x-vscode-user-agent-library-version',
|
|
95
|
+
// Pattern-based forbidden headers are checked separately:
|
|
96
|
+
// - 'proxy-*' headers (handled in sanitization logic)
|
|
97
|
+
// - 'sec-*' headers (handled in sanitization logic)
|
|
98
|
+
// - 'x-http-method*' with forbidden methods CONNECT, TRACE, TRACK (handled in sanitization logic)
|
|
99
|
+
]); }
|
|
100
|
+
// RFC 7230 compliant header name pattern: token characters only
|
|
101
|
+
static { this._validHeaderNamePattern = /^[!#$%&'*+\-.0-9A-Z^_`a-z|~]+$/; }
|
|
102
|
+
// Maximum limits to prevent abuse
|
|
103
|
+
static { this._maxHeaderNameLength = 256; }
|
|
104
|
+
static { this._maxHeaderValueLength = 8192; }
|
|
105
|
+
static { this._maxCustomHeaderCount = 20; }
|
|
106
|
+
constructor(modelMetadata, _apiKey, _modelUrl, fetcherService, domainService, capiClientService, telemetryService, authService, chatMLFetcher, tokenizerProvider, instantiationService, configurationService, expService, logService) {
|
|
107
|
+
super(modelMetadata, domainService, capiClientService, fetcherService, telemetryService, authService, chatMLFetcher, tokenizerProvider, instantiationService, configurationService, expService, logService);
|
|
55
108
|
this.modelMetadata = modelMetadata;
|
|
56
109
|
this._apiKey = _apiKey;
|
|
57
110
|
this._modelUrl = _modelUrl;
|
|
58
111
|
this.instantiationService = instantiationService;
|
|
112
|
+
this.logService = logService;
|
|
113
|
+
this._customHeaders = this._sanitizeCustomHeaders(modelMetadata.requestHeaders);
|
|
114
|
+
}
|
|
115
|
+
_sanitizeCustomHeaders(headers) {
|
|
116
|
+
if (!headers) {
|
|
117
|
+
return {};
|
|
118
|
+
}
|
|
119
|
+
const entries = Object.entries(headers);
|
|
120
|
+
if (entries.length > OpenAIEndpoint_1._maxCustomHeaderCount) {
|
|
121
|
+
this.logService.warn(`[OpenAIEndpoint] Model '${this.modelMetadata.id}' has ${entries.length} custom headers, exceeding limit of ${OpenAIEndpoint_1._maxCustomHeaderCount}. Only first ${OpenAIEndpoint_1._maxCustomHeaderCount} will be processed.`);
|
|
122
|
+
}
|
|
123
|
+
const sanitized = {};
|
|
124
|
+
let processedCount = 0;
|
|
125
|
+
for (const [rawKey, rawValue] of entries) {
|
|
126
|
+
if (processedCount >= OpenAIEndpoint_1._maxCustomHeaderCount) {
|
|
127
|
+
break;
|
|
128
|
+
}
|
|
129
|
+
const key = rawKey.trim();
|
|
130
|
+
if (!key) {
|
|
131
|
+
this.logService.warn(`[OpenAIEndpoint] Model '${this.modelMetadata.id}' has empty header name, skipping.`);
|
|
132
|
+
continue;
|
|
133
|
+
}
|
|
134
|
+
if (key.length > OpenAIEndpoint_1._maxHeaderNameLength) {
|
|
135
|
+
this.logService.warn(`[OpenAIEndpoint] Model '${this.modelMetadata.id}' has header name exceeding ${OpenAIEndpoint_1._maxHeaderNameLength} characters, skipping.`);
|
|
136
|
+
continue;
|
|
137
|
+
}
|
|
138
|
+
if (!OpenAIEndpoint_1._validHeaderNamePattern.test(key)) {
|
|
139
|
+
this.logService.warn(`[OpenAIEndpoint] Model '${this.modelMetadata.id}' has invalid header name format: '${key}', Skipping.`);
|
|
140
|
+
continue;
|
|
141
|
+
}
|
|
142
|
+
const lowerKey = key.toLowerCase();
|
|
143
|
+
if (OpenAIEndpoint_1._reservedHeaders.has(lowerKey)) {
|
|
144
|
+
this.logService.warn(`[OpenAIEndpoint] Model '${this.modelMetadata.id}' attempted to override reserved header '${key}', skipping.`);
|
|
145
|
+
continue;
|
|
146
|
+
}
|
|
147
|
+
// Check for pattern-based forbidden headers
|
|
148
|
+
if (lowerKey.startsWith('proxy-') || lowerKey.startsWith('sec-')) {
|
|
149
|
+
this.logService.warn(`[OpenAIEndpoint] Model '${this.modelMetadata.id}' attempted to set forbidden header pattern '${key}', skipping.`);
|
|
150
|
+
continue;
|
|
151
|
+
}
|
|
152
|
+
// Check for X-HTTP-Method* headers with forbidden methods
|
|
153
|
+
if ((lowerKey === 'x-http-method' || lowerKey === 'x-http-method-override' || lowerKey === 'x-method-override')) {
|
|
154
|
+
const forbiddenMethods = ['connect', 'trace', 'track'];
|
|
155
|
+
const methodValue = String(rawValue).toLowerCase().trim();
|
|
156
|
+
if (forbiddenMethods.includes(methodValue)) {
|
|
157
|
+
this.logService.warn(`[OpenAIEndpoint] Model '${this.modelMetadata.id}' attempted to set forbidden method '${methodValue}' in header '${key}', skipping.`);
|
|
158
|
+
continue;
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
const sanitizedValue = this._sanitizeHeaderValue(rawValue);
|
|
162
|
+
if (sanitizedValue === undefined) {
|
|
163
|
+
this.logService.warn(`[OpenAIEndpoint] Model '${this.modelMetadata.id}' has invalid value for header '${key}': '${rawValue}', skipping.`);
|
|
164
|
+
continue;
|
|
165
|
+
}
|
|
166
|
+
sanitized[key] = sanitizedValue;
|
|
167
|
+
processedCount++;
|
|
168
|
+
}
|
|
169
|
+
return sanitized;
|
|
170
|
+
}
|
|
171
|
+
_sanitizeHeaderValue(value) {
|
|
172
|
+
if (typeof value !== 'string') {
|
|
173
|
+
return undefined;
|
|
174
|
+
}
|
|
175
|
+
const trimmed = value.trim();
|
|
176
|
+
if (trimmed.length > OpenAIEndpoint_1._maxHeaderValueLength) {
|
|
177
|
+
return undefined;
|
|
178
|
+
}
|
|
179
|
+
// Disallow control characters including CR, LF, and others (0x00-0x1F, 0x7F)
|
|
180
|
+
// This prevents HTTP header injection and response splitting attacks
|
|
181
|
+
if (/[\x00-\x1F\x7F]/.test(trimmed)) {
|
|
182
|
+
return undefined;
|
|
183
|
+
}
|
|
184
|
+
// Additional check for potential Unicode issues
|
|
185
|
+
// Reject headers with bidirectional override characters or zero-width characters
|
|
186
|
+
if (/[\u200B-\u200D\u202A-\u202E\uFEFF]/.test(trimmed)) {
|
|
187
|
+
return undefined;
|
|
188
|
+
}
|
|
189
|
+
return trimmed;
|
|
59
190
|
}
|
|
60
191
|
createRequestBody(options) {
|
|
61
192
|
if (this.useResponsesApi) {
|
|
@@ -67,6 +198,11 @@ let OpenAIEndpoint = OpenAIEndpoint_1 = class OpenAIEndpoint extends chatEndpoin
|
|
|
67
198
|
body.stream_options = undefined;
|
|
68
199
|
if (!this.modelMetadata.capabilities.supports.thinking) {
|
|
69
200
|
body.reasoning = undefined;
|
|
201
|
+
body.include = undefined;
|
|
202
|
+
}
|
|
203
|
+
if (body.previous_response_id && !body.previous_response_id.startsWith('resp_')) {
|
|
204
|
+
// Don't use a response ID from CAPI
|
|
205
|
+
body.previous_response_id = undefined;
|
|
70
206
|
}
|
|
71
207
|
return body;
|
|
72
208
|
}
|
|
@@ -122,6 +258,9 @@ let OpenAIEndpoint = OpenAIEndpoint_1 = class OpenAIEndpoint extends chatEndpoin
|
|
|
122
258
|
else {
|
|
123
259
|
headers['Authorization'] = `Bearer ${this._apiKey}`;
|
|
124
260
|
}
|
|
261
|
+
for (const [key, value] of Object.entries(this._customHeaders)) {
|
|
262
|
+
headers[key] = value;
|
|
263
|
+
}
|
|
125
264
|
return headers;
|
|
126
265
|
}
|
|
127
266
|
async acceptChatPolicy() {
|
|
@@ -146,14 +285,13 @@ exports.OpenAIEndpoint = OpenAIEndpoint = OpenAIEndpoint_1 = __decorate([
|
|
|
146
285
|
__param(3, fetcherService_1.IFetcherService),
|
|
147
286
|
__param(4, domainService_1.IDomainService),
|
|
148
287
|
__param(5, capiClient_1.ICAPIClientService),
|
|
149
|
-
__param(6,
|
|
150
|
-
__param(7,
|
|
151
|
-
__param(8,
|
|
152
|
-
__param(9,
|
|
153
|
-
__param(10,
|
|
154
|
-
__param(11,
|
|
155
|
-
__param(12,
|
|
156
|
-
__param(13,
|
|
157
|
-
__param(14, logService_1.ILogService)
|
|
288
|
+
__param(6, telemetry_1.ITelemetryService),
|
|
289
|
+
__param(7, authentication_1.IAuthenticationService),
|
|
290
|
+
__param(8, chatMLFetcher_1.IChatMLFetcher),
|
|
291
|
+
__param(9, tokenizer_1.ITokenizerProvider),
|
|
292
|
+
__param(10, instantiation_1.IInstantiationService),
|
|
293
|
+
__param(11, configurationService_1.IConfigurationService),
|
|
294
|
+
__param(12, nullExperimentationService_1.IExperimentationService),
|
|
295
|
+
__param(13, logService_1.ILogService)
|
|
158
296
|
], OpenAIEndpoint);
|
|
159
297
|
//# sourceMappingURL=openAIEndpoint.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openAIEndpoint.js","sourceRoot":"","sources":["../../../../../../src/_internal/extension/byok/node/openAIEndpoint.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAKA,2FAAgG;AAChG,+EAA6E;AAC7E,2EAAgG;AAChG,sGAAoG;AACpG,6EAAkF;AAClF,mFAAiF;AAEjF,+EAA4E;AAC5E,wEAAsE;AACtE,
|
|
1
|
+
{"version":3,"file":"openAIEndpoint.js","sourceRoot":"","sources":["../../../../../../src/_internal/extension/byok/node/openAIEndpoint.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/_internal/extension/common/constants.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AAEtE,0BAAkB,MAAM;IACvB,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,WAAW,gBAAgB;IAC3B,cAAc,mBAAmB;IACjC,MAAM,WAAW;IACjB,cAAc,mBAAmB;IACjC,QAAQ,aAAa;IACrB,eAAe,oBAAoB;IACnC,MAAM,WAAW;IACjB,SAAS,cAAc;IACvB,OAAO,YAAY;IACnB,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/_internal/extension/common/constants.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AAEtE,0BAAkB,MAAM;IACvB,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,WAAW,gBAAgB;IAC3B,cAAc,mBAAmB;IACjC,MAAM,WAAW;IACjB,cAAc,mBAAmB;IACjC,QAAQ,aAAa;IACrB,eAAe,oBAAoB;IACnC,MAAM,WAAW;IACjB,SAAS,cAAc;IACvB,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,GAAG,QAAQ;IACX,IAAI,SAAS;IACb,KAAK,UAAU;IACf,KAAK,cAAc;IACnB,QAAQ,aAAa;IACrB,WAAW,gBAAgB;IAC3B,cAAc,mBAAmB;IACjC,QAAQ,aAAa;IACrB,UAAU,eAAe;CACzB;AAED,eAAO,MAAM,qBAAqB,oCAAoC,CAAC;AAGvE,eAAO,MAAM,gBAAgB,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA8B5E,CAAC;AAGF,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAc3H;AAED,eAAO,MAAM,YAAY,wBAAwB,CAAC"}
|
|
@@ -23,7 +23,6 @@ exports.agentsToCommands = {
|
|
|
23
23
|
},
|
|
24
24
|
["vscode" /* Intent.VSCode */]: {
|
|
25
25
|
'search': "search" /* Intent.Search */,
|
|
26
|
-
'startDebugging': "startDebugging" /* Intent.StartDebugging */,
|
|
27
26
|
},
|
|
28
27
|
["terminal" /* Intent.Terminal */]: {
|
|
29
28
|
'explain': "terminalExplain" /* Intent.TerminalExplain */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/_internal/extension/common/constants.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/_internal/extension/common/constants.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAoEhG,8CAcC;AAhFD,wEAAsE;AA8BzD,QAAA,qBAAqB,GAAG,iCAAiC,CAAC;AAEvE,oEAAoE;AACvD,QAAA,gBAAgB,GAAoD;IAChF,oCAAkB,EAAE;QACnB,SAAS,gCAAgB;QACzB,MAAM,0BAAa;QACnB,QAAQ,8BAAe;QACvB,OAAO,4BAAc;QACrB,KAAK,wBAAY;QACjB,KAAK,wBAAY;QACjB,aAAa,wCAAoB;QACjC,gBAAgB,8CAAuB;QACvC,YAAY,sCAAmB;KAC/B;IACD,8BAAe,EAAE;QAChB,QAAQ,8BAAe;KACvB;IACD,kCAAiB,EAAE;QAClB,SAAS,gDAAwB;KACjC;IACD,8BAAe,EAAE;QAChB,KAAK,wBAAY;QACjB,KAAK,wBAAY;QACjB,SAAS,gCAAgB;QACzB,QAAQ,8BAAe;QACvB,OAAO,4BAAc;QACrB,MAAM,0BAAa;QACnB,UAAU,kCAAiB;KAC3B;IACD,sCAAmB,EAAE;QACpB,YAAY,sCAAmB;KAC/B;CACD,CAAC;AAEF,oFAAoF;AACpF,SAAgB,iBAAiB,CAAC,QAAgB,EAAE,QAAsB;IACzE,IAAI,MAAM,CAAC,IAAI,CAAC,wBAAgB,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QACtD,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;IAC5B,CAAC;IAED,KAAK,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,wBAAgB,CAAC,EAAE,CAAC;QAClE,IAAI,QAAQ,KAAK,0BAAY,CAAC,MAAM,IAAI,KAAK,iCAAkB,EAAE,CAAC;YACjE,SAAS;QACV,CAAC;QAED,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YAChD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;QACrC,CAAC;IACF,CAAC;AACF,CAAC;AAEY,QAAA,YAAY,GAAG,qBAAqB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nesConfigs.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/inlineEdits/node/nesConfigs.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,WAAW;IAC3B,kBAAkB,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"nesConfigs.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/inlineEdits/node/nesConfigs.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,WAAW;IAC3B,kBAAkB,EAAE,OAAO,CAAC;CAC5B"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
import { IConfigurationService } from '../../../platform/configuration/common/configurationService';
|
|
1
2
|
import { DocumentId } from '../../../platform/inlineEdits/common/dataTypes/documentId';
|
|
2
3
|
import { ObservableWorkspace } from '../../../platform/inlineEdits/common/observableWorkspace';
|
|
3
4
|
import { ILogService } from '../../../platform/log/common/logService';
|
|
5
|
+
import { IExperimentationService } from '../../../platform/telemetry/common/nullExperimentationService';
|
|
4
6
|
import { Disposable } from '../../../util/vs/base/common/lifecycle';
|
|
5
7
|
import { AnnotatedStringReplacement, StringEdit, StringReplacement } from '../../../util/vs/editor/common/core/edits/stringEdit';
|
|
6
8
|
import { OffsetRange } from '../../../util/vs/editor/common/core/ranges/offsetRange';
|
|
@@ -34,9 +36,9 @@ export declare class NextEditCache extends Disposable {
|
|
|
34
36
|
private readonly _logService;
|
|
35
37
|
private readonly _documentCaches;
|
|
36
38
|
private readonly _sharedCache;
|
|
37
|
-
constructor(workspace: ObservableWorkspace, _logService: ILogService);
|
|
39
|
+
constructor(workspace: ObservableWorkspace, _logService: ILogService, configService: IConfigurationService, expService: IExperimentationService);
|
|
38
40
|
setKthNextEdit(docId: DocumentId, documentContents: StringText, editWindow: OffsetRange | undefined, nextEdit: StringReplacement, subsequentN: number, nextEdits: StringReplacement[] | undefined, userEditSince: StringEdit | undefined, source: NextEditFetchRequest): CachedEdit | undefined;
|
|
39
|
-
setNoNextEdit(docId: DocumentId, documentContents: StringText, editWindow: OffsetRange | undefined, source: NextEditFetchRequest
|
|
41
|
+
setNoNextEdit(docId: DocumentId, documentContents: StringText, editWindow: OffsetRange | undefined, source: NextEditFetchRequest): void;
|
|
40
42
|
lookupNextEdit(docId: DocumentId, currentDocumentContents: StringText, currentSelection: readonly OffsetRange[], nesConfigs: INesConfigs): CachedOrRebasedEdit | undefined;
|
|
41
43
|
tryRebaseCacheEntry(cachedEdit: CachedEdit, currentDocumentContents: StringText, currentSelection: readonly OffsetRange[], nesConfigs: INesConfigs): CachedOrRebasedEdit | undefined;
|
|
42
44
|
rejectedNextEdit(requestId: string): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nextEditCache.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/inlineEdits/node/nextEditCache.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,2DAA2D,CAAC;AACvF,OAAO,EAAuB,mBAAmB,EAAE,MAAM,0DAA0D,CAAC;AAEpH,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"nextEditCache.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/inlineEdits/node/nextEditCache.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
*--------------------------------------------------------------------------------------------*/
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.NextEditCache = void 0;
|
|
8
|
+
const configurationService_1 = require("../../../platform/configuration/common/configurationService");
|
|
8
9
|
const observable_1 = require("../../../platform/inlineEdits/common/utils/observable");
|
|
9
10
|
const cache_1 = require("../../../util/common/cache");
|
|
10
11
|
const tracing_1 = require("../../../util/common/tracing");
|
|
@@ -12,7 +13,7 @@ const lifecycle_1 = require("../../../util/vs/base/common/lifecycle");
|
|
|
12
13
|
const observableInternal_1 = require("../../../util/vs/base/common/observableInternal");
|
|
13
14
|
const editRebase_1 = require("../common/editRebase");
|
|
14
15
|
class NextEditCache extends lifecycle_1.Disposable {
|
|
15
|
-
constructor(workspace, _logService) {
|
|
16
|
+
constructor(workspace, _logService, configService, expService) {
|
|
16
17
|
super();
|
|
17
18
|
this.workspace = workspace;
|
|
18
19
|
this._logService = _logService;
|
|
@@ -29,6 +30,15 @@ class NextEditCache extends lifecycle_1.Disposable {
|
|
|
29
30
|
state.handleEdit(edit);
|
|
30
31
|
}
|
|
31
32
|
}
|
|
33
|
+
// if editor-change triggering is allowed,
|
|
34
|
+
// it means an edit in file A can result in a cached edit for file B to be less relevant than with the edits in file A included
|
|
35
|
+
if (configService.getExperimentBasedConfig(configurationService_1.ConfigKey.Internal.InlineEditsTriggerOnEditorChange, expService)) {
|
|
36
|
+
for (const [k, v] of this._sharedCache.entries()) {
|
|
37
|
+
if (v.docId !== doc.id) {
|
|
38
|
+
this._sharedCache.deleteKey(k);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
}
|
|
32
42
|
}));
|
|
33
43
|
store.add((0, lifecycle_1.toDisposable)(() => {
|
|
34
44
|
this._documentCaches.delete(doc.id);
|
|
@@ -42,12 +52,12 @@ class NextEditCache extends lifecycle_1.Disposable {
|
|
|
42
52
|
}
|
|
43
53
|
return docCache.setKthNextEdit(documentContents, editWindow, nextEdit, nextEdits, userEditSince, subsequentN, source);
|
|
44
54
|
}
|
|
45
|
-
setNoNextEdit(docId, documentContents, editWindow, source
|
|
55
|
+
setNoNextEdit(docId, documentContents, editWindow, source) {
|
|
46
56
|
const docCache = this._documentCaches.get(docId);
|
|
47
57
|
if (!docCache) {
|
|
48
58
|
return;
|
|
49
59
|
}
|
|
50
|
-
docCache.setNoNextEdit(documentContents, editWindow, source
|
|
60
|
+
docCache.setNoNextEdit(documentContents, editWindow, source);
|
|
51
61
|
}
|
|
52
62
|
lookupNextEdit(docId, currentDocumentContents, currentSelection, nesConfigs) {
|
|
53
63
|
const docCache = this._documentCaches.get(docId);
|
|
@@ -139,7 +149,7 @@ class DocumentEditCache {
|
|
|
139
149
|
}
|
|
140
150
|
return cachedEdit;
|
|
141
151
|
}
|
|
142
|
-
setNoNextEdit(documentContents, editWindow, source
|
|
152
|
+
setNoNextEdit(documentContents, editWindow, source) {
|
|
143
153
|
const key = this._getKey(documentContents.value);
|
|
144
154
|
const cachedEdit = { docId: this.docId, edits: [], detailedEdits: [], source, documentBeforeEdit: documentContents, editWindow, cacheTime: Date.now() };
|
|
145
155
|
const existing = this._sharedCache.get(key);
|
|
@@ -158,14 +168,11 @@ class DocumentEditCache {
|
|
|
158
168
|
if (cachedEdit) {
|
|
159
169
|
const editWindow = cachedEdit.editWindow;
|
|
160
170
|
const cursorRange = currentSelection[0];
|
|
161
|
-
if (editWindow &&
|
|
171
|
+
if (editWindow && !editWindow.containsRange(cursorRange)) {
|
|
162
172
|
return undefined;
|
|
163
173
|
}
|
|
164
174
|
return cachedEdit;
|
|
165
175
|
}
|
|
166
|
-
if (!nesConfigs.isRevisedCacheStrategy) {
|
|
167
|
-
return undefined;
|
|
168
|
-
}
|
|
169
176
|
for (const cachedEdit of this._trackedCachedEdits) {
|
|
170
177
|
const rebased = this.tryRebaseCacheEntry(cachedEdit, currentDocumentContents, currentSelection, nesConfigs);
|
|
171
178
|
if (rebased) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nextEditCache.js","sourceRoot":"","sources":["../../../../../../src/_internal/extension/inlineEdits/node/nextEditCache.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;
|
|
1
|
+
{"version":3,"file":"nextEditCache.js","sourceRoot":"","sources":["../../../../../../src/_internal/extension/inlineEdits/node/nextEditCache.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,6 @@ export declare class NextEditProvider extends Disposable implements INextEditPro
|
|
|
37
37
|
readonly ID: string;
|
|
38
38
|
private readonly _rejectionCollector;
|
|
39
39
|
private readonly _nextEditCache;
|
|
40
|
-
private readonly _recentlyShownCache;
|
|
41
40
|
private _pendingStatelessNextEditRequest;
|
|
42
41
|
private _lastShownTime;
|
|
43
42
|
private _lastRejectionTime;
|
|
@@ -57,6 +56,7 @@ export declare class NextEditProvider extends Disposable implements INextEditPro
|
|
|
57
56
|
private _joinNextEditRequest;
|
|
58
57
|
private _executeNewNextEditRequest;
|
|
59
58
|
private _hookupCancellation;
|
|
59
|
+
private computeMinimumResponseDelay;
|
|
60
60
|
handleShown(suggestion: NextEditResult): void;
|
|
61
61
|
handleAcceptance(docId: DocumentId, suggestion: NextEditResult): void;
|
|
62
62
|
handleRejection(docId: DocumentId, suggestion: NextEditResult): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nextEditProvider.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/inlineEdits/node/nextEditProvider.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAa,qBAAqB,EAAE,MAAM,6DAA6D,CAAC;AAC/G,OAAO,EAAE,UAAU,EAAE,MAAM,2DAA2D,CAAC;AAGvF,OAAO,EAAE,2BAA2B,EAAE,MAAM,2DAA2D,CAAC;AACxG,OAAO,EAAuB,mBAAmB,EAAE,MAAM,0DAA0D,CAAC;AACpH,OAAO,EAAE,0BAA0B,EAAoI,MAAM,gEAAgE,CAAC;AAE9O,OAAO,EAAmC,uBAAuB,EAAE,MAAM,kFAAkF,CAAC;AAC5J,OAAO,EAAE,qBAAqB,EAAE,MAAM,iFAAiF,CAAC;AACxH,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,+DAA+D,CAAC;AAOxG,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAE9E,OAAO,EAAE,UAAU,EAAmB,WAAW,EAAgB,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"nextEditProvider.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/inlineEdits/node/nextEditProvider.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAa,qBAAqB,EAAE,MAAM,6DAA6D,CAAC;AAC/G,OAAO,EAAE,UAAU,EAAE,MAAM,2DAA2D,CAAC;AAGvF,OAAO,EAAE,2BAA2B,EAAE,MAAM,2DAA2D,CAAC;AACxG,OAAO,EAAuB,mBAAmB,EAAE,MAAM,0DAA0D,CAAC;AACpH,OAAO,EAAE,0BAA0B,EAAoI,MAAM,gEAAgE,CAAC;AAE9O,OAAO,EAAmC,uBAAuB,EAAE,MAAM,kFAAkF,CAAC;AAC5J,OAAO,EAAE,qBAAqB,EAAE,MAAM,iFAAiF,CAAC;AACxH,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,+DAA+D,CAAC;AAOxG,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAE9E,OAAO,EAAE,UAAU,EAAmB,WAAW,EAAgB,MAAM,wCAAwC,CAAC;AAUhH,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEnE,MAAM,WAAW,iBAAiB,CAAC,CAAC,SAAS,eAAe,EAAE,UAAU,EAAE,KAAK,GAAG,IAAI,CAAE,SAAQ,WAAW;IAC1G,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,uBAAuB,EAAE,UAAU,EAAE,2BAA2B,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC/M,WAAW,CAAC,UAAU,EAAE,CAAC,GAAG,IAAI,CAAC;IACjC,gBAAgB,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,GAAG,IAAI,CAAC;IACzD,eAAe,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,GAAG,IAAI,CAAC;IACxD,aAAa,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,EAAE,uBAAuB,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI,CAAC;IAC5G,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;CACxB;AAQD,qBAAa,gBAAiB,SAAQ,UAAW,YAAW,iBAAiB,CAAC,cAAc,EAAE,sBAAsB,CAAC;IA2BnH,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,0BAA0B;IAC3C,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,cAAc;IACR,OAAO,CAAC,QAAQ,CAAC,cAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAClC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAChB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAjCtD,SAAgB,EAAE,SAAsC;IAExD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA2F;IAC/H,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAE/C,OAAO,CAAC,gCAAgC,CAA8D;IAEtG,OAAO,CAAC,cAAc,CAAK;IAE3B,OAAO,CAAC,kBAAkB,CAAK;IAC/B,IAAW,iBAAiB,WAE3B;IAED,OAAO,CAAC,gBAAgB,CAAK;IAC7B,IAAW,eAAe,WAEzB;IAED,OAAO,CAAC,mBAAmB,CAA6B;IACxD,OAAO,CAAC,uBAAuB,CAAS;IAExC,OAAO,CAAC,OAAO,CAAU;gBAGP,UAAU,EAAE,mBAAmB,EAC/B,0BAA0B,EAAE,0BAA0B,EACtD,uBAAuB,EAAE,uBAAuB,EAChD,mBAAmB,EAAE,qBAAqB,EAC1C,cAAc,EAAE,aAAa,GAAG,SAAS,EAClB,cAAc,EAAE,qBAAqB,EAC5C,cAAc,EAAE,cAAc,EACjC,WAAW,EAAE,WAAW,EACZ,WAAW,EAAE,uBAAuB;IAc/E,OAAO,CAAC,mCAAmC;IAW9B,WAAW,CACvB,KAAK,EAAE,UAAU,EACjB,OAAO,EAAE,MAAM,CAAC,uBAAuB,EACvC,UAAU,EAAE,2BAA2B,EACvC,iBAAiB,EAAE,iBAAiB,EACpC,gBAAgB,EAAE,sBAAsB,GACtC,OAAO,CAAC,cAAc,CAAC;YAwBZ,oBAAoB;IAwJlC,OAAO,CAAC,mBAAmB;IAW3B,OAAO,CAAC,WAAW;YA+BL,aAAa;YAkEb,oBAAoB;YAiBpB,0BAA0B;IAqNxC,OAAO,CAAC,mBAAmB;IA+C3B,OAAO,CAAC,2BAA2B;IAuB5B,WAAW,CAAC,UAAU,EAAE,cAAc;IAItC,gBAAgB,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,cAAc;IAa9D,eAAe,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,cAAc;IAgB7D,aAAa,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,YAAY,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI;YAEtG,SAAS;IAOhB,UAAU;CAIjB;AASD,qBAAa,oBAAoB;aAGf,aAAa,EAAE,MAAM;aACrB,GAAG,EAAE,2BAA2B;aAChC,4BAA4B,EAAE,MAAM,GAAG,SAAS;IAJjE,SAAgB,eAAe,SAAkB;gBAEhC,aAAa,EAAE,MAAM,EACrB,GAAG,EAAE,2BAA2B,EAChC,4BAA4B,EAAE,MAAM,GAAG,SAAS;CAGjE"}
|