@theia/ai-copilot 1.75.0-next.4 → 1.75.0-next.43
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/lib/browser/copilot-auth-dialog.js +9 -58
- package/lib/browser/copilot-auth-dialog.js.map +1 -1
- package/lib/common/copilot-preferences.d.ts.map +1 -1
- package/lib/common/copilot-preferences.js +1 -0
- package/lib/common/copilot-preferences.js.map +1 -1
- package/lib/node/copilot-auth-service-impl.js +1 -1
- package/lib/node/copilot-auth-service-impl.js.map +1 -1
- package/lib/node/copilot-language-models-manager-impl.d.ts +2 -1
- package/lib/node/copilot-language-models-manager-impl.d.ts.map +1 -1
- package/lib/node/copilot-language-models-manager-impl.js +9 -4
- package/lib/node/copilot-language-models-manager-impl.js.map +1 -1
- package/package.json +6 -6
- package/src/common/copilot-preferences.ts +2 -1
- package/src/node/copilot-auth-service-impl.ts +1 -1
- package/src/node/copilot-language-models-manager-impl.ts +9 -6
|
@@ -1,23 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
// *****************************************************************************
|
|
3
|
-
// Copyright (C) 2026 EclipseSource GmbH.
|
|
4
|
-
//
|
|
5
|
-
// This program and the accompanying materials are made available under the
|
|
6
|
-
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
7
|
-
// http://www.eclipse.org/legal/epl-2.0.
|
|
8
|
-
//
|
|
9
|
-
// This Source Code may also be made available under the following Secondary
|
|
10
|
-
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
11
|
-
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
12
|
-
// with the GNU Classpath Exception which is available at
|
|
13
|
-
// https://www.gnu.org/software/classpath/license.html.
|
|
14
|
-
//
|
|
15
|
-
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
|
-
// *****************************************************************************
|
|
17
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
3
|
exports.CopilotAuthDialog = exports.CopilotAuthDialogProps = void 0;
|
|
19
4
|
const tslib_1 = require("tslib");
|
|
20
|
-
const
|
|
5
|
+
const jsx_runtime_1 = require("@theia/core/shared/react/jsx-runtime");
|
|
21
6
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
22
7
|
const dialogs_1 = require("@theia/core/lib/browser/dialogs");
|
|
23
8
|
const react_dialog_1 = require("@theia/core/lib/browser/dialogs/react-dialog");
|
|
@@ -144,7 +129,7 @@ let CopilotAuthDialog = class CopilotAuthDialog extends react_dialog_1.ReactDial
|
|
|
144
129
|
return '';
|
|
145
130
|
}
|
|
146
131
|
render() {
|
|
147
|
-
return (
|
|
132
|
+
return ((0, jsx_runtime_1.jsx)("div", { className: "theia-copilot-auth-dialog-content", children: this.renderContent() }));
|
|
148
133
|
}
|
|
149
134
|
renderContent() {
|
|
150
135
|
switch (this.state) {
|
|
@@ -163,56 +148,22 @@ let CopilotAuthDialog = class CopilotAuthDialog extends react_dialog_1.ReactDial
|
|
|
163
148
|
}
|
|
164
149
|
}
|
|
165
150
|
renderLoading() {
|
|
166
|
-
return (
|
|
167
|
-
React.createElement("div", { className: "theia-spin" },
|
|
168
|
-
React.createElement("span", { className: "codicon codicon-loading" })),
|
|
169
|
-
React.createElement("p", null, core_1.nls.localize('theia/ai/copilot/auth/initiating', 'Initiating authentication...'))));
|
|
151
|
+
return ((0, jsx_runtime_1.jsxs)("div", { className: "theia-copilot-auth-state", children: [(0, jsx_runtime_1.jsx)("div", { className: "theia-spin", children: (0, jsx_runtime_1.jsx)("span", { className: "codicon codicon-loading" }) }), (0, jsx_runtime_1.jsx)("p", { children: core_1.nls.localize('theia/ai/copilot/auth/initiating', 'Initiating authentication...') })] }));
|
|
170
152
|
}
|
|
171
153
|
renderWaiting() {
|
|
172
154
|
const response = this.deviceCodeResponse;
|
|
173
|
-
return (
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
React.createElement("div", { className: "theia-copilot-auth-code-display" },
|
|
177
|
-
React.createElement("span", { className: "theia-copilot-auth-code" }, response.user_code),
|
|
178
|
-
React.createElement("button", { className: "theia-button secondary theia-copilot-copy-button", onClick: this.handleCopyCode, title: this.copied
|
|
179
|
-
? core_1.nls.localize('theia/ai/copilot/auth/copied', 'Copied!')
|
|
180
|
-
: core_1.nls.localize('theia/ai/copilot/auth/copyCode', 'Copy code') },
|
|
181
|
-
React.createElement("span", { className: `codicon ${this.copied ? 'codicon-check' : 'codicon-copy'}` }),
|
|
182
|
-
core_1.nls.localizeByDefault('Copy')))),
|
|
183
|
-
React.createElement("div", { className: "theia-copilot-auth-url-section" },
|
|
184
|
-
React.createElement("button", { className: "theia-button theia-copilot-open-url-button", onClick: this.handleOpenUrl },
|
|
185
|
-
React.createElement("span", { className: "codicon codicon-link-external" }),
|
|
186
|
-
core_1.nls.localize('theia/ai/copilot/auth/openGitHub', 'Open GitHub')),
|
|
187
|
-
React.createElement("span", { className: "theia-copilot-auth-url" }, response.verification_uri)),
|
|
188
|
-
React.createElement("p", { className: "theia-copilot-auth-hint" }, core_1.nls.localize('theia/ai/copilot/auth/hint', 'After entering the code and authorizing, click "I have authorized" below.')),
|
|
189
|
-
React.createElement("div", { className: "theia-copilot-auth-privacy" },
|
|
190
|
-
React.createElement("p", { className: "theia-copilot-auth-privacy-text" }, this.messages.privacyNotice),
|
|
191
|
-
React.createElement("p", { className: "theia-copilot-auth-tos-text" },
|
|
192
|
-
core_1.nls.localize('theia/ai/copilot/auth/tos', 'By signing in, you agree to the '),
|
|
193
|
-
React.createElement("a", { href: "https://docs.github.com/en/site-policy/github-terms/github-terms-of-service", target: "_blank", rel: "noopener noreferrer", onClick: this.handleOpenTos }, core_1.nls.localize('theia/ai/copilot/auth/tosLink', 'GitHub Terms of Service')),
|
|
194
|
-
"."))));
|
|
155
|
+
return ((0, jsx_runtime_1.jsxs)("div", { className: "theia-copilot-auth-waiting", children: [(0, jsx_runtime_1.jsx)("p", { className: "theia-copilot-auth-instructions", children: this.messages.instructions }), (0, jsx_runtime_1.jsx)("div", { className: "theia-copilot-auth-code-section", children: (0, jsx_runtime_1.jsxs)("div", { className: "theia-copilot-auth-code-display", children: [(0, jsx_runtime_1.jsx)("span", { className: "theia-copilot-auth-code", children: response.user_code }), (0, jsx_runtime_1.jsxs)("button", { className: "theia-button secondary theia-copilot-copy-button", onClick: this.handleCopyCode, title: this.copied
|
|
156
|
+
? core_1.nls.localize('theia/ai/copilot/auth/copied', 'Copied!')
|
|
157
|
+
: core_1.nls.localize('theia/ai/copilot/auth/copyCode', 'Copy code'), children: [(0, jsx_runtime_1.jsx)("span", { className: `codicon ${this.copied ? 'codicon-check' : 'codicon-copy'}` }), core_1.nls.localizeByDefault('Copy')] })] }) }), (0, jsx_runtime_1.jsxs)("div", { className: "theia-copilot-auth-url-section", children: [(0, jsx_runtime_1.jsxs)("button", { className: "theia-button theia-copilot-open-url-button", onClick: this.handleOpenUrl, children: [(0, jsx_runtime_1.jsx)("span", { className: "codicon codicon-link-external" }), core_1.nls.localize('theia/ai/copilot/auth/openGitHub', 'Open GitHub')] }), (0, jsx_runtime_1.jsx)("span", { className: "theia-copilot-auth-url", children: response.verification_uri })] }), (0, jsx_runtime_1.jsx)("p", { className: "theia-copilot-auth-hint", children: core_1.nls.localize('theia/ai/copilot/auth/hint', 'After entering the code and authorizing, click "I have authorized" below.') }), (0, jsx_runtime_1.jsxs)("div", { className: "theia-copilot-auth-privacy", children: [(0, jsx_runtime_1.jsx)("p", { className: "theia-copilot-auth-privacy-text", children: this.messages.privacyNotice }), (0, jsx_runtime_1.jsxs)("p", { className: "theia-copilot-auth-tos-text", children: [core_1.nls.localize('theia/ai/copilot/auth/tos', 'By signing in, you agree to the '), (0, jsx_runtime_1.jsx)("a", { href: "https://docs.github.com/en/site-policy/github-terms/github-terms-of-service", target: "_blank", rel: "noopener noreferrer", onClick: this.handleOpenTos, children: core_1.nls.localize('theia/ai/copilot/auth/tosLink', 'GitHub Terms of Service') }), "."] })] })] }));
|
|
195
158
|
}
|
|
196
159
|
renderPolling() {
|
|
197
|
-
return (
|
|
198
|
-
React.createElement("div", { className: "theia-spin" },
|
|
199
|
-
React.createElement("span", { className: "codicon codicon-loading" })),
|
|
200
|
-
React.createElement("p", null, core_1.nls.localize('theia/ai/copilot/auth/verifying', 'Verifying authorization...'))));
|
|
160
|
+
return ((0, jsx_runtime_1.jsxs)("div", { className: "theia-copilot-auth-state", children: [(0, jsx_runtime_1.jsx)("div", { className: "theia-spin", children: (0, jsx_runtime_1.jsx)("span", { className: "codicon codicon-loading" }) }), (0, jsx_runtime_1.jsx)("p", { children: core_1.nls.localize('theia/ai/copilot/auth/verifying', 'Verifying authorization...') })] }));
|
|
201
161
|
}
|
|
202
162
|
renderSuccess() {
|
|
203
|
-
return (
|
|
204
|
-
React.createElement("span", { className: "codicon codicon-check" }),
|
|
205
|
-
React.createElement("p", null, core_1.nls.localize('theia/ai/copilot/auth/success', 'Successfully signed in to GitHub Copilot!')),
|
|
206
|
-
React.createElement("p", { className: "theia-copilot-auth-success-hint" },
|
|
207
|
-
core_1.nls.localize('theia/ai/copilot/auth/successHint', 'If your GitHub account has access to Copilot, you can now configure Copilot language models in the '),
|
|
208
|
-
React.createElement("a", { href: "#", onClick: this.handleOpenAIConfig }, core_1.nls.localize('theia/ai/copilot/auth/aiConfiguration', 'AI Configuration')),
|
|
209
|
-
".")));
|
|
163
|
+
return ((0, jsx_runtime_1.jsxs)("div", { className: "theia-copilot-auth-state theia-copilot-auth-success", children: [(0, jsx_runtime_1.jsx)("span", { className: "codicon codicon-check" }), (0, jsx_runtime_1.jsx)("p", { children: core_1.nls.localize('theia/ai/copilot/auth/success', 'Successfully signed in to GitHub Copilot!') }), (0, jsx_runtime_1.jsxs)("p", { className: "theia-copilot-auth-success-hint", children: [core_1.nls.localize('theia/ai/copilot/auth/successHint', 'If your GitHub account has access to Copilot, you can now configure Copilot language models in the '), (0, jsx_runtime_1.jsx)("a", { href: "#", onClick: this.handleOpenAIConfig, children: core_1.nls.localize('theia/ai/copilot/auth/aiConfiguration', 'AI Configuration') }), "."] })] }));
|
|
210
164
|
}
|
|
211
165
|
renderError() {
|
|
212
|
-
return (
|
|
213
|
-
React.createElement("span", { className: "codicon codicon-error" }),
|
|
214
|
-
React.createElement("p", null, this.errorMessage),
|
|
215
|
-
React.createElement("button", { className: "theia-button", onClick: this.handleRetry }, core_1.nls.localizeByDefault('Try Again'))));
|
|
166
|
+
return ((0, jsx_runtime_1.jsxs)("div", { className: "theia-copilot-auth-state theia-copilot-auth-error", children: [(0, jsx_runtime_1.jsx)("span", { className: "codicon codicon-error" }), (0, jsx_runtime_1.jsx)("p", { children: this.errorMessage }), (0, jsx_runtime_1.jsx)("button", { className: "theia-button", onClick: this.handleRetry, children: core_1.nls.localizeByDefault('Try Again') })] }));
|
|
216
167
|
}
|
|
217
168
|
};
|
|
218
169
|
exports.CopilotAuthDialog = CopilotAuthDialog;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot-auth-dialog.js","sourceRoot":"","sources":["../../src/browser/copilot-auth-dialog.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"copilot-auth-dialog.js","sourceRoot":"","sources":["../../src/browser/copilot-auth-dialog.tsx"],"names":[],"mappings":";;;;;AAiBA,4DAAiF;AACjF,6DAA2E;AAC3E,+EAA2E;AAC3E,iFAA6E;AAC7E,kFAA8E;AAC9E,sCAAkD;AAClD,yEAAwF;AACxF,iFAA2E;AAE3E,MAAM,2BAA2B,GAAG,sBAAsB,CAAC;AAKpD,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,qBAAW;CAEtD,CAAA;AAFY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CAElC;AAGM,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,0BAAoB;aAsBvC,OAAE,GAAG,qBAAqB,AAAxB,CAAyB;IAE3C,YACoC,KAAyD;QAEzF,KAAK,CAAC,KAAK,CAAC,CAAC;QAF+C,UAAK,GAAL,KAAK,CAAwB;QARnF,UAAK,GAAoB,SAAS,CAAC;QAGnC,WAAM,GAAG,KAAK,CAAC;QAoGf,mBAAc,GAAG,KAAK,IAAmB,EAAE;YACjD,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC1B,MAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;gBACzE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;gBACnB,IAAI,CAAC,MAAM,EAAE,CAAC;gBACd,UAAU,CAAC,GAAG,EAAE;oBACZ,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;oBACpB,IAAI,CAAC,MAAM,EAAE,CAAC;gBAClB,CAAC,EAAE,IAAI,CAAC,CAAC;YACb,CAAC;QACL,CAAC,CAAC;QAEQ,kBAAa,GAAG,GAAS,EAAE;YACjC,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC1B,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;YACnG,CAAC;QACL,CAAC,CAAC;QAmGQ,kBAAa,GAAG,CAAC,CAAmB,EAAQ,EAAE;YACpD,CAAC,CAAC,cAAc,EAAE,CAAC;YACnB,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,6EAA6E,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QACxI,CAAC,CAAC;QA6BQ,uBAAkB,GAAG,CAAC,CAAmB,EAAQ,EAAE;YACzD,CAAC,CAAC,cAAc,EAAE,CAAC;YACnB,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,2BAA2B,CAAC,CAAC;QACpE,CAAC,CAAC;QAEQ,gBAAW,GAAG,GAAS,EAAE;YAC/B,IAAI,CAAC,YAAY,EAAE,CAAC;QACxB,CAAC,CAAC;IAtPF,CAAC;IAGS,IAAI;QACV,IAAI,CAAC,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;QAC9C,IAAI,CAAC,kBAAkB,CAAC,UAAG,CAAC,QAAQ,CAAC,iCAAiC,EAAE,mBAAmB,CAAC,CAAC,CAAC;QAC9F,IAAI,CAAC,iBAAiB,CAAC,UAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC5D,CAAC;IAES,kBAAkB;QACxB,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC;QAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC;QAC3C,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACpB,IAAI,CAAC,YAAY,CAAC,QAAQ,GAAG,SAAS,IAAI,SAAS,CAAC;YACpD,IAAI,SAAS,EAAE,CAAC;gBACZ,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;YAC7C,CAAC;QACL,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,IAAI,SAAS,EAAE,CAAC;gBACZ,IAAI,CAAC,WAAW,CAAC,WAAW,GAAG,UAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YAClE,CAAC;QACL,CAAC;IACL,CAAC;IAEQ,KAAK,CAAC,IAAI;QACf,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;IACxB,CAAC;IAEQ,MAAM;QACX,KAAK,CAAC,MAAM,EAAE,CAAC;QACf,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAC9B,CAAC;IAES,KAAK,CAAC,YAAY;QACxB,IAAI,CAAC;YACD,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;YACvB,IAAI,CAAC,MAAM,EAAE,CAAC;YAEd,IAAI,CAAC,kBAAkB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YAC9F,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;YACvB,IAAI,CAAC,MAAM,EAAE,CAAC;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC;YACrB,IAAI,CAAC,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC3E,IAAI,CAAC,MAAM,EAAE,CAAC;QAClB,CAAC;IACL,CAAC;IAEkB,KAAK,CAAC,MAAM;QAC3B,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACvD,OAAO;QACX,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACvB,IAAI,CAAC,MAAM,EAAE,CAAC;QAEd,IAAI,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAC/C,IAAI,CAAC,kBAAkB,CAAC,WAAW,EACnC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAChC,IAAI,CAAC,KAAK,CAAC,aAAa,CAC3B,CAAC;YAEF,IAAI,OAAO,EAAE,CAAC;gBACV,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;gBACvB,IAAI,CAAC,MAAM,EAAE,CAAC;YAClB,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC;gBACrB,IAAI,CAAC,YAAY,GAAG,UAAG,CAAC,QAAQ,CAAC,+BAA+B,EAC5D,wDAAwD,CAAC,CAAC;gBAC9D,IAAI,CAAC,MAAM,EAAE,CAAC;YAClB,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC;YACrB,IAAI,CAAC,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC3E,IAAI,CAAC,MAAM,EAAE,CAAC;QAClB,CAAC;IACL,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC;IACpC,CAAC;IAEkB,OAAO,CAAC,MAAe,EAAE,KAAkB;QAC1D,IAAI,IAAI,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,YAAY,IAAI,mBAAmB,CAAC;QACpD,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAoBS,MAAM;QACZ,OAAO,CACH,gCAAK,SAAS,EAAC,mCAAmC,YAC7C,IAAI,CAAC,aAAa,EAAE,GACnB,CACT,CAAC;IACN,CAAC;IAES,aAAa;QACnB,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC;YACjB,KAAK,SAAS;gBACV,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC;YAChC,KAAK,SAAS;gBACV,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC;YAChC,KAAK,SAAS;gBACV,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC;YAChC,KAAK,SAAS;gBACV,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC;YAChC,KAAK,OAAO;gBACR,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;YAC9B;gBACI,OAAO,SAAS,CAAC;QACzB,CAAC;IACL,CAAC;IAES,aAAa;QACnB,OAAO,CACH,iCAAK,SAAS,EAAC,0BAA0B,aACrC,gCAAK,SAAS,EAAC,YAAY,YACvB,iCAAM,SAAS,EAAC,yBAAyB,GAAQ,GAC/C,EACN,wCAAI,UAAG,CAAC,QAAQ,CAAC,kCAAkC,EAAE,8BAA8B,CAAC,GAAK,IACvF,CACT,CAAC;IACN,CAAC;IAES,aAAa;QACnB,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAmB,CAAC;QAC1C,OAAO,CACH,iCAAK,SAAS,EAAC,4BAA4B,aACvC,8BAAG,SAAS,EAAC,iCAAiC,YACzC,IAAI,CAAC,QAAQ,CAAC,YAAY,GAC3B,EAEJ,gCAAK,SAAS,EAAC,iCAAiC,YAC5C,iCAAK,SAAS,EAAC,iCAAiC,aAC5C,iCAAM,SAAS,EAAC,yBAAyB,YAAE,QAAQ,CAAC,SAAS,GAAQ,EACrE,oCACI,SAAS,EAAC,kDAAkD,EAC5D,OAAO,EAAE,IAAI,CAAC,cAAc,EAC5B,KAAK,EAAE,IAAI,CAAC,MAAM;oCACd,CAAC,CAAC,UAAG,CAAC,QAAQ,CAAC,8BAA8B,EAAE,SAAS,CAAC;oCACzD,CAAC,CAAC,UAAG,CAAC,QAAQ,CAAC,gCAAgC,EAAE,WAAW,CAAC,aAEjE,iCAAM,SAAS,EAAE,WAAW,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,EAAE,GAAS,EACpF,UAAG,CAAC,iBAAiB,CAAC,MAAM,CAAC,IACzB,IACP,GACJ,EAEN,iCAAK,SAAS,EAAC,gCAAgC,aAC3C,oCACI,SAAS,EAAC,4CAA4C,EACtD,OAAO,EAAE,IAAI,CAAC,aAAa,aAE3B,iCAAM,SAAS,EAAC,+BAA+B,GAAQ,EACtD,UAAG,CAAC,QAAQ,CAAC,kCAAkC,EAAE,aAAa,CAAC,IAC3D,EACT,iCAAM,SAAS,EAAC,wBAAwB,YAAE,QAAQ,CAAC,gBAAgB,GAAQ,IACzE,EAEN,8BAAG,SAAS,EAAC,yBAAyB,YACjC,UAAG,CAAC,QAAQ,CAAC,4BAA4B,EACtC,2EAA2E,CAAC,GAChF,EAEJ,iCAAK,SAAS,EAAC,4BAA4B,aACvC,8BAAG,SAAS,EAAC,iCAAiC,YACzC,IAAI,CAAC,QAAQ,CAAC,aAAa,GAC5B,EACJ,+BAAG,SAAS,EAAC,6BAA6B,aACrC,UAAG,CAAC,QAAQ,CAAC,2BAA2B,EACrC,kCAAkC,CAAC,EACvC,8BACI,IAAI,EAAC,6EAA6E,EAClF,MAAM,EAAC,QAAQ,EACf,GAAG,EAAC,qBAAqB,EACzB,OAAO,EAAE,IAAI,CAAC,aAAa,YAE1B,UAAG,CAAC,QAAQ,CAAC,+BAA+B,EAAE,yBAAyB,CAAC,GACzE,SACJ,IACF,IACJ,CACT,CAAC;IACN,CAAC;IAOS,aAAa;QACnB,OAAO,CACH,iCAAK,SAAS,EAAC,0BAA0B,aACrC,gCAAK,SAAS,EAAC,YAAY,YACvB,iCAAM,SAAS,EAAC,yBAAyB,GAAQ,GAC/C,EACN,wCAAI,UAAG,CAAC,QAAQ,CAAC,iCAAiC,EAAE,4BAA4B,CAAC,GAAK,IACpF,CACT,CAAC;IACN,CAAC;IAES,aAAa;QACnB,OAAO,CACH,iCAAK,SAAS,EAAC,qDAAqD,aAChE,iCAAM,SAAS,EAAC,uBAAuB,GAAQ,EAC/C,wCAAI,UAAG,CAAC,QAAQ,CAAC,+BAA+B,EAAE,2CAA2C,CAAC,GAAK,EACnG,+BAAG,SAAS,EAAC,iCAAiC,aACzC,UAAG,CAAC,QAAQ,CAAC,mCAAmC,EAC7C,qGAAqG,CAAC,EAC1G,8BAAG,IAAI,EAAC,GAAG,EAAC,OAAO,EAAE,IAAI,CAAC,kBAAkB,YACvC,UAAG,CAAC,QAAQ,CAAC,uCAAuC,EAAE,kBAAkB,CAAC,GAC1E,SACJ,IACF,CACT,CAAC;IACN,CAAC;IAWS,WAAW;QACjB,OAAO,CACH,iCAAK,SAAS,EAAC,mDAAmD,aAC9D,iCAAM,SAAS,EAAC,uBAAuB,GAAQ,EAC/C,wCAAI,IAAI,CAAC,YAAY,GAAK,EAC1B,mCACI,SAAS,EAAC,cAAc,EACxB,OAAO,EAAE,IAAI,CAAC,WAAW,YAExB,UAAG,CAAC,iBAAiB,CAAC,WAAW,CAAC,GAC9B,IACP,CACT,CAAC;IACN,CAAC;;AAjSQ,8CAAiB;AAGP;IADlB,IAAA,kBAAM,EAAC,yCAAkB,CAAC;;sDACwB;AAGhC;IADlB,IAAA,kBAAM,EAAC,oCAAgB,CAAC;;2DAC6B;AAGnC;IADlB,IAAA,kBAAM,EAAC,8BAAa,CAAC;;wDAC0B;AAG7B;IADlB,IAAA,kBAAM,EAAC,qBAAc,CAAC;;yDAC2B;AAG/B;IADlB,IAAA,kBAAM,EAAC,wDAAyB,CAAC;;mDACqB;AAgB7C;IADT,IAAA,yBAAa,GAAE;;;;6CAKf;4BAnCQ,iBAAiB;IAD7B,IAAA,sBAAU,GAAE;IA0BJ,mBAAA,IAAA,kBAAM,EAAC,sBAAsB,CAAC,CAAA;6CAAoC,sBAAsB;GAzBpF,iBAAiB,CAkS7B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot-preferences.d.ts","sourceRoot":"","sources":["../../src/common/copilot-preferences.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAO,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,eAAO,MAAM,oBAAoB,gCAAgC,CAAC;AAClE,eAAO,MAAM,4BAA4B,uCAAuC,CAAC;AACjF,eAAO,MAAM,2BAA2B,sCAAsC,CAAC;AAE/E,eAAO,MAAM,wBAAwB,EAAE,
|
|
1
|
+
{"version":3,"file":"copilot-preferences.d.ts","sourceRoot":"","sources":["../../src/common/copilot-preferences.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAO,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,eAAO,MAAM,oBAAoB,gCAAgC,CAAC;AAClE,eAAO,MAAM,4BAA4B,uCAAuC,CAAC;AACjF,eAAO,MAAM,2BAA2B,sCAAsC,CAAC;AAE/E,eAAO,MAAM,wBAAwB,EAAE,gBA+BtC,CAAC"}
|
|
@@ -25,6 +25,7 @@ exports.CopilotPreferencesSchema = {
|
|
|
25
25
|
properties: {
|
|
26
26
|
[exports.COPILOT_ENABLED_PREF]: {
|
|
27
27
|
type: 'boolean',
|
|
28
|
+
typeDetails: { [ai_core_preferences_1.MODEL_PROVIDER_TYPE_DETAIL]: { label: 'GitHub Copilot' } },
|
|
28
29
|
markdownDescription: core_1.nls.localize('theia/ai/copilot/enabled/mdDescription', 'Enable the GitHub Copilot provider. When enabled, a status bar entry '
|
|
29
30
|
+ 'appears for authentication and available models are discovered from your Copilot subscription.'),
|
|
30
31
|
title: ai_core_preferences_1.AI_CORE_PREFERENCES_TITLE,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot-preferences.js","sourceRoot":"","sources":["../../src/common/copilot-preferences.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,
|
|
1
|
+
{"version":3,"file":"copilot-preferences.js","sourceRoot":"","sources":["../../src/common/copilot-preferences.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,uFAA+I;AAC/I,sCAAoD;AAEvC,QAAA,oBAAoB,GAAG,6BAA6B,CAAC;AACrD,QAAA,4BAA4B,GAAG,oCAAoC,CAAC;AACpE,QAAA,2BAA2B,GAAG,mCAAmC,CAAC;AAElE,QAAA,wBAAwB,GAAqB;IACtD,UAAU,EAAE;QACR,CAAC,4BAAoB,CAAC,EAAE;YACpB,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,EAAE,CAAC,gDAA0B,CAAC,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAoC,EAAE;YAC5G,mBAAmB,EAAE,UAAG,CAAC,QAAQ,CAAC,wCAAwC,EACtE,uEAAuE;kBACrE,gGAAgG,CAAC;YACvG,KAAK,EAAE,+CAAyB;YAChC,OAAO,EAAE,IAAI;SAChB;QACD,CAAC,oCAA4B,CAAC,EAAE;YAC5B,IAAI,EAAE,OAAO;YACb,mBAAmB,EAAE,UAAG,CAAC,QAAQ,CAAC,+CAA+C,EAC7E,+DAA+D;kBAC7D,wFAAwF;kBACxF,oDAAoD,CAAC;YAC3D,KAAK,EAAE,+CAAyB;YAChC,OAAO,EAAE,EAAE;YACX,KAAK,EAAE;gBACH,IAAI,EAAE,QAAQ;aACjB;SACJ;QACD,CAAC,mCAA2B,CAAC,EAAE;YAC3B,IAAI,EAAE,QAAQ;YACd,mBAAmB,EAAE,UAAG,CAAC,QAAQ,CAAC,8CAA8C,EAC5E,sGAAsG,CAAC;YAC3G,KAAK,EAAE,+CAAyB;YAChC,OAAO,EAAE,EAAE;SACd;KACJ;CACJ,CAAC"}
|
|
@@ -171,7 +171,7 @@ let CopilotAuthServiceImpl = class CopilotAuthServiceImpl {
|
|
|
171
171
|
const credentials = JSON.parse(stored);
|
|
172
172
|
// Tokens from the current OAuth App start with 'gho_'; other prefixes (e.g. 'ghu_') indicate a token from the previous GitHub App (Iv-prefixed client ID).
|
|
173
173
|
if (!credentials.accessToken.startsWith('gho_')) {
|
|
174
|
-
|
|
174
|
+
this.logger.info('Copilot: clearing outdated GitHub App token. Please sign in again.');
|
|
175
175
|
await this.keyStoreService.deletePassword(this.oauthConfig.keystoreService, this.oauthConfig.keystoreAccount);
|
|
176
176
|
this.cachedState = { isAuthenticated: false, migrationRequired: true };
|
|
177
177
|
return this.cachedState;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot-auth-service-impl.js","sourceRoot":"","sources":["../../src/node/copilot-auth-service-impl.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"copilot-auth-service-impl.js","sourceRoot":"","sources":["../../src/node/copilot-auth-service-impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { LanguageModelRegistry, LanguageModelStatus } from '@theia/ai-core';
|
|
2
|
-
import { Disposable, DisposableCollection } from '@theia/core';
|
|
2
|
+
import { Disposable, DisposableCollection, ILogger } from '@theia/core';
|
|
3
3
|
import { CopilotLanguageModelsManager, CopilotModelDescription } from '../common';
|
|
4
4
|
import { CopilotOAuthConfig } from '../common/copilot-oauth-config';
|
|
5
5
|
import { CopilotAuthServiceImpl } from './copilot-auth-service-impl';
|
|
@@ -11,6 +11,7 @@ export declare class CopilotLanguageModelsManagerImpl implements CopilotLanguage
|
|
|
11
11
|
protected readonly languageModelRegistry: LanguageModelRegistry;
|
|
12
12
|
protected readonly authService: CopilotAuthServiceImpl;
|
|
13
13
|
protected readonly oauthConfig: CopilotOAuthConfig;
|
|
14
|
+
protected readonly logger: ILogger;
|
|
14
15
|
protected enterpriseUrl: string | undefined;
|
|
15
16
|
protected readonly toDispose: DisposableCollection;
|
|
16
17
|
protected init(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot-language-models-manager-impl.d.ts","sourceRoot":"","sources":["../../src/node/copilot-language-models-manager-impl.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"copilot-language-models-manager-impl.d.ts","sourceRoot":"","sources":["../../src/node/copilot-language-models-manager-impl.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAExE,OAAO,EAAE,4BAA4B,EAAE,uBAAuB,EAA6C,MAAM,WAAW,CAAC;AAC7H,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAEpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE;;;GAGG;AACH,qBACa,gCAAiC,YAAW,4BAA4B,EAAE,UAAU;IAG7F,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGhE,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,sBAAsB,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAC;IAGnD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,SAAS,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5C,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAA8B;IAG1D,SAAS,CAAC,IAAI,IAAI,IAAI;IAMtB,OAAO,IAAI,IAAI;IAIf,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;cAI/B,eAAe,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAQzD,4BAA4B,CAAC,GAAG,iBAAiB,EAAE,uBAAuB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAoClG,oBAAoB,CAAC,GAAG,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI;IAI3C,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAapC,sBAAsB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAmCjD;;;;;;OAMG;IACH,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE;YAAE,MAAM,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC,GAAG,MAAM,EAAE;CAyB3G"}
|
|
@@ -56,7 +56,7 @@ let CopilotLanguageModelsManagerImpl = class CopilotLanguageModelsManagerImpl {
|
|
|
56
56
|
const model = await this.languageModelRegistry.getLanguageModel(modelDescription.id);
|
|
57
57
|
if (model) {
|
|
58
58
|
if (!(model instanceof copilot_language_model_1.CopilotLanguageModel)) {
|
|
59
|
-
|
|
59
|
+
this.logger.warn(`Copilot: model ${modelDescription.id} is not a Copilot model`);
|
|
60
60
|
continue;
|
|
61
61
|
}
|
|
62
62
|
await this.languageModelRegistry.patchLanguageModel(modelDescription.id, {
|
|
@@ -103,17 +103,17 @@ let CopilotLanguageModelsManagerImpl = class CopilotLanguageModelsManagerImpl {
|
|
|
103
103
|
}
|
|
104
104
|
});
|
|
105
105
|
if (!response.ok) {
|
|
106
|
-
|
|
106
|
+
this.logger.warn(`Copilot: failed to fetch available models: ${response.status} ${response.statusText}`);
|
|
107
107
|
return [];
|
|
108
108
|
}
|
|
109
109
|
const data = await response.json();
|
|
110
110
|
const models = data.data ?? [];
|
|
111
111
|
const modelIds = this.deduplicateModels(models);
|
|
112
|
-
|
|
112
|
+
this.logger.info(`Copilot: discovered ${modelIds.length} available models: ${modelIds.join(', ')}`);
|
|
113
113
|
return modelIds;
|
|
114
114
|
}
|
|
115
115
|
catch (error) {
|
|
116
|
-
|
|
116
|
+
this.logger.warn('Copilot: failed to fetch available models:', error);
|
|
117
117
|
return [];
|
|
118
118
|
}
|
|
119
119
|
}
|
|
@@ -163,6 +163,11 @@ tslib_1.__decorate([
|
|
|
163
163
|
(0, inversify_1.inject)(copilot_oauth_config_1.CopilotOAuthConfig),
|
|
164
164
|
tslib_1.__metadata("design:type", Object)
|
|
165
165
|
], CopilotLanguageModelsManagerImpl.prototype, "oauthConfig", void 0);
|
|
166
|
+
tslib_1.__decorate([
|
|
167
|
+
(0, inversify_1.inject)(core_1.ILogger),
|
|
168
|
+
(0, inversify_1.named)('ai-copilot:CopilotLanguageModelsManagerImpl'),
|
|
169
|
+
tslib_1.__metadata("design:type", Object)
|
|
170
|
+
], CopilotLanguageModelsManagerImpl.prototype, "logger", void 0);
|
|
166
171
|
tslib_1.__decorate([
|
|
167
172
|
(0, inversify_1.postConstruct)(),
|
|
168
173
|
tslib_1.__metadata("design:type", Function),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot-language-models-manager-impl.js","sourceRoot":"","sources":["../../src/node/copilot-language-models-manager-impl.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4CAA4E;AAC5E,
|
|
1
|
+
{"version":3,"file":"copilot-language-models-manager-impl.js","sourceRoot":"","sources":["../../src/node/copilot-language-models-manager-impl.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/ai-copilot",
|
|
3
|
-
"version": "1.75.0-next.
|
|
3
|
+
"version": "1.75.0-next.43+8b231a496",
|
|
4
4
|
"description": "Theia - GitHub Copilot Integration",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/ai-core": "1.75.0-next.
|
|
7
|
-
"@theia/ai-openai": "1.75.0-next.
|
|
8
|
-
"@theia/core": "1.75.0-next.
|
|
9
|
-
"openai": "^6.
|
|
6
|
+
"@theia/ai-core": "1.75.0-next.43+8b231a496",
|
|
7
|
+
"@theia/ai-openai": "1.75.0-next.43+8b231a496",
|
|
8
|
+
"@theia/core": "1.75.0-next.43+8b231a496",
|
|
9
|
+
"openai": "^6.49.0",
|
|
10
10
|
"tslib": "^2.8.1"
|
|
11
11
|
},
|
|
12
12
|
"publishConfig": {
|
|
@@ -48,5 +48,5 @@
|
|
|
48
48
|
"nyc": {
|
|
49
49
|
"extends": "../../configs/nyc.json"
|
|
50
50
|
},
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "8b231a49646069eab30d7ef31d047ae718def49d"
|
|
52
52
|
}
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { AI_CORE_PREFERENCES_TITLE } from '@theia/ai-core/lib/common/ai-core-preferences';
|
|
17
|
+
import { AI_CORE_PREFERENCES_TITLE, MODEL_PROVIDER_TYPE_DETAIL, ModelProviderTypeDetail } from '@theia/ai-core/lib/common/ai-core-preferences';
|
|
18
18
|
import { nls, PreferenceSchema } from '@theia/core';
|
|
19
19
|
|
|
20
20
|
export const COPILOT_ENABLED_PREF = 'ai-features.copilot.enabled';
|
|
@@ -25,6 +25,7 @@ export const CopilotPreferencesSchema: PreferenceSchema = {
|
|
|
25
25
|
properties: {
|
|
26
26
|
[COPILOT_ENABLED_PREF]: {
|
|
27
27
|
type: 'boolean',
|
|
28
|
+
typeDetails: { [MODEL_PROVIDER_TYPE_DETAIL]: { label: 'GitHub Copilot' } satisfies ModelProviderTypeDetail },
|
|
28
29
|
markdownDescription: nls.localize('theia/ai/copilot/enabled/mdDescription',
|
|
29
30
|
'Enable the GitHub Copilot provider. When enabled, a status bar entry '
|
|
30
31
|
+ 'appears for authentication and available models are discovered from your Copilot subscription.'),
|
|
@@ -228,7 +228,7 @@ export class CopilotAuthServiceImpl implements CopilotAuthService {
|
|
|
228
228
|
const credentials: StoredCredentials = JSON.parse(stored);
|
|
229
229
|
// Tokens from the current OAuth App start with 'gho_'; other prefixes (e.g. 'ghu_') indicate a token from the previous GitHub App (Iv-prefixed client ID).
|
|
230
230
|
if (!credentials.accessToken.startsWith('gho_')) {
|
|
231
|
-
|
|
231
|
+
this.logger.info('Copilot: clearing outdated GitHub App token. Please sign in again.');
|
|
232
232
|
await this.keyStoreService.deletePassword(this.oauthConfig.keystoreService, this.oauthConfig.keystoreAccount);
|
|
233
233
|
this.cachedState = { isAuthenticated: false, migrationRequired: true };
|
|
234
234
|
return this.cachedState;
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { LanguageModelRegistry, LanguageModelStatus } from '@theia/ai-core';
|
|
18
|
-
import { Disposable, DisposableCollection } from '@theia/core';
|
|
19
|
-
import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
18
|
+
import { Disposable, DisposableCollection, ILogger } from '@theia/core';
|
|
19
|
+
import { inject, injectable, postConstruct, named } from '@theia/core/shared/inversify';
|
|
20
20
|
import { CopilotLanguageModelsManager, CopilotModelDescription, COPILOT_PROVIDER_ID, getCopilotApiBaseUrl } from '../common';
|
|
21
21
|
import { CopilotOAuthConfig } from '../common/copilot-oauth-config';
|
|
22
22
|
import { CopilotLanguageModel } from './copilot-language-model';
|
|
@@ -38,6 +38,9 @@ export class CopilotLanguageModelsManagerImpl implements CopilotLanguageModelsMa
|
|
|
38
38
|
@inject(CopilotOAuthConfig)
|
|
39
39
|
protected readonly oauthConfig: CopilotOAuthConfig;
|
|
40
40
|
|
|
41
|
+
@inject(ILogger) @named('ai-copilot:CopilotLanguageModelsManagerImpl')
|
|
42
|
+
protected readonly logger: ILogger;
|
|
43
|
+
|
|
41
44
|
protected enterpriseUrl: string | undefined;
|
|
42
45
|
protected readonly toDispose = new DisposableCollection();
|
|
43
46
|
|
|
@@ -72,7 +75,7 @@ export class CopilotLanguageModelsManagerImpl implements CopilotLanguageModelsMa
|
|
|
72
75
|
|
|
73
76
|
if (model) {
|
|
74
77
|
if (!(model instanceof CopilotLanguageModel)) {
|
|
75
|
-
|
|
78
|
+
this.logger.warn(`Copilot: model ${modelDescription.id} is not a Copilot model`);
|
|
76
79
|
continue;
|
|
77
80
|
}
|
|
78
81
|
await this.languageModelRegistry.patchLanguageModel<CopilotLanguageModel>(modelDescription.id, {
|
|
@@ -135,7 +138,7 @@ export class CopilotLanguageModelsManagerImpl implements CopilotLanguageModelsMa
|
|
|
135
138
|
});
|
|
136
139
|
|
|
137
140
|
if (!response.ok) {
|
|
138
|
-
|
|
141
|
+
this.logger.warn(`Copilot: failed to fetch available models: ${response.status} ${response.statusText}`);
|
|
139
142
|
return [];
|
|
140
143
|
}
|
|
141
144
|
|
|
@@ -144,10 +147,10 @@ export class CopilotLanguageModelsManagerImpl implements CopilotLanguageModelsMa
|
|
|
144
147
|
};
|
|
145
148
|
const models = data.data ?? [];
|
|
146
149
|
const modelIds = this.deduplicateModels(models);
|
|
147
|
-
|
|
150
|
+
this.logger.info(`Copilot: discovered ${modelIds.length} available models: ${modelIds.join(', ')}`);
|
|
148
151
|
return modelIds;
|
|
149
152
|
} catch (error) {
|
|
150
|
-
|
|
153
|
+
this.logger.warn('Copilot: failed to fetch available models:', error);
|
|
151
154
|
return [];
|
|
152
155
|
}
|
|
153
156
|
}
|